nilsteampassnet / TeamPass

sources/utils.queries.php

Indentation +7 added lines, -7 removed lines

@@ -252,7 +252,7 @@ 
                         array(
                             'pw' => $encrypt['string'],
                             'pw_iv' => ""
-                           ),
+                            ),
                         "id = %i", $data['id']
                     );
                 }
@@ -305,7 +305,7 @@ 
                         'pw' => $encrypt['string'],
                         'pw_iv' => "",
                         "encryption_type" => "defuse"
-                       ),
+                        ),
                     "id = %i", $data['id']
                 );
             } elseif ($data['encryption_type'] === "not_set") {
@@ -333,7 +333,7 @@ 
                         'pw' => $encrypt['string'],
                         'pw_iv' => "",
                         "encryption_type" => "defuse"
-                       ),
+                        ),
                     "id = %i", $data['id']
                 );
             } else {
@@ -347,7 +347,7 @@ 
             prefix_table('users'),
             array(
                 'upgrade_needed' => 0
-               ),
+                ),
             "id = %i",
             $_SESSION['user_id']
         );
@@ -406,7 +406,7 @@ 
         } else {
             $ssh = new phpseclib\Net\SSH2($parse['host'], $parse['port']);
             if (!$ssh->login($dataReceived['ssh_root'], $dataReceived['ssh_pwd'])) {
-               echo prepareExchangedData(
+                echo prepareExchangedData(
                     array(
                         "error" => "Login failed.",
                         "text" => ""
@@ -434,7 +434,7 @@ 
                 array(
                     'pw' => $encrypt['string'],
                     'pw_iv' => $encrypt['iv']
-                   ),
+                    ),
                 "id = %i",
                 $dataReceived['currentId']
             );
@@ -467,7 +467,7 @@ 
             array(
                 'auto_update_pwd_frequency' => $_POST['freq'],
                 'auto_update_pwd_next_date' => time() + (2592000 * intval($_POST['freq']))
-               ),
+                ),
             "id = %i",
             $_POST['id']
         );

Spacing +6 added lines, -6 removed lines

@@ -53,7 +53,7 @@ 
 
         foreach (explode(';', $_POST['ids']) as $id) {
             if (!in_array($id, $_SESSION['forbiden_pfs']) && in_array($id, $_SESSION['groupes_visibles'])) {
-                $rows =DB::query(
+                $rows = DB::query(
                     "SELECT i.id as id, i.restricted_to as restricted_to, i.perso as perso, i.label as label, i.description as description, i.pw as pw, i.login as login, i.pw_iv as pw_iv
                     l.date as date,
                     n.renewal_period as renewal_period
@@ -219,7 +219,7 @@ 
                     $pw = decrypt($data['pw'], $oldPersonalSaltkey);
                     if (empty($pw)) {
                         // used protocol is #1
-                        $pw = decryptOld($data['pw'], $oldPersonalSaltkey);  // decrypt using protocol #1
+                        $pw = decryptOld($data['pw'], $oldPersonalSaltkey); // decrypt using protocol #1
                     } else {
                         // used protocol is #2
                         // get key for this pw
@@ -274,7 +274,7 @@ 
                 );
                 if (empty($pw)) {
                     // used protocol is #1
-                    $pw = decryptOld($data['pw'], $_SESSION['user_settings']['clear_psk']);  // decrypt using protocol #1
+                    $pw = decryptOld($data['pw'], $_SESSION['user_settings']['clear_psk']); // decrypt using protocol #1
                 } else {
                     // used protocol is #2
                     // get key for this pw
@@ -393,7 +393,7 @@ 
         $ret = "";
         require($_SESSION['settings']['cpassman_dir'].'/includes/libraries/Authentication/phpseclib/Net/SSH2.php');
         $parse = parse_url($dataItem['url']);
-        if (!isset($parse['host']) || empty($parse['host']) ||!isset($parse['port']) || empty($parse['port'])) {
+        if (!isset($parse['host']) || empty($parse['host']) || !isset($parse['port']) || empty($parse['port'])) {
             // error in parsing the url
             echo prepareExchangedData(
                 array(
@@ -414,7 +414,7 @@ 
                     "encode"
                 );
                 break;
-            }else{
+            } else {
                 // send ssh script for user change
                 $ret .= "<br />".$LANG['ssh_answer_from_server'].':&nbsp;<div style="margin-left:20px;font-style: italic;">';
                 $ret_server = $ssh->exec('echo -e "'.$dataReceived['ssh_pwd'].'\n'.$dataReceived['new_pwd'].'\n'.$dataReceived['new_pwd'].'" | passwd '.$dataItem['login']);
@@ -448,7 +448,7 @@ 
         // finished
         echo prepareExchangedData(
             array(
-                "error" => "" ,
+                "error" => "",
                 "text" => str_replace(array("\n"), array("<br />"), $ret)
             ),
             "encode"

Braces +1 added lines, -1 removed lines

@@ -414,7 +414,7 @@
                     "encode"
                 );
                 break;
-            }else{
+            } else{
                 // send ssh script for user change
                 $ret .= "<br />".$LANG['ssh_answer_from_server'].':&nbsp;<div style="margin-left:20px;font-style: italic;">';
                 $ret_server = $ssh->exec('echo -e "'.$dataReceived['ssh_pwd'].'\n'.$dataReceived['new_pwd'].'\n'.$dataReceived['new_pwd'].'" | passwd '.$dataItem['login']);

sources/find.queries.php

Spacing +19 added lines, -19 removed lines

@@ -55,7 +55,7 @@ 
 
 //init SQL variables
 $sOrder = $sLimit = "";
-$sWhere = "id_tree IN %ls_idtree";    //limit search to the visible folders
+$sWhere = "id_tree IN %ls_idtree"; //limit search to the visible folders
 
 //Get current user "personal folder" ID
 $row = DB::query(
@@ -93,7 +93,7 @@ 
 //Paging
 $sLimit = "";
 if (isset($_GET['iDisplayStart']) && $_GET['iDisplayLength'] != '-1') {
-    $sLimit = "LIMIT ". filter_var($_GET['iDisplayStart'], FILTER_SANITIZE_NUMBER_INT) .", ". filter_var($_GET['iDisplayLength'], FILTER_SANITIZE_NUMBER_INT)."";
+    $sLimit = "LIMIT ".filter_var($_GET['iDisplayStart'], FILTER_SANITIZE_NUMBER_INT).", ".filter_var($_GET['iDisplayLength'], FILTER_SANITIZE_NUMBER_INT)."";
 }
 
 //Ordering
@@ -106,13 +106,13 @@ 
     }
     else {
         $sOrder = "ORDER BY  ";
-        for ($i=0; $i<intval($_GET['iSortingCols']); $i++) {
+        for ($i = 0; $i < intval($_GET['iSortingCols']); $i++) {
             if (
-                $_GET[ 'bSortable_'.filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT)] == "true" &&
+                $_GET['bSortable_'.filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT)] == "true" &&
                 preg_match("#^(asc|desc)\$#i", $_GET['sSortDir_'.$i])
             ) {
-                $sOrder .= "".$aColumns[ filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT) ]." "
-                .mysqli_escape_string($link, $_GET['sSortDir_'.$i]) .", ";
+                $sOrder .= "".$aColumns[filter_var($_GET['iSortCol_'.$i], FILTER_SANITIZE_NUMBER_INT)]." "
+                .mysqli_escape_string($link, $_GET['sSortDir_'.$i]).", ";
             }
         }
 
@@ -131,7 +131,7 @@ 
  */
 if (isset($_GET['sSearch']) && $_GET['sSearch'] != "") {
     $sWhere .= " AND (";
-    for ($i=0; $i<count($aColumns); $i++) {
+    for ($i = 0; $i < count($aColumns); $i++) {
         $sWhere .= $aColumns[$i]." LIKE %ss_".$i." OR ";
     }
     $sWhere = substr_replace($sWhere, "", -3).") ";
@@ -208,9 +208,9 @@ 
  */
 if (!isset($_GET['type'])) {
     $sOutput = '{';
-    if (isset($_GET['sEcho'])) $sOutput .= '"sEcho": ' . intval($_GET['sEcho']) . ', ';
-    $sOutput .= '"iTotalRecords": ' . $iFilteredTotal . ', ';
-    $sOutput .= '"iTotalDisplayRecords": ' . $iTotal . ', ';
+    if (isset($_GET['sEcho'])) $sOutput .= '"sEcho": '.intval($_GET['sEcho']).', ';
+    $sOutput .= '"iTotalRecords": '.$iFilteredTotal.', ';
+    $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
     $sOutputConst = "";
 
@@ -242,14 +242,14 @@ 
         }
 
         //col1
-        $sOutputItem .= '"<i class=\"fa fa-external-link tip\" title=\"'.$LANG['open_url_link'].'\" onClick=\"javascript:window.location.href = &#039;index.php?page=items&amp;group=' . $record['id_tree'] . '&amp;id=' . $record['id'] . '&#039;;\" style=\"cursor:pointer;\"></i>&nbsp;'.
-            '<i class=\"fa fa-eye tip\" title=\"'.$LANG['see_item_title'].'\" onClick=\"javascript:see_item(' . $record['id'] . ',' . $record['perso'] . ');\" style=\"cursor:pointer;\"></i>'.$checkbox.'", ';
+        $sOutputItem .= '"<i class=\"fa fa-external-link tip\" title=\"'.$LANG['open_url_link'].'\" onClick=\"javascript:window.location.href = &#039;index.php?page=items&amp;group='.$record['id_tree'].'&amp;id='.$record['id'].'&#039;;\" style=\"cursor:pointer;\"></i>&nbsp;'.
+            '<i class=\"fa fa-eye tip\" title=\"'.$LANG['see_item_title'].'\" onClick=\"javascript:see_item('.$record['id'].','.$record['perso'].');\" style=\"cursor:pointer;\"></i>'.$checkbox.'", ';
 
         //col2
-        $sOutputItem .= '"<span id=\"item_label-'.$record['id'].'\">' . htmlspecialchars(stripslashes($record['label']), ENT_QUOTES) . '</span>", ';
+        $sOutputItem .= '"<span id=\"item_label-'.$record['id'].'\">'.htmlspecialchars(stripslashes($record['label']), ENT_QUOTES).'</span>", ';
 
         //col3
-        $sOutputItem .= '"' . str_replace("&amp;", "&", htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)) . '", ';
+        $sOutputItem .= '"'.str_replace("&amp;", "&", htmlspecialchars(stripslashes($record['login']), ENT_QUOTES)).'", ';
 
         //col4
         //get restriction from ROles
@@ -281,23 +281,23 @@ 
         } else {
             $txt = str_replace(array('\n', '<br />', '\\'), array(' ', ' ', '', ' '), strip_tags($record['description']));
             if (strlen($txt) > 50) {
-                $sOutputItem .= '"' . substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50) . '", ';
+                $sOutputItem .= '"'.substr(stripslashes(preg_replace('~/<[\/]{0,1}[^>]*>\//|[ \t]/~', '', $txt)), 0, 50).'", ';
             } else {
-                $sOutputItem .= '"' . stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)) . '", ';
+                $sOutputItem .= '"'.stripslashes(preg_replace('~/<[^>]*>|[ \t]/~', '', $txt)).'", ';
             }
         }
 
         //col5 - TAGS
-        $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES) . '", ';
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES).'", ';
 
         // col6 - URL
         if ($record['url'] != "0")
-            $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['url']), ENT_QUOTES) . '", ';
+            $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['url']), ENT_QUOTES).'", ';
         else
             $sOutputItem .= '"", ';
 
         //col7 - Prepare the Treegrid
-        $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES) . '"';
+        $sOutputItem .= '"'.htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES).'"';
 
         //Finish the line
         $sOutputItem .= '], ';

Braces +19 added lines, -12 removed lines

@@ -103,8 +103,7 @@ 
         // possible attack - stop
         echo '[{}]';
         exit;
-    }
-    else {
+    } else {
         $sOrder = "ORDER BY  ";
         for ($i=0; $i<intval($_GET['iSortingCols']); $i++) {
             if (
@@ -208,7 +207,9 @@ 
  */
 if (!isset($_GET['type'])) {
     $sOutput = '{';
-    if (isset($_GET['sEcho'])) $sOutput .= '"sEcho": ' . intval($_GET['sEcho']) . ', ';
+    if (isset($_GET['sEcho'])) {
+        $sOutput .= '"sEcho": ' . intval($_GET['sEcho']) . ', ';
+    }
     $sOutput .= '"iTotalRecords": ' . $iFilteredTotal . ', ';
     $sOutput .= '"iTotalDisplayRecords": ' . $iTotal . ', ';
     $sOutput .= '"aaData": [ ';
@@ -232,13 +233,18 @@ 
                     $role,
                     $record['id_tree']
                 );
-                if ($access['type'] == "R") array_push($arrTmp, 1);
-                else if ($access['type'] == "W") array_push($arrTmp, 0);
-                else array_push($arrTmp, 2);
+                if ($access['type'] == "R") {
+                    array_push($arrTmp, 1);
+                } else if ($access['type'] == "W") {
+                    array_push($arrTmp, 0);
+                } else {
+                    array_push($arrTmp, 2);
+                }
             }
             $accessLevel = min($arrTmp);
-            if ($accessLevel === 0)
-                $checkbox = '&nbsp;<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" id=\"mass_op_cb-'.$record['id'].'\">';
+            if ($accessLevel === 0) {
+                            $checkbox = '&nbsp;<input type=\"checkbox\" value=\"0\" class=\"mass_op_cb\" id=\"mass_op_cb-'.$record['id'].'\">';
+            }
         }
 
         //col1
@@ -291,10 +297,11 @@ 
         $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['tags']), ENT_QUOTES) . '", ';
 
         // col6 - URL
