Inspection of "Merge pull request #3025 from manusfreedom/teampas..." - nilsteampassnet/TeamPass - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — teampass_3.0 ( d39ab8...880668 )

by Nils

created 2022-02-01 17:48 UTC

Status

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -26,7 +26,7 @@
 block discarded – undo
  */
 
 if (
-  isset($_SESSION['CPM']) === false || $_SESSION['CPM'] !== 1
+    isset($_SESSION['CPM']) === false || $_SESSION['CPM'] !== 1
   || isset($_SESSION['user_id']) === false || empty($_SESSION['user_id']) === true
   || isset($_SESSION['key']) === false || empty($_SESSION['key']) === true
 ) {

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -43,15 +43,15 @@
 block discarded – undo
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'special', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 ?>
 

Please login to merge, or discard this patch.

pages/utilities.database.js.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -43,11 +43,11 @@
 block discarded – undo
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'utilities.logs', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>

Please login to merge, or discard this patch.

pages/ldap.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -43,15 +43,15 @@
 block discarded – undo
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 // LDAP type currently loaded
 $ldap_type = $SETTINGS['ldap_type'] ?? '';
 

Please login to merge, or discard this patch.

pages/ldap.js.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -43,11 +43,11 @@  discard block
 block discarded – undo
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], '2fa', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
                     if (data[i].selected_role === 1) {
                         selected_role = data[i].id;
                     }
-                    html_admin_by += '<option value="' + data[i].id + '"><?php echo langHdl('managers_of') . ' '; ?>' + data[i].title + '</option>';
+                    html_admin_by += '<option value="' + data[i].id + '"><?php echo langHdl('managers_of').' '; ?>' + data[i].title + '</option>';
                     html_roles += '<option value="' + data[i].id + '">' + data[i].title + '</option>';
                 }
                 $("#ldap_new_user_is_administrated_by").append(html_admin_by);

Please login to merge, or discard this patch.

pages/folders.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -43,15 +43,15 @@  discard block
 block discarded – undo
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'folders', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 // Ensure Complexity levels are translated
 if (defined('TP_PW_COMPLEXITY') === false) {
     define(
@@ -71,33 +71,33 @@  discard block
 block discarded – undo
 $complexityHtml = '<div id="hidden-select-complexity" class="hidden"><select id="select-complexity" class="form-control form-item-control save-me">';
 $complexitySelect = '';
 foreach (TP_PW_COMPLEXITY as $level) {
-    $complexitySelect .= '<option value="' . $level[0] . '">' . $level[1] . '</option>';
+    $complexitySelect .= '<option value="'.$level[0].'">'.$level[1].'</option>';
 }
-$complexityHtml .= $complexitySelect . '</select></div>';
+$complexityHtml .= $complexitySelect.'</select></div>';
 // Prepare folders
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 //Build tree
-$tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+$tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
 $tree->register();
 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 /* Get full tree structure */
 $tst = $tree->getDescendants();
 // prepare options list
-$droplist = '<option value="na">---' . langHdl('select') . '---</option>';
+$droplist = '<option value="na">---'.langHdl('select').'---</option>';
 if ((int) $_SESSION['is_admin'] === 1 || (int) $_SESSION['user_manager'] === 1 || (int) $_SESSION['can_create_root_folder'] === 1) {
-    $droplist .= '<option value="0">' . langHdl('root') . '</option>';
+    $droplist .= '<option value="0">'.langHdl('root').'</option>';
 }
 foreach ($tst as $t) {
     if (
         in_array($t->id, $_SESSION['groupes_visibles']) === true
         && in_array($t->id, $_SESSION['personal_visible_groups']) === false
     ) {
-        $droplist .= '<option value="' . $t->id . '">' . addslashes($t->title);
+        $droplist .= '<option value="'.$t->id.'">'.addslashes($t->title);
         $text = '';
         foreach ($tree->getPath($t->id, false) as $fld) {
-            $text .= empty($text) === true ? '     [' . $fld->title : ' > ' . $fld->title;
+            $text .= empty($text) === true ? '     ['.$fld->title : ' > '.$fld->title;
         }
-        $droplist .= (empty($text) === true ? '' : $text . '</i>]') . '</option>';
+        $droplist .= (empty($text) === true ? '' : $text.'</i>]').'</option>';
     }
 }
 
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
                                 <th scope="col" min-width="200px"><?php echo langHdl('group'); ?></th>
                                 <th scope="col" min-width="200px"><?php echo langHdl('group_parent'); ?></th>
                                 <th scope="col" width="50px"><i class="fas fa-gavel fa-lg infotip" title="<?php echo langHdl('password_strength'); ?>"></i></th>
-                                <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo langHdl('group_pw_duration') . ' ' . langHdl('group_pw_duration_tip'); ?>"></i></th>
+                                <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo langHdl('group_pw_duration').' '.langHdl('group_pw_duration_tip'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-pen fa-lg infotip" title="<?php echo langHdl('auth_creation_without_complexity'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-edit fa-lg infotip" title="<?php echo langHdl('auth_modification_without_complexity'); ?>"></i></th>
                             </tr>

Please login to merge, or discard this patch.

pages/folders.js.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -43,11 +43,11 @@
 block discarded – undo
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'folders', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>

Please login to merge, or discard this patch.

pages/backups.js.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -43,11 +43,11 @@  discard block
 block discarded – undo
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], '2fa', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
                             // ERROR
                             toastr.remove();
                             toastr.error(
-                                '<?php echo langHdl('server_answer_error') . '<br />' . langHdl('server_returned_data') . ':<br />'; ?>' + data.error,
+                                '<?php echo langHdl('server_answer_error').'<br />'.langHdl('server_returned_data').':<br />'; ?>' + data.error,
                                 '<?php echo langHdl('error'); ?>', {
                                     timeOut: 5000,
                                     progressBar: true
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
                                         // error
                                         toastr.remove();
                                         toastr.error(
-                                            '<?php echo langHdl('server_answer_error') . '<br />' . langHdl('server_returned_data') . ':<br />'; ?>' + data.error,
+                                            '<?php echo langHdl('server_answer_error').'<br />'.langHdl('server_returned_data').':<br />'; ?>' + data.error,
                                             '<?php echo langHdl('error'); ?>', {
                                                 timeOut: 5000,
                                                 progressBar: true
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
                             // ERROR
                             toastr.remove();
                             toastr.error(
-                                '<?php echo langHdl('server_answer_error') . '<br />' . langHdl('server_returned_data') . ':<br />'; ?>' + data.error,
+                                '<?php echo langHdl('server_answer_error').'<br />'.langHdl('server_returned_data').':<br />'; ?>' + data.error,
                                 '<?php echo langHdl('error'); ?>', {
                                     timeOut: 5000,
                                     progressBar: true

Please login to merge, or discard this patch.

pages/users.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -43,19 +43,19 @@  discard block
 block discarded – undo
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'users', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 // Load superGlobals
-include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -72,29 +72,29 @@  discard block
 block discarded – undo
 // If administrator then all roles are shown
 // else only the Roles the users is associated to.
 if ((int) $_SESSION['is_admin'] === 1) {
-    $optionsManagedBy .= '<option value="0">' . langHdl('administrators_only') . '</option>';
+    $optionsManagedBy .= '<option value="0">'.langHdl('administrators_only').'</option>';
 }
 
 $rows = DB::query(
     'SELECT id, title, creator_id
-    FROM ' . prefixTable('roles_title') . '
+    FROM ' . prefixTable('roles_title').'
     ORDER BY title ASC'
 );
 foreach ($rows as $record) {
     if ((int) $_SESSION['is_admin'] === 1 || in_array($record['id'], $_SESSION['user_roles']) === true) {
-        $optionsManagedBy .= '<option value="' . $record['id'] . '">' . langHdl('managers_of') . ' ' . addslashes($record['title']) . '</option>';
+        $optionsManagedBy .= '<option value="'.$record['id'].'">'.langHdl('managers_of').' '.addslashes($record['title']).'</option>';
     }
     if (
         (int) $_SESSION['is_admin'] === 1
         || (((int) $superGlobal->get('user_manager', 'SESSION') === 1 || (int) $_SESSION['user_can_manage_all_users'] === 1)
             && (in_array($record['id'], $userRoles) === true) || (int) $record['creator_id'] === (int) $_SESSION['user_id'])
     ) {
-        $optionsRoles .= '<option value="' . $record['id'] . '">' . addslashes($record['title']) . '</option>';
+        $optionsRoles .= '<option value="'.$record['id'].'">'.addslashes($record['title']).'</option>';
     }
 }
 
 //Build tree
-$tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+$tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
 $tree->register();
 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 $treeDesc = $tree->getDescendants();
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
         for ($y = 1; $y < $t->nlevel; ++$y) {
             $ident .= '&nbsp;&nbsp;';
         }
-        $foldersList .= '<option value="' . $t->id . '">' . $ident . htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8') . '</option>';
+        $foldersList .= '<option value="'.$t->id.'">'.$ident.htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8').'</option>';
     }
 }
 
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
                         </button><?php
                                     echo isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && (int) $_SESSION['is_admin'] === 1 ?
                                         '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="ldap-sync">
-                            <i class="fas fa-address-card mr-2"></i>' . langHdl('ldap_synchronization') . '
+                            <i class="fas fa-address-card mr-2"></i>' . langHdl('ldap_synchronization').'
                         </button>' : '';
                                     ?>
                     </h3>
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
                                             <?php
                                             foreach (TP_PW_COMPLEXITY as $entry) {
                                                 echo '
-                                            <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>';
+                                            <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>';
                                             }
                                             ?>
                                         </select>

Please login to merge, or discard this patch.

pages/fields.js.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -43,11 +43,11 @@  discard block
 block discarded – undo
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], '2fa', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
             if (parseInt($(this).data('category')) === parseInt(selectedCategory)) {
                 fields.push({
                     id: $(this).data('order'),
-                    text: '<?php echo langHdl('before') . ' '; ?>' + $(this).find('td:eq(1)').text()
+                    text: '<?php echo langHdl('before').' '; ?>' + $(this).find('td:eq(1)').text()
                 });
             }
         });
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
                 if ($(this).data('category') === categoryId) {
                     fields.push({
                         id: $(this).data('order'),
-                        text: '<?php echo langHdl('before') . ' '; ?>' + $(this).find('td:eq(1)').text()
+                        text: '<?php echo langHdl('before').' '; ?>' + $(this).find('td:eq(1)').text()
                     });
                 }
             });
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
                                     '</tr>';
 
                                 // Prepare list of categories for Form
-                                categoriesList += '<option value="' + categoryId + '"><?php echo langHdl('before') . ' '; ?>' + val.title + '</option>';
+                                categoriesList += '<option value="' + categoryId + '"><?php echo langHdl('before').' '; ?>' + val.title + '</option>';
 
                                 positionCategory += 1;
                             } else {

Please login to merge, or discard this patch.

		@@ -43,15 +43,15 @@ discard block
		block discarded – undo
43	43	}
44	44
45	45	/* do checks */
46		-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
	46	+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
47	47	if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'folders', $SETTINGS) === false) {
48	48	$_SESSION['error']['code'] = ERR_NOT_ALLOWED;
49		- include $SETTINGS['cpassman_dir'] . '/error.php';
	49	+ include $SETTINGS['cpassman_dir'].'/error.php';
50	50	exit;
51	51	}
52	52
53	53	// Load template
54		-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
	54	+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
