Merge commit 'origin/master' into account

[platal.git] / bin / cron / compliance.php

diff --git a/bin/cron/compliance.php b/bin/cron/compliance.php
index fffe1f9..23739ff 100755 (executable)
--- a/bin/cron/compliance.php
+++ b/bin/cron/compliance.php
@@ -32,11 +32,11 @@ require('./connect.db.inc.php');
  */
 function discardExpiredSessions($userPerms, $retentionPeriod, $minimalBacklog) {
     XDB::execute(
-        "DELETE  #logger#.s
-           FROM  #logger#.sessions AS s
+        "DELETE  s
+           FROM  log_sessions AS s
            JOIN  (SELECT  u.user_id,
                           (SELECT  us.start
-                             FROM  #logger#.sessions AS us
+                             FROM  log_sessions AS us
                             WHERE  us.uid = u.user_id
                          ORDER BY  us.start DESC
                             LIMIT  {?}, 1) AS no_discard_limit
@@ -57,7 +57,7 @@ function discardExpiredSessions($userPerms, $retentionPeriod, $minimalBacklog) {
 function checkOrphanedSessions() {
     $res = XDB::query(
         "SELECT  COUNT(*)
-           FROM  #logger#.sessions AS s
+           FROM  log_sessions AS s
       LEFT JOIN  #x4dat#.auth_user_md5 AS u ON (u.user_id = s.uid)
           WHERE  u.user_id IS NULL");
     if (($count = $res->fetchOneCell())) {
@@ -70,9 +70,9 @@ function checkOrphanedSessions() {
  */
 function purgeOrphanedEvents() {
     XDB::execute(
-        "DELETE  #logger#.e
-           FROM  #logger#.events AS e
-      LEFT JOIN  #logger#.sessions AS s ON (s.id = e.session)
+        "DELETE  e
+           FROM  log_events AS e
+      LEFT JOIN  log_sessions AS s ON (s.id = e.session)
           WHERE  s.id IS NULL");
     $affectedRows = XDB::affectedRows();
     echo "Orphaned events: removed $affectedRows events.\n";
@@ -93,8 +93,8 @@ checkOrphanedSessions();
 purgeOrphanedEvents();
 
 // Many rows have been removed from the two logger tables. Let's optimize them.
-XDB::execute("OPTIMIZE TABLE #logger#.events");
-XDB::execute("OPTIMIZE TABLE #logger#.sessions");
+XDB::execute("OPTIMIZE TABLE log_events");
+XDB::execute("OPTIMIZE TABLE log_sessions");
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>