thorsten / phpMyFAQ

phpmyfaq/inc/Bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -151,7 +151,7 @@ 
 // We always need a valid session!
 //
 ini_set('session.use_only_cookies', 1); // Avoid any PHP version to move sessions on URLs
-ini_set('session.auto_start', 0);       // Prevent error to use session_start() if it's active in php.ini
+ini_set('session.auto_start', 0); // Prevent error to use session_start() if it's active in php.ini
 ini_set('session.use_trans_sid', 0);
 ini_set('url_rewriter.tags', '');
 
@@ -184,7 +184,7 @@ 
     $tmp = dirname(__DIR__).DIRECTORY_SEPARATOR.$confAttachmentsPath;
 
     // Check that nobody is traversing
-    if (0 === strpos((string) $tmp, dirname(__DIR__))) {
+    if (0 === strpos((string)$tmp, dirname(__DIR__))) {
         define('PMF_ATTACHMENTS_DIR', $tmp);
     } else {
         define('PMF_ATTACHMENTS_DIR', false);

phpmyfaq/inc/PMF/Attachment/File.php

Spacing +2 added lines, -2 removed lines

@@ -47,10 +47,10 @@
         $subDirNameLength = 5;
 
         for ($i = 0; $i < $subDirCount; ++$i) {
-            $retval .= DIRECTORY_SEPARATOR.substr($fsHash, $i * $subDirNameLength, $subDirNameLength);
+            $retval .= DIRECTORY_SEPARATOR.substr($fsHash, $i*$subDirNameLength, $subDirNameLength);
         }
 
-        $retval .= DIRECTORY_SEPARATOR.substr($fsHash, $i * $subDirNameLength);
+        $retval .= DIRECTORY_SEPARATOR.substr($fsHash, $i*$subDirNameLength);
 
         return $retval;
     }

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

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
          * If the target is a string or vanilla object, just move
          * it the simplest way we can. 
          */
-            $retval = $this->copyToSimple((string) $target);
+            $retval = $this->copyToSimple((string)$target);
         } else {
             $target->setMode(self::MODE_WRITE);
             while (!$this->eof()) {

phpmyfaq/inc/PMF/Auth.php

Spacing +2 added lines, -2 removed lines

@@ -129,7 +129,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";
@@ -189,7 +189,7 @@ 
         }
 
         $oldreadOnly = $this->readOnly;
-        $this->readOnly = (bool) $readOnly;
+        $this->readOnly = (bool)$readOnly;
 
         return $oldreadOnly;
     }

phpmyfaq/inc/PMF/Captcha.php

Indentation +2 added lines, -2 removed lines

@@ -479,8 +479,8 @@
                %sfaqcaptcha 
            WHERE 
                id = '%s'",
-           PMF_Db::getTablePrefix(),
-           $this->code
+            PMF_Db::getTablePrefix(),
+            $this->code
         );
 
         $result = $this->_config->getDb()->query($select);

Spacing +12 added lines, -12 removed lines