55	55	// Ensure Complexity levels are translated
56	56	if (defined('TP_PW_COMPLEXITY') === false) {
57	57	define(
		@@ -71,33 +71,33 @@ discard block
		block discarded – undo
71	71	$complexityHtml = '<div id="hidden-select-complexity" class="hidden"><select id="select-complexity" class="form-control form-item-control save-me">';
72	72	$complexitySelect = '';
73	73	foreach (TP_PW_COMPLEXITY as $level) {
74		- $complexitySelect .= '<option value="' . $level[0] . '">' . $level[1] . '</option>';
	74	+ $complexitySelect .= '<option value="'.$level[0].'">'.$level[1].'</option>';
75	75	}
76		-$complexityHtml .= $complexitySelect . '</select></div>';
	76	+$complexityHtml .= $complexitySelect.'</select></div>';
77	77	// Prepare folders
78		-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
	78	+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
79	79	//Build tree
80		-$tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
	80	+$tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
81	81	$tree->register();
82	82	$tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
83	83	/* Get full tree structure */
84	84	$tst = $tree->getDescendants();
85	85	// prepare options list
86		-$droplist = '<option value="na">---' . langHdl('select') . '---</option>';
	86	+$droplist = '<option value="na">---'.langHdl('select').'---</option>';
87	87	if ((int) $_SESSION['is_admin'] === 1 \|\| (int) $_SESSION['user_manager'] === 1 \|\| (int) $_SESSION['can_create_root_folder'] === 1) {
88		- $droplist .= '<option value="0">' . langHdl('root') . '</option>';
	88	+ $droplist .= '<option value="0">'.langHdl('root').'</option>';
89	89	}
90	90	foreach ($tst as $t) {
91	91	if (
92	92	in_array($t->id, $_SESSION['groupes_visibles']) === true
93	93	&& in_array($t->id, $_SESSION['personal_visible_groups']) === false
94	94	) {
95		- $droplist .= '<option value="' . $t->id . '">' . addslashes($t->title);
	95	+ $droplist .= '<option value="'.$t->id.'">'.addslashes($t->title);
96	96	$text = '';
97	97	foreach ($tree->getPath($t->id, false) as $fld) {
98		- $text .= empty($text) === true ? ' [' . $fld->title : ' > ' . $fld->title;
	98	+ $text .= empty($text) === true ? ' ['.$fld->title : ' > '.$fld->title;
99	99	}
100		- $droplist .= (empty($text) === true ? '' : $text . '</i>]') . '</option>';
	100	+ $droplist .= (empty($text) === true ? '' : $text.'</i>]').'</option>';
101	101	}
102	102	}
103	103
		@@ -260,7 +260,7 @@ discard block
		block discarded – undo
260	260	<th scope="col" min-width="200px"><?php echo langHdl('group'); ?></th>
261	261	<th scope="col" min-width="200px"><?php echo langHdl('group_parent'); ?></th>
262	262	<th scope="col" width="50px"><i class="fas fa-gavel fa-lg infotip" title="<?php echo langHdl('password_strength'); ?>"></i></th>
263		- <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo langHdl('group_pw_duration') . ' ' . langHdl('group_pw_duration_tip'); ?>"></i></th>
	263	+ <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo langHdl('group_pw_duration').' '.langHdl('group_pw_duration_tip'); ?>"></i></th>
264	264	<th scope="col" width="50px"><i class="fas fa-pen fa-lg infotip" title="<?php echo langHdl('auth_creation_without_complexity'); ?>"></i></th>
265	265	<th scope="col" width="50px"><i class="fas fa-edit fa-lg infotip" title="<?php echo langHdl('auth_modification_without_complexity'); ?>"></i></th>
266	266	</tr>

		@@ -43,19 +43,19 @@ discard block
		block discarded – undo
43	43	}
44	44
45	45	/* do checks */
46		-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
	46	+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
47	47	if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'users', $SETTINGS) === false) {
48	48	$_SESSION['error']['code'] = ERR_NOT_ALLOWED;
49		- include $SETTINGS['cpassman_dir'] . '/error.php';
	49	+ include $SETTINGS['cpassman_dir'].'/error.php';
50	50	exit;
51	51	}
52	52
53		-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
	53	+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
