diff --git a/composer.json b/composer.json index 092505818..8e82b22b4 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,6 @@ "license": "GNU Affero General Public License version 3", "require": { - "luracast/restler" : "dev-master" + "luracast/restler" : "v3.0.0" } -} \ No newline at end of file +} diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php index db389ba5f..e78924bd1 100644 --- a/gulliver/system/class.bootstrap.php +++ b/gulliver/system/class.bootstrap.php @@ -3057,15 +3057,15 @@ class Bootstrap if (! is_dir(PATH_TRUNK . 'vendor')) { if (file_exists(PATH_TRUNK . 'composer.phar')) { throw new Exception( - "ERROR: Verdors are missing!\n" . - "Please execute the following command to install vendors for the environment:\n" . + "ERROR: Verdors are missing!" . PHP_EOL . + "Please execute the following command to install vendors:" .PHP_EOL.PHP_EOL. "$>php composer.phar install" ); } else { throw new Exception( - "ERROR: Verdors are missing!\n" . - "Please execute the following commands to prepare/install vendors for the environment:\n" . - "$>curl -sS https://getcomposer.org/installer | php\n" . + "ERROR: Verdors are missing!" . PHP_EOL . + "Please execute the following commands to prepare/install vendors:" .PHP_EOL.PHP_EOL. + "$>curl -sS https://getcomposer.org/installer | php" . PHP_EOL . "$>php composer.phar install" ); } diff --git a/gulliver/templates/error.tpl b/gulliver/templates/error.tpl index 87eae617c..a44198ce5 100644 --- a/gulliver/templates/error.tpl +++ b/gulliver/templates/error.tpl @@ -1,52 +1,80 @@ - - - - -Server Error :: - - + + +
+

ProcessMaker, looks like something went wrong.

+

+ {$exceptionClass}: {$title}

+
+
+
    + {$message} +
+
+
+ + - - - - - -
- -
-
- - - - -
- {$title}
-
- {$message}

-
-
- - - - 
{$trace}
-
- -
- - \ No newline at end of file diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index d5d54fd44..d0512d42c 100755 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -1026,5 +1026,9 @@ try { } } } catch (Exception $e) { - Bootstrap::renderTemplate('error.tpl', 'SYSTEM EXCEPTION', $e->getMessage(), array()); + Bootstrap::renderTemplate('error.tpl', array( + 'title' => 'ProcessMaker Bootstrap Exception', + 'message' => nl2br($e->getMessage()), + 'exceptionClass' => get_class($e) + )); }