thorsten / phpMyFAQ

phpmyfaq/admin/category.translate.php

Braces +5 added lines, -2 removed lines

@@ -62,9 +62,12 @@
                     <input type="hidden" name="showcat" value="<?php echo $showcat ?>">
                     <?php if ($faqConfig->get('security.permLevel') !== 'basic'): ?>
                     <input type="hidden" name="restricted_groups[]" value="<?php echo $group_permission[0] ?>">
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                     <input type="hidden" name="restricted_groups[]" value="-1">
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
                     <input type="hidden" name="restricted_users" value="<?php echo $user_permission[0] ?>">
                     <input type="hidden" name="csrf" value="<?php echo $user->getCsrfTokenFromSession() ?>">
                     <input type="hidden" name="active" value="<?php echo $category->categoryName[$id]['active'] ?>">

phpmyfaq/inc/PMF/Comment.php

Spacing +1 added lines, -1 removed lines

@@ -295,7 +295,7 @@
         $result = $this->config->getDb()->query($query);
         if ($this->config->getDb()->numRows($result) > 0) {
             while ($row = $this->config->getDb()->fetchObject($result)) {
-                $num[$row->id] = (int) $row->num_comments;
+                $num[$row->id] = (int)$row->num_comments;
             }
         }
 

phpmyfaq/admin/record.show.php

Spacing +4 added lines, -4 removed lines

@@ -210,11 +210,11 @@ 
                     $fdTable.'.active AS active',
                     $fdTable.'.thema AS thema',
                     $fdTable.'.content AS content',
