thorsten / phpMyFAQ

phpmyfaq/setup/update.php

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;
         }
@@ -574,8 +574,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()
@@ -851,7 +851,7 @@ 
             printf('<span title="%s"><i 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();

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 {

phpmyfaq/inc/PMF/Configuration.php

Spacing +6 added lines, -6 removed lines

@@ -395,12 +395,12 @@
     public function update(Array $newConfigs)
     {
         $runtimeConfigs = [
-            'core.database',           // PMF_DB_Driver
-            'core.instance',           // PMF_Instance
-            'core.language',           // Language
-            'core.ldap',               // PMF_Ldap
-            'core.ldapConfig',         // $PMF_LDAP
-            'core.elasticsearch',      // Elasticsearch\Client
+            'core.database', // PMF_DB_Driver
+            'core.instance', // PMF_Instance
+            'core.language', // Language
+            'core.ldap', // PMF_Ldap
+            'core.ldapConfig', // $PMF_LDAP
+            'core.elasticsearch', // Elasticsearch\Client
             'core.elasticsearchConfig' // $PMF_ES
         ];
 

phpmyfaq/inc/PMF/Instance/Elasticsearch.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
     public function createIndex()
     {
         $this->client->indices()->create($this->getParams());
-        return $this->putMapping();;
+        return $this->putMapping(); ;
     }
 
     /**
@@ -177,7 +177,7 @@ 
                 'categories' => $faq['category_id']
             ];
 
-            if ($i % 1000 == 0) {
+            if ($i%1000 == 0) {
                 $responses = $this->client->bulk($params);
                 $params = ['body' => []];
                 unset($responses);

phpmyfaq/inc/PMF/Faq.php

Spacing +16 added lines, -16 removed lines

@@ -28,17 +28,17 @@ 
  * SQL constants definitions
  */
 define('FAQ_SQL_ACTIVE_YES', 'yes');
-define('FAQ_SQL_ACTIVE_NO',  'no');
+define('FAQ_SQL_ACTIVE_NO', 'no');
 
 /*
  * Query type definitions
  */
-define('FAQ_QUERY_TYPE_DEFAULT',      'faq_default');
-define('FAQ_QUERY_TYPE_APPROVAL',     'faq_approval');
-define('FAQ_QUERY_TYPE_EXPORT_PDF',   'faq_export_pdf');
+define('FAQ_QUERY_TYPE_DEFAULT', 'faq_default');
+define('FAQ_QUERY_TYPE_APPROVAL', 'faq_approval');
+define('FAQ_QUERY_TYPE_EXPORT_PDF', 'faq_export_pdf');
 define('FAQ_QUERY_TYPE_EXPORT_XHTML', 'faq_export_xhtml');
-define('FAQ_QUERY_TYPE_EXPORT_XML',   'faq_export_xml');
-define('FAQ_QUERY_TYPE_RSS_LATEST',   'faq_rss_latest');
+define('FAQ_QUERY_TYPE_EXPORT_XML', 'faq_export_xml');
+define('FAQ_QUERY_TYPE_RSS_LATEST', 'faq_rss_latest');
 
 /*
  * Sorting type definitions
@@ -384,12 +384,12 @@ 
 
         $result = $this->_config->getDb()->query($query);
         $num = $this->_config->getDb()->numRows($result);
-        $pages = (int) ceil($num / $numPerPage);
+        $pages = (int)ceil($num/$numPerPage);
 
         if ($page == 1) {
             $first = 0;
         } else {
-            $first = $page * $numPerPage - $numPerPage;
+            $first = $page*$numPerPage - $numPerPage;
         }
 
         if ($num > 0) {
@@ -570,12 +570,12 @@ 
         $result = $this->_config->getDb()->query($query);
 
         $num = $this->_config->getDb()->numRows($result);
-        $pages = ceil($num / $this->_config->get('records.numberOfRecordsPerPage'));
+        $pages = ceil($num/$this->_config->get('records.numberOfRecordsPerPage'));
 
         if ($page == 1) {
             $first = 0;
         } else {
-            $first = ($page * $this->_config->get('records.numberOfRecordsPerPage')) - $this->_config->get('records.numberOfRecordsPerPage');
+            $first = ($page*$this->_config->get('records.numberOfRecordsPerPage')) - $this->_config->get('records.numberOfRecordsPerPage');
         }
 
         if ($num > 0) {
@@ -1258,7 +1258,7 @@ 
                 AND
                 lang = '%s'",
             PMF_Db::getTablePrefix(),
-            (int) $faqId,
+            (int)$faqId,
             $this->_config->getDb()->escape($faqLang)
         );
 
@@ -2311,7 +2311,7 @@ 
                     'category_id' => $row->category_id,
                     'question' => $row->question,
                     'created' => $row->created,
-                    'is_visible' => $row->is_visible, );
+                    'is_visible' => $row->is_visible,);
             }
         }
 
@@ -2479,7 +2479,7 @@ 
                     'revision_id' => $row->revision_id,
                     'user' => $row->usr,
                     'date' => $row->datum,
-                    'changelog' => $row->what, );
+                    'changelog' => $row->what,);
             }
         }
 
@@ -2790,13 +2790,13 @@ 
             $mode,
             PMF_Db::getTablePrefix(),
             $mode,
-            (int) $recordId);
+            (int)$recordId);
 
         $result = $this->_config->getDb()->query($query);
 
         if ($this->_config->getDb()->numRows($result) > 0) {
             while (($row = $this->_config->getDb()->fetchObject($result))) {
-                $permissions[] = (int) $row->permission;
+                $permissions[] = (int)$row->permission;
             }
         }
 
@@ -3043,7 +3043,7 @@ 
                 $lang
             );
 
-            $retval = (bool) $this->_config->getDb()->query($update);
+            $retval = (bool)$this->_config->getDb()->query($update);
         }
 
         return $retval;

Doc Comments +9 added lines, -9 removed lines

@@ -1069,7 +1069,7 @@ 
      * @param int    $record_id  Record id
      * @param string $language   Language
      *
-     * @return int
+     * @return boolean
      */
     public function addCategoryRelations(Array $categories, $record_id, $language)
     {
@@ -1534,7 +1534,7 @@ 
      * @param int    $record_id   Record id
      * @param string $record_lang Record language
      *
-     * @return array
+     * @return boolean
      */
     public function addNewRevision($record_id, $record_lang)
     {
@@ -2534,7 +2534,7 @@ 
      * Build a logic sequence, for a WHERE statement, of those category IDs
      * children of the provided category ID, if any.
      *
-     * @param   $nCatid
+     * @param   integer $nCatid
      * @param   $logicOp
      * @param   $oCat
      *
@@ -2564,14 +2564,14 @@ 
     /**
      * Build the SQL query for retrieving faq records according to the constraints provided.
      *
-     * @param   $QueryType
-     * @param   $nCatid
-     * @param   $bDownwards
-     * @param   $lang
-     * @param   $date
+     * @param   string $QueryType
+     * @param   integer $nCatid
+     * @param   boolean $bDownwards
+     * @param   string $lang
+     * @param   string $date
      * @param   $faqid
      *
-     * @return array
+     * @return string
      *
      * @since   2005-11-02
      *

Indentation +18 added lines, -18 removed lines

@@ -1868,16 +1868,16 @@ 
         return true;
     }
 
-     /**
-      * Returns the visibility of a question.
-      *
-      * @param   int $questionId
-      *
-      * @return  string
-      */
-     public function getVisibilityOfQuestion($questionId)
-     {
-         $query = sprintf("
+        /**
+         * Returns the visibility of a question.
+         *
+         * @param   int $questionId
+         *
+         * @return  string
+         */
+        public function getVisibilityOfQuestion($questionId)
+        {
+            $query = sprintf("
             SELECT
                 is_visible
             FROM
@@ -1891,15 +1891,15 @@ 
             $this->_config->getLanguage()->getLanguage()
         );
 
-         $result = $this->_config->getDb()->query($query);
-         if ($this->_config->getDb()->numRows($result) > 0) {
-             $row = $this->_config->getDb()->fetchObject($result);
+            $result = $this->_config->getDb()->query($query);
+            if ($this->_config->getDb()->numRows($result) > 0) {
+                $row = $this->_config->getDb()->fetchObject($result);
 
-             return $row->is_visible;
-         }
+                return $row->is_visible;
+            }
 
-         return;
-     }
+            return;
+        }
 
     /**
      * Sets the visibility of a question.
@@ -2455,7 +2455,7 @@ 
                     'answer_id' => $row->answer_id,
                     'is_visible' => $row->is_visible,
                 );
-             }
+                }
         }
 
         return $questions;

phpmyfaq/admin/category.main.php

Indentation +21 added lines, -21 removed lines

@@ -321,19 +321,19 @@ 
 
         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)
@@ -357,20 +357,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']
+                );
             }
         }
 

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>

phpmyfaq/inc/PMF/Mail.php

Spacing +2 added lines, -2 removed lines

@@ -490,8 +490,8 @@
         $this->headers['X-Mailer'] = $this->_mailer;
 
         // X-MSMail-Priority
-        if (isset($this->priorities[(int) $this->priority])) {
-            $this->headers['X-MSMail-Priority'] = $this->priorities[(int) $this->priority];
+        if (isset($this->priorities[(int)$this->priority])) {
+            $this->headers['X-MSMail-Priority'] = $this->priorities[(int)$this->priority];
         }
 
         // X-Originating-IP

phpmyfaq/admin/ajax.config_list.php

Indentation +3 added lines, -3 removed lines

@@ -108,8 +108,8 @@ 
                         echo PMF_Language::languageOptions(
                             str_replace(
                                 array(
-                                     'language_',
-                                     '.php',
+                                        'language_',
+                                        '.php',
                                 ),
                                 '',
                                 $faqConfig->get('main.language')
@@ -120,7 +120,7 @@ 
                     } else {
                         echo '<option value="language_en.php">English</option>';
                     }
-                   break;
+                    break;
 
                 case 'records.orderby':
                     echo PMF_Configuration::sortingOptions($faqConfig->get($key));

phpmyfaq/admin/stat.main.php

Spacing +1 added lines, -1 removed lines

@@ -134,7 +134,7 @@
                     </tr>
                     <tr>
                         <td><?php echo $PMF_LANG['ad_stat_vpd'] ?>:</td>
-                        <td><?php echo ($danz != 0) ? round(($vanz / $danz), 2) : 0 ?></td>
+                        <td><?php echo ($danz != 0) ? round(($vanz/$danz), 2) : 0 ?></td>
                     </tr>
                     <tr>
                         <td><?php echo $PMF_LANG['ad_stat_fien'] ?>:</td>

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>