@@ -209,7 +209,7 @@ 
         $this->drawText();
         if (function_exists('imagejpeg')) {
             header('Content-Type: image/jpeg');
-            imagejpeg($this->img, null, (int) $this->quality);
+            imagejpeg($this->img, null, (int)$this->quality);
         } elseif (function_exists('imagegif')) {
             header('Content-Type: image/gif');
             imagegif($this->img);
@@ -317,7 +317,7 @@ 
         $w1 = 0;
         $w2 = 0;
 
-        for ($x = 0; $x < $this->width; $x += (int) $nextline) {
+        for ($x = 0; $x < $this->width; $x += (int)$nextline) {
             if ($x < $this->width) {
                 imageline($this->img, $x + $w1, 0, $x + $w2, $this->height - 1, rand($color1, $color2));
             }
@@ -348,18 +348,18 @@ 
     {
         $len = PMF_String::strlen($this->code);
         $w1 = 15;
-        $w2 = $this->width / ($len + 1);
+        $w2 = $this->width/($len + 1);
 
         for ($p = 0; $p < $len; ++$p) {
             $letter = $this->code[$p];
             if (count($this->fonts) > 0) {
                 $font = $this->fonts[rand(0, count($this->fonts) - 1)];
             }
-            $size = rand(20, $this->height / 2.2);
+            $size = rand(20, $this->height/2.2);
             $rotation = rand(-23, 23);
             $y = rand($size + 3, $this->height - 5);
             // $w1 += rand(- $this->width / 90, $this->width / 40 );
-            $x = $w1 + $w2 * $p;
+            $x = $w1 + $w2*$p;
             $c1 = []; // fore char color
             $c2 = []; // back char color
             do {
@@ -373,28 +373,28 @@ 
             } while ($c1['b'] == $this->_backgroundColor['b']);
             $c1 = imagecolorallocate($this->img, $c1['r'], $c1['g'], $c1['b']);
             do {
-                $c2['r'] = ($c1['r'] < 100 ? $c1['r'] * 2 : mt_rand(30, 199));
+                $c2['r'] = ($c1['r'] < 100 ? $c1['r']*2 : mt_rand(30, 199));
             } while (($c2['r'] == $this->_backgroundColor['r']) && ($c2['r'] == $c1['r']));
             do {
-                $c2['g'] = ($c1['g'] < 100 ? $c1['g'] * 2 : mt_rand(30, 199));
+                $c2['g'] = ($c1['g'] < 100 ? $c1['g']*2 : mt_rand(30, 199));
             } while (($c2['g'] == $this->_backgroundColor['g']) && ($c2['g'] == $c1['g']));
             do {
-                $c2['b'] = ($c1['b'] < 100 ? $c1['b'] * 2 : mt_rand(30, 199));
+                $c2['b'] = ($c1['b'] < 100 ? $c1['b']*2 : mt_rand(30, 199));
             } while (($c2['b'] == $this->_backgroundColor['b']) && ($c2['b'] == $c1['b']));
             $c2 = imagecolorallocate($this->img, $c2['r'], $c2['g'], $c2['b']);
             // Add the letter
             if (function_exists('imagettftext') && (count($this->fonts) > 0)) {
-                imagettftext($this->img, $size, $rotation, $x + 2, $y,     $c2, $font, $letter);
+                imagettftext($this->img, $size, $rotation, $x + 2, $y, $c2, $font, $letter);
                 imagettftext($this->img, $size, $rotation, $x + 1, $y + 1, $c2, $font, $letter);
-                imagettftext($this->img, $size, $rotation, $x,     $y - 2,   $c1, $font, $letter);
+                imagettftext($this->img, $size, $rotation, $x, $y - 2, $c1, $font, $letter);
             } else {
                 $size = 5;
                 $c3 = imagecolorallocate($this->img, 0, 0, 255);
                 $x = 20;
                 $y = 12;
                 $s = 30;
-                imagestring($this->img, $size, $x + 1 + ($s * $p), $y + 1, $letter, $c3);
-                imagestring($this->img, $size, $x + ($s * $p),     $y,   $letter, $c1);
+                imagestring($this->img, $size, $x + 1 + ($s*$p), $y + 1, $letter, $c3);
+                imagestring($this->img, $size, $x + ($s*$p), $y, $letter, $c1);
             }
         }
 

phpmyfaq/inc/PMF/Category.php

Indentation +5 added lines, -5 removed lines

@@ -1353,9 +1353,9 @@ 
                    id = %d
                AND
                    lang = '%s'",
-               PMF_Db::getTablePrefix(),
-               $category_id,
-               $language);
+                PMF_Db::getTablePrefix(),
+                $category_id,
+                $language);
             $result = $this->_config->getDb()->query($query);
             if ($row = $this->_config->getDb()->fetchArray($result)) {
                 $translated[$languageCodes[strtoupper($language)]] = $row['name'].('' == $row['description'] ? '' : '  ('.$row['description'].')');
@@ -1614,8 +1614,8 @@ 
                 fd.lang = fcr.category_lang
             ORDER BY
                 fcr.category_id, fd.id',
-             PMF_Db::getTablePrefix(),
-             PMF_Db::getTablePrefix());
+                PMF_Db::getTablePrefix(),
+                PMF_Db::getTablePrefix());
         $result = $this->_config->getDb()->query($query);
 
         if ($this->_config->getDb()->numRows($result) > 0) {

Spacing +9 added lines, -9 removed lines

@@ -246,10 +246,10 @@ 
         if ($result) {
             while ($row = $this->_config->getDb()->fetchArray($result)) {
                 $this->categoryName[$row['id']] = $row;
-                $this->categories[] =& $this->categoryName[$row['id']];
-                $this->children[$row['parent_id']][$row['id']] =& $this->categoryName[$row['id']];
-                $this->owner[$row['id']] =& $row['user_id'];
-                $this->moderators[$row['id']] =& $row['group_id'];
+                $this->categories[] = & $this->categoryName[$row['id']];
+                $this->children[$row['parent_id']][$row['id']] = & $this->categoryName[$row['id']];
+                $this->owner[$row['id']] = & $row['user_id'];
+                $this->moderators[$row['id']] = & $row['group_id'];
             }
         }
 
@@ -356,7 +356,7 @@ 
         $result = $this->_config->getDb()->query($query);
 
         while ($row = $this->_config->getDb()->fetchArray($result)) {
-            $categories[] = (int) $row['id'];
+            $categories[] = (int)$row['id'];
         }
 
         return $categories;
@@ -676,7 +676,7 @@ 
         $open = 0;
         $this->expandAll();
 
-        for ($y = 0;$y < $this->height(); $y = $this->getNextLineTree($y)) {
+        for ($y = 0; $y < $this->height(); $y = $this->getNextLineTree($y)) {
             list($hasChild, $categoryName, $parent, $description) = $this->getLineDisplay($y);
             $level = $this->treeTab[$y]['level'];
             $levelDiff = $open - $level;
@@ -951,7 +951,7 @@ 
         while ($row = $this->_config->getDb()->fetchObject($result)) {
             $categories[$row->category_id] = array(
                 'category_id' => $row->category_id,
-                'category_lang' => $row->category_lang, );
+                'category_lang' => $row->category_lang,);
         }
 
         return $categories;
@@ -1254,7 +1254,7 @@ 
             array('faqcategories' => 'parent_id'),
             array('faqcategoryrelations' => 'category_id'),
             array('faqcategory_group' => 'category_id'),
-            array('faqcategory_user' => 'category_id'), );
+            array('faqcategory_user' => 'category_id'),);
 
         $result = true;
         foreach ($tables as $pair) {
@@ -1448,7 +1448,7 @@ 
                 if ($lang == $selected_lang) {
                     $output .= ' selected="selected"';
                 }
-                $output .=  '>'.$langname."</option>\n";
+                $output .= '>'.$langname."</option>\n";
             }
         }
 

