nilsteampassnet / TeamPass

install/upgrade_db_1.08.php

Spacing +39 added lines, -39 removed lines

@@ -18,42 +18,42 @@ 
 global $k;
 //ENGLISH
 $english_vals = array(
-    array('at_modification',"Modification"),
-    array('at_creation',"Creation"),
-    array('at_delete',"Deletion"),
-    array('at_pw',"Password changed."),
-    array('at_category',"Group"),
-    array('at_personnel',"Personnal"),
-    array('at_description',"Description"),
-    array('at_url',"Url"),
-    array('at_login',"Login"),
-    array('at_label',"Label")
+    array('at_modification', "Modification"),
+    array('at_creation', "Creation"),
+    array('at_delete', "Deletion"),
+    array('at_pw', "Password changed."),
+    array('at_category', "Group"),
+    array('at_personnel', "Personnal"),
+    array('at_description', "Description"),
+    array('at_url', "Url"),
+    array('at_login', "Login"),
+    array('at_label', "Label")
 );
 //FRENCH
 $french_vals = array(
-    array('at_modification',"Modification"),
-    array('at_creation',"Création"),
-    array('at_delete',"Suppression"),
-    array('at_pw',"Mot de passe changé."),
-    array('at_category',"Group"),
-    array('at_personnel',"Personnel"),
-    array('at_description',"Description."),
-    array('at_url',"Url"),
-    array('at_login',"Login"),
-    array('at_label',"Label")
+    array('at_modification', "Modification"),
+    array('at_creation', "Création"),
+    array('at_delete', "Suppression"),
+    array('at_pw', "Mot de passe changé."),
+    array('at_category', "Group"),
+    array('at_personnel', "Personnel"),
+    array('at_description', "Description."),
+    array('at_url', "Url"),
+    array('at_login', "Login"),
+    array('at_label', "Label")
 );
 //SPANISH
 $spanish_vals = array(
-    array('at_modification',"Modificacion"),
-    array('at_creation',"Creacion"),
-    array('at_delete',"Borrado"),
-    array('at_pw',"Contraseéa cambiada."),
-    array('at_category',"Grupo"),
-    array('at_personnel',"Personal"),
-    array('at_description',"Descripcion."),
-    array('at_url',"Url"),
-    array('at_login',"Login"),
-    array('at_label',"Etiqueta")
+    array('at_modification', "Modificacion"),
+    array('at_creation', "Creacion"),
+    array('at_delete', "Borrado"),
+    array('at_pw', "Contraseéa cambiada."),
+    array('at_category', "Grupo"),
+    array('at_personnel', "Personal"),
+    array('at_description', "Descripcion."),
+    array('at_url', "Url"),
+    array('at_login', "Login"),
+    array('at_label', "Etiqueta")
 );
 
 changeDB();
@@ -79,9 +79,9 @@ 
                 mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data['action']."'");
                 $found = true;
             } else
-            if ($lang[1] == trim(substr($data['raison'],0,strpos($data['raison'],":"))) && !empty($data['raison'])) {
-                $data1= mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
-                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'],strpos($data['raison'],":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
+            if ($lang[1] == trim(substr($data['raison'], 0, strpos($data['raison'], ":"))) && !empty($data['raison'])) {
+                $data1 = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
+                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'], strpos($data['raison'], ":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
                 $found = true;
             }
         }
@@ -98,9 +98,9 @@ 
                 mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data['action']."'");
                 $found = true;
             } else
-            if ($lang[1] == trim(substr($data['raison'],0,strpos($data['raison'],":"))) && !empty($data['raison'])) {
-                $data1= mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
-                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'],strpos($data['raison'],":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
+            if ($lang[1] == trim(substr($data['raison'], 0, strpos($data['raison'], ":"))) && !empty($data['raison'])) {
+                $data1 = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
+                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'], strpos($data['raison'], ":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
                 $found = true;
             }
         }
@@ -117,9 +117,9 @@ 
                 mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data['action']."'");
                 $found = true;
             } else
-            if ($lang[1] == trim(substr($data['raison'],0,strpos($data['raison'],":"))) && !empty($data['raison'])) {
-                $data1= mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
-                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'],strpos($data['raison'],":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
+            if ($lang[1] == trim(substr($data['raison'], 0, strpos($data['raison'], ":"))) && !empty($data['raison'])) {
+                $data1 = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
+                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'], strpos($data['raison'], ":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
                 $found = true;
             }
         }

install/upgrade_run_db_original.php

Spacing +91 added lines, -91 removed lines

@@ -40,7 +40,7 @@ 
 function getSettingValue($val)
 {
     $val = trim(strstr($val, "="));
-    return trim(str_replace('"', '', substr($val, 1, strpos($val, ";")-1)));
+    return trim(str_replace('"', '', substr($val, 1, strpos($val, ";") - 1)));
 }
 
 ################
@@ -51,7 +51,7 @@ 
     global $dbTmp;
     $exists = false;
     $columns = mysqli_query($dbTmp, "show columns from $db");
-    while ($c = mysqli_fetch_assoc( $columns)) {
+    while ($c = mysqli_fetch_assoc($columns)) {
         if ($c['Field'] == $column) {
             $exists = true;
             return true;
@@ -64,7 +64,7 @@ 
     }
 }
 
-function addIndexIfNotExist($table, $index, $sql ) {
+function addIndexIfNotExist($table, $index, $sql) {
     global $dbTmp;
 
     $mysqli_result = mysqli_query($dbTmp, "SHOW INDEX FROM $table WHERE key_name LIKE \"$index\"");
@@ -72,7 +72,7 @@ 
 
     // if index does not exist, then add it
     if (!$res) {
-        $res = mysqli_query($dbTmp, "ALTER TABLE `$table` " . $sql);
+        $res = mysqli_query($dbTmp, "ALTER TABLE `$table` ".$sql);
     }
 
     return $res;
@@ -128,7 +128,7 @@ 
 // if yes, then don't execute re-encryption
 $_SESSION['tp_defuse_installed'] = false;
 $columns = mysqli_query($dbTmp, "show columns from ".$_SESSION['pre']."items");
-while ($c = mysqli_fetch_assoc( $columns)) {
+while ($c = mysqli_fetch_assoc($columns)) {
     if ($c['Field'] === "encryption_type") {
         $_SESSION['tp_defuse_installed'] = true;
     }
@@ -137,49 +137,49 @@ 
 
 ## Populate table MISC
 $val = array(
-    array('admin', 'max_latest_items', '10',0),
-    array('admin', 'enable_favourites', '1',0),
-    array('admin', 'show_last_items', '1',0),
-    array('admin', 'enable_pf_feature', '0',0),
-    array('admin', 'menu_type', 'context',0),
-    array('admin', 'log_connections', '0',0),
-    array('admin', 'time_format', 'H:i:s',0),
-    array('admin', 'date_format', 'd/m/Y',0),
-    array('admin', 'duplicate_folder', '0',0),
-    array('admin', 'duplicate_item', '0',0),
-    array('admin', 'item_duplicate_in_same_folder', '0',0),
-    array('admin', 'number_of_used_pw', '3',0),
-    array('admin', 'manager_edit', '1',0),
-    array('admin', 'cpassman_dir', '',0),
-    array('admin', 'cpassman_url', '',0),
-    array('admin', 'favicon', '',0),
-    array('admin', 'activate_expiration', '0',0),
-    array('admin', 'pw_life_duration','30',0),
+    array('admin', 'max_latest_items', '10', 0),
+    array('admin', 'enable_favourites', '1', 0),
+    array('admin', 'show_last_items', '1', 0),
+    array('admin', 'enable_pf_feature', '0', 0),
+    array('admin', 'menu_type', 'context', 0),
+    array('admin', 'log_connections', '0', 0),
+    array('admin', 'time_format', 'H:i:s', 0),
+    array('admin', 'date_format', 'd/m/Y', 0),
+    array('admin', 'duplicate_folder', '0', 0),
+    array('admin', 'duplicate_item', '0', 0),
+    array('admin', 'item_duplicate_in_same_folder', '0', 0),
+    array('admin', 'number_of_used_pw', '3', 0),
+    array('admin', 'manager_edit', '1', 0),
+    array('admin', 'cpassman_dir', '', 0),
+    array('admin', 'cpassman_url', '', 0),
+    array('admin', 'favicon', '', 0),
+    array('admin', 'activate_expiration', '0', 0),
+    array('admin', 'pw_life_duration', '30', 0),
     //array('admin', 'maintenance_mode','1',1),
-    array('admin', 'cpassman_version',$k['version'],1),
-    array('admin', 'ldap_mode','0',0),
-    array('admin','ldap_type','0',0),
-    array('admin','ldap_suffix','0',0),
-    array('admin','ldap_domain_dn','0',0),
-    array('admin','ldap_domain_controler','0',0),
-    array('admin','ldap_user_attribute','0',0),
-    array('admin','ldap_ssl','0',0),
-    array('admin','ldap_tls','0',0),
-    array('admin','ldap_elusers','0',0),
-    array('admin', 'richtext',0,0),
-    array('admin', 'allow_print',0,0),
-    array('admin', 'roles_allowed_to_print',0,0),
-    array('admin', 'show_description',1,0),
-    array('admin', 'anyone_can_modify',0,0),
-    array('admin', 'anyone_can_modify_bydefault',0,0),
-    array('admin', 'nb_bad_authentication',0,0),
-    array('admin', 'restricted_to',0,0),
-    array('admin', 'restricted_to_roles',0,0),
-    array('admin', 'utf8_enabled',1,0),
-    array('admin', 'custom_logo','',0),
-    array('admin', 'custom_login_text','',0),
-    array('admin', 'log_accessed', '1',1),
-    array('admin', 'default_language', 'english',0),
+    array('admin', 'cpassman_version', $k['version'], 1),
+    array('admin', 'ldap_mode', '0', 0),
+    array('admin', 'ldap_type', '0', 0),
+    array('admin', 'ldap_suffix', '0', 0),
+    array('admin', 'ldap_domain_dn', '0', 0),
+    array('admin', 'ldap_domain_controler', '0', 0),
+    array('admin', 'ldap_user_attribute', '0', 0),
+    array('admin', 'ldap_ssl', '0', 0),
+    array('admin', 'ldap_tls', '0', 0),
+    array('admin', 'ldap_elusers', '0', 0),
+    array('admin', 'richtext', 0, 0),
+    array('admin', 'allow_print', 0, 0),
+    array('admin', 'roles_allowed_to_print', 0, 0),
+    array('admin', 'show_description', 1, 0),
+    array('admin', 'anyone_can_modify', 0, 0),
+    array('admin', 'anyone_can_modify_bydefault', 0, 0),
+    array('admin', 'nb_bad_authentication', 0, 0),
+    array('admin', 'restricted_to', 0, 0),
+    array('admin', 'restricted_to_roles', 0, 0),
+    array('admin', 'utf8_enabled', 1, 0),
+    array('admin', 'custom_logo', '', 0),
+    array('admin', 'custom_login_text', '', 0),
+    array('admin', 'log_accessed', '1', 1),
+    array('admin', 'default_language', 'english', 0),
     array(
         'admin',
         'send_stats',
@@ -195,16 +195,16 @@ 
         'admin',
         'path_to_upload_folder',
         strrpos($_SERVER['DOCUMENT_ROOT'], "/") == 1 ?
-            (strlen($_SERVER['DOCUMENT_ROOT'])-1).substr(
+            (strlen($_SERVER['DOCUMENT_ROOT']) - 1).substr(
                 $_SERVER['PHP_SELF'],
                 0,
-                strlen($_SERVER['PHP_SELF'])-25
+                strlen($_SERVER['PHP_SELF']) - 25
             ).'/upload'
         :
         $_SERVER['DOCUMENT_ROOT'].substr(
             $_SERVER['PHP_SELF'],
             0,
-            strlen($_SERVER['PHP_SELF'])-25
+            strlen($_SERVER['PHP_SELF']) - 25
         ).'/upload',
         0
     ),
@@ -214,7 +214,7 @@ 
         'http://'.$_SERVER['HTTP_HOST'].substr(
             $_SERVER['PHP_SELF'],
             0,
-            strrpos($_SERVER['PHP_SELF'], '/')-8
+            strrpos($_SERVER['PHP_SELF'], '/') - 8
         ).'/upload',
         0
     ),
@@ -224,16 +224,16 @@ 
         'admin',
         'path_to_files_folder',
         strrpos($_SERVER['DOCUMENT_ROOT'], "/") == 1 ?
-        (strlen($_SERVER['DOCUMENT_ROOT'])-1).substr(
+        (strlen($_SERVER['DOCUMENT_ROOT']) - 1).substr(
             $_SERVER['PHP_SELF'],
             0,
-            strlen($_SERVER['PHP_SELF'])-25
+            strlen($_SERVER['PHP_SELF']) - 25
         ).'/files'
         :
         $_SERVER['DOCUMENT_ROOT'].substr(
             $_SERVER['PHP_SELF'],
             0,
-            strlen($_SERVER['PHP_SELF'])-25
+            strlen($_SERVER['PHP_SELF']) - 25
         ).'/files',
         0
     ),
@@ -243,12 +243,12 @@ 
         'http://'.$_SERVER['HTTP_HOST'].substr(
             $_SERVER['PHP_SELF'],
             0,
-            strrpos($_SERVER['PHP_SELF'], '/')-8
+            strrpos($_SERVER['PHP_SELF'], '/') - 8
         ).'/files',
         0
     ),
-    array('admin', 'pwd_maximum_length','40',0),
-    array('admin', 'ga_website_name','TeamPass for ChangeMe',0),
+    array('admin', 'pwd_maximum_length', '40', 0),
+    array('admin', 'ga_website_name', 'TeamPass for ChangeMe', 0),
     array('admin', 'email_smtp_server', @$_SESSION['smtp_server'], 0),
     array('admin', 'email_smtp_auth', @$_SESSION['smtp_auth'], 0),
     array('admin', 'email_auth_username', @$_SESSION['smtp_auth_username'], 0),
@@ -259,43 +259,43 @@ 
     array('admin', 'email_from_name', @$_SESSION['email_from_name'], 0),
     array('admin', 'google_authentication', 0, 0),
     array('admin', 'delay_item_edition', 0, 0),
-    array('admin', 'allow_import',0,0),
-    array('admin', 'proxy_port',0,0),
-    array('admin', 'proxy_port',0,0),
-    array('admin','upload_maxfilesize','10mb',0),
+    array('admin', 'allow_import', 0, 0),
+    array('admin', 'proxy_port', 0, 0),
+    array('admin', 'proxy_port', 0, 0),
+    array('admin', 'upload_maxfilesize', '10mb', 0),
     array(
         'admin',
         'upload_docext',
         'doc,docx,dotx,xls,xlsx,xltx,rtf,csv,txt,pdf,ppt,pptx,pot,dotx,xltx',
         0
     ),
-    array('admin','upload_imagesext','jpg,jpeg,gif,png',0),
-    array('admin','upload_pkgext','7z,rar,tar,zip',0),
-    array('admin','upload_otherext','sql,xml',0),
-    array('admin','upload_imageresize_options','1',0),
-    array('admin','upload_imageresize_width','800',0),
-    array('admin','upload_imageresize_height','600',0),
-    array('admin','upload_imageresize_quality','90',0),
-    array('admin','enable_send_email_on_user_login','0', 0),
-    array('admin','enable_user_can_create_folders','0', 0),
-    array('admin','insert_manual_entry_item_history','0', 0),
-    array('admin','enable_kb','0', 0),
-    array('admin','enable_email_notification_on_item_shown','0', 0),
-    array('admin','enable_email_notification_on_user_pw_change','0', 0),
-    array('admin','enable_sts','0', 0),
-    array('admin','encryptClientServer','1', 0),
-    array('admin','use_md5_password_as_salt','0', 0),
-    array('admin','api','0', 0),
+    array('admin', 'upload_imagesext', 'jpg,jpeg,gif,png', 0),
+    array('admin', 'upload_pkgext', '7z,rar,tar,zip', 0),
+    array('admin', 'upload_otherext', 'sql,xml', 0),
+    array('admin', 'upload_imageresize_options', '1', 0),
+    array('admin', 'upload_imageresize_width', '800', 0),
+    array('admin', 'upload_imageresize_height', '600', 0),
+    array('admin', 'upload_imageresize_quality', '90', 0),
+    array('admin', 'enable_send_email_on_user_login', '0', 0),
+    array('admin', 'enable_user_can_create_folders', '0', 0),
+    array('admin', 'insert_manual_entry_item_history', '0', 0),
+    array('admin', 'enable_kb', '0', 0),
+    array('admin', 'enable_email_notification_on_item_shown', '0', 0),
+    array('admin', 'enable_email_notification_on_user_pw_change', '0', 0),
+    array('admin', 'enable_sts', '0', 0),
+    array('admin', 'encryptClientServer', '1', 0),
+    array('admin', 'use_md5_password_as_salt', '0', 0),
+    array('admin', 'api', '0', 0),
     array('admin', 'subfolder_rights_as_parent', '0', 0),
     array('admin', 'show_only_accessible_folders', '0', 0),
     array('admin', 'enable_suggestion', '0', 0),
     array('admin', 'email_server_url', '', 0),
-    array('admin','otv_expiration_period','7', 0),
-    array('admin','default_session_expiration_time','60', 0),
-    array('admin','duo','0', 0),
-    array('admin','enable_server_password_change','0', 0),
-    array('admin','bck_script_path', $_SESSION['abspath']."/backups", 0),
-    array('admin','bck_script_filename', 'bck_cpassman', 0)
+    array('admin', 'otv_expiration_period', '7', 0),
+    array('admin', 'default_session_expiration_time', '60', 0),
+    array('admin', 'duo', '0', 0),
+    array('admin', 'enable_server_password_change', '0', 0),
+    array('admin', 'bck_script_path', $_SESSION['abspath']."/backups", 0),
+    array('admin', 'bck_script_filename', 'bck_cpassman', 0)
 );
 $res1 = "na";
 foreach ($val as $elem) {
@@ -605,7 +605,7 @@ 
 );
 
 // Clean timestamp for users table
-mysqli_query($dbTmp,"UPDATE ".$_SESSION['pre']."users SET timestamp = ''");
+mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."users SET timestamp = ''");
 
 ## Alter nested_tree table
 $res2 = addColumnIfNotExist(
@@ -699,7 +699,7 @@ 
 );
 
 ## TABLE CACHE
-mysqli_query($dbTmp,"DROP TABLE IF EXISTS `".$_SESSION['pre']."cache`");
+mysqli_query($dbTmp, "DROP TABLE IF EXISTS `".$_SESSION['pre']."cache`");
 $res8 = mysqli_query($dbTmp,
     "CREATE TABLE IF NOT EXISTS `".$_SESSION['pre']."cache` (
     `id` int(12) NOT NULL,
@@ -722,7 +722,7 @@ 
             INNER JOIN ".$_SESSION['pre']."log_items as l ON (l.id_item = i.id)
             AND l.action = 'at_creation'
             WHERE i.inactif=0";
-    $rows = mysqli_query($dbTmp,$sql);
+    $rows = mysqli_query($dbTmp, $sql);
     while ($reccord = mysqli_fetch_array($rows)) {
         //Get all TAGS
         $tags = "";
@@ -734,7 +734,7 @@ 
         if (!empty($itemTags)) {
             foreach ($itemTags as $itemTag) {
                 if (!empty($itemTag['tag'])) {
-                    $tags .= $itemTag['tag']. " ";
+                    $tags .= $itemTag['tag']." ";
                 }
             }
         }
@@ -868,7 +868,7 @@ 
     );
 
     //Drop old table
-    mysqli_query($dbTmp,"DROP TABLE ".$_SESSION['pre']."functions");
+    mysqli_query($dbTmp, "DROP TABLE ".$_SESSION['pre']."functions");
 } elseif ($tableFunctionExists == false) {
     echo '[{"finish":"1", "msg":"", "error":"An error appears on table ROLES! '.addslashes(mysqli_error($dbTmp)).'"}]';
     mysqli_close($dbTmp);
@@ -962,9 +962,9 @@ 
     exit();
 }
 $resTmp = mysqli_fetch_row(
-    mysqli_query($dbTmp,"SELECT COUNT(*) FROM ".$_SESSION['pre']."languages")
+    mysqli_query($dbTmp, "SELECT COUNT(*) FROM ".$_SESSION['pre']."languages")
 );
-mysqli_query($dbTmp,"TRUNCATE TABLE ".$_SESSION['pre']."languages");
+mysqli_query($dbTmp, "TRUNCATE TABLE ".$_SESSION['pre']."languages");
 mysqli_query($dbTmp,
     "INSERT IGNORE INTO `".$_SESSION['pre']."languages`
     (`id`, `name`, `label`, `code`, `flag`) VALUES

Braces +6 added lines, -3 removed lines

@@ -89,9 +89,12 @@
         AND table_name = '$tablename'"
     );
 
-    if ($res > 0) return true;
-    else return false;
-}
+    if ($res > 0) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 //define pbkdf2 iteration count
 @define('ITCOUNT', '2072');

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
 ################
 ## Function permits to get the value from a line
 ################
+/**
+ * @param string $val
+ */
 function getSettingValue($val)
 {
     $val = trim(strstr($val, "="));

install/upgrade_run_2.1.26.php

Spacing +12 added lines, -12 removed lines

@@ -54,7 +54,7 @@ 
 function getSettingValue($val)
 {
     $val = trim(strstr($val, "="));
-    return trim(str_replace('"', '', substr($val, 1, strpos($val, ";")-1)));
+    return trim(str_replace('"', '', substr($val, 1, strpos($val, ";") - 1)));
 }
 
 ################
@@ -65,7 +65,7 @@ 
     global $dbTmp;
     $exists = false;
     $columns = mysqli_query($dbTmp, "show columns from $db");
-    while ($c = mysqli_fetch_assoc( $columns)) {
+    while ($c = mysqli_fetch_assoc($columns)) {
         if ($c['Field'] == $column) {
             $exists = true;
             return true;
@@ -78,7 +78,7 @@ 
     }
 }
 
-function addIndexIfNotExist($table, $index, $sql ) {
+function addIndexIfNotExist($table, $index, $sql) {
     global $dbTmp;
 
     $mysqli_result = mysqli_query($dbTmp, "SHOW INDEX FROM $table WHERE key_name LIKE \"$index\"");
@@ -86,7 +86,7 @@ 
 
     // if index does not exist, then add it
     if (!$res) {
-        $res = mysqli_query($dbTmp, "ALTER TABLE `$table` " . $sql);
+        $res = mysqli_query($dbTmp, "ALTER TABLE `$table` ".$sql);
     }
 
     return $res;
@@ -249,7 +249,7 @@ 
 
 // change to 0 if auto_update_pwd_next_date empty in ITEMS table
 $result = mysqli_query($dbTmp, "SELECT id FROM `".$_SESSION['pre']."items` WHERE auto_update_pwd_next_date = ''");
-while($row = mysqli_fetch_assoc($result)) {
+while ($row = mysqli_fetch_assoc($result)) {
     mysqli_query($dbTmp,
         "UPDATE `".$_SESSION['pre']."items`
         SET `auto_update_pwd_next_date` = '0'
@@ -283,8 +283,8 @@ 
             // "The file $csrfp_file already exist. A copy has been created.<br />";
         }
     }
-    unlink($csrfp_file);    // delete existing csrfp.config file
-    copy($csrfp_file_sample, $csrfp_file);  // make a copy of csrfp.config.sample file
+    unlink($csrfp_file); // delete existing csrfp.config file
+    copy($csrfp_file_sample, $csrfp_file); // make a copy of csrfp.config.sample file
     $data = file_get_contents("../includes/libraries/csrfp/libs/csrfp.config.php");
     $newdata = str_replace('"CSRFP_TOKEN" => ""', '"CSRFP_TOKEN" => "'.bin2hex(openssl_random_pseudo_bytes(25)).'"', $data);
     $newdata = str_replace('"tokenLength" => "25"', '"tokenLength" => "50"', $newdata);
@@ -313,7 +313,7 @@ 
     \$SETTINGS = array (";
 
     $result = mysqli_query($dbTmp, "SELECT * FROM `".$_SESSION['pre']."misc` WHERE type = 'admin'");
-    while($row = mysqli_fetch_assoc($result)) {
+    while ($row = mysqli_fetch_assoc($result)) {
         // append new setting in config file
         $config_text .= "
         '".$row['intitule']."' => '".$row['valeur']."',";
@@ -333,7 +333,7 @@ 
 
 // clean duplicate ldap_object_class from bad update script version
 $tmp = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT COUNT(*) FROM `".$_SESSION['pre']."misc` WHERE type = 'admin' AND intitule = 'ldap_object_class'"));
-if ($tmp[0] > 1 ) {
+if ($tmp[0] > 1) {
     mysqli_query($dbTmp, "DELETE FROM `".$_SESSION['pre']."misc` WHERE type = 'admin' AND intitule = 'ldap_object_class' AND `valeur` = 0");
 }
 // add new setting - ldap_object_class
@@ -346,10 +346,10 @@ 
 $tmp_googlecount = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT COUNT(*) FROM `".$_SESSION['pre']."misc` WHERE type = 'admin' AND intitule = 'google_authentication'"));
 $tmp_twocount = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT COUNT(*) FROM `".$_SESSION['pre']."misc` WHERE type = 'admin' AND intitule = '2factors_authentication'"));
 
-if ($tmp_googlecount[0] > 0 ) {
+if ($tmp_googlecount[0] > 0) {
     mysqli_query($dbTmp, "DELETE FROM `".$_SESSION['pre']."misc` WHERE type = 'admin' AND intitule = '2factors_authentication'");
 } else {
-    if ($tmp_twocount[0] > 0 ) {
+    if ($tmp_twocount[0] > 0) {
         mysqli_query($dbTmp, "UPDATE `".$_SESSION['pre']."misc` SET intitule = 'google_authentication' WHERE intitule = '2factors_authentication' ");
     } else {
         mysqli_query($dbTmp, "INSERT INTO `".$_SESSION['pre']."misc` VALUES ('admin', 'google_authentication', '0')");
@@ -365,7 +365,7 @@ 
     FROM `".$_SESSION['pre']."nested_tree`
     WHERE personal_folder = '1' AND nlevel = '1' AND parent_id = '0'"
 );
-while($row = mysqli_fetch_assoc($result)) {
+while ($row = mysqli_fetch_assoc($result)) {
     // only change non numeric folder title
     if (!is_numeric($row['title'])) {
         mysqli_query(

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
 ################
 ## Function permits to get the value from a line
 ################
+/**
+ * @param string $val
+ */
 function getSettingValue($val)
 {
     $val = trim(strstr($val, "="));

Braces +6 added lines, -3 removed lines

@@ -89,9 +89,12 @@
         AND table_name = '$tablename'"
     );
 
-    if ($res > 0) return true;
-    else return false;
-}
+    if ($res > 0) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 //define pbkdf2 iteration count
 @define('ITCOUNT', '2072');

install/upgrade_run_final.php

Braces +6 added lines, -2 removed lines

@@ -101,8 +101,12 @@
         }
 
         // temp data
-        if (!isset($record['login'])) $record['login'] = "";
-        if (!isset($resNT['renewal_period'])) $resNT['renewal_period'] = "0";
+        if (!isset($record['login'])) {
+            $record['login'] = "";
+        }
+        if (!isset($resNT['renewal_period'])) {
+            $resNT['renewal_period'] = "0";
+        }
 
         // store data
         $res = mysqli_query($dbTmp,

install/upgrade_run_2.1.27.php

Spacing +12 added lines, -12 removed lines

@@ -34,7 +34,7 @@ 
 function getSettingValue($val)
 {
     $val = trim(strstr($val, "="));
-    return trim(str_replace('"', '', substr($val, 1, strpos($val, ";")-1)));
+    return trim(str_replace('"', '', substr($val, 1, strpos($val, ";") - 1)));
 }
 
 ################
@@ -45,7 +45,7 @@ 
     global $dbTmp;
     $exists = false;
     $columns = mysqli_query($dbTmp, "show columns from $db");
-    while ($c = mysqli_fetch_assoc( $columns)) {
+    while ($c = mysqli_fetch_assoc($columns)) {
         if ($c['Field'] == $column) {
             $exists = true;
             return true;
@@ -58,7 +58,7 @@ 
     }
 }
 
-function addIndexIfNotExist($table, $index, $sql ) {
+function addIndexIfNotExist($table, $index, $sql) {
     global $dbTmp;
 
     $mysqli_result = mysqli_query($dbTmp, "SHOW INDEX FROM $table WHERE key_name LIKE \"$index\"");
@@ -66,7 +66,7 @@ 
 
     // if index does not exist, then add it
     if (!$res) {
-        $res = mysqli_query($dbTmp, "ALTER TABLE `$table` " . $sql);
+        $res = mysqli_query($dbTmp, "ALTER TABLE `$table` ".$sql);
     }
 
     return $res;
@@ -152,7 +152,7 @@ 
 // if yes, then don't execute re-encryption
 $_SESSION['tp_defuse_installed'] = false;
 $columns = mysqli_query($dbTmp, "show columns from ".$_SESSION['pre']."items");
-while ($c = mysqli_fetch_assoc( $columns)) {
+while ($c = mysqli_fetch_assoc($columns)) {
     if ($c['Field'] === "encryption_type") {
         $_SESSION['tp_defuse_installed'] = true;
     }
@@ -211,9 +211,9 @@ 
 // do clean of users table
 $fieldsToUpdate = ['groupes_visibles', 'fonction_id', 'groupes_interdits'];
 $result = mysqli_query($dbTmp, "SELECT id, groupes_visibles, fonction_id, groupes_interdits FROM `".$_SESSION['pre']."users`");
-while($row = mysqli_fetch_assoc($result)) {
+while ($row = mysqli_fetch_assoc($result)) {
     // check if field contains , instead of ;
-    foreach($fieldsToUpdate as $field) {
+    foreach ($fieldsToUpdate as $field) {
         $tmp = cleanFields($row[$field]);
         if ($tmp !== $row[$field]) {
             mysqli_query($dbTmp,
@@ -334,9 +334,9 @@ 
 if (!isset($_SESSION['tp_defuse_installed']) || $_SESSION['tp_defuse_installed'] === false) {
     $filename = "../includes/config/settings.php";
     $settingsFile = file($filename);
-    while (list($key,$val) = each($settingsFile)) {
-        if (substr_count($val, 'require_once "')>0 && substr_count($val, 'sk.php')>0) {
-            $_SESSION['sk_file'] = substr($val, 14, strpos($val, '";')-14);
+    while (list($key, $val) = each($settingsFile)) {
+        if (substr_count($val, 'require_once "') > 0 && substr_count($val, 'sk.php') > 0) {
+            $_SESSION['sk_file'] = substr($val, 14, strpos($val, '";') - 14);
         }
     }
 
@@ -380,7 +380,7 @@ 
             $dbTmp,
             "SELECT id FROM `".$_SESSION['pre']."users`"
         );
-        while($row_user = mysqli_fetch_assoc($result)) {
+        while ($row_user = mysqli_fetch_assoc($result)) {
             $result_items = mysqli_query(
                 $dbTmp,
                 "SELECT i.id AS item_id
@@ -454,7 +454,7 @@ 
 $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `".$_SESSION['pre']."misc` WHERE type = 'admin' AND intitule = 'send_stats_time'"));
 if ($tmp === "0") {
     mysqli_query($dbTmp,
-        "INSERT INTO `".$_SESSION['pre']."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'send_stats_time', '".(time()-2592000)."')"
+        "INSERT INTO `".$_SESSION['pre']."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'send_stats_time', '".(time() - 2592000)."')"
     );
 }
 

Braces +18 added lines, -7 removed lines

@@ -83,16 +83,27 @@
         AND table_name = '$tablename'"
     );
 
-    if ($res > 0) return true;
-    else return false;
-}
+    if ($res > 0) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 function cleanFields($txt) {
     $tmp = str_replace(",", ";", trim($txt));
-    if (empty($tmp)) return $tmp;
-    if ($tmp === ";") return "";
-    if (strpos($tmp, ';') === 0) $tmp = substr($tmp, 1);
-    if (substr($tmp, -1) !== ";") $tmp = $tmp.";";
+    if (empty($tmp)) {
+        return $tmp;
+    }
+    if ($tmp === ";") {
+        return "";
+    }
+    if (strpos($tmp, ';') === 0) {
+        $tmp = substr($tmp, 1);
+    }
+    if (substr($tmp, -1) !== ";") {
+        $tmp = $tmp.";";
+    }
     return $tmp;
 }
 

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
 ################
 ## Function permits to get the value from a line
 ################
+/**
+ * @param string $val
+ */
 function getSettingValue($val)
 {
     $val = trim(strstr($val, "="));

install/install.php

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
     <body>
 <?php
 // define root path
-$abs_path = rtrim($_SERVER['DOCUMENT_ROOT'], '/') . substr($_SERVER['PHP_SELF'], 0, strlen($_SERVER['PHP_SELF']) - 20);
-if( isset($_SERVER['HTTPS'] ) ) {
+$abs_path = rtrim($_SERVER['DOCUMENT_ROOT'], '/').substr($_SERVER['PHP_SELF'], 0, strlen($_SERVER['PHP_SELF']) - 20);
+if (isset($_SERVER['HTTPS'])) {
     $protocol = 'https://';
 } else {
     $protocol = 'http://';

install/upgrade_run_encryption_pwd.php

Spacing +7 added lines, -7 removed lines

@@ -43,7 +43,7 @@ 
 
 $dbgDuo = fopen("upgrade.log", "a");
 $finish = false;
-$next = ($_POST['nb']+$_POST['start']);
+$next = ($_POST['nb'] + $_POST['start']);
 
 
 $dbTmp = mysqli_connect(
@@ -93,7 +93,7 @@ 
             $pw = decrypt($data['pw']);
             if (empty($pw)) {
                 // used protocol is #1
-                $pw = decryptOld($data['pw']);  // decrypt using protocol #1
+                $pw = decryptOld($data['pw']); // decrypt using protocol #1
             }
 
             // get key for this pw
@@ -131,7 +131,7 @@ 
     }
 
     // does tables KEYS exists
-    if(mysqli_num_rows(mysqli_query("SHOW TABLES LIKE '".$_SESSION['pre']."keys'")) == 1) {
+    if (mysqli_num_rows(mysqli_query("SHOW TABLES LIKE '".$_SESSION['pre']."keys'")) == 1) {
         $table_keys_exists = 1;
     } else {
         $table_keys_exists = 0;
@@ -162,7 +162,7 @@ 
                     fputs($dbgDuo, "\n/ step1 : ".$pw);
                     if (empty($pw)) {
                         // used protocol is #1
-                        $pw = decryptOld(trim($reason[1]));  // decrypt using protocol #1
+                        $pw = decryptOld(trim($reason[1])); // decrypt using protocol #1
                         fputs($dbgDuo, " / step2 : ".$pw);
                     }
 
@@ -185,7 +185,7 @@ 
 
                     // store new encryption
                     if (isUTF8($pw) && !empty($pw)) {
-                        $encrypt = cryption_phpCrypt($pw , SALT, "", "encrypt");
+                        $encrypt = cryption_phpCrypt($pw, SALT, "", "encrypt");
                         fputs($dbgDuo, " / Final : ".$encrypt['string']);
                         mysqli_query($dbTmp,
                             "UPDATE ".$_SESSION['pre']."log_items
@@ -217,8 +217,8 @@ 
 
         while ($record = mysqli_fetch_array($resData)) {
             $tmpData = substr(decrypt($record['data']), strlen($record['rndKey']));
-            if (isUTF8($tmpData ) && !empty($tmpData )) {
-                $encrypt = cryption_phpCrypt($tmpData , SALT, "", "encrypt");
+            if (isUTF8($tmpData) && !empty($tmpData)) {
+                $encrypt = cryption_phpCrypt($tmpData, SALT, "", "encrypt");
 
                 // store Password
                 $resData_tmp2 = mysqli_query($dbTmp,

install/libs/aesctr.php

Indentation +17 added lines, -17 removed lines

@@ -214,16 +214,16 @@ 
 {
 
     /**
-    * Encrypt a text using AES encryption in Counter mode of operation
-    *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
-    *
-    * Unicode multi-byte character safe
-    *
-    * @param plaintext source text to be encrypted
-    * @param password  the password to use to generate a key
-    * @param nBits     number of bits to be used in the key (128, 192, or 256)
-    * @return          encrypted text
-    */
+     * Encrypt a text using AES encryption in Counter mode of operation
+     *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
+     *
+     * Unicode multi-byte character safe
+     *
+     * @param plaintext source text to be encrypted
+     * @param password  the password to use to generate a key
+     * @param nBits     number of bits to be used in the key (128, 192, or 256)
+     * @return          encrypted text
+     */
     public static function encrypt($plaintext, $password, $nBits)
     {
         $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
@@ -298,13 +298,13 @@ 
     }
 
     /**
-    * Decrypt a text encrypted by AES in counter mode of operation
-    *
-    * @param ciphertext source text to be decrypted
-    * @param password   the password to use to generate a key
-    * @param nBits      number of bits to be used in the key (128, 192, or 256)
-    * @return           decrypted text
-    */
+     * Decrypt a text encrypted by AES in counter mode of operation
+     *
+     * @param ciphertext source text to be decrypted
+     * @param password   the password to use to generate a key
+     * @param nBits      number of bits to be used in the key (128, 192, or 256)
+     * @return           decrypted text
+     */
     public static function decrypt($ciphertext, $password, $nBits)
     {
         $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES

Spacing +107 added lines, -107 removed lines

@@ -20,17 +20,17 @@ 
     public static function cipher($input, $w)
     {
         // main cipher function [é5.1]
-        $Nb = 4;                 // block size (in words): no of columns in state (fixed at 4 for AES)
-        $Nr = count($w)/$Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
+        $Nb = 4; // block size (in words): no of columns in state (fixed at 4 for AES)
+        $Nr = count($w) / $Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
-        $state = array();  // initialise 4xNb byte-array 'state' with input [é3.4]
-        for ($i=0; $i<4*$Nb; $i++) {
-            $state[$i%4][floor($i/4)] = $input[$i];
+        $state = array(); // initialise 4xNb byte-array 'state' with input [é3.4]
+        for ($i = 0; $i < 4 * $Nb; $i++) {
+            $state[$i % 4][floor($i / 4)] = $input[$i];
         }
 
         $state = self::addRoundKey($state, $w, 0, $Nb);
 
-        for ($round=1; $round<$Nr; $round++) {  // apply Nr rounds
+        for ($round = 1; $round < $Nr; $round++) {  // apply Nr rounds
             $state = self::subBytes($state, $Nb);
             $state = self::shiftRows($state, $Nb);
             $state = self::mixColumns($state, $Nb);
@@ -41,9 +41,9 @@ 
         $state = self::shiftRows($state, $Nb);
         $state = self::addRoundKey($state, $w, $Nr, $Nb);
 
-        $output = array(4*$Nb);  // convert state to 1-d array before returning [é3.4]
-        for ($i=0; $i<4*$Nb; $i++) {
-            $output[$i] = $state[$i%4][floor($i/4)];
+        $output = array(4 * $Nb); // convert state to 1-d array before returning [é3.4]
+        for ($i = 0; $i < 4 * $Nb; $i++) {
+            $output[$i] = $state[$i % 4][floor($i / 4)];
         }
 
         return $output;
@@ -52,9 +52,9 @@ 
     private static function addRoundKey($state, $w, $rnd, $Nb)
     {
         // xor Round Key into state S [é5.1.4]
-        for ($r=0; $r<4; $r++) {
-            for ($c=0; $c<$Nb; $c++) {
-                $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+        for ($r = 0; $r < 4; $r++) {
+            for ($c = 0; $c < $Nb; $c++) {
+                $state[$r][$c] ^= $w[$rnd * 4 + $c][$r];
             }
         }
 
@@ -64,8 +64,8 @@ 
     private static function subBytes($s, $Nb)
     {
         // apply SBox to state S [é5.1.1]
-        for ($r=0; $r<4; $r++) {
-            for ($c=0; $c<$Nb; $c++) {
+        for ($r = 0; $r < 4; $r++) {
+            for ($c = 0; $c < $Nb; $c++) {
                 $s[$r][$c] = self::$sBox[$s[$r][$c]];
             }
         }
@@ -77,26 +77,26 @@ 
     {
         // shift row r of state S left by r bytes [é5.1.2]
         $t = array(4);
-        for ($r=1; $r<4; $r++) {
-            for ($c=0; $c<4; $c++) {
-                $t[$c] = $s[$r][($c+$r)%$Nb];  // shift into temp copy
+        for ($r = 1; $r < 4; $r++) {
+            for ($c = 0; $c < 4; $c++) {
+                $t[$c] = $s[$r][($c + $r) % $Nb]; // shift into temp copy
             }
-            for ($c=0; $c<4; $c++) {
-                $s[$r][$c] = $t[$c];           // and copy back
+            for ($c = 0; $c < 4; $c++) {
+                $s[$r][$c] = $t[$c]; // and copy back
             }
         }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
-        return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
+        return $s; // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
     }
 
     private static function mixColumns($s, $Nb)
     {
         // combine bytes of each col of state S [é5.1.3]
-        for ($c=0; $c<4; $c++) {
-            $a = array(4);  // 'a' is a copy of the current column from 's'
-            $b = array(4);  // 'b' is aé{02} in GF(2^8)
-            for ($i=0; $i<4; $i++) {
+        for ($c = 0; $c < 4; $c++) {
+            $a = array(4); // 'a' is a copy of the current column from 's'
+            $b = array(4); // 'b' is aé{02} in GF(2^8)
+            for ($i = 0; $i < 4; $i++) {
                 $a[$i] = $s[$i][$c];
-                $b[$i] = $s[$i][$c]&0x80 ? $s[$i][$c]<<1 ^ 0x011b : $s[$i][$c]<<1;
+                $b[$i] = $s[$i][$c] & 0x80 ? $s[$i][$c] << 1 ^ 0x011b : $s[$i][$c] << 1;
             }
             // a[n] ^ b[n] is aé{03} in GF(2^8)
             $s[0][$c] = $b[0] ^ $a[1] ^ $b[1] ^ $a[2] ^ $a[3]; // 2*a0 + 3*a1 + a2 + a3
@@ -118,33 +118,33 @@ 
     public static function keyExpansion($key)
     {
         // generate Key Schedule from Cipher Key [é5.2]
-        $Nb = 4;              // block size (in words): no of columns in state (fixed at 4 for AES)
-        $Nk = count($key)/4;  // key length (in words): 4/6/8 for 128/192/256-bit keys
-        $Nr = $Nk + 6;        // no of rounds: 10/12/14 for 128/192/256-bit keys
+        $Nb = 4; // block size (in words): no of columns in state (fixed at 4 for AES)
+        $Nk = count($key) / 4; // key length (in words): 4/6/8 for 128/192/256-bit keys
+        $Nr = $Nk + 6; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
         $w = array();
         $temp = array();
 
-        for ($i=0; $i<$Nk; $i++) {
-            $r = array($key[4*$i], $key[4*$i+1], $key[4*$i+2], $key[4*$i+3]);
+        for ($i = 0; $i < $Nk; $i++) {
+            $r = array($key[4 * $i], $key[4 * $i + 1], $key[4 * $i + 2], $key[4 * $i + 3]);
             $w[$i] = $r;
         }
 
-        for ($i=$Nk; $i<($Nb*($Nr+1)); $i++) {
+        for ($i = $Nk; $i < ($Nb * ($Nr + 1)); $i++) {
             $w[$i] = array();
-            for ($t=0; $t<4; $t++) {
-                $temp[$t] = $w[$i-1][$t];
+            for ($t = 0; $t < 4; $t++) {
+                $temp[$t] = $w[$i - 1][$t];
             }
             if ($i % $Nk == 0) {
                 $temp = self::subWord(self::rotWord($temp));
-                for ($t=0; $t<4; $t++) {
-                    $temp[$t] ^= self::$rCon[$i/$Nk][$t];
+                for ($t = 0; $t < 4; $t++) {
+                    $temp[$t] ^= self::$rCon[$i / $Nk][$t];
                 }
-            } elseif ($Nk > 6 && $i%$Nk == 4) {
+            } elseif ($Nk > 6 && $i % $Nk == 4) {
                 $temp = self::subWord($temp);
             }
-            for ($t=0; $t<4; $t++) {
-                $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+            for ($t = 0; $t < 4; $t++) {
+                $w[$i][$t] = $w[$i - $Nk][$t] ^ $temp[$t];
             }
         }
 
@@ -154,7 +154,7 @@ 
     private static function subWord($w)
     {
         // apply SBox to 4-byte word w
-        for ($i=0; $i<4; $i++) {
+        for ($i = 0; $i < 4; $i++) {
             $w[$i] = self::$sBox[$w[$i]];
         }
 
@@ -165,8 +165,8 @@ 
     {
         // rotate 4-byte word w left by one byte
         $tmp = $w[0];
-        for ($i=0; $i<3; $i++) {
-            $w[$i] = $w[$i+1];
+        for ($i = 0; $i < 3; $i++) {
+            $w[$i] = $w[$i + 1];
         }
         $w[3] = $tmp;
 
@@ -175,22 +175,22 @@ 
 
     // sBox is pre-computed multiplicative inverse in GF(2^8) used in subBytes and keyExpansion [é5.1.1]
     private static $sBox = array(
-            0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76,
-            0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0,0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0,
-            0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc,0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15,
-            0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a,0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75,
-            0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0,0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84,
-            0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b,0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf,
-            0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85,0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8,
-            0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5,0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2,
-            0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17,0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73,
-            0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88,0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb,
-            0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c,0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79,
-            0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9,0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08,
-            0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6,0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a,
-            0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e,0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e,
-            0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94,0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf,
-            0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68,0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
+            0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+            0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+            0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+            0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+            0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+            0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+            0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+            0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+            0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+            0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+            0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+            0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+            0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+            0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+            0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+            0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16
     );
 
     // rCon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [é5.2]
@@ -226,72 +226,72 @@ 
     */
     public static function encrypt($plaintext, $password, $nBits)
     {
-        $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-        if (!($nBits==128 || $nBits==192 || $nBits==256)) {
-            return '';  // standard allows 128/192/256 bit keys
+        $blockSize = 16; // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+        if (!($nBits == 128 || $nBits == 192 || $nBits == 256)) {
+            return ''; // standard allows 128/192/256 bit keys
         }
         // note PHP (5) gives us plaintext and password in UTF8 encoding!
 
         // use AES itself to encrypt password to get cipher key (using plain password as source for
         // key expansion) - gives us well encrypted key
-        $nBytes = $nBits/8;  // no bytes in key
+        $nBytes = $nBits / 8; // no bytes in key
         $pwBytes = array();
-        for ($i=0; $i<$nBytes; $i++) {
+        for ($i = 0; $i < $nBytes; $i++) {
             $pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
         }
         $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
-        $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
+        $key = array_merge($key, array_slice($key, 0, $nBytes - 16)); // expand key to 16/24/32 bytes long
 
         // initialise counter block (NIST SP800-38A §B.2): millisecond time-stamp for nonce in
         // 1st 8 bytes, block counter in 2nd 8 bytes
         $counterBlock = array();
-        $nonce = floor(microtime(true)*1000);   // timestamp: milliseconds since 1-Jan-1970
-        $nonceSec = floor($nonce/1000);
-        $nonceMs = $nonce%1000;
+        $nonce = floor(microtime(true) * 1000); // timestamp: milliseconds since 1-Jan-1970
+        $nonceSec = floor($nonce / 1000);
+        $nonceMs = $nonce % 1000;
         // encode nonce with seconds in 1st 4 bytes, and (repeated) ms part filling 2nd 4 bytes
-        for ($i=0; $i<4; $i++) {
-            $counterBlock[$i] = self::urs($nonceSec, $i*8) & 0xff;
+        for ($i = 0; $i < 4; $i++) {
+            $counterBlock[$i] = self::urs($nonceSec, $i * 8) & 0xff;
         }
-        for ($i=0; $i<4; $i++) {
-            $counterBlock[$i+4] = $nonceMs & 0xff;
+        for ($i = 0; $i < 4; $i++) {
+            $counterBlock[$i + 4] = $nonceMs & 0xff;
         }
         // and convert it to a string to go on the front of the ciphertext
         $ctrTxt = '';
-        for ($i=0; $i<8; $i++) {
+        for ($i = 0; $i < 8; $i++) {
             $ctrTxt .= chr($counterBlock[$i]);
         }
 
         // generate key schedule - an expansion of the key into distinct Key Rounds for each round
         $keySchedule = Aes::keyExpansion($key);
 
-        $blockCount = ceil(strlen($plaintext)/$blockSize);
-        $ciphertxt = array();  // ciphertext as array of strings
+        $blockCount = ceil(strlen($plaintext) / $blockSize);
+        $ciphertxt = array(); // ciphertext as array of strings
 
-        for ($b=0; $b<$blockCount; $b++) {
+        for ($b = 0; $b < $blockCount; $b++) {
             // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
             // done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
             }
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c - 4] = self::urs($b / 0x100000000, $c * 8);
             }
 
-            $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // -- encrypt counter block --
+            $cipherCntr = Aes::cipher($counterBlock, $keySchedule); // -- encrypt counter block --
 
             // block size is reduced on final block
-            $blockLength = $b<$blockCount-1 ? $blockSize : (strlen($plaintext)-1)%$blockSize+1;
+            $blockLength = $b < $blockCount - 1 ? $blockSize : (strlen($plaintext) - 1) % $blockSize + 1;
             $cipherByte = array();
 
-            for ($i=0; $i<$blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
-                $cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b*$blockSize+$i, 1));
+            for ($i = 0; $i < $blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
+                $cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b * $blockSize + $i, 1));
                 $cipherByte[$i] = chr($cipherByte[$i]);
             }
-            $ciphertxt[$b] = implode('', $cipherByte);  // escape troublesome characters in ciphertext
+            $ciphertxt[$b] = implode('', $cipherByte); // escape troublesome characters in ciphertext
         }
 
         // implode is more efficient than repeated string concatenation
-        $ciphertext = $ctrTxt . implode('', $ciphertxt);
+        $ciphertext = $ctrTxt.implode('', $ciphertxt);
         $ciphertext = base64_encode($ciphertext);
 
         return $ciphertext;
@@ -307,25 +307,25 @@ 
     */
     public static function decrypt($ciphertext, $password, $nBits)
     {
-        $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-        if (!($nBits==128 || $nBits==192 || $nBits==256)) {
-            return '';  // standard allows 128/192/256 bit keys
+        $blockSize = 16; // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+        if (!($nBits == 128 || $nBits == 192 || $nBits == 256)) {
+            return ''; // standard allows 128/192/256 bit keys
         }
         $ciphertext = base64_decode($ciphertext);
 
         // use AES to encrypt password (mirroring encrypt routine)
-        $nBytes = $nBits/8;  // no bytes in key
+        $nBytes = $nBits / 8; // no bytes in key
         $pwBytes = array();
-        for ($i=0; $i<$nBytes; $i++) {
+        for ($i = 0; $i < $nBytes; $i++) {
             $pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
         }
         $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
-        $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
+        $key = array_merge($key, array_slice($key, 0, $nBytes - 16)); // expand key to 16/24/32 bytes long
 
         // recover nonce from 1st element of ciphertext
         $counterBlock = array();
         $ctrTxt = substr($ciphertext, 0, 8);
-        for ($i=0; $i<8; $i++) {
+        for ($i = 0; $i < 8; $i++) {
             $counterBlock[$i] = ord(substr($ctrTxt, $i, 1));
         }
 
@@ -333,29 +333,29 @@ 
         $keySchedule = Aes::keyExpansion($key);
 
         // separate ciphertext into blocks (skipping past initial 8 bytes)
-        $nBlocks = ceil((strlen($ciphertext)-8) / $blockSize);
+        $nBlocks = ceil((strlen($ciphertext) - 8) / $blockSize);
         $ct = array();
-        for ($b=0; $b<$nBlocks; $b++) {
-            $ct[$b] = substr($ciphertext, 8+$b*$blockSize, 16);
+        for ($b = 0; $b < $nBlocks; $b++) {
+            $ct[$b] = substr($ciphertext, 8 + $b * $blockSize, 16);
         }
-        $ciphertext = $ct;  // ciphertext is now array of block-length strings
+        $ciphertext = $ct; // ciphertext is now array of block-length strings
 
         // plaintext will get generated block-by-block into array of block-length strings
         $plaintxt = array();
 
-        for ($b=0; $b<$nBlocks; $b++) {
+        for ($b = 0; $b < $nBlocks; $b++) {
             // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
             }
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c - 4] = self::urs(($b + 1) / 0x100000000 - 1, $c * 8) & 0xff;
             }
 
-            $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // encrypt counter block
+            $cipherCntr = Aes::cipher($counterBlock, $keySchedule); // encrypt counter block
 
             $plaintxtByte = array();
-            for ($i=0; $i<strlen($ciphertext[$b]); $i++) {
+            for ($i = 0; $i < strlen($ciphertext[$b]); $i++) {
                 // -- xor plaintext with ciphered counter byte-by-byte --
                 $plaintxtByte[$i] = $cipherCntr[$i] ^ ord(substr($ciphertext[$b], $i, 1));
                 $plaintxtByte[$i] = chr($plaintxtByte[$i]);
@@ -379,12 +379,12 @@ 
     private static function urs($a, $b)
     {
         $a &= 0xffffffff;
-        $b &= 0x1f;  // (bounds check)
-        if ($a&0x80000000 && $b>0) {   // if left-most bit set
-            $a = ($a>>1) & 0x7fffffff;   //   right-shift one bit & clear left-most bit
-            $a = $a >> ($b-1);           //   remaining right-shifts
+        $b &= 0x1f; // (bounds check)
+        if ($a & 0x80000000 && $b > 0) {   // if left-most bit set
+            $a = ($a >> 1) & 0x7fffffff; //   right-shift one bit & clear left-most bit
+            $a = $a >> ($b - 1); //   remaining right-shifts
         } else {                       // otherwise
-            $a = ($a>>$b);               //   use normal right-shift
+            $a = ($a >> $b); //   use normal right-shift
         }
 
         return $a;

Doc Comments +18 added lines, -5 removed lines

@@ -49,6 +49,10 @@ 
         return $output;
     }
 
+    /**
+     * @param integer $rnd
+     * @param integer $Nb
+     */
     private static function addRoundKey($state, $w, $rnd, $Nb)
     {
         // xor Round Key into state S [é5.1.4]
@@ -61,6 +65,9 @@ 
         return $state;
     }
 
+    /**
+     * @param integer $Nb
+     */
     private static function subBytes($s, $Nb)
     {
         // apply SBox to state S [é5.1.1]
@@ -73,6 +80,9 @@ 
         return $s;
     }
 
+    /**
+     * @param integer $Nb
+     */
     private static function shiftRows($s, $Nb)
     {
         // shift row r of state S left by r bytes [é5.1.2]
@@ -88,6 +98,9 @@ 
         return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
     }
 
+    /**
+     * @param integer $Nb
+     */
     private static function mixColumns($s, $Nb)
     {
         // combine bytes of each col of state S [é5.1.3]
@@ -219,10 +232,10 @@ 
     *
     * Unicode multi-byte character safe
     *
-    * @param plaintext source text to be encrypted
+    * @param plaintext string text to be encrypted
     * @param password  the password to use to generate a key
-    * @param nBits     number of bits to be used in the key (128, 192, or 256)
-    * @return          encrypted text
+    * @param nBits     integer of bits to be used in the key (128, 192, or 256)
+    * @return          string text
     */
     public static function encrypt($plaintext, $password, $nBits)
     {
@@ -302,8 +315,8 @@ 
     *
     * @param ciphertext source text to be decrypted
     * @param password   the password to use to generate a key
-    * @param nBits      number of bits to be used in the key (128, 192, or 256)
-    * @return           decrypted text
+    * @param nBits      integer of bits to be used in the key (128, 192, or 256)
+    * @return           string text
     */
     public static function decrypt($ciphertext, $password, $nBits)
     {

install/upgrade_run_defuse_for_files.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     $_SESSION['port']
 );
 // are files encrypted? get the setting ongoing in teampass
-$set = mysqli_fetch_row(mysqli_query($dbTmp,"SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='enable_attachment_encryption'"));
+$set = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='enable_attachment_encryption'"));
 $enable_attachment_encryption = $set[0];
 
 // if no encryption then stop
@@ -51,11 +51,11 @@ 
 }
 
 // get path to upload
-$set = mysqli_fetch_row(mysqli_query($dbTmp,"SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='path_to_upload_folder'"));
+$set = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='path_to_upload_folder'"));
 $path_to_upload_folder = $set[0];
 
 // get previous saltkey
-$set = mysqli_fetch_row(mysqli_query($dbTmp,"SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='saltkey_ante_2127'"));
+$set = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='saltkey_ante_2127'"));
 $saltkey_ante_2127 = $set[0];