thorsten / phpMyFAQ

phpmyfaq/admin/trans.edit.php

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
 }
 
 $leftVarsOnly = array_slice($_SESSION['trans']['leftVarsOnly'],
-                              ($page - 1) * $itemsPerPage,
+                              ($page - 1)*$itemsPerPage,
                               $itemsPerPage);
 $rightVarsOnly = &$_SESSION['trans']['rightVarsOnly'];
 
@@ -76,8 +76,8 @@ 
  * We use these values to add the correct number of input boxes.
  * Left column will always have 2 boxes, right - 1 to 6+ boxes.
  */
-$leftNPlurals = (int) $_SESSION['trans']['leftVarsOnly']['PMF_LANG[nplurals]'];
-$rightNPlurals = (int) $rightVarsOnly['PMF_LANG[nplurals]'];
+$leftNPlurals = (int)$_SESSION['trans']['leftVarsOnly']['PMF_LANG[nplurals]'];
+$rightNPlurals = (int)$rightVarsOnly['PMF_LANG[nplurals]'];
 
 printf(
     '<header class="row"><div class="col-lg-12"><h2 class="page-header"><i class="fa fa-wrench"></i> %s</h2></div></header>',

Braces +5 added lines, -2 removed lines

@@ -188,9 +188,12 @@
                            $tt->isKeyIgnorable($key) || $tt->isValIgnorable($line))):
                     ?>
                     <td><input class="form-control" type="text" name="<?php echo $key?>" value="<?php echo PMF_String::htmlspecialchars($rightVarsOnly[$key]) ?>" /></td>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                     <td><input class="form-control alert-danger" type="text" name="<?php echo $key?>" value="<?php echo PMF_String::htmlspecialchars($line) ?>" /></td>
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
                 </tr>
                 <?php endwhile; ?>
                 <tr>

Indentation +2 added lines, -2 removed lines

@@ -58,8 +58,8 @@
 }
 
 $leftVarsOnly = array_slice($_SESSION['trans']['leftVarsOnly'],
-                              ($page - 1) * $itemsPerPage,
-                              $itemsPerPage);
+                                ($page - 1) * $itemsPerPage,
+                                $itemsPerPage);
 $rightVarsOnly = &$_SESSION['trans']['rightVarsOnly'];
 
 $options = array(

phpmyfaq/admin/trans.list.php

Braces +12 added lines, -4 removed lines

@@ -107,9 +107,11 @@ 
                         <?php echo $PMF_LANG['msgEdit'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgEdit'] ?></td>
                 <?php endif;
+}
         ?>
                 <?php if ($user->perm->checkRight($user->getUserId(), 'deltranslation') && $showActions): ?>
                 <td>
@@ -118,9 +120,11 @@ 
                         <?php echo $PMF_LANG['msgDelete'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgDelete'] ?></td>
                 <?php endif;
+}
         ?>
                 <?php if ($user->perm->checkRight($user->getUserId(), 'edittranslation') && $showActions): ?>
                 <td>
@@ -129,15 +133,19 @@ 
                         <?php echo $PMF_LANG['msgTransToolSendToTeam'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgTransToolSendToTeam'] ?></td>
                 <?php endif;
+}
         ?>
                 <?php if ($isLangFileWritable): ?>
                 <td><i class="fa fa-ok-circle"></i> <?php echo $PMF_LANG['msgYes'] ?></td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><i class="fa fa-ban-circle"></i> <?php echo $PMF_LANG['msgNo'] ?></td>
                 <?php endif;
+}
         ?>
                 <td>
                     <?php echo $percents ?>%

phpmyfaq/admin/user.php

Spacing +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
         if (!isset($_SESSION['phpmyfaq_csrf_token']) || $_SESSION['phpmyfaq_csrf_token'] !== $csrfToken) {
             $csrfOkay = false;
         }
