Completed
Push — development ( 4858c7...106ddb )
by Thomas
25s
created
htdocs/adminuser.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -142,22 +142,22 @@
 block discarded – undo
142 142
 
143 143
     $tpl->assign('showdetails', true);
144 144
 
145
-    $r['hidden'] = (int) $connection->fetchColumn(
145
+    $r['hidden'] = (int)$connection->fetchColumn(
146 146
         'SELECT COUNT(*) FROM `caches` WHERE `user_id`=:userId', [':userId' => $r['user_id']]
147 147
     );
148
-    $r['hidden_active'] = (int) $connection->fetchColumn(
148
+    $r['hidden_active'] = (int)$connection->fetchColumn(
149 149
         'SELECT COUNT(*) FROM `caches` WHERE `user_id`= :userId AND `status`=1',
150 150
         [':userId' => $r['user_id']]
151 151
     );
152
-    $r['logentries'] = (int) $connection->fetchColumn(
152
+    $r['logentries'] = (int)$connection->fetchColumn(
153 153
         'SELECT COUNT(*) FROM `cache_logs` WHERE `user_id`= :userId',
154 154
         [':userId' => $r['user_id']]
155 155
     );
156
-    $r['deleted_logentries'] = (int) $connection->fetchColumn(
156
+    $r['deleted_logentries'] = (int)$connection->fetchColumn(
157 157
         'SELECT COUNT(*) FROM `cache_logs_archived` WHERE `user_id`= :userId',
158 158
         [':userId' => $r['user_id']]
159 159
     );
160
-    $r['reports'] = (int) $connection->fetchColumn(
160
+    $r['reports'] = (int)$connection->fetchColumn(
161 161
         'SELECT COUNT(*) FROM `cache_reports` WHERE `userid`= :userId',
162 162
         [':userId' => $r['user_id']]
163 163
     );
Please login to merge, or discard this patch.
htdocs/lib/login.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@
 block discarded – undo
121 121
         // user.last_login gives the overall last login date, including OKAPI logins.
122 122
 
123 123
         if ($rUser = sql_fetch_assoc($rs)) {
124
-            if ((($this->permanent == true) && (strtotime($rUser['last_login']) + LOGIN_TIME_PERMANENT  / 2 < time())) ||
124
+            if ((($this->permanent == true) && (strtotime($rUser['last_login']) + LOGIN_TIME_PERMANENT / 2 < time())) ||
125 125
                 (($this->permanent == false) && (strtotime($rUser['last_login']) + LOGIN_TIME / 2 < time()))
126 126
             ) {
127 127
                 sql(
Please login to merge, or discard this patch.