thorsten / phpMyFAQ

phpmyfaq/admin/index.php

Spacing +10 added lines, -10 removed lines

@@ -28,7 +28,7 @@ 
 //
 // Check if config/database.php exist -> if not, redirect to installer
 //
-if (!file_exists(PMF_ROOT_DIR . '/config/database.php')) {
+if (!file_exists(PMF_ROOT_DIR.'/config/database.php')) {
     RedirectResponse::create(str_replace('admin/index.php', '', $_SERVER['SCRIPT_NAME']).'setup/index.php')
         ->send();
     exit;
@@ -42,7 +42,7 @@ 
 //
 // Bootstrapping
 //
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
 // get language (default: english)
 $Language = new PMF_Language($faqConfig);
@@ -53,10 +53,10 @@ 
 
 if (isset($LANGCODE) && PMF_Language::isASupportedLanguage($LANGCODE)) {
     // Overwrite English strings with the ones we have in the current language
-    if (! file_exists(PMF_ROOT_DIR . '/lang/language_' . $LANGCODE . '.php')) {
+    if (!file_exists(PMF_ROOT_DIR.'/lang/language_'.$LANGCODE.'.php')) {
         $LANGCODE = 'en';
     }
-    require PMF_ROOT_DIR . '/lang/language_' . $LANGCODE . '.php';
+    require PMF_ROOT_DIR.'/lang/language_'.$LANGCODE.'.php';
 } else {
     $LANGCODE = 'en';
 }
@@ -145,19 +145,19 @@ 
     } else {
         // error
         $logging = new PMF_Logging($faqConfig);
-        $logging->logAdmin($user, 'Loginerror\nLogin: '.$faqusername.'\nErrors: ' . implode(', ', $user->errors));
+        $logging->logAdmin($user, 'Loginerror\nLogin: '.$faqusername.'\nErrors: '.implode(', ', $user->errors));
         $error = $PMF_LANG['ad_auth_fail'];
     }
 } else {
     // Try to authenticate with cookie information
     $user = PMF_User_CurrentUser::getFromCookie($faqConfig);
     // authenticate with session information
-    if (! $user instanceof PMF_User_CurrentUser) {
+    if (!$user instanceof PMF_User_CurrentUser) {
         $user = PMF_User_CurrentUser::getFromSession($faqConfig);
     }
     if ($user instanceof PMF_User_CurrentUser) {
         $auth = true;
-    }  else {
+    } else {
         $user = new PMF_User_CurrentUser($faqConfig);
     }
 }
@@ -168,7 +168,7 @@ 
     $auth = null;
     $ssoLogout = $faqConfig->get('security.ssoLogoutRedirect');
     if ($faqConfig->get('security.ssoSupport') && !empty ($ssoLogout)) {
-        header ("Location: $ssoLogout");
+        header("Location: $ssoLogout");
     }
 }
 
@@ -234,7 +234,7 @@ 
 }
 
 // are we running a PMF export file request?
-switch($action) {
+switch ($action) {
     case 'exportfile':
         require 'export.file.php';
         exit();
@@ -247,7 +247,7 @@ 
 
 //Initializing Twig
 $twig = new Twig_Environment(
-    new Twig_Loader_Filesystem(PMF_ROOT_DIR . '/admin/assets/twig')
+    new Twig_Loader_Filesystem(PMF_ROOT_DIR.'/admin/assets/twig')
 );
 
 // Header of the admin page including the navigation

Braces +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
     }
     if ($user instanceof PMF_User_CurrentUser) {
         $auth = true;
-    }  else {
+    } else {
         $user = new PMF_User_CurrentUser($faqConfig);
     }
 }

phpmyfaq/admin/user.php

Spacing +10 added lines, -10 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();
 }
 
@@ -77,7 +77,7 @@ 
                 $PMF_LANG['ad_msg_savedsuc_1'],
                 $user->getLogin(),
                 $PMF_LANG['ad_msg_savedsuc_2']);
-            $message .= '<script type="text/javascript">updateUser(' . $userId . ');</script>';
+            $message .= '<script type="text/javascript">updateUser('.$userId.');</script>';
             $user     = new PMF_User_CurrentUser($faqConfig);
         }
     }
