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

Passed

Push — teampass_3.0 ( 4afd88...b28540 )

by Nils

created 2021-09-05 08:49 UTC

Status

Spacing +47 added lines, -51 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');
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
 $session['personal_visible_groups'] = $superGlobal->get('personal_visible_groups', 'SESSION');
 
 $lastFolderChange = DB::query(
-    'SELECT * FROM ' . prefixTable('misc') . '
+    'SELECT * FROM '.prefixTable('misc').'
     WHERE type = %s AND intitule = %s',
     'timestamp',
     'last_folder_change'
@@ -103,7 +103,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');
 
@@ -213,7 +213,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
@@ -267,7 +267,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
@@ -277,7 +277,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
                 );
@@ -285,11 +285,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;
@@ -299,33 +298,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';
@@ -351,18 +347,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,
                             ),
                         )
@@ -371,13 +367,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'),
                             ),
                         )
                     );
@@ -470,7 +466,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
@@ -557,7 +553,7 @@  discard block
 block discarded – undo
 {
     // 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
@@ -658,7 +654,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 (
@@ -678,17 +674,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.$completTree[$nodeId]->title.$nodeData['html'],
                 'li_attr' => array(
                     'class' => 'jstreeopen',
-                    'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . $nodeData['title'],
+                    'title' => 'ID ['.$completTree[$nodeId]->id.'] '.$nodeData['title'],
                 ),
                 'a_attr' => array(
-                    'id' => 'fld_' . $completTree[$nodeId]->id,
+                    'id' => 'fld_'.$completTree[$nodeId]->id,
                     'class' => $nodeData['folderClass'],
-                    'onclick' => 'ListerItems(' . $completTree[$nodeId]->id . ', ' . $nodeData['restricted'] . ', 0, 1)',
+                    'onclick' => 'ListerItems('.$completTree[$nodeId]->id.', '.$nodeData['restricted'].', 0, 1)',
                     'data-title' => $completTree[$nodeId]->title,
                 ),
             )
@@ -697,12 +693,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.$completTree[$nodeId]->title.$nodeData['html'],
                 'li_attr' => array(
                     'class' => '',
-                    'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . langHdl('no_access'),
+                    'title' => 'ID ['.$completTree[$nodeId]->id.'] '.langHdl('no_access'),
                 ),
             )
         );
@@ -765,8 +761,8 @@  discard block
 block discarded – undo
     if (in_array($nodeId, $session_groupes_visibles) === true) {
         if (in_array($nodeId, $session_read_only_folders) === true) {
             return [
-                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
-                    ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  : '') . '</span>',
+                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
+                    ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
                 'title' => langHdl('read_only_account'),
                 'restricted' => 1,
                 'folderClass' => 'folder_not_droppable',
@@ -780,8 +776,8 @@  discard block
 block discarded – undo
             && in_array($nodeId, $session_personal_visible_groups) === false
         ) {
             return [
-                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
-                    ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  : '') . '</span>',
+                'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
+                    ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
                 'title' => $title,
                 'restricted' => 0,
                 'folderClass' => 'folder',
@@ -791,8 +787,8 @@  discard block
 block discarded – undo
         }
         
         return [
-            'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
-                ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1)  : '') . '</span>',
+            'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
+                ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
             'title' => $title,
             'restricted' => 0,
             'folderClass' => 'folder',
