thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Init.php

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;
                 }
             }
         }

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-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-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-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-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'])) {

phpmyfaq/inc/PMF/Language/Plurals.php

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;
         }

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-2016 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-2016 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;

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;
             }

Indentation +19 added lines, -19 removed lines

@@ -1,24 +1,24 @@
 <?php
 /**
- * The network class for IPv4 and IPv6 handling
- *
- * 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_Network
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
- * @author    Kenneth Shaw <ken@expitrans.com>
- * @author    David Soria Parra <dsp@php.net>
- * @copyright 2011-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2011-02-04
- */
+     * The network class for IPv4 and IPv6 handling
+     *
+     * 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_Network
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
+     * @author    Kenneth Shaw <ken@expitrans.com>
+     * @author    David Soria Parra <dsp@php.net>
+     * @copyright 2011-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2011-02-04
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Cache/Varnish.php

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) {

Indentation +57 added lines, -57 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * The PMF_Cache_Varnish class implements the varnish 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_Varnish
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2002-2016 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_Varnish class implements the varnish 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_Varnish
+     * @author    Anatoliy Belsky <ab@php.net>
+     * @copyright 2002-2016 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,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(".*");
+    }
 
 }

phpmyfaq/inc/PMF/Cache/Dummy.php

Indentation +12 added lines, -12 removed lines

@@ -3,18 +3,18 @@
 class PMF_Cache_Dummy extends PMF_Cache_Service
 {
 
-	public function __construct(array $config)
-	{
-		// pass
-	}
+    public function __construct(array $config)
+    {
+        // pass
+    }
 
-	public function clearArticle($id)
-	{
-		// pass
-	}
+    public function clearArticle($id)
+    {
+        // pass
+    }
 
-	public function clearAll()
-	{
-		// pass
-	}
+    public function clearAll()
+    {
+        // pass
+    }
 }

phpmyfaq/inc/PMF/Filesystem.php

Spacing +9 added lines, -9 removed lines