-        if ($record['url'] != "0")
-            $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['url']), ENT_QUOTES) . '", ';
-        else
-            $sOutputItem .= '"", ';
+        if ($record['url'] != "0") {
+                    $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['url']), ENT_QUOTES) . '", ';
+        } else {
+                    $sOutputItem .= '"", ';
+        }
 
         //col7 - Prepare the Treegrid
         $sOutputItem .= '"' . htmlspecialchars(stripslashes($record['folder']), ENT_QUOTES) . '"';

sources/export.queries.php

Indentation +16 added lines, -16 removed lines

@@ -131,13 +131,13 @@ 
                             WHERE a.item_id = %i",
                             $record['id']
                         );
-                         foreach ($rows_kb as $rec_kb) {
+                            foreach ($rows_kb as $rec_kb) {
                             if (empty($arr_kbs)) {
                                 $arr_kbs = $rec_kb['label'];
                             } else {
                                 $arr_kbs .= " | ".$rec_kb['label'];
                             }
-                         }
+                            }
 
                         // get TAGS
                         $arr_tags = "";
@@ -147,13 +147,13 @@ 
                             WHERE item_id = %i",
                             $record['id']
                         );
-                         foreach ($rows_tag as $rec_tag) {
+                            foreach ($rows_tag as $rec_tag) {
                             if (empty($arr_tags)) {
                                 $arr_tags = $rec_tag['tag'];
                             } else {
                                 $arr_tags .= " ".$rec_tag['tag'];
                             }
-                         }
+                            }
 
                         // store
                         DB::insert(
@@ -369,9 +369,9 @@ 
                                 WHERE a.item_id = %i",
                                 $record['id']
                             );
-                             foreach ($rows_kb as $rec_kb) {
+                                foreach ($rows_kb as $rec_kb) {
                                 array_push($arr_kbs, $rec_kb['label']);
-                             }
+                                }
 
                             // get TAGS
                             $arr_tags = [];
@@ -381,9 +381,9 @@ 
                                 WHERE item_id = %i",
                                 $record['id']
                             );
-                             foreach ($rows_tag as $rec_tag) {
+                                foreach ($rows_tag as $rec_tag) {
                                 array_push($arr_tags, $rec_tag['tag']);
-                             }
+                                }
 
                             $full_listing[$i] = array(
                                 'id' => $record['id'],
@@ -487,13 +487,13 @@ 
             }
         }
 
-          // prepare export file
-          //save the file
-          $html_file = '/teampass_export_'.time().'_'.generateKey().'.html';
-          //print_r($full_listing);
-          $outstream = fopen($_SESSION['settings']['path_to_files_folder'].$html_file, "w");
-          fwrite(
-              $outstream,
+            // prepare export file
+            //save the file
+            $html_file = '/teampass_export_'.time().'_'.generateKey().'.html';
+            //print_r($full_listing);
+            $outstream = fopen($_SESSION['settings']['path_to_files_folder'].$html_file, "w");
+            fwrite(
+                $outstream,
 '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
@@ -530,7 +530,7 @@ 
         <th style="width:5%;">'.$LANG['user_login'].'</th>
         <th style="width:20%;">'.$LANG['url'].'</th>
     </tr></thead>'
-          );
+            );
 
         fclose($outstream);
 

Spacing +47 added lines, -47 removed lines

@@ -160,13 +160,13 @@ 
                             prefix_table("export"),
                             array(
                                 'id' => $record['id'],
-                                'description' => strip_tags(cleanString(html_entity_decode($record['description'], ENT_QUOTES | ENT_XHTML, UTF-8), true)),
-                                'label' => cleanString(html_entity_decode($record['label'], ENT_QUOTES | ENT_XHTML, UTF-8), true),
-                                'pw' => html_entity_decode($pw['string'], ENT_QUOTES | ENT_XHTML, UTF-8),
-                                'login' => strip_tags(cleanString(html_entity_decode($record['login'], ENT_QUOTES | ENT_XHTML, UTF-8), true)),
+                                'description' => strip_tags(cleanString(html_entity_decode($record['description'], ENT_QUOTES | ENT_XHTML, UTF - 8), true)),
+                                'label' => cleanString(html_entity_decode($record['label'], ENT_QUOTES | ENT_XHTML, UTF - 8), true),
+                                'pw' => html_entity_decode($pw['string'], ENT_QUOTES | ENT_XHTML, UTF - 8),
+                                'login' => strip_tags(cleanString(html_entity_decode($record['login'], ENT_QUOTES | ENT_XHTML, UTF - 8), true)),
                                 'path' => $path,
-                                'url' => strip_tags(cleanString(html_entity_decode($record['url'], ENT_QUOTES | ENT_XHTML, UTF-8), true)),
-                                'email' => strip_tags(cleanString(html_entity_decode($record['email'], ENT_QUOTES | ENT_XHTML, UTF-8), true)),
+                                'url' => strip_tags(cleanString(html_entity_decode($record['url'], ENT_QUOTES | ENT_XHTML, UTF - 8), true)),
+                                'email' => strip_tags(cleanString(html_entity_decode($record['email'], ENT_QUOTES | ENT_XHTML, UTF - 8), true)),
                                 'kbs' => $arr_kbs,
                                 'tags' => $arr_tags
                             )
@@ -257,23 +257,23 @@ 
                 $nb = max($nb, nbLines($table_col_width[6], $record['kbs']));
                 $nb = max($nb, nbLines($table_col_width[7], $record['tags']));
 
-                $h=5*$nb;
+                $h = 5 * $nb;
                 //Page break needed?
                 checkPageBreak($h);
                 //Draw cells
                 $pdf->SetFont('helvetica', '', 8);
-                for ($i=0; $i<count($table); $i++) {
-                    $w=$table_col_width[$i];
-                    $a='L';
+                for ($i = 0; $i < count($table); $i++) {
+                    $w = $table_col_width[$i];
+                    $a = 'L';
                     //actual position
-                    $x=$pdf->GetX();
-                    $y=$pdf->GetY();
+                    $x = $pdf->GetX();
+                    $y = $pdf->GetY();
                     //Draw
                     $pdf->Rect($x, $y, $w, $h);
                     //Write
                     $pdf->MultiCell($w, 5, ($record[$table[$i]]), 0, $a);
                     //go to right
-                    $pdf->SetXY($x+$w, $y);
+                    $pdf->SetXY($x + $w, $y);
                 }
                 //return to line
                 $pdf->Ln($h);
@@ -387,10 +387,10 @@ 
 
                             $full_listing[$i] = array(
                                 'id' => $record['id'],
-                                'label' => strip_tags(cleanString(html_entity_decode($record['label'], ENT_QUOTES | ENT_XHTML, UTF-8), true)),
+                                'label' => strip_tags(cleanString(html_entity_decode($record['label'], ENT_QUOTES | ENT_XHTML, UTF - 8), true)),
                                 'description' => htmlspecialchars_decode(addslashes(str_replace(array(";", "<br />"), array("|", "\n\r"), mysqli_escape_string($link, stripslashes(utf8_decode($record['description'])))))),
-                                'pw' => html_entity_decode($pw['string'], ENT_QUOTES | ENT_XHTML, UTF-8),
-                                'login' => strip_tags(cleanString(html_entity_decode($record['login'], ENT_QUOTES | ENT_XHTML, UTF-8), true)),
+                                'pw' => html_entity_decode($pw['string'], ENT_QUOTES | ENT_XHTML, UTF - 8),
+                                'login' => strip_tags(cleanString(html_entity_decode($record['login'], ENT_QUOTES | ENT_XHTML, UTF - 8), true)),
                                 'restricted_to' => $record['restricted_to'],
                                 'perso' => $record['perso'] === "0" ? "False" : "True",
                                 'url' => $record['url'] !== "none" ? htmlspecialchars_decode($record['url']) : "",
@@ -588,7 +588,7 @@ 
                         "decrypt"
                     );
                 }
-                array_push($full_listing,array(
+                array_push($full_listing, array(
                     'id_tree' => $record['id_tree'],
                     'id' => $record['id'],
                     'label' => $record['label'],
@@ -599,7 +599,7 @@ 
                     'perso' => $record['perso']
                 ));
                 $i++;
-                array_push($items_id_list,$record['id']);
+                array_push($items_id_list, $record['id']);
             }
             $id_managed = $record['id'];
         }
@@ -728,7 +728,7 @@ 
 {
     global $pdf;
     //Continue on a new page if needed
-    if ($pdf->GetY()+$h>$pdf->PageBreakTrigger) {
+    if ($pdf->GetY() + $h > $pdf->PageBreakTrigger) {
         $pdf->addPage($pdf->CurOrientation);
     }
 }
@@ -737,47 +737,47 @@ 
 {
     global $pdf;
     //Calculate the number of lines needed by a Multicell with a width of w
-    $cw=&$pdf->CurrentFont['cw'];
-    if ($w==0) {
-        $w=$pdf->w-$this->rMargin-$pdf->x;
+    $cw = &$pdf->CurrentFont['cw'];
+    if ($w == 0) {
+        $w = $pdf->w - $this->rMargin - $pdf->x;
     }
-    $wmax=($w-2*$pdf->cMargin)*1000/$pdf->FontSize;
-    $s=str_replace("\r", '', $txt);
-    $nb=strlen($s);
-    if ($nb>0 and $s[$nb-1]=="\n") {
+    $wmax = ($w - 2 * $pdf->cMargin) * 1000 / $pdf->FontSize;
+    $s = str_replace("\r", '', $txt);
+    $nb = strlen($s);
+    if ($nb > 0 and $s[$nb - 1] == "\n") {
         $nb--;
     }
-    $sep=-1;
-    $i=0;
-    $j=0;
-    $l=0;
-    $nl=1;
-    while ($i<$nb) {
-        $c=$s[$i];
-        if ($c=="\n") {
+    $sep = -1;
+    $i = 0;
+    $j = 0;
+    $l = 0;
+    $nl = 1;
+    while ($i < $nb) {
+        $c = $s[$i];
+        if ($c == "\n") {
             $i++;
-            $sep=-1;
-            $j=$i;
-            $l=0;
+            $sep = -1;
+            $j = $i;
+            $l = 0;
             $nl++;
             continue;
         }
-        if ($c==' ') {
-            $sep=$i;
+        if ($c == ' ') {
+            $sep = $i;
         }
-        $l+=550;//$cw[$c];
+        $l += 550; //$cw[$c];
         //echo $cw[$c].";".$wmax.";".$l."|";
-        if ($l>$wmax) {
-            if ($sep==-1) {
-                if ($i==$j) {
+        if ($l > $wmax) {
+            if ($sep == -1) {
+                if ($i == $j) {
                     $i++;
                 }
             } else {
-                $i=$sep+1;
+                $i = $sep + 1;
             }
-            $sep=-1;
-            $j=$i;
-            $l=0;
+            $sep = -1;
+            $j = $i;
+            $l = 0;
             $nl++;
         } else {
             $i++;

Braces +3 added lines, -1 removed lines

@@ -246,7 +246,9 @@
                     $pdf->cell($table_col_width[7], 6, $LANG['tags'], 1, 1, "C", 1);
                 }
                 $prev_path = $record['path'];
-                if (!isutf8($record['pw'])) $record['pw'] = "";
+                if (!isutf8($record['pw'])) {
+                    $record['pw'] = "";
+                }
                 //row height calculation
                 $nb = 0;
                 $nb = max($nb, nbLines($table_col_width[0], $record['label']));

sources/views.queries.php

Indentation +7 added lines, -7 removed lines

@@ -201,7 +201,7 @@ 
                             'bloquer_modification' => $folderData[7],
                             'personal_folder' => $folderData[8],
                             'renewal_period' => $folderData[9]
-                       )
+                        )
                     );
                     //delete log
                     DB::delete(prefix_table("misc"), "type = %s AND intitule = %s", "folder_deleted", $id);
@@ -327,8 +327,8 @@ 
             ORDER BY %s %s
 			LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)) .", ". mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
             "user_connection",
-			$_POST['order'],
-			$POST['direction']
+            $_POST['order'],
+            $POST['direction']
         );
 
         foreach ($rows as $record) {
@@ -383,8 +383,8 @@ 
             ORDER BY %s %s
             LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)) .", ". mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
             "error",
-			$_POST['order'],
-			$_POST['direction']
+            $_POST['order'],
+            $_POST['direction']
         );
         foreach ($rows as $record) {
             $label = explode('@', addslashes(cleanString($record['label'])));
@@ -756,11 +756,11 @@ 
                 );
                 $counter = DB::count();
                     // Delete
-                 DB::delete(prefix_table("log_items"), "action=%s AND date BETWEEN %i AND %i",
+                    DB::delete(prefix_table("log_items"), "action=%s AND date BETWEEN %i AND %i",
                     "at_shown",
                     intval(strtotime($_POST['purgeFrom'])),
                     intval(strtotime($_POST['purgeTo']))
-                 );
+                    );
             } elseif ($_POST['logType'] == "connections_logs") {
                 DB::query(
                     "SELECT * FROM ".prefix_table("log_system")." WHERE type=%s ".

Spacing +40 added lines, -41 removed lines

@@ -64,7 +64,7 @@ 
     case "log_generate":
         //Prepare the PDF file
         include $_SESSION['settings']['cpassman_dir'].'/includes/libraries/Pdf/Tfpdf/tfpdf.class.php';
-        $pdf=new TFPDF();
+        $pdf = new TFPDF();
 
         //Add font for utf-8
         $pdf->AddFont('helvetica', '');
@@ -154,7 +154,7 @@ 
         foreach ($rows as $record) {
             if ($record['id'] !== $prev_id) {
                 if (in_array($record['id_tree'], $arrFolders)) {
-                    if (count($arrFolders[$record['id_tree']])>0) {
+                    if (count($arrFolders[$record['id_tree']]) > 0) {
                         $thisFolder = '<td>'.$arrFolders[$record['id_tree']].'</td>';
                     } else {
                         $thisFolder = "";
@@ -176,7 +176,7 @@ 
      */
     case "restore_deleted__items":
         //restore FOLDERS
-        if (count($_POST['list_f'])>0) {
+        if (count($_POST['list_f']) > 0) {
             foreach (explode(';', $_POST['list_f']) as $id) {
                 $data = DB::queryfirstrow(
                     "SELECT valeur
@@ -209,7 +209,7 @@ 
             }
         }
         //restore ITEMS
-        if (count($_POST['list_i'])>0) {
+        if (count($_POST['list_i']) > 0) {
             foreach (explode(';', $_POST['list_i']) as $id) {
                 DB::update(
                     prefix_table("items"),
@@ -241,7 +241,7 @@ 
      */
     case "really_delete_items":
         $folders = explode(';', $_POST['folders']);
-        if (count($folders)>0) {
+        if (count($folders) > 0) {
             //delete folders
             foreach ($folders as $fId) {
                 //get folder ID
@@ -267,7 +267,7 @@ 
                         DB::delete(prefix_table("cache"), "id = %i", $item['id']);
                     }
                     //Actualize the variable
-                    $_SESSION['nb_folders'] --;
+                    $_SESSION['nb_folders']--;
                 }
                 //delete folder
                 DB::delete(prefix_table("misc"), "intitule = %s AND type = %s", $fId, "folder_deleted");
@@ -301,19 +301,18 @@ 
             "user_connection"
         );
         if (DB::count() != 0) {
-            $nbPages = ceil($data[0]/$nbElements);
-            for ($i=1; $i<=$nbPages; $i++) {
+            $nbPages = ceil($data[0] / $nbElements);
+            for ($i = 1; $i <= $nbPages; $i++) {
                 $pages .= '<td onclick=\'displayLogs(\"connections_logs\", '.
                 $i.', \"'.$_POST['order'].'\")\'><span style=\'cursor:pointer;'.
-                ($_POST['page'] == $i ? 'font-weight:bold;font-size:18px;\'>'.$i:
-                '\'>'.$i).'</span></td>';
+                ($_POST['page'] == $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>';
             }
         }
         $pages .= '</tr></table>';
 
         //define query limits
         if (isset($_POST['page']) && $_POST['page'] > 1) {
-            $start = ($nbElements*($_POST['page']-1)) + 1;
+            $start = ($nbElements * ($_POST['page'] - 1)) + 1;
         } else {
             $start = 0;
         }
@@ -325,7 +324,7 @@ 
             INNER JOIN ".prefix_table("users")." as u ON (l.qui=u.id)
             WHERE l.type = %s
             ORDER BY %s %s
-			LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)) .", ". mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
+			LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)).", ".mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
             "user_connection",
 			$_POST['order'],
 			$POST['direction']
@@ -358,18 +357,18 @@ 
             "error"
         );
         if (DB::count() != 0) {
-            $nbPages = ceil($data[0]/$nbElements);
-            for ($i=1; $i<=$nbPages; $i++) {
+            $nbPages = ceil($data[0] / $nbElements);
+            for ($i = 1; $i <= $nbPages; $i++) {
                 $pages .= '<td onclick=\'displayLogs(\"errors_logs\", '.$i.', \"'.$_POST['order'].
                 '\")\'><span style=\'cursor:pointer;'.($_POST['page'] == $i ?
-                'font-weight:bold;font-size:18px;\'>'.$i:'\'>'.$i).'</span></td>';
+                'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>';
             }
         }
         $pages .= '</tr></table>';
 
         //define query limits
         if (isset($_POST['page']) && $_POST['page'] > 1) {
-            $start = ($nbElements*($_POST['page']-1)) + 1;
+            $start = ($nbElements * ($_POST['page'] - 1)) + 1;
         } else {
             $start = 0;
         }
@@ -381,7 +380,7 @@ 
             INNER JOIN ".prefix_table("users")." as u ON (l.qui=u.id)
             WHERE l.type = %s
             ORDER BY %s %s
-            LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)) .", ". mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
+            LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)).", ".mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
             "error",
 			$_POST['order'],
 			$_POST['direction']
@@ -420,16 +419,16 @@ 
             $where
         );
         if ($data[0] != 0) {
-            $nbPages = ceil($data[0]/$nbElements);
-            for ($i=1; $i<=$nbPages; $i++) {
-                $pages .= '<td onclick=\'displayLogs(\"access_logs\", '.$i.', \"'.$_POST['order'].'\")\'><span style=\'cursor:pointer;'.($_POST['page'] == $i ? 'font-weight:bold;font-size:18px;\'>'.$i:'\'>'.$i).'</span></td>';
+            $nbPages = ceil($data[0] / $nbElements);
+            for ($i = 1; $i <= $nbPages; $i++) {
+                $pages .= '<td onclick=\'displayLogs(\"access_logs\", '.$i.', \"'.$_POST['order'].'\")\'><span style=\'cursor:pointer;'.($_POST['page'] == $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>';
             }
         }
         $pages .= '</tr></table>';
 
         //define query limits
         if (isset($_POST['page']) && $_POST['page'] > 1) {
-            $start = ($nbElements*($_POST['page']-1)) + 1;
+            $start = ($nbElements * ($_POST['page'] - 1)) + 1;
         } else {
             $start = 0;
         }
@@ -442,7 +441,7 @@ 
             INNER JOIN ".prefix_table("users")." as u ON (l.id_user=u.id)
             WHERE %l
             ORDER BY ".$_POST['order']." ".$_POST['direction']."
-            LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)) .", ". mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
+            LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)).", ".mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
             $where
         );
         foreach ($rows as $record) {
@@ -479,16 +478,16 @@ 
             $where
         );
         if ($data[0] != 0) {
-            $nbPages = ceil($data[0]/$nbElements);
-            for ($i=1; $i<=$nbPages; $i++) {
-                $pages .= '<td onclick=\'displayLogs(\"copy_logs\", '.$i.', \'\')\'><span style=\'cursor:pointer;'.($_POST['page'] == $i ? 'font-weight:bold;font-size:18px;\'>'.$i:'\'>'.$i).'</span></td>';
+            $nbPages = ceil($data[0] / $nbElements);
+            for ($i = 1; $i <= $nbPages; $i++) {
+                $pages .= '<td onclick=\'displayLogs(\"copy_logs\", '.$i.', \'\')\'><span style=\'cursor:pointer;'.($_POST['page'] == $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>';
             }
         }
         $pages .= '</tr></table>';
 
         //define query limits
         if (isset($_POST['page']) && $_POST['page'] > 1) {
-            $start = ($nbElements*($_POST['page']-1)) + 1;
+            $start = ($nbElements * ($_POST['page'] - 1)) + 1;
         } else {
             $start = 0;
         }
@@ -501,7 +500,7 @@ 
             INNER JOIN ".prefix_table("users")." as u ON (l.id_user=u.id)
             WHERE %l
             ORDER BY date DESC
-            LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)) .", ". mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
+            LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)).", ".mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
             $where
         );
         foreach ($rows as $record) {
@@ -539,16 +538,16 @@ 
             $where
         );
         if (DB::count() != 0) {
-            $nbPages = ceil($data[0]/$nbElements);
-            for ($i=1; $i<=$nbPages; $i++) {
-                $pages .= '<td onclick=\'displayLogs(\"items_logs\", '.$i.', \"\")\'><span style=\'cursor:pointer;'.($_POST['page'] == $i ? 'font-weight:bold;font-size:18px;\'>'.$i:'\'>'.$i).'</span></td>';
+            $nbPages = ceil($data[0] / $nbElements);
+            for ($i = 1; $i <= $nbPages; $i++) {
+                $pages .= '<td onclick=\'displayLogs(\"items_logs\", '.$i.', \"\")\'><span style=\'cursor:pointer;'.($_POST['page'] == $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>';
             }
         }
         $pages .= '</tr></table>';
 
         //define query limits
         if (isset($_POST['page']) && $_POST['page'] > 1) {
-            $start = ($nbElements*($_POST['page']-1)) + 1;
+            $start = ($nbElements * ($_POST['page'] - 1)) + 1;
         } else {
             $start = 0;
         }
@@ -562,7 +561,7 @@ 
             INNER JOIN ".prefix_table("users")." as u ON (l.id_user=u.id)
             WHERE %l
             ORDER BY date DESC
-            LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)) .", ". mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
+            LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)).", ".mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
             $where
         );
 
@@ -604,16 +603,16 @@ 
             $where
         );
         if ($data[0] != 0) {
-            $nbPages = ceil($data[0]/$nbElements);
-            for ($i=1; $i<=$nbPages; $i++) {
-                $pages .= '<td onclick=\'displayLogs(\"copy_logs\", '.$i.', \'\')\'><span style=\'cursor:pointer;'.($_POST['page'] == $i ? 'font-weight:bold;font-size:18px;\'>'.$i:'\'>'.$i).'</span></td>';
+            $nbPages = ceil($data[0] / $nbElements);
+            for ($i = 1; $i <= $nbPages; $i++) {
+                $pages .= '<td onclick=\'displayLogs(\"copy_logs\", '.$i.', \'\')\'><span style=\'cursor:pointer;'.($_POST['page'] == $i ? 'font-weight:bold;font-size:18px;\'>'.$i : '\'>'.$i).'</span></td>';
             }
         }
         $pages .= '</tr></table>';
 
         //define query limits
         if (isset($_POST['page']) && $_POST['page'] > 1) {
-            $start = ($nbElements*($_POST['page']-1)) + 1;
+            $start = ($nbElements * ($_POST['page'] - 1)) + 1;
         } else {
             $start = 0;
         }
@@ -625,7 +624,7 @@ 
             INNER JOIN ".prefix_table("users")." as u ON (l.qui=u.id)
             WHERE %l
             ORDER BY date DESC
-            LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)) .", ". mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
+            LIMIT ".mysqli_real_escape_string($link, filter_var($start, FILTER_SANITIZE_NUMBER_INT)).", ".mysqli_real_escape_string($link, filter_var($nbElements, FILTER_SANITIZE_NUMBER_INT)),
             $where
         );
 
