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

Passed

Push — teampass_3.0 ( 4c0075...5e4b29 )

by Nils

created 2022-01-26 19:36 UTC

Status

Spacing +46 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
@@ -262,7 +262,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
@@ -272,7 +272,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
                 );
@@ -280,11 +280,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;
@@ -294,33 +293,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']) && (int) $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';
@@ -342,22 +338,21 @@  discard block
 block discarded – undo
                 }
 
                 // json
-                $hide_node === true ? '' :
-                    array_push(
+                $hide_node === true ? '' : array_push(
                         $ret_json,
                         array(
-                            'id' => 'li_' . $node->id,
+                            'id' => 'li_'.$node->id,
                             'parent' => $parent,
-                            'text' => ($show_but_block === true ? '<i class="fas fa-times fa-xs text-danger mr-1"></i>' : '') . $text,
+                            'text' => ($show_but_block === true ? '<i class="fas fa-times fa-xs text-danger mr-1"></i>' : '').$text,
                             'children' => ($childrenNb === 0 ? false : true),
                             'li_attr' => array(
                                 'class' => ($show_but_block === true ? '' : 'jstreeopen'),
-                                'title' => 'ID [' . $node->id . '] ' . ($show_but_block === true ? langHdl('no_access') : $title),
+                                'title' => 'ID ['.$node->id.'] '.($show_but_block === true ? langHdl('no_access') : $title),
                             ),
                             'a_attr' => $show_but_block === true ? (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,
                             )) : '',
                         )
@@ -450,7 +445,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
@@ -537,7 +532,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
@@ -638,7 +633,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 (
@@ -658,17 +653,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,
                 ),
             )
@@ -677,12 +672,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'),
                 ),
             )
         );
@@ -745,8 +740,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',
@@ -760,8 +755,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',
@@ -771,8 +766,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',
@@ -783,8 +778,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',
@@ -795,8 +790,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
		@@ -262,7 +262,7 @@ discard block
		block discarded – undo
