thorsten / phpMyFAQ

phpmyfaq/admin/footer.php

Indentation +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
     $templateVars['wysiwygActive'] = false;
 
     $twig->loadTemplate('footer.twig')
-         ->display($templateVars);
+            ->display($templateVars);
 
     unset($templateVars, $wysiwygActions);
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -20,21 +20,21 @@ 
 
 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();
 }
 
 $templateVars = array(
     'PMF_LANG'            => $PMF_LANG,
     'debugInformation'    => DEBUG ? $faqConfig->getDb()->log() : '',
-    'formAction'          => 'index.php' . (isset($action) ? '?action=' . $action : ''),
+    'formAction'          => 'index.php'.(isset($action) ? '?action='.$action : ''),
     'isAuthenticated'     => isset($auth),
     'languageSelector'    => PMF_Language::selectLanguages($LANGCODE, true),
     'pmfVersion'          => $faqConfig->get('main.currentVersion'),
-    'sessionKeepaliveUrl' => 'session.keepalive.php?lang=' . $LANGCODE,
+    'sessionKeepaliveUrl' => 'session.keepalive.php?lang='.$LANGCODE,
     'userDisplayName'     => isset($user) ? $user->userdata->get('display_name') : '',
     'userId'              => isset($user) ? $user->userdata->get('user_id') : ''
 );
