Fixed colors in console;

More sophisticated autoloader;
Error message changes.

Author: boenrobot

scripts/roscon.bat

@@ -5,18 +5,17 @@ REM 2. "php" from %cd% with one of %pathext% extensions.
 REM 3. "php" from a %path% path with one of %pathext% extensions.
 REM 4. Whatever %PHP_PEAR_PHP_BIN% points to.
 REM
-REM Once a binary is found, a file is looked for at the %PHPFILE% environment
-REM variable (not intendend to be overriden).
-REM Fallbacks to a file with the same name as this one.
+REM Once a binary is found, a file is looked for that has the same name as
+REM this batch file.
 REM Prefered extensions are ".php" and then no extension.
-REM
 goto SET_BIN
 :PHP_ERR
 echo PHP interpreter not found. Please set the %%PHPBIN%% or %%PHP_PEAR_PHP_BIN%% environment variable to one, or add one to your %%PATH%%.
-goto DONE
+goto :eof
 :FILE_ERR
 echo The file to be ran was not found. It should be at either "%~d0%~p0%~n0.php" or "%~d0%~p0%~n0".
-goto DONE
+endlocal
+goto :eof
 :SET_BIN
 if "%PHPBIN%" == "" set PHPBIN=php
 where /q %PHPBIN%
@@ -26,10 +25,12 @@ where /q "%PHP_PEAR_PHP_BIN%"
 if %ERRORLEVEL% neq 0 goto PHP_ERR
 set PHPBIN=%PHP_PEAR_PHP_BIN%
 :SET_FILE
-if "%PHPFILE%" == "" set PHPFILE=%~d0%~p0%~n0.php
+setlocal
+set PHPFILE=%~d0%~p0%~n0.php
 if exist "%PHPFILE%" goto RUN
 set PHPFILE=%~d0%~p0%~n0
-if not exist "%PHPFILE%" goto FILE_ERR
+if exist "%PHPFILE%" goto RUN
+goto FILE_ERR
 :RUN
 "%PHPBIN%" "%PHPFILE%" %*
-:DONE
+endlocal

scripts/roscon.php

@@ -49,11 +49,29 @@
 
 //If there's no appropriate autoloader, add one
 if (!class_exists('PEAR2\Net\RouterOS\Communicator', true)) {
-    include_once 'PEAR2/Autoload.php';
-    chdir(__DIR__);
-    Autoload::initialize(realpath('../src'));
-    Autoload::initialize(realpath('../../Net_Transmitter.git/src'));
-    Autoload::initialize(realpath('../../Console_Color.git/src'));
+    $autoloader = stream_resolve_include_path('../vendor/autoload.php');
+    if (false !== $autoloader) {
+        include_once $autoloader;
+    } else {
+        $autoloader = stream_resolve_include_path('PEAR2/Autoload.php');
+        if (false !== $autoloader) {
+            include_once $autoloader;
+            Autoload::initialize(realpath('../src'));
+            Autoload::initialize(realpath('../../Net_Transmitter.git/src'));
+            Autoload::initialize(realpath('../../Cache_SHM.git/src'));
+        } else {
+            fwrite(
+                STDERR,
+                <<<HEREDOC
+No recognized autoloader is available.
+Please install this package with Pyrus, PEAR or Composer.
+Alternatively, install PEAR2_Autoload, and/or add it to your include_path.
+HEREDOC
+            );
+            exit(10);
+        }
+    }
+    unset($autoloader);
 }
 
 // Locate the data dir, in preference as:
@@ -72,7 +90,7 @@
         STDERR,
         'Unable to find data dir.'
     );
-    exit(10);
+    exit(11);
 }
 $consoleDefFile = realpath($dataDir . '/roscon.xml');
 if (false === $consoleDefFile) {
@@ -84,7 +102,7 @@
 {$dataDir}
 HEREDOC
     );
-    exit(11);
+    exit(12);
 }
 
 $cmdParser = CommandLine::fromXmlFile($consoleDefFile);
@@ -95,7 +113,7 @@
         STDERR,
         'Error when parsing command line: ' . $e->getMessage() . "\n"
     );
-    $cmdParser->displayUsage(12);
+    $cmdParser->displayUsage(13);
 }
 
 $c_colors = array(
@@ -126,6 +144,10 @@
         Color\Backgrounds::YELLOW
     );
     $c_colors[''] = new Color();
+
+    foreach ($c_colors as $mode => $color) {
+        $c_colors[$mode] = ((string)$color) . "\033[K";
+    }
 }
 
 $cmd->options['size'] = $cmd->options['size'] ?: 80;
@@ -188,12 +210,18 @@
 <<<HEREDOC
 Login refused. Possible reasons:
 1. No such username.
-3. The user does not have the "api" privilege. Check the username's group, and
-   it's permissions at "/user groups".
-2. Mistyped password. If the password contains non-ASCII characters, be careful
-   of your locale settings - either they must match those of the terminal you
-   set your password on, or you must type the equivalent code points in your
-   locale, which may display as different characters.
+   Make sure you have spelled it correctly.
+2. The user does not have the "api" privilege.
+   Check the permissions of the user's group at "/user group".
+3. The user is not allowed to access the router from your web server's IP.
+   Make sure your web server's IP address is within the subnets the user is
+   allowed to log in from. You can check them at the "address" property
+   of the user in the "/user" menu.
+4. Mistyped password.
+   If the password contains non-ASCII characters, be careful of your locale.
+   It must match that of the terminal you set your password on, or you must
+   type the equivalent code points in your current locale, which may display as
+   different characters.
 
 HEREDOC
             );

stub.php

@@ -116,7 +116,7 @@
 
 1. You haven't enabled the API service at RouterOS or you've enabled it on a
 different TCP port. Make sure that the "api" service at "/ip service" is
-enabled, and with that same TCP port (8728 by default).
+enabled, and with that same TCP port (8728 by default or 8729 for "api-ssl").
 
 2. You've mistyped the IP and/or port. Check the IP and port you've specified
 are the ones you intended.