thorsten / phpMyFAQ

phpmyfaq/admin/category.translate.php

Spacing +3 added lines, -3 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();
 }
 
@@ -103,7 +103,7 @@ 
                     <ul>
                         <?php
                         foreach ($category->getCategoryLanguagesTranslated($id) as $language => $namedesc) {
-                            print "<li><strong>" . $language . "</strong>: " . $namedesc . "</li>";
+                            print "<li><strong>".$language."</strong>: ".$namedesc."</li>";
                         }
                         ?>
                     </ul>

Braces +5 added lines, -2 removed lines

@@ -59,9 +59,12 @@
             <input type="hidden" name="showcat" value="<?php print $showcat; ?>" />
             <?php if ($faqConfig->get('security.permLevel') !== 'basic'): ?>
             <input type="hidden" name="restricted_groups" value="<?php print $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 print $user_permission[0]; ?>" />
             <input type="hidden" name="csrf" value="<?php print $user->getCsrfTokenFromSession(); ?>" />
 

phpmyfaq/admin/trans.edit.php

Spacing +10 added lines, -10 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
 );
@@ -92,7 +92,7 @@ 
             <th>en</th>
             <th><?php print $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)) {
@@ -195,7 +195,7 @@ 
             </td>
             <td>
                 <button class="btn btn-success" type="button"
-                        onclick="save()"<?php if (!is_writable(PMF_ROOT_DIR . "/lang/language_$translateLang.php")) { print ' disabled="disabled"'; } ?>>
+                        onclick="save()"<?php if (!is_writable(PMF_ROOT_DIR."/lang/language_$translateLang.php")) { print ' disabled="disabled"'; } ?>>
                     <?php print $PMF_LANG['msgSave'] ?>
                 </button>
             </td>

Braces +23 added lines, -16 removed lines

@@ -110,8 +110,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) {
@@ -132,10 +133,11 @@ 
         print "<td>".$key."</td>\n";
         print '<td><input style="width: 300px;" 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)))
-            print '<td><input style="width: 300px;" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key]).'" /></td>'."\n";
-        else
-            print '<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))) {
+                    print '<td><input style="width: 300px;" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key]).'" /></td>'."\n";
+        } else {
+                    print '<td><input style="width: 300px;border-color: red;" type="text" name="'.$key.'" value="'.PMF_String::htmlspecialchars($line).'" /></td>'."\n";
+        }
         print "</tr>\n";
 
         // Add second English form and translation
@@ -147,10 +149,11 @@ 
             // Other language has only one form
             print '<td><input style="width: 300px;" type="text" value="'.$PMF_LANG['msgTransToolLanguageOnePlural'].'" disabled="disabled" /></td>'."\n";
         } else {
-            if (array_key_exists($key2, $rightVarsOnly))
-                print '<td><input style="width: 300px;" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key2]).'" /></td>'."\n";
-            else
-                print '<td><input style="width: 300px;border-color: red;" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n";
+            if (array_key_exists($key2, $rightVarsOnly)) {
+                            print '<td><input style="width: 300px;" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$key2]).'" /></td>'."\n";
+            } else {
+                            print '<td><input style="width: 300px;border-color: red;" type="text" name="'.$key2.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n";
+            }
         }
         print "</tr>\n";
 
@@ -160,10 +163,11 @@ 
             print "<tr>\n";
             print "<td>".$keyI."</td>\n";
             print '<td><input style="width: 300px;" type="text" value="" disabled="disabled" /></td>'."\n";
-            if (array_key_exists($keyI, $rightVarsOnly) && $leftVarsOnly[$key2] != $rightVarsOnly[$key])
-                print '<td><input style="width: 300px;" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$keyI]).'" /></td>'."\n";
-            else
-                print '<td><input style="width: 300px;border-color: red;" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n";
+            if (array_key_exists($keyI, $rightVarsOnly) && $leftVarsOnly[$key2] != $rightVarsOnly[$key]) {
+                            print '<td><input style="width: 300px;" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($rightVarsOnly[$keyI]).'" /></td>'."\n";
+            } else {
+                            print '<td><input style="width: 300px;border-color: red;" type="text" name="'.$keyI.'" value="'.PMF_String::htmlspecialchars($leftVarsOnly[$key2]).'" /></td>'."\n";
+            }
             print "</tr>\n";
         }
         // We do not need to process this $key any further
