thorsten / phpMyFAQ

phpmyfaq/lang/language_sr.php

Spacing +8 added lines, -8 removed lines

@@ -664,14 +664,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/search.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
             }
         }
 
-        uasort($relatedTags, function ($a, $b) {
+        uasort($relatedTags, function($a, $b) {
             return ($b - $a);
             }
         );

phpmyfaq/send2friend.php

Spacing +2 added lines, -2 removed lines

@@ -47,8 +47,8 @@
 
 $send2friendLink = sprintf('%sindex.php?action=artikel&cat=%d&id=%d&artlang=%s',
     $faqConfig->getDefaultUrl(),
-    (int) $cat,
-    (int) $id,
+    (int)$cat,
+    (int)$id,
     urlencode($artlang));
 
 $captchaHelper = new PMF_Helper_Captcha($faqConfig);

phpmyfaq/setup/attachment.php

Indentation +19 added lines, -19 removed lines

@@ -1,22 +1,22 @@ 
 <?php 
 /**
- * Attachment migration script.
- *
- * PHP Version 5.5
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- *
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2009-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- *
- * @link      http://www.phpmyfaq.de
- * @since     2009-09-13
- */
+         * Attachment migration script.
+         *
+         * PHP Version 5.5
+         *
+         * This Source Code Form is subject to the terms of the Mozilla Public License,
+         * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+         * obtain one at http://mozilla.org/MPL/2.0/.
+         *
+         * @category  phpMyFAQ
+         *
+         * @author    Anatoliy Belsky <ab@php.net>
+         * @copyright 2009-2015 phpMyFAQ Team
+         * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+         *
+         * @link      http://www.phpmyfaq.de
+         * @since     2009-09-13
+         */
 set_time_limit(0);
 
 define('PMF_ROOT_DIR', dirname(__DIR__));
@@ -66,8 +66,8 @@ 
 /*        case PMF_Attachment_Migration::MIGRATION_TYPE3:
         case PMF_Attachment_Migration::MIGRATION_TYPE4:*/
             $options['defaultKey'] = PMF_Filter::filterInput(INPUT_POST,
-                                                             'defaultKey',
-                                                             FILTER_SANITIZE_STRING);
+                                                                'defaultKey',
+                                                                FILTER_SANITIZE_STRING);
             break;
 
         default:

phpmyfaq/inc/PMF/Date.php

Indentation -1 removed lines

@@ -38,7 +38,6 @@
  * @author    Anatoliy Belsky <ab@php.net>
  * @copyright 2009-2015 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- 
  * @link      http://www.phpmyfaq.de
  * @since     2009-04-06
  */

phpmyfaq/setup/update.php

Indentation +22 added lines, -22 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Main update script.
- *
- * PHP Version 5.5
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Thomas Melchinger <t.melchinger@uni.de>
- * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
- * @copyright 2002-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2002-01-10
- */
+     * Main update script.
+     *
+     * PHP Version 5.5
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Thomas Melchinger <t.melchinger@uni.de>
+     * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
+     * @copyright 2002-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2002-01-10
+     */
 define('COPYRIGHT', '&copy; 2001-2015 <a target="_blank" href="http://www.phpmyfaq.de/">phpMyFAQ Team</a>');
 define('PMF_ROOT_DIR', dirname(dirname(__FILE__)));
 define('IS_VALID_PHPMYFAQ', null);
@@ -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 +3 added lines, -3 removed lines

@@ -229,7 +229,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;
@@ -597,7 +597,7 @@ 
         foreach ($query as $key => $executeQuery) {
             $result = $faqConfig->getDb()->query($executeQuery);
             echo '.';
-            if (!($key % 100)) {
+            if (!($key%100)) {
                 echo '<br />';
             }
             if (!$result) {
@@ -617,7 +617,7 @@ 
             }
             usleep(10000);
             ++$count;
-            if (!($count % 10)) {
+            if (!($count%10)) {
                 ob_flush();
             }
         }

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

Doc Comments +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     /**
      * Creates the Elasticsearch index.
      *
-     * @return array
+     * @return boolean
      */
     public function createIndex()
     {

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/Search/Elasticsearch.php

Spacing +4 added lines, -4 removed lines

@@ -91,7 +91,7 @@ 
                             'bool' => [
                                 'must' => [
                                     [
-                                        'terms' => [ 'category_id' => $this->getCategoryIds() ]
+                                        'terms' => ['category_id' => $this->getCategoryIds()]
                                     ],
                                     $languageFilter
                                 ]
@@ -100,9 +100,9 @@ 
                         'query' => [
                             'bool' => [
                                 'should' => [
-                                    [ 'match' => [ 'question' => $searchTerm ] ],
-                                    [ 'match' => [ 'answer' => $searchTerm ] ],
-                                    [ 'match' => [ 'keywords' => $searchTerm ] ]
+                                    ['match' => ['question' => $searchTerm]],
+                                    ['match' => ['answer' => $searchTerm]],
+                                    ['match' => ['keywords' => $searchTerm]]
                                 ]
                             ]
                         ]

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
      *
      * @throws PMF_Search_Exception
      *
-     * @return array
+     * @return resource
      */
     public function autocomplete($searchTerm)
     {