thorsten / phpMyFAQ

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
      *

scripts/createHashes.php

Spacing +2 added lines, -2 removed lines

@@ -18,9 +18,9 @@
  * @since     2012-04-11
  */
 
-define('PMF_ROOT_DIR', dirname(__DIR__) . '/phpmyfaq');
+define('PMF_ROOT_DIR', dirname(__DIR__).'/phpmyfaq');
 
-require PMF_ROOT_DIR . '/inc/PMF/System.php';
+require PMF_ROOT_DIR.'/inc/PMF/System.php';
 
 $system = new PMF_System();
 

phpmyfaq/inc/PMF/Search.php

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
      */
     public function setCategoryId($categoryId)
     {
-        $this->categoryId = (int) $categoryId;
+        $this->categoryId = (int)$categoryId;
     }
 
     /**
@@ -159,8 +159,8 @@ 
      */
     public function searchDatabase($searchTerm, $allLanguages = true)
     {
-        $fdTable = PMF_Db::getTablePrefix() . 'faqdata AS fd';
-        $fcrTable = PMF_Db::getTablePrefix() . 'faqcategoryrelations';
+        $fdTable = PMF_Db::getTablePrefix().'faqdata AS fd';
+        $fcrTable = PMF_Db::getTablePrefix().'faqcategoryrelations';
         $condition = ['fd.active' => "'yes'"];
         $search = PMF_Search_Factory::create($this->_config, ['database' => PMF_Db::getType()]);
 
@@ -168,7 +168,7 @@ 
             if ($this->getCategory() instanceof PMF_Category) {
                 $children = $this->getCategory()->getChildNodes($this->getCategoryId());
                 $selectedCategory = array(
-                    $fcrTable.'.category_id' => array_merge((array) $this->getCategoryId(), $children),
+                    $fcrTable.'.category_id' => array_merge((array)$this->getCategoryId(), $children),
                 );
             } else {
                 $selectedCategory = array(
@@ -179,7 +179,7 @@ 
         }
 
         if ((!$allLanguages) && (!is_numeric($searchTerm))) {
-            $selectedLanguage = array('fd.lang' => "'" . $this->_config->getLanguage()->getLanguage() . "'");
+            $selectedLanguage = array('fd.lang' => "'".$this->_config->getLanguage()->getLanguage()."'");
             $condition        = array_merge($selectedLanguage, $condition);
         }
 
@@ -188,13 +188,13 @@ 
                 'fd.id AS id',
                 'fd.lang AS lang',
                 'fd.solution_id AS solution_id',
-                $fcrTable . '.category_id AS category_id',
+                $fcrTable.'.category_id AS category_id',
                 'fd.thema AS question',
                 'fd.content AS answer'))
             ->setJoinedTable($fcrTable)
             ->setJoinedColumns(array(
-                'fd.id = ' . $fcrTable . '.record_id',
-                'fd.lang = ' . $fcrTable . '.record_lang'
+                'fd.id = '.$fcrTable.'.record_id',
+                'fd.lang = '.$fcrTable.'.record_lang'
             ))
             ->setConditions($condition);
 
@@ -339,7 +339,7 @@ 
             $i = 0;
             while ($row = $this->_config->getDb()->fetchObject($result)) {
                 if ($i < $numResults) {
-                    $searchResult[] = (array) $row;
+                    $searchResult[] = (array)$row;
                 }
                 ++$i;
             }
@@ -362,7 +362,7 @@ 
 
         $result = $this->_config->getDb()->query($sql);
 
-        return (int) $this->_config->getDb()->fetchObject($result)->count;
+        return (int)$this->_config->getDb()->fetchObject($result)->count;
     }
 
     /**

phpmyfaq/inc/PMF/Instance/Elasticsearch.php

Spacing +2 added lines, -2 removed lines

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

phpmyfaq/index.php

Spacing +5 added lines, -5 removed lines

@@ -500,7 +500,7 @@ 
     'dir' => $PMF_LANG['dir'],
     'writeSendAdress' => '?'.$sids.'action=search',
     'searchBox' => $PMF_LANG['msgSearch'],
-    'categoryId' => ($cat === 0) ? '%' : (int) $cat,
+    'categoryId' => ($cat === 0) ? '%' : (int)$cat,
     'showInstantResponse' => '', // @deprecated
     'headerCategories' => $PMF_LANG['msgFullCategories'],
     'msgCategory' => $PMF_LANG['msgCategory'],
@@ -547,7 +547,7 @@ 
         array(
             '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),
@@ -582,7 +582,7 @@ 
         'allCategories' => '<a href="'.$faqSystem->getSystemUri($faqConfig).'showcat.html">'.$PMF_LANG['msgShowAllCategories'].'</a>',
         'faqOverview' => '<a href="'.$faqSystem->getSystemUri($faqConfig).'overview.html">'.$PMF_LANG['faqOverview'].'</a>',
         'showSitemap' => '<a href="'.$faqSystem->getSystemUri($faqConfig).'sitemap/A/'.$LANGCODE.'.html">'.$PMF_LANG['msgSitemap'].'</a>',
-        'opensearch' => $faqSystem->getSystemUri($faqConfig).'opensearch.html', );
+        'opensearch' => $faqSystem->getSystemUri($faqConfig).'opensearch.html',);
 } else {
     $tplNavigation = array(
         'msgSearch' => '<a href="index.php?'.$sids.'action=search">'.$PMF_LANG['msgAdvancedSearch'].'</a>',
@@ -596,7 +596,7 @@ 
         'faqOverview' => '<a href="index.php?'.$sids.'action=overview">'.$PMF_LANG['faqOverview'].'</a>',
         'backToHome' => '<a href="index.php?'.$sids.'">'.$PMF_LANG['msgHome'].'</a>',
         'showSitemap' => '<a href="index.php?'.$sids.'action=sitemap&amp;lang='.$LANGCODE.'">'.$PMF_LANG['msgSitemap'].'</a>',
-        'opensearch' => $faqSystem->getSystemUri($faqConfig).'opensearch.php', );
+        'opensearch' => $faqSystem->getSystemUri($faqConfig).'opensearch.php',);
 }
 
 $tplNavigation['faqHome'] = $faqConfig->getDefaultUrl();
@@ -695,7 +695,7 @@ 
     );
 } else {
     $tpl->parseBlock('rightBox', 'latestEntriesListError', array(
-        'errorMsgLatest' => $latestEntriesParams['error'], )
+        'errorMsgLatest' => $latestEntriesParams['error'],)
     );
 }
 

Indentation +3 added lines, -3 removed lines

@@ -454,8 +454,8 @@ 
     $users = $faqsession->getUsersOnline();
     $totUsers = $users[0] + $users[1];
     $usersOnline = $plr->getMsg('plmsgUserOnline', $totUsers).' | '.
-                   $plr->getMsg('plmsgGuestOnline', $users[0]).
-                   $plr->getMsg('plmsgRegisteredOnline', $users[1]);
+                    $plr->getMsg('plmsgGuestOnline', $users[0]).
+                    $plr->getMsg('plmsgRegisteredOnline', $users[1]);
 } else {
     $usersOnline = '';
 }
@@ -509,7 +509,7 @@ 
     'switchLanguages' => PMF_Language::selectLanguages($LANGCODE, true),
     'userOnline' => $usersOnline,
     'copyright' => 'powered by <a href="https://www.phpmyfaq.de" target="_blank">phpMyFAQ</a> '.
-                              $faqConfig->get('main.currentVersion'),
+                                $faqConfig->get('main.currentVersion'),
     'registerUser' => $faqConfig->get('security.enableRegistration') ? '<a href="?action=register">'.$PMF_LANG['msgRegistration'].'</a>' : '',
     'sendPassword' => '<a href="?action=password">'.$PMF_LANG['lostPassword'].'</a>',
     'msgFullName' => $PMF_LANG['ad_user_loggedin'].$user->getLogin(),