@@ -644,11 +643,11 @@ 
         if ($_POST['period'] == "0") {
             $date = (time());
         } elseif ($_POST['period'] == "1month") {
-            $date = (mktime(date('h'), date('i'), date('s'), date('m')+1, date('d'), date('y')));
+            $date = (mktime(date('h'), date('i'), date('s'), date('m') + 1, date('d'), date('y')));
         } elseif ($_POST['period'] == "6months") {
-            $date = (mktime(date('h'), date('i'), date('s'), date('m')+6, date('d'), date('y')));
+            $date = (mktime(date('h'), date('i'), date('s'), date('m') + 6, date('d'), date('y')));
         } elseif ($_POST['period'] == "1year") {
-            $date = (mktime(date('h'), date('i'), date('s'), date('m'), date('d'), date('y')+1));
+            $date = (mktime(date('h'), date('i'), date('s'), date('m'), date('d'), date('y') + 1));
         }
         $idItem = "";
         $texte = "<table cellpadding=3><thead><tr><th>".$LANG['label']."</th><th>".$LANG['creation_date']."</th><th>".$LANG['expiration_date']."</th><th>".$LANG['group']."</th><th>".$LANG['auteur']."</th></tr></thead>";
@@ -702,7 +701,7 @@ 
     case "generate_renewal_pdf":
         //Prepare the PDF file
         include $_SESSION['settings']['cpassman_dir'].'/includes/libraries/Pdf/Tfpdf/tfpdf.class.php';
-        $pdf=new tFPDF();
+        $pdf = new tFPDF();
 
         //Add font for utf-8
         $pdf->AddFont('helvetica', '');

sources/kb.queries.php

Indentation +4 added lines, -4 removed lines

@@ -104,7 +104,7 @@ 
                         prefix_table("kb_categories"),
                         array(
                             'category' => $category
-                       )
+                        )
                     );
                     $cat_id = DB::insertId();
                 } else {
@@ -123,7 +123,7 @@ 
                             'author_id' => $_SESSION['user_id'],
                             'category_id' => $cat_id,
                             'anyone_can_modify' => $anyone_can_modify
-                       ),
+                        ),
                         "id=%i", $id
                     );
                 } else {
@@ -136,7 +136,7 @@ 
                             'author_id' => $_SESSION['user_id'],
                             'category_id' => $cat_id,
                             'anyone_can_modify' => $anyone_can_modify
-                       )
+                        )
                     );
                     $id = DB::insertId();
                 }
@@ -151,7 +151,7 @@ 
                         array(
                             'kb_id' => $id,
                             'item_id' => $item_id
-                       )
+                        )
                     );
                 }
 

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
                 "options"     => $arrOptions
             );
 
