thorsten / phpMyFAQ

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

phpmyfaq/inc/PMF/Faq.php

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;

Doc Comments +10 added lines, -10 removed lines

@@ -492,7 +492,7 @@ 
      * This function returns all not expired records from the given record ids.
      *
      * @param array  $recordIds Array of record ids
-     * @param string $orderby    Order by
+     * @param string $orderBy    Order by
      * @param string $sortBy     Sort by
      *
      * @return string
@@ -1165,7 +1165,7 @@ 
      * @param int    $record_id  Record id
      * @param string $language   Language
      *
-     * @return int
+     * @return boolean
      */
     public function addCategoryRelations(Array $categories, $record_id, $language)
     {
@@ -1660,7 +1660,7 @@ 
      * @param int    $record_id   Record id
      * @param string $record_lang Record language
      *
-     * @return array
+     * @return boolean
      */
     public function addNewRevision($record_id, $record_lang)
     {
@@ -2654,7 +2654,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
      *
@@ -2680,14 +2680,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
      */
     private function _getSQLQuery($QueryType, $nCatid, $bDownwards, $lang, $date, $faqid = 0)
     {

Spacing +17 added lines, -17 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
@@ -379,12 +379,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) {
@@ -565,12 +565,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) {
@@ -1368,7 +1368,7 @@ 
                 AND
                 lang = '%s'",
             PMF_Db::getTablePrefix(),
-            (int) $faqId,
+            (int)$faqId,
             $this->_config->getDb()->escape($faqLang)
         );
 
@@ -2441,7 +2441,7 @@ 
                     'category_id' => $row->category_id,
                     'question' => $row->question,
                     'created' => $row->created,
-                    'is_visible' => $row->is_visible, );
+                    'is_visible' => $row->is_visible,);
             }
         }
 
@@ -2597,7 +2597,7 @@ 
                     'revision_id' => $row->revision_id,
                     'user' => $row->usr,
                     'date' => $row->datum,
-                    'changelog' => $row->what, );
+                    'changelog' => $row->what,);
             }
         }
 
@@ -2897,13 +2897,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;
             }
         }
 
@@ -2997,7 +2997,7 @@ 
                 $oLink->itemTitle = $title;
                 $oLink->text = $title;
                 $oLink->tooltip = $title;
-                $listItem = '<li>' . $oLink->toHtmlAnchor() . '</li>';
+                $listItem = '<li>'.$oLink->toHtmlAnchor().'</li>';
 
                 $output .= $listItem;
             }
@@ -3153,7 +3153,7 @@ 
                 $lang
             );
 
-            $retval = (bool) $this->_config->getDb()->query($update);
+            $retval = (bool)$this->_config->getDb()->query($update);
         }
 
         return $retval;

phpmyfaq/admin/record.comments.php

Indentation +3 added lines, -3 removed lines

@@ -71,9 +71,9 @@
                     </a> |
                     <?php echo $date->format(date('Y-m-d H:i', $faqcomment['date'])) ?> |
                     <a href="<?php printf('../?action=artikel&cat=%d&id=%d&artlang=%s',
-                       $faqcomment['category_id'],
-                       $faqcomment['record_id'],
-                       $LANGCODE) ?>">
+                        $faqcomment['category_id'],
+                        $faqcomment['record_id'],
+                        $LANGCODE) ?>">
                         <?php echo $faq->getRecordTitle($faqcomment['record_id']) ?>
                     </a>
                 </span><br/>

phpmyfaq/admin/image.browser.php

Spacing +4 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
 if (!is_dir(PMF_ROOT_DIR.'/images')) {
     echo '<p class="alert alert-danger">'.sprintf($PMF_LANG['ad_dir_missing'], '/images').'</p>';
 } else {
-    $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(PMF_ROOT_DIR . '/images/'));
+    $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(PMF_ROOT_DIR.'/images/'));
     foreach ($files as $file) {
         if ($file->isDir() || !in_array($file->getExtension(), $allowedExtensions)) {
             continue;
@@ -74,9 +74,9 @@ 
         $path = str_replace(dirname(__DIR__).'/', '', $file->getPath());
         printf(
             '<div class="mce-file" data-src="%s"><img src="%s" class="mce-file-preview">%s</div>',
-            $faqConfig->getDefaultUrl() . $path . '/' . $file->getFilename(),
-            $faqConfig->getDefaultUrl() . $path . '/' . $file->getFilename(),
-            $path . '/' . $file->getFilename()
+            $faqConfig->getDefaultUrl().$path.'/'.$file->getFilename(),
+            $faqConfig->getDefaultUrl().$path.'/'.$file->getFilename(),
+            $path.'/'.$file->getFilename()
         );
     }
 }

phpmyfaq/inc/PMF/Relation.php

Indentation +10 added lines, -10 removed lines

@@ -73,21 +73,21 @@
         $search
             ->setTable(PMF_Db::getTablePrefix().'faqdata AS fd')
             ->setResultColumns(
-               [
-                   'fd.id AS id',
-                   'fd.lang AS lang',
-                   'fcr.category_id AS category_id',
-                   'fd.thema AS question',
-                   'fd.content AS answer',
-                   'fd.keywords AS keywords'
-               ]
+                [
+                    'fd.id AS id',
+                    'fd.lang AS lang',
+                    'fcr.category_id AS category_id',
+                    'fd.thema AS question',
+                    'fd.content AS answer',
+                    'fd.keywords AS keywords'
+                ]
             )
             ->setJoinedTable(PMF_Db::getTablePrefix().'faqcategoryrelations AS fcr')
             ->setJoinedColumns(
-               [
+                [
                 'fd.id = fcr.record_id',
                 'fd.lang = fcr.record_lang',
-               ]
+                ]
             )
             ->setConditions(
                 [

phpmyfaq/admin/trans.list.php

Braces +20 added lines, -8 removed lines

@@ -105,9 +105,12 @@ 
                         <?php echo $PMF_LANG['msgEdit'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgEdit'] ?></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                 <?php if ($user->perm->checkRight($user->getUserId(), 'deltranslation') && $showActions): ?>
                 <td>
                     <a class="btn btn-danger" href="javascript: del('<?php echo $lang ?>');" >
@@ -115,9 +118,12 @@ 
                         <?php echo $PMF_LANG['msgDelete'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgDelete'] ?></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                 <?php if ($user->perm->checkRight($user->getUserId(), 'edittranslation') && $showActions): ?>
                 <td>
                     <a class="btn btn-success" href="javascript: sendToTeam('<?php echo $lang ?>');" >
@@ -125,14 +131,20 @@ 
                         <?php echo $PMF_LANG['msgTransToolSendToTeam'] ?>
                     </a>
                 </td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><?php echo $PMF_LANG['msgTransToolSendToTeam'] ?></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                 <?php if ($isLangFileWritable): ?>
                 <td><i aria-hidden="true" class="fa fa-ok-circle"></i> <?php echo $PMF_LANG['msgYes'] ?></td>
-                <?php else: ?>
+                <?php else {
+    : ?>
                 <td><i aria-hidden="true" class="fa fa-ban-circle"></i> <?php echo $PMF_LANG['msgNo'] ?></td>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                 <td>
                     <?php echo $percents ?>%
                     <meter value="<?php echo $percents ?>" max="100" min="0" title="<?php echo $percents ?>%">

phpmyfaq/inc/PMF/Mail/SwiftSMTP.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      * @param array $headers
      * @param string $body
      *
-     * @return bool True if successful, false otherwise.
+     * @return integer True if successful, false otherwise.
      */
     public function send($recipients, Array $headers, $body)
     {

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     exit();
 }
 
-require __DIR__ . '/../../libs/swiftmailer/swift_required.php';
+require __DIR__.'/../../libs/swiftmailer/swift_required.php';
 
 /**
  * Class PMF_Mail_SwiftSMTP

phpmyfaq/lang/language_bs.php

Spacing +8 added lines, -8 removed lines

@@ -661,14 +661,14 @@
 $PMF_LANG['ad_entry_visibility'] = 'Objavi?';
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG['ad_user_error_password'] =  "Molimo unesite lozinku. ";
-$PMF_LANG['ad_user_error_passwordsDontMatch'] =  "Lozinke se ne poklapaju. ";
-$PMF_LANG['ad_user_error_loginInvalid'] =  "Unešeno korisničko ime nije nađeno.";
-$PMF_LANG['ad_user_error_noEmail'] =  "Unesite važeću email adresu. ";
-$PMF_LANG['ad_user_error_noRealName'] =  "Unesite Vaše pravo ime. ";
-$PMF_LANG['ad_user_error_delete'] =  "Korisnički nalog ne može biti izbrisan. ";
-$PMF_LANG['ad_user_error_noId'] =  "Nije priložen ID. ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "Korisnički nalog je zaštićen. ";
+$PMF_LANG['ad_user_error_password'] = "Molimo unesite lozinku. ";
+$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Lozinke se ne poklapaju. ";
+$PMF_LANG['ad_user_error_loginInvalid'] = "Unešeno korisničko ime nije nađeno.";
+$PMF_LANG['ad_user_error_noEmail'] = "Unesite važeću email adresu. ";
+$PMF_LANG['ad_user_error_noRealName'] = "Unesite Vaše pravo ime. ";
+$PMF_LANG['ad_user_error_delete'] = "Korisnički nalog ne može biti izbrisan. ";
+$PMF_LANG['ad_user_error_noId'] = "Nije priložen ID. ";
+$PMF_LANG['ad_user_error_protectedAccount'] = "Korisnički nalog je zaštićen. ";
 $PMF_LANG['ad_user_deleteUser'] = "Obriši korisnika";
 $PMF_LANG['ad_user_status'] = "Status:";
 $PMF_LANG['ad_user_lastModified'] = "zadnji put menjano:";

phpmyfaq/inc/PMF/Sitemap.php

Doc Comments +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
     /**
      * Returns all available first letters.
      *
-     * @return array
+     * @return string
      *
      * @since  2007-03-30
      *
@@ -212,7 +212,7 @@ 
      *
      * @param string $letter Letter
      *
-     * @return array
+     * @return string
      *
      * @since  2007-03-30
      *