-                    $fdTable.'.updated AS updated', ))
+                    $fdTable.'.updated AS updated',))
             ->setJoinedTable($fcrTable)
             ->setJoinedColumns(array(
                     $fdTable.'.id = '.$fcrTable.'.record_id',
-                    $fdTable.'.lang = '.$fcrTable.'.record_lang', ));
+                    $fdTable.'.lang = '.$fcrTable.'.record_lang',));
 
         if (is_numeric($searchTerm)) {
             $search->setMatchingColumns(array($fdTable.'.solution_id'));
@@ -230,7 +230,7 @@ 
         $faqsFound = [];
 
         while ($row = $faqConfig->getDb()->fetchObject($result)) {
-            if ($searchCat != 0 && $searchCat != (int) $row->category_id) {
+            if ($searchCat != 0 && $searchCat != (int)$row->category_id) {
                 continue;
             }
 
@@ -405,7 +405,7 @@ 
                                             <input type="checkbox" lang="<?php echo $record['lang'] ?>"
                                                onclick="saveStatus(<?php echo $cid.', ['.$record['id'].']' ?>, 'sticky', '<?php echo $user->getCsrfTokenFromSession() ?>');"
                                                id="sticky_record_<?php echo $cid.'_'.$record['id'] ?>"
-                                            <?php echo($record['sticky'] ? 'checked' :  '    ') ?>>
+                                            <?php echo($record['sticky'] ? 'checked' : '    ') ?>>
                                         </label>
                                     </td>
                                     <td>

phpmyfaq/inc/PMF/Date.php

Indentation -1 removed lines

@@ -15,7 +15,6 @@
  * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
  * @copyright 2009-2018 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- 
  * @link      https://www.phpmyfaq.de
  * @since     2009-09-24
  */

phpmyfaq/admin/ajax.image.php

Switch Indentation +40 added lines, -40 removed lines

@@ -36,47 +36,47 @@ 
 }
 switch ($ajaxAction) {
 
-    case 'upload':
+        case 'upload':
 
-        $uploadDir = PMF_ROOT_DIR . '/images/';
-        $uploadFile = basename($_FILES['upload']['name']);
-        $isUploaded = false;
-        $height = $width = 0;
-        $validFileExtensions = [ 'gif', 'jpg', 'jpeg', 'png' ];
+            $uploadDir = PMF_ROOT_DIR . '/images/';
+            $uploadFile = basename($_FILES['upload']['name']);
+            $isUploaded = false;
+            $height = $width = 0;
+            $validFileExtensions = [ 'gif', 'jpg', 'jpeg', 'png' ];
 
-        if ($csrfOkay) {
-            if (is_uploaded_file($uploadedFile['tmp_name']) &&
-                $uploadedFile['size'] < $faqConfig->get('records.maxAttachmentSize')
-            ) {
+            if ($csrfOkay) {
+                if (is_uploaded_file($uploadedFile['tmp_name']) &&
+                    $uploadedFile['size'] < $faqConfig->get('records.maxAttachmentSize')
+                ) {
 
-                $fileInfo = getimagesize($uploadedFile['tmp_name']);
-                $fileExtension = strtolower(pathinfo($uploadFile, PATHINFO_EXTENSION));
+                    $fileInfo = getimagesize($uploadedFile['tmp_name']);
+                    $fileExtension = strtolower(pathinfo($uploadFile, PATHINFO_EXTENSION));
 
-                if (false === $fileInfo) {
-                    $isUploaded = false;
-                }
-
-                if (($fileInfo[2] !== IMAGETYPE_GIF) &&
-                    ($fileInfo[2] !== IMAGETYPE_JPEG) &&
-                    ($fileInfo[2] !== IMAGETYPE_PNG)) {
-                    $isUploaded = false;
-                } else {
-                    $isUploaded = true;
-                }
-
-                if (!in_array($fileExtension, $validFileExtensions)) {
-                    $isUploaded = false;
-                }
+                    if (false === $fileInfo) {
+                        $isUploaded = false;
+                    }
 
-                if ($fileInfo && $isUploaded) {
-                    list($width, $height) = $fileInfo;
-                    if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) {
-                        $isUploaded = true;
+                    if (($fileInfo[2] !== IMAGETYPE_GIF) &&
+                        ($fileInfo[2] !== IMAGETYPE_JPEG) &&
+                        ($fileInfo[2] !== IMAGETYPE_PNG)) {
+                        $isUploaded = false;
                     } else {
+                        $isUploaded = true;
+                    }
+
+                    if (!in_array($fileExtension, $validFileExtensions)) {
                         $isUploaded = false;
                     }
-                }
-                ?>
+
+                    if ($fileInfo && $isUploaded) {
+                        list($width, $height) = $fileInfo;
+                        if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) {
+                            $isUploaded = true;
+                        } else {
+                            $isUploaded = false;
+                        }
+                    }
+                    ?>
                 <script>
                     window.parent.window.pmfImageUpload.uploadFinished({
                         filename: '<?php echo $faqConfig->getDefaultUrl() . 'images/' . $uploadFile ?>',
@@ -87,8 +87,8 @@ 
                     });
                 </script>
                 <?php
-            } else {
-                ?>
+                } else {
+                    ?>
                 <script>
                     window.parent.window.pmfImageUpload.uploadFinished({
                         filename: '',
@@ -99,9 +99,9 @@ 
                     });
                 </script>
                 <?php
-            }
-        } else {
-            ?>
+                }
+            } else {
+                ?>
             <script>
                 window.parent.window.pmfImageUpload.uploadFinished({
                     filename: '',
@@ -112,7 +112,7 @@ 
                 });
             </script>
             <?php
-        }
+            }
 
-        break;
+            break;
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -38,11 +38,11 @@ 
 
     case 'upload':
 
-        $uploadDir = PMF_ROOT_DIR . '/images/';
+        $uploadDir = PMF_ROOT_DIR.'/images/';
         $uploadFile = basename($_FILES['upload']['name']);
         $isUploaded = false;
         $height = $width = 0;
-        $validFileExtensions = [ 'gif', 'jpg', 'jpeg', 'png' ];
+        $validFileExtensions = ['gif', 'jpg', 'jpeg', 'png'];
 
         if ($csrfOkay) {
             if (is_uploaded_file($uploadedFile['tmp_name']) &&
@@ -70,7 +70,7 @@ 
 
                 if ($fileInfo && $isUploaded) {
                     list($width, $height) = $fileInfo;
-                    if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) {
+                    if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir.$uploadFile)) {
                         $isUploaded = true;
                     } else {
                         $isUploaded = false;
@@ -79,7 +79,7 @@ 
                 ?>
                 <script>
                     window.parent.window.pmfImageUpload.uploadFinished({
-                        filename: '<?php echo $faqConfig->getDefaultUrl() . 'images/' . $uploadFile ?>',
+                        filename: '<?php echo $faqConfig->getDefaultUrl().'images/'.$uploadFile ?>',
                         result: '<?php echo $isUploaded ? 'file_uploaded' : 'error' ?>',
                         resultCode: '<?php echo $isUploaded ? 'success' : 'failed' ?>',
                         height: <?php echo $height ?>,

phpmyfaq/inc/PMF/Search/Resultset.php

Spacing +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
             if ('medium' === $this->_config->get('security.permLevel')) {
                 $groupPermissions = $this->faq->getPermission('group', $result->id);
                 if (is_array($groupPermissions)) {
-                    foreach($groupPermissions as $groupPermission) {
+                    foreach ($groupPermissions as $groupPermission) {
                         if (in_array($groupPermission, $currentGroupIds)) {
                             $permission = true;
                         }
@@ -222,6 +222,6 @@ 
             $score += $object->relevance_keywords;
         }
 
-        return round($score / 3 * 100);
+        return round($score/3*100);
     }
 }

phpmyfaq/inc/PMF/Report.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
             }
         }
 
-        $toBeRemoved = [ '=', '+', '-', 'HYPERLINK'];
+        $toBeRemoved = ['=', '+', '-', 'HYPERLINK'];
         $outputString = str_replace($toBeRemoved, '', $outputString);
 
         return $outputString;

phpmyfaq/inc/PMF/Utils.php

Doc Comments +6 added lines, -6 removed lines

@@ -125,7 +125,7 @@ 
      *
      * @param string $lang Language
      *
-     * @return bool
+     * @return integer
      */
     public static function isLanguage($lang)
     {
@@ -137,7 +137,7 @@ 
      *
      * @param int $date Date
      *
-     * @return int
+     * @return boolean
      */
     public static function isLikeOnPMFDate($date)
     {
@@ -346,7 +346,7 @@ 
     /**
      * debug_backtrace() wrapper function.
      *
-     * @param $string
+     * @param string $string
      *
      * @return string
      */
@@ -407,7 +407,7 @@ 
 
     /**
      * Creates a seed with microseconds.
-     * @return float|int
+     * @return integer|null
      */
     private static function makeSeed()
     {
@@ -417,8 +417,8 @@ 
 
     /**
      * Returns a random number.
-     * @param $min
-     * @param $max
+     * @param integer $min
+     * @param integer $max
      * @return int
      */
     public static function createRandomNumber($min, $max)

Spacing +1 added lines, -1 removed lines

@@ -412,7 +412,7 @@
     private static function makeSeed()
     {
         list($usec, $sec) = explode(' ', microtime());
-        return $sec + $usec * 1000000;
+        return $sec + $usec*1000000;
     }
 
     /**

phpmyfaq/inc/PMF/User.php

Spacing +17 added lines, -19 removed lines

@@ -243,7 +243,7 @@ 
     public function getUserId()
     {
         if (isset($this->userId) && is_int($this->userId)) {
-            return (int) $this->userId;
+            return (int)$this->userId;
         }
         $this->userId = -1;
         $this->errors[] = self::ERROR_USER_NO_USERID;
@@ -272,7 +272,7 @@ 
             WHERE
                 user_id = %d '.($allowBlockedUsers ? '' : "AND account_status != 'blocked'"),
             PMF_Db::getTablePrefix(),
-            (int) $userId
+            (int)$userId
         );
 
         $res = $this->config->getDb()->query($select);
@@ -282,9 +282,9 @@ 
             return false;
         }
         $user = $this->config->getDb()->fetchArray($res);
-        $this->userId = (int) $user['user_id'];
-        $this->login = (string) $user['login'];
-        $this->status = (string) $user['account_status'];
+        $this->userId = (int)$user['user_id'];
+        $this->login = (string)$user['login'];
+        $this->status = (string)$user['account_status'];
 
         // get encrypted password
         // @todo: Add a getEncPassword method to the Auth* classes for the (local and remote) Auth Sources.
@@ -349,9 +349,9 @@ 
             return false;
         }
         $user = $this->config->getDb()->fetchArray($res);
-        $this->userId = (int) $user['user_id'];
-        $this->login = (string) $user['login'];
-        $this->status = (string) $user['account_status'];
+        $this->userId = (int)$user['user_id'];
+        $this->login = (string)$user['login'];
+        $this->status = (string)$user['account_status'];
 
         // get user-data
         if (!$this->userdata instanceof PMF_User_UserData) {
@@ -398,9 +398,9 @@ 
             return false;
         }
 
-        $this->userId = (int) $user['user_id'];
-        $this->login = (string) $user['login'];
-        $this->status = (string) $user['account_status'];
+        $this->userId = (int)$user['user_id'];
+        $this->login = (string)$user['login'];
+        $this->status = (string)$user['account_status'];
 
         // get user-data
         if (!$this->userdata instanceof PMF_User_UserData) {
@@ -504,7 +504,7 @@ 
         }
 
         // is $login valid?
-        $login = (string) $login;
+        $login = (string)$login;
         if (!$this->isValidLogin($login)) {
             $this->errors[] = self::ERROR_USER_LOGINNAME_TOO_SHORT;
 
@@ -520,7 +520,7 @@ 
 
         // set user-ID
         if (0 == $userId) {
-            $this->userId = (int) $this->config->getDb()->nextId(PMF_Db::getTablePrefix().'faquser', 'user_id');
+            $this->userId = (int)$this->config->getDb()->nextId(PMF_Db::getTablePrefix().'faquser', 'user_id');
         } else {
             $this->userId = $userId;
         }
@@ -776,7 +776,7 @@ 
      */
     public function isValidLogin($login)
     {
-        $login = (string) $login;
+        $login = (string)$login;
 
         if (strlen($login) < $this->loginMinLength || !preg_match($this->validUsername, $login)) {
             $this->errors[] = self::ERROR_USER_LOGIN_INVALID;
@@ -1058,8 +1058,8 @@ 
         // To make passwords harder to get wrong, a few letters & numbers have been omitted.
         // This will ensure safety with browsers using fonts with confusable letters.
         // Removed: o,O,0,1,l,L
-        $consonants = ['b','c','d','f','g','h','j','k','m','n','p','r','s','t','v','w','x','y','z'];
-        $vowels = ['a','e','i','u'];
+        $consonants = ['b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z'];
+        $vowels = ['a', 'e', 'i', 'u'];
         $newPassword = '';
         $skipped = false;
 
@@ -1071,9 +1071,7 @@ 
             }
 
             switch (rand(0, $skipped ? 3 : ($allowUnderscore ? 5 : 4))) {
-                case 0:
-                case 1:
-                    $nextChar = $caseFunc($consonants[rand(0, 18)]);
+                case 0 : case 1 : $nextChar = $caseFunc($consonants[rand(0, 18)]);
                     break;
                 case 2:
                 case 3: