thorsten / phpMyFAQ

phpmyfaq/admin/record.edit.php

Braces +10 added lines, -4 removed lines

@@ -623,12 +623,15 @@ 
                                         <input type="radio" name="active" value="no"
                                             <?php if (isset($sul)) { echo $sul; } ?>>
                                         <?php echo $PMF_LANG['ad_gen_no'] ?>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                         <br>
                                         <input type="radio" name="active" value="no" checked>
                                         <?php echo $PMF_LANG['ad_gen_no'] ?>
 
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                                     </label>
                             </div>
                         </div>
@@ -689,9 +692,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>

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
             $queryString = 'saveentry&id='.$faqData['id'];
         } else {
             $queryString = 'insertentry';
-            if(isset($categoryId)){ 
+            if (isset($categoryId)) { 
                 $categories = $categoryId;
             } 
         }

phpmyfaq/admin/category.main.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
                             <i aria-hidden="true" class="fa fa-plus fa-fw"></i> <?php echo $PMF_LANG['ad_kateg_add']; ?>
                         </a>
                         <a class="btn btn-info" href="?action=showcategory">
-                            <i aria-hidden="true" class="fa fa-th fa-fw"></i> <?php echo $PMF_LANG['ad_categ_show'];?>
+                            <i aria-hidden="true" class="fa fa-th fa-fw"></i> <?php echo $PMF_LANG['ad_categ_show']; ?>
                         </a>
                     </div>
                 </h2>

Indentation +24 added lines, -24 removed lines

@@ -322,26 +322,26 @@ 
         // add faq to category (always)
         printf('
            <a class="btn btn-info btn-sm" href="?action=editentry&amp;cat=%s&amp;lang=%s"><span title="%s" class="fa fa-file-text-o fa-fw"></span></a> ',
-           $cat['id'],
-           $cat['lang'],
-           $PMF_LANG['ad_quick_entry']
+            $cat['id'],
+            $cat['lang'],
+            $PMF_LANG['ad_quick_entry']
         );
 
         if ($cat['lang'] == $lang) {
             // add sub category (if current language)
-           printf('
+            printf('
                <a class="btn btn-info btn-sm" href="?action=addcategory&amp;cat=%s&amp;lang=%s"><span title="%s" class="fa fa-plus fa-fw"></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-sm" href="?action=editcategory&amp;cat=%s"><span title="%s" class="fa fa-edit fa-fw"></a> ',
-               $cat['id'],
-               $PMF_LANG['ad_kateg_rename']
-           );
+                $cat['id'],
+                $PMF_LANG['ad_kateg_rename']
+            );
         }
 
         // translate category (always)
@@ -365,20 +365,20 @@ 
 
         if ($cat['lang'] == $lang) {
             // cut category (if current language)
-           printf(
-               '<a class="btn btn-warning btn-sm" href="?action=cutcategory&amp;cat=%s"><span title="%s" class="fa fa-cut fa-fw"></a> ',
-               $cat['id'],
-               $PMF_LANG['ad_categ_cut']
-           );
+            printf(
+                '<a class="btn btn-warning btn-sm" href="?action=cutcategory&amp;cat=%s"><span title="%s" class="fa fa-cut fa-fw"></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-sm" href="?action=movecategory&amp;cat=%s&amp;parent_id=%s"><span title="%s" class="fa fa-sort fa-fw"></a> ',
-                  $cat['id'],
-                  $cat['parent_id'],
-                  $PMF_LANG['ad_categ_move']
-              );
+                printf(
+                    '<a class="btn btn-warning btn-sm" href="?action=movecategory&amp;cat=%s&amp;parent_id=%s"><span title="%s" class="fa fa-sort fa-fw"></a> ',
+                    $cat['id'],
+                    $cat['parent_id'],
+                    $PMF_LANG['ad_categ_move']
+                );
             }
         }
 

phpmyfaq/main.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         'writeNumberOfArticles' => $plr->getMsg('plmsgHomeArticlesOnline', $faq->getNumberOfRecords($LANGCODE)),
         'writeSendAdress' => '?'.$sids.'action=search',
         'searchBox' => $PMF_LANG['msgSearch'],
