thorsten / phpMyFAQ

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>
      */

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($this->type) {
+        switch ($this->type) {
             case 'db2':
             case 'sqlite':
                 $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/Template.php

Doc Comments +2 added lines, -2 removed lines

@@ -266,7 +266,7 @@ 
      * This function multiplies blocks
      *
      * @param  string $block        Blockname
-     * @param  array  $blockContent Content of block
+     * @param  string  $blockContent Content of block
      *
      * @return string implode('', $tmpBlock)
      */
@@ -358,7 +358,7 @@ 
      *
      * @param string $content Content to check
      *
-     * @return array
+     * @return string
      */
     private function _checkContent($content)
     {

Spacing +14 added lines, -14 removed lines

@@ -88,7 +88,7 @@ 
         
         foreach ($myTemplate as $templateName => $filename) {
             $this->templates[$templateName] = $this->_include(
-                'assets/template/' . $tplSetName . '/' . $filename,
+                'assets/template/'.$tplSetName.'/'.$filename,
                 $templateName
             );
         }
@@ -104,7 +104,7 @@ 
      */
     public function merge($from, $into)
     {
-        $this->outputs[$into] = str_replace('{' . $from . '}', $this->outputs[$from], $this->outputs[$into]);
+        $this->outputs[$into] = str_replace('{'.$from.'}', $this->outputs[$from], $this->outputs[$into]);
         $this->outputs[$from] = null;
     }
 
@@ -126,12 +126,12 @@ 
             foreach ($rawBlocks as $key => $rawBlock) {
                 if (in_array($key, $this->blocksTouched) && $key != 'unblocked') {
                     $tmp = str_replace($rawBlock, $this->blocks[$templateName][$key], $tmp);
-                    $tmp = str_replace('[' . $key . ']', '', $tmp);
-                    $tmp = str_replace('[/' . $key . ']', '', $tmp);
+                    $tmp = str_replace('['.$key.']', '', $tmp);
+                    $tmp = str_replace('[/'.$key.']', '', $tmp);
                 } elseif ($key != 'unblocked') {
                     $tmp = str_replace($rawBlock, '', $tmp);
-                    $tmp = str_replace('[' . $key . ']', '', $tmp);
-                    $tmp = str_replace('[/' . $key . ']', '', $tmp);
+                    $tmp = str_replace('['.$key.']', '', $tmp);
+                    $tmp = str_replace('[/'.$key.']', '', $tmp);
                 }
             }
         }
@@ -289,9 +289,9 @@ 
                 } else {
                     die('Wrong parameter length!');
                 }
-            } else{
+            } else {
                 //multiply strings to $multiplyTimes
-                for ($i=0; $i<$multiplyTimes; $i++){
+                for ($i = 0; $i < $multiplyTimes; $i++) {
                     $replace[$var][] = $val;
                 }
             }
@@ -326,20 +326,20 @@ 
         $unblocked = $tpl;
         if (isset($tmpBlocks)) {
             $blockCount = count($tmpBlocks[0]);
-            for ($i = 0 ; $i < $blockCount; $i++) {
+            for ($i = 0; $i < $blockCount; $i++) {
                 $name = '';
                 //find block name
                 PMF_String::preg_match('/\[.+\]/', $tmpBlocks[0][$i], $name);
                 $name = PMF_String::preg_replace('/[\[\[\/\]]/', '', $name);
                 //remove block tags from block
-                $res = str_replace('[' . $name[0] . ']','',$tmpBlocks[0][$i]);
-                $res = str_replace('[/' . $name[0] . ']','',$res);
+                $res = str_replace('['.$name[0].']', '', $tmpBlocks[0][$i]);
+                $res = str_replace('[/'.$name[0].']', '', $res);
                 $tplBlocks[$name[0]] = $res;
 
                 //unblocked content
                 $unblocked = str_replace($tplBlocks[$name[0]], '', $unblocked);
-                $unblocked = str_replace('[' . $name[0] . ']','',$unblocked);
-                $unblocked = str_replace('[/' . $name[0] . ']','',$unblocked);
+                $unblocked = str_replace('['.$name[0].']', '', $unblocked);
+                $unblocked = str_replace('[/'.$name[0].']', '', $unblocked);
             }
 
             $hits = [];
@@ -366,7 +366,7 @@ 
         $search      = array('#<\?php#i', '#\{$\{#', '#<\?#', '#<\%#', '#`#', '#<script[^>]+php#mi');
         $phppattern1 = "&lt;?php";
         $phppattern2 = "&lt;?";
-        $replace     = array($phppattern1, '', $phppattern2, '', '' );
+        $replace     = array($phppattern1, '', $phppattern2, '', '');
 
         // Hack: Backtick Fix
         $content = str_replace('`', '&acute;', $content);

phpmyfaq/inc/PMF/TransTool.php

Doc Comments +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
      *
      * @param string $val Value
      *
-     * @return boolean
+     * @return integer
      */
     public function isValIgnorable($val)
     {

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
                 }
             }
             
-            $retval = floor(100 * $countTranslated / $countAll);
+            $retval = floor(100*$countTranslated/$countAll);
         }
         
         unset($exemplary, $toCheck);

phpmyfaq/inc/PMF/User.php

Doc Comments +1 added lines, -1 removed lines

@@ -480,7 +480,7 @@
      * @param  string  $login  Login name
      * @param  string  $pass   Password
      * @param  integer $userId User ID
-     * @return mixed
+     * @return boolean
      */
     public function createUser($login, $pass = '', $userId = 0)
     {

Braces +1 added lines, -2 removed lines

@@ -653,8 +653,7 @@
             }
             if (!$auth->changePassword($login, $pass)) {
                 continue;
-            }
-            else {
+            } else {
                 $success = true;
             }
         }

