thorsten / phpMyFAQ

phpmyfaq/inc/PMF/DB/Mysql.php

Doc Comments +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
      * @param string $password MySQL Password
      * @param string $database       MySQL Database name
      *
-     * @return boolean
+     * @return null|boolean
      */
     public function connect($host, $user, $password, $database = '')
     {
@@ -134,7 +134,7 @@ 
     /**
      * Fetch a result row as an object
      *
-     * @param  mixed $result Resultset
+     * @param  resource $result Resultset
      * @return mixed
      */
     public function fetchObject($result)
@@ -273,7 +273,7 @@ 
      *
      * @param  string $prefix Table prefix
      *
-     * @return array
+     * @return string[]
      */
     public function getTableNames($prefix = '')
     {

Spacing +36 added lines, -36 removed lines

@@ -174,7 +174,7 @@ 
     {
         $ret = array();
         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)) {
@@ -303,41 +303,41 @@ 
     public function getTableNames($prefix = '')
     {
         return $this->tableNames[] = array(
-            $prefix . 'faqadminlog',
-            $prefix . 'faqattachment',
-            $prefix . 'faqattachment_file',
-            $prefix . 'faqcaptcha',
-            $prefix . 'faqcategories',
-            $prefix . 'faqcategory_group',
-            $prefix . 'faqcategory_user',
-            $prefix . 'faqcategoryrelations',
-            $prefix . 'faqchanges',
-            $prefix . 'faqcomments',
-            $prefix . 'faqconfig',
-            $prefix . 'faqdata',
-            $prefix . 'faqdata_group',
-            $prefix . 'faqdata_revisions',
-            $prefix . 'faqdata_tags',
-            $prefix . 'faqdata_user',
-            $prefix . 'faqglossary',
-            $prefix . 'faqgroup',
-            $prefix . 'faqgroup_right',
-            $prefix . 'faqinstances',
-            $prefix . 'faqinstances_config',
-            $prefix . 'faqnews',
-            $prefix . 'faqquestions',
-            $prefix . 'faqright',
-            $prefix . 'faqsearches',
-            $prefix . 'faqsessions',
-            $prefix . 'faqstopwords',
-            $prefix . 'faqtags',
-            $prefix . 'faquser',
-            $prefix . 'faquser_group',
-            $prefix . 'faquser_right',
-            $prefix . 'faquserdata',
-            $prefix . 'faquserlogin',
-            $prefix . 'faqvisits',
-            $prefix . 'faqvoting'
+            $prefix.'faqadminlog',
+            $prefix.'faqattachment',
+            $prefix.'faqattachment_file',
+            $prefix.'faqcaptcha',
+            $prefix.'faqcategories',
+            $prefix.'faqcategory_group',
+            $prefix.'faqcategory_user',
+            $prefix.'faqcategoryrelations',
+            $prefix.'faqchanges',
+            $prefix.'faqcomments',
+            $prefix.'faqconfig',
+            $prefix.'faqdata',
+            $prefix.'faqdata_group',
+            $prefix.'faqdata_revisions',
+            $prefix.'faqdata_tags',
+            $prefix.'faqdata_user',
+            $prefix.'faqglossary',
+            $prefix.'faqgroup',
+            $prefix.'faqgroup_right',
+            $prefix.'faqinstances',
+            $prefix.'faqinstances_config',
+            $prefix.'faqnews',
+            $prefix.'faqquestions',
+            $prefix.'faqright',
+            $prefix.'faqsearches',
+            $prefix.'faqsessions',
+            $prefix.'faqstopwords',
+            $prefix.'faqtags',
+            $prefix.'faquser',
+            $prefix.'faquser_group',
+            $prefix.'faquser_right',
+            $prefix.'faquserdata',
+            $prefix.'faquserlogin',
+            $prefix.'faqvisits',
+            $prefix.'faqvoting'
         );
     }
 

Indentation +7 added lines, -7 removed lines

@@ -227,8 +227,8 @@ 
              MAX(%s) AS current_id
          FROM
              %s",
-           $id,
-           $table);
+            $id,
+            $table);
            
         $result    = $this->query($select);
         $currentId = mysql_result($result, 0, 'current_id');
@@ -236,11 +236,11 @@ 
         return ($currentId + 1);
     }
 