@@ -803,8 +799,8 @@  discard block
 block discarded – undo
     
     if (in_array($nodeId, $listFoldersLimitedKeys) === true) {
         return [
-            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') .
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>',
+            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '').
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>',
             'title' => $title,
             'restricted' => 1,
             'folderClass' => 'folder',
@@ -815,8 +811,8 @@  discard block
 block discarded – undo
     
     if (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) {
         return [
-            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' .
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>',
+            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''.
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>',
             'title' => $title,
             'restricted' => 1,
             'folderClass' => 'folder',

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');
		@@ -92,7 +92,7 @@ discard block
		block discarded – undo
92	92	$session['personal_visible_groups'] = $superGlobal->get('personal_visible_groups', 'SESSION');
93	93
94	94	$lastFolderChange = DB::query(
95		- 'SELECT * FROM ' . prefixTable('misc') . '
	95	+ 'SELECT * FROM '.prefixTable('misc').'
96	96	WHERE type = %s AND intitule = %s',
97	97	'timestamp',
98	98	'last_folder_change'
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	\|\| (isset($get['force_refresh']) === true && (int) $get['force_refresh'] === 1)
104	104	) {
105	105	// Build tree
106		- $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
	106	+ $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
107	107	$tree->register();
108	108	$tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
109	109
		@@ -213,7 +213,7 @@ discard block
		block discarded – undo
213	213	$SETTINGS
214	214	) {
215	215	// Load library
216		- include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
	216	+ include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
217	217	$superGlobal = new protect\SuperGlobal\SuperGlobal();
218	218
219	219	// Prepare superGlobal variables
		@@ -267,7 +267,7 @@ discard block
		block discarded – undo
267	267	// get count of Items in this folder
268	268	DB::query(
269	269	'SELECT *
270		- FROM ' . prefixTable('items') . '
	270	+ FROM ' . prefixTable('items').'
271	271	WHERE inactif=%i AND id_tree = %i',
272	272	0,
273	273	$node->id
		@@ -277,7 +277,7 @@ discard block
		block discarded – undo
277	277	// get info about current folder
278	278	DB::query(
279	279	'SELECT *
280		- FROM ' . prefixTable('nested_tree') . '
	280	+ FROM ' . prefixTable('nested_tree').'
281	281	WHERE parent_id = %i',
282	282	$node->id
283	283	);
		@@ -285,11 +285,10 @@ discard block
		block discarded – undo
285	285
286	286	// If personal Folder, convert id into user name
287	287	$node->title = $node->title === $session_user_id && (int) $node->nlevel === 1 ?
288		- $session_login :
289		- ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
	288	+ $session_login : ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
290	289
291	290	// prepare json return for current node
292		- $parent = $node->parent_id === 0 ? '#' : 'li_' . $node->parent_id;
	291	+ $parent = $node->parent_id === 0 ? '#' : 'li_'.$node->parent_id;
293	292
294	293	// special case for READ-ONLY folder
295	294	$title = $session_user_read_only === true && in_array($node->id, $session_personal_folders) === false ? langHdl('read_only_account') : $title;
		@@ -299,33 +298,30 @@ discard block
		block discarded – undo
299	298
300	299	if (in_array($node->id, $session_groupes_visibles)) {
301	300	if (in_array($node->id, $session_read_only_folders)) {
302		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	301	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
303	302	$title = langHdl('read_only_account');
304	303	$restricted = 1;
305	304	$folderClass = 'folder_not_droppable';
306	305	} elseif ($session_user_read_only === true && !in_array($node->id, $session_personal_visible_groups)) {
307		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	306	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
308	307	}
309	308	$text .=
310		- ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . $itemsNb . '</span>'
	309	+ ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.$itemsNb.'</span>'
311	310	.(isset($SETTINGS['tree_counters']) && $SETTINGS['tree_counters'] === 1 ?
312		- '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) :
313		- '')
	311	+ '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '')
314	312	.'</span>';
315	313	} elseif (in_array($node->id, $listFoldersLimitedKeys)) {
316	314	$restricted = 1;
317	315	$text .=
318	316	$session_user_read_only === true ?
319		- "<i class='far fa-eye fa-xs mr-1'></i>" :
320		- '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_folders_limited[$node->id]) . '</span>';
	317	+ "<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>';
321	318	} elseif (in_array($node->id, $listRestrictedFoldersForItemsKeys)) {
322	319	$restricted = 1;
323	320	if ($session_user_read_only === true) {
324		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	321	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
325	322	}
326	323	$text .= $session_user_read_only === true ?
327		- "<i class='far fa-eye fa-xs mr-1'></i>" :
328		- '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_restricted_folders_for_items[$node->id]) . '</span>';
	324	+ "<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>';
329	325	} else {
330	326	$restricted = 1;
331	327	$folderClass = 'folder_not_droppable';
		@@ -351,18 +347,18 @@ discard block
		block discarded – undo
351	347	array_push(
352	348	$ret_json,
353	349	array(
354		- 'id' => 'li_' . $node->id,
	350	+ 'id' => 'li_'.$node->id,
355	351	'parent' => $parent,
356	352	'text' => $text,
357	353	'children' => $childrenNb === 0 ? false : true,
358	354	'li_attr' => array(
359	355	'class' => 'jstreeopen',
360		- 'title' => 'ID [' . $node->id . '] ' . $title,
	356	+ 'title' => 'ID ['.$node->id.'] '.$title,
361	357	),
362	358	'a_attr' => array(
363		- 'id' => 'fld_' . $node->id,
	359	+ 'id' => 'fld_'.$node->id,
364	360	'class' => $folderClass,
365		- 'onclick' => 'ListerItems(' . $node->id . ', ' . $restricted . ', 0, 1)',
	361	+ 'onclick' => 'ListerItems('.$node->id.', '.$restricted.', 0, 1)',
366	362	'data-title' => $node->title,
367	363	),
368	364	)
		@@ -371,13 +367,13 @@ discard block
		block discarded – undo
371	367	array_push(
372	368	$ret_json,
373	369	array(
374		- 'id' => 'li_' . $node->id,
	370	+ 'id' => 'li_'.$node->id,
375	371	'parent' => $parent,
376	372	'children' => $childrenNb === 0 ? false : true,
377		- 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>' . $text,
	373	+ 'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text,
378	374	'li_attr' => array(
379	375	'class' => '',
380		- 'title' => 'ID [' . $node->id . '] ' . langHdl('no_access'),
	376	+ 'title' => 'ID ['.$node->id.'] '.langHdl('no_access'),
381	377	),
382	378	)
383	379	);
		@@ -470,7 +466,7 @@ discard block
		block discarded – undo
470	466	) === true
471	467	) {
472	468	DB::query(
473		- 'SELECT * FROM ' . prefixTable('items') . '
	469	+ 'SELECT * FROM '.prefixTable('items').'
474	470	WHERE inactif=%i AND id_tree = %i',
475	471	0,
476	472	$node
		@@ -557,7 +553,7 @@ discard block
		block discarded – undo
557	553	{
558	554	// get info about current folder
559	555	DB::query(
560		- 'SELECT * FROM ' . prefixTable('items') . '
	556	+ 'SELECT * FROM '.prefixTable('items').'
561	557	WHERE inactif=%i AND id_tree = %i',
562	558	0,
563	559	$completTree[$nodeId]->id
		@@ -658,7 +654,7 @@ discard block
		block discarded – undo
658	654	*/
659	655
660	656	// prepare json return for current node
661		- $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_' . $completTree[$nodeId]->parent_id;
	657	+ $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_'.$completTree[$nodeId]->parent_id;
662	658
663	659	// handle displaying
664	660	if (
		@@ -678,17 +674,17 @@ discard block
		block discarded – undo
678	674	array_push(
679	675	$ret_json,
680	676	array(
681		- 'id' => 'li_' . $completTree[$nodeId]->id,
	677	+ 'id' => 'li_'.$completTree[$nodeId]->id,
682	678	'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
683	679	'text' => $text.$completTree[$nodeId]->title.$nodeData['html'],
684	680	'li_attr' => array(
685	681	'class' => 'jstreeopen',
686		- 'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . $nodeData['title'],
	682	+ 'title' => 'ID ['.$completTree[$nodeId]->id.'] '.$nodeData['title'],
687	683	),
688	684	'a_attr' => array(
689		- 'id' => 'fld_' . $completTree[$nodeId]->id,
	685	+ 'id' => 'fld_'.$completTree[$nodeId]->id,
690	686	'class' => $nodeData['folderClass'],
691		- 'onclick' => 'ListerItems(' . $completTree[$nodeId]->id . ', ' . $nodeData['restricted'] . ', 0, 1)',
	687	+ 'onclick' => 'ListerItems('.$completTree[$nodeId]->id.', '.$nodeData['restricted'].', 0, 1)',
692	688	'data-title' => $completTree[$nodeId]->title,
693	689	),
694	690	)
		@@ -697,12 +693,12 @@ discard block
		block discarded – undo
697	693	array_push(
698	694	$ret_json,
699	695	array(
700		- 'id' => 'li_' . $completTree[$nodeId]->id,
	696	+ 'id' => 'li_'.$completTree[$nodeId]->id,
701	697	'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
702	698	'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text.$completTree[$nodeId]->title.$nodeData['html'],
703	699	'li_attr' => array(
704	700	'class' => '',
705		- 'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . langHdl('no_access'),
	701	+ 'title' => 'ID ['.$completTree[$nodeId]->id.'] '.langHdl('no_access'),
706	702	),
707	703	)
708	704	);
		@@ -765,8 +761,8 @@ discard block
		block discarded – undo
765	761	if (in_array($nodeId, $session_groupes_visibles) === true) {
766	762	if (in_array($nodeId, $session_read_only_folders) === true) {
767	763	return [
768		- 'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
769		- ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>',
	764	+ 'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
	765	+ ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
770	766	'title' => langHdl('read_only_account'),
771	767	'restricted' => 1,
772	768	'folderClass' => 'folder_not_droppable',
		@@ -780,8 +776,8 @@ discard block
		block discarded – undo
780	776	&& in_array($nodeId, $session_personal_visible_groups) === false
781	777	) {
782	778	return [
783		- 'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
784		- ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>',
	779	+ 'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
	780	+ ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
785	781	'title' => $title,
786	782	'restricted' => 0,
787	783	'folderClass' => 'folder',
		@@ -791,8 +787,8 @@ discard block
		block discarded – undo
791	787	}
792	788
793	789	return [
794		- 'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
795		- ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>',
	790	+ 'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
	791	+ ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
796	792	'title' => $title,
797	793	'restricted' => 0,
798	794	'folderClass' => 'folder',
		@@ -803,8 +799,8 @@ discard block
		block discarded – undo
803	799
804	800	if (in_array($nodeId, $listFoldersLimitedKeys) === true) {
805	801	return [
806		- 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') .
807		- '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>',
	802	+ 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '').
	803	+ '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>',
808	804	'title' => $title,
809	805	'restricted' => 1,
810	806	'folderClass' => 'folder',
		@@ -815,8 +811,8 @@ discard block
		block discarded – undo
815	811
816	812	if (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) {
817	813	return [
818		- 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' .
819		- '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>',
	814	+ 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''.
	815	+ '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>',
820	816	'title' => $title,
821	817	'restricted' => 1,
822	818	'folderClass' => 'folder',

nilsteampassnet / TeamPass

Push — teampass_3.0 ( 4afd88...b28540 )

Status

Category

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