-            echo json_encode($arrOutput, JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP);
+            echo json_encode($arrOutput, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP);
             break;
         /**
          * Delete the KB

sources/core.php

Spacing +13 added lines, -13 removed lines

@@ -12,7 +12,7 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] != 1 ) {
+if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] != 1) {
     die('Please login...');
 }
 
@@ -44,8 +44,8 @@ 
 
 /* LOAD CPASSMAN SETTINGS */
 if (!isset($_SESSION['settings']['loaded']) || $_SESSION['settings']['loaded'] != 1) {
-    $_SESSION['settings']['duplicate_folder'] = 0;  //by default, this is false;
-    $_SESSION['settings']['duplicate_item'] = 0;  //by default, this is false;
+    $_SESSION['settings']['duplicate_folder'] = 0; //by default, this is false;
+    $_SESSION['settings']['duplicate_item'] = 0; //by default, this is false;
     $_SESSION['settings']['number_of_used_pw'] = 5; //by default, this value is 5;
 
     $rows = DB::query("SELECT * FROM ".prefix_table("misc")." WHERE type=%s_type OR type=%s_type2",
@@ -78,13 +78,13 @@ 
 if (isset($_SESSION['user_language']) && $_SESSION['user_language'] !== "0") {
     require_once $_SESSION['settings']['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
     $_SESSION['settings']['pwComplexity'] = array(
-        0=>array(0,$LANG['complex_level0']),
-        25=>array(25,$LANG['complex_level1']),
-        50=>array(50,$LANG['complex_level2']),
-        60=>array(60,$LANG['complex_level3']),
-        70=>array(70,$LANG['complex_level4']),
-        80=>array(80,$LANG['complex_level5']),
-        90=>array(90,$LANG['complex_level6'])
+        0=>array(0, $LANG['complex_level0']),
+        25=>array(25, $LANG['complex_level1']),
+        50=>array(50, $LANG['complex_level2']),
+        60=>array(60, $LANG['complex_level3']),
+        70=>array(70, $LANG['complex_level4']),
+        80=>array(80, $LANG['complex_level5']),
+        90=>array(90, $LANG['complex_level6'])
     );
 }
 
@@ -371,7 +371,7 @@ 
 * CHECK PASSWORD VALIDITY
 * Don't take into consideration if LDAP in use
 */
-$_SESSION['numDaysBeforePwExpiration'] = "";    //initiliaze variable
+$_SESSION['numDaysBeforePwExpiration'] = ""; //initiliaze variable
 if (isset($_SESSION['settings']['ldap_mode']) && $_SESSION['settings']['ldap_mode'] == 1) {
     $_SESSION['validite_pw'] = true;
     $_SESSION['last_pw_change'] = true;
@@ -382,7 +382,7 @@ 
             $_SESSION['validite_pw'] = true;
         } else {
             $_SESSION['numDaysBeforePwExpiration'] = $_SESSION['settings']['pw_life_duration'] - round(
-                (mktime(0, 0, 0, date('m'), date('d'), date('y'))-$_SESSION['last_pw_change'])/(24*60*60)
+                (mktime(0, 0, 0, date('m'), date('d'), date('y')) - $_SESSION['last_pw_change']) / (24 * 60 * 60)
             );
             if ($_SESSION['numDaysBeforePwExpiration'] <= 0) {
                 $_SESSION['validite_pw'] = false;
@@ -398,7 +398,7 @@ 
 /*
 * LOAD CATEGORIES
 */
-if (isset($_SESSION['settings']['item_extra_fields']) && $_SESSION['settings']['item_extra_fields'] == 1 && empty( $_SESSION['item_fields'])) {
+if (isset($_SESSION['settings']['item_extra_fields']) && $_SESSION['settings']['item_extra_fields'] == 1 && empty($_SESSION['item_fields'])) {
     $_SESSION['item_fields'] = array();
     $rows = DB::query("SELECT * FROM ".prefix_table("categories")." WHERE level=%s_level",
         array(

sources/categories.queries.php

Indentation +6 added lines, -6 removed lines

@@ -99,7 +99,7 @@ 
                     prefix_table("categories"),
                     array(
                         'title' => $_POST['data']
-                       ),
+                        ),
                     "id=%i",
                     $_POST['id']
                 );
@@ -115,7 +115,7 @@ 
                     array(
                         'parent_id' => $_POST['data'],
                         'order' => 99
-                       ),
+                        ),
                     "id=%i",
                     $_POST['id']
                 );
@@ -132,7 +132,7 @@ 
                         prefix_table("categories"),
                         array(
                             'order' => $elem[1]
-                           ),
+                            ),
                         "id=%i",
                         $elem[0]
                     );
@@ -215,7 +215,7 @@ 
                         array(
                             'id_category' => $_POST['id'],
                             'id_folder' => $folder
-                           )
+                            )
                     );
 
                     // prepare a list
@@ -236,7 +236,7 @@ 
                 prefix_table("categories"),
                 array(
                     'encrypted_data' => $_POST['encrypt']
-                   ),
+                    ),
                 "id = %i",
                 $_POST['id']
             );
@@ -271,7 +271,7 @@ 
                     array(
                         'data' => $encrypt['string'],
                         'data_iv' => ""
-                       ),
+                        ),
                     "id = %i",
                     $recordF['id']
                 );

Spacing +1 added lines, -1 removed lines

@@ -199,7 +199,7 @@
                     }
                 }
             }
-            echo json_encode($arrCategories, JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP);
+            echo json_encode($arrCategories, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP);
             break;
 
         case "categoryInFolders":

sources/SecureHandler.php

Spacing +7 added lines, -7 removed lines

@@ -25,13 +25,13 @@ 
      */
     public function __construct()
     {
-        if (! extension_loaded('openssl')) {
+        if (!extension_loaded('openssl')) {
             throw new \RuntimeException(sprintf(
                 "You need the OpenSSL extension to use %s",
                 __CLASS__
             ));
         }
-        if (! extension_loaded('mbstring')) {
+        if (!extension_loaded('mbstring')) {
             throw new \RuntimeException(sprintf(
                 "You need the Multibytes extension to use %s",
                 __CLASS__
@@ -48,7 +48,7 @@ 
      */
     public function open($save_path, $session_name)
     {
-        $this->key = $this->getKey('KEY_' . $session_name);
+        $this->key = $this->getKey('KEY_'.$session_name);
         return parent::open($save_path, $session_name);
     }
 
@@ -95,11 +95,11 @@ 
         // Authentication
         $hmac = hash_hmac(
             'SHA256',
-            $iv . $ciphertext,
+            $iv.$ciphertext,
             mb_substr($key, 32, null, '8bit'),
             true
         );
-        return $hmac . $iv . $ciphertext;
+        return $hmac.$iv.$ciphertext;
     }
 
     /**
@@ -117,11 +117,11 @@ 
         // Authentication
         $hmacNew = hash_hmac(
             'SHA256',
-            $iv . $ciphertext,
+            $iv.$ciphertext,
             mb_substr($key, 32, null, '8bit'),
             true
         );
-        if (! $this->hash_equals($hmac, $hmacNew)) {
+        if (!$this->hash_equals($hmac, $hmacNew)) {
             throw new \RuntimeException('Authentication failed');
         }
         // Decrypt

sources/main.queries.php

Indentation +14 added lines, -14 removed lines

@@ -99,7 +99,7 @@ 
                     prefix_table("users"),
                     array(
                         'fonction_id' => $data_roles['fonction_id']
-                       ),
+                        ),
                     "id = %i",
                     $_SESSION['user_id']
                 );
@@ -166,7 +166,7 @@ 
                         'pw' => $newPw,
                         'last_pw_change' => mktime(0, 0, 0, date('m'), date('d'), date('y')),
                         'last_pw' => $oldPw
-                       ),
+                        ),
                     "id = %i",
                     $_SESSION['user_id']
                 );
@@ -204,7 +204,7 @@ 
                 array(
                     'pw' => $newPw,
                     'last_pw_change' => mktime(0, 0, 0, date('m'), date('d'), date('y'))
-                   ),
+                    ),
                 "id = %i",
                 $dataReceived['user_id']
             );
@@ -240,7 +240,7 @@ 
                 array(
                     'pw' => $newPw,
                     'last_pw_change' => mktime(0, 0, 0, date('m'), date('d'), date('y'))
-                   ),
+                    ),
                 "id = %i",
                 $_SESSION['user_id']
             );
@@ -261,8 +261,8 @@ 
         }
         break;
     /**
-    * This will generate the QR Google Authenticator
-    */
+     * This will generate the QR Google Authenticator
+     */
     case "ga_generate_qr":
         // is this allowed by setting
         if (!isset($_SESSION['settings']['ga_reset_by_user']) || $_SESSION['settings']['ga_reset_by_user'] !== "1") {
@@ -311,7 +311,7 @@ 
                     array(
                         'ga' => $gaSecretKey,
                         'ga_temporary_code' => $gaTemporaryCode
-                       ),
+                        ),
                     "id = %i",
                     $data['id']
                 );
@@ -457,7 +457,7 @@ 
                 prefix_table("users"),
                 array(
                     'pw' => $newPw
-                   ),
+                    ),
                 "login = %s",
                 mysqli_escape_string($link, $login)
             );
@@ -551,7 +551,7 @@ 
                     prefix_table("users"),
                     array(
                         'encrypted_psk' => $_SESSION['user_settings']['encrypted_psk']
-                       ),
+                        ),
                     "id = %i",
                     $_SESSION['user_id']
                 );