@@ -178,9 +182,12 @@ 
                    $tt->isKeyIgnorable($key) || $tt->isValIgnorable($line))):
             ?>
             <td><input style="width: 300px;" type="text" name="<?php print $key?>" value="<?php print PMF_String::htmlspecialchars($rightVarsOnly[$key]) ?>" /></td>
-            <?php else: ?>
+            <?php else {
+    : ?>
             <td><input style="width: 300px;border-color: red;" type="text" name="<?php print $key?>" value="<?php print 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'];
 
 

phpmyfaq/admin/category.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();
 }
 
@@ -35,7 +35,7 @@ 
                         <i class="icon-plus icon-white"></i> <?php print $PMF_LANG['ad_kateg_add']; ?>
                     </a>
                     <a class="btn btn-info" href="?action=showcategory">
-                        <i class="icon-th icon-white"></i> <?php print $PMF_LANG['ad_categ_show'];?>
+                        <i class="icon-th icon-white"></i> <?php print $PMF_LANG['ad_categ_show']; ?>
                     </a>
                 </div>
             </h2>
@@ -267,7 +267,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'];

Indentation +27 added lines, -27 removed lines

@@ -310,20 +310,20 @@ 
         }
 
         if ($cat["lang"] == $lang) {
-           // add sub category (if current language)
-           printf('
+            // add sub category (if current language)
+            printf('
             <a class="btn btn-info btn-mini" href="?action=addcategory&amp;cat=%s&amp;lang=%s"><span title="%s" class="icon-plus-sign icon-white"></span></a> ',
-               $cat['id'],
-               $cat['lang'],
-               $PMF_LANG['ad_quick_category']
-           );
+                $cat['id'],
+                $cat['lang'],
+                $PMF_LANG['ad_quick_category']
+            );
 
-           // rename (sub) category (if current language)
-           printf('
+            // rename (sub) category (if current language)
+            printf('
                <a class="btn btn-info btn-mini" href="?action=editcategory&amp;cat=%s"><span title="%s" class="icon-edit icon-white"></a> ',
-               $cat['id'],
-               $PMF_LANG['ad_kateg_rename']
-           );
+                $cat['id'],
+                $PMF_LANG['ad_kateg_rename']
+            );
         }
 
         // translate category (always)
@@ -346,22 +346,22 @@ 
         }
 
         if ($cat["lang"] == $lang) {
-           // cut category (if current language)
-           printf(
-               '<a class="btn btn-warning btn-mini" href="?action=cutcategory&amp;cat=%s"><span title="%s" class="icon-cut icon-white"></a> ',
-               $cat['id'],
-               $PMF_LANG['ad_categ_cut']
-           );
-
-           if ($category->numParent($cat['parent_id']) > 1) {
-              // move category (if current language) AND more than 1 category at the same level)
-              printf(
-                  '<a class="btn btn-warning btn-mini" href="?action=movecategory&amp;cat=%s&amp;parent_id=%s"><span title="%s" class="icon-resize-vertical icon-white"></a> ',
-                  $cat['id'],
-                  $cat['parent_id'],
-                  $PMF_LANG['ad_categ_move']
-              );
-           }
+            // cut category (if current language)
+            printf(
+                '<a class="btn btn-warning btn-mini" href="?action=cutcategory&amp;cat=%s"><span title="%s" class="icon-cut icon-white"></a> ',
+                $cat['id'],
+                $PMF_LANG['ad_categ_cut']
+            );
+
+            if ($category->numParent($cat['parent_id']) > 1) {
+                // move category (if current language) AND more than 1 category at the same level)
+                printf(
+                    '<a class="btn btn-warning btn-mini" href="?action=movecategory&amp;cat=%s&amp;parent_id=%s"><span title="%s" class="icon-resize-vertical icon-white"></a> ',
+                    $cat['id'],
+                    $cat['parent_id'],
+                    $PMF_LANG['ad_categ_move']
+                );
+            }
         }
 
         $open      = $level;

phpmyfaq/admin/instances.php

Spacing +5 added lines, -5 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();
 }
 
@@ -30,7 +30,7 @@ 
     <header>
         <h2>
             <i class="icon-wrench"></i> <?php print $PMF_LANG['ad_menu_instances']; ?>