@@ -105,7 +105,7 @@ 
                 $consonants  = array("b", "c", "d", "f", "g", "h", "j", "k", "l", "m", "n", "p", "r", "s", "t", "v", "w", "x", "y", "z");
                 $vowels      = array("a", "e", "i", "o", "u");
                 $newPassword = '';
-                srand((double)microtime() * 1000000);
+                srand((double)microtime()*1000000);
                 for ($i = 1; $i <= 4; $i++) {
                     $newPassword .= $consonants[rand(0, 19)];
                     $newPassword .= $vowels[rand(0, 4)];
@@ -119,7 +119,7 @@ 
                     $userData['display_name'],
                     $user->getLogin(),
                     $newPassword);
-                $result        = $mail->send();
+                $result = $mail->send();
                 unset($mail);
             }
 
@@ -130,7 +130,7 @@ 
                     $PMF_LANG['ad_msg_savedsuc_1'],
                     $user->getLogin(),
                     $PMF_LANG['ad_msg_savedsuc_2']);
-                $message .= '<script type="text/javascript">updateUser(' . $userId . ');</script>';
+                $message .= '<script type="text/javascript">updateUser('.$userId.');</script>';
             }
         }
     }
@@ -268,7 +268,7 @@ 
             $userAction = 'add';
             $message    = '<p class="alert alert-danger">';
             foreach ($messages as $err) {
-                $message .= $err . '<br />';
+                $message .= $err.'<br />';
             }
             $message .= '</p>';
         }
@@ -328,8 +328,8 @@ 
         $numUsers  = count($allUsers);
         $page      = PMF_Filter::filterInput(INPUT_GET, 'page', FILTER_VALIDATE_INT, 0);
         $perPage   = 10;
-        $numPages  = ceil($numUsers / $perPage);
-        $lastPage  = $page * $perPage;
+        $numPages  = ceil($numUsers/$perPage);
+        $lastPage  = $page*$perPage;
         $firstPage = $lastPage - $perPage;
 
         $baseUrl = sprintf(
@@ -381,7 +381,7 @@ 
             $templateVars['users'][] = array(
                 'id'               => $user->getUserId(),
                 'displayName'      => $user->getUserData('display_name'),
-                'editUrl'          => '?action=user&amp;user_id=' . $user->getUserData('user_id'),
+                'editUrl'          => '?action=user&amp;user_id='.$user->getUserData('user_id'),
                 'email'            => $user->getUserData('email'),
                 'icon'             => $icon,
                 'loginName'        => $user->getLogin(),

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();
 }
 
@@ -32,7 +32,7 @@ 
             <h2 class="page-header">
                 <i class="fa fa-wrench fa-fw"></i> <?php print $PMF_LANG['ad_menu_instances']; ?>
                 <?php if ($user->perm->checkRight($user->getUserId(), 'addinstances') &&
-                          is_writable(PMF_ROOT_DIR . DIRECTORY_SEPARATOR . 'multisite')): ?>
+                          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="fa fa-plus"></i> <?php echo $PMF_LANG["ad_instance_add"] ?>
@@ -52,7 +52,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-danger">%s</p>',
             $PMF_LANG["ad_instance_error_notwritable"]
@@ -104,7 +104,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/dashboard.php

Spacing +10 added lines, -10 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();
 }
 
