Changeset 592 for trunk/lib/Lock.inc.php

Timestamp:

Apr 3, 2017 8:24:25 AM (7 years ago)

Author:

anonymous

Message:

Update wording of lock messages. Add SQL escaping. Code formatting.

File:

• trunk/lib/Lock.inc.php (modified) (4 diffs)

trunk/lib/Lock.inc.php

@@ -371 +371 @@
             $db->query("
                 DELETE FROM " . $db->escapeString($this->getParam('db_table')) . "
-                WHERE DATE_ADD(lock_datetime, INTERVAL '" . $this->getParam('auto_timeout') . "' SECOND) < NOW()
+                WHERE DATE_ADD(lock_datetime, INTERVAL '" . $db->escapeString($this->getParam('auto_timeout')) . "' SECOND) < NOW()
             ");
             $_timeout_run = true;
@@ -388 +388 @@
 
     /**
-     * Print error page.
+     * Print error page. This method is probably not used anywhere; instead, we're including this via the template codebase/services/templates/lock.ihtml
      */
     public function printErrorHTML()
@@ -399 +399 @@
             <div id="sc-msg" class="sc-msg">
                 <div class="sc-msg-notice">
-                <?php printf(_("The record %s is currently being edited by %s (%d minutes elapsed). You cannot modify the record while it is locked by another user."),
-                    $this->getTitle(),
+                <?php printf(_("<em>%s</em> is currently being edited by %s (%d minutes elapsed). You cannot modify this database record while it is locked. Please try again later."),
+                    ucfirst($this->getTitle()),
                     $this->getEditor(),
                     date('i', $this->getSecondsElapsed() + 60)
@@ -450 +450 @@
     public function getSecondsElapsed()
     {
-        if (isset($this->data['lock_datetime']) && strtotime($this->data['lock_datetime']) < time()) {
-            return time() - strtotime($this->data['lock_datetime']);
+        if (isset($this->data['lock_datetime']) && false !== ($lock_timestamp = strtotime($this->data['lock_datetime'])) && $lock_timestamp < time()) {
+            return time() - $lock_timestamp;
         } else {
             return 0;