Inspection of "Code improvements" - nilsteampassnet/TeamPass - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — teampass_3.0 ( 11332f...9ad4f0 )

by Nils

created 2021-08-04 16:30 UTC

Status

Spacing +47 added lines, -52 removed lines patch added patch discarded remove patch

@@ -42,11 +42,11 @@  discard block
 block discarded – undo
 }
 
 // includes
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
 // header
 header('Content-type: text/html; charset=utf-8');
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
 }
 
 // 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,7 +72,7 @@  discard block
 block discarded – undo
 DB::$encoding = DB_ENCODING;
 
 // Superglobal load
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 $get = [];
 $get['user_tree_structure'] = $superGlobal->get('user_tree_structure', 'GET');
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
 
 
 $lastFolderChange = DB::query(
-    'SELECT * FROM ' . prefixTable('misc') . '
+    'SELECT * FROM '.prefixTable('misc').'
     WHERE type = %s AND intitule = %s',
     'timestamp',
     'last_folder_change'
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
     || (isset($get['force_refresh']) === true && (int) $get['force_refresh'] === 1)
 ) {
     // 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');
 
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
     $SETTINGS
 ) {
     // Load library
-    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();
 
     // Prepare superGlobal variables
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
                 // get count of Items in this folder
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE inactif=%i AND id_tree = %i',
                     0,
                     $node->id
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
                 // get info about current folder
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE parent_id = %i',
                     $node->id
                 );
@@ -263,11 +263,10 @@  discard block
 block discarded – undo
 
                 // If personal Folder, convert id into user name
                 $node->title = $node->title === $session_user_id && (int) $node->nlevel === 1 ?
-                    $session_login :
-                    ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
+                    $session_login : ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
 
                 // prepare json return for current node
-                $parent = $node->parent_id === 0 ? '#' : 'li_' . $node->parent_id;
+                $parent = $node->parent_id === 0 ? '#' : 'li_'.$node->parent_id;
 
                 // special case for READ-ONLY folder
                 $title = $session_user_read_only === true && in_array($node->id, $session_personal_folders) === false ? langHdl('read_only_account') : $title;
@@ -277,33 +276,30 @@  discard block
 block discarded – undo
 
                 if (in_array($node->id, $session_groupes_visibles)) {
                     if (in_array($node->id, $session_read_only_folders)) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                         $title = langHdl('read_only_account');
                         $restricted = 1;
                         $folderClass = 'folder_not_droppable';
                     } elseif ($session_user_read_only === true && !in_array($node->id, $session_personal_visible_groups)) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                     }
                     $text .=
-                        ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . $itemsNb . '</span>'
+                        ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.$itemsNb.'</span>'
                         .(isset($SETTINGS['tree_counters']) && $SETTINGS['tree_counters'] === 1 ?
-                            '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  :
-                            '')
+                            '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '')
                         .'</span>';
                 } elseif (in_array($node->id, $listFoldersLimitedKeys)) {
                     $restricted = '1';
                     $text .= 
                         $session_user_read_only === true ?
-                            "<i class='far fa-eye fa-xs mr-1'></i>" :
-                            '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_folders_limited[$node->id]) . '</span>';
+                            "<i class='far fa-eye fa-xs mr-1'></i>" : '<span class="badge badge-danger ml-2 items_count" id="itcount_'.$node->id.'">'.count($session_list_folders_limited[$node->id]).'</span>';
                 } elseif (in_array($node->id, $listRestrictedFoldersForItemsKeys)) {
                     $restricted = '1';
                     if ($session_user_read_only === true) {
-                        $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                        $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                     }
                     $text .= $session_user_read_only === true ? 
-                        "<i class='far fa-eye fa-xs mr-1'></i>" :
-                        '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_restricted_folders_for_items[$node->id]) . '</span>';
+                        "<i class='far fa-eye fa-xs mr-1'></i>" : '<span class="badge badge-danger ml-2 items_count" id="itcount_'.$node->id.'">'.count($session_list_restricted_folders_for_items[$node->id]).'</span>';
                 } else {
                     $restricted = '1';
                     $folderClass = 'folder_not_droppable';
@@ -329,18 +325,18 @@  discard block
 block discarded – undo
                     array_push(
                         $ret_json,
                         array(
-                            'id' => 'li_' . $node->id,
+                            'id' => 'li_'.$node->id,
                             'parent' => $parent,
                             'text' => $text,
                             'children' => $childrenNb === 0 ? false : true,
                             'li_attr' => array(
                                 'class' => 'jstreeopen',
-                                'title' => 'ID [' . $node->id . '] ' . $title,
+                                'title' => 'ID ['.$node->id.'] '.$title,
                             ),
                             'a_attr' => array(
-                                'id' => 'fld_' . $node->id,
+                                'id' => 'fld_'.$node->id,
                                 'class' => $folderClass,
-                                'onclick' => 'ListerItems(' . $node->id . ', ' . $restricted . ', 0, 1)',
+                                'onclick' => 'ListerItems('.$node->id.', '.$restricted.', 0, 1)',
                                 'data-title' => $node->title,
                             ),
                         )
@@ -349,13 +345,13 @@  discard block
 block discarded – undo
                     array_push(
                         $ret_json,
                         array(
-                            'id' => 'li_' . $node->id,
+                            'id' => 'li_'.$node->id,
                             'parent' =>  $parent,
                             'children' => $childrenNb === 0 ? false : true,
-                            'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>' . $text,
+                            'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text,
                             'li_attr' => array(
                                 'class' => '',
-                                'title' => 'ID [' . $node->id . '] ' . langHdl('no_access'),
+                                'title' => 'ID ['.$node->id.'] '.langHdl('no_access'),
                             ),
                         )
                     );
@@ -407,7 +403,7 @@  discard block
 block discarded – undo
     }
 
     // Load library
-    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();
 
     // Prepare superGlobal variables
@@ -444,7 +440,7 @@  discard block
 block discarded – undo
                 ) === true
             ) {
                 DB::query(
-                    'SELECT * FROM ' . prefixTable('items') . '
+                    'SELECT * FROM '.prefixTable('items').'
                     WHERE inactif=%i AND id_tree = %i',
                     0,
                     $node
@@ -474,7 +470,7 @@  discard block
 block discarded – undo
         if ($displayThisNode === true) {
             // get info about current folder
             DB::query(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE inactif=%i AND id_tree = %i',
                 0,
                 $completTree[$nodeId]->id
@@ -502,7 +498,7 @@  discard block
 block discarded – undo
 
             if (in_array($completTree[$nodeId]->id, $session_groupes_visibles) === true) {
                 if (in_array($completTree[$nodeId]->id, $session_read_only_folders) === true) {
-                    $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                    $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                     $title = langHdl('read_only_account');
                     $restricted = 1;
                     $folderClass = 'folder_not_droppable';
@@ -510,26 +506,25 @@  discard block
 block discarded – undo
                     $session_user_read_only === true
                     && in_array($completTree[$nodeId]->id, $session_personal_visible_groups) === false
                 ) {
-                    $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                    $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                 }
                 $text .= 
-                    '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . $itemsNb .
+                    '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.$itemsNb.
                     ((isset($SETTINGS['tree_counters']) === true && (int) $SETTINGS['tree_counters'] === 1) ?
-                        '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  :
-                        '')
+                        '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '')
                     . '</span>';
             } elseif (in_array($completTree[$nodeId]->id, $listFoldersLimitedKeys) === true) {
                 $restricted = '1';
                 if ($session_user_read_only === true) {
-                    $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                    $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                 }
-                $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . count($session_list_folders_limited[$completTree[$nodeId]->id]);
+                $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.count($session_list_folders_limited[$completTree[$nodeId]->id]);
             } elseif (in_array($completTree[$nodeId]->id, $listRestrictedFoldersForItemsKeys) === true) {
                 $restricted = '1';
                 if ($session_user_read_only === true) {
-                    $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
+                    $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
                 }
-                $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . count($session_list_restricted_folders_for_items[$completTree[$nodeId]->id]) . '</span>';
+                $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.count($session_list_restricted_folders_for_items[$completTree[$nodeId]->id]).'</span>';
             } else {
                 $restricted = '1';
                 $folderClass = 'folder_not_droppable';
@@ -566,7 +561,7 @@  discard block
 block discarded – undo
             }
 
             // prepare json return for current node
-            $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_' . $completTree[$nodeId]->parent_id;
+            $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_'.$completTree[$nodeId]->parent_id;
 
             // handle displaying
             if (
@@ -586,17 +581,17 @@  discard block
 block discarded – undo
                 array_push(
                     $ret_json,
                     array(
-                        'id' => 'li_' . $completTree[$nodeId]->id,
+                        'id' => 'li_'.$completTree[$nodeId]->id,
                         'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                         'text' => $text,
                         'li_attr' => array(
                             'class' => 'jstreeopen',
-                            'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . $title,
+                            'title' => 'ID ['.$completTree[$nodeId]->id.'] '.$title,
                         ),
                         'a_attr' => array(
-                            'id' => 'fld_' . $completTree[$nodeId]->id,
+                            'id' => 'fld_'.$completTree[$nodeId]->id,
                             'class' => $folderClass,
-                            'onclick' => 'ListerItems(' . $completTree[$nodeId]->id . ', ' . $restricted . ', 0, 1)',
+                            'onclick' => 'ListerItems('.$completTree[$nodeId]->id.', '.$restricted.', 0, 1)',
                             'data-title' => $completTree[$nodeId]->title,
                         ),
                     )
@@ -605,12 +600,12 @@  discard block
 block discarded – undo
                 array_push(
                     $ret_json,
                     array(
-                        'id' => 'li_' . $completTree[$nodeId]->id,
+                        'id' => 'li_'.$completTree[$nodeId]->id,
                         'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
-                        'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>' . $text,
+                        'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text,
                         'li_attr' => array(
                             'class' => '',
-                            'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . langHdl('no_access'),
+                            'title' => 'ID ['.$completTree[$nodeId]->id.'] '.langHdl('no_access'),
                         ),
                     )
                 );

Please login to merge, or discard this patch.

		@@ -42,11 +42,11 @@ discard block
		block discarded – undo
42	42	}
43	43
44	44	// includes
45		-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
46		-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
47		-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
48		-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
49		-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
	45	+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
	46	+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
	47	+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
	48	+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
	49	+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
50	50
51	51	// header
52	52	header('Content-type: text/html; charset=utf-8');
		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	}
61	61
62	62	// Connect to mysql server
63		-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
	63	+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
64	64	if (defined('DB_PASSWD_CLEAR') === false) {
65	65	define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
66	66	}
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	DB::$encoding = DB_ENCODING;
73	73
74	74	// Superglobal load
75		-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
	75	+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
76	76	$superGlobal = new protect\SuperGlobal\SuperGlobal();
77	77	$get = [];
78	78	$get['user_tree_structure'] = $superGlobal->get('user_tree_structure', 'GET');
		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82
83	83
84	84	$lastFolderChange = DB::query(
85		- 'SELECT * FROM ' . prefixTable('misc') . '
	85	+ 'SELECT * FROM '.prefixTable('misc').'
86	86	WHERE type = %s AND intitule = %s',
87	87	'timestamp',
88	88	'last_folder_change'
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	\|\| (isset($get['force_refresh']) === true && (int) $get['force_refresh'] === 1)
94	94	) {
95	95	// Build tree
96		- $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
	96	+ $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
97	97	$tree->register();
98	98	$tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
99	99
		@@ -191,7 +191,7 @@ discard block
		block discarded – undo
191	191	$SETTINGS
192	192	) {
193	193	// Load library
194		- include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
	194	+ include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
195	195	$superGlobal = new protect\SuperGlobal\SuperGlobal();
196	196
197	197	// Prepare superGlobal variables
		@@ -245,7 +245,7 @@ discard block
		block discarded – undo
245	245	// get count of Items in this folder
246	246	DB::query(
247	247	'SELECT *
248		- FROM ' . prefixTable('items') . '
	248	+ FROM ' . prefixTable('items').'
249	249	WHERE inactif=%i AND id_tree = %i',
250	250	0,
251	251	$node->id
		@@ -255,7 +255,7 @@ discard block
		block discarded – undo
255	255	// get info about current folder
256	256	DB::query(
257	257	'SELECT *
258		- FROM ' . prefixTable('nested_tree') . '
	258	+ FROM ' . prefixTable('nested_tree').'
259	259	WHERE parent_id = %i',
260	260	$node->id
261	261	);
		@@ -263,11 +263,10 @@ discard block
		block discarded – undo
263	263
264	264	// If personal Folder, convert id into user name
265	265	$node->title = $node->title === $session_user_id && (int) $node->nlevel === 1 ?
266		- $session_login :
267		- ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
	266	+ $session_login : ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
268	267
269	268	// prepare json return for current node
270		- $parent = $node->parent_id === 0 ? '#' : 'li_' . $node->parent_id;
	269	+ $parent = $node->parent_id === 0 ? '#' : 'li_'.$node->parent_id;
271	270
272	271	// special case for READ-ONLY folder
273	272	$title = $session_user_read_only === true && in_array($node->id, $session_personal_folders) === false ? langHdl('read_only_account') : $title;
		@@ -277,33 +276,30 @@ discard block
		block discarded – undo
277	276
278	277	if (in_array($node->id, $session_groupes_visibles)) {
279	278	if (in_array($node->id, $session_read_only_folders)) {
280		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	279	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
281	280	$title = langHdl('read_only_account');
282	281	$restricted = 1;
283	282	$folderClass = 'folder_not_droppable';
284	283	} elseif ($session_user_read_only === true && !in_array($node->id, $session_personal_visible_groups)) {
285		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	284	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
286	285	}
287	286	$text .=
288		- ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . $itemsNb . '</span>'
	287	+ ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.$itemsNb.'</span>'
289	288	.(isset($SETTINGS['tree_counters']) && $SETTINGS['tree_counters'] === 1 ?
290		- '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) :
291		- '')
	289	+ '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '')
292	290	.'</span>';
293	291	} elseif (in_array($node->id, $listFoldersLimitedKeys)) {
294	292	$restricted = '1';
295	293	$text .=
296	294	$session_user_read_only === true ?
297		- "<i class='far fa-eye fa-xs mr-1'></i>" :
298		- '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_folders_limited[$node->id]) . '</span>';
	295	+ "<i class='far fa-eye fa-xs mr-1'></i>" : '<span class="badge badge-danger ml-2 items_count" id="itcount_'.$node->id.'">'.count($session_list_folders_limited[$node->id]).'</span>';
299	296	} elseif (in_array($node->id, $listRestrictedFoldersForItemsKeys)) {
300	297	$restricted = '1';
301	298	if ($session_user_read_only === true) {
302		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	299	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
303	300	}
304	301	$text .= $session_user_read_only === true ?
305		- "<i class='far fa-eye fa-xs mr-1'></i>" :
306		- '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_restricted_folders_for_items[$node->id]) . '</span>';
	302	+ "<i class='far fa-eye fa-xs mr-1'></i>" : '<span class="badge badge-danger ml-2 items_count" id="itcount_'.$node->id.'">'.count($session_list_restricted_folders_for_items[$node->id]).'</span>';
307	303	} else {
308	304	$restricted = '1';
309	305	$folderClass = 'folder_not_droppable';
		@@ -329,18 +325,18 @@ discard block
		block discarded – undo
329	325	array_push(
330	326	$ret_json,
331	327	array(
332		- 'id' => 'li_' . $node->id,
	328	+ 'id' => 'li_'.$node->id,
333	329	'parent' => $parent,
334	330	'text' => $text,
335	331	'children' => $childrenNb === 0 ? false : true,
336	332	'li_attr' => array(
337	333	'class' => 'jstreeopen',
338		- 'title' => 'ID [' . $node->id . '] ' . $title,
	334	+ 'title' => 'ID ['.$node->id.'] '.$title,
339	335	),
340	336	'a_attr' => array(
341		- 'id' => 'fld_' . $node->id,
	337	+ 'id' => 'fld_'.$node->id,
342	338	'class' => $folderClass,
343		- 'onclick' => 'ListerItems(' . $node->id . ', ' . $restricted . ', 0, 1)',
	339	+ 'onclick' => 'ListerItems('.$node->id.', '.$restricted.', 0, 1)',
344	340	'data-title' => $node->title,
345	341	),
346	342	)
		@@ -349,13 +345,13 @@ discard block
		block discarded – undo
349	345	array_push(
350	346	$ret_json,
351	347	array(
352		- 'id' => 'li_' . $node->id,
	348	+ 'id' => 'li_'.$node->id,
353	349	'parent' => $parent,
354	350	'children' => $childrenNb === 0 ? false : true,
355		- 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>' . $text,
	351	+ 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text,
356	352	'li_attr' => array(
357	353	'class' => '',
358		- 'title' => 'ID [' . $node->id . '] ' . langHdl('no_access'),
	354	+ 'title' => 'ID ['.$node->id.'] '.langHdl('no_access'),
359	355	),
360	356	)
361	357	);
		@@ -407,7 +403,7 @@ discard block
		block discarded – undo
407	403	}
408	404
409	405	// Load library
410		- include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
	406	+ include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
411	407	$superGlobal = new protect\SuperGlobal\SuperGlobal();
412	408
413	409	// Prepare superGlobal variables
		@@ -444,7 +440,7 @@ discard block
		block discarded – undo
444	440	) === true
445	441	) {
446	442	DB::query(
447		- 'SELECT * FROM ' . prefixTable('items') . '
	443	+ 'SELECT * FROM '.prefixTable('items').'
448	444	WHERE inactif=%i AND id_tree = %i',
449	445	0,
450	446	$node
		@@ -474,7 +470,7 @@ discard block
		block discarded – undo
474	470	if ($displayThisNode === true) {
475	471	// get info about current folder
476	472	DB::query(
477		- 'SELECT * FROM ' . prefixTable('items') . '
	473	+ 'SELECT * FROM '.prefixTable('items').'
478	474	WHERE inactif=%i AND id_tree = %i',
479	475	0,
480	476	$completTree[$nodeId]->id
		@@ -502,7 +498,7 @@ discard block
		block discarded – undo
502	498
503	499	if (in_array($completTree[$nodeId]->id, $session_groupes_visibles) === true) {
504	500	if (in_array($completTree[$nodeId]->id, $session_read_only_folders) === true) {
505		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	501	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
506	502	$title = langHdl('read_only_account');
507	503	$restricted = 1;
508	504	$folderClass = 'folder_not_droppable';
		@@ -510,26 +506,25 @@ discard block
		block discarded – undo
510	506	$session_user_read_only === true
511	507	&& in_array($completTree[$nodeId]->id, $session_personal_visible_groups) === false
512	508	) {
513		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	509	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
514	510	}
515	511	$text .=
516		- '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . $itemsNb .
	512	+ '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.$itemsNb.
517	513	((isset($SETTINGS['tree_counters']) === true && (int) $SETTINGS['tree_counters'] === 1) ?
518		- '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) :
519		- '')
	514	+ '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '')
520	515	. '</span>';
521	516	} elseif (in_array($completTree[$nodeId]->id, $listFoldersLimitedKeys) === true) {
522	517	$restricted = '1';
523	518	if ($session_user_read_only === true) {
524		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	519	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
525	520	}
526		- $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . count($session_list_folders_limited[$completTree[$nodeId]->id]);
	521	+ $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.count($session_list_folders_limited[$completTree[$nodeId]->id]);
527	522	} elseif (in_array($completTree[$nodeId]->id, $listRestrictedFoldersForItemsKeys) === true) {
528	523	$restricted = '1';
529	524	if ($session_user_read_only === true) {
530		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	525	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
531	526	}
532		- $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_' . $completTree[$nodeId]->id . '\'>' . count($session_list_restricted_folders_for_items[$completTree[$nodeId]->id]) . '</span>';
	527	+ $text .= '<span class=\'badge badge-pill badge-light ml-2 items_count\' id=\'itcount_'.$completTree[$nodeId]->id.'\'>'.count($session_list_restricted_folders_for_items[$completTree[$nodeId]->id]).'</span>';
533	528	} else {
534	529	$restricted = '1';
535	530	$folderClass = 'folder_not_droppable';
		@@ -566,7 +561,7 @@ discard block
		block discarded – undo
566	561	}
567	562
568	563	// prepare json return for current node
569		- $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_' . $completTree[$nodeId]->parent_id;
	564	+ $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_'.$completTree[$nodeId]->parent_id;
570	565
571	566	// handle displaying
572	567	if (
		@@ -586,17 +581,17 @@ discard block
		block discarded – undo
586	581	array_push(
587	582	$ret_json,
588	583	array(
589		- 'id' => 'li_' . $completTree[$nodeId]->id,
	584	+ 'id' => 'li_'.$completTree[$nodeId]->id,
590	585	'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
591	586	'text' => $text,
592	587	'li_attr' => array(
593	588	'class' => 'jstreeopen',
594		- 'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . $title,
	589	+ 'title' => 'ID ['.$completTree[$nodeId]->id.'] '.$title,
595	590	),
596	591	'a_attr' => array(
597		- 'id' => 'fld_' . $completTree[$nodeId]->id,
	592	+ 'id' => 'fld_'.$completTree[$nodeId]->id,
598	593	'class' => $folderClass,
599		- 'onclick' => 'ListerItems(' . $completTree[$nodeId]->id . ', ' . $restricted . ', 0, 1)',
	594	+ 'onclick' => 'ListerItems('.$completTree[$nodeId]->id.', '.$restricted.', 0, 1)',
600	595	'data-title' => $completTree[$nodeId]->title,
601	596	),
602	597	)
		@@ -605,12 +600,12 @@ discard block
		block discarded – undo
605	600	array_push(
606	601	$ret_json,
607	602	array(
608		- 'id' => 'li_' . $completTree[$nodeId]->id,
	603	+ 'id' => 'li_'.$completTree[$nodeId]->id,
609	604	'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
610		- 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>' . $text,
	605	+ 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text,
611	606	'li_attr' => array(
612	607	'class' => '',
613		- 'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . langHdl('no_access'),
	608	+ 'title' => 'ID ['.$completTree[$nodeId]->id.'] '.langHdl('no_access'),
614	609	),
615	610	)
616	611	);

nilsteampassnet / TeamPass

Push — teampass_3.0 ( 11332f...9ad4f0 )

Status

Category

Spacing +47 added lines, -52 removed lines patch added patch discarded remove patch