Inspection of "Merge branch 'release/3.1.5.15'" - nilsteampassnet/TeamPass - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 965d80...bc7faf )

by Nils

created 2025-12-17 19:30 UTC

Status

Spacing +24 added lines, -26 removed lines patch added patch discarded remove patch

@@ -76,7 +76,7 @@  discard block
 block discarded – undo
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
     
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": [ ';
@@ -573,7 +573,7 @@  discard block
 block discarded – undo
         $iTotal = 0;
     }
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -649,7 +649,7 @@  discard block
 block discarded – undo
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -868,7 +868,7 @@  discard block
 block discarded – undo
             FROM '.prefixTable('background_tasks').' AS p 
             LEFT JOIN '.prefixTable('users').' AS u ON %l
             WHERE %l ORDER BY %l %l LIMIT %i, %i';
-    $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
+    $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
 
     // Get the records
     $rows = DB::query($sql, ...$params);
@@ -876,7 +876,7 @@  discard block
 block discarded – undo
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
         //col1
         $sOutput .= '"<span data-done=\"'.$record['is_in_progress'].'\" data-type=\"'.$record['process_type'].'\" data-process-id=\"'.$record['increment_id'].'\"></span>", ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
         //$sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['updated_at'])).'", ';
         $sOutput .= '"<div class=\"progress mt-2\"><div class=\"progress-bar\" style=\"width: '.$subtaskProgress.'\">'.$subtaskProgress.'</div></div>", ';
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
         // col5
         if (in_array($record['process_type'], array('create_user_keys', 'item_copy')) === true) {
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname FROM ' . prefixTable('users') . '
+                'SELECT name, lastname FROM '.prefixTable('users').'
                 WHERE id = %i',
                 json_decode($record['arguments'], true)['new_user_id']
             );
@@ -957,7 +957,7 @@  discard block
 block discarded – undo
     FROM '.prefixTable('background_tasks').' AS p 
     LEFT JOIN '.prefixTable('users').' AS u ON %l
     WHERE %l ORDER BY %l %l LIMIT %i, %i';
-    $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
+    $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
 
     // Get the records
     $rows = DB::query($sql, ...$params);
@@ -965,7 +965,7 @@  discard block
 block discarded – undo
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -981,13 +981,12 @@  discard block
 block discarded – undo
         //col1
         $sOutput .= '"'.(is_null($record['error_message']) ? '' : addslashes($record['error_message'])).'", ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
         $sOutput .= is_null($record['started_at']) === false ?
-            ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['started_at']).'", ') :
-                ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ');
+            ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['started_at']).'", ') : ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ');
         //col4
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['finished_at']).'", '; 
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['finished_at']).'", '; 
         // col7
         $sOutput .= '"'.gmdate('H:i:s', (int) $record['finished_at'] - (is_null($record['started_at']) === false ? (int) $record['started_at'] : (int) $record['created_at'])).'",';
         //col5
@@ -1010,11 +1009,10 @@  discard block
 block discarded – undo
         // col6
         $arguments = json_decode($record['arguments'], true);
         $newUserId = array_key_exists('new_user_id', $arguments) ? 
-            $arguments['new_user_id'] : 
-            (array_key_exists('user_id', $arguments) ? $arguments['user_id'] : null);
+            $arguments['new_user_id'] : (array_key_exists('user_id', $arguments) ? $arguments['user_id'] : null);
         if ($record['process_type'] === 'create_user_keys' && is_null($newUserId) === false && empty($newUserId) === false) {
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $newUserId
             );
@@ -1030,7 +1028,7 @@  discard block
 block discarded – undo
         } elseif ($record['process_type'] === 'user_build_cache_tree') {
             $user = json_decode($record['arguments'], true)['user_id'];
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $user
             );
@@ -1064,7 +1062,7 @@  discard block
 block discarded – undo
 {
     $subtasks = DB::query(
         'SELECT *
-        FROM ' . prefixTable('background_subtasks') . '
+        FROM ' . prefixTable('background_subtasks').'
         WHERE task_id = %i',
         $id
     );
@@ -1080,5 +1078,5 @@  discard block
 block discarded – undo
         $i++;
     }
 
-    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0) .'%';
+    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0).'%';
 }

Please login to merge, or discard this patch.

		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	) {
77	77	// Not allowed page
78	78	$session->set('system-error_code', ERR_NOT_ALLOWED);
79		- include $SETTINGS['cpassman_dir'] . '/error.php';
	79	+ include $SETTINGS['cpassman_dir'].'/error.php';
80	80	exit;
81	81	}
82	82
		@@ -168,7 +168,7 @@ discard block
		block discarded – undo