54	54	// Load superGlobals
55		-include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
	55	+include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
56	56	$superGlobal = new protect\SuperGlobal\SuperGlobal();
57	57	// Connect to mysql server
58		-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
	58	+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
59	59	if (defined('DB_PASSWD_CLEAR') === false) {
60	60	define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
61	61	}
		@@ -72,29 +72,29 @@ discard block
		block discarded – undo
72	72	// If administrator then all roles are shown
73	73	// else only the Roles the users is associated to.
74	74	if ((int) $_SESSION['is_admin'] === 1) {
75		- $optionsManagedBy .= '<option value="0">' . langHdl('administrators_only') . '</option>';
	75	+ $optionsManagedBy .= '<option value="0">'.langHdl('administrators_only').'</option>';
76	76	}
77	77
78	78	$rows = DB::query(
79	79	'SELECT id, title, creator_id
80		- FROM ' . prefixTable('roles_title') . '
	80	+ FROM ' . prefixTable('roles_title').'
81	81	ORDER BY title ASC'
82	82	);
83	83	foreach ($rows as $record) {
84	84	if ((int) $_SESSION['is_admin'] === 1 \|\| in_array($record['id'], $_SESSION['user_roles']) === true) {
85		- $optionsManagedBy .= '<option value="' . $record['id'] . '">' . langHdl('managers_of') . ' ' . addslashes($record['title']) . '</option>';
	85	+ $optionsManagedBy .= '<option value="'.$record['id'].'">'.langHdl('managers_of').' '.addslashes($record['title']).'</option>';
86	86	}
87	87	if (
88	88	(int) $_SESSION['is_admin'] === 1
89	89	\|\| (((int) $superGlobal->get('user_manager', 'SESSION') === 1 \|\| (int) $_SESSION['user_can_manage_all_users'] === 1)
90	90	&& (in_array($record['id'], $userRoles) === true) \|\| (int) $record['creator_id'] === (int) $_SESSION['user_id'])
91	91	) {
92		- $optionsRoles .= '<option value="' . $record['id'] . '">' . addslashes($record['title']) . '</option>';
	92	+ $optionsRoles .= '<option value="'.$record['id'].'">'.addslashes($record['title']).'</option>';
93	93	}
94	94	}
95	95
96	96	//Build tree
97		-$tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
	97	+$tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
