thorsten / phpMyFAQ

phpmyfaq/inc/PMF/DB/Sqlite.php

Doc Comments +7 added lines, -8 removed lines

@@ -68,7 +68,7 @@ 
      * @param string
      * @param string
      *
-     * @return  boolean
+     * @return  null|boolean
      */
     public function connect($host, $user, $passwd, $db = '')
     {
@@ -99,7 +99,7 @@ 
      * @param integer $offset
      * @param integer $rowcount
      *
-     * @return  mixed $result
+     * @return  SQLiteResult $result
      */
     public function query($query, $offset = 0, $rowcount = 0)
     {
@@ -145,7 +145,7 @@ 
     /**
      * Fetch a result row as an associate array
      *
-     * @param   mixed $result
+     * @param   SQLiteResult $result
      * @return  array
      */
     public function fetchArray($result)
@@ -179,7 +179,7 @@ 
     /**
      * Number of rows in a result
      *
-     * @param   mixed $result
+     * @param   SQLiteResult $result
      * @return  integer
      */
     public function numRows($result)
@@ -190,8 +190,7 @@ 
     /**
      * Logs the queries
      *
-     * @param   mixed $result
-     * @return  integer
+     * @return  string
      */
     public function log()
     {
@@ -270,7 +269,7 @@ 
      *
      * @param  string $prefix Table prefix
      *
-     * @return array
+     * @return string[]
      */
     public function getTableNames($prefix = '')
     {
@@ -324,7 +323,7 @@ 
     /**
      * Closes the connection to the database.
      *
-     * @return boolean
+     * @return boolean|null
      */
     public function close()
     {

Indentation +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
      */
     public function escape($string)
     {
-      return sqlite_escape_string($string);
+        return sqlite_escape_string($string);
     }
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -156,7 +156,7 @@ 
     {
         $ret = [];
         if (false === $result) {
-            throw new Exception('Error while fetching result: ' . $this->error());
+            throw new Exception('Error while fetching result: '.$this->error());
         }
 
         while ($row = $this->fetchObject($result)) {
@@ -265,7 +265,7 @@ 
         // First, declare those tables that are referenced by others
         $this->tableNames[] = $prefix.'faquser';
 
-        $result = $this->query("SELECT name FROM sqlite_master WHERE type='table' ".(('' == $prefix) ? '':  "AND name LIKE '".$prefix."%' ")."ORDER BY name");
+        $result = $this->query("SELECT name FROM sqlite_master WHERE type='table' ".(('' == $prefix) ? '' : "AND name LIKE '".$prefix."%' ")."ORDER BY name");
         while ($row = $this->fetchObject($result)) {
             if (!in_array($row->name, $this->tableNames)) {
                 $this->tableNames[] = $row->name;

phpmyfaq/inc/PMF/DB/Sqlsrv.php

Doc Comments +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
      *                          SQL Server Authentication
      * @param  string $database Specifies the name of the database in use for the connection being established
      * 
-     * @return boolean true, if connected, otherwise false
+     * @return null|boolean true, if connected, otherwise false
      */
     public function connect($host, $user, $password, $database = '')
     {
@@ -113,7 +113,7 @@ 
      * @param integer $offset
      * @param integer $rowcount
      *
-     * @return  mixed $result
+     * @return  resource $result
      */
     public function query($query, $offset = 0, $rowcount = 0)
     {
@@ -207,7 +207,7 @@ 
     /**
      * Logs the queries
      *
-     * @return integer
+     * @return string
      */
     public function log()
     {
@@ -267,7 +267,7 @@ 
     /**
      * Returns the error string.
      *
-     * @return mixed
+     * @return string|null
      */
     public function error()
     {
@@ -309,7 +309,7 @@ 
      *
      * @param  string $prefix Table prefix
      *
-     * @return array
+     * @return string[]
      */
     public function getTableNames($prefix = '')
     {

Indentation +6 added lines, -6 removed lines

@@ -100,10 +100,10 @@ 
     private function setConnectionOptions($user, $passwd, $database)
     {
         $this->connectionOptions = array(
-           'UID'          => $user,
-           'PWD'          => $passwd,
-           'Database'     => $database,
-           'CharacterSet' => 'UTF-8');
+            'UID'          => $user,
+            'PWD'          => $passwd,
+            'Database'     => $database,
+            'CharacterSet' => 'UTF-8');
     }
 
     /**
@@ -256,8 +256,8 @@ 
                max(%s) as current_id
            FROM 
                %s",
-           $id,
-           $table);
+            $id,
+            $table);
         
         $result = $this->query($select);
         sqlsrv_fetch($result);

Spacing +4 added lines, -4 removed lines

@@ -127,7 +127,7 @@ 
             $query .= sprintf(' OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', $offset, $rowcount);
         }
 
-        $result  = sqlsrv_query($this->conn, $query, [], $options);
+        $result = sqlsrv_query($this->conn, $query, [], $options);
 
         if (!$result) {
             $this->sqllog .= $this->error();
@@ -182,7 +182,7 @@ 
     {
         $ret = [];
         if (false === $result) {
-            throw new Exception('Error while fetching result: ' . $this->error());
+            throw new Exception('Error while fetching result: '.$this->error());
         }
         
         while ($row = $this->fetchObject($result)) {
@@ -274,7 +274,7 @@ 
         $errors = sqlsrv_errors();
 
         if (null !== $errors) {
-            return $errors[0]['SQLSTATE'] . ': ' . $errors[0]['message'];
+            return $errors[0]['SQLSTATE'].': '.$errors[0]['message'];
         } else {
             return null;
         }
@@ -288,7 +288,7 @@ 
     public function clientVersion()
     {
         $client_info = sqlsrv_client_info($this->conn);
-        return $client_info['DriverODBCVer'] . ' ' . $client_info['DriverVer'];
+        return $client_info['DriverODBCVer'].' '.$client_info['DriverVer'];
     }
 
     /**

phpmyfaq/inc/PMF/Faq.php

Doc Comments +10 added lines, -10 removed lines

@@ -1025,7 +1025,7 @@ 
      * @param  array   $categories Array of categories
      * @param  integer $record_id  Record id
      * @param  string  $language   Language
-     * @return integer
+     * @return boolean
      */
     public function addCategoryRelations(Array $categories, $record_id, $language)
     {
@@ -1447,7 +1447,7 @@ 
      *
      * @param  integer $record_id   Record id
      * @param  string  $record_lang Record language
-     * @return array
+     * @return boolean
      */
     public function addNewRevision($record_id, $record_lang)
     {
@@ -2155,7 +2155,7 @@ 
     /**
      * Returns a new question
      *
-     * @param    integer    $question_id
+     * @param    integer    $id_question
      * @return   array
      * @access   public
      * @since    2006-11-11
@@ -2409,7 +2409,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
      * @return  string
@@ -2437,13 +2437,13 @@ 
 /**
      * 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
      * @access  private
      * @since   2005-11-02
      * @author  Matteo Scaramuccia <matteo@scaramuccia.com>

Indentation +39 added lines, -39 removed lines

@@ -75,31 +75,31 @@ 
     private $_config;
 
     /**
-    * Language strings
-    *
-    * @var  string
-    */
+     * Language strings
+     *
+     * @var  string
+     */
     private $pmf_lang;
 
     /**
-    * Plural form support
-    *
-    * @var  PMF_Language_Plurals
-    */
+     * Plural form support
+     *
+     * @var  PMF_Language_Plurals
+     */
     private $plr;
 
     /**
-    * The current FAQ record
-    *
-    * @var  array
-    */
+     * The current FAQ record
+     *
+     * @var  array
+     */
     public $faqRecord = array();
 
     /**
-    * All current FAQ records in an array
-    *
-    * @var  array
-    */
+     * All current FAQ records in an array
+     *
+     * @var  array
+     */
     public $faqRecords = array();
 
     /**
@@ -1184,8 +1184,8 @@ 
 
         if ($row = $this->_config->getDb()->fetchObject($result)) {
             return array('id'      => $row->id,
-                         'lang'    => $row->lang,
-                         'content' => $row->content);
+                            'lang'    => $row->lang,
+                            'content' => $row->content);
         }
 
         return null;
@@ -1512,7 +1512,7 @@ 
      */
     public function getRecordPreview($recordId, $wordCount = 12)
     {
-    	$answerPreview = '';
+        $answerPreview = '';
     	
         if (isset($this->faqRecord['id']) && ($this->faqRecord['id'] == $recordId)) {
             $answerPreview = $this->faqRecord['content'];
@@ -1677,8 +1677,8 @@ 
      * @since   2006-11-04
      * @author  Thorsten Rinne <thorsten@phpmyfaq.de>
      */
-     function getVisibilityOfQuestion($question_id)
-     {
+        function getVisibilityOfQuestion($question_id)
+        {
         $query = sprintf('
             SELECT
                 is_visible
@@ -1695,7 +1695,7 @@ 
             return $row->is_visible;
         }
         return null;
-     }
+        }
 
     /**
      * Sets the visibilty of a question
@@ -2210,8 +2210,8 @@ 
      * @param  $all boolean If true, then return visible and unvisble questions; otherwise only visible ones
      * @return array
      */
-     public function getAllOpenQuestions($all = true)
-     {
+        public function getAllOpenQuestions($all = true)
+        {
         $questions = array();
 
         $query = sprintf("
@@ -2240,7 +2240,7 @@ 
             }
         }
         return $questions;
-     }
+        }
 
     /**
      * Updates an existing voting record
@@ -2347,7 +2347,7 @@ 
             $record_id
             );
 
-       if ($result = $this->_config->getDb()->query($query)) {
+        if ($result = $this->_config->getDb()->query($query)) {
             while ($row = $this->_config->getDb()->fetchObject($result)) {
                 $entries[] = array(
                     'revision_id'   => $row->revision_id,
@@ -2435,19 +2435,19 @@ 
     }
 
 /**
-     * Build the SQL query for retrieving faq records according to the constraints provided
-     *
-     * @param   $QueryType
-     * @param   $nCatid
-     * @param   $bDownwards
-     * @param   $lang
-     * @param   $date
-     * @param   $faqid
-     * @return  array
-     * @access  private
-     * @since   2005-11-02
-     * @author  Matteo Scaramuccia <matteo@scaramuccia.com>
-     */
+ * Build the SQL query for retrieving faq records according to the constraints provided
+ *
+ * @param   $QueryType
+ * @param   $nCatid
+ * @param   $bDownwards
+ * @param   $lang
+ * @param   $date
+ * @param   $faqid
+ * @return  array
+ * @access  private
+ * @since   2005-11-02
+ * @author  Matteo Scaramuccia <matteo@scaramuccia.com>
+ */
     private function _getSQLQuery($QueryType, $nCatid, $bDownwards, $lang, $date, $faqid = 0)
     {
         $now = date('YmdHis');

Spacing +29 added lines, -29 removed lines

@@ -28,20 +28,20 @@ 
 /**
  * SQL constants definitions
  */
-define('FAQ_SQL_YES',        'y');
-define('FAQ_SQL_NO',         'n');
+define('FAQ_SQL_YES', 'y');
+define('FAQ_SQL_NO', 'n');
 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
@@ -256,7 +256,7 @@ 
                     $visits = $row->visits;
                 }
 
-                $url   = sprintf(
+                $url = sprintf(
                     '%s?%saction=artikel&cat=%d&id=%d&artlang=%s',
                     PMF_Link::getSystemRelativeUri(),
                     $sids,
@@ -265,7 +265,7 @@ 
                     $row->lang
                 );
                 $oLink = new PMF_Link($url, $this->_config);
-                $oLink->itemTitle = $oLink->text = $oLink->tooltip = $row->thema;;
+                $oLink->itemTitle = $oLink->text = $oLink->tooltip = $row->thema; ;
 
                 $faqdata[] = array(
                     'record_id'      => $row->id,
@@ -379,20 +379,20 @@ 
 
         $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) {
             if ($pages > 1) {
                 $output .= sprintf('<p><strong>%s %s %s</strong></p>',
-                    $this->pmf_lang['msgPage'] . $page,
+                    $this->pmf_lang['msgPage'].$page,
                     $this->pmf_lang['msgVoteFrom'],
-                    $pages . $this->pmf_lang['msgPages']);
+                    $pages.$this->pmf_lang['msgPages']);
             }
             $output .= '<ul class="phpmyfaq_ul">';
 
@@ -400,7 +400,7 @@ 
             $displayedCounter = 0;
             $renderedItems    = [];
             while (($row = $this->_config->getDb()->fetchObject($result)) && $displayedCounter < $numPerPage) {
-                $counter ++;
+                $counter++;
                 if ($counter <= $first) {
                     continue;
                 }
@@ -564,20 +564,20 @@ 
         $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) {
             if ($pages > 1) {
                 $output .= sprintf('<p><strong>%s %s %s</strong></p>',
-                    $this->pmf_lang['msgPage'] . $page,
+                    $this->pmf_lang['msgPage'].$page,
                     $this->pmf_lang['msgVoteFrom'],
-                    $pages . $this->pmf_lang['msgPages']);
+                    $pages.$this->pmf_lang['msgPages']);
             }
             $output .= '<ul class="phpmyfaq_ul">';
             $counter = 0;
@@ -585,7 +585,7 @@ 
 
             $lastFaqId = 0;
             while (($row = $this->_config->getDb()->fetchObject($result)) && $displayedCounter < $this->_config->get('records.numberOfRecordsPerPage')) {
-                $counter ++;
+                $counter++;
                 if ($counter <= $first) {
                     continue;
                 }
@@ -617,7 +617,7 @@ 
                 $listItem = sprintf(
                     '<li>%s<br /><small>(%s)</small></li>',
                     $oLink->toHtmlAnchor(),
-                    $this->plr->GetMsg('plmsgViews',$visits)
+                    $this->plr->GetMsg('plmsgViews', $visits)
                 );
 
                 $output .= $listItem;
@@ -694,7 +694,7 @@ 
                 fd.lang = '%s'
                 %s",
             PMF_Db::getTablePrefix(),
-            isset($revisionId) ? 'faqdata_revisions': 'faqdata',
+            isset($revisionId) ? 'faqdata_revisions' : 'faqdata',
             PMF_Db::getTablePrefix(),
             PMF_Db::getTablePrefix(),
             $id,
@@ -1635,9 +1635,9 @@ 
         $result = $this->getLatestData(PMF_NUMBER_RECORDS_LATEST, $this->_config->getLanguage()->getLanguage());
         $output = [];
         
-        if (count ($result) > 0) {
+        if (count($result) > 0) {
             foreach ($result as $row) {
-                $output['url'][]     =  $row['url'];
+                $output['url'][]     = $row['url'];
                 $output['title'][]   = PMF_Utils::makeShorterText($row['thema'], 8);
                 $output['preview'][] = $row['thema'];
                 $output['date'][]    = $date->format(PMF_Date::createIsoDate($row['datum']));
@@ -1783,7 +1783,7 @@ 
                 fd.lang = \''.$language.'\'';
         }
         $query .= '
-                ' . $this->queryPermission($this->groupSupport) . '
+                ' . $this->queryPermission($this->groupSupport).'
             ORDER BY
                 avg DESC';
 
@@ -1882,7 +1882,7 @@ 
                 fd.lang = \''.$language.'\'';
         }
         $query .= '
-                ' . $this->queryPermission($this->groupSupport) . '
+                ' . $this->queryPermission($this->groupSupport).'
 
             GROUP BY
                 id
@@ -1986,7 +1986,7 @@ 
                 fd.lang = \''.$language.'\'';
         }
         $query .= '
-                ' . $this->queryPermission($this->groupSupport) . '
+                ' . $this->queryPermission($this->groupSupport).'
             GROUP BY
                 id
             ORDER BY
@@ -2291,7 +2291,7 @@ 
      */
     function createChangeEntry($id, $userId, $text, $lang, $revision_id = 0)
     {
-        if (   !is_numeric($id)
+        if (!is_numeric($id)
             && !is_numeric($userId)
             && !is_string($text)
             && !is_string($lang)
@@ -2850,7 +2850,7 @@ 
             );
         }
 
-        return $output . $extraout;
+        return $output.$extraout;
     }
     
     /**

phpmyfaq/inc/PMF/Helper/Category.php

Doc Comments +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
     /**
      * Get all categories in <option> tags
      *
-     * @param  array|integer $categoryId Category ID or array of category IDs
+     * @param  integer $categoryId Category ID or array of category IDs
      *
      * @return string
      */

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
         $numFaqs       = $this->Category->getNumberOfRecordsOfCategory();
         
         if ($numCategories > 0) {
-            for ($y = 0 ;$y < $numCategories; $y = $this->Category->getNextLineTree($y)) {
+            for ($y = 0; $y < $numCategories; $y = $this->Category->getNextLineTree($y)) {
                 
                 list($hasChild, $name, $categoryId, $description) = $this->Category->getLineDisplay($y);
 
@@ -163,7 +163,7 @@ 
 
         if ($numCategories > 0) {
 
-            for ($y = 0 ;$y < $this->Category->height(); $y = $this->Category->getNextLineTree($y)) {
+            for ($y = 0; $y < $this->Category->height(); $y = $this->Category->getNextLineTree($y)) {
 
                 list($hasChild, $categoryName, $parent, $description) = $this->Category->getLineDisplay($y);
                 $level     = $this->Category->treeTab[$y]['level'];
@@ -307,7 +307,7 @@ 
             }
 
             $categories .= ">";
-            $categories .= $indent . $cat['name'] . "</option>\n";
+            $categories .= $indent.$cat['name']."</option>\n";
             $i++;
         }
 

phpmyfaq/inc/PMF/Instance.php

Doc Comments +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
     /**
      * Returns all instances
      *
-     * @return array
+     * @return PMF_DB_Driver
      */
     public function getAllInstances()
     {
@@ -261,7 +261,7 @@ 
      * Adds a configuration item for the database
      *
      * @param string $name
-     * @param mixed  $value
+     * @param string  $value
      *
      * @return boolean
      */

Spacing +4 added lines, -4 removed lines

@@ -76,7 +76,7 @@ 
      */
     public function addInstance(Array $data)
     {
-        $this->setId($this->config->getDb()->nextId(PMF_Db::getTablePrefix() . 'faqinstances', 'id'));
+        $this->setId($this->config->getDb()->nextId(PMF_Db::getTablePrefix().'faqinstances', 'id'));
 
         $insert = sprintf(
             "INSERT INTO %sfaqinstances VALUES (%d, '%s', '%s', '%s', %s, %s)",
@@ -89,7 +89,7 @@ 
             $this->config->getDb()->now()
         );
 
-        if (! $this->config->getDb()->query($insert)) {
+        if (!$this->config->getDb()->query($insert)) {
             return 0;
         }
 
@@ -249,7 +249,7 @@ 
 
         foreach ($deletes as $delete) {
             $success = $this->config->getDb()->query($delete);
-            if (! $success) {
+            if (!$success) {
                 return false;
             }
         }
@@ -290,7 +290,7 @@ 
      */
     public function getConfig($name)
     {
-        if (! isset($this->instanceConfig[$name])) {
+        if (!isset($this->instanceConfig[$name])) {
             $this->getInstanceConfig($this->getId());
         }
 

phpmyfaq/inc/PMF/Instance/Client.php

Doc Comments +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
      *
      * @param string $prefix SQL table prefix
      *
-     * @return bool
+     * @return boolean|null
      */
     public function createClientTables($prefix)
     {
@@ -192,7 +192,7 @@ 
      * @param string $dest        Destination folder
      * @param string $templateDir Template folder
      *
-     * @return bool
+     * @return boolean|null
      */
     public function copyTemplateFolder($dest, $templateDir = 'default')
     {

Spacing +7 added lines, -7 removed lines

@@ -76,17 +76,17 @@ 
      */
     public function createClientFolder($hostname)
     {
-        $clientDir = PMF_ROOT_DIR . '/multisite/';
+        $clientDir = PMF_ROOT_DIR.'/multisite/';
 
         if (!$this->fileSystem instanceof PMF_Filesystem) {
             $this->fileSystem = new PMF_Filesystem();
         }
 
-        if (! is_writeable($clientDir)) {
+        if (!is_writeable($clientDir)) {
             return false;
         }
 
-        return $this->fileSystem->mkdir($clientDir . $hostname);
+        return $this->fileSystem->mkdir($clientDir.$hostname);
     }
 
     /**
@@ -165,7 +165,7 @@ 
     public function copyConstantsFile($dest)
     {
         return $this->fileSystem->copy(
-            $this->fileSystem->getRootPath() . '/config/constants.php',
+            $this->fileSystem->getRootPath().'/config/constants.php',
             $dest
         );
     }
@@ -180,7 +180,7 @@ 
     public function copyLdapConstantsFile($dest)
     {
         return $this->fileSystem->copy(
-            $this->fileSystem->getRootPath() . '/config/constants_ldap.php',
+            $this->fileSystem->getRootPath().'/config/constants_ldap.php',
             $dest
         );
     }
@@ -196,8 +196,8 @@ 
      */
     public function copyTemplateFolder($dest, $templateDir = 'default')
     {
-        $sourceTpl = $this->fileSystem->getRootPath() . '/assets/template/' . $templateDir;
-        $destTpl   = $dest . '/assets/template/';
+        $sourceTpl = $this->fileSystem->getRootPath().'/assets/template/'.$templateDir;
+        $destTpl   = $dest.'/assets/template/';
 
         $this->fileSystem->recursiveCopy($sourceTpl, $destTpl);
     }

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)
     {

Spacing +21 added lines, -21 removed lines

@@ -90,16 +90,16 @@ 
         $failedDirs = [];
 
         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, 0755)) {
+            } elseif (false === is_dir($this->_rootDir.$dir)) {
+                if (false === mkdir($this->_rootDir.$dir, 0755)) {
                     $failedDirs[] = $dir;
                 }
             } else {
                 copy(
-                    $this->_rootDir . '/setup/index.html',
-                    $this->_rootDir . $dir . '/index.html'
+                    $this->_rootDir.'/setup/index.html',
+                    $this->_rootDir.$dir.'/index.html'
                 );
             }
         }
@@ -118,15 +118,15 @@ 
     public function createDatabaseFile(Array $data, $folder = '/config')
     {
         $ret = file_put_contents(
-            $this->_rootDir . $folder . '/database.php',
-            "<?php\n" .
-            "\$DB['server'] = '" . $data['dbServer'] . "';\n" .
-            "\$DB['port'] = '" . $data['dbPort'] . "';\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['port'] = '".$data['dbPort']."';\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
         );
 
@@ -144,13 +144,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 +45 added lines, -45 removed lines

@@ -361,7 +361,7 @@ 
         $parameters = [];
 
         if (!empty($query)) {
-            if (isset($query['fragment']) ) {
+            if (isset($query['fragment'])) {
                 $parameters[self::PMF_LINK_FRAGMENT_SEPARATOR] = urldecode($query['fragment']);
             }
             $params = explode(self::PMF_LINK_AMPERSAND, $query['main']);
@@ -426,8 +426,8 @@ 
             return 'https://';
         }
         
-        $scheme = 'http' . (((!PMF_Link::isIISServer()) && isset($_SERVER['HTTPS'])) || 
-                           ((PMF_Link::isIISServer()) && ('on' == strtolower($_SERVER['HTTPS']))) ? 's' : '') . '://';
+        $scheme = 'http'.(((!PMF_Link::isIISServer()) && isset($_SERVER['HTTPS'])) || 
+                           ((PMF_Link::isIISServer()) && ('on' == strtolower($_SERVER['HTTPS']))) ? 's' : '').'://';
 
         return $scheme;
     }
@@ -463,11 +463,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);
     }
 
     /**
@@ -536,7 +536,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;
     }
     
     /**
@@ -567,22 +567,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;
@@ -614,37 +614,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;
@@ -655,25 +655,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;
                     }
@@ -702,7 +702,7 @@ 
         $url = $this->url;
         if (!empty($this->url)) {
             if ((!$this->hasScheme()) && (!$this->isInternalReference())) {
-                $url = $this->getDefaultScheme() . $this->url;
+                $url = $this->getDefaultScheme().$this->url;
             }
         }
 
@@ -717,9 +717,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 = "")
     {

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";

Indentation +10 added lines, -10 removed lines

@@ -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";