thorsten / phpMyFAQ

phpmyfaq/inc/PMF/HttpStreamer.php

Spacing +4 added lines, -4 removed lines

@@ -209,7 +209,7 @@ 
 
         // Set the correct HTTP headers:
         // 1. Prevent proxies&browsers caching
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
         header("Expires: 0");
         header("Cache-Control: private, no-store, no-cache, must-revalidate, post-check=0, pre-check=0");
         header("Pragma: no-cache");
@@ -221,13 +221,13 @@ 
             header("Content-Type: application/force-download");
         }
         // RFC2616, �19.5.1: $filename must be a quoted-string
-        header("Content-Disposition: " . $this->disposition."; filename=\"" . PMF_Export::getExportTimestamp() . "_" . $filename."\"");
+        header("Content-Disposition: ".$this->disposition."; filename=\"".PMF_Export::getExportTimestamp()."_".$filename."\"");
         if (!empty($description)) {
-            header("Content-Description: " . $description);
+            header("Content-Description: ".$description);
         }
         header("Content-Transfer-Encoding: binary");
         header("Accept-Ranges: none");
-        header("Content-Length: " . $this->size);
+        header("Content-Length: ".$this->size);
     }
 
     /**

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Simple HTTP Streamer
- *
- * 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_HttpStreamer
- * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
- * @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-11-02
- */
+     * Simple HTTP Streamer
+     *
+     * 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_HttpStreamer
+     * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
+     * @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-11-02
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Auth.php

Spacing +2 added lines, -2 removed lines

@@ -130,7 +130,7 @@ 
         $message = '';
         
         if (!is_array($this->errors)) {
-            $this->errors = array((string) $this->errors);
+            $this->errors = array((string)$this->errors);
         }
         foreach ($this->errors as $error) {
             $message .= $error."\n";
@@ -165,7 +165,7 @@ 
             return $this;
         }
 