-     /**
-      * Returns the error string.
-      *
-      * @return string
-      */
+        /**
+         * Returns the error string.
+         *
+         * @return string
+         */
     public function error()
     {
         return mysql_error();

phpmyfaq/inc/PMF/DB/Mysqli.php

Doc Comments +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
      *
      * @throws PMF_Exception
      *
-     * @return  boolean true, if connected, otherwise false
+     * @return  null|boolean true, if connected, otherwise false
      */
     public function connect($host, $user, $password, $database = '')
     {
@@ -137,7 +137,7 @@ 
      *
      * This function fetches a result row as an object.
      *
-     * @param   mixed $result
+     * @param   resource $result
      * @return  mixed
      */
     public function fetchObject($result)
@@ -282,7 +282,7 @@ 
      *
      * @param  string $prefix Table prefix
      *
-     * @return array
+     * @return string[]
      */
     public function getTableNames($prefix = '')
     {

Spacing +39 added lines, -39 removed lines

@@ -75,7 +75,7 @@ 
         $this->conn = new mysqli($host, $user, $password);
 
         if ($this->conn->connect_error) {
-            PMF_Db::errorPage($this->conn->connect_errno . ': ' . $this->conn->connect_error);
+            PMF_Db::errorPage($this->conn->connect_errno.': '.$this->conn->connect_error);
             die();
         }
         
@@ -85,8 +85,8 @@ 
         }
 
         if ('' !== $database) {
-            if (! $this->conn->select_db($database)) {
-                throw new PMF_Exception('Cannot connect to database ' . $database);
+            if (!$this->conn->select_db($database)) {
+                throw new PMF_Exception('Cannot connect to database '.$database);
             }
         }
 
@@ -172,7 +172,7 @@ 
         $ret = array();
 
         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)) {
@@ -287,41 +287,41 @@ 
     public function getTableNames($prefix = '')
     {
         return $this->tableNames[] = array(
-            $prefix . 'faqadminlog',
-            $prefix . 'faqattachment',
-            $prefix . 'faqattachment_file',
-            $prefix . 'faqcaptcha',
-            $prefix . 'faqcategories',
-            $prefix . 'faqcategory_group',
-            $prefix . 'faqcategory_user',
-            $prefix . 'faqcategoryrelations',
-            $prefix . 'faqchanges',
-            $prefix . 'faqcomments',
-            $prefix . 'faqconfig',
-            $prefix . 'faqdata',
-            $prefix . 'faqdata_group',
-            $prefix . 'faqdata_revisions',
-            $prefix . 'faqdata_tags',
-            $prefix . 'faqdata_user',
-            $prefix . 'faqglossary',
-            $prefix . 'faqgroup',
-            $prefix . 'faqgroup_right',
-            $prefix . 'faqinstances',
-            $prefix . 'faqinstances_config',
-            $prefix . 'faqnews',
-            $prefix . 'faqquestions',
-            $prefix . 'faqright',
-            $prefix . 'faqsearches',
-            $prefix . 'faqsessions',
-            $prefix . 'faqstopwords',
-            $prefix . 'faqtags',
-            $prefix . 'faquser',
-            $prefix . 'faquser_group',
-            $prefix . 'faquser_right',
-            $prefix . 'faquserdata',
-            $prefix . 'faquserlogin',
-            $prefix . 'faqvisits',
-            $prefix . 'faqvoting'
+            $prefix.'faqadminlog',
+            $prefix.'faqattachment',
+            $prefix.'faqattachment_file',
+            $prefix.'faqcaptcha',
+            $prefix.'faqcategories',
+            $prefix.'faqcategory_group',
+            $prefix.'faqcategory_user',
+            $prefix.'faqcategoryrelations',
+            $prefix.'faqchanges',
+            $prefix.'faqcomments',
+            $prefix.'faqconfig',
+            $prefix.'faqdata',
+            $prefix.'faqdata_group',
+            $prefix.'faqdata_revisions',
+            $prefix.'faqdata_tags',
+            $prefix.'faqdata_user',
+            $prefix.'faqglossary',
+            $prefix.'faqgroup',
+            $prefix.'faqgroup_right',
+            $prefix.'faqinstances',
+            $prefix.'faqinstances_config',
+            $prefix.'faqnews',
+            $prefix.'faqquestions',
+            $prefix.'faqright',
+            $prefix.'faqsearches',
+            $prefix.'faqsessions',
+            $prefix.'faqstopwords',
+            $prefix.'faqtags',
+            $prefix.'faquser',
+            $prefix.'faquser_group',
+            $prefix.'faquser_right',
+            $prefix.'faquserdata',
+            $prefix.'faquserlogin',
+            $prefix.'faqvisits',
+            $prefix.'faqvoting'
         );
     }
 

Indentation +17 added lines, -17 removed lines

@@ -122,11 +122,11 @@ 
     }
 
     /**
-    * Escapes a string for use in a query
-    *
-    * @param   string
-    * @return  string
-    */
+     * Escapes a string for use in a query
+     *
+     * @param   string
+     * @return  string
+     */
     public function escape($string)
     {
         return $this->conn->real_escape_string($string);
@@ -207,11 +207,11 @@ 
         return $this->sqllog;
     }
 
-     /**
-      * This function returns the table status.
-      *
-      * @return array
-      */
+        /**
+         * This function returns the table status.
+         *
+         * @return array
+         */
     public function getTableStatus()
     {
         $arr = array();
@@ -237,19 +237,19 @@ 
                MAX(%s) AS current_id
            FROM
                %s",
-           $id,
-           $table);
+            $id,
+            $table);
            
         $result  = $this->query($select);
         $current = $result->fetch_row();
         return $current[0] + 1;
     }
 