Indentation +2 added lines, -2 removed lines

@@ -266,8 +266,8 @@
                 %sfaquser
             WHERE
                 user_id = %d",
-             PMF_Db::getTablePrefix(),
-             (int) $userId);
+                PMF_Db::getTablePrefix(),
+                (int) $userId);
              
         $res = $this->config->getDb()->query($select);
         if ($this->config->getDb()->numRows($res) != 1) {

Spacing +20 added lines, -20 removed lines

@@ -267,15 +267,15 @@ 
             WHERE
                 user_id = %d",
              PMF_Db::getTablePrefix(),
-             (int) $userId);
+             (int)$userId);
              
         $res = $this->config->getDb()->query($select);
         if ($this->config->getDb()->numRows($res) != 1) {
-            $this->errors[] = self::ERROR_USER_NO_USERID . 'error(): ' . $this->config->getDb()->error();
+            $this->errors[] = self::ERROR_USER_NO_USERID.'error(): '.$this->config->getDb()->error();
             return false;
         }
         $user          = $this->config->getDb()->fetchArray($res);
-        $this->userId = (int)    $user['user_id'];
+        $this->userId = (int)$user['user_id'];
         $this->login   = (string)$user['login'];
         $this->status  = (string)$user['account_status'];
         
@@ -295,7 +295,7 @@ 
                 
             $res = $this->config->getDb()->query($select);
             if ($this->config->getDb()->numRows($res) != 1) {
-                $this->errors[] = self::ERROR_USER_NO_USERLOGINDATA . 'error(): ' . $this->config->getDb()->error();
+                $this->errors[] = self::ERROR_USER_NO_USERLOGINDATA.'error(): '.$this->config->getDb()->error();
                 return false;
             }
         }
@@ -339,9 +339,9 @@ 
             return false;
         }
         $user = $this->config->getDb()->fetchArray($res);
-        $this->userId  = (int)    $user['user_id'];
-        $this->login   = (string) $user['login'];
-        $this->status  = (string) $user['account_status'];
+        $this->userId  = (int)$user['user_id'];
+        $this->login   = (string)$user['login'];
+        $this->status  = (string)$user['account_status'];
 
         // get user-data
         if (!$this->userdata instanceof PMF_User_UserData) {
@@ -386,9 +386,9 @@ 
             return false;
         }
 
-        $this->userId = (int)     $user['user_id'];
-        $this->login   = (string) $user['login'];
-        $this->status  = (string) $user['account_status'];
+        $this->userId = (int)$user['user_id'];
+        $this->login   = (string)$user['login'];
+        $this->status  = (string)$user['account_status'];
 
         // get user-data
         if (!$this->userdata instanceof PMF_User_UserData) {
@@ -463,7 +463,7 @@ 
         
         // set user-ID
         if (0 == $userId) {
-            $this->userId = (int) $this->config->getDb()->nextId(PMF_Db::getTablePrefix() . 'faquser', 'user_id');
+            $this->userId = (int)$this->config->getDb()->nextId(PMF_Db::getTablePrefix().'faquser', 'user_id');
         } else {
             $this->userId = $userId;
         }
@@ -503,7 +503,7 @@ 
                 continue;
             }
             if (!$auth->add($login, $pass)) {
-                $this->errors[] = self::ERROR_USER_CANNOT_CREATE_USER . 'in Auth ' . $name;
+                $this->errors[] = self::ERROR_USER_CANNOT_CREATE_USER.'in Auth '.$name;
             } else {
                 $success = true;
             }
