nilsteampassnet / TeamPass

api/functions.php

Doc Comments +6 added lines

@@ -141,6 +141,9 @@ 
 }
 
 
+/**
+ * @param string $setting
+ */
 function getSettingValue($setting) {
 
     // get default language
@@ -1999,6 +2002,9 @@ 
     }
 }
 
+/**
+ * @param string $type
+ */
 function rest_error ($type,$detail = 'N/A') {
     switch ($type) {
         case 'APIKEY':

Spacing +167 added lines, -167 removed lines

@@ -19,17 +19,17 @@ 
 require_once "../sources/main.functions.php";
 
 function get_ip() {
-    if ( function_exists( 'apache_request_headers' ) ) {
+    if (function_exists('apache_request_headers')) {
         $headers = apache_request_headers();
     } else {
         $headers = $_SERVER;
     }
-    if ( array_key_exists( 'X-Forwarded-For', $headers ) && filter_var( $headers['X-Forwarded-For'], FILTER_VALIDATE_IP ) ) {
+    if (array_key_exists('X-Forwarded-For', $headers) && filter_var($headers['X-Forwarded-For'], FILTER_VALIDATE_IP)) {
         $the_ip = $headers['X-Forwarded-For'];
-    } elseif ( array_key_exists( 'HTTP_X_FORWARDED_FOR', $headers ) && filter_var( $headers['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP ) ) {
+    } elseif (array_key_exists('HTTP_X_FORWARDED_FOR', $headers) && filter_var($headers['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP)) {
         $the_ip = $headers['HTTP_X_FORWARDED_FOR'];
     } else {
-        $the_ip = filter_var( $_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP );
+        $the_ip = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP);
     }
     return $the_ip;
 }
@@ -90,7 +90,7 @@ 
     return $response;
 }
 
-function rest_head () {
+function rest_head() {
     header('HTTP/1.1 402 Payment Required');
 }
 
@@ -153,32 +153,32 @@ 
     return $set['valeur'];
 }
 
-function rest_delete () {
-    if(!@count($GLOBALS['request'])==0){
+function rest_delete() {
+    if (!@count($GLOBALS['request']) == 0) {
         $request_uri = $GLOBALS['_SERVER']['REQUEST_URI'];
-        preg_match('/\/api(\/index.php|)\/(.*)\?apikey=(.*)/',$request_uri,$matches);
+        preg_match('/\/api(\/index.php|)\/(.*)\?apikey=(.*)/', $request_uri, $matches);
         if (count($matches) == 0) {
-            rest_error ('REQUEST_SENT_NOT_UNDERSTANDABLE');
+            rest_error('REQUEST_SENT_NOT_UNDERSTANDABLE');
         }
-        $GLOBALS['request'] =  explode('/',$matches[2]);
+        $GLOBALS['request'] = explode('/', $matches[2]);
     }
-    if(apikey_checker($GLOBALS['apikey'])) {
+    if (apikey_checker($GLOBALS['apikey'])) {
         global $server, $user, $pass, $database, $pre, $link;
         include "../sources/main.functions.php";
         teampass_connect();
         $category_query = "";
 
         if ($GLOBALS['request'][0] == "write") {
-            if($GLOBALS['request'][1] == "category") {
-                $array_category = explode(';',$GLOBALS['request'][2]);
+            if ($GLOBALS['request'][1] == "category") {
+                $array_category = explode(';', $GLOBALS['request'][2]);
 
-                foreach($array_category as $category) {
-                    if(!preg_match_all("/^([\w\:\'\-\sàáâãäåçèéêëìíîïðòóôõöùúûüýÿ]+)$/i", $category,$result)) {
+                foreach ($array_category as $category) {
+                    if (!preg_match_all("/^([\w\:\'\-\sàáâãäåçèéêëìíîïðòóôõöùúûüýÿ]+)$/i", $category, $result)) {
                         rest_error('CATEGORY_MALFORMED');
                     }
                 }
 
-                if(count($array_category) > 1 && count($array_category) < 5) {
+                if (count($array_category) > 1 && count($array_category) < 5) {
                     for ($i = count($array_category); $i > 0; $i--) {
                         $slot = $i - 1;
                         if (!$slot) {
@@ -191,7 +191,7 @@ 
                 } elseif (count($array_category) == 1) {
                     $category_query = "select id from ".prefix_table("nested_tree")." where title LIKE '".$array_category[0]."' AND parent_id = 0";
                 } else {
-                    rest_error ('NO_CATEGORY');
+                    rest_error('NO_CATEGORY');
                 }
 
                 // Delete items which in category
@@ -203,29 +203,29 @@ 
 
                 $json['type'] = 'category';
                 $json['category'] = $GLOBALS['request'][2];
-                if($response) {
+                if ($response) {
                     $json['status'] = 'OK';
                 } else {
                     $json['status'] = 'KO';
                 }
 
-            } elseif($GLOBALS['request'][1] == "item") {
-                $array_category = explode(';',$GLOBALS['request'][2]);
+            } elseif ($GLOBALS['request'][1] == "item") {
+                $array_category = explode(';', $GLOBALS['request'][2]);
                 $item = $GLOBALS['request'][3];
 
-                foreach($array_category as $category) {
-                    if(!preg_match_all("/^([\w\:\'\-\sàáâãäåçèéêëìíîïðòóôõöùúûüýÿ]+)$/i", $category,$result)) {
+                foreach ($array_category as $category) {
+                    if (!preg_match_all("/^([\w\:\'\-\sàáâãäåçèéêëìíîïðòóôõöùúûüýÿ]+)$/i", $category, $result)) {
                         rest_error('CATEGORY_MALFORMED');
                     }
                 }
 
-                if(!preg_match_all("/^([\w\:\'\-\sàáâãäåçèéêëìíîïðòóôõöùúûüýÿ]+)$/i", $item,$result)) {
+                if (!preg_match_all("/^([\w\:\'\-\sàáâãäåçèéêëìíîïðòóôõöùúûüýÿ]+)$/i", $item, $result)) {
                     rest_error('ITEM_MALFORMED');
                 } elseif (empty($item) || count($array_category) == 0) {
                     rest_error('MALFORMED');
                 }
 
-                if(count($array_category) > 1 && count($array_category) < 5) {
+                if (count($array_category) > 1 && count($array_category) < 5) {
                     for ($i = count($array_category); $i > 0; $i--) {
                         $slot = $i - 1;
                         if (!$slot) {
@@ -238,7 +238,7 @@ 
                 } elseif (count($array_category) == 1) {
                     $category_query = "select id from ".prefix_table("nested_tree")." where title LIKE '".$array_category[0]."' AND parent_id = 0";
                 } else {
-                    rest_error ('NO_CATEGORY');
+                    rest_error('NO_CATEGORY');
                 }
 
                 // Delete item
@@ -246,7 +246,7 @@ 
                 $json['type'] = 'item';
                 $json['item'] = $item;
                 $json['category'] = $GLOBALS['request'][2];
-                if($response) {
+                if ($response) {
                     $json['status'] = 'OK';
                 } else {
                     $json['status'] = 'KO';
@@ -256,27 +256,27 @@ 
             if ($json) {
                 echo json_encode($json);
             } else {
-                rest_error ('EMPTY');
+                rest_error('EMPTY');
             }
         } else {
-            rest_error ('METHOD');
+            rest_error('METHOD');
         }
     }
 }
 
-function rest_get () {
+function rest_get() {
     global $api_version;
 
-    if(!@count($GLOBALS['request'])==0){
+    if (!@count($GLOBALS['request']) == 0) {
         $request_uri = $GLOBALS['_SERVER']['REQUEST_URI'];
         preg_match('/\/api(\/index.php|)\/(.*)\?apikey=(.*)/', $request_uri, $matches);
         if (count($matches) == 0) {
-            rest_error ('REQUEST_SENT_NOT_UNDERSTANDABLE');
+            rest_error('REQUEST_SENT_NOT_UNDERSTANDABLE');
         }
-        $GLOBALS['request'] =  explode('/',$matches[2]);
+        $GLOBALS['request'] = explode('/', $matches[2]);
     }
 
-    if(apikey_checker($GLOBALS['apikey'])) {
+    if (apikey_checker($GLOBALS['apikey'])) {
         global $server, $user, $pass, $database, $pre, $link;
         teampass_connect();
         $category_query = "";
@@ -290,7 +290,7 @@ 
         );
 
         if ($GLOBALS['request'][0] == "read") {
-            if($GLOBALS['request'][1] == "folder") {
+            if ($GLOBALS['request'][1] == "folder") {
                 /*
                 * READ FOLDERS
                 */
@@ -303,7 +303,7 @@ 
                 $tree = new Tree\NestedTree\NestedTree(prefix_table("nested_tree"), 'id', 'parent_id', 'title');
 
                 // get ids
-                if (strpos($GLOBALS['request'][2],";") > 0) {
+                if (strpos($GLOBALS['request'][2], ";") > 0) {
                     $condition = "id_tree IN %ls";
                     $condition_value = explode(';', $GLOBALS['request'][2]);
                 } else {
@@ -350,7 +350,7 @@ 
                     $x++;
                 }
             }
-            else if($GLOBALS['request'][1] == "userpw") {
+            else if ($GLOBALS['request'][1] == "userpw") {
                 /*
                 * READ USER ITEMS
                 */
@@ -364,7 +364,7 @@ 
 
                 // about the user
                 $username = $GLOBALS['request'][2];
-                if(strcmp($username,"admin")==0) {
+                if (strcmp($username, "admin") == 0) {
                     // forbid admin access
                 }
                 $response = DB::query("SELECT fonction_id FROM ".prefix_table("users")." WHERE login='".$username."'");
@@ -383,8 +383,8 @@ 
                     foreach ($response as $data)
                     {
                         $folder_id = $data['folder_id'];
-                        if(!array_key_exists($folder_id,$folder_arr)) {
-                            array_push($folder_arr,$folder_id);
+                        if (!array_key_exists($folder_id, $folder_arr)) {
+                            array_push($folder_arr, $folder_id);
                         }
                     }
                 }
@@ -435,14 +435,14 @@ 
                     $x++;
                 }
             }
-            else if($GLOBALS['request'][1] == "userfolders") {
+            else if ($GLOBALS['request'][1] == "userfolders") {
                 /*
                 * READ USER FOLDERS
                 * Sends back a list of folders
                 */
                 $json = "";
                 $username = $GLOBALS['request'][2];
-                if(strcmp($username,"admin")==0) {
+                if (strcmp($username, "admin") == 0) {
                     // forbid admin access
                 }
                 $response = DB::query("SELECT fonction_id FROM ".prefix_table("users")." WHERE login='".$username."'");
@@ -463,8 +463,8 @@ 
                     foreach ($response as $data)
                     {
                         $folder_id = $data['folder_id'];
-                        if(!array_key_exists($folder_id,$folder_arr)) {
-                            array_push($folder_arr,$folder_id);
+                        if (!array_key_exists($folder_id, $folder_arr)) {
+                            array_push($folder_arr, $folder_id);
 
                             $response2 = DB::queryFirstRow("SELECT title, nlevel FROM ".prefix_table("nested_tree")." WHERE id='".$folder_id."'");
 
@@ -479,7 +479,7 @@ 
                     }
                 }
             }
-            elseif($GLOBALS['request'][1] == "items") {
+            elseif ($GLOBALS['request'][1] == "items") {
                 /*
                 * READ ITEMS asked
                 */
@@ -492,16 +492,16 @@ 
                 $tree = new Tree\NestedTree\NestedTree(prefix_table("nested_tree"), 'id', 'parent_id', 'title');
 
                 // get parameters
-                $array_items = explode(';',$GLOBALS['request'][2]);
+                $array_items = explode(';', $GLOBALS['request'][2]);
 
                 // check if not empty
                 if (count($array_items) == 0) {
-                    rest_error ('NO_ITEM');
+                    rest_error('NO_ITEM');
                 }
 
                 // only accepts numeric
-                foreach($array_items as $item) {
-                    if(!is_numeric($item)) {
+                foreach ($array_items as $item) {
+                    if (!is_numeric($item)) {
                         rest_error('ITEM_MALFORMED');
                     }
                 }
@@ -544,10 +544,10 @@ 
             if (isset($json) && $json) {
                 echo json_encode($json);
             } else {
-                rest_error ('EMPTY');
+                rest_error('EMPTY');
             }
         } elseif ($GLOBALS['request'][0] == "find") {
-            if($GLOBALS['request'][1] == "item") {
+            if ($GLOBALS['request'][1] == "item") {
                 /*
                 * FIND ITEMS in FOLDERS
                 */
@@ -562,20 +562,20 @@ 
                 // get parameters
                 $array_category = explode(';', $GLOBALS['request'][2]);
                 $item = $GLOBALS['request'][3];
-                foreach($array_category as $category) {
-                    if(!preg_match_all("/^([\w\:\'\-\sàáâãäåçèéêëìíîïðòóôõöùúûüýÿ]+)$/i", $category,$result)) {
+                foreach ($array_category as $category) {
+                    if (!preg_match_all("/^([\w\:\'\-\sàáâãäåçèéêëìíîïðòóôõöùúûüýÿ]+)$/i", $category, $result)) {
                         rest_error('CATEGORY_MALFORMED');
                     }
                 }
 
-                if(!preg_match_all("/^([\w\:\'\-\sàáâãäåçèéêëìíîïðòóôõöùúûüýÿ]+)$/i", $item, $result)) {
+                if (!preg_match_all("/^([\w\:\'\-\sàáâãäåçèéêëìíîïðòóôõöùúûüýÿ]+)$/i", $item, $result)) {
                     rest_error('ITEM_MALFORMED');
                 } elseif (empty($item) || count($array_category) == 0) {
                     rest_error('MALFORMED');
                 }
 
-                if(count($array_category) === 0) {
-                    rest_error ('NO_CATEGORY');
+                if (count($array_category) === 0) {
+                    rest_error('NO_CATEGORY');
                 }
 
                 DB::debugMode(false);
@@ -621,15 +621,15 @@ 
                 if (isset($json) && $json) {
                     echo json_encode($json);
                 } else {
-                    rest_error ('EMPTY');
+                    rest_error('EMPTY');
                 }
             }
         } elseif ($GLOBALS['request'][0] == "add") {
-            if($GLOBALS['request'][1] == "item") {
+            if ($GLOBALS['request'][1] == "item") {
                 // get sent parameters
                 $params = explode(';', base64_decode($GLOBALS['request'][2]));
                 if (count($params) != 9) {
-                    rest_error ('ITEMBADDEFINITION');
+                    rest_error('ITEMBADDEFINITION');
                 }
 
                 $item_label = $params[0];
@@ -646,14 +646,14 @@ 
                 if (!empty($item_label) && !empty($item_pwd) && !empty($item_folder_id)) {
                     // Check length
                     if (strlen($item_pwd) > 50) {
-                        rest_error ('PASSWORDTOOLONG');
+                        rest_error('PASSWORDTOOLONG');
                     }
 
                     // Check Folder ID
                     DB::query("SELECT * FROM ".prefix_table("nested_tree")." WHERE id = %i", $item_folder_id);
                     $counter = DB::count();
                     if ($counter == 0) {
-                        rest_error ('NOSUCHFOLDER');
+                        rest_error('NOSUCHFOLDER');
                     }
 
                     // check if element doesn't already exist
@@ -665,7 +665,7 @@ 
                             $itemExists = 1;
                             // prevent the error if the label already exists
                             // so lets just add the time() as a random factor
-                            $item_label .= " (" . time() .")";
+                            $item_label .= " (".time().")";
                         } else {
                             $itemExists = 0;
                         }
@@ -679,7 +679,7 @@ 
                             "encrypt"
                         );
                         if (empty($encrypt['string'])) {
-                            rest_error ('PASSWORDEMPTY');
+                            rest_error('PASSWORDEMPTY');
                         }
 
                         // ADD item
@@ -717,7 +717,7 @@ 
 
                             // Add tags
                             $tags = explode(' ', $item_tags);
-                            foreach ((array)$tags as $tag) {
+                            foreach ((array) $tags as $tag) {
                                 if (!empty($tag)) {
                                     DB::insert(
                                         prefix_table("tags"),
@@ -750,14 +750,14 @@ 
                             );
 
                             echo '{"status":"item added" , "new_item_id" : "'.$newID.'"}';
-                        } catch(PDOException $ex) {
-                            echo '<br />' . $ex->getMessage();
+                        } catch (PDOException $ex) {
+                            echo '<br />'.$ex->getMessage();
                         }
                     } else {
-                        rest_error ('ITEMEXISTS');
+                        rest_error('ITEMEXISTS');
                     }
                 } else {
-                    rest_error ('ITEMMISSINGDATA');
+                    rest_error('ITEMMISSINGDATA');
                 }
             }
             /*
@@ -771,12 +771,12 @@ 
              * Example: /api/index.php/add/user/U4;Nils;Laumaille;test;nils@laumaille.fr;Users;0;Managers,Users;0;1;1?apikey=sae6iekahxiseL3viShoo0chahc1ievei8aequi
              *
              */
-            elseif($GLOBALS['request'][1] == "user") {
+            elseif ($GLOBALS['request'][1] == "user") {
 
                 // get user definition
                 $array_user = explode(';', base64_decode($GLOBALS['request'][2]));
                 if (count($array_user) != 11) {
-                    rest_error ('USERBADDEFINITION');
+                    rest_error('USERBADDEFINITION');
                 }
 
                 $login = $array_user[0];
@@ -793,7 +793,7 @@ 
 
                 // Empty user
                 if (mysqli_escape_string($link, htmlspecialchars_decode($login)) == "") {
-                    rest_error ('USERLOGINEMPTY');
+                    rest_error('USERLOGINEMPTY');
                 }
                 // Check if user already exists
                 $data = DB::query(
@@ -827,7 +827,7 @@ 
                                 $role
                             );
                             if (empty($rolesList)) $rolesList = $tmp['id'];
-                            else $rolesList .= ";" . $tmp['id'];
+                            else $rolesList .= ";".$tmp['id'];
                         }
 
                         // Add user in DB
@@ -882,18 +882,18 @@ 
                         logEvents('user_mngt', 'at_user_added', 'api - '.$GLOBALS['apikey'], $new_user_id, "");
 
                         echo '{"status":"user added"}';
-                    } catch(PDOException $ex) {
-                        echo '<br />' . $ex->getMessage();
+                    } catch (PDOException $ex) {
+                        echo '<br />'.$ex->getMessage();
                     }
                 } else {
-                    rest_error ('USERALREADYEXISTS');
+                    rest_error('USERALREADYEXISTS');
                 }
             }
             /*
             * ADDING A FOLDER
             * <url to teampass>/api/index.php/add/folder/<title>;<complexity_level>;<parent_id>;<renewal_period>;<personal>?apikey=<valid api key>
             */
-            elseif($GLOBALS['request'][1] == "folder") {
+            elseif ($GLOBALS['request'][1] == "folder") {
                 if (!empty($GLOBALS['request'][2])) {
                     // get sent parameters
                     $params = explode(';', base64_decode($GLOBALS['request'][2]));
@@ -902,17 +902,17 @@ 
                         if (empty($params[3])) $params[3] = 0;
                         if (empty($params[4])) $params[4] = 0;
                         if ($params[2] < 0) {
-                            rest_error ('NO_DATA_EXIST');
+                            rest_error('NO_DATA_EXIST');
                         }
 
                         //Check if title doesn't contains html codes
                         if (preg_match_all("|<[^>]+>(.*)</[^>]+>|U", $params[0], $out)) {
-                            rest_error ('HTML_CODES_NOT_ALLOWED');
+                            rest_error('HTML_CODES_NOT_ALLOWED');
                         }
 
                         // check if title is numeric
                         if (is_numeric($params[0]) === true) {
-                            rest_error ('TITLE_ONLY_WITH_NUMBERS');
+                            rest_error('TITLE_ONLY_WITH_NUMBERS');
                         }
 
                         //Check if duplicate folders name are allowed
@@ -928,7 +928,7 @@ 
                             DB::query("SELECT * FROM ".prefix_table("nested_tree")." WHERE title = %s", $params[0]);
                             $counter = DB::count();
                             if ($counter != 0) {
-                                rest_error ('ALREADY_EXISTS');
+                                rest_error('ALREADY_EXISTS');
                             }
                         }
 
@@ -957,7 +957,7 @@ 
                                 "complex"
                             );
                             if (intval($params[1]) < intval($data['valeur'])) {
-                                rest_error ('COMPLEXICITY_LEVEL_NOT_REACHED');
+                                rest_error('COMPLEXICITY_LEVEL_NOT_REACHED');
                             }
                         }
 
@@ -987,11 +987,11 @@ 
                             );
 
                             echo '{"status":"folder created" , "new_folder_id":"'.$newId.'"}';
-                        } catch(PDOException $ex) {
-                            echo '<br />' . $ex->getMessage();
+                        } catch (PDOException $ex) {
+                            echo '<br />'.$ex->getMessage();
                         }
                     } else {
-                        rest_error ('NO_DATA_EXIST');
+                        rest_error('NO_DATA_EXIST');
                     }
                 } else {
                     rest_error('SET_NO_DATA');
@@ -1012,14 +1012,14 @@ 
                     if (!empty($params[0]) && !empty($params[1]) && !empty($params[3])) {
                         // Check length
                         if (strlen($params[1]) > 50) {
-                            rest_error ('PASSWORDTOOLONG');
+                            rest_error('PASSWORDTOOLONG');
                         }
 
                         // Check Folder ID
                         DB::query("SELECT * FROM ".prefix_table("nested_tree")." WHERE id = %i", $params[3]);
                         $counter = DB::count();
                         if ($counter == 0) {
-                            rest_error ('NOSUCHFOLDER');
+                            rest_error('NOSUCHFOLDER');
                         }
 
                         // check if item exists
@@ -1036,7 +1036,7 @@ 
                                 "encrypt"
                             );
                             if (empty($encrypt['string'])) {
-                                rest_error ('PASSWORDEMPTY');
+                                rest_error('PASSWORDEMPTY');
                             }
 
                             // ADD item
@@ -1071,7 +1071,7 @@ 
 
                                 // Add tags
                                 $tags = explode(' ', $params[7]);
-                                foreach ((array)$tags as $tag) {
+                                foreach ((array) $tags as $tag) {
                                     if (!empty($tag)) {
                                         // check if already exists
                                         DB::query(
@@ -1114,14 +1114,14 @@ 
                                 );
 
                                 echo '{"status":"item updated"}';
-                            } catch(PDOException $ex) {
-                                echo '<br />' . $ex->getMessage();
+                            } catch (PDOException $ex) {
+                                echo '<br />'.$ex->getMessage();
                             }
                         } else {
-                            rest_error ('NO_DATA_EXIST');
+                            rest_error('NO_DATA_EXIST');
                         }
                     } else {
-                        rest_error ('ITEMMISSINGDATA');
+                        rest_error('ITEMMISSINGDATA');
                     }
                 } else {
                     rest_error('NO_ITEM');
@@ -1131,14 +1131,14 @@ 
             * UPDATING A FOLDER
             * <url to teampass>/api/index.php/update/folder/<folder_id>/<title>;<complexity_level>;<renewal_period>?apikey=<valid api key>
             */
-            else if($GLOBALS['request'][1] == "folder") {
+            else if ($GLOBALS['request'][1] == "folder") {
                 if ($GLOBALS['request'][2] !== "" && is_numeric($GLOBALS['request'][2])) {
                     // get sent parameters
                     $params = explode(';', base64_decode($GLOBALS['request'][3]));
 
                     if (!empty($params[0])) {
                         if ($params[1] < 0) {
-                            rest_error ('NO_DATA_EXIST');
+                            rest_error('NO_DATA_EXIST');
                         }
                         if (empty($params[2])) $params[2] = 0;
 
@@ -1146,17 +1146,17 @@ 
                         $data_folder = DB::queryfirstrow("SELECT * FROM ".prefix_table("nested_tree")." WHERE id = %s", $GLOBALS['request'][2]);
                         $counter = DB::count();
                         if ($counter === 0) {
-                            rest_error ('NO_DATA_EXIST');
+                            rest_error('NO_DATA_EXIST');
                         }
 
                         //Check if title doesn't contains html codes
                         if (preg_match_all("|<[^>]+>(.*)</[^>]+>|U", $params[0], $out)) {
-                            rest_error ('HTML_CODES_NOT_ALLOWED');
+                            rest_error('HTML_CODES_NOT_ALLOWED');
                         }
 
                         // check if title is numeric
                         if (is_numeric($params[0]) === true) {
-                            rest_error ('TITLE_ONLY_WITH_NUMBERS');
+                            rest_error('TITLE_ONLY_WITH_NUMBERS');
                         }
 
                         // get complexity level for this folder
@@ -1168,7 +1168,7 @@ 
                             "complex"
                         );
                         if (intval($params[1]) < intval($data['valeur'])) {
-                            rest_error ('COMPLEXICITY_LEVEL_NOT_REACHED');
+                            rest_error('COMPLEXICITY_LEVEL_NOT_REACHED');
                         }
 
                         try {
@@ -1198,11 +1198,11 @@ 
                             );
 
                             echo '{"status":"folder updated"}';
-                        } catch(PDOException $ex) {
-                            echo '<br />' . $ex->getMessage();
+                        } catch (PDOException $ex) {
+                            echo '<br />'.$ex->getMessage();
                         }
                     } else {
-                        rest_error ('ITEMMISSINGDATA');
+                        rest_error('ITEMMISSINGDATA');
                     }
                 } else {
                     rest_error('NO_ITEM');
@@ -1227,9 +1227,9 @@ 
             **
             */
             // get user credentials
-            if(isset($GLOBALS['request'][3]) && isset($GLOBALS['request'][4])) {
+            if (isset($GLOBALS['request'][3]) && isset($GLOBALS['request'][4])) {
                 // get url
-                if(isset($GLOBALS['request'][1]) && isset($GLOBALS['request'][2])) {
+                if (isset($GLOBALS['request'][1]) && isset($GLOBALS['request'][2])) {
                     // is user granted?
                     $userData = DB::queryFirstRow(
                         "SELECT `id`, `pw`, `groupes_interdits`, `groupes_visibles`, `fonction_id` FROM ".$pre."users WHERE login = %s",
@@ -1292,21 +1292,21 @@ 
                             }
                             // prepare answer. If no access then inform
                             if (empty($json)) {
-                                rest_error ('AUTH_NO_DATA');
+                                rest_error('AUTH_NO_DATA');
                             } else {
                                 echo json_encode($json);
                             }
                         } else {
-                            rest_error ('NO_DATA_EXIST');
+                            rest_error('NO_DATA_EXIST');
                         }
                     } else {
-                        rest_error ('AUTH_NOT_GRANTED');
+                        rest_error('AUTH_NOT_GRANTED');
                     }
                 } else {
-                    rest_error ('AUTH_NO_URL');
+                    rest_error('AUTH_NO_URL');
                 }
             } else {
-                rest_error ('AUTH_NO_IDENTIFIER');
+                rest_error('AUTH_NO_IDENTIFIER');
             }
         } elseif ($GLOBALS['request'][0] == "auth_tpc") {
             /*
@@ -1314,9 +1314,9 @@ 
             **
             */
             // get user credentials
-            if(isset($GLOBALS['request'][2]) && isset($GLOBALS['request'][3]) && isset($GLOBALS['request'][4])) {
+            if (isset($GLOBALS['request'][2]) && isset($GLOBALS['request'][3]) && isset($GLOBALS['request'][4])) {
                 // get url
-                if(isset($GLOBALS['request'][1])) {
+                if (isset($GLOBALS['request'][1])) {
                     // decode base64 criterium
                     $tpc_url = base64_decode($GLOBALS['request'][1]);
                     $user_pwd = base64_decode($GLOBALS['request'][3]);
@@ -1336,7 +1336,7 @@ 
                     );
                     if (strpos($user_saltkey, "Error ") !== false) {
                         // error
-                        rest_error ('AUTH_NO_DATA');
+                        rest_error('AUTH_NO_DATA');
                     }
 
                     // load passwordLib library
@@ -1393,7 +1393,7 @@ 
                                 ) {
                                     // prepare export
                                     $json[$data['id']]['label'] = mb_convert_encoding($data['label'], mb_detect_encoding($data['label']), 'UTF-8');
-                                    $json[$data['id']]['login'] =  mb_convert_encoding($data['login'], mb_detect_encoding($data['login']), 'UTF-8');
+                                    $json[$data['id']]['login'] = mb_convert_encoding($data['login'], mb_detect_encoding($data['login']), 'UTF-8');
                                     if ($data['perso'] === "0") {
                                         $crypt_pw = cryption(
                                             $data['pw'],
@@ -1415,21 +1415,21 @@ 
                             }
                             // prepare answer. If no access then inform
                             if (empty($json)) {
-                                rest_error ('AUTH_NO_DATA');
+                                rest_error('AUTH_NO_DATA');
                             } else {
                                 echo json_encode($json);
                             }
                         } else {
-                            rest_error ('NO_DATA_EXIST');
+                            rest_error('NO_DATA_EXIST');
                         }
                     } else {
-                        rest_error ('AUTH_NOT_GRANTED');
+                        rest_error('AUTH_NOT_GRANTED');
                     }
                 } else {
-                    rest_error ('AUTH_NO_URL');
+                    rest_error('AUTH_NO_URL');
                 }
             } else {
-                rest_error ('AUTH_NO_IDENTIFIER');
+                rest_error('AUTH_NO_IDENTIFIER');
             }
         } elseif ($GLOBALS['request'][0] == "set") {
             /*
@@ -1439,16 +1439,16 @@ 
              * NEW ITEM WILL BE STORED IN SPECIFIC FOLDER
              */
             // get user credentials
-            if(isset($GLOBALS['request'][4]) && isset($GLOBALS['request'][5])) {
+            if (isset($GLOBALS['request'][4]) && isset($GLOBALS['request'][5])) {
                 // get url
                 if (isset($GLOBALS['request'][1]) && isset($GLOBALS['request'][2]) && isset($GLOBALS['request'][3])) {
                     // is user granted?
                     $userData = DB::queryFirstRow(
-                        "SELECT `id`, `pw`, `groupes_interdits`, `groupes_visibles`, `fonction_id` FROM " . $pre . "users WHERE login = %s",
+                        "SELECT `id`, `pw`, `groupes_interdits`, `groupes_visibles`, `fonction_id` FROM ".$pre."users WHERE login = %s",
                         $GLOBALS['request'][4]
                     );
                     if (DB::count() == 0) {
-                        rest_error ('AUTH_NO_IDENTIFIER');
+                        rest_error('AUTH_NO_IDENTIFIER');
                     }
 
                     // load passwordLib library
@@ -1463,7 +1463,7 @@ 
                         // does the personal folder of this user exists?
                         DB::queryFirstRow(
                             "SELECT `id`
-                            FROM " . $pre . "nested_tree
+                            FROM " . $pre."nested_tree
                             WHERE title = %s AND personal_folder = 1",
                             $userData['id']
                         );
@@ -1472,7 +1472,7 @@ 
                             // if not create it
                             $folder = DB::queryFirstRow(
                                 "SELECT `id`
-                                FROM " . $pre . "nested_tree
+                                FROM " . $pre."nested_tree
                                 WHERE title = %s",
                                 "teampass-connect"
                             );
@@ -1552,37 +1552,37 @@ 
                             $json['status'] = "ok";
                             // prepare answer. If no access then inform
                             if (empty($json)) {
-                                rest_error ('AUTH_NO_DATA');
+                                rest_error('AUTH_NO_DATA');
                             } else {
                                 echo json_encode($json);
                             }
                         } else {
-                            rest_error ('NO_PF_EXIST_FOR_USER');
+                            rest_error('NO_PF_EXIST_FOR_USER');
                         }
                     } else {
-                        rest_error ('AUTH_NOT_GRANTED');
+                        rest_error('AUTH_NOT_GRANTED');
                     }
                 } else {
-                    rest_error ('SET_NO_DATA');
+                    rest_error('SET_NO_DATA');
                 }
             } else {
-                rest_error ('AUTH_NO_IDENTIFIER');
+                rest_error('AUTH_NO_IDENTIFIER');
             }
         } elseif ($GLOBALS['request'][0] == "set_tpc") {
             /*
              * TO BE USED ONLY BY TEAMPASS-CONNECT
              */
             // get user credentials
-            if(isset($GLOBALS['request'][2]) && isset($GLOBALS['request'][3])) {
+            if (isset($GLOBALS['request'][2]) && isset($GLOBALS['request'][3])) {
                 // get url
                 if (isset($GLOBALS['request'][1])) {
                     // is user granted?
                     $userData = DB::queryFirstRow(
-                        "SELECT `id`, `pw`, `groupes_interdits`, `groupes_visibles`, `fonction_id`, `encrypted_psk` FROM " . $pre . "users WHERE login = %s",
+                        "SELECT `id`, `pw`, `groupes_interdits`, `groupes_visibles`, `fonction_id`, `encrypted_psk` FROM ".$pre."users WHERE login = %s",
                         $GLOBALS['request'][2]
                     );
                     if (DB::count() == 0) {
-                        rest_error ('AUTH_NO_IDENTIFIER');
+                        rest_error('AUTH_NO_IDENTIFIER');
                     }
 
                     // load passwordLib library
@@ -1617,7 +1617,7 @@ 
                             );
                             if (strpos($user_key_encoded, "Error ") !== false) {
                                 // error
-                                rest_error ('AUTH_NO_DATA');
+                                rest_error('AUTH_NO_DATA');
                             }
 
 
@@ -1627,7 +1627,7 @@ 
                             // does the personal folder of this user exists?
                             $user_folder = DB::queryFirstRow(
                                 "SELECT `id`
-                                FROM " . $pre . "nested_tree
+                                FROM " . $pre."nested_tree
                                 WHERE title = %s AND personal_folder = 1",
                                 $userData['id']
                             );
@@ -1636,7 +1636,7 @@ 
                                 // if not create it
                                 $folder = DB::queryFirstRow(
                                     "SELECT `id`
-                                    FROM " . $pre . "nested_tree
+                                    FROM " . $pre."nested_tree
                                     WHERE title = %s",
                                     "teampass-connect"
                                 );
@@ -1673,7 +1673,7 @@ 
                             }
                         } else {
                             // there is an error in PSALT
-                            rest_error ('NO_PSALTK_PROVIDED');
+                            rest_error('NO_PSALTK_PROVIDED');
                         }
 
                         // now we continue
@@ -1725,18 +1725,18 @@ 
                         $json['new_item_id'] = $newID;
                         // prepare answer. If no access then inform
                         if (empty($json)) {
-                            rest_error ('AUTH_NO_DATA');
+                            rest_error('AUTH_NO_DATA');
                         } else {
                             echo json_encode($json);
                         }
                     } else {
-                        rest_error ('AUTH_NOT_GRANTED');
+                        rest_error('AUTH_NOT_GRANTED');
                     }
                 } else {
-                    rest_error ('SET_NO_DATA');
+                    rest_error('SET_NO_DATA');
                 }
             } else {
-                rest_error ('AUTH_NO_IDENTIFIER');
+                rest_error('AUTH_NO_IDENTIFIER');
             }
         }
         /*
@@ -1747,13 +1747,13 @@ 
         */
         elseif ($GLOBALS['request'][0] == "delete") {
             $_SESSION['settings']['cpassman_dir'] = "..";
-            if($GLOBALS['request'][1] == "folder") {
+            if ($GLOBALS['request'][1] == "folder") {
                 $array_category = explode(';', $GLOBALS['request'][2]);
 
                 // get user info
                 if (isset($GLOBALS['request'][3]) && !empty($GLOBALS['request'][3])) {
                     $userData = DB::queryFirstRow(
-                        "SELECT `id` FROM " . $pre . "users WHERE login = %s",
+                        "SELECT `id` FROM ".$pre."users WHERE login = %s",
                         $GLOBALS['request'][3]
                     );
                     if (DB::count() == 0) {
@@ -1765,7 +1765,7 @@ 
                     $user_id = API_USER_ID;
                 }
 
-                if(count($array_category) > 0 && count($array_category) < 5) {
+                if (count($array_category) > 0 && count($array_category) < 5) {
                     // load passwordLib library
                     require_once '../sources/SplClassLoader.php';
 
@@ -1775,7 +1775,7 @@ 
                     $tree = new Tree\NestedTree\NestedTree(prefix_table("nested_tree"), 'id', 'parent_id', 'title', 'personal_folder');
 
                     // this will delete all sub folders and items associated
-                    for ($i=0; $i < count($array_category); $i ++) {echo "\n".$array_category[$i]."\n";
+                    for ($i = 0; $i < count($array_category); $i++) {echo "\n".$array_category[$i]."\n";
                         // Get through each subfolder
                         $folders = $tree->getDescendants($array_category[$i], true);
                         print_r($folders);
@@ -1789,7 +1789,7 @@ 
                                             'type' => 'folder_deleted',
                                             'intitule' => "f".$array_category[$i],
                                             'valeur' => $folder->id.', '.$folder->parent_id.', '.
-                                                $folder->title.', '.$folder->nleft.', '.$folder->nright.', '. $folder->nlevel.', 0, 0, 0, 0'
+                                                $folder->title.', '.$folder->nleft.', '.$folder->nright.', '.$folder->nlevel.', 0, 0, 0, 0'
                                        )
                                     );
                                     //delete folder
@@ -1829,18 +1829,18 @@ 
                         }
                     }
                 } else {
-                    rest_error ('NO_CATEGORY');
+                    rest_error('NO_CATEGORY');
                 }
 
                 $json['status'] = 'OK';
 
-            } elseif($GLOBALS['request'][1] == "item") {
+            } elseif ($GLOBALS['request'][1] == "item") {
                 $array_items = explode(';', $GLOBALS['request'][2]);
 
                 // get user info
                 if (isset($GLOBALS['request'][3]) && !empty($GLOBALS['request'][3])) {
                     $userData = DB::queryFirstRow(
-                        "SELECT `id` FROM " . $pre . "users WHERE login = %s",
+                        "SELECT `id` FROM ".$pre."users WHERE login = %s",
                         $GLOBALS['request'][3]
                     );
                     if (DB::count() == 0) {
@@ -1850,7 +1850,7 @@ 
                     }
                 }
 
-                for ($i=0; $i < count($array_items); $i ++) {
+                for ($i = 0; $i < count($array_items); $i++) {
                     DB::update(
                         prefix_table("items"),
                         array(
@@ -1880,7 +1880,7 @@ 
             if ($json) {
                 echo json_encode($json);
             } else {
-                rest_error ('EMPTY');
+                rest_error('EMPTY');
             }
         } else if ($GLOBALS['request'][0] == "new_password") {
             if (!empty($GLOBALS['request'][1])) {
@@ -1902,11 +1902,11 @@ 
 
                 // init
                 $pwgen->setLength($params[0]);
-                if($params[1] === "1") $pwgen->setSecure(true);
-                if($params[2] === "1") $pwgen->setNumerals(true);
-                if($params[3] === "1") $pwgen->setCapitalize(true);
-                if($params[4] === "1") $pwgen->setAmbiguous(true);
-                if($params[5] === "1" && $params[6] === "1") $pwgen->setSymbols(true);
+                if ($params[1] === "1") $pwgen->setSecure(true);
+                if ($params[2] === "1") $pwgen->setNumerals(true);
+                if ($params[3] === "1") $pwgen->setCapitalize(true);
+                if ($params[4] === "1") $pwgen->setAmbiguous(true);
+                if ($params[5] === "1" && $params[6] === "1") $pwgen->setSymbols(true);
 
                 // generate and send back (generate in base64 if symbols are asked)
                 if ($params[6] === "1") {
@@ -1915,7 +1915,7 @@ 
                     echo '{"password" : "'.($pwgen->generate()).'"}';
                 }
             } else {
-                rest_error ('NO_PARAMETERS');
+                rest_error('NO_PARAMETERS');
             }
         } else if ($GLOBALS['request'][0] === "info") {
             if ($GLOBALS['request'][1] === "complexicity_levels_list") {
@@ -1935,11 +1935,11 @@ 
             } else if ($GLOBALS['request'][1] === "folder") {
                 if (!empty($GLOBALS['request'][2]) && is_numeric($GLOBALS['request'][2])) {
                     $data = DB::queryFirstRow(
-                        "SELECT * FROM " . $pre . "nested_tree WHERE id = %i",
+                        "SELECT * FROM ".$pre."nested_tree WHERE id = %i",
                         $GLOBALS['request'][2]
                     );
                     if (DB::count() == 0) {
-                        rest_error ('NOSUCHFOLDER');
+                        rest_error('NOSUCHFOLDER');
                     }
 
                     // form id_tree to full foldername
@@ -1970,36 +1970,36 @@ 
 
                     echo json_encode($json);
                 } else {
-                    rest_error ('NO_PARAMETERS');
+                    rest_error('NO_PARAMETERS');
                 }
             } else if ($GLOBALS['request'][1] === "version") {
                 echo '{"api-version":"'.$api_version.'"}';
             } else {
-                rest_error ('NO_PARAMETERS');
+                rest_error('NO_PARAMETERS');
             }
         } else {
-            rest_error ('METHOD');
+            rest_error('METHOD');
         }
     }
 }
 
 function rest_put() {
-    if(!@count($GLOBALS['request'])==0){
+    if (!@count($GLOBALS['request']) == 0) {
         $request_uri = $GLOBALS['_SERVER']['REQUEST_URI'];
-        preg_match('/\/api(\/index.php|)\/(.*)\?apikey=(.*)/',$request_uri,$matches);
+        preg_match('/\/api(\/index.php|)\/(.*)\?apikey=(.*)/', $request_uri, $matches);
         if (count($matches) == 0) {
-            rest_error ('REQUEST_SENT_NOT_UNDERSTANDABLE');
+            rest_error('REQUEST_SENT_NOT_UNDERSTANDABLE');
         }
-        $GLOBALS['request'] =  explode('/',$matches[2]);
+        $GLOBALS['request'] = explode('/', $matches[2]);
     }
-    if(apikey_checker($GLOBALS['apikey'])) {
+    if (apikey_checker($GLOBALS['apikey'])) {
         global $server, $user, $pass, $database, $pre, $link;
         teampass_connect();
 
     }
 }
 
-function rest_error ($type,$detail = 'N/A') {
+function rest_error($type, $detail = 'N/A') {
     switch ($type) {
         case 'APIKEY':
             $message = Array('err' => 'This api_key '.$GLOBALS['apikey'].' doesn\'t exist');
@@ -2116,13 +2116,13 @@ 
     exit(0);
 }
 
-function apikey_checker ($apikey_used) {
+function apikey_checker($apikey_used) {
     teampass_connect();
     $apikey_pool = teampass_get_keys();
     if (in_array($apikey_used, $apikey_pool)) {
         return(1);
     } else {
-        rest_error('APIKEY',$apikey_used);
+        rest_error('APIKEY', $apikey_used);
     }
 }
 
@@ -2132,7 +2132,7 @@ 
     $dk = '';
 
     for ($block = 1; $block <= $kb; $block++) {
-        $ib = $h = hash_hmac($a, $s . pack('N', $block), $p, true);
+        $ib = $h = hash_hmac($a, $s.pack('N', $block), $p, true);
         for ($i = 1; $i < $c; $i++) {
             $ib ^= ($h = hash_hmac($a, $h, $p, true));
         }

includes/libraries/Authentication/agses/axs/AXSILPortal_V1_Auth.php

Doc Comments +4 added lines

@@ -40,6 +40,10 @@
 		return $response['flickerCode'];
 	}
 	
+	/**
+	 * @param string $response
+	 * @param string $hedgeId
+	 */
 	function verifyResponse($apn, $response, $hedgeId) {
 		
 		$serviceCall = $this->baseUrl."/authmessage/".$apn."/verify/".$hedgeId."/".$response;

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 		$serviceCall = $this->baseUrl."/authmessage/".$apn."/create/".$hedgeId;
 		
 		$json = file_get_contents($serviceCall);
-		$response = json_decode($json,true);		
+		$response = json_decode($json, true);		
 		
 		return $response['flickerCode'];
 	}
@@ -45,7 +45,7 @@ 
 		$serviceCall = $this->baseUrl."/authmessage/".$apn."/verify/".$hedgeId."/".$response;
 		
 		$json = file_get_contents($serviceCall);
-		$response = json_decode($json,true);
+		$response = json_decode($json, true);
 		
 		return $response['response'];
 	}

includes/libraries/Authentication/ParagonIE/ConstantTime/Base64.php

Doc Comments +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
      * Base64 character set "./[A-Z][a-z][0-9]"
      *
      * @param string $src
-     * @return string|bool
+     * @return string|false
      * @throws \RangeException
      */
     public static function decode($src, $strictPadding = false)

Spacing +11 added lines, -11 removed lines

@@ -52,10 +52,10 @@ 
             $b2 = $chunk[3];
 
             $dest .=
-                static::encode6Bits(               $b0 >> 2       ) .
-                static::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                static::encode6Bits((($b1 << 2) | ($b2 >> 6)) & 63) .
-                static::encode6Bits(  $b2                     & 63);
+                static::encode6Bits($b0 >> 2).
+                static::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63).
+                static::encode6Bits((($b1 << 2) | ($b2 >> 6)) & 63).
+                static::encode6Bits($b2 & 63);
         }
         // The last chunk, which may have padding:
         if ($i < $srcLen) {
@@ -64,13 +64,13 @@ 
             if ($i + 1 < $srcLen) {
                 $b1 = $chunk[2];
                 $dest .=
-                    static::encode6Bits(               $b0 >> 2       ) .
-                    static::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                    static::encode6Bits( ($b1 << 2)               & 63) . '=';
+                    static::encode6Bits($b0 >> 2).
+                    static::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63).
+                    static::encode6Bits(($b1 << 2) & 63).'=';
             } else {
                 $dest .=
-                    static::encode6Bits( $b0 >> 2) .
-                    static::encode6Bits(($b0 << 4) & 63) . '==';
+                    static::encode6Bits($b0 >> 2).
+                    static::encode6Bits(($b0 << 4) & 63).'==';
             }
         }
         return $dest;
@@ -125,7 +125,7 @@ 
                 'CCC',
                 ((($c0 << 2) | ($c1 >> 4)) & 0xff),
                 ((($c1 << 4) | ($c2 >> 2)) & 0xff),
-                ((($c2 << 6) |  $c3      ) & 0xff)
+                ((($c2 << 6) | $c3) & 0xff)
             );
             $err |= ($c0 | $c1 | $c2 | $c3) >> 8;
         }
@@ -142,7 +142,7 @@ 
                     ((($c1 << 4) | ($c2 >> 2)) & 0xff)
                 );
                 $err |= ($c0 | $c1 | $c2) >> 8;
-            } elseif($i + 1 < $srcLen) {
+            } elseif ($i + 1 < $srcLen) {
                 $c1 = static::decode6Bits($chunk[2]);
                 $dest .= \pack(
                     'C',

includes/libraries/Authentication/phpseclib/Crypt/Common/SymmetricKey.php

Doc Comments +2 added lines, -2 removed lines

@@ -1458,7 +1458,7 @@ 
      *
      * May need to be overwritten by classes extending this one in some cases
      *
-     * @return int
+     * @return string|null
      * @access private
      */
     function _openssl_translate_mode()
@@ -2541,7 +2541,7 @@ 
      *
      * @see self::_setupInlineCrypt()
      * @access private
-     * @param $bytes
+     * @param string $bytes
      * @return string
      */
     function _hashInlineCryptFunction($bytes)

Spacing +108 added lines, -108 removed lines

@@ -517,7 +517,7 @@ 
         }
 
         if (strlen($iv) != $this->block_size) {
-            throw new \LengthException('Received initialization vector of size ' . strlen($iv) . ', but size ' . $this->block_size . ' is required');
+            throw new \LengthException('Received initialization vector of size '.strlen($iv).', but size '.$this->block_size.' is required');
         }
 
         $this->iv = $iv;
@@ -571,7 +571,7 @@ 
 
         if (is_string($this->key) && strlen($this->key) != $this->explicit_key_length) {
             $this->key = false;
-            throw new \LengthException('Key has already been set and is not ' .$this->explicit_key_length . ' bytes long');
+            throw new \LengthException('Key has already been set and is not '.$this->explicit_key_length.' bytes long');
         }
     }
 
@@ -592,7 +592,7 @@ 
     function setKey($key)
     {
         if ($this->explicit_key_length !== false && strlen($key) != $this->explicit_key_length) {
-            throw new \LengthException('Key length has already been set to ' . $this->explicit_key_length . ' bytes and this key is ' . strlen($key) . ' bytes');
+            throw new \LengthException('Key length has already been set to '.$this->explicit_key_length.' bytes and this key is '.strlen($key).' bytes');
         }
 
         $this->key = $key;
@@ -651,7 +651,7 @@ 
                         if ($dkLen > $hashObj->getLength()) {
                             throw new \LengthException('Derived key length cannot be longer than the hash length');
                         }
-                        $t = $password . $salt;
+                        $t = $password.$salt;
                         for ($i = 0; $i < $count; ++$i) {
                             $t = $hashObj->hash($t);
                         }
@@ -670,12 +670,12 @@ 
                             $hmac = new Hash();
                             $hmac->setHash($hash);
                             $hmac->setKey($password);
-                            $f = $u = $hmac->hash($salt . pack('N', $i++));
+                            $f = $u = $hmac->hash($salt.pack('N', $i++));
                             for ($j = 2; $j <= $count; ++$j) {
                                 $u = $hmac->hash($u);
-                                $f^= $u;
+                                $f ^= $u;
                             }
-                            $key.= $f;
+                            $key .= $f;
                         }
                         $key = substr($key, 0, $dkLen);
                         break;
@@ -755,11 +755,11 @@ 
                         $max = $this->block_size - $pos;
                         if ($len >= $max) {
                             $i = $max;
-                            $len-= $max;
+                            $len -= $max;
                             $pos = 0;
                         } else {
                             $i = $len;
-                            $pos+= $len;
+                            $pos += $len;
                             $len = 0;
                         }
                         // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
@@ -771,13 +771,13 @@ 
                     $overflow = $len % $this->block_size;
 
                     if ($overflow) {
-                        $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        $ciphertext .= openssl_encrypt(substr($plaintext, 0, -$overflow).str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
                         $iv = $this->_string_pop($ciphertext, $this->block_size);
 
                         $size = $len - $overflow;
                         $block = $iv ^ substr($plaintext, -$overflow);
                         $iv = substr_replace($iv, $block, 0, $overflow);
-                        $ciphertext.= $block;
+                        $ciphertext .= $block;
                         $pos = $overflow;
                     } elseif ($len) {
                         $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
@@ -815,11 +815,11 @@ 
                     $max = $block_size - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
@@ -832,15 +832,15 @@ 
                             @mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
                             $this->enbuffer['enmcrypt_init'] = false;
                         }
-                        $ciphertext.= @mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % $block_size));
+                        $ciphertext .= @mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % $block_size));
                         $iv = substr($ciphertext, -$block_size);
-                        $len%= $block_size;
+                        $len %= $block_size;
                     } else {
                         while ($len >= $block_size) {
                             $iv = @mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, $block_size);
-                            $ciphertext.= $iv;
-                            $len-= $block_size;
-                            $i+= $block_size;
+                            $ciphertext .= $iv;
+                            $len -= $block_size;
+                            $i += $block_size;
                         }
                     }
                 }
@@ -849,7 +849,7 @@ 
                     $iv = @mcrypt_generic($this->ecb, $iv);
                     $block = $iv ^ substr($plaintext, -$len);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
 
@@ -879,17 +879,17 @@ 
         $ciphertext = '';
         switch ($this->mode) {
             case self::MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
+                    $ciphertext .= $this->_encryptBlock(substr($plaintext, $i, $block_size));
                 }
                 break;
             case self::MODE_CBC:
                 $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                     $block = substr($plaintext, $i, $block_size);
                     $block = $this->_encryptBlock($block ^ $xor);
                     $xor = $block;
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
@@ -898,27 +898,27 @@ 
             case self::MODE_CTR:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $block = substr($plaintext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
+                            $buffer['ciphertext'] .= $this->_encryptBlock($xor);
                         }
                         $this->_increment_str($xor);
                         $key = Strings::shift($buffer['ciphertext'], $block_size);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $block = substr($plaintext, $i, $block_size);
                         $key = $this->_encryptBlock($xor);
                         $this->_increment_str($xor);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                        $buffer['ciphertext'] = substr($key, $start).$buffer['ciphertext'];
                     }
                 }
                 break;
@@ -939,11 +939,11 @@ 
                     $max = $block_size - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
@@ -952,41 +952,41 @@ 
                 }
                 while ($len >= $block_size) {
                     $iv = $this->_encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
-                    $ciphertext.= $iv;
-                    $len-= $block_size;
-                    $i+= $block_size;
+                    $ciphertext .= $iv;
+                    $len -= $block_size;
+                    $i += $block_size;
                 }
                 if ($len) {
                     $iv = $this->_encryptBlock($iv);
                     $block = $iv ^ substr($plaintext, $i);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 break;
             case self::MODE_OFB:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $block = substr($plaintext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = Strings::shift($buffer['xor'], $block_size);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $xor = $this->_encryptBlock($xor);
-                        $ciphertext.= substr($plaintext, $i, $block_size) ^ $xor;
+                        $ciphertext .= substr($plaintext, $i, $block_size) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                        $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
                 break;
@@ -1014,7 +1014,7 @@ 
     function decrypt($ciphertext)
     {
         if ($this->paddable && strlen($ciphertext) % $this->block_size) {
-            throw new \LengthException('The ciphertext length (' . strlen($ciphertext) . ') needs to be a multiple of the block size (' . $this->block_size . ')');
+            throw new \LengthException('The ciphertext length ('.strlen($ciphertext).') needs to be a multiple of the block size ('.$this->block_size.')');
         }
 
         if ($this->engine === self::ENGINE_OPENSSL) {
@@ -1028,14 +1028,14 @@ 
                     break;
                 case self::MODE_ECB:
                     if (!defined('OPENSSL_RAW_DATA')) {
-                        $ciphertext.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $this->key, true);
+                        $ciphertext .= openssl_encrypt('', $this->cipher_name_openssl_ecb, $this->key, true);
                     }
                     $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
                     break;
                 case self::MODE_CBC:
                     if (!defined('OPENSSL_RAW_DATA')) {
                         $padding = str_repeat(chr($this->block_size), $this->block_size) ^ substr($ciphertext, -$this->block_size);
-                        $ciphertext.= substr(openssl_encrypt($padding, $this->cipher_name_openssl_ecb, $this->key, true), 0, $this->block_size);
+                        $ciphertext .= substr(openssl_encrypt($padding, $this->cipher_name_openssl_ecb, $this->key, true), 0, $this->block_size);
                         $offset = 2 * $this->block_size;
                     } else {
                         $offset = $this->block_size;
@@ -1066,11 +1066,11 @@ 
                         $max = $this->block_size - $pos;
                         if ($len >= $max) {
                             $i = $max;
-                            $len-= $max;
+                            $len -= $max;
                             $pos = 0;
                         } else {
                             $i = $len;
-                            $pos+= $len;
+                            $pos += $len;
                             $len = 0;
                         }
                         // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $this->blocksize
@@ -1080,16 +1080,16 @@ 
                     }
                     $overflow = $len % $this->block_size;
                     if ($overflow) {
-                        $plaintext.= openssl_decrypt(substr($ciphertext, 0, -$overflow), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        $plaintext .= openssl_decrypt(substr($ciphertext, 0, -$overflow), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
                         if ($len - $overflow) {
                             $iv = substr($ciphertext, -$overflow - $this->block_size, -$overflow);
                         }
                         $iv = openssl_encrypt(str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $plaintext.= $iv ^ substr($ciphertext, -$overflow);
+                        $plaintext .= $iv ^ substr($ciphertext, -$overflow);
                         $iv = substr_replace($iv, substr($ciphertext, -$overflow), 0, $overflow);
                         $pos = $overflow;
                     } elseif ($len) {
-                        $plaintext.= openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        $plaintext .= openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
                         $iv = substr($ciphertext, -$this->block_size);
                     }
                     break;
@@ -1122,11 +1122,11 @@ 
                     $max = $block_size - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
@@ -1135,13 +1135,13 @@ 
                 }
                 if ($len >= $block_size) {
                     $cb = substr($ciphertext, $i, $len - $len % $block_size);
-                    $plaintext.= @mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
+                    $plaintext .= @mcrypt_generic($this->ecb, $iv.$cb) ^ $cb;
                     $iv = substr($cb, -$block_size);
-                    $len%= $block_size;
+                    $len %= $block_size;
                 }
                 if ($len) {
                     $iv = @mcrypt_generic($this->ecb, $iv);
-                    $plaintext.= $iv ^ substr($ciphertext, -$len);
+                    $plaintext .= $iv ^ substr($ciphertext, -$len);
                     $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
                     $pos = $len;
                 }
@@ -1173,15 +1173,15 @@ 
         $plaintext = '';
         switch ($this->mode) {
             case self::MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
+                for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
+                    $plaintext .= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
                 }
                 break;
             case self::MODE_CBC:
                 $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                     $block = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $this->_decryptBlock($block) ^ $xor;
+                    $plaintext .= $this->_decryptBlock($block) ^ $xor;
                     $xor = $block;
                 }
                 if ($this->continuousBuffer) {
@@ -1191,27 +1191,27 @@ 
             case self::MODE_CTR:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $block = substr($ciphertext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
+                            $buffer['ciphertext'] .= $this->_encryptBlock($xor);
                             $this->_increment_str($xor);
                         }
                         $key = Strings::shift($buffer['ciphertext'], $block_size);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $block = substr($ciphertext, $i, $block_size);
                         $key = $this->_encryptBlock($xor);
                         $this->_increment_str($xor);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                        $buffer['ciphertext'] = substr($key, $start).$buffer['ciphertext'];
                     }
                 }
                 break;
@@ -1230,11 +1230,11 @@ 
                     $max = $block_size - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
@@ -1244,14 +1244,14 @@ 
                 while ($len >= $block_size) {
                     $iv = $this->_encryptBlock($iv);
                     $cb = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $iv ^ $cb;
+                    $plaintext .= $iv ^ $cb;
                     $iv = $cb;
-                    $len-= $block_size;
-                    $i+= $block_size;
+                    $len -= $block_size;
+                    $i += $block_size;
                 }
                 if ($len) {
                     $iv = $this->_encryptBlock($iv);
-                    $plaintext.= $iv ^ substr($ciphertext, $i);
+                    $plaintext .= $iv ^ substr($ciphertext, $i);
                     $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
                     $pos = $len;
                 }
@@ -1259,26 +1259,26 @@ 
             case self::MODE_OFB:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $block = substr($ciphertext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = Strings::shift($buffer['xor'], $block_size);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $xor = $this->_encryptBlock($xor);
-                        $plaintext.= substr($ciphertext, $i, $block_size) ^ $xor;
+                        $plaintext .= substr($ciphertext, $i, $block_size) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                        $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
                 break;
@@ -1331,30 +1331,30 @@ 
         if ($this->openssl_emulate_ctr) {
             $xor = $encryptIV;
             if (strlen($buffer['ciphertext'])) {
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                     $block = substr($plaintext, $i, $block_size);
                     if (strlen($block) > strlen($buffer['ciphertext'])) {
                         $result = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
                         $result = !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
-                        $buffer['ciphertext'].= $result;
+                        $buffer['ciphertext'] .= $result;
                     }
                     $this->_increment_str($xor);
                     $otp = Strings::shift($buffer['ciphertext'], $block_size);
-                    $ciphertext.= $block ^ $otp;
+                    $ciphertext .= $block ^ $otp;
                 }
             } else {
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                     $block = substr($plaintext, $i, $block_size);
                     $otp = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
                     $otp = !defined('OPENSSL_RAW_DATA') ? substr($otp, 0, -$this->block_size) : $otp;
                     $this->_increment_str($xor);
-                    $ciphertext.= $block ^ $otp;
+                    $ciphertext .= $block ^ $otp;
                 }
             }
             if ($this->continuousBuffer) {
                 $encryptIV = $xor;
                 if ($start = strlen($plaintext) % $block_size) {
-                    $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                    $buffer['ciphertext'] = substr($key, $start).$buffer['ciphertext'];
                 }
             }
 
@@ -1373,15 +1373,15 @@ 
         $overflow = strlen($plaintext) % $block_size;
         if ($overflow) {
             $plaintext2 = $this->_string_pop($plaintext, $overflow); // ie. trim $plaintext to a multiple of $block_size and put rest of $plaintext in $plaintext2
-            $encrypted = openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
+            $encrypted = openssl_encrypt($plaintext.str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
             $temp = $this->_string_pop($encrypted, $block_size);
-            $ciphertext.= $encrypted . ($plaintext2 ^ $temp);
+            $ciphertext .= $encrypted.($plaintext2 ^ $temp);
             if ($this->continuousBuffer) {
                 $buffer['ciphertext'] = substr($temp, $overflow);
                 $encryptIV = $temp;
             }
         } elseif (!strlen($buffer['ciphertext'])) {
-            $ciphertext.= openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
+            $ciphertext .= openssl_encrypt($plaintext.str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
             $temp = $this->_string_pop($ciphertext, $block_size);
             if ($this->continuousBuffer) {
                 $encryptIV = $temp;
@@ -1389,7 +1389,7 @@ 
         }
         if ($this->continuousBuffer) {
             if (!defined('OPENSSL_RAW_DATA')) {
-                $encryptIV.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
+                $encryptIV .= openssl_encrypt('', $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
             }
             $encryptIV = openssl_decrypt($encryptIV, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
             if ($overflow) {
@@ -1433,12 +1433,12 @@ 
 
         if (strlen($plaintext)) {
             if ($overflow) {
-                $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
+                $ciphertext .= openssl_encrypt(substr($plaintext, 0, -$overflow).str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
                 $xor = $this->_string_pop($ciphertext, $block_size);
                 if ($this->continuousBuffer) {
                     $encryptIV = $xor;
                 }
-                $ciphertext.= Strings::shift($xor, $overflow) ^ substr($plaintext, -$overflow);
+                $ciphertext .= Strings::shift($xor, $overflow) ^ substr($plaintext, -$overflow);
                 if ($this->continuousBuffer) {
                     $buffer['xor'] = $xor;
                 }
@@ -1954,7 +1954,7 @@ 
      */
     function _increment_str(&$var)
     {
-        for ($i = 4; $i <= strlen($var); $i+= 4) {
+        for ($i = 4; $i <= strlen($var); $i += 4) {
             $temp = substr($var, -$i, 4);
             switch ($temp) {
                 case "\xFF\xFF\xFF\xFF":
@@ -2168,9 +2168,9 @@ 
         $block_size = $this->block_size;
 
         // optional
-        $init_crypt    = isset($cipher_code['init_crypt'])    ? $cipher_code['init_crypt']    : '';
-        $init_encrypt  = isset($cipher_code['init_encrypt'])  ? $cipher_code['init_encrypt']  : '';
-        $init_decrypt  = isset($cipher_code['init_decrypt'])  ? $cipher_code['init_decrypt']  : '';
+        $init_crypt    = isset($cipher_code['init_crypt']) ? $cipher_code['init_crypt'] : '';
+        $init_encrypt  = isset($cipher_code['init_encrypt']) ? $cipher_code['init_encrypt'] : '';
+        $init_decrypt  = isset($cipher_code['init_decrypt']) ? $cipher_code['init_decrypt'] : '';
         // required
         $encrypt_block = $cipher_code['encrypt_block'];
         $decrypt_block = $cipher_code['decrypt_block'];
@@ -2180,7 +2180,7 @@ 
         // for encrypt- and decryption.
         switch ($this->mode) {
             case self::MODE_ECB:
-                $encrypt = $init_encrypt . '
+                $encrypt = $init_encrypt.'
                     $_ciphertext = "";
                     $_plaintext_len = strlen($_text);
 
@@ -2193,7 +2193,7 @@ 
                     return $_ciphertext;
                     ';
 
-                $decrypt = $init_decrypt . '
+                $decrypt = $init_decrypt.'
                     $_plaintext = "";
                     $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
                     $_ciphertext_len = strlen($_text);
@@ -2208,7 +2208,7 @@ 
                     ';
                 break;
             case self::MODE_CTR:
-                $encrypt = $init_encrypt . '
+                $encrypt = $init_encrypt.'
                     $_ciphertext = "";
                     $_plaintext_len = strlen($_text);
                     $_xor = $self->encryptIV;
@@ -2245,7 +2245,7 @@ 
                     return $_ciphertext;
                 ';
 
-                $decrypt = $init_encrypt . '
+                $decrypt = $init_encrypt.'
                     $_plaintext = "";
                     $_ciphertext_len = strlen($_text);
                     $_xor = $self->decryptIV;
@@ -2284,7 +2284,7 @@ 
                     ';
                 break;
             case self::MODE_CFB:
-                $encrypt = $init_encrypt . '
+                $encrypt = $init_encrypt.'
                     $_ciphertext = "";
                     $_buffer = &$self->enbuffer;
 
@@ -2332,7 +2332,7 @@ 
                     return $_ciphertext;
                 ';
 
-                $decrypt = $init_encrypt . '
+                $decrypt = $init_encrypt.'
                     $_plaintext = "";
                     $_buffer = &$self->debuffer;
 
@@ -2383,7 +2383,7 @@ 
                     ';
                 break;
             case self::MODE_OFB:
-                $encrypt = $init_encrypt . '
+                $encrypt = $init_encrypt.'
                     $_ciphertext = "";
                     $_plaintext_len = strlen($_text);
                     $_xor = $self->encryptIV;
@@ -2419,7 +2419,7 @@ 
                     return $_ciphertext;
                     ';
 
-                $decrypt = $init_encrypt . '
+                $decrypt = $init_encrypt.'
                     $_plaintext = "";
                     $_ciphertext_len = strlen($_text);
                     $_xor = $self->decryptIV;
@@ -2456,12 +2456,12 @@ 
                     ';
                 break;
             case self::MODE_STREAM:
-                $encrypt = $init_encrypt . '
+                $encrypt = $init_encrypt.'
                     $_ciphertext = "";
                     '.$encrypt_block.'
                     return $_ciphertext;
                     ';
-                $decrypt = $init_decrypt . '
+                $decrypt = $init_decrypt.'
                     $_plaintext = "";
                     '.$decrypt_block.'
                     return $_plaintext;
@@ -2469,7 +2469,7 @@ 
                 break;
             // case self::MODE_CBC:
             default:
-                $encrypt = $init_encrypt . '
+                $encrypt = $init_encrypt.'
                     $_ciphertext = "";
                     $_plaintext_len = strlen($_text);
 
@@ -2488,7 +2488,7 @@ 
                     return $_ciphertext;
                     ';
 
-                $decrypt = $init_decrypt . '
+                $decrypt = $init_decrypt.'
                     $_plaintext = "";
                     $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
                     $_ciphertext_len = strlen($_text);
@@ -2512,7 +2512,7 @@ 
         }
 
         // Create the $inline function and return its name as string. Ready to run!
-        return create_function('$_action, &$self, $_text', $init_crypt . 'if ($_action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }');
+        return create_function('$_action, &$self, $_text', $init_crypt.'if ($_action == "encrypt") { '.$encrypt.' } else { '.$decrypt.' }');
     }
 
     /**
@@ -2559,15 +2559,15 @@ 
                     $hash = hash('whirlpool', $hash, true);
                     $result .= $t ^ $hash;
                 }
-                return $result . hash('whirlpool', $hash, true);
+                return $result.hash('whirlpool', $hash, true);
             default:
                 $len = strlen($bytes);
-                for ($i = 0; $i < $len; $i+=20) {
+                for ($i = 0; $i < $len; $i += 20) {
                     $t = substr($bytes, $i, 20);
                     $hash = sha1($hash, true);
                     $result .= $t ^ $hash;
                 }
-                return $result . sha1($hash, true);
+                return $result.sha1($hash, true);
         }
     }
 }

includes/libraries/Authentication/phpseclib/Crypt/Hash.php

Doc Comments +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
      * As set by the constructor or by the setHash() method.
      *
      * @access public
-     * @return string
+     * @return integer
      */
     function getHash()
     {

Spacing +12 added lines, -14 removed lines

@@ -209,8 +209,7 @@ 
                 array(
                     '22312194FC2BF72C', '9F555FA3C84C64C2', '2393B86B6F53B151', '963877195940EABD',
                     '96283EE2A88EFFE3', 'BE5E1E2553863992', '2B0199FC2C85B8AA', '0EB72DDC81C52CA2'
-                ) :
-                array(
+                ) : array(
                     '8C3D37C819544DA2', '73E1996689DCD4D6', '1DFAB7AE32FF9C82', '679DD514582F9FCF',
                     '0F6D2B697BD44DA8', '77E36F7304C48942', '3F9D85A86A1D36C8', '1112E6AD91D692A1'
                 );
@@ -244,19 +243,18 @@ 
                     -- http://tools.ietf.org/html/rfc2104#section-2 */
                 $key = strlen($this->key) > $this->b ? self::_sha512($this->key, $this->initial) : $this->key;
 
-                $key    = str_pad($this->key, 128, chr(0));       // step 1
-                $temp   = $this->ipad ^ $this->key;               // step 2
-                $temp  .= $text;                                  // step 3
-                $temp   = self::_sha512($temp, $this->initial);   // step 4
-                $output = $this->opad ^ $this->key;               // step 5
-                $output.= $temp;                                  // step 6
+                $key    = str_pad($this->key, 128, chr(0)); // step 1
+                $temp   = $this->ipad ^ $this->key; // step 2
+                $temp  .= $text; // step 3
+                $temp   = self::_sha512($temp, $this->initial); // step 4
+                $output = $this->opad ^ $this->key; // step 5
+                $output .= $temp; // step 6
                 $output = self::_sha512($output, $this->initial); // step 7
 
                 return substr($output, 0, $this->length);
         }
         $output = !empty($this->key) || is_string($this->key) ?
-            hash_hmac($this->hash, $text, $this->key, true) :
-            hash($this->hash, $text, true);
+            hash_hmac($this->hash, $text, $this->key, true) : hash($this->hash, $text, true);
 
         return strlen($output) > $this->length
             ? substr($output, 0, $this->length)
@@ -318,10 +316,10 @@ 
         // Pre-processing
         $length = strlen($m);
         // to round to nearest 112 mod 128, we'll add 128 - (length + (128 - 112)) % 128
-        $m.= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
+        $m .= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
         $m[$length] = chr(0x80);
         // we don't support hashing strings 512MB long
-        $m.= pack('N4', 0, 0, 0, $length << 3);
+        $m .= pack('N4', 0, 0, 0, $length << 3);
 
         // Process the message in successive 1024-bit chunks
         $chunks = str_split($m, 128);
@@ -425,8 +423,8 @@ 
 
         // Produce the final hash value (big-endian)
         // (\phpseclib\Crypt\Hash::hash() trims the output for hashes but not for HMACs.  as such, we trim the output here)
-        $temp = $hash[0]->toBytes() . $hash[1]->toBytes() . $hash[2]->toBytes() . $hash[3]->toBytes() .
-                $hash[4]->toBytes() . $hash[5]->toBytes() . $hash[6]->toBytes() . $hash[7]->toBytes();
+        $temp = $hash[0]->toBytes().$hash[1]->toBytes().$hash[2]->toBytes().$hash[3]->toBytes().
+                $hash[4]->toBytes().$hash[5]->toBytes().$hash[6]->toBytes().$hash[7]->toBytes();
 
         return $temp;
     }

includes/libraries/Authentication/phpseclib/Crypt/RC4.php

Doc Comments +1 added lines, -1 removed lines

@@ -201,8 +201,8 @@
      * Keys can be between 1 and 256 bytes long.
      *
      * @access public
-     * @param int $length
      * @throws \LengthException if the key length is invalid
+     * @param string $key
      */
     function setKey($key)
     {

Spacing +2 added lines, -2 removed lines

@@ -187,7 +187,7 @@ 
     function setKeyLength($length)
     {
         if ($length < 8 || $length > 2048) {
-            throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys between 1 and 256 bytes are supported');
+            throw new \LengthException('Key size of '.$length.' bits is not supported by this algorithm. Only keys between 1 and 256 bytes are supported');
         }
 
         $this->key_length = $length >> 3;
@@ -208,7 +208,7 @@ 
     {
         $length = strlen($key);
         if ($length < 1 || $length > 256) {
-            throw new \LengthException('Key size of ' . $length . ' bytes is not supported by RC4. Keys must be between 1 and 256 bytes long');
+            throw new \LengthException('Key size of '.$length.' bytes is not supported by RC4. Keys must be between 1 and 256 bytes long');
         }
 
         parent::setKey($key);

includes/libraries/Authentication/phpseclib/Crypt/RSA.php

Doc Comments +14 added lines, -18 removed lines

@@ -402,7 +402,6 @@ 
      * @access public
      * @param int $bits
      * @param int $timeout
-     * @param array $p
      */
     static function createKey($bits = 2048, $timeout = false, $partial = array())
     {
@@ -608,7 +607,7 @@ 
      * @see self::load()
      * @param string $fullname
      * @access public
-     * @return bool
+     * @return boolean|null
      */
     static function addFileFormat($fullname)
     {
@@ -750,7 +749,7 @@ 
      *
      * @see self::load()
      * @access public
-     * @return mixed
+     * @return false|string
      */
     function getLoadedFormat()
     {
@@ -971,7 +970,7 @@ 
      * @access public
      * @param string $algorithm The hashing algorithm to be used. Valid options are 'md5' and 'sha256'. False is returned
      * for invalid values.
-     * @return mixed
+     * @return false|string
      */
     function getPublicKeyFingerprint($algorithm = 'md5')
     {
@@ -1154,7 +1153,6 @@ 
      *    of the hash function Hash) and 0.
      *
      * @access public
-     * @param int $format
      */
     function setSaltLength($sLen)
     {
@@ -1169,7 +1167,7 @@ 
      * @access private
      * @param bool|\phpseclib\Math\BigInteger $x
      * @param int $xLen
-     * @return bool|string
+     * @return false|string
      */
     function _i2osp($x, $xLen)
     {
@@ -1405,7 +1403,6 @@ 
      *
      * @access private
      * @param string $mgfSeed
-     * @param int $mgfLen
      * @return string
      */
     function _mgf1($mgfSeed, $maskLen)
@@ -1494,7 +1491,7 @@ 
      * @access private
      * @param string $c
      * @param string $l
-     * @return bool|string
+     * @return false|string
      */
     function _rsaes_oaep_decrypt($c, $l = '')
     {
@@ -1548,7 +1545,7 @@ 
      *
      * @access private
      * @param string $m
-     * @return bool|string
+     * @return false|string
      * @throws \OutOfBoundsException if strlen($m) > $this->k
      */
     function _raw_encrypt($m)
@@ -1571,7 +1568,7 @@ 
      * @param string $m
      * @param bool $pkcs15_compat optional
      * @throws \OutOfBoundsException if strlen($m) > $this->k - 11
-     * @return bool|string
+     * @return false|string
      */
     function _rsaes_pkcs1_v1_5_encrypt($m, $pkcs15_compat = false)
     {
@@ -1629,7 +1626,7 @@ 
      *
      * @access private
      * @param string $c
-     * @return bool|string
+     * @return false|string
      */
     function _rsaes_pkcs1_v1_5_decrypt($c)
     {
@@ -1711,7 +1708,7 @@ 
      * @param string $m
      * @param string $em
      * @param int $emBits
-     * @return string
+     * @return boolean
      */
     function _emsa_pss_verify($m, $em, $emBits)
     {
@@ -1756,7 +1753,7 @@ 
      *
      * @access private
      * @param string $m
-     * @return bool|string
+     * @return false|string
      */
     function _rsassa_pss_sign($m)
     {
@@ -1876,7 +1873,7 @@ 
      * @access private
      * @param string $m
      * @throws \LengthException if the RSA modulus is too short
-     * @return bool|string
+     * @return false|string
      */
     function _rsassa_pkcs1_v1_5_sign($m)
     {
@@ -2058,7 +2055,7 @@ 
      * @access public
      * @param string $plaintext
      * @param int $padding optional
-     * @return bool|string
+     * @return false|string
      * @throws \LengthException if the RSA modulus is too short
      */
     function encrypt($plaintext, $padding = self::PADDING_OAEP)
@@ -2080,9 +2077,8 @@ 
      *
      * @see self::encrypt()
      * @access public
-     * @param string $plaintext
      * @param int $padding optional
-     * @return bool|string
+     * @return false|string
      */
     function decrypt($ciphertext, $padding = self::PADDING_OAEP)
     {
@@ -2130,7 +2126,7 @@ 
      * @param string $message
      * @param string $signature
      * @param int $padding optional
-     * @return bool
+     * @return boolean|string
      */
     function verify($message, $signature, $padding = self::PADDING_PSS)
     {

Spacing +15 added lines, -15 removed lines

@@ -350,15 +350,15 @@ 
     static function _initialize_static_variables()
     {
         if (!isset(self::$zero)) {
-            self::$zero= new BigInteger(0);
+            self::$zero = new BigInteger(0);
             self::$one = new BigInteger(1);
-            self::$configFile = __DIR__ . '/../openssl.cnf';
+            self::$configFile = __DIR__.'/../openssl.cnf';
 
             if (self::$fileFormats === false) {
                 self::$fileFormats = array();
-                foreach (glob(__DIR__ . '/RSA/*.php') as $file) {
+                foreach (glob(__DIR__.'/RSA/*.php') as $file) {
                     $name = pathinfo($file, PATHINFO_FILENAME);
-                    $type = 'phpseclib\Crypt\RSA\\' . $name;
+                    $type = 'phpseclib\Crypt\RSA\\'.$name;
                     $meta = new \ReflectionClass($type);
                     if (!$meta->isAbstract()) {
                         self::$fileFormats[strtolower($name)] = $type;
@@ -498,7 +498,7 @@ 
         do {
             for ($i = $i0; $i <= $num_primes; $i++) {
                 if ($timeout !== false) {
-                    $timeout-= time() - $start;
+                    $timeout -= time() - $start;
                     $start = time();
                     if ($timeout <= 0) {
                         return array(
@@ -1416,7 +1416,7 @@ 
         $count = ceil($maskLen / $this->mgfHLen);
         for ($i = 0; $i < $count; $i++) {
             $c = pack('N', $i);
-            $t.= $this->mgfHash->hash($mgfSeed . $c);
+            $t .= $this->mgfHash->hash($mgfSeed.$c);
         }
 
         return substr($t, 0, $maskLen);
@@ -1451,13 +1451,13 @@ 
 
         $lHash = $this->hash->hash($l);
         $ps = str_repeat(chr(0), $this->k - $mLen - 2 * $this->hLen - 2);
-        $db = $lHash . $ps . chr(1) . $m;
+        $db = $lHash.$ps.chr(1).$m;
         $seed = Random::string($this->hLen);
         $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
         $maskedDB = $db ^ $dbMask;
         $seedMask = $this->_mgf1($maskedDB, $this->hLen);
         $maskedSeed = $seed ^ $seedMask;
-        $em = chr(0) . $maskedSeed . $maskedDB;
+        $em = chr(0).$maskedSeed.$maskedDB;
 
         // RSA encryption
 
@@ -1590,7 +1590,7 @@ 
         while (strlen($ps) != $psLen) {
             $temp = Random::string($psLen - strlen($ps));
             $temp = str_replace("\x00", '', $temp);
-            $ps.= $temp;
+            $ps .= $temp;
         }
         $type = 2;
         // see the comments of _rsaes_pkcs1_v1_5_decrypt() to understand why this is being done
@@ -1599,7 +1599,7 @@ 
             // "The padding string PS shall consist of k-3-||D|| octets. ... for block type 01, they shall have value FF"
             $ps = str_repeat("\xFF", $psLen);
         }
-        $em = chr(0) . chr($type) . $ps . chr(0) . $m;
+        $em = chr(0).chr($type).$ps.chr(0).$m;
 
         // RSA encryption
         $m = $this->_os2ip($em);
@@ -1690,14 +1690,14 @@ 
         }
 
         $salt = Random::string($sLen);
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
+        $m2 = "\0\0\0\0\0\0\0\0".$mHash.$salt;
         $h = $this->hash->hash($m2);
         $ps = str_repeat(chr(0), $emLen - $sLen - $this->hLen - 2);
-        $db = $ps . chr(1) . $salt;
+        $db = $ps.chr(1).$salt;
         $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
         $maskedDB = $db ^ $dbMask;
         $maskedDB[0] = ~chr(0xFF << ($emBits & 7)) & $maskedDB[0];
-        $em = $maskedDB . $h . chr(0xBC);
+        $em = $maskedDB.$h.chr(0xBC);
 
         return $em;
     }
@@ -1744,7 +1744,7 @@ 
             return false;
         }
         $salt = substr($db, $temp + 1); // should be $sLen long
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
+        $m2 = "\0\0\0\0\0\0\0\0".$mHash.$salt;
         $h2 = $this->hash->hash($m2);
         return $this->_equals($h, $h2);
     }
@@ -1854,7 +1854,7 @@ 
             case 'sha512/256':
                 $t = "\x30\x31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x06\x05\x00\x04\x20";
         }
-        $t.= $h;
+        $t .= $h;
         $tLen = strlen($t);
 
         if ($emLen < $tLen + 11) {

includes/libraries/Authentication/phpseclib/Crypt/RSA/PuTTY.php

Doc Comments -1 removed lines

@@ -55,7 +55,6 @@
      *
      * @access public
      * @param string $password
-     * @param string $iv
      * @param int $length
      * @return string
      */

Spacing +15 added lines, -15 removed lines

@@ -65,7 +65,7 @@ 
         $sequence = 0;
         while (strlen($symkey) < $length) {
             $temp = pack('Na*', $sequence++, $password);
-            $symkey.= Hex::decode(sha1($temp));
+            $symkey .= Hex::decode(sha1($temp));
         }
         return substr($symkey, 0, $length);
     }
@@ -205,8 +205,8 @@ 
 
         $key = "PuTTY-User-Key-File-2: ssh-rsa\r\nEncryption: ";
         $encryption = (!empty($password) || is_string($password)) ? 'aes256-cbc' : 'none';
-        $key.= $encryption;
-        $key.= "\r\nComment: " . self::$comment . "\r\n";
+        $key .= $encryption;
+        $key .= "\r\nComment: ".self::$comment."\r\n";
         $public = pack(
             'Na*Na*Na*',
             strlen('ssh-rsa'),
@@ -228,8 +228,8 @@ 
             $public
         );
         $public = Base64::encode($public);
-        $key.= "Public-Lines: " . ((strlen($public) + 63) >> 6) . "\r\n";
-        $key.= chunk_split($public, 64);
+        $key .= "Public-Lines: ".((strlen($public) + 63) >> 6)."\r\n";
+        $key .= chunk_split($public, 64);
         $private = pack(
             'Na*Na*Na*Na*',
             strlen($raw['privateExponent']),
@@ -242,26 +242,26 @@ 
             $raw['coefficient']
         );
         if (empty($password) && !is_string($password)) {
-            $source.= pack('Na*', strlen($private), $private);
+            $source .= pack('Na*', strlen($private), $private);
             $hashkey = 'putty-private-key-file-mac-key';
         } else {
-            $private.= Random::string(16 - (strlen($private) & 15));
-            $source.= pack('Na*', strlen($private), $private);
+            $private .= Random::string(16 - (strlen($private) & 15));
+            $source .= pack('Na*', strlen($private), $private);
             $crypto = new AES();
 
             $crypto->setKey(static::generateSymmetricKey($password, 32));
             $crypto->setIV(str_repeat("\0", $crypto->getBlockLength() >> 3));
             $crypto->disablePadding();
             $private = $crypto->encrypt($private);
-            $hashkey = 'putty-private-key-file-mac-key' . $password;
+            $hashkey = 'putty-private-key-file-mac-key'.$password;
         }
 
         $private = Base64::encode($private);
-        $key.= 'Private-Lines: ' . ((strlen($private) + 63) >> 6) . "\r\n";
-        $key.= chunk_split($private, 64);
+        $key .= 'Private-Lines: '.((strlen($private) + 63) >> 6)."\r\n";
+        $key .= chunk_split($private, 64);
         $hash = new Hash('sha1');
         $hash->setKey(sha1($hashkey, true));
-        $key.= 'Private-MAC: ' . Hex::encode($hash->hash($source)) . "\r\n";
+        $key .= 'Private-MAC: '.Hex::encode($hash->hash($source))."\r\n";
 
         return $key;
     }
@@ -288,9 +288,9 @@ 
             strlen($n),
             $n
         );
-        $key = "---- BEGIN SSH2 PUBLIC KEY ----\r\n" .
-               'Comment: "' . str_replace(array('\\', '"'), array('\\\\', '\"'), self::$comment) . "\"\r\n";
-               chunk_split(Base64::encode($key), 64) .
+        $key = "---- BEGIN SSH2 PUBLIC KEY ----\r\n".
+               'Comment: "'.str_replace(array('\\', '"'), array('\\\\', '\"'), self::$comment)."\"\r\n";
+               chunk_split(Base64::encode($key), 64).
                '---- END SSH2 PUBLIC KEY ----';
 
         return $key;

includes/libraries/Authentication/phpseclib/File/ANSI.php

Doc Comments +1 added lines, -2 removed lines

@@ -203,9 +203,8 @@
     /**
      * Set the number of lines that should be logged past the terminal height
      *
-     * @param int $x
-     * @param int $y
      * @access public
+     * @param integer $history
      */
     function setHistory($history)
     {

Spacing +26 added lines, -26 removed lines

@@ -235,7 +235,7 @@ 
         $this->tokenization = array('');
         for ($i = 0; $i < strlen($source); $i++) {
             if (strlen($this->ansi)) {
-                $this->ansi.= $source[$i];
+                $this->ansi .= $source[$i];
                 $chr = ord($source[$i]);
                 // http://en.wikipedia.org/wiki/ANSI_escape_code#Sequence_elements
                 // single character CSI's not currently supported
@@ -290,7 +290,7 @@ 
                         switch (true) {
                             case preg_match('#\x1B\[(\d+)B#', $this->ansi, $match): // Move cursor down n lines
                                 $this->old_y = $this->y;
-                                $this->y+= $match[1];
+                                $this->y += $match[1];
                                 break;
                             case preg_match('#\x1B\[(\d+);(\d+)H#', $this->ansi, $match): // Move cursor to screen location v,h
                                 $this->old_x = $this->x;
@@ -300,11 +300,11 @@ 
                                 break;
                             case preg_match('#\x1B\[(\d+)C#', $this->ansi, $match): // Move cursor right n lines
                                 $this->old_x = $this->x;
-                                $this->x+= $match[1];
+                                $this->x += $match[1];
                                 break;
                             case preg_match('#\x1B\[(\d+)D#', $this->ansi, $match): // Move cursor left n lines
                                 $this->old_x = $this->x;
-                                $this->x-= $match[1];
+                                $this->x -= $match[1];
                                 break;
                             case preg_match('#\x1B\[(\d+);(\d+)r#', $this->ansi, $match): // Set top and bottom lines of a window
                                 break;
@@ -373,7 +373,7 @@ 
                 continue;
             }
 
-            $this->tokenization[count($this->tokenization) - 1].= $source[$i];
+            $this->tokenization[count($this->tokenization) - 1] .= $source[$i];
             switch ($source[$i]) {
                 case "\r":
                     $this->x = 0;
@@ -400,7 +400,7 @@ 
                     //if (!strlen($this->tokenization[count($this->tokenization) - 1])) {
                     //    array_pop($this->tokenization);
                     //}
-                    $this->ansi.= "\x1B";
+                    $this->ansi .= "\x1B";
                     break;
                 default:
                     $this->attrs[$this->y][$this->x] = clone $this->attr_cell;
@@ -468,45 +468,45 @@ 
             $close = $open = '';
             if ($last_attr->foreground != $cur_attr->foreground) {
                 if ($cur_attr->foreground != 'white') {
-                    $open.= '<span style="color: ' . $cur_attr->foreground . '">';
+                    $open .= '<span style="color: '.$cur_attr->foreground.'">';
                 }
                 if ($last_attr->foreground != 'white') {
-                    $close = '</span>' . $close;
+                    $close = '</span>'.$close;
                 }
             }
             if ($last_attr->background != $cur_attr->background) {
                 if ($cur_attr->background != 'black') {
-                    $open.= '<span style="background: ' . $cur_attr->background . '">';
+                    $open .= '<span style="background: '.$cur_attr->background.'">';
                 }
                 if ($last_attr->background != 'black') {
-                    $close = '</span>' . $close;
+                    $close = '</span>'.$close;
                 }
             }
             if ($last_attr->bold != $cur_attr->bold) {
                 if ($cur_attr->bold) {
-                    $open.= '<b>';
+                    $open .= '<b>';
                 } else {
-                    $close = '</b>' . $close;
+                    $close = '</b>'.$close;
                 }
             }
             if ($last_attr->underline != $cur_attr->underline) {
                 if ($cur_attr->underline) {
-                    $open.= '<u>';
+                    $open .= '<u>';
                 } else {
-                    $close = '</u>' . $close;
+                    $close = '</u>'.$close;
                 }
             }
             if ($last_attr->blink != $cur_attr->blink) {
                 if ($cur_attr->blink) {
-                    $open.= '<blink>';
+                    $open .= '<blink>';
                 } else {
-                    $close = '</blink>' . $close;
+                    $close = '</blink>'.$close;
                 }
             }
-            $output.= $close . $open;
+            $output .= $close.$open;
         }
 
-        $output.= htmlspecialchars($char);
+        $output .= htmlspecialchars($char);
 
         return $output;
     }
@@ -524,14 +524,14 @@ 
         for ($i = 0; $i <= $this->max_y; $i++) {
             for ($j = 0; $j <= $this->max_x; $j++) {
                 $cur_attr = $this->attrs[$i][$j];
-                $output.= $this->_processCoordinate($last_attr, $cur_attr, isset($this->screen[$i][$j]) ? $this->screen[$i][$j] : '');
+                $output .= $this->_processCoordinate($last_attr, $cur_attr, isset($this->screen[$i][$j]) ? $this->screen[$i][$j] : '');
                 $last_attr = $this->attrs[$i][$j];
             }
-            $output.= "\r\n";
+            $output .= "\r\n";
         }
         $output = substr($output, 0, -2);
         // close any remaining open tags
-        $output.= $this->_processCoordinate($last_attr, $this->base_attr_cell, '');
+        $output .= $this->_processCoordinate($last_attr, $this->base_attr_cell, '');
         return rtrim($output);
     }
 
@@ -543,7 +543,7 @@ 
      */
     function getScreen()
     {
-        return '<pre width="' . ($this->max_x + 1) . '" style="color: white; background: black">' . $this->_getScreen() . '</pre>';
+        return '<pre width="'.($this->max_x + 1).'" style="color: white; background: black">'.$this->_getScreen().'</pre>';
     }
 
     /**
@@ -559,16 +559,16 @@ 
         for ($i = 0; $i < count($this->history); $i++) {
             for ($j = 0; $j <= $this->max_x + 1; $j++) {
                 $cur_attr = $this->history_attrs[$i][$j];
-                $scrollback.= $this->_processCoordinate($last_attr, $cur_attr, isset($this->history[$i][$j]) ? $this->history[$i][$j] : '');
+                $scrollback .= $this->_processCoordinate($last_attr, $cur_attr, isset($this->history[$i][$j]) ? $this->history[$i][$j] : '');
                 $last_attr = $this->history_attrs[$i][$j];
             }
-            $scrollback.= "\r\n";
+            $scrollback .= "\r\n";
         }
         $base_attr_cell = $this->base_attr_cell;
         $this->base_attr_cell = $last_attr;
-        $scrollback.= $this->_getScreen();
+        $scrollback .= $this->_getScreen();
         $this->base_attr_cell = $base_attr_cell;
 
-        return '<pre width="' . ($this->max_x + 1) . '" style="color: white; background: black">' . $scrollback . '</span></pre>';
+        return '<pre width="'.($this->max_x + 1).'" style="color: white; background: black">'.$scrollback.'</span></pre>';
     }
 }