fix lockdir use

This replaces #237 which addressed the issue at only one line instead of
all 4. The _ prefix is still needed to avoid conflicts with page names.

Author: splitbrain

helper/rewrite.php

@@ -143,7 +143,7 @@ public function setSelfMoveMeta($id) {
     public static function isLocked() {
         global $PLUGIN_MOVE_WORKING;
         global $conf;
-        $lockfile = $conf['lockdir'] . self::LOCKFILENAME;
+        $lockfile = $conf['lockdir'] . '/' . self::LOCKFILENAME;
         return ((isset($PLUGIN_MOVE_WORKING) && $PLUGIN_MOVE_WORKING > 0) || file_exists($lockfile));
     }
 
@@ -154,7 +154,7 @@ public static function addLock() {
         global $PLUGIN_MOVE_WORKING;
         global $conf;
         $PLUGIN_MOVE_WORKING = $PLUGIN_MOVE_WORKING ? $PLUGIN_MOVE_WORKING + 1 : 1;
-        $lockfile = $conf['lockdir'] . self::LOCKFILENAME;
+        $lockfile = $conf['lockdir'] . '/' . self::LOCKFILENAME;
         if (!file_exists($lockfile)) {
             io_savefile($lockfile, "1\n");
         } else {
@@ -171,7 +171,7 @@ public static function removeLock() {
         global $PLUGIN_MOVE_WORKING;
         global $conf;
         $PLUGIN_MOVE_WORKING = $PLUGIN_MOVE_WORKING ? $PLUGIN_MOVE_WORKING - 1 : 0;
-        $lockfile = $conf['lockdir'] . self::LOCKFILENAME;
+        $lockfile = $conf['lockdir'] . '/' .self::LOCKFILENAME;
         if (!file_exists($lockfile)) {
             throw new Exception("removeLock failed: lockfile missing");
         } else {
@@ -192,7 +192,7 @@ public static function removeLock() {
      */
     public static function removeAllLocks() {
         global $conf;
-        $lockfile = $conf['lockdir'] . self::LOCKFILENAME;
+        $lockfile = $conf['lockdir'] . '/' . self::LOCKFILENAME;
         if (file_exists($lockfile)) {
             unlink($lockfile);
         }