-            <?php if ($permission['addinstances'] && is_writable(PMF_ROOT_DIR . DIRECTORY_SEPARATOR . 'multisite')): ?>
+            <?php if ($permission['addinstances'] && is_writable(PMF_ROOT_DIR.DIRECTORY_SEPARATOR.'multisite')): ?>
             <div class="pull-right">
                 <a class="btn btn-success" data-toggle="modal" href="#pmf-modal-add-instance">
                     <i class="icon-plus"></i> <?php echo $PMF_LANG["ad_instance_add"] ?>
@@ -46,7 +46,7 @@ 
     $instanceId = PMF_Filter::filterInput(INPUT_POST, 'instance_id', FILTER_VALIDATE_INT);
 
     // Check, if /multisite is writeable
-    if (! is_writable(PMF_ROOT_DIR . DIRECTORY_SEPARATOR . 'multisite')) {
+    if (!is_writable(PMF_ROOT_DIR.DIRECTORY_SEPARATOR.'multisite')) {
         printf(
             '<p class="alert alert-error">%s</p>',
             $PMF_LANG["ad_instance_error_notwritable"]
@@ -98,7 +98,7 @@ 
         ?>
         <tr id="row-instance-<?php print $site->id ?>">
             <td><?php print $site->id ?></td>
-            <td><a href="<?php print $site->url . $site->instance ?>"><?php print $site->url ?></a></td>
+            <td><a href="<?php print $site->url.$site->instance ?>"><?php print $site->url ?></a></td>
             <td><?php print $site->instance ?></td>
             <td><?php print $site->comment ?></td>
             <td>

phpmyfaq/admin/ajax.user.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();
 }
 
@@ -76,7 +76,7 @@ 
 
             $user->getUserById($userId, true);
             if ($user->getStatus() == 'protected' || $userId == 1) {
-                $message = '<p class="error">' . $PMF_LANG['ad_user_error_protectedAccount'] . '</p>';
+                $message = '<p class="error">'.$PMF_LANG['ad_user_error_protectedAccount'].'</p>';
             } else {
                 if (!$user->deleteUser()) {
                     $message = $PMF_LANG['ad_user_error_delete'];
@@ -90,7 +90,7 @@ 
                         $permissions->removeFromAllGroups($userId);
                     }
     
-                    $message = '<p class="success">' . $PMF_LANG['ad_user_deleted'] . '</p>';
+                    $message = '<p class="success">'.$PMF_LANG['ad_user_deleted'].'</p>';
                 }
             }
             print json_encode($message);

phpmyfaq/admin/category.move.php

Indentation +4 added lines, -4 removed lines

@@ -56,10 +56,10 @@
                    <select name="change" size="1">
 <?php
                     foreach ($category->categories as $cat) {
-                       if ($id != $cat["id"]) {
-                          printf("<option value=\"%s\">%s</option>", $cat['id'], $cat['name']);
-                       }
-                   }
+                        if ($id != $cat["id"]) {
+                            printf("<option value=\"%s\">%s</option>", $cat['id'], $cat['name']);
+                        }
+                    }
 ?>
                     </select>
                     <?php printf('<p class="help-block">%s</p>', $PMF_LANG['ad_categ_remark_move']); ?>

Spacing +2 added lines, -2 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();
 }
 

phpmyfaq/admin/report.export.php

Spacing +12 added lines, -12 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();
 }
 
@@ -45,18 +45,18 @@ 
 
     $text    = array();
     $text[0] = array();
