thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Services/Twitter.php

Spacing +3 added lines, -3 removed lines

@@ -65,12 +65,12 @@
         $hashtags = '';
         
         if ($tags != '') {
-            $hashtags = '#' . str_replace(',', ' #', $tags);
+            $hashtags = '#'.str_replace(',', ' #', $tags);
         }
 
         $message  = PMF_String::htmlspecialchars($question);
-        $message .= ' ' . $hashtags;
-        $message .= ' ' . $link;
+        $message .= ' '.$hashtags;
+        $message .= ' '.$link;
 
         $this->connection->post('statuses/update', array('status' => $message));
     }

phpmyfaq/inc/PMF/Services/Gravatar.php

Spacing +5 added lines, -5 removed lines

@@ -59,18 +59,18 @@ 
      */
     public function getImage($email, $params = array())
     {
-        $imageUrl = $this->getUrl() . 'avatar/' . $this->getHash($email);
+        $imageUrl = $this->getUrl().'avatar/'.$this->getHash($email);
 
         $opts = array();
 
         if (isset($params['default'])) {
-            $opts[] = 'default='. $params['default'];
+            $opts[] = 'default='.$params['default'];
         }
         if (isset($params['size'])) {
-            $opts[] = 'size='. $params['size'];
+            $opts[] = 'size='.$params['size'];
         }
         if (isset($params['rating'])) {
-            $opts[] = 'rating='. $params['rating'];
+            $opts[] = 'rating='.$params['rating'];
         }
         if (isset($params['force_default']) && $params['force_default'] === true) {
             $opts[] = 'forcedefault=y';
@@ -79,7 +79,7 @@ 
             $params['class'] = '';
         }
 
-        $gravatar = $imageUrl . (sizeof($opts) > 0 ? '?' . implode($opts, '&') : false);
+        $gravatar = $imageUrl.(sizeof($opts) > 0 ? '?'.implode($opts, '&') : false);
 
         return sprintf(
             '<img src="%s" class="%s" alt="Gravatar">',

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Service class for Gravatar support
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Services
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2013-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2013-01-14
- */
+     * Service class for Gravatar support
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Services
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2013-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2013-01-14
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Session.php

Spacing +11 added lines, -11 removed lines

@@ -111,7 +111,7 @@ 
 
             if (0 == $bots && false == $banned) {
                 if (!isset($sid)) {
-                    $sid = $this->config->getDb()->nextId(PMF_Db::getTablePrefix() . 'faqsessions', 'sid');
+                    $sid = $this->config->getDb()->nextId(PMF_Db::getTablePrefix().'faqsessions', 'sid');
                     // Sanity check: force the session cookie to contains the current $sid
                     if (!is_null($sidc) && (!$sidc != $sid)) {
                         self::setCookie(self::PMF_COOKIE_NAME_SESSIONID, $sid);
@@ -132,15 +132,15 @@ 
                     $this->config->getDb()->query($query);
                 }
 
-                $data = $sid.';' . 
-                        str_replace(';', ',', $action) . ';' . 
-                        $id . ';' . 
-                        $remoteAddr . ';' .
-                        str_replace(';', ',', $_SERVER['QUERY_STRING']) . ';' . 
-                        str_replace(';', ',', isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '') . ';' . 
-                        str_replace(';', ',', urldecode($_SERVER['HTTP_USER_AGENT'])) . ';' . 
-                        $_SERVER['REQUEST_TIME'] . ";\n";
-                $file = './data/tracking' . date('dmY');
+                $data = $sid.';'. 
+                        str_replace(';', ',', $action).';'. 
+                        $id.';'. 
+                        $remoteAddr.';'.
+                        str_replace(';', ',', $_SERVER['QUERY_STRING']).';'. 
+                        str_replace(';', ',', isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '').';'. 
+                        str_replace(';', ',', urldecode($_SERVER['HTTP_USER_AGENT'])).';'. 
+                        $_SERVER['REQUEST_TIME'].";\n";
+                $file = './data/tracking'.date('dmY');
                 file_put_contents($file, $data, FILE_APPEND);
             }
         }
@@ -338,7 +338,7 @@ 
 
             $timeNow = ($_SERVER['REQUEST_TIME'] - $activityTimeWindow);
 
-            if (! $this->config->get('security.enableLoginOnly')) {
+            if (!$this->config->get('security.enableLoginOnly')) {
                 // Count all sids within the time window for public installations
                 // @todo add a new field in faqsessions in order to find out only sids of anonymous users
                 $query = sprintf("

Indentation +18 added lines, -18 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * The main User session class
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   PMF_Session
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2007-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2007-03-31
- */
+     * The main User session class
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   PMF_Session
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2007-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2007-03-31
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -170,8 +170,8 @@ 
         $result = $this->config->getDb()->query($query);
 
         if ($result) {
-        	$res       = $this->config->getDb()->fetchObject($result);
-        	$timestamp = $res->time;
+            $res       = $this->config->getDb()->fetchObject($result);
+            $timestamp = $res->time;
         }
 
         return $timestamp;

phpmyfaq/inc/PMF/News.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
             while (($row = $this->_config->getDb()->fetchObject($result))) {
 
                 $counter++;
-                if (($showArchive  && ($counter > $this->_config->get('records.numberOfShownNewsEntries'))) ||
+                if (($showArchive && ($counter > $this->_config->get('records.numberOfShownNewsEntries'))) ||
                    ((!$showArchive) && (!$forceConfLimit) && 
                    ($counter <= $this->_config->get('records.numberOfShownNewsEntries'))) ||
                    ((!$showArchive) && $forceConfLimit)) {

Indentation +24 added lines, -24 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * The News class for phpMyFAQ news
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   PMF_News
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
- * @copyright 2006-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2006-06-25
- */
+     * The News class for phpMyFAQ news
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   PMF_News
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
+     * @copyright 2006-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2006-06-25
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -42,10 +42,10 @@ 
     private $_config;
 
     /**
-    * Language strings
-    *
-    * @var  string
-    */
+     * Language strings
+     *
+     * @var  string
+     */
     private $pmf_lang;
 
     /**
@@ -152,9 +152,9 @@ 
         foreach ($news as $item) {
 
             $url = sprintf('%s?action=news&amp;newsid=%d&amp;newslang=%s',
-                           PMF_Link::getSystemRelativeUri(),
-                           $item['id'],
-                           $item['lang']);
+                            PMF_Link::getSystemRelativeUri(),
+                            $item['id'],
+                            $item['lang']);
             $oLink = new PMF_Link($url, $this->_config);
             
             if (isset($item['header'])) {

phpmyfaq/inc/PMF/Configuration.php

Spacing +4 added lines, -4 removed lines

@@ -291,10 +291,10 @@
     public function update(Array $newConfigs)
     {
         $runtimeConfigs = array(
-            'core.database',  // PMF_DB_Driver
-            'core.instance',  // PMF_Instance
-            'core.language',  // Language
-            'core.ldap',      // PMF_Ldap
+            'core.database', // PMF_DB_Driver
+            'core.instance', // PMF_Instance
+            'core.language', // Language
+            'core.ldap', // PMF_Ldap
             'core.ldapConfig' // $PMF_LDAP
         );
         if (is_array($newConfigs)) {

Indentation +17 added lines, -17 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * The main class for fetching the configuration, update and delete items. This
- * class is also a small Dependency Injection Container for phpMyFAQ.
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Configuration
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2006-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2006-01-04
- */
+     * The main class for fetching the configuration, update and delete items. This
+     * class is also a small Dependency Injection Container for phpMyFAQ.
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Configuration
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2006-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2006-01-04
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Export.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     exit();
 }
 
-require_once PMF_CONFIG_DIR . '/constants.php';
+require_once PMF_CONFIG_DIR.'/constants.php';
 
 /**
  * Export Class

Indentation +17 added lines, -17 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * XML, XHTML and PDF export - Classes and Functions
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Export
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @copyright 2005-2016 phpMyFAQ Team
- * @link      http://www.phpmyfaq.de
- * @since     2005-11-02
- */
+     * XML, XHTML and PDF export - Classes and Functions
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Export
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @copyright 2005-2016 phpMyFAQ Team
+     * @link      http://www.phpmyfaq.de
+     * @since     2005-11-02
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Notification.php

Spacing +2 added lines, -2 removed lines

@@ -86,11 +86,11 @@
     public function sendOpenQuestionAnswered($email, $userName, $url)
     {
         $this->mail->addTo($email, $userName);
-        $this->mail->subject = $this->config->get('main.titleFAQ') . ' - ' . $this->pmfStr['msgQuestionAnswered'];
+        $this->mail->subject = $this->config->get('main.titleFAQ').' - '.$this->pmfStr['msgQuestionAnswered'];
         $this->mail->message = sprintf(
             $this->pmfStr['msgMessageQuestionAnswered'],
             $this->config->get('main.titleFAQ')
-        ) . "\n\r" . $url;
+        )."\n\r".$url;
         $this->mail->send();
     }
 }
\ No newline at end of file

phpmyfaq/inc/PMF/Perm.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     public static function selectPerm($permLevel, PMF_Configuration $config)
     {
         if (isset($permLevel)) {
-            $permclass = 'PMF_Perm_' . ucfirst(strtolower($permLevel));
+            $permclass = 'PMF_Perm_'.ucfirst(strtolower($permLevel));
             if (class_exists($permclass)) {
                 return new $permclass($config);
             }

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * This class manages user permissions and group memberships.
- *
- * There are three possible extensions of this class: basic, medium and large
- * by the classes PMF_PermBasic, PMF_PermMedium and PMF_PermLarge. The classes
- * to allow for scalability. This means that PMF_PermMedium is an extend of
- * and PMF_PermLarge is an extend of PMF_PermMedium.
- *
- * The permission type can be selected by calling $perm = Perm(perm_type) or
- * static method $perm = Perm::selectPerm(perm_type) where perm_type is
- * 'medium' or 'large'. Both ways, a PMF_PermBasic, PMF_PermMedium or
- * is returned.
- *
- * Before calling any method, the object $perm needs to be initialised calling
- * user_id, context, context_id). The parameters context and context_id are
- * accepted, but do only matter in PMF_PermLarge. In other words, if you have a
- * or PMF_PermMedium, it does not matter if you pass context and context_id or
- * But in PMF_PermLarge, they do make a significant difference if passed, thus
- * for up- and downwards-compatibility.
- *
- * Perhaps the most important method is $perm->checkRight(right_name). This
- * checks whether the user having the user_id set with $perm->setPerm()
- *
- * The permission object is added to a user using the user's addPerm() method.
- * a single permission-object is allowed for each user. The permission-object is
- * in the user's $perm variable. Permission methods are performed using the
- * variable (e.g. $user->perm->method() ).
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ 
- * @package   Perm
- * @author    Lars Tiedemann <php@larstiedemann.de>
- * @copyright 2005-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2005-09-17
- */
+     * This class manages user permissions and group memberships.
+     *
+     * There are three possible extensions of this class: basic, medium and large
+     * by the classes PMF_PermBasic, PMF_PermMedium and PMF_PermLarge. The classes
+     * to allow for scalability. This means that PMF_PermMedium is an extend of
+     * and PMF_PermLarge is an extend of PMF_PermMedium.
+     *
+     * The permission type can be selected by calling $perm = Perm(perm_type) or
+     * static method $perm = Perm::selectPerm(perm_type) where perm_type is
+     * 'medium' or 'large'. Both ways, a PMF_PermBasic, PMF_PermMedium or
+     * is returned.
+     *
+     * Before calling any method, the object $perm needs to be initialised calling
+     * user_id, context, context_id). The parameters context and context_id are
+     * accepted, but do only matter in PMF_PermLarge. In other words, if you have a
+     * or PMF_PermMedium, it does not matter if you pass context and context_id or
+     * But in PMF_PermLarge, they do make a significant difference if passed, thus
+     * for up- and downwards-compatibility.
+     *
+     * Perhaps the most important method is $perm->checkRight(right_name). This
+     * checks whether the user having the user_id set with $perm->setPerm()
+     *
+     * The permission object is added to a user using the user's addPerm() method.
+     * a single permission-object is allowed for each user. The permission-object is
+     * in the user's $perm variable. Permission methods are performed using the
+     * variable (e.g. $user->perm->method() ).
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ 
+     * @package   Perm
+     * @author    Lars Tiedemann <php@larstiedemann.de>
+     * @copyright 2005-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2005-09-17
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Rating.php

Spacing +2 added lines, -2 removed lines

@@ -197,11 +197,11 @@
         if ($this->_config->getDb()->numRows($result) > 0) {
             $row = $this->_config->getDb()->fetchObject($result);
             return sprintf(
-                ' %s ('.$this->plr->GetMsg('plmsgVotes',$row->usr).')',
+                ' %s ('.$this->plr->GetMsg('plmsgVotes', $row->usr).')',
                 round($row->voting, 2)
             );
        } else {
-            return '0 (' . $this->plr->GetMsg('plmsgVotes', 0) . ')';
+            return '0 ('.$this->plr->GetMsg('plmsgVotes', 0).')';
        }
     }
 }

Indentation +25 added lines, -25 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * The main Rating class
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   PMF_Rating
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2007-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2007-03-31
- */
+     * The main Rating class
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   PMF_Rating
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2007-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2007-03-31
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -122,7 +122,7 @@ 
                 );
                 break;
 
-             default:
+                default:
                 $query = sprintf("
                     SELECT
                         fd.id AS id,
@@ -162,12 +162,12 @@ 
         $result = $this->_config->getDb()->query($query);
         while ($row = $this->_config->getDb()->fetchObject($result)) {
             $ratings[] = array(
-               'id'          => $row->id,
-               'lang'        => $row->lang,
-               'category_id' => $row->category_id,
-               'question'    => $row->question,
-               'num'         => $row->num,
-               'usr'         => $row->usr
+                'id'          => $row->id,
+                'lang'        => $row->lang,
+                'category_id' => $row->category_id,
+                'question'    => $row->question,
+                'num'         => $row->num,
+                'usr'         => $row->usr
             );
         }
 
@@ -200,8 +200,8 @@ 
                 ' %s ('.$this->plr->GetMsg('plmsgVotes',$row->usr).')',
                 round($row->voting, 2)
             );
-       } else {
+        } else {
             return '0 (' . $this->plr->GetMsg('plmsgVotes', 0) . ')';
-       }
+        }
     }
 }