@@ -635,7 +635,7 @@ 
             prefix_table("users"),
             array(
                 'encrypted_psk' => $_SESSION['user_settings']['encrypted_psk']
-               ),
+                ),
             "id = %i",
             $_SESSION['user_id']
         );
@@ -739,7 +739,7 @@ 
                 prefix_table("users"),
                 array(
                     'user_language' => $language
-                   ),
+                    ),
                 "id = %i",
                 $_SESSION['user_id']
             );
@@ -806,7 +806,7 @@ 
                         prefix_table("emails"),
                         array(
                             'status' => $status
-                           ),
+                            ),
                         "timestamp = %s",
                         $record['timestamp']
                     );
@@ -820,7 +820,7 @@ 
                 prefix_table("misc"),
                 array(
                     'valeur' => time()
-                   ),
+                    ),
                 "intitule = %s AND type = %s",
                 "sending_emails",
                 "cron"
@@ -1137,7 +1137,7 @@ 
                 prefix_table("misc"),
                 array(
                     'valeur' => time()
-                   ),
+                    ),
                 "type = %s AND intitule = %s",
                 'admin',
                 'send_stats_time'

Spacing +14 added lines, -14 removed lines

@@ -83,7 +83,7 @@ 
         $pwdlib = new PasswordLib\PasswordLib();
 
         // Prepare variables
-        $newPw = $pwdlib->createPasswordHash(htmlspecialchars_decode($dataReceived['new_pw']));    //bCrypt(htmlspecialchars_decode($dataReceived['new_pw']), COST);
+        $newPw = $pwdlib->createPasswordHash(htmlspecialchars_decode($dataReceived['new_pw'])); //bCrypt(htmlspecialchars_decode($dataReceived['new_pw']), COST);
 
         // User has decided to change is PW
         if (isset($_POST['change_pw_origine']) && $_POST['change_pw_origine'] === "user_change" && $_SESSION['user_admin'] !== "1") {
@@ -91,7 +91,7 @@ 
             $data_roles = DB::queryfirstrow("SELECT fonction_id FROM ".prefix_table("users")." WHERE id = %i", $_SESSION['user_id']);
 
             // check if badly written
-            $data_roles['fonction_id'] = array_filter(explode(',',str_replace(';', ',', $data_roles['fonction_id'])));
+            $data_roles['fonction_id'] = array_filter(explode(',', str_replace(';', ',', $data_roles['fonction_id'])));
             if ($data_roles['fonction_id'][0] === "") {
                 //$data_roles['fonction_id'] = array_filter($data_roles['fonction_id']);
                 $data_roles['fonction_id'] = implode(';', $data_roles['fonction_id']);
@@ -222,9 +222,9 @@ 
                 if (!empty($row['email']) && isset($_SESSION['settings']['enable_email_notification_on_user_pw_change']) && $_SESSION['settings']['enable_email_notification_on_user_pw_change'] == 1) {
                     sendEmail(
                         $LANG['forgot_pw_email_subject'],
-                        $LANG['forgot_pw_email_body'] . " " . htmlspecialchars_decode($dataReceived['new_pw']),
+                        $LANG['forgot_pw_email_body']." ".htmlspecialchars_decode($dataReceived['new_pw']),
                         $row[0],
-                        $LANG['forgot_pw_email_altbody_1'] . " " . htmlspecialchars_decode($dataReceived['new_pw'])
+                        $LANG['forgot_pw_email_altbody_1']." ".htmlspecialchars_decode($dataReceived['new_pw'])
                     );
                 }
             }
@@ -318,7 +318,7 @@ 
 
                 // send mail?
                 if (isset($_POST['send_email']) && $_POST['send_email'] === "1") {
-                    sendEmail (
+                    sendEmail(
                         $LANG['email_ga_subject'],
                         str_replace(
                             "#2FACode#",
@@ -368,7 +368,7 @@ 
      */
     case "send_pw_by_email":
         // generate key
-        $key =  GenerateCryptKey(50);
+        $key = GenerateCryptKey(50);
 
         // Get account and pw associated to email
         DB::query(
@@ -527,7 +527,7 @@ 
                 }
             }
         }
-        echo json_encode($arrOutput, JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP);
+        echo json_encode($arrOutput, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP);
         break;
     /**
      * Store the personal saltkey
@@ -863,10 +863,10 @@ 
             $pwgen->setCapitalize(true);
             $pwgen->setNumerals(true);
         } else {
-            $pwgen->setSecure(($_POST['secure'] == "true")? true : false);
-            $pwgen->setNumerals(($_POST['numerals'] == "true")? true : false);
-            $pwgen->setCapitalize(($_POST['capitalize'] == "true")? true : false);
-            $pwgen->setSymbols(($_POST['symbols'] == "true")? true : false);
+            $pwgen->setSecure(($_POST['secure'] == "true") ? true : false);
+            $pwgen->setNumerals(($_POST['numerals'] == "true") ? true : false);
+            $pwgen->setCapitalize(($_POST['capitalize'] == "true") ? true : false);
+            $pwgen->setSymbols(($_POST['symbols'] == "true") ? true : false);
         }
 
         echo prepareExchangedData(
@@ -927,7 +927,7 @@ 
                     prefix_table("statistics"),
                     array(
                         'scope' => 'item',
-                        'view' => $data['view']+1
+                        'view' => $data['view'] + 1
                     ),
                     "item_id = %i",
                     $_POST['id']
@@ -985,7 +985,7 @@ 
                 "existing_suggestions" => $nb_suggestions_waiting,
                 "text" => handleBackslash($return)
             ),
-            JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP
+            JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP
         );
         break;
 
@@ -1023,7 +1023,7 @@ 
                 'token' => $token,
                 'reason' => $_POST['reason'],
                 'creation_timestamp' => time(),
-                'end_timestamp' => time()+$_POST['duration']    // in secs
+                'end_timestamp' => time() + $_POST['duration']    // in secs
             )
         );
 

Braces +3 added lines, -1 removed lines

@@ -964,7 +964,9 @@
                     $return .= '<li onclick="displayItemNumber('.$record['id'].', '.$record['id_tree'].')"><i class="fa fa-hand-o-right"></i>&nbsp;'.($record['label']).'</li>';
                     $x++;
                     array_push($arrTmp, $record['id']);
-                    if ($x >= 10) break;
+                    if ($x >= 10) {
+                        break;
+                    }
                 }
             }
         }