@@ -31,12 +31,12 @@ 
 
 $templateVars = array(
     'PMF_LANG'                 => $PMF_LANG,
-    'dashboardArticles'        => $faqTableInfo[PMF_Db::getTablePrefix() . "faqdata"],
-    'dashboardComments'        => $faqTableInfo[PMF_Db::getTablePrefix() . "faqcomments"],
-    'dashboardNews'            => $faqTableInfo[PMF_Db::getTablePrefix() . "faqnews"],
-    'dashboardOpenQuestions'   => $faqTableInfo[PMF_Db::getTablePrefix() . "faqquestions"],
-    'dashboardUsers'           => $faqTableInfo[PMF_Db::getTablePrefix() . 'faquser'] - 1,
-    'dashboardVisits'          => $faqTableInfo[PMF_Db::getTablePrefix() . 'faqsessions'],
+    'dashboardArticles'        => $faqTableInfo[PMF_Db::getTablePrefix()."faqdata"],
+    'dashboardComments'        => $faqTableInfo[PMF_Db::getTablePrefix()."faqcomments"],
+    'dashboardNews'            => $faqTableInfo[PMF_Db::getTablePrefix()."faqnews"],
+    'dashboardOpenQuestions'   => $faqTableInfo[PMF_Db::getTablePrefix()."faqquestions"],
+    'dashboardUsers'           => $faqTableInfo[PMF_Db::getTablePrefix().'faquser'] - 1,
+    'dashboardVisits'          => $faqTableInfo[PMF_Db::getTablePrefix().'faqsessions'],
     'enableUserTracking'       => $faqConfig->get('main.enableUserTracking'),
     'inMaintenanceMode'        => $faqConfig->get('main.maintenanceMode'),
     'onlineVerificationActive' => false,
@@ -75,7 +75,7 @@ 
     $templateVars['onlineVerificationActive'] = true;
 
     set_error_handler(
-        function ($severity, $message, $file, $line)
+        function($severity, $message, $file, $line)
         {
             throw new ErrorException($message, $severity, $severity, $file, $line);
         }
@@ -86,7 +86,7 @@ 
     $versionCheckError = true;
     try {
         $remoteHashes = file_get_contents(
-            'http://www.phpmyfaq.de/api/verify/' . $faqConfig->get('main.currentVersion')
+            'http://www.phpmyfaq.de/api/verify/'.$faqConfig->get('main.currentVersion')
         );
         if (!is_array(json_decode($remoteHashes, true))) {
             $versionCheckError = true;

phpmyfaq/admin/session.keepalive.php

Spacing +4 added lines, -4 removed lines

@@ -31,15 +31,15 @@ 
 //
 // Bootstrapping
 //
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
-require PMF_ROOT_DIR . '/lang/language_en.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/lang/language_en.php';
 
 //
 // Get language (default: english)
 //
 $language = PMF_Filter::filterInput(INPUT_GET, 'lang', FILTER_SANITIZE_STRING);
 if (!is_null($language) && PMF_Language::isASupportedLanguage($language)) {
-    require PMF_ROOT_DIR . '/lang/language_' . $language . '.php';
+    require PMF_ROOT_DIR.'/lang/language_'.$language.'.php';
 }
 
 //
@@ -48,7 +48,7 @@ 
 PMF_String::init($language);
 
 $user        = PMF_User_CurrentUser::getFromSession($faqConfig);
-$refreshTime = (PMF_SESSION_ID_EXPIRES - PMF_SESSION_ID_REFRESH) * 60;
+$refreshTime = (PMF_SESSION_ID_EXPIRES - PMF_SESSION_ID_REFRESH)*60;
 ?>
 <!DOCTYPE html>
 <html lang="<?php print $PMF_LANG['metaLanguage']; ?>" class="no-js">

phpmyfaq/admin/stopwordsconfig.main.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();
 }
 
@@ -46,7 +46,7 @@ 
                 <select onchange="loadStopWordsByLang(this.options[this.selectedIndex].value)"
                         id="stopwords_lang_selector">
                 <option value="none">---</option>
-    <?php foreach($sortedLanguageCodes as $key => $value) { ?>
+    <?php foreach ($sortedLanguageCodes as $key => $value) { ?>
         <option value="<?php echo strtolower($key); ?>"><?php echo $value; ?></option>
     <?php } ?>
                 </select>

phpmyfaq/admin/stat.ratings.php

Spacing +6 added lines, -6 removed lines

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

phpmyfaq/admin/header.php

Spacing +7 added lines, -7 removed lines

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

phpmyfaq/admin/ajax.group.php

Indentation +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
             foreach ($userList as $single_user) {
                 $user->getUserById($single_user);
                 $users[] = array('user_id' => $user->getUserId(),
-                                 'login'   => $user->getLogin());
+                                    'login'   => $user->getLogin());
             }
             echo $response->setData($users);
             break;
@@ -83,7 +83,7 @@ 
             foreach ($memberList as $single_member) {
                 $user->getUserById($single_member);
                 $members[] = array('user_id' => $user->getUserId(),
-                                   'login'   => $user->getLogin());
+                                    'login'   => $user->getLogin());
             }
             echo $response->setData($members);
             break;

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