-        $authClass = 'PMF_Auth_' . $method;
+        $authClass = 'PMF_Auth_'.$method;
         if (!class_exists($authClass)) {
             $this->errors[] = self::PMF_ERROR_USER_NO_AUTHTYPE;
             return $this;

phpmyfaq/inc/PMF/Comment.php

Spacing +9 added lines, -9 removed lines

@@ -39,14 +39,14 @@ 
      *
      * @const string
      */
-    const COMMENT_TYPE_FAQ  = 'faq';
+    const COMMENT_TYPE_FAQ = 'faq';
 
     /**
      * News type
      *
      * @const string
      */
-    const COMMENT_TYPE_NEWS ='news';
+    const COMMENT_TYPE_NEWS = 'news';
 
     /**
      * @var PMF_Configuration
@@ -182,7 +182,7 @@ 
                 $mail->safeEmail($item['email']),
                 $item['user'],
                 $this->showShortComment($id, $item['content']),
-                $this->pmfStr['newsCommentDate'] .
+                $this->pmfStr['newsCommentDate'].
                     $date->format(
                         PMF_Date::createIsoDate($item['date'], 'Y-m-d H:i', false)
                     )
@@ -355,12 +355,12 @@ 
 
         $comment = '';
         foreach ($words as $word) {
-            $comment .= $word . ' ';
+            $comment .= $word.' ';
             if (15 === $numWords) {
-            $comment .= '<span class="comment-dots-' . $id . '">... </span>' .
-                        '<a onclick="showLongComment(' . $id . ')" class="comment-show-more-' . $id .
-                        ' pointer">' . $this->pmfStr['msgShowMore'] . '</a>' .
-                        '<span class="comment-more-' . $id . ' hide">';
+            $comment .= '<span class="comment-dots-'.$id.'">... </span>'.
+                        '<a onclick="showLongComment('.$id.')" class="comment-show-more-'.$id.
+                        ' pointer">'.$this->pmfStr['msgShowMore'].'</a>'.
+                        '<span class="comment-more-'.$id.' hide">';
             }
             $numWords++;
         }
@@ -368,6 +368,6 @@ 
         // Convert URLs to HTML anchors
 
 
-        return PMF_Utils::parseUrl($comment) . '</span>';
+        return PMF_Utils::parseUrl($comment).'</span>';
     }
 }
\ No newline at end of file

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * The main Comment 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_Comment
- * @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-07-23
- */
+     * The main Comment 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_Comment
+     * @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-07-23
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Ldap.php

Spacing +6 added lines, -6 removed lines

@@ -106,7 +106,7 @@ 
         $this->base = $ldapBase;
         $this->ds   = ldap_connect($ldapServer, $ldapPort);
 
-        if (! $this->ds) {
+        if (!$this->ds) {
             $this->error = sprintf(
                 'Unable to connect to LDAP server (Error: %s)',
                 ldap_error($this->ds)
@@ -119,7 +119,7 @@ 
         // optionally set Bind version
         if (isset($this->_ldapConfig['ldap_options'])) {
             foreach ($this->_ldapConfig['ldap_options'] as $key => $value) {
-                if (! ldap_set_option($this->ds, $key, $value)) {
+                if (!ldap_set_option($this->ds, $key, $value)) {
                     $this->errno = ldap_errno($this->ds);
                     $this->error = sprintf(
                         'Unable to set LDAP option "%s" to "%s" (Error: %s).',
@@ -135,7 +135,7 @@ 
 
         if (isset($this->_ldapConfig['ldap_use_dynamic_login']) && $this->_ldapConfig['ldap_use_dynamic_login']) {
             // Check for dynamic user binding
-            $ldapRdn  = $this->_ldapConfig['ldap_dynamic_login_attribute'] . '=' . $ldapUser . ',' . $ldapBase;
+            $ldapRdn  = $this->_ldapConfig['ldap_dynamic_login_attribute'].'='.$ldapUser.','.$ldapBase;
             $ldapBind = $this->bind($ldapRdn, $ldapPassword);
         } elseif (isset($this->_ldapConfig['ldap_use_anonymous_login']) && $this->_ldapConfig['ldap_use_anonymous_login']) {
             // Check for anonymous binding
@@ -240,7 +240,7 @@ 
      *
      * @return string|false
      */
-    private function getLdapData ($username, $data)
+    private function getLdapData($username, $data)
     {
         if (!is_resource($this->ds)) {
             $this->error = 'The LDAP connection handler is not a valid resource.';
@@ -358,8 +358,8 @@ 
     public function quote($string)
     {
         return str_replace(
-            array( '\\', ' ', '*', '(', ')' ),
-            array( '\\5c', '\\20', '\\2a', '\\28', '\\29' ),
+            array('\\', ' ', '*', '(', ')'),
+            array('\\5c', '\\20', '\\2a', '\\28', '\\29'),
             $string
         );
     }

Indentation +19 added lines, -19 removed lines

@@ -1,24 +1,24 @@
 <?php
 /**
- * The PMF_Ldap class provides methods and functions for a LDAP database
- *
- * 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_Ldap
- * @author    Adam Greene <phpmyfaq@skippy.fastmail.fm>
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Alberto Cabello Sanchez <alberto@unex.es>
- * @author    Lars Scheithauer <larsscheithauer@googlemail.com>
- * @copyright 2004-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2004-12-16
- */
+     * The PMF_Ldap class provides methods and functions for a LDAP database
+     *
+     * 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_Ldap
+     * @author    Adam Greene <phpmyfaq@skippy.fastmail.fm>
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Alberto Cabello Sanchez <alberto@unex.es>
+     * @author    Lars Scheithauer <larsscheithauer@googlemail.com>
+     * @copyright 2004-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2004-12-16
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/User/CurrentUser.php

Spacing +7 added lines, -7 removed lines

@@ -271,7 +271,7 @@ 
         if (!isset($_SESSION[PMF_SESSION_ID_TIMESTAMP])) {
             return 0;
         }
-        return ($_SERVER['REQUEST_TIME'] - $_SESSION[PMF_SESSION_ID_TIMESTAMP]) / 60;
+        return ($_SERVER['REQUEST_TIME'] - $_SESSION[PMF_SESSION_ID_TIMESTAMP])/60;
     }
 
     /**
@@ -319,10 +319,10 @@ 
         $oldSessionId = session_id();
         if (session_regenerate_id(true)) {
             $sessionPath = session_save_path();
-            if (strpos ($sessionPath, ';') !== false) {
-                $sessionPath = substr ($sessionPath, strpos ($sessionPath, ';') + 1);
+            if (strpos($sessionPath, ';') !== false) {
+                $sessionPath = substr($sessionPath, strpos($sessionPath, ';') + 1);
             }
-            $sessionFilename = $sessionPath . '/sess_' . $oldSessionId;
+            $sessionFilename = $sessionPath.'/sess_'.$oldSessionId;
             if (@file_exists($sessionFilename)) {
                 @unlink($sessionFilename);
             }
@@ -343,7 +343,7 @@ 
             PMF_Db::getTablePrefix(),
             session_id(),
             $_SERVER['REQUEST_TIME'],
-            $updateLastlogin ?  "last_login = '".date('YmdHis', $_SERVER['REQUEST_TIME'])."'," : '',
+            $updateLastlogin ? "last_login = '".date('YmdHis', $_SERVER['REQUEST_TIME'])."'," : '',
             $_SERVER['REMOTE_ADDR'],
             $this->getUserId()
         );
@@ -490,7 +490,7 @@ 
      */
     public static function getFromCookie(PMF_Configuration $config)
     {
-        if (! isset($_COOKIE[PMF_Session::PMF_COOKIE_NAME_REMEMBERME])) {
+        if (!isset($_COOKIE[PMF_Session::PMF_COOKIE_NAME_REMEMBERME])) {
             return null;
         }
 
@@ -612,6 +612,6 @@ 
      */
     private function createCsrfToken()
     {
-        return sha1(microtime() . $this->getLogin());
+        return sha1(microtime().$this->getLogin());
     }
 }

Indentation +25 added lines, -25 removed lines

@@ -1,28 +1,28 @@ 
 <?php
 /**
- * Manages authentication process using PHP sessions.
- *
- * The CurrentUser class is an extension of the User class. It provides methods
- * manage user authentication using multiple database accesses. There are three
- * ways of making a new current user object, using the login(), getFromSession(),
- * getFromCookie() or manually. login(), getFromSession() and getFromCookie() may
- * be combined.
- *
- * 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   User
- * @author    Lars Tiedemann <php@larstiedemann.de>
- * @author    Thorsten Rinne <thorsten@phpmyfaq.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-28
- */
+     * Manages authentication process using PHP sessions.
+     *
+     * The CurrentUser class is an extension of the User class. It provides methods
+     * manage user authentication using multiple database accesses. There are three
+     * ways of making a new current user object, using the login(), getFromSession(),
+     * getFromCookie() or manually. login(), getFromSession() and getFromCookie() may
+     * be combined.
+     *
+     * 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   User
+     * @author    Lars Tiedemann <php@larstiedemann.de>
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.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-28
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -292,8 +292,8 @@ 
                 %sfaquser
             WHERE
                 user_id = %d",
-           PMF_Db::getTablePrefix(),
-           $this->getUserId()
+            PMF_Db::getTablePrefix(),
+            $this->getUserId()
         );
            
         $res = $this->config->getDb()->query($select);

phpmyfaq/inc/PMF/Perm/Basic.php

Spacing +1 added lines, -1 removed lines

@@ -318,7 +318,7 @@
             isset($rightData['for_groups']) ? (int)$rightData['for_groups'] : 1
         );
 
-        if (! $this->config->getDb()->query($insert)) {
+        if (!$this->config->getDb()->query($insert)) {
             return 0;
         }
         

phpmyfaq/inc/PMF/Perm/Medium.php

Spacing +1 added lines, -1 removed lines

@@ -258,7 +258,7 @@
         
         $nextId    = $this->config->getDb()->nextId(PMF_Db::getTablePrefix()."faqgroup", "group_id");
         $groupData = $this->checkGroupData($groupData);
-        $insert     = sprintf("
+        $insert = sprintf("
             INSERT INTO
                 %sfaqgroup
             (group_id, name, description, auto_join)

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * The medium permission class provides group rights.
- *
- * 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
- */
+     * The medium permission class provides group rights.
+     *
+     * 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/Attachment/Collection.php

Spacing +2 added lines, -2 removed lines

@@ -79,8 +79,8 @@
                 fa.record_id = fd.id
             GROUP BY
                 fa.id",
-            PMF_Db::getTablePrefix() . 'faqattachment',
-            PMF_Db::getTablePrefix() . 'faqdata'
+            PMF_Db::getTablePrefix().'faqattachment',
+            PMF_Db::getTablePrefix().'faqdata'
         );
 
         $result = $this->config->getDb()->query($query);

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Attachment collection 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   Attachment
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2010-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2010-12-13
- */
+     * Attachment collection 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   Attachment
+     * @author    Anatoliy Belsky <ab@php.net>
+     * @copyright 2010-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2010-12-13
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Attachment/Filesystem/File.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
         $this->handle = @fopen($this->path, $this->mode);
         
         if (!is_resource($this->handle)) {
-            throw new PMF_Attachment_Filesystem_File_Exception('Could not open file: ' . $this->path);
+            throw new PMF_Attachment_Filesystem_File_Exception('Could not open file: '.$this->path);
         }
     }
     
@@ -151,7 +151,7 @@ 
     {
         $retval = false;
         
-        if(in_array($mode, array(self::MODE_WRITE, self::MODE_READ, self::MODE_APPEND))) {
+        if (in_array($mode, array(self::MODE_WRITE, self::MODE_READ, self::MODE_APPEND))) {
             fclose($this->handle);
             $this->handle = fopen($this->path, $mode);
         

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * File handler 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   Attachment
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2009-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-08-21
- */
+     * File handler 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   Attachment
+     * @author    Anatoliy Belsky <ab@php.net>
+     * @copyright 2009-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-08-21
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();