thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Instance/Setup.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
     /**
      * Checks basic folders and creates them if necessary
      *
-     * @param array $dirs
+     * @param string[] $dirs
      *
      * @return array
      */
@@ -162,7 +162,7 @@ 
      * @param string $name Name of the new folder
      * @param string $path Path to the new folder
      *
-     * @return bool
+     * @return boolean|null
      */
     public function createFolder($name, $path)
     {

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * The phpMyFAQ instances setup class
- *
- * PHP Version 5.3
- *
- * 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
- * @package   PMF_Instance
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2012-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2012-04-04
- */
+     * The phpMyFAQ instances setup class
+     *
+     * PHP Version 5.3
+     *
+     * 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
+     * @package   PMF_Instance
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2012-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2012-04-04
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

Spacing +20 added lines, -20 removed lines

@@ -90,16 +90,16 @@ 
         $failedDirs = array();
 
         foreach ($dirs as $dir) {
-            if (false === is_writable($this->_rootDir . $dir)) {
+            if (false === is_writable($this->_rootDir.$dir)) {
                 $failedDirs[] = $dir;
-            } elseif (false === is_dir($this->_rootDir . $dir)) {
-                if (false === mkdir($this->_rootDir . $dir, 0775)) {
+            } elseif (false === is_dir($this->_rootDir.$dir)) {
+                if (false === mkdir($this->_rootDir.$dir, 0775)) {
                     $failedDirs[] = $dir;
                 }
             } else {
                 copy(
-                    $this->_rootDir . '/install/index.html',
-                    $this->_rootDir . $dir . '/index.html'
+                    $this->_rootDir.'/install/index.html',
+                    $this->_rootDir.$dir.'/index.html'
                 );
             }
         }
@@ -118,14 +118,14 @@ 
     public function createDatabaseFile(Array $data, $folder = '/config')
     {
         $ret = file_put_contents(
-            $this->_rootDir . $folder . '/database.php',
-            "<?php\n" .
-            "\$DB['server'] = '" . $data['dbServer'] . "';\n" .
-            "\$DB['user'] = '" . $data['dbUser'] . "';\n" .
-            "\$DB['password'] = '" . $data['dbPassword'] . "';\n" .
-            "\$DB['db'] = '" . $data['dbDatabaseName'] . "';\n" .
-            "\$DB['prefix'] = '" . $data['dbPrefix'] . "';\n" .
-            "\$DB['type'] = '" . $data['dbType'] . "';",
+            $this->_rootDir.$folder.'/database.php',
+            "<?php\n".
+            "\$DB['server'] = '".$data['dbServer']."';\n".
+            "\$DB['user'] = '".$data['dbUser']."';\n".
+            "\$DB['password'] = '".$data['dbPassword']."';\n".
+            "\$DB['db'] = '".$data['dbDatabaseName']."';\n".
+            "\$DB['prefix'] = '".$data['dbPrefix']."';\n".
+            "\$DB['type'] = '".$data['dbType']."';",
             LOCK_EX
         );
 
@@ -143,13 +143,13 @@ 
     public function createLdapFile(Array $data, $folder = '/config')
     {
         $ret = file_put_contents(
-            $this->_rootDir . $folder . '/config/ldap.php',
-            "<?php\n" .
-            "\$PMF_LDAP['ldap_server'] = '" . $data['ldapServer'] . "';\n" .
-            "\$PMF_LDAP['ldap_port'] = '" . $data['ldapPort'] . "';\n" .
-            "\$PMF_LDAP['ldap_user'] = '" . $data['ldapUser'] . "';\n" .
-            "\$PMF_LDAP['ldap_password'] = '" . $data['ldapPassword'] . "';\n" .
-            "\$PMF_LDAP['ldap_base'] = '" . $data['ldapBase'] . "';",
+            $this->_rootDir.$folder.'/config/ldap.php',
+            "<?php\n".
+            "\$PMF_LDAP['ldap_server'] = '".$data['ldapServer']."';\n".
+            "\$PMF_LDAP['ldap_port'] = '".$data['ldapPort']."';\n".
+            "\$PMF_LDAP['ldap_user'] = '".$data['ldapUser']."';\n".
+            "\$PMF_LDAP['ldap_password'] = '".$data['ldapPassword']."';\n".
+            "\$PMF_LDAP['ldap_base'] = '".$data['ldapBase']."';",
             LOCK_EX
         );
 

phpmyfaq/inc/PMF/Link.php

Doc Comments +2 added lines, -2 removed lines

@@ -353,7 +353,7 @@ 
     /**
      * Returns the HTTP GET parameters
      *
-     * @return array
+     * @return string
      */
     protected function getHttpGetParameters()
     {
@@ -747,7 +747,7 @@ 
      * @param string $text   Text
      * @param bool   $active Add CSS class named "active"?
      *
-     * @return string
+     * @return integer
      */
     public static function renderNavigationLink($url, $text, $active = false)
     {

Spacing +43 added lines, -43 removed lines

@@ -362,7 +362,7 @@ 
 
         if (!empty($query)) {
             // Check fragment
-            if (isset($query['fragment']) ) {
+            if (isset($query['fragment'])) {
                 $parameters[self::PMF_LINK_FRAGMENT_SEPARATOR] = urldecode($query['fragment']);
             }
             // Check if query string contains &
@@ -479,11 +479,11 @@ 
         //           being requested, as obtained from the original URI given by the user or referring resource
 
         // Remove any ref to standard ports 80 and 443.
-        $pattern[0] = '/:80$/';   // HTTP: port 80
+        $pattern[0] = '/:80$/'; // HTTP: port 80
         $pattern[1] = '/:443$/'; // HTTPS: port 443
-        $sysUri = $this->getSystemScheme() . preg_replace($pattern, '', $_SERVER['HTTP_HOST']);
+        $sysUri = $this->getSystemScheme().preg_replace($pattern, '', $_SERVER['HTTP_HOST']);
 
-        return $sysUri . PMF_link::getSystemRelativeUri($path);
+        return $sysUri.PMF_link::getSystemRelativeUri($path);
     }
 
     /**
@@ -552,7 +552,7 @@ 
                      self::PMF_LINK_SEARCHPART_SEPARATOR 
                      : 
                      self::PMF_LINK_AMPERSAND;
-        return $url . $separator . self::PMF_LINK_GET_SIDS . self::PMF_LINK_EQUAL . $sids;
+        return $url.$separator.self::PMF_LINK_GET_SIDS.self::PMF_LINK_EQUAL.$sids;
     }
     
     /**
@@ -583,22 +583,22 @@ 
                             break;
                             
                         case self::PMF_LINK_GET_ACTION_ARTIKEL:
-                            $url .= self::PMF_LINK_CONTENT . 
-                                    $getParams[self::PMF_LINK_GET_CATEGORY] . 
-                                    self::PMF_LINK_HTML_SLASH . 
-                                    $getParams[self::PMF_LINK_GET_ID] . 
-                                    self::PMF_LINK_HTML_SLASH . 
-                                    $getParams[self::PMF_LINK_GET_ARTLANG] . 
-                                    self::PMF_LINK_SLASH . 
-                                    $this->getSEOItemTitle() . 
+                            $url .= self::PMF_LINK_CONTENT. 
+                                    $getParams[self::PMF_LINK_GET_CATEGORY]. 
+                                    self::PMF_LINK_HTML_SLASH. 
+                                    $getParams[self::PMF_LINK_GET_ID]. 
+                                    self::PMF_LINK_HTML_SLASH. 
+                                    $getParams[self::PMF_LINK_GET_ARTLANG]. 
+                                    self::PMF_LINK_SLASH. 
+                                    $this->getSEOItemTitle(). 
                                     self::PMF_LINK_HTML_EXTENSION;
                             if (isset($getParams[self::PMF_LINK_GET_HIGHLIGHT])) {
-                                $url .= self::PMF_LINK_SEARCHPART_SEPARATOR . 
-                                        self::PMF_LINK_GET_HIGHLIGHT . '=' . 
+                                $url .= self::PMF_LINK_SEARCHPART_SEPARATOR. 
+                                        self::PMF_LINK_GET_HIGHLIGHT.'='. 
                                         $getParams[self::PMF_LINK_GET_HIGHLIGHT];
                             }
                             if (isset($getParams[self::PMF_LINK_FRAGMENT_SEPARATOR])) {
-                                $url .= self::PMF_LINK_FRAGMENT_SEPARATOR . 
+                                $url .= self::PMF_LINK_FRAGMENT_SEPARATOR. 
                                         $getParams[self::PMF_LINK_FRAGMENT_SEPARATOR];
                             }
                             break;
@@ -630,37 +630,37 @@ 
                                 if (isset($getParams[self::PMF_LINK_GET_PAGE])) {
                                     $url .= self::PMF_LINK_HTML_SLASH.$getParams[self::PMF_LINK_GET_PAGE];
                                 }
-                                $url .= self::PMF_LINK_SLASH . 
-                                        $this->getSEOItemTitle() . 
+                                $url .= self::PMF_LINK_SLASH. 
+                                        $this->getSEOItemTitle(). 
                                         self::PMF_LINK_HTML_EXTENSION; 
                             } elseif (isset($getParams[self::PMF_LINK_GET_ACTION_SEARCH])) {
                                 $url .= self::PMF_LINK_HTML_SEARCH;
-                                $url .= self::PMF_LINK_SEARCHPART_SEPARATOR . 
-                                        self::PMF_LINK_GET_ACTION_SEARCH . '=' . 
+                                $url .= self::PMF_LINK_SEARCHPART_SEPARATOR. 
+                                        self::PMF_LINK_GET_ACTION_SEARCH.'='. 
                                         $getParams[self::PMF_LINK_GET_ACTION_SEARCH];
                                 if (isset($getParams[self::PMF_LINK_GET_PAGE])) {
-                                    $url .= self::PMF_LINK_AMPERSAND.self::PMF_LINK_GET_PAGE . '=' . 
+                                    $url .= self::PMF_LINK_AMPERSAND.self::PMF_LINK_GET_PAGE.'='. 
                                             $getParams[self::PMF_LINK_GET_PAGE];
                                 }
                             }
                             if (isset($getParams[self::PMF_LINK_GET_LANGS])) {
-                                $url .= self::PMF_LINK_AMPERSAND . 
-                                        self::PMF_LINK_GET_LANGS . '=' . 
+                                $url .= self::PMF_LINK_AMPERSAND. 
+                                        self::PMF_LINK_GET_LANGS.'='. 
                                         $getParams[self::PMF_LINK_GET_LANGS];
                             }
                             break;
                             
                         case self::PMF_LINK_GET_ACTION_SITEMAP:
                             if (isset($getParams[self::PMF_LINK_GET_LETTER])) {
-                                $url .= self::PMF_LINK_SITEMAP . 
-                                        $getParams[self::PMF_LINK_GET_LETTER] . 
-                                        self::PMF_LINK_HTML_SLASH . 
-                                        $getParams[self::PMF_LINK_GET_LANG] . 
+                                $url .= self::PMF_LINK_SITEMAP. 
+                                        $getParams[self::PMF_LINK_GET_LETTER]. 
+                                        self::PMF_LINK_HTML_SLASH. 
+                                        $getParams[self::PMF_LINK_GET_LANG]. 
                                         self::PMF_LINK_HTML_EXTENSION;
                             } else {
-                                $url .= self::PMF_LINK_SITEMAP . 'A' . 
-                                        self::PMF_LINK_HTML_SLASH . 
-                                        $getParams[self::PMF_LINK_GET_LANG] . 
+                                $url .= self::PMF_LINK_SITEMAP.'A'. 
+                                        self::PMF_LINK_HTML_SLASH. 
+                                        $getParams[self::PMF_LINK_GET_LANG]. 
                                         self::PMF_LINK_HTML_EXTENSION;
                             }
                             break;
@@ -671,25 +671,25 @@ 
                                 (0 == $getParams[self::PMF_LINK_GET_CATEGORY]))) {
                                 $url .= self::PMF_LINK_HTML_SHOWCAT;
                             } else {
-                                $url .= self::PMF_LINK_CATEGORY . 
+                                $url .= self::PMF_LINK_CATEGORY. 
                                         $getParams[self::PMF_LINK_GET_CATEGORY];
                                 if (isset($getParams[self::PMF_LINK_GET_PAGE])) {
-                                    $url .= self::PMF_LINK_HTML_SLASH . 
+                                    $url .= self::PMF_LINK_HTML_SLASH. 
                                             $getParams[self::PMF_LINK_GET_PAGE];
                                 }
-                                $url .= self::PMF_LINK_HTML_SLASH . 
-                                        $this->getSEOItemTitle() .
+                                $url .= self::PMF_LINK_HTML_SLASH. 
+                                        $this->getSEOItemTitle().
                                         self::PMF_LINK_HTML_EXTENSION;
                             }
                             break;
                             
                         case self::PMF_LINK_GET_ACTION_NEWS:
-                            $url .= self::PMF_LINK_NEWS . 
-                                    $getParams[self::PMF_LINK_GET_NEWS_ID] . 
-                                    self::PMF_LINK_HTML_SLASH .
-                                    $getParams[self::PMF_LINK_GET_NEWS_LANG] .
-                                    self::PMF_LINK_SLASH .
-                                    $this->getSEOItemTitle() .
+                            $url .= self::PMF_LINK_NEWS. 
+                                    $getParams[self::PMF_LINK_GET_NEWS_ID]. 
+                                    self::PMF_LINK_HTML_SLASH.
+                                    $getParams[self::PMF_LINK_GET_NEWS_LANG].
+                                    self::PMF_LINK_SLASH.
+                                    $this->getSEOItemTitle().
                                     self::PMF_LINK_HTML_EXTENSION;
                             break;
                     }
@@ -718,7 +718,7 @@ 
         $url = $this->url;
         if (!empty($this->url)) {
             if ((!$this->hasScheme()) && (!$this->isInternalReference())) {
-                $url = $this->getDefaultScheme() . $this->url;
+                $url = $this->getDefaultScheme().$this->url;
             }
         }
 
@@ -733,9 +733,9 @@ 
     public function getCurrentUrl()
     {
         if (!empty($_SERVER['HTTPS'])) {
-            return 'https://' . $_SERVER['SERVER_NAME'] . PMF_String::htmlentities($_SERVER['REQUEST_URI']);
+            return 'https://'.$_SERVER['SERVER_NAME'].PMF_String::htmlentities($_SERVER['REQUEST_URI']);
         } else {
-            return 'http://' . $_SERVER['SERVER_NAME'] . PMF_String::htmlentities($_SERVER['REQUEST_URI']);
+            return 'http://'.$_SERVER['SERVER_NAME'].PMF_String::htmlentities($_SERVER['REQUEST_URI']);
         }
     }
     

phpmyfaq/inc/PMF/Linkverifier.php

Doc Comments +1 added lines, -1 removed lines

@@ -276,7 +276,7 @@
      *
      * @param string $string String
      *
-     * @return mixed  false if URL is not found, otherwise returns the number of URLs found.
+     * @return integer  false if URL is not found, otherwise returns the number of URLs found.
      */
     public function parse_string($string = "")
     {

Indentation +31 added lines, -31 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 /**
- * The PMF_Linkverifier class provides methods and functions for verifying URLs
- *
- * PHP Version 5.3
- *
- * 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/.
- *
- * The Initial Developer of the Original Code is released for external use
- * with permission from NetJapan, Inc. IT Administration Group.
- *
- * @category  phpMyFAQ
- * @package   PMF_Linkverifier
- * @author    Minoru TODA <todam@netjapan.co.jp>
- * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2005-2015 NetJapan, Inc. and phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2005-08-01
- */
+     * The PMF_Linkverifier class provides methods and functions for verifying URLs
+     *
+     * PHP Version 5.3
+     *
+     * 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/.
+     *
+     * The Initial Developer of the Original Code is released for external use
+     * with permission from NetJapan, Inc. IT Administration Group.
+     *
+     * @category  phpMyFAQ
+     * @package   PMF_Linkverifier
+     * @author    Minoru TODA <todam@netjapan.co.jp>
+     * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2005-2015 NetJapan, Inc. and phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2005-08-01
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -712,15 +712,15 @@ 
     }
 
     /**
-    * Verifies specified article content and update links_state database entry
-    *
-    * @param   string  $contents
-    * @param   integer $id
-    * @param   string  $artlang
-    * @param   boolean $cron
-    *
-    * @return  string  HTML text, if $cron is false (default)
-    */
+     * Verifies specified article content and update links_state database entry
+     *
+     * @param   string  $contents
+     * @param   integer $id
+     * @param   string  $artlang
+     * @param   boolean $cron
+     *
+     * @return  string  HTML text, if $cron is false (default)
+     */
     public function verifyArticleURL($contents = '', $id = 0, $artlang = '', $cron = false)
     {
         global $PMF_LANG;
@@ -774,7 +774,7 @@ 
                         $inforeasons[] = sprintf(
                             $PMF_LANG['ad_linkcheck_openurl_infoprefix'],
                             PMF_String::htmlspecialchars($value['absurl'])
-                         ) . $value['reason'];
+                            ) . $value['reason'];
                     }
                 } else {
                     $_classname = "urlfail";

Spacing +8 added lines, -8 removed lines

@@ -257,14 +257,14 @@ 
 
         // If path is not specified in reference uri, set as blank
         if (isset($pathparts['path'])) {
-            $pathparts['path'] = str_replace("\\","/",$pathparts['path']);
-            $pathparts['path'] = preg_replace("/^.*(\/)$/i","", $pathparts['path']);
+            $pathparts['path'] = str_replace("\\", "/", $pathparts['path']);
+            $pathparts['path'] = preg_replace("/^.*(\/)$/i", "", $pathparts['path']);
         } else {
             $pathparts['path'] = "";
         }
 
         // Recombine urls
-        if (PMF_String::substr($relativeuri,0,1) == "/") {
+        if (PMF_String::substr($relativeuri, 0, 1) == "/") {
             return $pathparts['scheme']."://".$pathparts['host'].$pathparts['port'].$relativeuri;
         } else {
             return $pathparts['scheme']."://".$pathparts['host'].$pathparts['port'].$pathparts['path']."/".$relativeuri;
@@ -286,10 +286,10 @@ 
 
         // Clean $this->urlpool
         $this->urlpool = array();
-        while(list(,$type) = each($types)) {
+        while (list(,$type) = each($types)) {
             preg_match_all("|[^?&]$type\=(\"?'?`?)([[:alnum:]\:\#%?=;&@/\ \.\_\-\{\}]+)\\1|i", $string, $matches); 
             $sz = sizeof($matches[2]);
-            for ($i = 0;$i < $sz; $i++) {
+            for ($i = 0; $i < $sz; $i++) {
                 $this->urlpool[$type][] = $matches[2][$i];
                 $urlcount++;
             }
@@ -340,7 +340,7 @@ 
 
         // parse URL
         $urlParts = @parse_url($url);
-        foreach(array(
+        foreach (array(
                     'scheme' => 'http',
                     'host' => $_SERVER['HTTP_HOST'],
                     'user' => '',
@@ -459,7 +459,7 @@ 
         switch ($code) {
             // TODO: Add more explicit http status management
             case '200': // OK
-                $_reason = ($redirectCount > 0) ? sprintf($PMF_LANG['ad_linkcheck_openurl_redirected'],PMF_String::htmlspecialchars($url)) : "";
+                $_reason = ($redirectCount > 0) ? sprintf($PMF_LANG['ad_linkcheck_openurl_redirected'], PMF_String::htmlspecialchars($url)) : "";
                 return array(true, $redirectCount, $_reason);
                 break;
             case '301': // Moved Permanently (go recursive ?)
@@ -774,7 +774,7 @@ 
                         $inforeasons[] = sprintf(
                             $PMF_LANG['ad_linkcheck_openurl_infoprefix'],
                             PMF_String::htmlspecialchars($value['absurl'])
-                         ) . $value['reason'];
+                         ).$value['reason'];
                     }
                 } else {
                     $_classname = "urlfail";

phpmyfaq/inc/PMF/Relation.php

Doc Comments +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
      * @param string  $question FAQ title
      * @param string  $keywords FAQ keywords
      *
-     * @return array
+     * @return PMF_DB_Driver
      */
     public function getAllRelatedById($recordId, $question, $keywords)
     {

Indentation +23 added lines, -23 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * The Relation class for dynamic related record linking
- *
- * PHP Version 5.3
- *
- * 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
- * @package   PMF_Relation
- * @author    Marco Enders <marco@minimarco.de>
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2006-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2006-06-18
- */
+     * The Relation class for dynamic related record linking
+     *
+     * PHP Version 5.3
+     *
+     * 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
+     * @package   PMF_Relation
+     * @author    Marco Enders <marco@minimarco.de>
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2006-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2006-06-18
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -73,23 +73,23 @@ 
         );
 
         $search->setTable(PMF_Db::getTablePrefix() . 'faqdata AS fd')
-               ->setResultColumns(array(
+                ->setResultColumns(array(
                     'fd.id AS id',
                     'fd.lang AS lang',
                     'fcr.category_id AS category_id',
                     'fd.thema AS question',
                     'fd.content AS answer'))
-               ->setJoinedTable(PMF_Db::getTablePrefix() . 'faqcategoryrelations AS fcr')
-               ->setJoinedColumns(array(
+                ->setJoinedTable(PMF_Db::getTablePrefix() . 'faqcategoryrelations AS fcr')
+                ->setJoinedColumns(array(
                     'fd.id = fcr.record_id', 
                     'fd.lang = fcr.record_lang'))
-               ->setConditions(
+                ->setConditions(
                     array(
                         'fd.active' => "'yes'",
                         'fd.lang'   => "'" . $this->_config->getLanguage()->getLanguage() . "'"
                     )
-               )
-               ->setMatchingColumns(array('fd.thema', 'fd.content', 'fd.keywords')
+                )
+                ->setMatchingColumns(array('fd.thema', 'fd.content', 'fd.keywords')
         );
 
         $result = $search->search($terms);

Spacing +4 added lines, -4 removed lines

@@ -66,27 +66,27 @@
      */
     public function getAllRelatedById($recordId, $question, $keywords)
     {
-        $terms  = str_replace('-', ' ', $question) . $keywords;
+        $terms  = str_replace('-', ' ', $question).$keywords;
         $search = PMF_Search_Factory::create(
             $this->_config,
             array('database' => PMF_Db::getType())
         );
 
-        $search->setTable(PMF_Db::getTablePrefix() . 'faqdata AS fd')
+        $search->setTable(PMF_Db::getTablePrefix().'faqdata AS fd')
                ->setResultColumns(array(
                     'fd.id AS id',
                     'fd.lang AS lang',
                     'fcr.category_id AS category_id',
                     'fd.thema AS question',
                     'fd.content AS answer'))
-               ->setJoinedTable(PMF_Db::getTablePrefix() . 'faqcategoryrelations AS fcr')
+               ->setJoinedTable(PMF_Db::getTablePrefix().'faqcategoryrelations AS fcr')
                ->setJoinedColumns(array(
                     'fd.id = fcr.record_id', 
                     'fd.lang = fcr.record_lang'))
                ->setConditions(
                     array(
                         'fd.active' => "'yes'",
-                        'fd.lang'   => "'" . $this->_config->getLanguage()->getLanguage() . "'"
+                        'fd.lang'   => "'".$this->_config->getLanguage()->getLanguage()."'"
                     )
                )
                ->setMatchingColumns(array('fd.thema', 'fd.content', 'fd.keywords')

phpmyfaq/inc/PMF/Search/Database/Pgsql.php

Doc Comments +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
     /**
      * Add the matching columns into the columns for the resultset
      *
-     * @return PMF_Search_Database
+     * @return string
      */
     public function getMatchingColumnsAsResult()
     {

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * phpMyFAQ PostgreSQL search classes
- *
- * PHP Version 5.3
- *
- * 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
- * @package   PMF_Search_Database
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2010-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2010-06-06
- */
+     * phpMyFAQ PostgreSQL search classes
+     *
+     * PHP Version 5.3
+     *
+     * 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
+     * @package   PMF_Search_Database
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2010-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2010-06-06
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

Spacing +10 added lines, -10 removed lines

@@ -60,9 +60,9 @@ 
         } else {
             $enableRelevance = $this->_config->get('search.enableRelevance');
 
-            $columns  =  $this->getResultColumns();
+            $columns  = $this->getResultColumns();
             $columns .= ($enableRelevance) ? $this->getMatchingColumnsAsResult($searchTerm) : '';
-            $orderBy  = ($enableRelevance) ? 'ORDER BY ' . $this->getMatchingOrder() : '';
+            $orderBy  = ($enableRelevance) ? 'ORDER BY '.$this->getMatchingOrder() : '';
 
             $query = sprintf("
                 SELECT
@@ -78,7 +78,7 @@ 
                 $this->getJoinedTable(),
                 $this->getJoinedColumns(),
                 ($enableRelevance)
-                    ? ", plainto_tsquery('" . $this->_config->getDb()->escape($searchTerm) . "') query "
+                    ? ", plainto_tsquery('".$this->_config->getDb()->escape($searchTerm)."') query "
                     : '',
                 $this->getMatchingColumns(),
                 $this->_config->getDb()->escape($searchTerm),
@@ -106,14 +106,14 @@ 
             foreach ($this->matchingColumns as $matchColumn) {
                 $match = sprintf("to_tsvector(coalesce(%s,''))", $matchColumn);
                 if (empty($machColumns)) {
-                    $machColumns .= '(' . $match;
+                    $machColumns .= '('.$match;
                 } else {
-                    $machColumns .= ' || ' . $match;
+                    $machColumns .= ' || '.$match;
                 }
             }
 
             // Add the ILIKE since the FULLTEXT looks for the exact phrase only
-            $machColumns .= ') @@ query) OR (' . implode(" || ' ' || ", $this->matchingColumns);
+            $machColumns .= ') @@ query) OR ('.implode(" || ' ' || ", $this->matchingColumns);
         } else {
             $machColumns = implode(" || ' ' || ", $this->matchingColumns);
         }
@@ -143,12 +143,12 @@ 
             $columnName = substr(strstr($matchColumn, '.'), 1);
 
             if (isset($weight[$columnName])) {
-                $column = sprintf("ts_rank_cd(setweight(to_tsvector(coalesce(%s,'')), '" . $weight[$columnName]
+                $column = sprintf("ts_rank_cd(setweight(to_tsvector(coalesce(%s,'')), '".$weight[$columnName]
                     . "'), query) AS rel_%s",
                     $matchColumn,
                     $columnName);
 
-                $resultColumns .= ', ' . $column;
+                $resultColumns .= ', '.$column;
             }
         }
 
@@ -168,11 +168,11 @@ 
         $order = '';
 
         foreach ($list as $field) {
-            $string = 'rel_' . $field . ' DESC';
+            $string = 'rel_'.$field.' DESC';
             if (empty($order)) {
                 $order .= $string;
             } else {
-                $order .= ', ' . $string;
+                $order .= ', '.$string;
             }
         }
 

phpmyfaq/inc/PMF/Sitemap.php

Doc Comments +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
     /**
      * Returns all available first letters
      *
-     * @return array
+     * @return string
      * @since  2007-03-30
      * @author Thorsten Rinne <thorsten@phpmyfaq.de>
      */
@@ -208,7 +208,7 @@ 
      * Returns all records from the current first letter
      *
      * @param  string $letter Letter
-     * @return array
+     * @return string
      * @since  2007-03-30
      * @author Thorsten Rinne <thorsten@phpmyfaq.de>
      */

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * The main Sitemap class
- *
- * PHP Version 5.3
- *
- * 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
- * @package   PMF_Sitemap
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2007-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2007-03-30
- */
+     * The main Sitemap class
+     *
+     * PHP Version 5.3
+     *
+     * 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
+     * @package   PMF_Sitemap
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2007-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2007-03-30
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

Spacing +4 added lines, -4 removed lines

@@ -196,7 +196,7 @@ 
                     $this->_config->getLanguage()->getLanguage());
                 $oLink         = new PMF_Link($url, $this->_config);
                 $oLink->text   = (string)$letters;
-                $writeLetters .= '<li>' . $oLink->toHtmlAnchor().'</li>';
+                $writeLetters .= '<li>'.$oLink->toHtmlAnchor().'</li>';
             }
         }
         $writeLetters .= '</ul>';
@@ -232,7 +232,7 @@ 
 
         $writeMap = '';
 
-        switch(PMF_Db::getType()) {
+        switch (PMF_Db::getType()) {
             case 'sqlite':
             case 'sqlite3':
                 $query = sprintf("
@@ -331,12 +331,12 @@ 
                 $oLink->tooltip   = $title;
 
                 $writeMap .= '<li>'.$oLink->toHtmlAnchor().'<br />'."\n";
-                $writeMap .= PMF_Utils::chopString(strip_tags($row->snap), 25). " ...</li>\n";
+                $writeMap .= PMF_Utils::chopString(strip_tags($row->snap), 25)." ...</li>\n";
             }
             $oldId = $row->id;
         }
 
-        $writeMap = empty($writeMap) ? '' : '<ul>' . $writeMap . '</ul>';
+        $writeMap = empty($writeMap) ? '' : '<ul>'.$writeMap.'</ul>';
 
         return $writeMap;
     }

phpmyfaq/inc/PMF/String.php

Doc Comments +3 added lines, -4 removed lines

@@ -104,7 +104,6 @@ 
     /**
      * Get a part of string
      *
-     * @param string  $str    String
      * @param integer $start  Start
      * @param integer $length Length
      *
@@ -121,7 +120,7 @@ 
      *
      * @param string $haystack Haystack
      * @param string $needle   Needle
-     * @param string $offset   Offset
+     * @param integer $offset   Offset
      *
      * @return int
      */
@@ -298,7 +297,7 @@ 
     /**
      * Search and replace by a regexp using a callback
      *
-     * @param string|array $pattern
+     * @param string $pattern
      * @param function $callback
      * @param string|array $subject
      * @param int $limit
@@ -333,7 +332,7 @@ 
      *
      * @param string $str String
      *
-     * @return boolean
+     * @return string|boolean
      */
     public static function isUTF8($str)
     {

Indentation +37 added lines, -37 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * The main string wrapper class. 
- *
- * PHP Version 5.3.0
- *
- * 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
- * @package   String
- * @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
- */
+     * The main string wrapper class. 
+     *
+     * PHP Version 5.3.0
+     *
+     * 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
+     * @package   String
+     * @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
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -184,18 +184,18 @@ 
     
     
     /**
-	 * Check if a language could be converted to iso-8859-1
-	 *
-	 * @param string $language
-	 *
-	 * @return boolean
+     * Check if a language could be converted to iso-8859-1
+     *
+     * @param string $language
+     *
+     * @return boolean
      */
     public static function isLangUTF8ToLatinConvertable($language)
     {
         $iso_languages = array('af', 'sq', 'br', 'ca', 'da', 'en', 'fo', 'gl', 'de', 'is', 'it',
-                               'ku', 'la', 'lb', 'nb', 'oc', 'pt', 'es', 'sw', 'sv', 'wa', 'eu',
-                               // NOTE this languages are not fully supported by latin1 
-                               'nl', 'fr', 'et', 'fi', 'cy'
+                                'ku', 'la', 'lb', 'nb', 'oc', 'pt', 'es', 'sw', 'sv', 'wa', 'eu',
+                                // NOTE this languages are not fully supported by latin1 
+                                'nl', 'fr', 'et', 'fi', 'cy'
         );
         
         return in_array($language, $iso_languages);
@@ -203,12 +203,12 @@ 
     
     
     /**
-	 * Get last occurence of a string within another
-	 *
-	 * @param string $haystack
-	 * @param string $needle
-	 *
-	 * @return string
+     * Get last occurence of a string within another
+     *
+     * @param string $haystack
+     * @param string $needle
+     *
+     * @return string
      */
     public static function strrchr($haystack, $needle)
     {
@@ -231,13 +231,13 @@ 
     
     
     /**
-	 * Find position of last occurrence of a char in a string
-	 *
-	 * @param string $haystack
-	 * @param string $needle
-	 * @param int $offset
-	 *
-	 * @return int
+     * Find position of last occurrence of a char in a string
+     *
+     * @param string $haystack
+     * @param string $needle
+     * @param int $offset
+     *
+     * @return int
      */
     public static function strrpos($haystack, $needle, $offset = 0)
     {

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
         if (!self::$instance) {
             if (extension_loaded('mbstring') && function_exists('mb_regex_encoding')) {
                 self::$instance = PMF_String_Mbstring::getInstance($language);
-            } elseif(self::isLangUTF8ToLatinConvertable($language)) {
+            } elseif (self::isLangUTF8ToLatinConvertable($language)) {
                 self::$instance = PMF_String_UTF8ToLatinConvertable::getInstance($language);
             } else {
                 self::$instance = PMF_String_Basic::getInstance($language);
@@ -306,7 +306,7 @@ 
      *
      * @return array|string
      */
-    public static function preg_replace_callback($pattern, $callback, $subject, $limit= -1, &$count = 0)
+    public static function preg_replace_callback($pattern, $callback, $subject, $limit = -1, &$count = 0)
     {
         return self::$instance->preg_replace_callback($pattern, $callback, $subject, $limit, $count);
     }
@@ -323,7 +323,7 @@ 
      *
      * @return array|string|null
      */
-    public static function preg_replace($pattern, $replacement, $subject, $limit= -1, &$count = 0)
+    public static function preg_replace($pattern, $replacement, $subject, $limit = -1, &$count = 0)
     {
         return self::$instance->preg_replace($pattern, $replacement, $subject, $limit, $count);
     }

phpmyfaq/inc/PMF/String/Mbstring.php

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
      * @param string  $needle   Needle
      * @param boolean $part     Part
      *
-     * @return string|false
+     * @return string
      */
     public function strstr($haystack, $needle, $part = false)
     {

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * The string wrapper class using mbstring extension. 
- *
- * PHP Version 5.3
- *
- * 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
- * @package   String
- * @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
- */
+     * The string wrapper class using mbstring extension. 
+     *
+     * PHP Version 5.3
+     *
+     * 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
+     * @package   String
+     * @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
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

Spacing +8 added lines, -8 removed lines

@@ -237,10 +237,10 @@ 
      *
      * @return array|string
      */
-    public function preg_replace_callback($pattern, $callback, $subject, $limit= -1, &$count = 0)
+    public function preg_replace_callback($pattern, $callback, $subject, $limit = -1, &$count = 0)
     {
-        if(is_array($pattern)) {
-            foreach($pattern as &$p) {
+        if (is_array($pattern)) {
+            foreach ($pattern as &$p) {
                 $p = self::appendU($p);
             }
         } else {
@@ -261,10 +261,10 @@ 
      *
      * @return array|string|null
      */
-    public function preg_replace($pattern, $replacement, $subject, $limit= -1, &$count = 0)
+    public function preg_replace($pattern, $replacement, $subject, $limit = -1, &$count = 0)
     {
-        if(is_array($pattern)) {
-            foreach($pattern as &$p) {
+        if (is_array($pattern)) {
+            foreach ($pattern as &$p) {
                 $p = self::appendU($p);
             }
         } else {
@@ -285,8 +285,8 @@ 
      */
     private static function appendU($str)
     {
-        $str = (string) $str;
+        $str = (string)$str;
 
-        return parent::isUTF8($str) ?  $str . 'u' : $str;
+        return parent::isUTF8($str) ? $str.'u' : $str;
     }
 }    

phpmyfaq/inc/PMF/String/UTF8ToLatinConvertable.php

Doc Comments +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
      *
      * @param string $language
      *
-     * @return PMF_String_Basic
+     * @return PMF_String_UTF8ToLatinConvertable
      */
     public static function getInstance($language = 'en')
     {
@@ -186,7 +186,7 @@ 
      * @param string $needle   Needle
      * @param boolean $part    Part
      *
-     * @return string|false
+     * @return string
      */
     public function strstr($haystack, $needle, $part = false)
     {

Indentation +16 added lines, -17 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * The string wrapper class using single byte string functions.
- *
- * PHP Version 5.3.0
- *
- * 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
- * @package   String
- * @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-08
- */
+     * The string wrapper class using single byte string functions.
+     *
+     * PHP Version 5.3.0
+     *
+     * 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
+     * @package   String
+     * @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-08
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -37,7 +37,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
  */

Spacing +5 added lines, -5 removed lines

@@ -298,10 +298,10 @@ 
      *
      * @return array|string
      */
-    public function preg_replace_callback($pattern, $callback, $subject, $limit= -1, &$count = 0)
+    public function preg_replace_callback($pattern, $callback, $subject, $limit = -1, &$count = 0)
     {
         if (is_array($pattern)) {
-            foreach($pattern as &$p) {
+            foreach ($pattern as &$p) {
                 $p = self::appendU($p);
             }
         } else {
@@ -322,10 +322,10 @@ 
      *
      * @return array|string|null
      */
-    public function preg_replace($pattern, $replacement, $subject, $limit= -1, &$count = 0)
+    public function preg_replace($pattern, $replacement, $subject, $limit = -1, &$count = 0)
     {
         if (is_array($pattern)) {
-            foreach($pattern as &$p) {
+            foreach ($pattern as &$p) {
                 $p = self::appendU($p);
             }
         } else {
@@ -346,6 +346,6 @@ 
      */
     private static function appendU($str)
     {
-        return ((string) $str) . 'u';
+        return ((string)$str).'u';
     }
 }