-     /**
-      * Returns the error string.
-      *
-      * @return string
-      */
+        /**
+         * Returns the error string.
+         *
+         * @return string
+         */
     public function error()
     {
         return $this->conn->error;

phpmyfaq/inc/PMF/DB/Pgsql.php

Doc Comments +5 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
      * @param string $password Password
      * @param string $database Database name
      *
-     * @return boolean true, if connected, otherwise false
+     * @return null|boolean true, if connected, otherwise false
      */
     public function connect ($host, $user, $password, $database = '')
     {
@@ -132,7 +132,7 @@ 
     /**
      * Fetch a result row as an object
      *
-     * @param   mixed $result
+     * @param   resource $result
      * @return  mixed
      */
     public function fetchObject($result)
@@ -190,7 +190,7 @@ 
     /**
      * Logs the queries
      *
-     * @return  integer
+     * @return  string
      */
     public function log()
     {
@@ -201,6 +201,7 @@ 
      * Returns just one row
      *
      * @param  string
+     * @param string $query
      * @return string
      */
     private function getOne($query)
@@ -287,7 +288,7 @@ 
      *
      * @param  string $prefix Table prefix
      *
-     * @return array
+     * @return string[]
      */
     public function getTableNames($prefix = '')
     {

Spacing +37 added lines, -37 removed lines

@@ -68,7 +68,7 @@ 
      *
      * @return boolean true, if connected, otherwise false
      */
-    public function connect ($host, $user, $password, $database = '')
+    public function connect($host, $user, $password, $database = '')
     {
         $connectionString = sprintf(
             'host=%s port=5432 dbname=%s user=%s password=%s',
@@ -166,7 +166,7 @@ 
     {
         $ret = array();
         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)) {
@@ -292,41 +292,41 @@ 
     public function getTableNames($prefix = '')
     {
         return $this->tableNames[] = array(
-            $prefix . 'faqadminlog',
-            $prefix . 'faqattachment',
-            $prefix . 'faqattachment_file',
-            $prefix . 'faqcaptcha',
-            $prefix . 'faqcategories',
-            $prefix . 'faqcategory_group',
-            $prefix . 'faqcategory_user',
-            $prefix . 'faqcategoryrelations',
-            $prefix . 'faqchanges',
-            $prefix . 'faqcomments',
-            $prefix . 'faqconfig',
-            $prefix . 'faqdata',
-            $prefix . 'faqdata_group',
-            $prefix . 'faqdata_revisions',
-            $prefix . 'faqdata_tags',
-            $prefix . 'faqdata_user',
-            $prefix . 'faqglossary',
-            $prefix . 'faqgroup',
-            $prefix . 'faqgroup_right',
-            $prefix . 'faqinstances',
-            $prefix . 'faqinstances_config',
-            $prefix . 'faqnews',
-            $prefix . 'faqquestions',
-            $prefix . 'faqright',
-            $prefix . 'faqsearches',
-            $prefix . 'faqsessions',
-            $prefix . 'faqstopwords',
-            $prefix . 'faqtags',
-            $prefix . 'faquser',
-            $prefix . 'faquser_group',
-            $prefix . 'faquser_right',
-            $prefix . 'faquserdata',
-            $prefix . 'faquserlogin',
-            $prefix . 'faqvisits',
-            $prefix . 'faqvoting'
+            $prefix.'faqadminlog',
+            $prefix.'faqattachment',
+            $prefix.'faqattachment_file',
+            $prefix.'faqcaptcha',
+            $prefix.'faqcategories',
+            $prefix.'faqcategory_group',
+            $prefix.'faqcategory_user',
+            $prefix.'faqcategoryrelations',
+            $prefix.'faqchanges',
+            $prefix.'faqcomments',
+            $prefix.'faqconfig',
+            $prefix.'faqdata',
+            $prefix.'faqdata_group',
+            $prefix.'faqdata_revisions',
+            $prefix.'faqdata_tags',
+            $prefix.'faqdata_user',
+            $prefix.'faqglossary',
+            $prefix.'faqgroup',
+            $prefix.'faqgroup_right',
+            $prefix.'faqinstances',
+            $prefix.'faqinstances_config',
+            $prefix.'faqnews',
+            $prefix.'faqquestions',
+            $prefix.'faqright',
+            $prefix.'faqsearches',
+            $prefix.'faqsessions',
+            $prefix.'faqstopwords',
+            $prefix.'faqtags',
+            $prefix.'faquser',
+            $prefix.'faquser_group',
+            $prefix.'faquser_right',
+            $prefix.'faquserdata',
+            $prefix.'faquserlogin',
+            $prefix.'faqvisits',
+            $prefix.'faqvoting'
         );
     }
 

Indentation +5 added lines, -5 removed lines

@@ -119,11 +119,11 @@
     }
 
     /**
-    * Escapes a string for use in a query
-    *
-    * @param   string
-    * @return  string
-    */
+     * Escapes a string for use in a query
+     *
+     * @param   string
+     * @return  string
+     */
     public function escape($string)
     {
         return pg_escape_string($this->conn, $string);

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

Spacing +36 added lines, -36 removed lines

@@ -174,7 +174,7 @@ 
     {
         $ret = array();
         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)) {
@@ -303,41 +303,41 @@ 
     public function getTableNames($prefix = '')
     {
         return $this->tableNames[] = array(
-            $prefix . 'faqadminlog',
-            $prefix . 'faqattachment',
-            $prefix . 'faqattachment_file',
-            $prefix . 'faqcaptcha',
-            $prefix . 'faqcategories',
-            $prefix . 'faqcategory_group',
-            $prefix . 'faqcategory_user',
-            $prefix . 'faqcategoryrelations',
-            $prefix . 'faqchanges',
-            $prefix . 'faqcomments',
-            $prefix . 'faqconfig',
-            $prefix . 'faqdata',
-            $prefix . 'faqdata_group',
-            $prefix . 'faqdata_revisions',
-            $prefix . 'faqdata_tags',
-            $prefix . 'faqdata_user',
-            $prefix . 'faqglossary',
-            $prefix . 'faqgroup',
-            $prefix . 'faqgroup_right',
-            $prefix . 'faqinstances',
-            $prefix . 'faqinstances_config',
-            $prefix . 'faqnews',
-            $prefix . 'faqquestions',
-            $prefix . 'faqright',
-            $prefix . 'faqsearches',
-            $prefix . 'faqsessions',
-            $prefix . 'faqstopwords',
-            $prefix . 'faqtags',
-            $prefix . 'faquser',
-            $prefix . 'faquser_group',
-            $prefix . 'faquser_right',
-            $prefix . 'faquserdata',
-            $prefix . 'faquserlogin',
-            $prefix . 'faqvisits',
-            $prefix . 'faqvoting'
+            $prefix.'faqadminlog',
+            $prefix.'faqattachment',
+            $prefix.'faqattachment_file',
+            $prefix.'faqcaptcha',
+            $prefix.'faqcategories',
+            $prefix.'faqcategory_group',
+            $prefix.'faqcategory_user',
+            $prefix.'faqcategoryrelations',
+            $prefix.'faqchanges',
+            $prefix.'faqcomments',
+            $prefix.'faqconfig',
+            $prefix.'faqdata',
+            $prefix.'faqdata_group',
+            $prefix.'faqdata_revisions',
+            $prefix.'faqdata_tags',
+            $prefix.'faqdata_user',
+            $prefix.'faqglossary',
+            $prefix.'faqgroup',
+            $prefix.'faqgroup_right',
+            $prefix.'faqinstances',
+            $prefix.'faqinstances_config',
+            $prefix.'faqnews',
+            $prefix.'faqquestions',
+            $prefix.'faqright',
+            $prefix.'faqsearches',
+            $prefix.'faqsessions',
+            $prefix.'faqstopwords',
+            $prefix.'faqtags',
+            $prefix.'faquser',
+            $prefix.'faquser_group',
+            $prefix.'faquser_right',
+            $prefix.'faquserdata',
+            $prefix.'faquserlogin',
+            $prefix.'faqvisits',
+            $prefix.'faqvoting'
         );
     }
 

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);
     }
 
     /**

phpmyfaq/inc/PMF/DB/Sqlite3.php

Doc Comments +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
      * @param string
      * @param string
      *
-     * @return  boolean
+     * @return  null|boolean
      */
     public function connect($host, $user, $passwd, $db = '')
     {
@@ -84,7 +84,7 @@ 
      * @param integer $offset
      * @param integer $rowcount
      *
-     * @return  mixed $result
+     * @return  SQLite3Result $result
      */
     public function query($query, $offset = 0, $rowcount = 0)
     {
@@ -150,7 +150,7 @@ 
      *
      * @param   SQLite3Result $result
      *
-     * @return  array
+     * @return  SQLite3Result
      */
     public function fetchAssoc($result)
     {
@@ -202,7 +202,7 @@ 
     /**
      * Logs the queries
      *
-     * @return  integer
+     * @return  string
      */
     public function log()
     {
@@ -234,7 +234,7 @@ 
      *
      * @param  string $prefix Table prefix
      *
-     * @return array
+     * @return string[]
      */
     public function getTableNames($prefix = '')
     {

Spacing +44 added lines, -44 removed lines

@@ -124,7 +124,7 @@ 
      */
     public function fetchObject($result)
     {
-        $result->fetchedByPMF= true;
+        $result->fetchedByPMF = true;
         $return = $result->fetchArray(SQLITE3_ASSOC);
 
         return $return
@@ -141,7 +141,7 @@ 
      */
     public function fetchArray($result)
     {
-        $result->fetchedByPMF= true;
+        $result->fetchedByPMF = true;
         return $result->fetchArray();
     }
 
@@ -154,7 +154,7 @@ 
      */
     public function fetchAssoc($result)
     {
-        $result->fetchedByPMF= true;
+        $result->fetchedByPMF = true;
         return $result->fetchArray(SQLITE3_ASSOC);
     }
 
@@ -171,11 +171,11 @@ 
     {
         $ret = array();
         if (false === $result) {
-            throw new Exception('Error while fetching result: ' . $this->error());
+            throw new Exception('Error while fetching result: '.$this->error());
         }
         
-        $result->fetchedByPMF= true;
-        while( $row=$result->fetchArray(SQLITE3_ASSOC) ) {
+        $result->fetchedByPMF = true;
+        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
             $ret[] = (object)$row;
         }
 
@@ -190,9 +190,9 @@ 
      */
     public function numRows($result)
     {
-        !isset( $result->fetchedByPMF ) || !$result->fetchedByPMF || die( "Do not call numRows() after you've fetched one or more result records, because PMF_DB_Sqlite3::numRows() has to reset the resultset at its end." );
-        $numberOfRows= 0;
-        while( $result->fetchArray(SQLITE3_NUM) ) {
+        !isset($result->fetchedByPMF) || !$result->fetchedByPMF || die("Do not call numRows() after you've fetched one or more result records, because PMF_DB_Sqlite3::numRows() has to reset the resultset at its end.");
+        $numberOfRows = 0;
+        while ($result->fetchArray(SQLITE3_NUM)) {
             $numberOfRows++;
         }
         $result->reset();
@@ -239,41 +239,41 @@ 
     public function getTableNames($prefix = '')
     {
         return $this->tableNames[] = array(
-            $prefix . 'faqadminlog',
-            $prefix . 'faqattachment',
-            $prefix . 'faqattachment_file',
-            $prefix . 'faqcaptcha',
-            $prefix . 'faqcategories',
-            $prefix . 'faqcategory_group',
-            $prefix . 'faqcategory_user',
-            $prefix . 'faqcategoryrelations',
-            $prefix . 'faqchanges',
-            $prefix . 'faqcomments',
-            $prefix . 'faqconfig',
-            $prefix . 'faqdata',
-            $prefix . 'faqdata_group',
-            $prefix . 'faqdata_revisions',
-            $prefix . 'faqdata_tags',
-            $prefix . 'faqdata_user',
-            $prefix . 'faqglossary',
-            $prefix . 'faqgroup',
-            $prefix . 'faqgroup_right',
-            $prefix . 'faqinstances',
-            $prefix . 'faqinstances_config',
-            $prefix . 'faqnews',
-            $prefix . 'faqquestions',
-            $prefix . 'faqright',
-            $prefix . 'faqsearches',
-            $prefix . 'faqsessions',
-            $prefix . 'faqstopwords',
-            $prefix . 'faqtags',
-            $prefix . 'faquser',
-            $prefix . 'faquser_group',
-            $prefix . 'faquser_right',
-            $prefix . 'faquserdata',
-            $prefix . 'faquserlogin',
-            $prefix . 'faqvisits',
-            $prefix . 'faqvoting'
+            $prefix.'faqadminlog',
+            $prefix.'faqattachment',
+            $prefix.'faqattachment_file',
+            $prefix.'faqcaptcha',
+            $prefix.'faqcategories',
+            $prefix.'faqcategory_group',
+            $prefix.'faqcategory_user',
+            $prefix.'faqcategoryrelations',
+            $prefix.'faqchanges',
+            $prefix.'faqcomments',
+            $prefix.'faqconfig',
+            $prefix.'faqdata',
+            $prefix.'faqdata_group',
+            $prefix.'faqdata_revisions',
+            $prefix.'faqdata_tags',
+            $prefix.'faqdata_user',
+            $prefix.'faqglossary',
+            $prefix.'faqgroup',
+            $prefix.'faqgroup_right',
+            $prefix.'faqinstances',
+            $prefix.'faqinstances_config',
+            $prefix.'faqnews',
+            $prefix.'faqquestions',
+            $prefix.'faqright',
+            $prefix.'faqsearches',
+            $prefix.'faqsessions',
+            $prefix.'faqstopwords',
+            $prefix.'faqtags',
+            $prefix.'faquser',
+            $prefix.'faquser_group',
+            $prefix.'faquser_right',
+            $prefix.'faquserdata',
+            $prefix.'faquserlogin',
+            $prefix.'faqvisits',
+            $prefix.'faqvoting'
         );
     }
 

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

Spacing +38 added lines, -38 removed lines

@@ -182,7 +182,7 @@ 
     {
         $ret = array();
         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'];
     }
 
     /**
@@ -314,41 +314,41 @@ 
     public function getTableNames($prefix = '')
     {
         return $this->tableNames[] = array(
-            $prefix . 'faqadminlog',
-            $prefix . 'faqattachment',
-            $prefix . 'faqattachment_file',
-            $prefix . 'faqcaptcha',
-            $prefix . 'faqcategories',
-            $prefix . 'faqcategory_group',
-            $prefix . 'faqcategory_user',
-            $prefix . 'faqcategoryrelations',
-            $prefix . 'faqchanges',
-            $prefix . 'faqcomments',
-            $prefix . 'faqconfig',
-            $prefix . 'faqdata',
-            $prefix . 'faqdata_group',
-            $prefix . 'faqdata_revisions',
-            $prefix . 'faqdata_tags',
-            $prefix . 'faqdata_user',
-            $prefix . 'faqglossary',
-            $prefix . 'faqgroup',
-            $prefix . 'faqgroup_right',
-            $prefix . 'faqinstances',
-            $prefix . 'faqinstances_config',
-            $prefix . 'faqnews',
-            $prefix . 'faqquestions',
-            $prefix . 'faqright',
-            $prefix . 'faqsearches',
-            $prefix . 'faqsessions',
-            $prefix . 'faqstopwords',
-            $prefix . 'faqtags',
-            $prefix . 'faquser',
-            $prefix . 'faquser_group',
-            $prefix . 'faquser_right',
-            $prefix . 'faquserdata',
-            $prefix . 'faquserlogin',
-            $prefix . 'faqvisits',
-            $prefix . 'faqvoting'
+            $prefix.'faqadminlog',
+            $prefix.'faqattachment',
+            $prefix.'faqattachment_file',
+            $prefix.'faqcaptcha',
+            $prefix.'faqcategories',
+            $prefix.'faqcategory_group',
+            $prefix.'faqcategory_user',
+            $prefix.'faqcategoryrelations',
+            $prefix.'faqchanges',
+            $prefix.'faqcomments',
+            $prefix.'faqconfig',
+            $prefix.'faqdata',
+            $prefix.'faqdata_group',
+            $prefix.'faqdata_revisions',
+            $prefix.'faqdata_tags',
+            $prefix.'faqdata_user',
+            $prefix.'faqglossary',
+            $prefix.'faqgroup',
+            $prefix.'faqgroup_right',
+            $prefix.'faqinstances',
+            $prefix.'faqinstances_config',
+            $prefix.'faqnews',
+            $prefix.'faqquestions',
+            $prefix.'faqright',
+            $prefix.'faqsearches',
+            $prefix.'faqsessions',
+            $prefix.'faqstopwords',
+            $prefix.'faqtags',
+            $prefix.'faquser',
+            $prefix.'faquser_group',
+            $prefix.'faquser_right',
+            $prefix.'faquserdata',
+            $prefix.'faquserlogin',
+            $prefix.'faqvisits',
+            $prefix.'faqvoting'
         );
     }
 

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

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>

Spacing +30 added lines, -30 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    = array();
             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,
@@ -1633,9 +1633,9 @@ 
         $result = $this->getLatestData(PMF_NUMBER_RECORDS_LATEST, $this->_config->getLanguage()->getLanguage());
         $output = array();
         
-        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['date'][]  = $date->format(PMF_Date::createIsoDate($row['datum']));
             }
@@ -1780,7 +1780,7 @@ 
                 fd.lang = \''.$language.'\'';
         }
         $query .= '
-                ' . $this->queryPermission($this->groupSupport) . '
+                ' . $this->queryPermission($this->groupSupport).'
             ORDER BY
                 avg DESC';
 
@@ -1879,7 +1879,7 @@ 
                 fd.lang = \''.$language.'\'';
         }
         $query .= '
-                ' . $this->queryPermission($this->groupSupport) . '
+                ' . $this->queryPermission($this->groupSupport).'
             ORDER BY
                 fv.visits DESC';
 
@@ -1985,7 +1985,7 @@ 
                 fd.lang = \''.$language.'\'';
         }
         $query .= '
-                ' . $this->queryPermission($this->groupSupport) . '
+                ' . $this->queryPermission($this->groupSupport).'
             ORDER BY
                 fd.datum DESC';
 
@@ -1995,7 +1995,7 @@ 
 
         $i = 0;
         $oldId = 0;
-        while (($row = $this->_config->getDb()->fetchObject($result)) && $i < $count ) {
+        while (($row = $this->_config->getDb()->fetchObject($result)) && $i < $count) {
             if ($oldId != $row->id) {
 
                 if ($this->groupSupport) {
@@ -2294,7 +2294,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)
@@ -2851,7 +2851,7 @@ 
             );
         }
 
-        return $output . $extraout;
+        return $output.$extraout;
     }
     
     /**

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

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 +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
         $numCategories = $this->Category->height();
 
         if ($numCategories > 0) {
-            for ($y = 0 ;$y < $numCategories; $y = $this->Category->getNextLineTree($y)) {
+            for ($y = 0; $y < $numCategories; $y = $this->Category->getNextLineTree($y)) {
                 
                 list($name, $categoryId, $description) = $this->Category->getLineDisplay($y);
 
@@ -201,7 +201,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());
         }