thorsten / phpMyFAQ

phpmyfaq/admin/ajax.tags_list.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();
 }
 
@@ -33,7 +33,7 @@ 
 
 $oTag              = new PMF_Tags($faqConfig);
 $autoCompleteValue = PMF_Filter::filterInput(INPUT_GET, 'q', FILTER_SANITIZE_STRIPPED);
-if (! is_null($autoCompleteValue)) {
+if (!is_null($autoCompleteValue)) {
     if (strpos($autoCompleteValue, ',')) {
         $arrayOfValues     = explode(',', $autoCompleteValue);
         $autoCompleteValue = end($arrayOfValues);

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * AJAX: Search for tags
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Ajax
- * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
- * @copyright 2005-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2005-12-15
- */
+         * AJAX: Search for tags
+         *
+         * PHP Version 5.3
+         *
+         * This Source Code Form is subject to the terms of the Mozilla Public License,
+         * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+         * obtain one at http://mozilla.org/MPL/2.0/.
+         *
+         * @category  phpMyFAQ
+         * @package   Ajax
+         * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
+         * @copyright 2005-2015 phpMyFAQ Team
+         * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+         * @link      http://www.phpmyfaq.de
+         * @since     2005-12-15
+         */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

phpmyfaq/admin/record.edit.php

Spacing +8 added lines, -8 removed lines

@@ -19,14 +19,14 @@ 
 
 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();
 }
 
-if (($permission['editbt']|| $permission['addbt']) && !PMF_Db::checkOnEmptyTable('faqcategories')) {
+if (($permission['editbt'] || $permission['addbt']) && !PMF_Db::checkOnEmptyTable('faqcategories')) {
 
     $category = new PMF_Category($faqConfig, array(), false);
     $category->setUser($currentAdminUser);
@@ -71,7 +71,7 @@ 
 
         $faqData['id'] = PMF_Filter::filterInput(INPUT_POST, 'id', FILTER_VALIDATE_INT);
         if (!is_null($faqData['id'])) {
-            $queryString = 'saveentry&id=' . $faqData['id'];
+            $queryString = 'saveentry&id='.$faqData['id'];
         } else {
             $queryString = 'insertentry';
         }
@@ -113,14 +113,14 @@ 
         $lang = PMF_Filter::filterInput(INPUT_GET, 'lang', FILTER_SANITIZE_STRING);
         if ((!isset($selectedCategory) && !isset($faqData['title'])) || !is_null($id)) {
             $logging = new PMF_Logging($faqConfig);
-            $logging->logAdmin($user, 'Beitragedit, ' . $id);
+            $logging->logAdmin($user, 'Beitragedit, '.$id);
 
             $categories = $category->getCategoryRelationsFromArticle($id, $lang);
 
             $faq->getRecord($id, null, true);
             $faqData         = $faq->faqRecord;
             $faqData['tags'] = implode(',', $tagging->getAllTagsById($faqData['id']));
-            $queryString     = 'saveentry&id=' . $faqData['id'];
+            $queryString     = 'saveentry&id='.$faqData['id'];
         } else {
             $queryString = 'insertentry';
         }
@@ -328,7 +328,7 @@ 
                                 <?php
                                 if (0 === $faqData['id']) {
                                     $faqData['id'] = $faqConfig->getDb()->nextId(
-                                        PMF_Db::getTablePrefix() . 'faqdata',
+                                        PMF_Db::getTablePrefix().'faqdata',
                                         'id'
                                     );
                                 }
@@ -527,7 +527,7 @@ 
                     <div class="control-group">
                         <label class="control-label" for="active"><?php echo $PMF_LANG["ad_entry_active"]; ?></label>
                         <div class="controls">
-                        <?php if($permission['approverec']):
+                        <?php if ($permission['approverec']):
                         if (isset($faqData['active']) && $faqData['active'] == 'yes') {
                             $suf = ' checked="checked"';
                             $sul = null;

Braces +10 added lines, -4 removed lines

@@ -547,10 +547,13 @@ 
                                 <input type="radio" name="active"  value="no"<?php if (isset($sul)) { echo $sul; } ?> />
                                 <?php echo $PMF_LANG['ad_gen_no']; ?>
                             </label>
-                            <?php else: ?>
+                            <?php else {
+    : ?>
                             <label class="radio">
                                 <input type="radio" name="active"  value="no" checked="checked" />
-                                <?php echo $PMF_LANG['ad_gen_no']; ?>
+                                <?php echo $PMF_LANG['ad_gen_no'];
+}
+?>
                             </label>
                         <?php endif; ?>
                         </div>
@@ -629,9 +632,12 @@ 
                             </label>
                         </div>
                     </div>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                     <input type="hidden" name="grouppermission" value="all" />
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
                     <div class="control-group">
                         <label class="control-label" for="userpermission"><?php echo $PMF_LANG['ad_entry_userpermission']; ?></label>
                         <div class="controls">

phpmyfaq/admin/glossary.main.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * The main glossary index file
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2005-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2005-09-15
- */
+     * The main glossary index file
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Administration
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2005-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2005-09-15
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

Spacing +8 added lines, -8 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();
 }
 
@@ -47,12 +47,12 @@ 
         $definition = PMF_Filter::filterInput(INPUT_POST, 'definition', FILTER_SANITIZE_SPECIAL_CHARS);
         if ($glossary->addGlossaryItem($item, $definition)) {
             echo '<p class="alert alert-success"><a href="#" class="close" data-dismiss="alert">×</a>';
-            echo $PMF_LANG['ad_glossary_save_success'] . '</p>';
+            echo $PMF_LANG['ad_glossary_save_success'].'</p>';
         } else {
             echo '<p class="alert alert-error"><a href="#" class="close" data-dismiss="alert">×</a>';
             echo $PMF_LANG['ad_glossary_save_error'];
             echo '<br />'.$PMF_LANG["ad_adus_dberr"].'<br />';
-            echo $faqConfig->getDb()->error() . '</p>';
+            echo $faqConfig->getDb()->error().'</p>';
         }
     }
 
@@ -62,12 +62,12 @@ 
         $definition = PMF_Filter::filterInput(INPUT_POST, 'definition', FILTER_SANITIZE_SPECIAL_CHARS);
         if ($glossary->updateGlossaryItem($id, $item, $definition)) {
             echo '<p class="alert alert-success"><a href="#" class="close" data-dismiss="alert">×</a>';
-            echo $PMF_LANG['ad_glossary_update_success'] . '</p>';
+            echo $PMF_LANG['ad_glossary_update_success'].'</p>';
         } else {
             echo '<p class="alert alert-error"><a href="#" class="close" data-dismiss="alert">×</a>';
             echo $PMF_LANG['ad_glossary_update_error'];
             echo '<br />'.$PMF_LANG["ad_adus_dberr"].'<br />';
-            echo $faqConfig->getDb()->error() . '</p>';
+            echo $faqConfig->getDb()->error().'</p>';
         }
     }
 
@@ -75,12 +75,12 @@ 
         $id = PMF_Filter::filterInput(INPUT_GET, 'id', FILTER_VALIDATE_INT);
         if ($glossary->deleteGlossaryItem($id)) {
             echo '<p class="alert alert-success"><a href="#" class="close" data-dismiss="alert">×</a>';
-            echo $PMF_LANG['ad_glossary_delete_success'] . '</p>';
+            echo $PMF_LANG['ad_glossary_delete_success'].'</p>';
         } else {
             echo '<p class="alert alert-error"><a href="#" class="close" data-dismiss="alert">×</a>';
             echo $PMF_LANG['ad_glossary_delete_error'];
             echo '<br />'.$PMF_LANG["ad_adus_dberr"].'<br />';
-            echo $faqConfig->getDb()->error() . '</p>';
+            echo $faqConfig->getDb()->error().'</p>';
         }
     }
 

phpmyfaq/admin/glossary.edit.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Displays a form to edit an existing glossary item
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2005-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2005-09-15
- */
+     * Displays a form to edit an existing glossary item
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Administration
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2005-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2005-09-15
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

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/category.translate.php

Indentation +17 added lines, -17 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * Translates a category
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Rudi Ferrari <bookcrossers@gmx.de>
- * @copyright 2006-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2006-09-10
- */
+     * Translates a category
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Administration
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Rudi Ferrari <bookcrossers@gmx.de>
+     * @copyright 2006-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2006-09-10
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

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 +18 added lines, -18 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * Handle ajax requests for the interface translation tool
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2009-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-05-11
- */
+             * Handle ajax requests for the interface translation tool
+             *
+             * PHP Version 5.3
+             *
+             * This Source Code Form is subject to the terms of the Mozilla Public License,
+             * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+             * obtain one at http://mozilla.org/MPL/2.0/.
+             *
+             * @category  phpMyFAQ
+             * @package   Administration
+             * @author    Anatoliy Belsky <ab@php.net>
+             * @copyright 2009-2015 phpMyFAQ Team
+             * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+             * @link      http://www.phpmyfaq.de
+             * @since     2009-05-11
+             */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
@@ -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

Indentation +43 added lines, -43 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * List all categories in the admin section
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2003-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2003-12-20
- */
+     * List all categories in the admin section
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Administration
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2003-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2003-12-20
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
@@ -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;

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

phpmyfaq/admin/instances.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * The main multi-site instances frontend
- *
- * PHP 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2012-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2012-03-16
- */
+     * The main multi-site instances frontend
+     *
+     * PHP 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Administration
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2012-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2012-03-16
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

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

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * AJAX: handling of Ajax user calls
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Administration
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2009-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-04-04
- */
+     * AJAX: handling of Ajax user calls
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Administration
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2009-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-04-04
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

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