Made cli_dispatch.phpsh work when called as "php cli_dispatch.phpsh" and protect...

[Packages/TYPO3.CMS.git] / typo3 / cli_dispatch.phpsh

diff --git a/typo3/cli_dispatch.phpsh b/typo3/cli_dispatch.phpsh
index d7a5875..4057f4e 100755 (executable)
--- a/typo3/cli_dispatch.phpsh
+++ b/typo3/cli_dispatch.phpsh
@@ -8,13 +8,16 @@
 // The point is to have only ONE script dealing with the environment initialization while the actual processing is all a developer should care for.
 // *****************************************
 
+if (PHP_SAPI!='cli')   {
+       die('ERROR: Not called from a command line interface (eg. a shell or scheduler).'.chr(10));
+}
+
        // Defining circumstances for CLI mode:
 define('TYPO3_cliMode', TRUE);
 
        // Defining PATH_thisScript here: Must be the ABSOLUTE path of this script in the right context:
        // This will work as long as the script is called by it's absolute path!
-$temp_PATH_thisScript = isset($_ENV['_']) ? $_ENV['_'] : $_SERVER['_'];
-$BACK_PATH = '';
+$temp_PATH_thisScript = isset($_SERVER['argv'][0]) ? $_SERVER['argv'][0] : (isset($_ENV['_']) ? $_ENV['_'] : $_SERVER['_']);
 
        // Alternatively, in some environments, we might be able to figure out the absolute path (with no "../" and "./" in) from environment variables...
 if ($temp_PATH_thisScript{0}!='/')     {
@@ -26,11 +29,11 @@ if ($temp_PATH_thisScript{0}!='/')  {
 }
 define('PATH_thisScript',$temp_PATH_thisScript);
 
-       // First argument is a key that 
-define('TYPO3_cliKey', $_SERVER["argv"][0]);
+       // First argument is a key that points to the script configuration
+define('TYPO3_cliKey', $_SERVER['argv'][1]);
 
        // Include init file:
-require(dirname(PATH_thisScript).'/'.$BACK_PATH.'init.php');
+require(dirname(PATH_thisScript).'/init.php');
 
 if (defined('TYPO3_cliInclude'))       {
        include(TYPO3_cliInclude);
@@ -38,4 +41,4 @@ if (defined('TYPO3_cliInclude'))      {
        echo 'ERROR: Nothing to include.'.chr(10);
        exit;
 }
-?>
+?>
\ No newline at end of file