168	168
169	169	// Output
170	170	$sOutput = '{';
171		- $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
	171	+ $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
172	172	$sOutput .= '"iTotalRecords": '.$iTotal.', ';
173	173	$sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
174	174	$sOutput .= '"aaData": ';
		@@ -241,7 +241,7 @@ discard block
		block discarded – undo
241	241
242	242	// Output
243	243	$sOutput = '{';
244		- $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
	244	+ $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
245	245	$sOutput .= '"iTotalRecords": '.$iTotal.', ';
246	246	$sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
247	247	$sOutput .= '"aaData": ';
		@@ -314,7 +314,7 @@ discard block
		block discarded – undo
314	314
315	315	// Output
316	316	$sOutput = '{';
317		- $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
	317	+ $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
318	318	$sOutput .= '"iTotalRecords": '.$iTotal.', ';
319	319	$sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
320	320	$sOutput .= '"aaData": ';
		@@ -387,7 +387,7 @@ discard block
		block discarded – undo
387	387
388	388	// Output
389	389	$sOutput = '{';
390		- $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
	390	+ $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
391	391	$sOutput .= '"iTotalRecords": '.$iTotal.', ';
392	392	$sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
393	393	$sOutput .= '"aaData": [ ';
		@@ -490,7 +490,7 @@ discard block
		block discarded – undo
490	490
491	491	// Output
492	492	$sOutput = '{';
493		- $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
	493	+ $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
494	494	$sOutput .= '"iTotalRecords": '.$iTotal.', ';
495	495	$sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
496	496	$sOutput .= '"aaData": [ ';
		@@ -573,7 +573,7 @@ discard block
		block discarded – undo
573	573	$iTotal = 0;
574	574	}
575	575	$sOutput = '{';
576		- $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
	576	+ $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
577	577	$sOutput .= '"iTotalRecords": '.$iTotal.', ';
578	578	$sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
579	579	$sOutput .= '"aaData": ';
		@@ -649,7 +649,7 @@ discard block
		block discarded – undo
649	649
650	650	// Output
651	651	$sOutput = '{';
652		- $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
	652	+ $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
653	653	$sOutput .= '"iTotalRecords": '.$iTotal.', ';
654	654	$sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
655	655	$sOutput .= '"aaData": ';
		@@ -718,7 +718,7 @@ discard block
		block discarded – undo
718	718
719	719	// Output
720	720	$sOutput = '{';
721		- $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
	721	+ $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
722	722	$sOutput .= '"iTotalRecords": '.$iTotal.', ';
723	723	$sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
724	724	$sOutput .= '"aaData": ';
		@@ -791,7 +791,7 @@ discard block
		block discarded – undo
791	791
792	792	// Output
793	793	$sOutput = '{';
794		- $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
	794	+ $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
795	795	$sOutput .= '"iTotalRecords": '.$iTotal.', ';
796	796	$sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
797	797	$sOutput .= '"aaData": ';
		@@ -868,7 +868,7 @@ discard block
		block discarded – undo
868	868	FROM '.prefixTable('background_tasks').' AS p
869	869	LEFT JOIN '.prefixTable('users').' AS u ON %l
870	870	WHERE %l ORDER BY %l %l LIMIT %i, %i';
871		- $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
	871	+ $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
872	872
873	873	// Get the records
874	874	$rows = DB::query($sql, ...$params);
		@@ -876,7 +876,7 @@ discard block
		block discarded – undo
876	876
877	877	// Output
878	878	$sOutput = '{';
879		- $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
	879	+ $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
880	880	$sOutput .= '"iTotalRecords": '.$iTotal.', ';
881	881	$sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
882	882	$sOutput .= '"aaData": ';
		@@ -891,7 +891,7 @@ discard block
		block discarded – undo
891	891	//col1
892	892	$sOutput .= '"<span data-done=\"'.$record['is_in_progress'].'\" data-type=\"'.$record['process_type'].'\" data-process-id=\"'.$record['increment_id'].'\"></span>", ';
893	893	//col2
894		- $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
	894	+ $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
895	895	//col3
896	896	//$sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['updated_at'])).'", ';
897	897	$sOutput .= '"<div class=\"progress mt-2\"><div class=\"progress-bar\" style=\"width: '.$subtaskProgress.'\">'.$subtaskProgress.'</div></div>", ';
		@@ -901,7 +901,7 @@ discard block
		block discarded – undo