98	98	$tree->register();
99	99	$tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
100	100	$treeDesc = $tree->getDescendants();
		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108	for ($y = 1; $y < $t->nlevel; ++$y) {
109	109	$ident .= '  ';
110	110	}
111		- $foldersList .= '<option value="' . $t->id . '">' . $ident . htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8') . '</option>';
	111	+ $foldersList .= '<option value="'.$t->id.'">'.$ident.htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8').'</option>';
112	112	}
113	113	}
114	114
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	</button><?php
146	146	echo isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && (int) $_SESSION['is_admin'] === 1 ?
147	147	'<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="ldap-sync">
148		- <i class="fas fa-address-card mr-2"></i>' . langHdl('ldap_synchronization') . '
	148	+ <i class="fas fa-address-card mr-2"></i>' . langHdl('ldap_synchronization').'
149	149	</button>' : '';
150	150	?>
151	151	</h3>
		@@ -217,7 +217,7 @@ discard block
		block discarded – undo
217	217	<?php
218	218	foreach (TP_PW_COMPLEXITY as $entry) {
219	219	echo '
220		- <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>';
	220	+ <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>';
221	221	}
222	222	?>
223	223	</select>

		@@ -26,7 +26,7 @@
		block discarded – undo
26	26	*/
27	27
28	28	if (
29		- isset($_SESSION['CPM']) === false \|\| $_SESSION['CPM'] !== 1
	29	+ isset($_SESSION['CPM']) === false \|\| $_SESSION['CPM'] !== 1
30	30	\|\| isset($_SESSION['user_id']) === false \|\| empty($_SESSION['user_id']) === true
31	31	\|\| isset($_SESSION['key']) === false \|\| empty($_SESSION['key']) === true
32	32	) {

		@@ -43,15 +43,15 @@
		block discarded – undo
43	43	}
44	44
45	45	/* do checks */
46		-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
	46	+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
47	47	if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'special', $SETTINGS) === false) {
48	48	$_SESSION['error']['code'] = ERR_NOT_ALLOWED;
49		- include $SETTINGS['cpassman_dir'] . '/error.php';
	49	+ include $SETTINGS['cpassman_dir'].'/error.php';
50	50	exit;
51	51	}
52	52
53	53	// Load template
54		-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
	54	+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
55	55
56	56	?>
57	57

		@@ -43,11 +43,11 @@
		block discarded – undo
43	43	}
44	44
45	45	/* do checks */
46		-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
	46	+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
47	47	if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'utilities.logs', $SETTINGS) === false) {
48	48	$_SESSION['error']['code'] = ERR_NOT_ALLOWED;
49	49	//not allowed page
50		- include $SETTINGS['cpassman_dir'] . '/error.php';
	50	+ include $SETTINGS['cpassman_dir'].'/error.php';
51	51	exit;
52	52	}
53	53	?>

		@@ -43,11 +43,11 @@ discard block
		block discarded – undo
43	43	}
44	44
45	45	/* do checks */
46		-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
	46	+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
47	47	if (checkUser($_SESSION['user_id'], $_SESSION['key'], '2fa', $SETTINGS) === false) {
48	48	$_SESSION['error']['code'] = ERR_NOT_ALLOWED;
49	49	//not allowed page
50		- include $SETTINGS['cpassman_dir'] . '/error.php';
	50	+ include $SETTINGS['cpassman_dir'].'/error.php';
51	51	exit;
52	52	}
53	53	?>
		@@ -138,7 +138,7 @@ discard block
		block discarded – undo
138	138	if (data[i].selected_role === 1) {
139	139	selected_role = data[i].id;
140	140	}
141		- html_admin_by += '<option value="' + data[i].id + '"><?php echo langHdl('managers_of') . ' '; ?>' + data[i].title + '</option>';
	141	+ html_admin_by += '<option value="' + data[i].id + '"><?php echo langHdl('managers_of').' '; ?>' + data[i].title + '</option>';
142	142	html_roles += '<option value="' + data[i].id + '">' + data[i].title + '</option>';
143	143	}
144	144	$("#ldap_new_user_is_administrated_by").append(html_admin_by);

nilsteampassnet / TeamPass

Push — teampass_3.0 ( d39ab8...880668 )

Status

Category

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch