Merge lp:~hartmut-php/eventum/bug904033 into lp:eventum

[Hartmut Holzgraefe]

Branch fixes bug #904033 by making Lock::release() return true if it actually removed a lock file, false otherwise and only printing "removed lock file" messages in the cron job scripts if true is returend from Lock::release()

=== modified file 'crons/check_reminders.php'
--- crons/check_reminders.php	2010-11-18 20:59:02 +0000
+++ crons/check_reminders.php	2011-12-14 00:57:05 +0000
@@ -31,8 +31,9 @@
 
 // if requested, clear the lock
 if (in_array('--fix-lock', $argv)) {
-    Lock::release('check_reminders');
-    echo "The lock file was removed successfully.\n";
+    if (Lock::release('check_reminders')) {
+        echo "The lock file was removed successfully.\n";
+    }
     exit;
 }
 

=== modified file 'crons/download_emails.php'
--- crons/download_emails.php	2010-11-23 14:42:17 +0000
+++ crons/download_emails.php	2011-12-14 00:57:05 +0000
@@ -177,14 +177,16 @@
             $ema_ids = Email_Account::getAssocList($prj_id);
             foreach ($ema_ids as $ema_id => $ema_title) {
                 $lockfile = 'download_emails_' . $ema_id;
-                Lock::release($lockfile);
-                msg("Removed lock file '$lockfile'.");
+                if (Lock::release($lockfile)) {
+                    msg("Removed lock file '$lockfile'.");
+                }
             }
         }
     } else {
         $lockfile = 'download_emails_' . $account_id;
-        Lock::release($lockfile);
-        msg("Removed lock file '$lockfile'.");
+        if (Lock::release($lockfile)) {
+            msg("Removed lock file '$lockfile'.");
+        }
     }
     exit(0);
 }

=== modified file 'crons/process_mail_queue.php'
--- crons/process_mail_queue.php	2010-07-28 08:50:32 +0000
+++ crons/process_mail_queue.php	2011-12-14 00:57:05 +0000
@@ -70,8 +70,9 @@
 
 // if requested, clear the lock
 if ($config['fix-lock']) {
-    Lock::release('process_mail_queue');
-    echo "The lock file was removed successfully.\n";
+    if (Lock::release('process_mail_queue')) {
+        echo "The lock file was removed successfully.\n";
+    }
     exit(0);
 }
 

=== modified file 'lib/eventum/class.lock.php'
--- lib/eventum/class.lock.php	2010-08-26 19:08:48 +0000
+++ lib/eventum/class.lock.php	2011-12-14 00:57:05 +0000
@@ -59,14 +59,15 @@
      *
      * @access  public
      * @param   string $name The name of this lock file
-     * @return  void
+     * @return  boolean
      */
     public static function release($name)
     {
         $pid_file = self::getProcessFilename($name);
         if (file_exists($pid_file)) {
-            unlink($pid_file);
+            return unlink($pid_file);
         }
+        return false;
     }