thorsten / phpMyFAQ

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

phpmyfaq/inc/PMF/Logging.php

Indentation +4 added lines, -4 removed lines

@@ -92,10 +92,10 @@
         $result = $this->_config->getDb()->query($query);
         while ($row = $this->_config->getDb()->fetchObject($result)) {
             $data[$row->id] = array(
-               'time'  => $row->time,
-               'usr'   => $row->usr,
-               'text'  => $row->text,
-               'ip'    => $row->ip
+                'time'  => $row->time,
+                'usr'   => $row->usr,
+                'text'  => $row->text,
+                'ip'    => $row->ip
             );
         }
 

Spacing +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
             WHERE
                 time < %d",
             PMF_Db::getTablePrefix(),
-            $_SERVER['REQUEST_TIME'] - 30 * 86400
+            $_SERVER['REQUEST_TIME'] - 30*86400
         );
 
         if ($this->_config->getDb()->query($query)) {

phpmyfaq/inc/PMF/Tags.php

Indentation +1 added lines, -1 removed lines

@@ -210,7 +210,7 @@
             $tagName = trim($tagName);
             if (PMF_String::strlen($tagName) > 0) {
                 if (!in_array(PMF_String::strtolower($tagName),
-                              array_map(array('PMF_String', 'strtolower'), $currentTags))) {
+                                array_map(array('PMF_String', 'strtolower'), $currentTags))) {
                     // Create the new tag
                     $newTagId = $this->_config->getDb()->nextId(PMF_Db::getTablePrefix().'faqtags', 'tagging_id');
                     $query    = sprintf("

Doc Comments +1 added lines, -1 removed lines

@@ -703,7 +703,7 @@
     }
 
     /**
-     * @param $chr
+     * @param string $chr
      *
      * @return bool
      */

Spacing +2 added lines, -2 removed lines

@@ -444,7 +444,7 @@ 
             $i++;
             if ($max - $min > 0) {
                 $CSSRelevanceLevel =
-                    (int)($CSSRelevanceMinLevel + $CSSRelevanceMaxLevel * ($tag['count'] - $min) / ($max - $min));
+                    (int)($CSSRelevanceMinLevel + $CSSRelevanceMaxLevel*($tag['count'] - $min)/($max - $min));
             }
             $class = 'relevance'.$CSSRelevanceLevel;
             $html .= '<span class="'.$class.'">';
@@ -612,7 +612,7 @@ 
         foreach ($this->getPopularTags($limit) as $tagId => $tagFreq) {
             $tagName   = $this->getTagNameById($tagId);
             $direction = $this->is_english($tagName[0]) ? 'ltr' : 'rtl';
-            $html      .= sprintf(
+            $html .= sprintf(
                 '<a class="btn tag" style="direction:%s;" href="?action=search&amp;tagging_id=%d">%s (%d)</a>',
                 $direction,
                 $tagId,

Braces +9 added lines, -6 removed lines

@@ -595,8 +595,9 @@ 
         if ($result) {
             while ($row = $this->_config->getDb()->fetchObject($result)) {
                 $tags[$row->tagging_id] = $row->freq;
-                if (--$limit === 0)
-                    break;
+                if (--$limit === 0) {
+                                    break;
+                }
             }
         }
         return $tags;
@@ -632,10 +633,12 @@ 
      */
     public function is_english($chr)
     {
-        if (($chr >= 'A') && ($chr <= 'Z'))
-                return true;
-        if (($chr >= 'a') && ($chr <= 'z'))
-                return true;
+        if (($chr >= 'A') && ($chr <= 'Z')) {
+                        return true;
+        }
+        if (($chr >= 'a') && ($chr <= 'z')) {
+                        return true;
+        }
         return false;
     }
 }

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/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 +7 added lines, -7 removed lines

@@ -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&newsid=%d&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)) {

phpmyfaq/inc/PMF/String.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
         if (!self::$instance) {
             if (extension_loaded('mbstring') && function_exists('mb_regex_encoding')) {
                 self::$instance = PMF_String_Mbstring::getInstance($language);
-            } elseif(self::isLangUTF8ToLatinConvertable($language)) {
+            } elseif (self::isLangUTF8ToLatinConvertable($language)) {
                 self::$instance = PMF_String_UTF8ToLatinConvertable::getInstance($language);
             } else {
                 self::$instance = PMF_String_Basic::getInstance($language);
@@ -306,7 +306,7 @@ 
      *
      * @return array|string
      */
-    public static function preg_replace_callback($pattern, $callback, $subject, $limit= -1, &$count = 0)
+    public static function preg_replace_callback($pattern, $callback, $subject, $limit = -1, &$count = 0)
     {
         return self::$instance->preg_replace_callback($pattern, $callback, $subject, $limit, $count);
     }
@@ -323,7 +323,7 @@ 
      *
      * @return array|string|null
      */
-    public static function preg_replace($pattern, $replacement, $subject, $limit= -1, &$count = 0)
+    public static function preg_replace($pattern, $replacement, $subject, $limit = -1, &$count = 0)
     {
         return self::$instance->preg_replace($pattern, $replacement, $subject, $limit, $count);
     }

Indentation +21 added lines, -21 removed lines

@@ -184,18 +184,18 @@ 
     
     
     /**
-	 * Check if a language could be converted to iso-8859-1
-	 *
-	 * @param string $language
-	 *
-	 * @return boolean
+     * Check if a language could be converted to iso-8859-1
+     *
+     * @param string $language
+     *
+     * @return boolean
      */
     public static function isLangUTF8ToLatinConvertable($language)
     {
         $iso_languages = array('af', 'sq', 'br', 'ca', 'da', 'en', 'fo', 'gl', 'de', 'is', 'it',
-                               'ku', 'la', 'lb', 'nb', 'oc', 'pt', 'es', 'sw', 'sv', 'wa', 'eu',
-                               // NOTE this languages are not fully supported by latin1 
-                               'nl', 'fr', 'et', 'fi', 'cy'
+                                'ku', 'la', 'lb', 'nb', 'oc', 'pt', 'es', 'sw', 'sv', 'wa', 'eu',
+                                // NOTE this languages are not fully supported by latin1 
+                                'nl', 'fr', 'et', 'fi', 'cy'
         );
         
         return in_array($language, $iso_languages);
@@ -203,12 +203,12 @@ 
     
     
     /**
-	 * Get last occurence of a string within another
-	 *
-	 * @param string $haystack
-	 * @param string $needle
-	 *
-	 * @return string
+     * Get last occurence of a string within another
+     *
+     * @param string $haystack
+     * @param string $needle
+     *
+     * @return string
      */
     public static function strrchr($haystack, $needle)
     {
@@ -231,13 +231,13 @@ 
     
     
     /**
-	 * Find position of last occurrence of a char in a string
-	 *
-	 * @param string $haystack
-	 * @param string $needle
-	 * @param int $offset
-	 *
-	 * @return int
+     * Find position of last occurrence of a char in a string
+     *
+     * @param string $haystack
+     * @param string $needle
+     * @param int $offset
+     *
+     * @return int
      */
     public static function strrpos($haystack, $needle, $offset = 0)
     {

Doc Comments +2 added lines, -3 removed lines

@@ -104,7 +104,6 @@ 
     /**
      * Get a part of string
      *
-     * @param string  $str    String
      * @param integer $start  Start
      * @param integer $length Length
      *
@@ -121,7 +120,7 @@ 
      *
      * @param string $haystack Haystack
      * @param string $needle   Needle
-     * @param string $offset   Offset
+     * @param integer $offset   Offset
      *
      * @return int
      */
@@ -298,7 +297,7 @@ 
     /**
      * Search and replace by a regexp using a callback
      *
-     * @param string|array $pattern
+     * @param string $pattern
      * @param function $callback
      * @param string|array $subject
      * @param int $limit

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