thorsten / phpMyFAQ

phpmyfaq/admin/stat.ratings.php

Spacing +6 added lines, -6 removed lines

@@ -19,10 +19,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
@@ -77,17 +77,17 @@ 
                         <td><?php echo $data['usr']; ?></td>
                         <td>
                             <?php
-                            if (round($data['num'] * 20) > 75) {
+                            if (round($data['num']*20) > 75) {
                                 $progressBar = 'success';
-                            } elseif (round($data['num'] * 20) < 25) {
+                            } elseif (round($data['num']*20) < 25) {
                                 $progressBar = 'danger';
                             } else {
                                 $progressBar = 'info';
                             }
                             ?>
-                            <meter value="<?php echo round($data['num'] * 20); ?>" max="100" min="0" low="25" optimum="75"></meter>
+                            <meter value="<?php echo round($data['num']*20); ?>" max="100" min="0" low="25" optimum="75"></meter>
                         </td>
-                        <td><?php echo round($data['num'] * 20); ?>%</td>
+                        <td><?php echo round($data['num']*20); ?>%</td>
                     </tr>
 <?php
         $oldcategory = $data['category_id'];

phpmyfaq/admin/header.php

Spacing +7 added lines, -7 removed lines

@@ -21,10 +21,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
@@ -34,19 +34,19 @@ 
 
 $templateVars = array(
     'PMF_LANG'              => $PMF_LANG,
-    'appleTouchIcon'        => '../assets/template/' . PMF_Template::getTplSetName() . '/apple-touch-icon.png',
-    'baseUrl'               => $faqConfig->get('main.referenceURL') . '/admin/',
+    'appleTouchIcon'        => '../assets/template/'.PMF_Template::getTplSetName().'/apple-touch-icon.png',
+    'baseUrl'               => $faqConfig->get('main.referenceURL').'/admin/',
     'editorAutosaveActive'  => ('editentry' === $action) && $faqConfig->get('records.autosaveActive'),
     'editorAutosaveSeconds' => $faqConfig->get('records.autosaveSecs'),
     'gravatarActive'        => $faqConfig->get('main.enableGravatarSupport'),
     'isAuthenticated'       => isset($auth) && in_array(true, $permission),
     'pmfVersion'            => $faqConfig->get('main.currentVersion'),
     'secLevelEntries'       => '',
-    'shortcutIcon'          => '../assets/template/' . PMF_Template::getTplSetName() . '/favicon.ico',
+    'shortcutIcon'          => '../assets/template/'.PMF_Template::getTplSetName().'/favicon.ico',
     'time'                  => time(),
     'titleFAQ'              => $faqConfig->get('main.titleFAQ'),
-    'userDisplayName'       => isset($user) ? $user->getUserData('display_name'): '',
-    'userTooltip'           => isset($user) ? $PMF_LANG['ad_user_loggedin'] . $user->getLogin() : '',
+    'userDisplayName'       => isset($user) ? $user->getUserData('display_name') : '',
+    'userTooltip'           => isset($user) ? $PMF_LANG['ad_user_loggedin'].$user->getLogin() : '',
     'userEmail'             => isset($user) ? $user->getUserData('email') : ''
 );
 

phpmyfaq/admin/loginform.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 if (!isset($_SERVER['HTTPS']) && $faqConfig->get('security.useSslForLogins')) {
     $templateVars['forceSecureSwitch'] = true;
-    $templateVars['secureSwitchUrl']   = 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+    $templateVars['secureSwitchUrl']   = 'https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
 }
 
 $twig->loadTemplate('loginform.twig')

phpmyfaq/admin/trans.edit.php

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'];
 
 

Spacing +11 added lines, -11 removed lines

@@ -19,10 +19,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
@@ -36,7 +36,7 @@ 
 $page = PMF_Filter::filterInput(INPUT_GET, 'page', FILTER_VALIDATE_INT);
 $page = 1 > $page ? 1 : $page;
 
-if (empty($translateLang) || !file_exists(PMF_ROOT_DIR . "/lang/language_$translateLang.php")) {
+if (empty($translateLang) || !file_exists(PMF_ROOT_DIR."/lang/language_$translateLang.php")) {
     header("Location: ?action=translist");
 }
 
@@ -48,23 +48,23 @@ 
  * at once, so let's paginate.
  */
 $itemsPerPage = 32;
-if(!isset($_SESSION['trans'])) {
+if (!isset($_SESSION['trans'])) {
     /**
      * English is our exemplary language
      */
-    $_SESSION['trans']['leftVarsOnly']  = $tt->getVars(PMF_ROOT_DIR . "/lang/language_en.php");
-    $_SESSION['trans']['rightVarsOnly'] = $tt->getVars(PMF_ROOT_DIR . "/lang/language_$translateLang.php");
+    $_SESSION['trans']['leftVarsOnly']  = $tt->getVars(PMF_ROOT_DIR."/lang/language_en.php");
+    $_SESSION['trans']['rightVarsOnly'] = $tt->getVars(PMF_ROOT_DIR."/lang/language_$translateLang.php");
     
 }
 
 $leftVarsOnly   = array_slice($_SESSION['trans']['leftVarsOnly'], 
-                              ($page-1)*$itemsPerPage,
+                              ($page - 1)*$itemsPerPage,
                               $itemsPerPage);
 $rightVarsOnly  = &$_SESSION['trans']['rightVarsOnly'];
 
 
 $options = array(
-    'baseUrl' => PMF_Link::getSystemRelativeUri('index.php') . '?' . str_replace('&', '&', $_SERVER['QUERY_STRING']),
+    'baseUrl' => PMF_Link::getSystemRelativeUri('index.php').'?'.str_replace('&', '&', $_SERVER['QUERY_STRING']),
     'total'   => count($_SESSION['trans']['leftVarsOnly']),
     'perPage' => $itemsPerPage
 );
@@ -99,12 +99,12 @@ 
                     <th>en</th>
                     <th><?php echo $translateLang ?></th>
                 </tr>
-        <?php while(list($key, $line) = each($leftVarsOnly)): ?>
+        <?php while (list($key, $line) = each($leftVarsOnly)): ?>
         <?php
     // These parameters are not real translations, so don't offer to translate them
     if ($tt->isKeyIgnorable($key)) {
         echo "<tr>\n";
-        echo "<td>" . $key . "</td>\n";
+        echo "<td>".$key."</td>\n";
         echo '<td><input class="form-control" type="text" value="'.PMF_String::htmlspecialchars($line).'" disabled="disabled" /></td>'."\n";
         echo '<td><input class="form-control" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key]).'" disabled="disabled" />';
         echo '<input type="hidden" name="'.$key.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key]).'" /></td>'."\n";
@@ -200,7 +200,7 @@ 
                             <?php echo $PMF_LANG['msgCancel'] ?>
                         </button>
                         <button class="btn btn-success" type="button"
-                                onclick="save()"<?php if (!is_writable(PMF_ROOT_DIR . "/lang/language_$translateLang.php")) { echo ' disabled="disabled"'; } ?>>
+                                onclick="save()"<?php if (!is_writable(PMF_ROOT_DIR."/lang/language_$translateLang.php")) { echo ' disabled="disabled"'; } ?>>
                             <?php echo $PMF_LANG['msgSave'] ?>
                         </button>
                     </td>

Braces +23 added lines, -16 removed lines

@@ -117,8 +117,9 @@ 
      */
 
     // We deal with the second plural form when dealing with the first, so skip it here
-    if ($tt->isKeyASecondPluralForm($key))
-        continue;
+    if ($tt->isKeyASecondPluralForm($key)) {
+            continue;
+    }
 
     if ($tt->isKeyAFirstPluralForm($key)) {
         if ($rightNPlurals == -1) {
@@ -139,10 +140,11 @@ 
         echo "<td>".$key."</td>\n";
         echo '<td><input class="form-control" type="text" value="'.PMF_String::htmlspecialchars($line).'" disabled="disabled" /></td>'."\n";
         if (array_key_exists($key, $rightVarsOnly) && ($line != $rightVarsOnly[$key] ||
-           $tt->isKeyIgnorable($key) || $tt->isValIgnorable($line)))
-            echo '<td><input class="form-control" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key]).'" /></td>'."\n";
-        else
-            echo '<td><input style="width: 300px;border-color: red;" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($line).'" /></td>'."\n";
+           $tt->isKeyIgnorable($key) || $tt->isValIgnorable($line))) {
+                    echo '<td><input class="form-control" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key]).'" /></td>'."\n";
+        } else {
+                    echo '<td><input style="width: 300px;border-color: red;" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($line).'" /></td>'."\n";
+        }
         echo "</tr>\n";
 
         // Add second English form and translation
@@ -154,10 +156,11 @@ 
             // Other language has only one form
             echo '<td><input class="form-control" type="text" value="'.$PMF_LANG['msgTransToolLanguageOnePlural'].'" disabled="disabled" /></td>'."\n";
         } else {
-            if (array_key_exists($key2, $rightVarsOnly))
-                echo '<td><input class="form-control" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key2]).'" /></td>'."\n";
-            else
-                echo '<td><input class="form-control alert-danger" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n";
+            if (array_key_exists($key2, $rightVarsOnly)) {
+                            echo '<td><input class="form-control" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key2]).'" /></td>'."\n";
+            } else {
+                            echo '<td><input class="form-control alert-danger" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n";
+            }
         }
         echo "</tr>\n";
 
@@ -167,10 +170,11 @@ 
             echo "<tr>\n";
             echo "<td>".$keyI."</td>\n";
             echo '<td><input class="form-control" type="text" value="" disabled="disabled" /></td>'."\n";
-            if (array_key_exists($keyI, $rightVarsOnly) && $leftVarsOnly[$key2] != $rightVarsOnly[$key])
-                echo '<td><input class="form-control" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$keyI]).'" /></td>'."\n";
-            else
-                echo '<td><input class="form-control alert-danger" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n";
+            if (array_key_exists($keyI, $rightVarsOnly) && $leftVarsOnly[$key2] != $rightVarsOnly[$key]) {
+                            echo '<td><input class="form-control" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$keyI]).'" /></td>'."\n";
+            } else {
+                            echo '<td><input class="form-control alert-danger" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n";
+            }
             echo "</tr>\n";
         }
         // We do not need to process this $key any further
