thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Auth/Ldap.php

Indentation +19 added lines, -19 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 /**
- * Manages user authentication with LDAP server.
- *
- * 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   Auth
- * @author    Alberto Cabello <alberto@unex.es>
- * @author    Lars Scheithauer <larsscheithauer@googlemail.com>
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2009-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-03-01
- */
+     * Manages user authentication with LDAP server.
+     *
+     * 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   Auth
+     * @author    Alberto Cabello <alberto@unex.es>
+     * @author    Lars Scheithauer <larsscheithauer@googlemail.com>
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2009-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-03-01
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -134,7 +134,7 @@ 
      * @param string $password  Password
      *
      * @return boolean
-    */
+     */
     public function changePassword($login, $password)
     {
         return true;

Spacing +2 added lines, -2 removed lines

@@ -178,7 +178,7 @@ 
         $bindLogin = $login;
         if ($this->_ldapConfig['ldap_use_domain_prefix']) {
             if (array_key_exists('domain', $optionalData)) {
-                $bindLogin = $optionalData['domain'] . '\\' . $login;
+                $bindLogin = $optionalData['domain'].'\\'.$login;
             }
         } else {
             $this->ldap = new PMF_Ldap($this->_config);
@@ -206,7 +206,7 @@ 
             $password
         );
 
-        if (! $this->ldap->bind($bindLogin, $password)) {
+        if (!$this->ldap->bind($bindLogin, $password)) {
             $this->errors[] = $this->ldap->error;
             return false;
         } else {

phpmyfaq/inc/PMF/Auth/Sso.php

Indentation +18 added lines, -18 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Manages user authentication with Apache's SSO authentication, e.g. mod_sspi
- * or mod_auth_kerb
- *
- * 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   Auth
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2011-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2011-06-22
- */
+     * Manages user authentication with Apache's SSO authentication, e.g. mod_sspi
+     * or mod_auth_kerb
+     *
+     * 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   Auth
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2011-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2011-06-22
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -78,7 +78,7 @@ 
      * @param string $pass  Password
      *
      * @return boolean
-    */
+     */
     public function changePassword($login, $pass)
     {
         return true;

phpmyfaq/inc/PMF/Enc.php

Indentation +17 added lines, -17 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * Provides methods for password encryption
- *
- * 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   Enc
- * @author    Lars Tiedemann <php@larstiedemann.de>
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2005-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2005-09-18
- */
+     * Provides methods for password encryption
+     *
+     * 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   Enc
+     * @author    Lars Tiedemann <php@larstiedemann.de>
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2005-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2005-09-18
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

Spacing +4 added lines, -4 removed lines

@@ -111,12 +111,12 @@ 
         $enc     = new PMF_Enc($config);
         $encType = ucfirst(strtolower($encType));
 
-        if (! isset($encType)) {
+        if (!isset($encType)) {
             $enc->errors[] = self::PMF_ERROR_USER_NO_ENCTYPE;
             return $enc;
         }
 
-        $encClass = 'PMF_Enc_' . $encType;
+        $encClass = 'PMF_Enc_'.$encType;
 
         if (!class_exists($encClass)) {
             $enc->errors[] = self::PMF_ERROR_USER_NO_ENCTYPE;
@@ -135,7 +135,7 @@ 
     public function error()
     {
         if (!is_array($this->errors)) {
-            $this->errors = array((string) $this->errors);
+            $this->errors = array((string)$this->errors);
         }
         $message = '';
         foreach ($this->errors as $error) {
@@ -153,7 +153,7 @@ 
      */
     public function setSalt($login)
     {
-        $this->salt = $this->_config->get('security.salt') . $login;
+        $this->salt = $this->_config->get('security.salt').$login;
 
         return $this;
     }

phpmyfaq/inc/PMF/Init.php

Indentation +31 added lines, -31 removed lines

@@ -1,28 +1,28 @@ 
 <?php
 /**
- * Some basic functions and PMF_Init 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/. 
- *
- * Portions created by Christian Stocker are Copyright (c) 2001-2008 Liip AG.
- * All Rights Reserved.
- *
- * @category  phpMyFAQ
- * @package   PMF_Init
- * @author    Johann-Peter Hartmann <hartmann@mayflower.de>
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Stefan Esser <sesser@php.net>
- * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
- * @author    Christian Stocker <chregu@bitflux.ch>
- * @copyright 2005-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2005-09-24
- */
+     * Some basic functions and PMF_Init 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/. 
+     *
+     * Portions created by Christian Stocker are Copyright (c) 2001-2008 Liip AG.
+     * All Rights Reserved.
+     *
+     * @category  phpMyFAQ
+     * @package   PMF_Init
+     * @author    Johann-Peter Hartmann <hartmann@mayflower.de>
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Stefan Esser <sesser@php.net>
+     * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
+     * @author    Christian Stocker <chregu@bitflux.ch>
+     * @copyright 2005-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2005-09-24
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -138,14 +138,14 @@ 
         return $filename;
     }
 
-   /**
-    * Clean the filename of any uploaded file by the user and force an error
-    * when calling is_uploaded_file($_FILES[key]['tmp_name']) if the cleanup goes wrong
-    *
-    * @return void
-    */
-   private static function _cleanFilenames()
-   {
+    /**
+     * Clean the filename of any uploaded file by the user and force an error
+     * when calling is_uploaded_file($_FILES[key]['tmp_name']) if the cleanup goes wrong
+     *
+     * @return void
+     */
+    private static function _cleanFilenames()
+    {
         reset($_FILES);
         while (list($key, $value) = each($_FILES)) {
             if (is_array($_FILES[$key]['name'])) {

Spacing +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
                     $_FILES[$key]['type']     = '';
                     $_FILES[$key]['tmp_name'] = '';
                     $_FILES[$key]['size']     = 0;
-                    $_FILES[$key]['error']   = UPLOAD_ERR_NO_FILE;
+                    $_FILES[$key]['error'] = UPLOAD_ERR_NO_FILE;
                 }
             }
         }

phpmyfaq/inc/PMF/Language/Plurals.php

Indentation +21 added lines, -21 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * The plurals class provides support for plural forms in PMF translations.
- *
- * 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   Language
- * @author    Aurimas Fišeras <aurimas@gmail.com>
- * @copyright 2009-2015 Aurimas Fišeras and phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-07-30
- */
+     * The plurals class provides support for plural forms in PMF translations.
+     *
+     * 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   Language
+     * @author    Aurimas Fišeras <aurimas@gmail.com>
+     * @copyright 2009-2015 Aurimas Fišeras and phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-07-30
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -63,11 +63,11 @@ 
     private $useDefaultPluralForm;
 
     /**
-    * Constructor
-    *
-    * @param  array $translation PMF translation array for current language
-    * @return void
-    */
+     * Constructor
+     *
+     * @param  array $translation PMF translation array for current language
+     * @return void
+     */
     public function __construct($translation)
     {
         $this->PMF_TRANSL = $translation;

Spacing +2 added lines, -2 removed lines

@@ -100,9 +100,9 @@
         }
 
         $plural = $this->plural($this->lang, $n);
-        if ($plural > $this->nPlurals-1) {
+        if ($plural > $this->nPlurals - 1) {
             // incorrectly defined plural function or wrong $nPlurals
-            return $this->nPlurals-1;
+            return $this->nPlurals - 1;
         } else {
             return $plural;
         }

phpmyfaq/inc/PMF/Network.php

Spacing +4 added lines, -4 removed lines

@@ -117,8 +117,8 @@ 
             // $network seems to be a real network address
             $x = ip2long($ip_arr[1]);
             // Evaluate the netmask: <Network Mask> or <CIDR>
-            $mask = ( long2ip($x) == $ip_arr[1] ? $x : 0xffffffff << (32 - $ip_arr[1]));
-            $matched = ( ($ip_long & $mask) == ($network_long & $mask) );
+            $mask = (long2ip($x) == $ip_arr[1] ? $x : 0xffffffff << (32 - $ip_arr[1]));
+            $matched = (($ip_long & $mask) == ($network_long & $mask));
         }
 
         return $matched;
@@ -153,8 +153,8 @@ 
         $bytes_addr = unpack("n*", inet_pton($addr));
         $bytes_test = unpack("n*", inet_pton($ip));
 
-        for ($i = 1; $i <= ceil($preflen / 16); $i++) {
-            $left = $preflen - 16 * ($i-1);
+        for ($i = 1; $i <= ceil($preflen/16); $i++) {
+            $left = $preflen - 16*($i - 1);
             if ($left > 16) {
                 $left = 16;
             }

phpmyfaq/inc/PMF/Cache/Service.php

Indentation +38 added lines, -38 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * The PMF_Cache_Service class provides abstract cache functionality
- *
- * 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_Cache_Service
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2002-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2011-09-23
- */
+     * The PMF_Cache_Service class provides abstract cache functionality
+     *
+     * 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_Cache_Service
+     * @author    Anatoliy Belsky <ab@php.net>
+     * @copyright 2002-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2011-09-23
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -34,28 +34,28 @@ 
  */
 abstract class PMF_Cache_Service
 {
-	/**
-	 * Children must implement the constructor with the appropriate config.
-	 *
-	 * @param array $config Cache configuration
-	 *
-	 * @return void
-	 */
-	abstract function __construct(array $config);
+    /**
+     * Children must implement the constructor with the appropriate config.
+     *
+     * @param array $config Cache configuration
+     *
+     * @return void
+     */
+    abstract function __construct(array $config);
 
-	/**
-	 * Children must implement this to be able to clear the single article cache as well as all the related items.
-	 *
-	 * @param intereg $id Article id
-	 *
-	 * @return void
-	 */
-	abstract function clearArticle($id);
+    /**
+     * Children must implement this to be able to clear the single article cache as well as all the related items.
+     *
+     * @param intereg $id Article id
+     *
+     * @return void
+     */
+    abstract function clearArticle($id);
 
-	/**
-	 * Children must implement this to be able to clear all the cache contents at once.
-	 *
-	 * @return void
-	 */
-	abstract function clearAll();
+    /**
+     * Children must implement this to be able to clear all the cache contents at once.
+     *
+     * @return void
+     */
+    abstract function clearAll();
 }

phpmyfaq/inc/PMF/Cache/Apc.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * The PMF_Cache_Apc class implements the APC cache service functionality
- *
- * 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_Cache_Apc
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2011-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2011-10-01
- */
+     * The PMF_Cache_Apc class implements the APC cache service functionality
+     *
+     * 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_Cache_Apc
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2011-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2011-10-01
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Cache/Varnish.php

Indentation +41 added lines, -41 removed lines

@@ -34,51 +34,51 @@
  */
 class PMF_Cache_Varnish extends PMF_Cache_Service
 {
-	protected $instance = NULL;
+    protected $instance = NULL;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param array $config Cache configuration
-	 *
-	 * @return void
-	 */
-	public function __construct(array $config)
-	{
-		$this->instance = new VarnishAdmin($config);	
+    /**
+     * Constructor.
+     *
+     * @param array $config Cache configuration
+     *
+     * @return void
+     */
+    public function __construct(array $config)
+    {
+        $this->instance = new VarnishAdmin($config);	
 
-		try {
-			if(!$this->instance->connect()) {
-				throw new VarnishException("Connection failed\n");
-			}   
-		} catch (VarnishException $e) {
-			echo $e->getMessage();
-		}
+        try {
+            if(!$this->instance->connect()) {
+                throw new VarnishException("Connection failed\n");
+            }   
+        } catch (VarnishException $e) {
+            echo $e->getMessage();
+        }
 
-		try {
-			if(!$this->instance->auth()) {
-				throw new VarnishException("Auth failed\n");
-			}   
-		} catch (VarnishException $e) {
-			echo $e->getMessage();
-		}
-	}
+        try {
+            if(!$this->instance->auth()) {
+                throw new VarnishException("Auth failed\n");
+            }   
+        } catch (VarnishException $e) {
+            echo $e->getMessage();
+        }
+    }
 
-	/**
-	 * Clear all cached article related items.
-	 *
-	 * @param intereg $id Article id
-	 *
-	 * @return void
-	 */
-	public function clearArticle($id)
-	{
-		$this->clearAll();
-	}
+    /**
+     * Clear all cached article related items.
+     *
+     * @param intereg $id Article id
+     *
+     * @return void
+     */
+    public function clearArticle($id)
+    {
+        $this->clearAll();
+    }
 
-	public function clearAll()
-	{
-		$this->instance->banUrl(".*");
-	}
+    public function clearAll()
+    {
+        $this->instance->banUrl(".*");
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 		$this->instance = new VarnishAdmin($config);	
 
 		try {
-			if(!$this->instance->connect()) {
+			if (!$this->instance->connect()) {
 				throw new VarnishException("Connection failed\n");
 			}   
 		} catch (VarnishException $e) {
@@ -56,7 +56,7 @@ 
 		}
 
 		try {
-			if(!$this->instance->auth()) {
+			if (!$this->instance->auth()) {
 				throw new VarnishException("Auth failed\n");
 			}   
 		} catch (VarnishException $e) {