thorsten / phpMyFAQ

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

Spacing +19 added lines, -19 removed lines

@@ -241,7 +241,7 @@ 
         if (isset($this->userId) && is_int($this->userId)) {
             return (int)$this->userId;
         }
-        $this->userId  = -1;
+        $this->userId = -1;
         $this->errors[] = self::ERROR_USER_NO_USERID;
         
         return -1;
@@ -266,18 +266,18 @@ 
             FROM
                 %sfaquser
             WHERE
-                user_id = %d " . ( $allowBlockedUsers ? '' : "AND account_status != 'blocked'"),
+                user_id = %d " . ($allowBlockedUsers ? '' : "AND account_status != 'blocked'"),
             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'];
         
@@ -297,7 +297,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;
             }
         }
@@ -341,9 +341,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) {
@@ -388,9 +388,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) {
@@ -505,7 +505,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;
         }
@@ -575,7 +575,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;
         }
         
@@ -592,7 +592,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;
         }
         
@@ -607,7 +607,7 @@ 
         
         $readOnly  = 0;
         $authCount = 0;
-        $delete     = array();
+        $delete = array();
         foreach ($this->authContainer as $auth) {
             $authCount++;
             if ($auth->setReadOnly()) {
@@ -745,7 +745,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;
@@ -863,8 +863,8 @@ 
      */
     private function createPassword()
     {
-        srand((double)microtime() * 1000000);
-        return (string) uniqid(rand());
+        srand((double)microtime()*1000000);
+        return (string)uniqid(rand());
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -329,8 +329,7 @@
                 if ($nextline < 1) {
                     $nextline = 2;
                 }
-            }
-            else {
+            } else {
                 $nextline += rand(1, 7);
             }
             $w1 += rand(-4, 4);

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 = "<code>" . $string . "</code><br />\n";
+            $ret = "<code>".$string."</code><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 .= ": <code>" . $string . "</code><br />\n";
+                $ret .= $debug[2]['function'].'() in line '.$debug[2]['line'];
+                $ret .= ": <code>".$string."</code><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_tw.php

Spacing +11 added lines, -11 removed lines

@@ -641,14 +641,14 @@ 
 $PMF_LANG['ad_entry_visibility'] = "公開發佈? (Publish?)";
 
 // added v2.0.0 - 2006-01-02 by Lars 開發者
-$PMF_LANG['ad_user_error_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'] =  "請輸入一個有效的 email 地址。(Please enter a valid mail address.) ";
-$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'] =  "沒有指定 ID。 (No ID specified.) ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "使用者帳號受到保護。(User account is protected. )";
+$PMF_LANG['ad_user_error_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'] = "請輸入一個有效的 email 地址。(Please enter a valid mail address.) ";
+$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'] = "沒有指定 ID。 (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:)";
@@ -986,7 +986,7 @@ 
 $PMF_LANG['msgSecureSwitch'] = "切換到安全模式來登入! (Switch to secure mode to login!)";
 
 // added 2.6.0-alpha - 2009-10-03 by Anatoliy Belsky 開發者
-$PMF_LANG['msgTransToolNoteFileSaving']  = "請注意，請按儲存(save)按鈕才會儲存檔案。(Please note that no files will we written until you click save button)";
+$PMF_LANG['msgTransToolNoteFileSaving'] = "請注意，請按儲存(save)按鈕才會儲存檔案。(Please note that no files will we written until you click save button)";
 $PMF_LANG['msgTransToolPageBufferRecorded'] = "頁面 %d 暫存 buffer 記錄成功 (Page %d buffer recorded successfully)";
 $PMF_LANG['msgTransToolErrorRecordingPageBuffer'] = "錯誤記錄頁面 %d 暫存 buffer (Error recording page %d buffer)";
 $PMF_LANG['msgTransToolRecordingPageBuffer'] = "記錄頁面 %d 暫存 buffer (Recording page %d buffer)";
@@ -998,9 +998,9 @@ 
 $PMF_LANG['msgAttachmentInvalid'] = "附加檔案無效，請通報管理員。(The attachment is invalid, please inform admin.)";
 
 // added 2.6.0-alpha - 2009-11-02 by max 開發者
-$LANG_CONF['search.numberSearchTerms']   = array(0 => "input", 1 => "Number of listed search terms");
+$LANG_CONF['search.numberSearchTerms'] = array(0 => "input", 1 => "Number of listed search terms");
 $LANG_CONF['records.orderingPopularFaqs'] = array(0 => "select", 1 => "排列熱門的 FAQ's<br> Sorting of the top FAQ's");
-$PMF_LANG['list_all_users']            = "列出所有使用者 (List all users)";
+$PMF_LANG['list_all_users'] = "列出所有使用者 (List all users)";
 
 $PMF_LANG['records.orderingPopularFaqs.visits'] = "列出最多訪問的 entries (list most visited entries)";
 $PMF_LANG['records.orderingPopularFaqs.voting'] = "列出最多得票的 entries (list most voted entries)";

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

@@ -679,14 +679,14 @@
 $PMF_LANG['ad_entry_visibility'] = 'Publish?';
 
 // 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:";

phpmyfaq/lang/language_tr.php

Spacing +8 added lines, -8 removed lines

@@ -671,14 +671,14 @@
 $PMF_LANG['ad_entry_visibility'] = 'Yayınla?';
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG['ad_user_error_password'] =  "Şifre giriniz. ";
-$PMF_LANG['ad_user_error_passwordsDontMatch'] =  "Şifreler uyuşmuyor. ";
-$PMF_LANG['ad_user_error_loginInvalid'] =  "Belirtilen kullanıcı adı geçersiz.";
-$PMF_LANG['ad_user_error_noEmail'] =  "Geçerli bir e-posta adresi giriniz. ";
-$PMF_LANG['ad_user_error_noRealName'] =  "Adınızı giriniz. ";
-$PMF_LANG['ad_user_error_delete'] =  "Kullanıcı hesabı silinemedi. ";
-$PMF_LANG['ad_user_error_noId'] =  "ID belirtilmedi. ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "Kullanıcı hesabı korumalı. ";
+$PMF_LANG['ad_user_error_password'] = "Şifre giriniz. ";
+$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Şifreler uyuşmuyor. ";
+$PMF_LANG['ad_user_error_loginInvalid'] = "Belirtilen kullanıcı adı geçersiz.";
+$PMF_LANG['ad_user_error_noEmail'] = "Geçerli bir e-posta adresi giriniz. ";
+$PMF_LANG['ad_user_error_noRealName'] = "Adınızı giriniz. ";
+$PMF_LANG['ad_user_error_delete'] = "Kullanıcı hesabı silinemedi. ";
+$PMF_LANG['ad_user_error_noId'] = "ID belirtilmedi. ";
+$PMF_LANG['ad_user_error_protectedAccount'] = "Kullanıcı hesabı korumalı. ";
 $PMF_LANG['ad_user_deleteUser'] = "Kullanıcıyı Sil";
 $PMF_LANG['ad_user_status'] = "Durum:";
 $PMF_LANG['ad_user_lastModified'] = "Son değişiklik:";