@@ -50,7 +50,7 @@ 
 
 if (isset($auth) && in_array($action, $wysiwygActions) && $faqConfig->get('main.enableWysiwygEditor')) {
     $templateVars['wysiwygActive']     = true;
-    $templateVars['tinyMceContentCss'] = '../assets/template/' . PMF_Template::getTplSetName() . '/css/style.css';
+    $templateVars['tinyMceContentCss'] = '../assets/template/'.PMF_Template::getTplSetName().'/css/style.css';
     $templateVars['tinyMceLanguage']   = PMF_Language::isASupportedTinyMCELanguage($LANGCODE) ? $LANGCODE : 'en';
     if (('addnews' == $action || 'editnews' == $action)) {
         $templateVars['tinyMceElements'] = 'news';

phpmyfaq/admin/backup.export.php

Spacing +10 added lines, -10 removed lines

@@ -27,7 +27,7 @@ 
 //
 // Bootstrapping
 //
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
 $action = PMF_Filter::filterInput(INPUT_GET, 'action', FILTER_SANITIZE_STRING);
 
@@ -47,7 +47,7 @@ 
 if ($user->perm->checkRight($user->getUserId(), 'backup')) {
 
     $tables       = $tableNames = $faqConfig->getDb()->getTableNames(PMF_Db::getTablePrefix());
-    $tablePrefix  = (PMF_Db::getTablePrefix() !== '') ? PMF_Db::getTablePrefix() . '.phpmyfaq' : 'phpmyfaq';
+    $tablePrefix  = (PMF_Db::getTablePrefix() !== '') ? PMF_Db::getTablePrefix().'.phpmyfaq' : 'phpmyfaq';
     $tableNames   = '';
     $majorVersion = substr($faqConfig->get('main.currentVersion'), 0, 3);
     $dbHelper     = new PMF_DB_Helper($faqConfig);
@@ -55,24 +55,24 @@ 
     switch ($action) {
         case 'backup_content' :
             foreach ($tables as $table) {
-                if ((PMF_Db::getTablePrefix() . 'faqadminlog' == trim($table)) || (PMF_Db::getTablePrefix() . 'faqsessions' == trim($table))) {
+                if ((PMF_Db::getTablePrefix().'faqadminlog' == trim($table)) || (PMF_Db::getTablePrefix().'faqsessions' == trim($table))) {
                     continue;
                 }
-                $tableNames .= $table . ' ';
+                $tableNames .= $table.' ';
             }
             break;
         case 'backup_logs' :
             foreach ($tables as $table) {
-                if ((PMF_Db::getTablePrefix() . 'faqadminlog' == trim($table)) || (PMF_Db::getTablePrefix() . 'faqsessions' == trim($table))) {
-                    $tableNames .= $table . ' ';
+                if ((PMF_Db::getTablePrefix().'faqadminlog' == trim($table)) || (PMF_Db::getTablePrefix().'faqsessions' == trim($table))) {
+                    $tableNames .= $table.' ';
                 }
             }
             break;
     }
 
-    $text[] = "-- pmf" . $majorVersion . ": " . $tableNames;
+    $text[] = "-- pmf".$majorVersion.": ".$tableNames;
     $text[] = "-- DO NOT REMOVE THE FIRST LINE!";
-    $text[] = "-- pmftableprefix: " . PMF_Db::getTablePrefix();
+    $text[] = "-- pmftableprefix: ".PMF_Db::getTablePrefix();
     $text[] = "-- DO NOT REMOVE THE LINES ABOVE!";
     $text[] = "-- Otherwise this backup will be broken.";
 
@@ -86,7 +86,7 @@ 
             header($header);
             foreach (explode(' ', $tableNames) as $table) {
                 print implode("\r\n", $text);
-                $text = $dbHelper->buildInsertQueries("SELECT * FROM " . $table, $table);
+                $text = $dbHelper->buildInsertQueries("SELECT * FROM ".$table, $table);
             }
             break;
         case 'backup_logs' :
@@ -98,7 +98,7 @@ 
             header($header);
             foreach (explode(' ', $tableNames) as $table) {
                 print implode("\r\n", $text);
-                $text = $dbHelper->buildInsertQueries("SELECT * FROM " . $table, $table);
+                $text = $dbHelper->buildInsertQueries("SELECT * FROM ".$table, $table);
             }
             break;
     }

phpmyfaq/admin/stat.browser.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,8 +30,8 @@ 
 
     $perpage   = 50;
     $day       = PMF_Filter::filterInput(INPUT_POST, 'day', FILTER_VALIDATE_INT);
-    $firstHour = mktime (0, 0, 0, date('m', $day), date('d', $day), date('Y', $day));
-    $lastHour  = mktime (23, 59, 59, date('m', $day), date('d', $day), date('Y', $day));
+    $firstHour = mktime(0, 0, 0, date('m', $day), date('d', $day), date('Y', $day));
+    $lastHour  = mktime(23, 59, 59, date('m', $day), date('d', $day), date('Y', $day));
     
     $session     = new PMF_Session($faqConfig);
     $sessiondata = $session->getSessionsbyDate($firstHour, $lastHour);
@@ -40,7 +40,7 @@ 
         <header class="row">
             <div class="col-lg-12">
                 <h2 class="page-header">
-                    <i class="fa fa-tasks"></i> <?php echo $PMF_LANG['ad_sess_session'] . ' ' . date("Y-m-d", $day); ?>
+                    <i class="fa fa-tasks"></i> <?php echo $PMF_LANG['ad_sess_session'].' '.date("Y-m-d", $day); ?>
                 </h2>
             </div>
         </header>

phpmyfaq/admin/stat.search.php

Spacing +9 added lines, -9 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();
 }
 ?>
@@ -47,9 +47,9 @@ 
 
     $perpage = 15;
     $pages   = PMF_Filter::filterInput(INPUT_GET, 'pages', FILTER_VALIDATE_INT);
-    $page    = PMF_Filter::filterInput(INPUT_GET, 'page' , FILTER_VALIDATE_INT, 1);
+    $page    = PMF_Filter::filterInput(INPUT_GET, 'page', FILTER_VALIDATE_INT, 1);
     
-    $search        = new PMF_Search($faqConfig);
+    $search = new PMF_Search($faqConfig);
 
     if ('truncatesearchterms' === $action) {
         if ($search->deleteAllSearchTerms()) {
@@ -63,10 +63,10 @@ 
     $searchesList  = $search->getMostPopularSearches($searchesCount + 1, true);
 
     if (is_null($pages)) {
-        $pages = round((count($searchesList) + ($perpage / 3)) / $perpage, 0);
+        $pages = round((count($searchesList) + ($perpage/3))/$perpage, 0);
     }
     
-    $start = ($page - 1) * $perpage;
+    $start = ($page - 1)*$perpage;
     $ende  = $start + $perpage;
 
     $baseUrl = sprintf(
@@ -106,7 +106,7 @@ 
     $counter = $displayedCounter = 0;
     $self    = substr(__FILE__, strlen($_SERVER['DOCUMENT_ROOT']));
 
-    foreach($searchesList as $searchItem) {
+    foreach ($searchesList as $searchItem) {
 
         if ($displayedCounter >= $perpage) {
             $displayedCounter++;
@@ -119,10 +119,10 @@ 
         }
         $displayedCounter++;
         
-        $num = round(($searchItem['number']*100 / $searchesCount), 2);
+        $num = round(($searchItem['number']*100/$searchesCount), 2);
 ?>
                     <tr class="row_search_id_<?php echo $searchItem['id'] ?>">
-                        <td><?php echo PMF_String::htmlspecialchars($searchItem['searchterm']);  ?></td>
+                        <td><?php echo PMF_String::htmlspecialchars($searchItem['searchterm']); ?></td>
                         <td><?php echo $searchItem['number'] ?></td>
                         <td><?php echo $languageCodes[PMF_String::strtoupper($searchItem['lang'])] ?></td>
                         <td><meter max="100" value="<?php echo $num; ?>"></td>

phpmyfaq/admin/ajax.trans.php

Spacing +22 added lines, -22 removed lines

@@ -22,10 +22,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();
 }
 
@@ -44,7 +44,7 @@ 
             if (is_string($val)) {
                 $val = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val);
                 $val = str_replace("'", "\\'", $val);
-                $_SESSION['trans']['rightVarsOnly']["PMF_LANG[$key]"]  = $val;
+                $_SESSION['trans']['rightVarsOnly']["PMF_LANG[$key]"] = $val;
             } elseif (is_array($val)) {
                 /**
                  * Here we deal with a two dimensional array
@@ -59,13 +59,13 @@ 
         
         foreach ((array)@$_POST['LANG_CONF'] as $key => $val) {
             // if string like array(blah-blah-blah), extract the contents inside the brackets
-            if (preg_match('/^\s*array\s*\(\s*(\d+.+)\s*\).*$/',$val,$matches1)) {
+            if (preg_match('/^\s*array\s*\(\s*(\d+.+)\s*\).*$/', $val, $matches1)) {
                 // split the resulting string of delimiters such as "number =>"
                 $valArr = preg_split(
                     '/\s*(\d+)\s*\=\>\s*/',
                     $matches1[1],
                     null,
-                    PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY
+                    PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
                 );
                 // in an array $valArr contents like  "number substring", "substring", "number substring", "substring", ...
                 $numVal = count($valArr);
@@ -84,12 +84,12 @@ 
                             }
                         }
                     }
-                    $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"] = 'array('.implode(", ",$newValArr).')';
+                    $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"] = 'array('.implode(", ", $newValArr).')';
                 }
             } else {  // compatibility for old behavior
                 $val = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val);
                 $val = str_replace("'", "\\'", $val);
-                $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"]  = $val;
+                $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"] = $val;
             }
         }
         
@@ -104,14 +104,14 @@ 
         }
         
         $lang     = strtolower($_SESSION['trans']['rightVarsOnly']["PMF_LANG[metaLanguage]"]);
-        $filename = PMF_ROOT_DIR . "/lang/language_" . $lang . ".php";
+        $filename = PMF_ROOT_DIR."/lang/language_".$lang.".php";
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+        if (!is_writable(PMF_ROOT_DIR."/lang")) {
             $response->setData(0);
             break;
         }     
         
-        if (!copy($filename, PMF_ROOT_DIR . "/lang/language_$lang.bak.php")) {
+        if (!copy($filename, PMF_ROOT_DIR."/lang/language_$lang.bak.php")) {
             $response->setData(0);
             break;
         }
@@ -133,7 +133,7 @@ 
             if (0 === strpos($key, 'PMF_LANG')) {
                 $val = "'$val'";
             }
-            array_push($tmpLines, '$' . str_replace(array('[', ']'), array("['", "']"), $key) . " = $val;");
+            array_push($tmpLines, '$'.str_replace(array('[', ']'), array("['", "']"), $key)." = $val;");
         }
         
         $newFileContents .= implode("\n", $tmpLines);
@@ -153,17 +153,17 @@ 
          
         $lang = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+        if (!is_writable(PMF_ROOT_DIR."/lang")) {
             $response->setData(0);
             break;
         }     
         