901	901	// col5
902	902	if (in_array($record['process_type'], array('create_user_keys', 'item_copy')) === true) {
903	903	$data_user = DB::queryFirstRow(
904		- 'SELECT name, lastname FROM ' . prefixTable('users') . '
	904	+ 'SELECT name, lastname FROM '.prefixTable('users').'
905	905	WHERE id = %i',
906	906	json_decode($record['arguments'], true)['new_user_id']
907	907	);
		@@ -957,7 +957,7 @@ discard block
		block discarded – undo
957	957	FROM '.prefixTable('background_tasks').' AS p
958	958	LEFT JOIN '.prefixTable('users').' AS u ON %l
959	959	WHERE %l ORDER BY %l %l LIMIT %i, %i';
960		- $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
	960	+ $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
961	961
962	962	// Get the records
963	963	$rows = DB::query($sql, ...$params);
		@@ -965,7 +965,7 @@ discard block
		block discarded – undo
965	965
966	966	// Output
967	967	$sOutput = '{';
968		- $sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
	968	+ $sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
969	969	$sOutput .= '"iTotalRecords": '.$iTotal.', ';
970	970	$sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
971	971	$sOutput .= '"aaData": ';
		@@ -981,13 +981,12 @@ discard block
		block discarded – undo
981	981	//col1
982	982	$sOutput .= '"'.(is_null($record['error_message']) ? '' : addslashes($record['error_message'])).'", ';
983	983	//col2
984		- $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
	984	+ $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
985	985	//col3
986	986	$sOutput .= is_null($record['started_at']) === false ?
987		- ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['started_at']).'", ') :
988		- ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ');
	987	+ ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['started_at']).'", ') : ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ');
989	988	//col4
990		- $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['finished_at']).'", ';
	989	+ $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['finished_at']).'", ';
991	990	// col7
992	991	$sOutput .= '"'.gmdate('H:i:s', (int) $record['finished_at'] - (is_null($record['started_at']) === false ? (int) $record['started_at'] : (int) $record['created_at'])).'",';
993	992	//col5
		@@ -1010,11 +1009,10 @@ discard block
		block discarded – undo
1010	1009	// col6
1011	1010	$arguments = json_decode($record['arguments'], true);
1012	1011	$newUserId = array_key_exists('new_user_id', $arguments) ?
1013		- $arguments['new_user_id'] :
1014		- (array_key_exists('user_id', $arguments) ? $arguments['user_id'] : null);
	1012	+ $arguments['new_user_id'] : (array_key_exists('user_id', $arguments) ? $arguments['user_id'] : null);
1015	1013	if ($record['process_type'] === 'create_user_keys' && is_null($newUserId) === false && empty($newUserId) === false) {
1016	1014	$data_user = DB::queryFirstRow(
1017		- 'SELECT name, lastname, login FROM ' . prefixTable('users') . '
	1015	+ 'SELECT name, lastname, login FROM '.prefixTable('users').'
1018	1016	WHERE id = %i',
1019	1017	$newUserId
1020	1018	);
		@@ -1030,7 +1028,7 @@ discard block
		block discarded – undo
1030	1028	} elseif ($record['process_type'] === 'user_build_cache_tree') {
1031	1029	$user = json_decode($record['arguments'], true)['user_id'];
1032	1030	$data_user = DB::queryFirstRow(
1033		- 'SELECT name, lastname, login FROM ' . prefixTable('users') . '
	1031	+ 'SELECT name, lastname, login FROM '.prefixTable('users').'
1034	1032	WHERE id = %i',
1035	1033	$user
1036	1034	);
		@@ -1064,7 +1062,7 @@ discard block
		block discarded – undo
1064	1062	{
1065	1063	$subtasks = DB::query(
1066	1064	'SELECT *
1067		- FROM ' . prefixTable('background_subtasks') . '
	1065	+ FROM ' . prefixTable('background_subtasks').'
1068	1066	WHERE task_id = %i',
1069	1067	$id
1070	1068	);
		@@ -1080,5 +1078,5 @@ discard block
		block discarded – undo
1080	1078	$i++;
1081	1079	}
1082	1080
1083		- return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0) .'%';
	1081	+ return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0).'%';
1084	1082	}

nilsteampassnet / TeamPass

Push — master ( 965d80...bc7faf )

Status

Category

Spacing +24 added lines, -26 removed lines patch added patch discarded remove patch