262	262	// get count of Items in this folder
263	263	DB::query(
264	264	'SELECT *
265		- FROM ' . prefixTable('items') . '
	265	+ FROM ' . prefixTable('items').'
266	266	WHERE inactif=%i AND id_tree = %i',
267	267	0,
268	268	$node->id
		@@ -272,7 +272,7 @@ discard block
		block discarded – undo
272	272	// get info about current folder
273	273	DB::query(
274	274	'SELECT *
275		- FROM ' . prefixTable('nested_tree') . '
	275	+ FROM ' . prefixTable('nested_tree').'
276	276	WHERE parent_id = %i',
277	277	$node->id
278	278	);
		@@ -280,11 +280,10 @@ discard block
		block discarded – undo
280	280
281	281	// If personal Folder, convert id into user name
282	282	$node->title = $node->title === $session_user_id && (int) $node->nlevel === 1 ?
283		- $session_login :
284		- ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
	283	+ $session_login : ($node->title === null ? '' : htmlspecialchars_decode($node->title, ENT_QUOTES));
285	284
286	285	// prepare json return for current node
287		- $parent = $node->parent_id === 0 ? '#' : 'li_' . $node->parent_id;
	286	+ $parent = $node->parent_id === 0 ? '#' : 'li_'.$node->parent_id;
288	287
289	288	// special case for READ-ONLY folder
290	289	$title = $session_user_read_only === true && in_array($node->id, $session_personal_folders) === false ? langHdl('read_only_account') : $title;
		@@ -294,33 +293,30 @@ discard block
		block discarded – undo
294	293
295	294	if (in_array($node->id, $session_groupes_visibles)) {
296	295	if (in_array($node->id, $session_read_only_folders)) {
297		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	296	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
298	297	$title = langHdl('read_only_account');
299	298	$restricted = 1;
300	299	$folderClass = 'folder_not_droppable';
301	300	} elseif ($session_user_read_only === true && !in_array($node->id, $session_personal_visible_groups)) {
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	}
304	303	$text .=
305		- ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_' . $node->id . '\'>' . $itemsNb . '</span>'
	304	+ ' <span class=\'badge badge-danger ml-2 items_count\' id=\'itcount_'.$node->id.'\'>'.$itemsNb.'</span>'
306	305	.(isset($SETTINGS['tree_counters']) && (int) $SETTINGS['tree_counters'] === 1 ?
307		- '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) :
308		- '')
	306	+ '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '')
309	307	.'</span>';
310	308	} elseif (in_array($node->id, $listFoldersLimitedKeys)) {
311	309	$restricted = 1;
312	310	$text .=
313	311	$session_user_read_only === true ?
314		- "<i class='far fa-eye fa-xs mr-1'></i>" :
315		- '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_folders_limited[$node->id]) . '</span>';
	312	+ "<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>';
316	313	} elseif (in_array($node->id, $listRestrictedFoldersForItemsKeys)) {
317	314	$restricted = 1;
318	315	if ($session_user_read_only === true) {
319		- $text = "<i class='far fa-eye fa-xs mr-1'></i>" . $text;
	316	+ $text = "<i class='far fa-eye fa-xs mr-1'></i>".$text;
320	317	}
321	318	$text .= $session_user_read_only === true ?
322		- "<i class='far fa-eye fa-xs mr-1'></i>" :
323		- '<span class="badge badge-danger ml-2 items_count" id="itcount_' . $node->id . '">' . count($session_list_restricted_folders_for_items[$node->id]) . '</span>';
	319	+ "<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>';
324	320	} else {
325	321	$restricted = 1;
326	322	$folderClass = 'folder_not_droppable';
		@@ -342,22 +338,21 @@ discard block
		block discarded – undo
342	338	}
343	339
344	340	// json
345		- $hide_node === true ? '' :
346		- array_push(
	341	+ $hide_node === true ? '' : array_push(
347	342	$ret_json,
348	343	array(
349		- 'id' => 'li_' . $node->id,
	344	+ 'id' => 'li_'.$node->id,
350	345	'parent' => $parent,
351		- 'text' => ($show_but_block === true ? '<i class="fas fa-times fa-xs text-danger mr-1"></i>' : '') . $text,
	346	+ 'text' => ($show_but_block === true ? '<i class="fas fa-times fa-xs text-danger mr-1"></i>' : '').$text,
352	347	'children' => ($childrenNb === 0 ? false : true),
353	348	'li_attr' => array(
354	349	'class' => ($show_but_block === true ? '' : 'jstreeopen'),
355		- 'title' => 'ID [' . $node->id . '] ' . ($show_but_block === true ? langHdl('no_access') : $title),
	350	+ 'title' => 'ID ['.$node->id.'] '.($show_but_block === true ? langHdl('no_access') : $title),
356	351	),
357	352	'a_attr' => $show_but_block === true ? (array(
358		- 'id' => 'fld_' . $node->id,
	353	+ 'id' => 'fld_'.$node->id,
359	354	'class' => $folderClass,
360		- 'onclick' => 'ListerItems(' . $node->id . ', ' . $restricted . ', 0, 1)',
	355	+ 'onclick' => 'ListerItems('.$node->id.', '.$restricted.', 0, 1)',
361	356	'data-title' => $node->title,
362	357	)) : '',
363	358	)
		@@ -450,7 +445,7 @@ discard block
		block discarded – undo
450	445	) === true
451	446	) {
452	447	DB::query(
453		- 'SELECT * FROM ' . prefixTable('items') . '
	448	+ 'SELECT * FROM '.prefixTable('items').'
454	449	WHERE inactif=%i AND id_tree = %i',
455	450	0,
456	451	$node
		@@ -537,7 +532,7 @@ discard block
		block discarded – undo
537	532	{
538	533	// get info about current folder
539	534	DB::query(
540		- 'SELECT * FROM ' . prefixTable('items') . '
	535	+ 'SELECT * FROM '.prefixTable('items').'
541	536	WHERE inactif=%i AND id_tree = %i',
542	537	0,
543	538	$completTree[$nodeId]->id
		@@ -638,7 +633,7 @@ discard block
		block discarded – undo
638	633	*/
639	634
640	635	// prepare json return for current node
641		- $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_' . $completTree[$nodeId]->parent_id;
	636	+ $parent = $completTree[$nodeId]->parent_id === '0' ? '#' : 'li_'.$completTree[$nodeId]->parent_id;
642	637
643	638	// handle displaying
644	639	if (
		@@ -658,17 +653,17 @@ discard block
		block discarded – undo
658	653	array_push(
659	654	$ret_json,
660	655	array(
661		- 'id' => 'li_' . $completTree[$nodeId]->id,
	656	+ 'id' => 'li_'.$completTree[$nodeId]->id,
662	657	'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
663	658	'text' => $text.$completTree[$nodeId]->title.$nodeData['html'],
664	659	'li_attr' => array(
665	660	'class' => 'jstreeopen',
666		- 'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . $nodeData['title'],
	661	+ 'title' => 'ID ['.$completTree[$nodeId]->id.'] '.$nodeData['title'],
667	662	),
668	663	'a_attr' => array(
669		- 'id' => 'fld_' . $completTree[$nodeId]->id,
	664	+ 'id' => 'fld_'.$completTree[$nodeId]->id,
670	665	'class' => $nodeData['folderClass'],
671		- 'onclick' => 'ListerItems(' . $completTree[$nodeId]->id . ', ' . $nodeData['restricted'] . ', 0, 1)',
	666	+ 'onclick' => 'ListerItems('.$completTree[$nodeId]->id.', '.$nodeData['restricted'].', 0, 1)',
672	667	'data-title' => $completTree[$nodeId]->title,
673	668	),
674	669	)
		@@ -677,12 +672,12 @@ discard block
		block discarded – undo
677	672	array_push(
678	673	$ret_json,
679	674	array(
680		- 'id' => 'li_' . $completTree[$nodeId]->id,
	675	+ 'id' => 'li_'.$completTree[$nodeId]->id,
681	676	'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
682	677	'text' => '<i class="fas fa-times fa-xs text-danger mr-1"></i>'.$text.$completTree[$nodeId]->title.$nodeData['html'],
683	678	'li_attr' => array(
684	679	'class' => '',
685		- 'title' => 'ID [' . $completTree[$nodeId]->id . '] ' . langHdl('no_access'),
	680	+ 'title' => 'ID ['.$completTree[$nodeId]->id.'] '.langHdl('no_access'),
686	681	),
687	682	)
688	683	);
		@@ -745,8 +740,8 @@ discard block
		block discarded – undo
745	740	if (in_array($nodeId, $session_groupes_visibles) === true) {
746	741	if (in_array($nodeId, $session_read_only_folders) === true) {
747	742	return [
748		- '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 .
749		- ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>',
	743	+ '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.
	744	+ ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
750	745	'title' => langHdl('read_only_account'),
751	746	'restricted' => 1,
752	747	'folderClass' => 'folder_not_droppable',
		@@ -760,8 +755,8 @@ discard block
		block discarded – undo
760	755	&& in_array($nodeId, $session_personal_visible_groups) === false
761	756	) {
762	757	return [
763		- '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 .
764		- ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>',
	758	+ '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.
	759	+ ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
765	760	'title' => $title,
766	761	'restricted' => 0,
767	762	'folderClass' => 'folder',
		@@ -771,8 +766,8 @@ discard block
		block discarded – undo
771	766	}
772	767
773	768	return [
774		- 'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb .
775		- ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>',
	769	+ 'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb.
	770	+ ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>',
776	771	'title' => $title,
777	772	'restricted' => 0,
778	773	'folderClass' => 'folder',
		@@ -783,8 +778,8 @@ discard block
		block discarded – undo
783	778
784	779	if (in_array($nodeId, $listFoldersLimitedKeys) === true) {
785	780	return [
786		- 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') .
787		- '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>',
	781	+ 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '').
	782	+ '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>',
788	783	'title' => $title,
789	784	'restricted' => 1,
790	785	'folderClass' => 'folder',
		@@ -795,8 +790,8 @@ discard block
		block discarded – undo
795	790
796	791	if (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) {
797	792	return [
798		- 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' .
799		- '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>',
	793	+ 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''.
	794	+ '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>',
800	795	'title' => $title,
801	796	'restricted' => 1,
802	797	'folderClass' => 'folder',

nilsteampassnet / TeamPass

Push — teampass_3.0 ( 4c0075...5e4b29 )

Status

Category

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