WIP: all ok?

NicolasRannou · Dec 2, 2011 · c263cd0 · c263cd0
1 parent d3f5f91
commit c263cd0
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 15 deletions.
diff --git a/ajax.php b/ajax.php
diff --git a/currentimage.php → ajax/currentimage.php b/currentimage.php → ajax/currentimage.php
diff --git a/currentimageupdate.php → ajax/currentimageupdate.php b/currentimageupdate.php → ajax/currentimageupdate.php
diff --git a/testcommand.php → ajax/testcommand.php b/testcommand.php → ajax/testcommand.php
@@ -12,12 +12,9 @@
     $_SESSION["newimage"] = $newimage;
     $_SESSION["command"] = $command;
 
-
-
-    // In my case $HTTP_ENV_VARS['PATH'] = bin:usr/bin
     $env_vars = "/Users/nr52/INSTALL/ImageMagick-6.7.3/bin/";
 
-    $fullcommand = $env_vars . $command . " " . $image . " " . $newimage;
+    $fullcommand = $env_vars . $command . " ../" . $image . " ../" . $newimage;
 
     system($fullcommand);
 

diff --git a/js/ajax.js b/js/ajax.js
@@ -43,7 +43,7 @@ function UpdateCurrentImage(filename)
   }
 
 
-  var im = "currentimage.php?var1=";
+  var im = "ajax/currentimage.php?var1=";
   var ag = im.concat(filename);
 
   xmlHttp.open("GET", ag, true); 
@@ -71,7 +71,7 @@ function RequestUpdateImageIfAny()
     }
   }
 
-  xmlHttp.open("GET", "currentimageupdate.php", true); 
+  xmlHttp.open("GET", "ajax/currentimageupdate.php", true); 
   xmlHttp.send(null);
 }
 
@@ -105,7 +105,7 @@ function UpdateTestCommand(file)
     }
   }
 
-  var im = "testcommand.php?var1=";
+  var im = "ajax/testcommand.php?var1=";
   var ag = im.concat(file);
 
   xmlHttp.open("GET", ag, true);