@@ -117,15 +117,15 @@ 
      */
     public function copy($source, $dest)
     {
-        if (! is_readable($source)) {
+        if (!is_readable($source)) {
             throw new PMF_Exception('/config/constants.php is not readable.');
         }
 
-        if (! is_writable(dirname($dest))) {
+        if (!is_writable(dirname($dest))) {
             throw new PMF_Exception(sprintf('%s is not writeable.', $dest));
         }
 
-        if (! copy($source, $dest)) {
+        if (!copy($source, $dest)) {
             $error = error_get_last();
             throw new PMF_Exception($error['message']);
         }
@@ -149,19 +149,19 @@ 
 
         $directoryName = substr($source, strrpos($source, '/') + 1);
 
-        $this->mkdir($dest . '/' . $directoryName, 0750, true);
+        $this->mkdir($dest.'/'.$directoryName, 0750, true);
 
         while ($file = readdir($directoryHandle))
         {
             if ('.' != $file && '..' != $file) {
 
-                if (! is_dir($source . '/' . $file)) {
+                if (!is_dir($source.'/'.$file)) {
                     $this->copy(
-                        $source . '/' . $file,
-                        $dest . '/' . $directoryName . '/' . $file
+                        $source.'/'.$file,
+                        $dest.'/'.$directoryName.'/'.$file
                     );
-                }  else {
-                    $this->recursiveCopy($source . '/' . $file, $dest . '/' . $directoryName);
+                } else {
+                    $this->recursiveCopy($source.'/'.$file, $dest.'/'.$directoryName);
                 }
             }
         }

Braces +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
                         $source . '/' . $file,
                         $dest . '/' . $directoryName . '/' . $file
                     );
-                }  else {
+                } else {
                     $this->recursiveCopy($source . '/' . $file, $dest . '/' . $directoryName);
                 }
             }

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Class for filesystem operations
- *
- * 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_Filesystem
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2012-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2012-04-02
- */
+     * Class for filesystem operations
+     *
+     * 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_Filesystem
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2012-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2012-04-02
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Mail.php

Spacing +21 added lines, -21 removed lines

@@ -240,7 +240,7 @@ 
         $this->headers     = array();
         $this->message     = '';
         $this->messageAlt  = '';
-        $this->messageId   = '<'.$_SERVER['REQUEST_TIME'] . '.'. md5(microtime()) . '@' . self::getServerName() . '>';
+        $this->messageId   = '<'.$_SERVER['REQUEST_TIME'].'.'.md5(microtime()).'@'.self::getServerName().'>';
         $this->priority    = 3; // 3 -> Normal
         $this->subject     = '';
 
@@ -249,7 +249,7 @@ 
         $this->_bcc        = array();
         $this->_cc         = array();
         $this->_from       = array();
-        $this->_mailer     = 'phpMyFAQ on PHP/' . PHP_VERSION;
+        $this->_mailer     = 'phpMyFAQ on PHP/'.PHP_VERSION;
         $this->_notifyTo   = array();
         $this->_replyTo    = array();
         $this->_returnPath = array();
@@ -257,7 +257,7 @@ 
         $this->_to         = array();
 
         // Set phpMyFAQ related data
-        $this->_mailer = 'phpMyFAQ/' . $this->_config->get('main.currentVersion');
+        $this->_mailer = 'phpMyFAQ/'.$this->_config->get('main.currentVersion');
         $this->setFrom($this->_config->get('main.administrationMail'));
     }
 
@@ -278,7 +278,7 @@ 
         // Sanity check
         if (!self::validateEmail($address)) {
             trigger_error(
-                "<strong>Mail Class</strong>: " . $address . " is not a valid e-mail address!",
+                "<strong>Mail Class</strong>: ".$address." is not a valid e-mail address!",
                 E_USER_ERROR
             );
             return false;
@@ -287,7 +287,7 @@ 
         // Don't allow duplicated addresses
         if (array_key_exists($address, $target)) {
             trigger_error(
-                "<strong>Mail Class</strong>: " . $address . " has been already added in '$targetAlias'!",
+                "<strong>Mail Class</strong>: ".$address." has been already added in '$targetAlias'!",
                 E_USER_WARNING
             );
             return false;
@@ -304,7 +304,7 @@ 
             
             // Wrap the displayed name in quotes (to fix problems with commas etc),
             // and escape any existing quotes
-            $name = '"' . str_replace('"', '\"', $name) . '"';
+            $name = '"'.str_replace('"', '\"', $name).'"';
         }
 
         // Add the e-mail address into the target array
@@ -432,7 +432,7 @@ 
 
         // Disposition-Notification-To, RFC 3798
         $notifyTos = array();
-        foreach($this->_notifyTo as $address => $name) {
+        foreach ($this->_notifyTo as $address => $name) {
             $notifyTos[] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
         $notifyTo = implode(',', $notifyTos);
@@ -442,17 +442,17 @@ 
 
         // From
         foreach ($this->_from as $address => $name) {
-            $this->headers['From'] = (empty($name) ? '' : $name.' ') . '<' . $address . '>';
+            $this->headers['From'] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
 
         // CC
         foreach ($this->_cc as $address => $name) {
-            $this->headers['CC'] = (empty($name) ? '' : $name.' ') . '<' . $address . '>';
+            $this->headers['CC'] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
 
         // BCC
         foreach ($this->_bcc as $address => $name) {
-            $this->headers['BCC'] = (empty($name) ? '' : $name.' ') . '<' . $address . '>';
+            $this->headers['BCC'] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
 
         // Message-Id
@@ -463,21 +463,21 @@ 
 
         // Reply-To
         $this->headers['Reply-To'] = $this->headers['From'];
-        foreach($this->_replyTo as $address => $name) {
+        foreach ($this->_replyTo as $address => $name) {
             $this->headers['Reply-To'] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
 
         // Return-Path
-        foreach($this->_from as $address => $name) {
+        foreach ($this->_from as $address => $name) {
             $this->headers['Return-Path'] = '<'.$address.'>';
         }
-        foreach($this->_returnPath as $address => $name) {
+        foreach ($this->_returnPath as $address => $name) {
             $this->headers['Return-Path'] = '<'.$address.'>';
         }
 
         // Sender
         $this->headers['Sender'] = $this->headers['From'];
-        foreach($this->_sender as $address => $name) {
+        foreach ($this->_sender as $address => $name) {
             $this->headers['Sender'] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
 
@@ -621,7 +621,7 @@ 
      */          
     public static function createBoundary()
     {
-        return '-----'  .md5(microtime());
+        return '-----'.md5(microtime());
     }
 
     /**
@@ -637,9 +637,9 @@ 
         // Assure that anything among CRLF, CR will be replaced with just LF
         $text = str_replace(
             array(
-                "\r\n",// CRLF
+                "\r\n", // CRLF
                 "\r", // CR
-                "\n",// LF
+                "\n", // LF
             ),
             "\n", // LF
             $text
@@ -764,7 +764,7 @@ 
 
         // Prepare the recipients
         $to = array();
-        foreach($this->_to as $address => $name) {
+        foreach ($this->_to as $address => $name) {
             $to[] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
         $recipients = implode(',', $to);
@@ -780,7 +780,7 @@ 
         $this->_createBody();
 
         // Send the email adopting to the given MUA
-        $mua  = self::getMUA($this->agent);
+        $mua = self::getMUA($this->agent);
         switch ($this->agent) {
             case 'built-in':
                 $sent = $mua->send($recipients, $this->headers, $this->body);
@@ -926,7 +926,7 @@ 
             return false;
         }
         
-        $unsafe = array ("\r", "\n");
+        $unsafe = array("\r", "\n");
         if ($address !== str_replace($unsafe, '', $address)) {
             return false;
         }
@@ -980,7 +980,7 @@ 
     public function safeEmail($email)
     {
         if ($this->_config->get('spam.enableSafeEmail')) {
-            return str_replace ( array ('@', '.' ), array ('_AT_', '_DOT_' ), $email );
+            return str_replace(array('@', '.'), array('_AT_', '_DOT_'), $email);
         } else {
             return $email;
         }

Indentation +18 added lines, -18 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * MUA (Mail User Agent) implementation.
- *
- * 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   Mail
- * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @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-09-11
- */
+     * MUA (Mail User Agent) implementation.
+     *
+     * 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   Mail
+     * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @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-09-11
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -932,7 +932,7 @@ 
         }
         
         if (false === filter_var($address, FILTER_VALIDATE_EMAIL)) {
-          return false;
+            return false;
         }
         
         return true;

phpmyfaq/inc/PMF/Search.php

Spacing +9 added lines, -9 removed lines

@@ -74,7 +74,7 @@ 
     public function __construct(PMF_Configuration $config)
     {
         $this->_config = $config;
-        $this->_table  = PMF_Db::getTablePrefix() . 'faqsearches';
+        $this->_table  = PMF_Db::getTablePrefix().'faqsearches';
     }
     
     /**
@@ -108,8 +108,8 @@ 
      */
     public function search($searchterm, $allLanguages = true)
     {
-        $fdTable   = PMF_Db::getTablePrefix() . 'faqdata AS fd';
-        $fcrTable  = PMF_Db::getTablePrefix() . 'faqcategoryrelations';
+        $fdTable   = PMF_Db::getTablePrefix().'faqdata AS fd';
+        $fcrTable  = PMF_Db::getTablePrefix().'faqcategoryrelations';
         $condition = array('fd.active' => "'yes'");
         $search    = PMF_Search_Factory::create($this->_config, array('database' => PMF_Db::getType()));
 
@@ -117,18 +117,18 @@ 
             if ($this->getCategory() instanceof PMF_Category) {
                 $children = $this->getCategory()->getChildNodes($this->getCategoryId());
                 $selectedCategory = array(
-                    $fcrTable . '.category_id' => array_merge((array)$this->getCategoryId(), $children)
+                    $fcrTable.'.category_id' => array_merge((array)$this->getCategoryId(), $children)
                 );
             } else {
                 $selectedCategory = array(
-                    $fcrTable . '.category_id' => $this->getCategoryId()
+                    $fcrTable.'.category_id' => $this->getCategoryId()
                 );
             }
             $condition = array_merge($selectedCategory, $condition);
         }
 
         if ((!$allLanguages) && (!is_numeric($searchterm))) {
-            $selectedLanguage = array('fd.lang' => "'" . $this->_config->getLanguage()->getLanguage() . "'");
+            $selectedLanguage = array('fd.lang' => "'".$this->_config->getLanguage()->getLanguage()."'");
             $condition        = array_merge($selectedLanguage, $condition);
         }
 
@@ -137,13 +137,13 @@ 
                 'fd.id AS id',
                 'fd.lang AS lang',
                 'fd.solution_id AS solution_id',
-                $fcrTable . '.category_id AS category_id',
+                $fcrTable.'.category_id AS category_id',
                 'fd.thema AS question',
                 'fd.content AS answer'))
             ->setJoinedTable($fcrTable)
             ->setJoinedColumns(array(
-                'fd.id = ' . $fcrTable . '.record_id',
-                'fd.lang = ' . $fcrTable . '.record_lang'
+                'fd.id = '.$fcrTable.'.record_id',
+                'fd.lang = '.$fcrTable.'.record_lang'
             ))
             ->setConditions($condition);
 

Indentation +18 added lines, -18 removed lines

@@ -1,23 +1,23 @@
 <?php
 /**
- * The phpMyFAQ Search 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   Search
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
- * @author    Adrianna Musiol <musiol@imageaccess.de>
- * @copyright 2008-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2008-01-26
- */
+     * The phpMyFAQ Search 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   Search
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
+     * @author    Adrianna Musiol <musiol@imageaccess.de>
+     * @copyright 2008-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2008-01-26
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/System.php

Spacing +11 added lines, -11 removed lines

@@ -156,8 +156,8 @@ 
     {
         $templates = array();
 
-        foreach (new DirectoryIterator(PMF_ROOT_DIR . '/assets/template') as $item) {
-            if (! $item->isDot() && $item->isDir()) {
+        foreach (new DirectoryIterator(PMF_ROOT_DIR.'/assets/template') as $item) {
+            if (!$item->isDot() && $item->isDir()) {
                 $templates[$item->getBasename()] = (PMF_Template::getTplSetName() == $item->getBasename() ? true : false);
             }
         }
@@ -244,7 +244,7 @@ 
     public function checkDatabase()
     {
         foreach ($this->_supportedDatabases as $extension => $database) {
-            if (extension_loaded ($extension)) {
+            if (extension_loaded($extension)) {
                 return true;
             }
         }
@@ -260,7 +260,7 @@ 
     public function checkRequiredExtensions()
     {
         foreach ($this->_requiredExtensions as $extension) {
-            if (!extension_loaded ( $extension)) {
+            if (!extension_loaded($extension)) {
                 $this->_missingExtensions[] = $extension;
             }
         }
@@ -308,7 +308,7 @@ 
      */
     public function checkphpMyFAQInstallation()
     {
-        if (is_file(PMF_ROOT_DIR . '/inc/data.php') || is_file(PMF_ROOT_DIR . '/config/database.php')) {
+        if (is_file(PMF_ROOT_DIR.'/inc/data.php') || is_file(PMF_ROOT_DIR.'/config/database.php')) {
             return false;
         } else {
             return true;
@@ -368,7 +368,7 @@ 
             foreach ($files as $file) {
 
             if ('php' === pathinfo($file->getFilename(), PATHINFO_EXTENSION) &&
-                ! preg_match('#/tests/#', $file->getPath())
+                !preg_match('#/tests/#', $file->getPath())
             ) {
                 $current = str_replace($path, '', $file->getPathname());
 
@@ -380,7 +380,7 @@ 
             }
 
         } catch (UnexpectedValueException $e) {
-            $hashes[$current . ' failed'] = $e->getMessage();
+            $hashes[$current.' failed'] = $e->getMessage();
         }
 
         return json_encode($hashes);
@@ -410,12 +410,12 @@ 
     public function cleanInstallation()
     {
         // Remove './config/database.php' file: no need of prompt anything to the user
-        if (file_exists(PMF_ROOT_DIR . '/config/database.php')) {
-            @unlink(PMF_ROOT_DIR . '/config/database.php');
+        if (file_exists(PMF_ROOT_DIR.'/config/database.php')) {
+            @unlink(PMF_ROOT_DIR.'/config/database.php');
         }
         // Remove './config/ldap.php' file: no need of prompt anything to the user
-        if (file_exists(PMF_ROOT_DIR . '/config/ldap.php')) {
-            @unlink(PMF_ROOT_DIR . '/config/ldap.php');
+        if (file_exists(PMF_ROOT_DIR.'/config/ldap.php')) {
+            @unlink(PMF_ROOT_DIR.'/config/ldap.php');
         }
     }
 

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Class for checking system requirements
- *
- * 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_System
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @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-01-13
- */
+     * Class for checking system requirements
+     *
+     * 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_System
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @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-01-13
+     */
 
 /**
  * PMF_System