-        if (0 === (int) $userId || !$csrfOkay) {
+        if (0 === (int)$userId || !$csrfOkay) {
             $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
         } else {
             $user = new PMF_User($faqConfig);
@@ -180,7 +180,7 @@ 
             $csrfOkay = false;
         }
         $userAction = $defaultUserAction;
-        if (0 === (int) $userId || !$csrfOkay) {
+        if (0 === (int)$userId || !$csrfOkay) {
             $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_user_error_noId']);
         } else {
             if (!$user->getUserById($userId, true)) {
@@ -669,8 +669,8 @@ 
         $numUsers = count($allUsers);
         $page = PMF_Filter::filterInput(INPUT_GET, 'page', FILTER_VALIDATE_INT, 0);
         $perPage = 10;
-        $numPages = ceil($numUsers / $perPage);
-        $lastPage = $page * $perPage;
+        $numPages = ceil($numUsers/$perPage);
+        $lastPage = $page*$perPage;
         $firstPage = $lastPage - $perPage;
 
         $baseUrl = sprintf(

phpmyfaq/ajaxservice.php

Indentation +3 added lines, -3 removed lines

@@ -660,8 +660,8 @@ 
 
                 $message = array(
                     'success' => trim($PMF_LANG['successMessage']).
-                                 ' '.
-                                 trim($PMF_LANG['msgRegThankYou']),
+                                    ' '.
+                                    trim($PMF_LANG['msgRegThankYou']),
                 );
             }
         } else {
@@ -763,7 +763,7 @@ 
         $attached = PMF_Filter::filterInput(INPUT_POST, 'message', FILTER_SANITIZE_STRIPPED);
         $mailto = PMF_Filter::filterInputArray(INPUT_POST,
             array('mailto' => array('filter' => FILTER_VALIDATE_EMAIL,
-                      'flags' => FILTER_REQUIRE_ARRAY | FILTER_NULL_ON_FAILURE,
+                        'flags' => FILTER_REQUIRE_ARRAY | FILTER_NULL_ON_FAILURE,
                 ),
             )
         );

Spacing +5 added lines, -5 removed lines

@@ -686,7 +686,7 @@ 
             $votingData = array(
                 'record_id' => $recordId,
                 'vote' => $vote,
-                'user_ip' => $userIp, );
+                'user_ip' => $userIp,);
 
             if (!$faq->getNumberOfVotings($recordId)) {
                 $faq->addVoting($votingData);
@@ -824,7 +824,7 @@ 
 
         $userData = array(
             'display_name' => $name,
-            'email' => $email, );
+            'email' => $email,);
         $success = $user->setUserData($userData);
 
         if (0 !== strlen($password) && 0 !== strlen($confirm)) {
@@ -859,13 +859,13 @@ 
 
             if ($loginExist && ($email == $user->getUserData('email'))) {
                 $consonants = array(
-                    'b','c','d','f','g','h','j','k','l','m','n','p','r','s','t','v','w','x','y','z',
+                    'b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z',
                 );
                 $vowels = array(
-                    'a','e','i','o','u',
+                    'a', 'e', 'i', 'o', 'u',
                 );
                 $newPassword = '';
-                srand((double) microtime() * 1000000);
+                srand((double)microtime()*1000000);
                 for ($i = 1; $i <= 4; ++$i) {
                     $newPassword .= $consonants[rand(0, 19)];
                     $newPassword .= $vowels[rand(0, 4)];

phpmyfaq/config/constants.php

Spacing +2 added lines, -2 removed lines

@@ -367,8 +367,8 @@
 define('PMF_GET_KEY_NAME_LANGUAGE', 'lang');
 define('PMF_GET_KEY_NAME_SESSIONID', 'sid');
 // Misc parameters
-define('PMF_LANGUAGE_EXPIRED_TIME', 3600);      // 30 minutes
-define('PMF_SESSION_EXPIRED_TIME', 3600);       // 30 minutes
+define('PMF_LANGUAGE_EXPIRED_TIME', 3600); // 30 minutes
+define('PMF_SESSION_EXPIRED_TIME', 3600); // 30 minutes
 define('PMF_REMEMBERME_EXPIRED_TIME', 1209600); // 2 weeks
 
 //

phpmyfaq/cron.verifyurls.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
     foreach ($_records as $_r) {
         ++$i;
         $output = '';
-        $output .= sprintf('%0'.strlen((string) $tot).'d', $i).'/'.$tot.'. Checking '.$_r['solution_id'].' ('.PMF_Utils::makeShorterText(strip_tags($_r['title']), 8).'):';
+        $output .= sprintf('%0'.strlen((string)$tot).'d', $i).'/'.$tot.'. Checking '.$_r['solution_id'].' ('.PMF_Utils::makeShorterText(strip_tags($_r['title']), 8).'):';
         $start = microtime(true);
         if ($oLnk->getEntryState($_r['id'], $_r['lang'], true) === true) {
             $output .= $oLnk->verifyArticleURL($_r['content'], $_r['id'], $_r['lang'], true);

phpmyfaq/glossary.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 
 if (0 < $numItems) {
     $output = [];
-    $visibleItems = array_slice($glossaryItems, ($page - 1) * $itemsPerPage, $itemsPerPage);
+    $visibleItems = array_slice($glossaryItems, ($page - 1)*$itemsPerPage, $itemsPerPage);
 
     foreach ($visibleItems as $item) {
         $output['item'][] = $item['item'];

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