-    ($useCategory)     ? $text[0][] = $PMF_LANG['ad_stat_report_category'] : '';
-    ($useSubcategory)  ? $text[0][] = $PMF_LANG['ad_stat_report_sub_category'] : '';
-    ($useTranslation)  ? $text[0][] = $PMF_LANG['ad_stat_report_translations'] : '';
-    ($useLanguage)     ? $text[0][] = $PMF_LANG['ad_stat_report_language'] : '';
-    ($useId)           ? $text[0][] = $PMF_LANG['ad_stat_report_id'] : '';
-    ($useSticky)       ? $text[0][] = $PMF_LANG['ad_stat_report_sticky'] : '';
-    ($useTitle)        ? $text[0][] = $PMF_LANG['ad_stat_report_title'] : '';
+    ($useCategory) ? $text[0][] = $PMF_LANG['ad_stat_report_category'] : '';
+    ($useSubcategory) ? $text[0][] = $PMF_LANG['ad_stat_report_sub_category'] : '';
+    ($useTranslation) ? $text[0][] = $PMF_LANG['ad_stat_report_translations'] : '';
+    ($useLanguage) ? $text[0][] = $PMF_LANG['ad_stat_report_language'] : '';
+    ($useId) ? $text[0][] = $PMF_LANG['ad_stat_report_id'] : '';
+    ($useSticky) ? $text[0][] = $PMF_LANG['ad_stat_report_sticky'] : '';
+    ($useTitle) ? $text[0][] = $PMF_LANG['ad_stat_report_title'] : '';
     ($useCreationDate) ? $text[0][] = $PMF_LANG['ad_stat_report_creation_date'] : '';
-    ($useOwner)        ? $text[0][] = $PMF_LANG['ad_stat_report_owner'] : '';
+    ($useOwner) ? $text[0][] = $PMF_LANG['ad_stat_report_owner'] : '';
     ($useLastModified) ? $text[0][] = $PMF_LANG['ad_stat_report_last_modified_person'] : '';
-    ($useUrl)          ? $text[0][] = $PMF_LANG['ad_stat_report_url'] : '';
-    ($useVisits)       ? $text[0][] = $PMF_LANG['ad_stat_report_visits'] : '';
+    ($useUrl) ? $text[0][] = $PMF_LANG['ad_stat_report_url'] : '';
+    ($useVisits) ? $text[0][] = $PMF_LANG['ad_stat_report_visits'] : '';
 
     $report = new PMF_Report($faqConfig);
 

phpmyfaq/admin/trans.list.php

Spacing +16 added lines, -16 removed lines

@@ -20,19 +20,19 @@ 
 
 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();
 }
 
 clearstatcache();