@@ -534,7 +534,7 @@ 
         }
         
         if (isset($this->allowedStatus[$this->status]) && $this->allowedStatus[$this->status] == self::STATUS_USER_PROTECTED) {
-            $this->errors[] = self::ERROR_USER_CANNOT_DELETE_USER . self::STATUS_USER_PROTECTED;
+            $this->errors[] = self::ERROR_USER_CANNOT_DELETE_USER.self::STATUS_USER_PROTECTED;
             return false;
         }
         
@@ -551,7 +551,7 @@ 
             
         $res = $this->config->getDb()->query($delete);
         if (!$res) {
-            $this->errors[] = self::ERROR_USER_CANNOT_DELETE_USER . 'error(): ' . $this->config->getDb()->error();
+            $this->errors[] = self::ERROR_USER_CANNOT_DELETE_USER.'error(): '.$this->config->getDb()->error();
             return false;
         }
         
@@ -566,7 +566,7 @@ 
         
         $readOnly  = 0;
         $authCount = 0;
-        $delete     = [];
+        $delete = [];
         foreach ($this->authContainer as $auth) {
             $authCount++;
             if ($auth->setReadOnly()) {
@@ -684,10 +684,10 @@ 
     {
         $message = '';
         foreach ($this->errors as $error) {
-            $message .= $error . "<br>\n";
+            $message .= $error."<br>\n";
         }
         $this->errors = [];
-        return $message . '<br>' . implode('<br>', debug_backtrace());
+        return $message.'<br>'.implode('<br>', debug_backtrace());
     }
 
     /**
@@ -704,7 +704,7 @@ 
      */
     public function isValidLogin($login)
     {
-        $login = (string) $login;
+        $login = (string)$login;
 
         if (strlen($login) < $this->loginMinLength || !preg_match($this->validUsername, $login)) {
             $this->errors[] = self::ERROR_USER_LOGIN_INVALID;
@@ -822,8 +822,8 @@ 
      */
     private function createPassword()
     {
-        srand((double)microtime() * 1000000);
-        return (string) uniqid(rand());
+        srand((double)microtime()*1000000);
+        return (string)uniqid(rand());
     }
 
     /**

phpmyfaq/inc/PMF/User/UserData.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      * Returns the field $field of the user data. If $field is an
      * array, an associative array will be returned.
      *
-     * @param  mixed $field Field(s)
+     * @param  string $field Field(s)
      * @return mixed
      */
     public function get($field)

Spacing +5 added lines, -5 removed lines

@@ -180,7 +180,7 @@ 
         }
         
         $this->userId = $userId;
-        $select        = sprintf("
+        $select = sprintf("
             SELECT
                 last_modified, 
                 display_name, 
@@ -240,13 +240,13 @@ 
      */
     public function add($userId)
     {
-        $userId = (int) $userId;
+        $userId = (int)$userId;
         if (($userId <= 0) && ($userId != -1)) {
             return false;
         }
             
         $this->userId = $userId;
-        $insert        = sprintf("
+        $insert = sprintf("
             INSERT INTO
                 %sfaquserdata
             (user_id, last_modified)
@@ -274,13 +274,13 @@ 
      */
     public function delete($userId)
     {
-        $userId = (int) $userId;
+        $userId = (int)$userId;
         if (($userId <= 0) && ($userId != -1)) {
             return false;
         }
             
         $this->userId = $userId;
-        $delete        = sprintf("
+        $delete = sprintf("
             DELETE FROM
                 %sfaquserdata
             WHERE

phpmyfaq/inc/PMF/Utils.php

Doc Comments +3 added lines, -3 removed lines

@@ -122,7 +122,7 @@ 
      *
      * @param string $lang Language
      *
-     * @return boolean
+     * @return integer
      */
     public static function isLanguage($lang)
     {
@@ -134,7 +134,7 @@ 
      *
      * @param integer $date Date
      *
-     * @return integer
+     * @return boolean
      */
     public static function isLikeOnPMFDate($date)
     {
@@ -315,7 +315,7 @@ 
     /**
      * debug_backtrace() wrapper function
      *
-     * @param $string
+     * @param string $string
      *
      * @return string
      */

Spacing +16 added lines, -16 removed lines

@@ -65,7 +65,7 @@ 
 
         // Create the HTTP options for the HTTP stream context, see below
         // Set phpMyFAQ agent related data
-        $agent = 'phpMyFAQ/' . PMF_System::getVersion() . ' on PHP/' . PHP_VERSION;
+        $agent = 'phpMyFAQ/'.PMF_System::getVersion().' on PHP/'.PHP_VERSION;
         $opts  = array(
             'header' => 'User-Agent: '.$agent."\r\n",
             'method' => 'GET'
@@ -73,7 +73,7 @@ 
         // HTTP 1.1 Virtual Host
         $urlParts = @parse_url($url);
         if (isset($urlParts['host'])) {
-            $opts['header'] = $opts['header'] . 'Host: ' . $urlParts['host'] . "\r\n";
+            $opts['header'] = $opts['header'].'Host: '.$urlParts['host']."\r\n";
         }
         // Socket timeout
         $opts['timeout'] = 5;
@@ -98,7 +98,7 @@ 
         // Unix: 13 Dec 1901 20:45:54 -> 19 Jan 2038 03:14:07, signed 32 bit
         // Windows: 1 Jan 1970 -> 19 Jan 2038.
         // So we will use: 1 Jan 2038 -> 2038-01-01, 00:00:01
-        return PMF_Utils::getPMFDate(mktime(0, 0 , 1, 1, 1, 2038));
+        return PMF_Utils::getPMFDate(mktime(0, 0, 1, 1, 1, 2038));
     }
 
     /**
@@ -146,7 +146,7 @@ 
         }
         // Suppress last occurence of '%'
         if (substr($testdate, -1, 1) == '%') {
-            $testdate = substr($testdate, 0, strlen($testdate)-1);
+            $testdate = substr($testdate, 0, strlen($testdate) - 1);
         }
         // PMF date consists of numbers only: YYYYMMDDhhmmss
         return is_int($testdate);
@@ -220,7 +220,7 @@ 
             if (count($data) > 1) {
                 $randomized_keys = array_rand($data, count($data));
 
-                foreach($randomized_keys as $current_key) {
+                foreach ($randomized_keys as $current_key) {
                     $shuffled_data[$current_key] = $data[$current_key];
                 }
             } else {
@@ -239,7 +239,7 @@ 
      *
      * @return string
      */
-    public static function chopString ($string, $words)
+    public static function chopString($string, $words)
     {
         $str    = '';
         $pieces = explode(' ', $string);
@@ -247,8 +247,8 @@ 
         if ($words > $num) {
             $words = $num;
         }
-        for ($i = 0; $i < $words; $i ++) {
-            $str .= $pieces[$i] . ' ';
+        for ($i = 0; $i < $words; $i++) {
+            $str .= $pieces[$i].' ';
         }
         return $str;
     }
@@ -284,9 +284,9 @@ 
         );
         
         return PMF_String::preg_replace_callback(
-            '/(' . $highlight . '="[^"]*")|' .
-            '((' . implode('|', $attributes) . ')="[^"]*' . $highlight . '[^"]*")|' .
-            '(' . $highlight . ')/mis',
+            '/('.$highlight.'="[^"]*")|'.
+            '(('.implode('|', $attributes).')="[^"]*'.$highlight.'[^"]*")|'.
+            '('.$highlight.')/mis',
             array('PMF_Utils', 'highlightNoLinks'),
             $string);
     }
@@ -305,7 +305,7 @@ 
         $postfix = isset($matches[5]) ? $matches[5] : '';
 
         if (!empty($item)) {
-            return '<mark>' . $prefix . $item . $postfix . '</mark>';
+            return '<mark>'.$prefix.$item.$postfix.'</mark>';
         }
         
         // Fallback: the original matched string
@@ -323,15 +323,15 @@ 
     {
         // sometimes Zend Optimizer causes segfaults with debug_backtrace()
         if (extension_loaded('Zend Optimizer')) {
-            $ret = "<pre>" . $string . "</pre><br>\n";
+            $ret = "<pre>".$string."</pre><br>\n";
         } else {
             $debug = debug_backtrace();
             $ret   = '';
             if (isset($debug[2]['class'])) {
-                $ret  = $debug[2]['file'] . ":<br>";
+                $ret  = $debug[2]['file'].":<br>";
                 $ret .= $debug[2]['class'].$debug[1]['type'];
-                $ret .= $debug[2]['function'] . '() in line ' . $debug[2]['line'];
-                $ret .= ": <pre>" . $string . "</pre><br>\n";
+                $ret .= $debug[2]['function'].'() in line '.$debug[2]['line'];
+                $ret .= ": <pre>".$string."</pre><br>\n";
             }
         }
         return $ret;

scripts/createHashes.php

Spacing +2 added lines, -2 removed lines

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

phpmyfaq/lang/language_uk.php

Indentation +1 added lines, -1 removed lines

@@ -468,7 +468,7 @@
 $PMF_LANG["ad_start_comments"] = "Коментарів"; 
 
 
- // Added v1.1 - 30.01.2002 - Bastian 
+    // Added v1.1 - 30.01.2002 - Bastian 
  
 $PMF_LANG["ad_categ_paste"] = "вставити"; 
 $PMF_LANG["ad_categ_cut"] = "cut"; 

Spacing +8 added lines, -8 removed lines

@@ -650,14 +650,14 @@
 $PMF_LANG["newsArchive"] = ". Архів новин"; 
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG['ad_user_error_password'] =  "Please enter a password. ";
-$PMF_LANG['ad_user_error_passwordsDontMatch'] =  "Passwords do not match. ";
-$PMF_LANG['ad_user_error_loginInvalid'] =  "The specified user name is invalid.";
-$PMF_LANG['ad_user_error_noEmail'] =  "Please enter a valid mail adress. ";
-$PMF_LANG['ad_user_error_noRealName'] =  "Please enter your real name. ";
-$PMF_LANG['ad_user_error_delete'] =  "User account could not be deleted. ";
-$PMF_LANG['ad_user_error_noId'] =  "No ID specified. ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "User account is protected. ";
+$PMF_LANG['ad_user_error_password'] = "Please enter a password. ";
+$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Passwords do not match. ";
+$PMF_LANG['ad_user_error_loginInvalid'] = "The specified user name is invalid.";
+$PMF_LANG['ad_user_error_noEmail'] = "Please enter a valid mail adress. ";
+$PMF_LANG['ad_user_error_noRealName'] = "Please enter your real name. ";
+$PMF_LANG['ad_user_error_delete'] = "User account could not be deleted. ";
+$PMF_LANG['ad_user_error_noId'] = "No ID specified. ";
+$PMF_LANG['ad_user_error_protectedAccount'] = "User account is protected. ";
 $PMF_LANG['ad_user_deleteUser'] = "Delete User";
 $PMF_LANG['ad_user_status'] = "Status:";
 $PMF_LANG['ad_user_lastModified'] = "last modified:";

phpmyfaq/lang/language_id.php

Spacing +8 added lines, -8 removed lines

@@ -657,14 +657,14 @@
 $PMF_LANG['ad_entry_visibility'] = 'Terbitkan?';
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG['ad_user_error_password'] =  "Silakan masukkan kata sandi. ";
-$PMF_LANG['ad_user_error_passwordsDontMatch'] =  "Kata sandi tidak cocok. ";
-$PMF_LANG['ad_user_error_loginInvalid'] =  "Nama pengguna yang dimaksud tidak benar.";
-$PMF_LANG['ad_user_error_noEmail'] =  "Silakan masukkan alamat email yang benar. ";
-$PMF_LANG['ad_user_error_noRealName'] =  "Silakan masukkan nama lengkap anda. ";
-$PMF_LANG['ad_user_error_delete'] =  "Akun pengguna tidak bisa dihapus. ";
-$PMF_LANG['ad_user_error_noId'] =  "Tidak ada ID yang dimasukkan. ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "Akun pengguna diproteksi. ";
+$PMF_LANG['ad_user_error_password'] = "Silakan masukkan kata sandi. ";
+$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Kata sandi tidak cocok. ";
+$PMF_LANG['ad_user_error_loginInvalid'] = "Nama pengguna yang dimaksud tidak benar.";
+$PMF_LANG['ad_user_error_noEmail'] = "Silakan masukkan alamat email yang benar. ";
+$PMF_LANG['ad_user_error_noRealName'] = "Silakan masukkan nama lengkap anda. ";
+$PMF_LANG['ad_user_error_delete'] = "Akun pengguna tidak bisa dihapus. ";
+$PMF_LANG['ad_user_error_noId'] = "Tidak ada ID yang dimasukkan. ";
+$PMF_LANG['ad_user_error_protectedAccount'] = "Akun pengguna diproteksi. ";
 $PMF_LANG['ad_user_deleteUser'] = "Hapus Pengguna";
 $PMF_LANG['ad_user_status'] = "Status:";
 $PMF_LANG['ad_user_lastModified'] = "edit terakhir:";