@@ -185,9 +189,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>

phpmyfaq/admin/attachment.php

Spacing +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
 //
 // Bootstrapping
 //
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
 /**
  * Initialize attachment factory
@@ -46,10 +46,10 @@ 
 $Language = new PMF_Language($faqConfig);
 $LANGCODE = $Language->setLanguage($faqConfig->get('main.languageDetection'), $faqConfig->get('main.language'));
 
-require_once PMF_ROOT_DIR . '/lang/language_en.php';
+require_once PMF_ROOT_DIR.'/lang/language_en.php';
 
 if (isset($LANGCODE) && PMF_Language::isASupportedLanguage($LANGCODE)) {
-    require_once PMF_ROOT_DIR . '/lang/language_'.$LANGCODE.'.php';
+    require_once PMF_ROOT_DIR.'/lang/language_'.$LANGCODE.'.php';
 } else {
     $LANGCODE = 'en';
 }
@@ -98,14 +98,14 @@ 
 <?php
 }
 if (is_null($currentAction) && $auth && $user->perm->checkRight($user->getUserId(), 'addattachment')) {
-    $recordId   = filter_input(INPUT_GET, 'record_id',   FILTER_VALIDATE_INT);
+    $recordId   = filter_input(INPUT_GET, 'record_id', FILTER_VALIDATE_INT);
     $recordLang = filter_input(INPUT_GET, 'record_lang', FILTER_SANITIZE_STRING);
 ?>
         <form action="attachment.php?action=save" enctype="multipart/form-data" method="post" accept-charset="utf-8">
             <fieldset>
             <legend>
                 <?php echo $PMF_LANG["ad_att_addto"]." ".$PMF_LANG["ad_att_addto_2"]; ?>
-                (max <?php echo round($faqConfig->get('records.maxAttachmentSize') / pow(1024, 2), 2) ?> MB)
+                (max <?php echo round($faqConfig->get('records.maxAttachmentSize')/pow(1024, 2), 2) ?> MB)
             </legend>
                 <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $faqConfig->get('records.maxAttachmentSize'); ?>" />
                 <input type="hidden" name="record_id" value="<?php echo $recordId; ?>" />
@@ -132,7 +132,7 @@ 
 
 if (!is_null($currentSave) && $currentSave == true && $auth &&
     $user->perm->checkRight($user->getUserId(), 'addattachment')) {
-    $recordId   = filter_input(INPUT_POST, 'record_id',   FILTER_VALIDATE_INT);
+    $recordId   = filter_input(INPUT_POST, 'record_id', FILTER_VALIDATE_INT);
     $recordLang = filter_input(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
 ?>
 <p><strong><?php echo $PMF_LANG["ad_att_addto"]." ".$PMF_LANG["ad_att_addto_2"]; ?></strong></p>
@@ -174,7 +174,7 @@ 
             '<p>%s</p>',
             sprintf(
                 $PMF_LANG['ad_attach_4'],
-                round($faqConfig->get('records.maxAttachmentSize') / pow(1024, 2), 2)
+                round($faqConfig->get('records.maxAttachmentSize')/pow(1024, 2), 2)
             )
         );
 

phpmyfaq/admin/category.main.php

Indentation +1 added lines, -1 removed lines

@@ -328,7 +328,7 @@
     $templateVars['categoryTree'] .= "</li>\n</ul>";
 
     $twig->loadTemplate('category/main.twig')
-         ->display($templateVars);
+            ->display($templateVars);
 
     unset($templateVars, $csrfToken, $open, $level, $category, $id, $cat, $lang, $lastCatId);
 } else {

Spacing +3 added lines, -3 removed lines

@@ -19,10 +19,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
@@ -261,7 +261,7 @@ 
         if ($cat['lang'] == $lang) {
             $categoryName = $cat['name'];
         } else {
-            $categoryName = $cat['name'] . ' (' . $languageCodes[strtoupper($cat['lang'])] . ')';
+            $categoryName = $cat['name'].' ('.$languageCodes[strtoupper($cat['lang'])].')';
         }
 
         $level     = $cat['indent'];

phpmyfaq/admin/stat.main.php

Spacing +4 added lines, -4 removed lines

@@ -20,10 +20,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 ?>
@@ -51,7 +51,7 @@ 
         $dir   = opendir(PMF_ROOT_DIR."/data");
         $first = 9999999999999999999999999;
         $last  = 0;
-        while($trackingFile = readdir($dir)) {
+        while ($trackingFile = readdir($dir)) {
             // The filename format is: trackingDDMMYYYY
             // e.g.: tracking02042006
             if (($trackingFile != '.') && ($trackingFile != '..') && (10 == strpos($trackingFile, $month))) {
@@ -106,7 +106,7 @@ 
                     </tr>
                     <tr>
                         <td><?php print $PMF_LANG["ad_stat_vpd"]; ?>:</td>
-                        <td><?php print (($danz != 0) ? round(($vanz / $danz),2) : 0); ?></td>
+                        <td><?php print (($danz != 0) ? round(($vanz/$danz), 2) : 0); ?></td>
                     </tr>
                     <tr>
                         <td><?php print $PMF_LANG["ad_stat_fien"]; ?>:</td>

phpmyfaq/admin/system.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
-    header('Location: http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 

phpmyfaq/admin/att.main.php

Spacing +4 added lines, -4 removed lines

@@ -19,10 +19,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
@@ -33,12 +33,12 @@ 
 $itemsPerPage = 32;
 $allCrumbs    = $fa->getBreadcrumbs();
 
-$crumbs   = array_slice($allCrumbs, ($page - 1) * $itemsPerPage, $itemsPerPage);
+$crumbs = array_slice($allCrumbs, ($page - 1)*$itemsPerPage, $itemsPerPage);
 
 $pagination = new PMF_Pagination(
     $faqConfig,
     array(
-        'baseUrl' => PMF_Link::getSystemRelativeUri() . '?' . str_replace('&', '&', $_SERVER['QUERY_STRING']),
+        'baseUrl' => PMF_Link::getSystemRelativeUri().'?'.str_replace('&', '&', $_SERVER['QUERY_STRING']),
         'total'   => count($allCrumbs),
         'perPage' => $itemsPerPage,
     )