-        if (!copy(PMF_ROOT_DIR . "/lang/language_$lang.php", PMF_ROOT_DIR . "/lang/language_$lang.bak.php")) {
+        if (!copy(PMF_ROOT_DIR."/lang/language_$lang.php", PMF_ROOT_DIR."/lang/language_$lang.bak.php")) {
             $response->setData(0);
             break;
         }
         
-        if (!unlink(PMF_ROOT_DIR . "/lang/language_$lang.php")) {
+        if (!unlink(PMF_ROOT_DIR."/lang/language_$lang.php")) {
             $response->setData(0);
             break;
         }
@@ -178,7 +178,7 @@ 
             break;
         }        
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+        if (!is_writable(PMF_ROOT_DIR."/lang")) {
             $response->setData(0);
             break;
         }
@@ -187,17 +187,17 @@ 
         $langName    = @$languageCodes[$langCode];
         $langCharset = "UTF-8";
         $langDir     = PMF_Filter::filterInput(INPUT_POST, 'langdir', FILTER_SANITIZE_STRING);
-        $langNPlurals= strval(PMF_Filter::filterVar(@$_POST['langnplurals'], FILTER_VALIDATE_INT, -1));
+        $langNPlurals = strval(PMF_Filter::filterVar(@$_POST['langnplurals'], FILTER_VALIDATE_INT, -1));
         $langDesc    = PMF_Filter::filterInput(INPUT_POST, 'langdesc', FILTER_SANITIZE_STRING);
-        $author      = (array) @$_POST['author'];
+        $author      = (array)@$_POST['author'];
         
-        if(empty($langCode) || empty($langName) || empty($langCharset) ||
+        if (empty($langCode) || empty($langName) || empty($langCharset) ||
             empty($langDir) || empty($langDesc) || empty($author)) {
             $response->setData(0);
             break;
         }
         
-        $fileTpl     = <<<FILE
+        $fileTpl = <<<FILE
 <?php
 /**
  * %s
@@ -231,7 +231,7 @@ 
         $fileTpl = sprintf($fileTpl, $langDesc, $authorTpl, date('Y-m-d'), $langCode, date('Y'),
                                      $langCharset, strtolower($langCode), $langName, $langDir, $langNPlurals);
 
-        $retval = @file_put_contents(PMF_ROOT_DIR . '/lang/language_' . strtolower($langCode) . '.php', $fileTpl);
+        $retval = @file_put_contents(PMF_ROOT_DIR.'/lang/language_'.strtolower($langCode).'.php', $fileTpl);
         $response->setData(intval($retval));
     break;
     
@@ -239,7 +239,7 @@ 
     case 'send_translated_file':
         
         $lang     = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
-        $filename = PMF_ROOT_DIR . "/lang/language_" . $lang . ".php";
+        $filename = PMF_ROOT_DIR."/lang/language_".$lang.".php";
         
         if (!file_exists($filename)) {
             $response->setData(0);
@@ -258,7 +258,7 @@ 
         $mail->addTo('thorsten@phpmyfaq.de');
         $mail->addAttachment($filename, null, 'text/plain');
 
-        $response->setData((int) $mail->send());
+        $response->setData((int)$mail->send());
     break;
 }
 

Indentation +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
         }
         
         $fileTpl = sprintf($fileTpl, $langDesc, $authorTpl, date('Y-m-d'), $langCode, date('Y'),
-                                     $langCharset, strtolower($langCode), $langName, $langDir, $langNPlurals);
+                                        $langCharset, strtolower($langCode), $langName, $langDir, $langNPlurals);
 
         $retval = @file_put_contents(PMF_ROOT_DIR . '/lang/language_' . strtolower($langCode) . '.php', $fileTpl);
         $response->setData(intval($retval));

phpmyfaq/admin/record.show.php

Spacing +31 added lines, -31 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();
 }
 ?>
@@ -149,13 +149,13 @@ 
     $searchTerm     = PMF_Filter::filterInput(INPUT_POST, 'searchterm', FILTER_SANITIZE_STRIPPED);
 
     if (!is_null($linkState)) {
-        $cond[PMF_Db::getTablePrefix() . 'faqdata.links_state'] = 'linkbad';
+        $cond[PMF_Db::getTablePrefix().'faqdata.links_state'] = 'linkbad';
         $linkState                             = ' checked="checked" ';
         $internalSearch                       .= '&linkstate=linkbad';
     }
     if (!is_null($searchCat)) {
-        $internalSearch .= "&searchcat=" . $searchCat;
-        $cond[PMF_Db::getTablePrefix() . 'faqcategoryrelations.category_id'] = array_merge(
+        $internalSearch .= "&searchcat=".$searchCat;
+        $cond[PMF_Db::getTablePrefix().'faqcategoryrelations.category_id'] = array_merge(
             array($searchCat),
             $category->getChildNodes($searchCat)
         );
@@ -205,30 +205,30 @@ 
 
     } else {
 
-        $fdTable  = PMF_Db::getTablePrefix() . 'faqdata';
-        $fcrTable = PMF_Db::getTablePrefix() . 'faqcategoryrelations';
+        $fdTable  = PMF_Db::getTablePrefix().'faqdata';
+        $fcrTable = PMF_Db::getTablePrefix().'faqcategoryrelations';
         $search   = PMF_Search_Factory::create($faqConfig, array('database' => PMF_Db::getType()));
 
         $search->setTable($fdTable)
             ->setResultColumns(array(
-                    $fdTable . '.id AS id',
-                    $fdTable . '.lang AS lang',
-                    $fdTable . '.solution_id AS solution_id',
-                    $fcrTable . '.category_id AS category_id',
-                    $fdTable . '.sticky AS sticky',
-                    $fdTable . '.active AS active',
-                    $fdTable . '.thema AS thema',
-                    $fdTable . '.content AS content',
-                    $fdTable . '.datum AS date'))
+                    $fdTable.'.id AS id',
+                    $fdTable.'.lang AS lang',
+                    $fdTable.'.solution_id AS solution_id',
+                    $fcrTable.'.category_id AS category_id',
+                    $fdTable.'.sticky AS sticky',
+                    $fdTable.'.active AS active',
+                    $fdTable.'.thema AS thema',
+                    $fdTable.'.content AS content',
+                    $fdTable.'.datum AS date'))
             ->setJoinedTable($fcrTable)
             ->setJoinedColumns(array(
-                    $fdTable . '.id = ' . $fcrTable . '.record_id',
-                    $fdTable . '.lang = ' . $fcrTable . '.record_lang'));
+                    $fdTable.'.id = '.$fcrTable.'.record_id',
+                    $fdTable.'.lang = '.$fcrTable.'.record_lang'));
 
         if (is_numeric($searchTerm)) {
-            $search->setMatchingColumns(array($fdTable . '.solution_id'));
+            $search->setMatchingColumns(array($fdTable.'.solution_id'));
         } else {
-            $search->setMatchingColumns(array($fdTable . '.thema', $fdTable . '.content', $fdTable . '.keywords'));
+            $search->setMatchingColumns(array($fdTable.'.thema', $fdTable.'.content', $fdTable.'.keywords'));
         }
 
         $result         = $search->search($searchTerm);
@@ -291,7 +291,7 @@ 
         }
         
         foreach ($faq->faqRecords as $record) {
-            $catInfo =  '';
+            $catInfo = '';
             $cid     = $record['category_id'];
             
             if (isset($numRecordsByCat[$cid]) && ($numRecordsByCat[$cid] > 0)) {
@@ -330,7 +330,7 @@ 
         <p>
             <a class="btn showhideCategory" data-category-id="<?php echo $cid; ?>">
                 <i class="icon fa fa-arrow-right"></i>
-                <strong><?php echo $category->getPath($cid); ?></strong> <?php echo $catInfo;?>
+                <strong><?php echo $category->getPath($cid); ?></strong> <?php echo $catInfo; ?>
             </a>
         </p>
         <div id="category_<?php echo $cid; ?>" style="display: none;">
@@ -386,7 +386,7 @@ 
 <?php
             }
 ?>
-        <tr id="record_<?php echo $record['id'] . '_' . $record['lang']; ?>">
+        <tr id="record_<?php echo $record['id'].'_'.$record['lang']; ?>">
             <td style="width: 24px; text-align: right;">
                 <a href="?action=editentry&amp;id=<?php echo $record['id']; ?>&amp;lang=<?php echo $record['lang']; ?>">
                     <?php echo $record['id']; ?>
@@ -403,17 +403,17 @@ 
             </td>
             <td style="width: 56px;">
                 <input type="checkbox" lang="<?php echo $record['lang'] ?>"
-                       onclick="saveStatus(<?php echo $cid . ', [' . $record['id'] . ']' ?>, 'sticky');"
-                       id="sticky_record_<?php echo $cid . '_' . $record['id'] ?>"
-                    <?php echo ($record['sticky'] ? 'checked' :  '    ') ?>>
+                       onclick="saveStatus(<?php echo $cid.', ['.$record['id'].']' ?>, 'sticky');"
+                       id="sticky_record_<?php echo $cid.'_'.$record['id'] ?>"
+                    <?php echo ($record['sticky'] ? 'checked' : '    ') ?>>
             </td>
             <td>
                 <?php if ($user->perm->checkRight($user->getUserId(), 'approverec') && isset($numVisits[$record['id']])) { ?>
                 <input type="checkbox" lang="<?php echo $record['lang'] ?>"
-                       onclick="saveStatus(<?php echo $cid . ', [' . $record['id'] . ']' ?>, 'active');"
-                       id="active_record_<?php echo $cid . '_' . $record['id'] ?>"
+                       onclick="saveStatus(<?php echo $cid.', ['.$record['id'].']' ?>, 'active');"
+                       id="active_record_<?php echo $cid.'_'.$record['id'] ?>"
                     <?php echo ('yes' == $record['active'] ? 'checked' : '    ') ?>>
-                <?php }  else { ?>
+                <?php } else { ?>
                 <span class="label label-important"><i class="fa fa-white fa fa-ban-circle"></i></span>
                 <?php } ?>
             </td>
@@ -483,7 +483,7 @@ 
     if ('' === $categoryId) {
         $categoryId = 0;
     }
-    echo "                id_map[" . $categoryId . "] = [" . implode(',', $recordIds) . "];\n";
+    echo "                id_map[".$categoryId."] = [".implode(',', $recordIds)."];\n";
 }
 ?>
             for (var i = 0; i < id_map[id].length; i++) {
@@ -558,7 +558,7 @@ 
          */
         function deleteRecord(record_id, record_lang)
         {
-            if (confirm('<?php echo addslashes($PMF_LANG["ad_entry_del_1"] . " " . $PMF_LANG["ad_entry_del_3"]); ?>')) {
+            if (confirm('<?php echo addslashes($PMF_LANG["ad_entry_del_1"]." ".$PMF_LANG["ad_entry_del_3"]); ?>')) {
                 $('#saving_data_indicator').html('<img src="images/indicator.gif" /> deleting ...');
                 $.ajax({
                     type:    "POST",

Braces +1 added lines, -1 removed lines

@@ -413,7 +413,7 @@
                        onclick="saveStatus(<?php echo $cid . ', [' . $record['id'] . ']' ?>, 'active');"
                        id="active_record_<?php echo $cid . '_' . $record['id'] ?>"
                     <?php echo ('yes' == $record['active'] ? 'checked' : '    ') ?>>
-                <?php }  else { ?>
+                <?php } else { ?>
                 <span class="label label-important"><i class="fa fa-white fa fa-ban-circle"></i></span>
                 <?php } ?>
             </td>

phpmyfaq/admin/record.filemanager.php

Spacing +3 added lines, -3 removed lines

@@ -19,12 +19,12 @@
 
 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();
 }
 
-$rootPath   = dirname(dirname(__DIR__)) . 'images/';
+$rootPath   = dirname(dirname(__DIR__)).'images/';
 $fileSystem = new PMF_Filesystem($rootPath);
\ No newline at end of file

phpmyfaq/admin/category.cut.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();
 }
 
@@ -48,7 +48,7 @@ 
     foreach ($category->catTree as $cat) {
         $indent = str_repeat('…', $cat['indent']);
         if ($id != $cat['id']) {
-            $templateVars['categoryOptions'][$cat['id']] = $indent . $cat['name'];
+            $templateVars['categoryOptions'][$cat['id']] = $indent.$cat['name'];
         }
     }
 

phpmyfaq/admin/record.edit.php

Spacing +7 added lines, -7 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();
 }
 
@@ -72,7 +72,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';
         }
@@ -114,14 +114,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';
         }
@@ -334,7 +334,7 @@ 
                                     <?php
                                     if (0 === $faqData['id']) {
                                         $faqData['id'] = $faqConfig->getDb()->nextId(
-                                            PMF_Db::getTablePrefix() . 'faqdata',
+                                            PMF_Db::getTablePrefix().'faqdata',
                                             'id'
                                         );
                                     }
@@ -569,7 +569,7 @@ 
                     <div class="panel-body">
                         <div class="form-group">
                             <div class="col-lg-offset-1 col-lg-10">
-                                <?php if($user->perm->checkRight($user->getUserId(), 'approverec')):
+                                <?php if ($user->perm->checkRight($user->getUserId(), 'approverec')):
                                     if (isset($faqData['active']) && $faqData['active'] == 'yes') {
                                         $suf = ' checked';
                                         $sul = null;

Braces +10 added lines, -4 removed lines

@@ -589,10 +589,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 />
-                                        <?php echo $PMF_LANG['ad_gen_no']; ?>
+                                        <?php echo $PMF_LANG['ad_gen_no'];
+}
+?>
                                     </label>
                                 <?php endif; ?>
                             </div>
@@ -647,9 +650,12 @@ 
                             </div>
                         </div>
                     </div>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                         <input type="hidden" name="grouppermission" value="all" />
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
                     <div class="panel-heading">
                         <?php echo $PMF_LANG['ad_entry_userpermission']; ?>
                     </div>