-        'categoryId' => ($cat === 0) ? '%' : (int) $cat,
+        'categoryId' => ($cat === 0) ? '%' : (int)$cat,
         'msgSearch' => sprintf(
             '<a class="help" href="%sindex.php?action=search">%s</a>',
             $faqSystem->getSystemUri($faqConfig),

phpmyfaq/feed/news/rss.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
     }
 } else {
     $user = PMF_User_CurrentUser::getFromCookie($faqConfig);
-    if (! $user instanceof PMF_User_CurrentUser) {
+    if (!$user instanceof PMF_User_CurrentUser) {
         $user = PMF_User_CurrentUser::getFromSession($faqConfig);
     }
 }

phpmyfaq/admin/footer.php

Braces +5 added lines, -2 removed lines

@@ -169,12 +169,15 @@
             action: 'ajax',
             ajax: 'recordAdd'
         };
-        <?php else: ?>
+        <?php else {
+    : ?>
         var data = {
             action: 'ajax',
             ajax: 'recordSave'
         };
-        <?php endif; ?>
+        <?php endif;
+}
+?>
 
         $.each($('#faqEditor').serializeArray(), function(i, field) {
             data[field.name] = field.value;

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 <iframe id="keepPMFSessionAlive" src="session.keepalive.php?lang=<?php echo $LANGCODE ?>" width="0" height="0"
         style="display: none;"></iframe>
 <?php
-    if (isset($auth) && (('takequestion' == $action) || ('editentry' == $action) || ('editpreview'  == $action) ||
+    if (isset($auth) && (('takequestion' == $action) || ('editentry' == $action) || ('editpreview' == $action) ||
                          ('addnews' == $action) || ('editnews' == $action) || ('copyentry' == $action))) {
         if ($faqConfig->get('main.enableWysiwygEditor') == true) {
             ?>

phpmyfaq/admin/backup.import.php

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
                 $errorMessage = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.';
                 break;
             case 2:
-                $errorMessage = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the ' .
+                $errorMessage = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the '.
                                 'HTML form.';
                 break;
             case 3:

phpmyfaq/inc/PMF/Helper/Search.php

Spacing +3 added lines, -3 removed lines

@@ -208,8 +208,8 @@ 
         $confPerPage = $this->_config->get('records.numberOfRecordsPerPage');
         $numOfResults = $resultSet->getNumberOfResults();
 
-        $totalPages = ceil($numOfResults / $confPerPage);
-        $lastPage = $currentPage * $confPerPage;
+        $totalPages = ceil($numOfResults/$confPerPage);
+        $lastPage = $currentPage*$confPerPage;
         $firstPage = $lastPage - $confPerPage;
         if ($lastPage > $numOfResults) {
             $lastPage = $numOfResults;
@@ -286,7 +286,7 @@ 
                 $oLink->itemTitle = $oLink->tooltip = $result->question;
 
                 $html .= '<li>';
-                $html .= $this->renderScore($result->score * 33);
+                $html .= $this->renderScore($result->score*33);
                 $html .= sprintf('<strong>%s</strong>: %s<br />',
                     $categoryInfo[0]['name'],
                     $oLink->toHtmlAnchor()

phpmyfaq/inc/PMF/Auth/Ldap.php

Spacing +3 added lines, -3 removed lines

@@ -215,7 +215,7 @@ 
                 }
 
                 if (false !== $this->ldap->getDn($login)) {
-                    $this->activeServer = (int) $key;
+                    $this->activeServer = (int)$key;
                     break;
                 }
             }
@@ -251,7 +251,7 @@ 
             htmlspecialchars_decode($password)
         );
 
-        if (! $this->ldap->bind($bindLogin, htmlspecialchars_decode($password))) {
+        if (!$this->ldap->bind($bindLogin, htmlspecialchars_decode($password))) {
             $this->errors[] = $this->ldap->error;
 
             return false;
@@ -288,7 +288,7 @@ 
                 }
 
                 if (false !== $this->ldap->getDn($login)) {
-                    $this->activeServer = (int) $key;
+                    $this->activeServer = (int)$key;
                     break;
                 }
             }

phpmyfaq/setup/update.php

Spacing +4 added lines, -4 removed lines

@@ -231,7 +231,7 @@ 
     // Backup of config/elasticsearch.php if exists
     if (file_exists(PMF_ROOT_DIR.'/config/elasticsearch.php')) {
         if (!copy(PMF_ROOT_DIR.'/config/elasticsearch.php', PMF_ROOT_DIR.'/config/elasticsearch.bak.php')) {
-            echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ' .
+            echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file '.
                 '../config/elasticsearch.bak.php could not be written. Please correct this!</p>';
         } else {
             $checkElasticsearchSetupFile = true;
@@ -599,7 +599,7 @@ 
         foreach ($query as $key => $executeQuery) {
             $result = $faqConfig->getDb()->query($executeQuery);
             echo '.';
-            if (!($key % 100)) {
+            if (!($key%100)) {
                 echo '<br />';
             }
             if (!$result) {
@@ -619,7 +619,7 @@ 
             }
             usleep(10000);
             ++$count;
-            if (!($count % 10)) {
+            if (!($count%10)) {
                 ob_flush();
             }
         }
@@ -713,7 +713,7 @@ 
         $faqConfig->add('main.enableGzipCompression', 'true');
 
         if ('sqlite3' === $DB['type']) {
-            $query[] = 'ALTER TABLE ' . $prefix . 'faquser ADD COLUMN success INT(1) NULL DEFAULT 1';
+            $query[] = 'ALTER TABLE '.$prefix.'faquser ADD COLUMN success INT(1) NULL DEFAULT 1';
         } elseif ('pgsql' === $DB['type']) {
             $query[] = 'ALTER TABLE '.$prefix.'faquser ADD success SMALLINT NULL DEFAULT 1';
         } else {

Indentation +5 added lines, -5 removed lines

@@ -160,7 +160,7 @@ 
                 // 2.5 versions only
                 if (version_compare($version, '2.6.0-alpha', '<') && !is_writeable('../template')) {
                     echo '<p class="alert alert-danger text-center"><strong>Please change the directory ../template '.
-                         'and its contents writable (777 on Linux/UNIX).</strong></p>';
+                            'and its contents writable (777 on Linux/UNIX).</strong></p>';
                 }
 
                 // We only support updates from 2.6+
@@ -206,7 +206,7 @@ 
     if (file_exists(PMF_ROOT_DIR.'/config/database.php')) {
         if (!copy(PMF_ROOT_DIR.'/config/database.php', PMF_ROOT_DIR.'/config/database.bak.php')) {
             echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ../config/database.bak.php '.
-                  'could not be written. Please correct this!</p>';
+                    'could not be written. Please correct this!</p>';
         } else {
             $checkDatabaseSetupFile = true;
             $updateMessages[] = 'A backup of your database configuration file has been made.';
@@ -603,8 +603,8 @@ 
             if (!$result) {
                 echo '</div>';
                 echo '<p class="alert alert-danger"><strong>Error:</strong> Please update your version of phpMyFAQ '.
-                      'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.'.
-                      '</p>';
+                        'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.'.
+                        '</p>';
                 printf(
                     '<p class="alert alert-danger"><strong>DB error:</strong> %s</p>',
                     $faqConfig->getDb()->error()
@@ -906,7 +906,7 @@ 
             printf('<span title="%s"><i aria-hidden="true" class="fa fa-circle"></i></span>', $executeQuery);
             if (!$result) {
                 echo '<p class="alert alert-danger"><strong>Error:</strong> Please install your version of phpMyFAQ once again '.
-                      'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>';
+                        'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>';
                 printf('<p class="error"><strong>DB error:</strong> %s</p>', $faqConfig->getDb()->error());
                 printf('<code>%s</code>', htmlentities($executeQuery));
                 PMF_System::renderFooter();