-if(isset($_SESSION['trans'])) {
+if (isset($_SESSION['trans'])) {
     unset($_SESSION['trans']);
 }
 
-$langDir            = PMF_ROOT_DIR . DIRECTORY_SEPARATOR . "lang";
+$langDir            = PMF_ROOT_DIR.DIRECTORY_SEPARATOR."lang";
 $transDir           = new DirectoryIterator($langDir);
 $isTransDirWritable = is_writable($langDir);
 $tt                 = new PMF_TransTool;
@@ -40,7 +40,7 @@ 
         <header>
             <h2>
                 <i class="icon-wrench"></i> <?php echo $PMF_LANG['ad_menu_translations'] ?>
-                <?php if($permission["addtranslation"] && $isTransDirWritable): ?>
+                <?php if ($permission["addtranslation"] && $isTransDirWritable): ?>
                 <div class="pull-right">
                     <a class="btn btn-success" href="?action=transadd">
                         <i class="icon-plus"></i> <?php echo $PMF_LANG['msgTransToolAddNewTranslation'] ?>
@@ -52,8 +52,8 @@ 
 
         <p><?php echo $PMF_LANG['msgChooseLanguageToTranslate'] ?>:</p>
 
-        <?php if(!$isTransDirWritable):
-            echo '<p class="alert alert-error">'. $PMF_LANG['msgLangDirIsntWritable'] . "</p>";
+        <?php if (!$isTransDirWritable):
+            echo '<p class="alert alert-error">'.$PMF_LANG['msgLangDirIsntWritable']."</p>";
         endif; ?>
 
         <table class="table table-striped">
@@ -76,7 +76,7 @@ 
             /**
              * English is our exemplary language which won't be changed
              */
-            if('en' == $lang) {
+            if ('en' == $lang) {
                 continue;
             }
             
@@ -87,12 +87,12 @@ 
     sort($sortedLangList);
     
     while (list(,$lang) = each($sortedLangList)) { 
-        $isLangFileWritable = is_writable($langDir . DIRECTORY_SEPARATOR . "language_$lang.php");
+        $isLangFileWritable = is_writable($langDir.DIRECTORY_SEPARATOR."language_$lang.php");
         $showActions        = $isTransDirWritable && $isLangFileWritable;
         ?>
             <tr class="lang_<?php echo $lang ?>_container">
                 <td><?php echo $languageCodes[strtoupper($lang)] ?></td>
-                <?php if($permission["edittranslation"] && $showActions): ?>
+                <?php if ($permission["edittranslation"] && $showActions): ?>
                 <td>
                     <a class="btn btn-primary" href="?action=transedit&amp;translang=<?php echo $lang ?>" >
                         <i class="icon-edit icon-white"></i>
@@ -102,7 +102,7 @@ 
                 <?php else: ?>
                 <td><?php echo $PMF_LANG['msgEdit'] ?></td>
                 <?php endif; ?>
-                <?php if($permission["deltranslation"] && $showActions): ?>
+                <?php if ($permission["deltranslation"] && $showActions): ?>
                 <td>
                     <a class="btn btn-danger" href="javascript: del('<?php echo $lang ?>');" >
                         <i class="icon-remove icon-white"></i>
@@ -112,7 +112,7 @@ 
                 <?php else: ?>
                 <td><?php echo $PMF_LANG['msgDelete'] ?></td>
                 <?php endif; ?>
-                <?php if($permission["edittranslation"] && $showActions): ?>
+                <?php if ($permission["edittranslation"] && $showActions): ?>
                 <td>
                     <a class="btn btn-success" href="javascript: sendToTeam('<?php echo $lang ?>');" >
                         <i class="icon-upload icon-white"></i>
@@ -121,15 +121,15 @@ 
                 </td>
                 <?php else: ?>
                 <td><?php echo $PMF_LANG['msgTransToolSendToTeam'] ?></td>
-                <?php endif;?>
-                <?php if($isLangFileWritable): ?>
+                <?php endif; ?>
+                <?php if ($isLangFileWritable): ?>
                 <td><i class="icon-ok-circle"></i> <?php echo $PMF_LANG['msgYes'] ?></td>
                 <?php else: ?>
                 <td><i class="icon-ban-circle"></i> <?php echo $PMF_LANG['msgNo'] ?></td>
                 <?php endif; ?>
                 <td><?php echo $tt->getTranslatedPercentage(
-                    $langDir . DIRECTORY_SEPARATOR . "language_en.php",
-                    $langDir . DIRECTORY_SEPARATOR . "language_$lang.php"
+                    $langDir.DIRECTORY_SEPARATOR."language_en.php",
+                    $langDir.DIRECTORY_SEPARATOR."language_$lang.php"
                 ); ?>%</td>
             </tr>
         <?php 

Braces +20 added lines, -8 removed lines

@@ -99,9 +99,12 @@ 
                         <?php echo $PMF_LANG['msgEdit'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgEdit'] ?></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                 <?php if($permission["deltranslation"] && $showActions): ?>
                 <td>
                     <a class="btn btn-danger" href="javascript: del('<?php echo $lang ?>');" >
@@ -109,9 +112,12 @@ 
                         <?php echo $PMF_LANG['msgDelete'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgDelete'] ?></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                 <?php if($permission["edittranslation"] && $showActions): ?>
                 <td>
                     <a class="btn btn-success" href="javascript: sendToTeam('<?php echo $lang ?>');" >
@@ -119,14 +125,20 @@ 
                         <?php echo $PMF_LANG['msgTransToolSendToTeam'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgTransToolSendToTeam'] ?></td>
-                <?php endif;?>
+                <?php endif;
+}
+?>
                 <?php if($isLangFileWritable): ?>
                 <td><i class="icon-ok-circle"></i> <?php echo $PMF_LANG['msgYes'] ?></td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><i class="icon-ban-circle"></i> <?php echo $PMF_LANG['msgNo'] ?></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                 <td><?php echo $tt->getTranslatedPercentage(
                     $langDir . DIRECTORY_SEPARATOR . "language_en.php",
                     $langDir . DIRECTORY_SEPARATOR . "language_$lang.php"

phpmyfaq/admin/category.edit.php

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();
 }
 
@@ -52,7 +52,7 @@ 
         $restrictedGroups = true;
     }
 
-    $header = $PMF_LANG['ad_categ_edit_1'] . ' ' . $categories[$categoryId]['name'] . ' ' . $PMF_LANG['ad_categ_edit_2'];
+    $header = $PMF_LANG['ad_categ_edit_1'].' '.$categories[$categoryId]['name'].' '.$PMF_LANG['ad_categ_edit_2'];
 ?>
 
         <header>