phpmyfaq/inc/PMF/DB/Mysqli.php

Indentation +2 added lines, -2 removed lines

@@ -248,8 +248,8 @@
                MAX(%s) AS current_id
            FROM
                %s',
-           $id,
-           $table);
+            $id,
+            $table);
 
         $result = $this->query($select);
 

phpmyfaq/inc/PMF/DB/Sqlsrv.php

Indentation +6 added lines, -6 removed lines

@@ -102,10 +102,10 @@ 
     private function setConnectionOptions($user, $passwd, $database)
     {
         $this->connectionOptions = array(
-           'UID' => $user,
-           'PWD' => $passwd,
-           'Database' => $database,
-           'CharacterSet' => 'UTF-8', );
+            'UID' => $user,
+            'PWD' => $passwd,
+            'Database' => $database,
+            'CharacterSet' => 'UTF-8', );
     }
 
     /**
@@ -262,8 +262,8 @@ 
                max(%s) as current_id
            FROM 
                %s',
-           $id,
-           $table);
+            $id,
+            $table);
 
         $result = $this->query($select);
         sqlsrv_fetch($result);

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
            'UID' => $user,
            'PWD' => $passwd,
            'Database' => $database,
-           'CharacterSet' => 'UTF-8', );
+           'CharacterSet' => 'UTF-8',);
     }
 
     /**

phpmyfaq/inc/PMF/Enc.php

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,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) {