projects
/
shipsimu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1079ab2
)
Used exit() instead of die()
author
Roland Häder
<roland@mxchange.org>
Tue, 7 Aug 2012 00:56:45 +0000
(
00:56
+0000)
committer
Roland Häder
<roland@mxchange.org>
Tue, 7 Aug 2012 00:56:45 +0000
(
00:56
+0000)
index.php
patch
|
blob
|
history
diff --git
a/index.php
b/index.php
index 66a45e537db557b1c3bb771a5bb1828b1207d247..a14e71b0b5f8275639eb7a3ad1ef652288a9d34a 100644
(file)
--- a/
index.php
+++ b/
index.php
@@
-9,7
+9,7
@@
*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 201
1
Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 201
2
Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
@@
-41,7
+41,7
@@
final class ApplicationEntryPoint {
'debug', // Debug output
'db', // Database layer
'io', // Base I/O system (local file [or network])
'debug', // Debug output
'db', // Database layer
'io', // Base I/O system (local file [or network])
- 'engine', // Template engine ( for ApplicationEntryPoint::app_
die
() )
+ 'engine', // Template engine ( for ApplicationEntryPoint::app_
exit
() )
'lang', // Language sub-system
'app', // The ApplicationHelper instance
);
'lang', // Language sub-system
'app', // The ApplicationHelper instance
);
@@
-52,15
+52,15
@@
final class ApplicationEntryPoint {
* @param $message The optional message we shall output on exit
* @param $code Error code from exception
* @param $extraData Extra information from exceptions
* @param $message The optional message we shall output on exit
* @param $code Error code from exception
* @param $extraData Extra information from exceptions
- * @param $silentMode W
ether not
silent mode is turned on
+ * @param $silentMode W
hether
silent mode is turned on
* @return void
* @todo This method is old code and needs heavy rewrite and should be moved to ApplicationHelper
*/
* @return void
* @todo This method is old code and needs heavy rewrite and should be moved to ApplicationHelper
*/
- public static final function app_
die
($message = '', $code = false, $extraData = '', $silentMode = false) {
+ public static final function app_
exit
($message = '', $code = false, $extraData = '', $silentMode = false) {
// Is this method already called?
if (isset($GLOBALS['app_die_called'])) {
// Then output the text directly
// Is this method already called?
if (isset($GLOBALS['app_die_called'])) {
// Then output the text directly
-
die
($message);
+
exit
($message);
} // END - if
// This method shall not be called twice
} // END - if
// This method shall not be called twice
@@
-78,7
+78,7
@@
final class ApplicationEntryPoint {
// Do we have debug installation?
if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) {
// Abort here
// Do we have debug installation?
if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) {
// Abort here
-
die
();
+
exit
();
} // END - if
// Get some instances
} // END - if
// Get some instances
@@
-98,7
+98,7
@@
final class ApplicationEntryPoint {
// Get the template instance from our object factory
$templateInstance = ObjectFactory::createObjectByName($tpl);
} catch (FrameworkException $e) {
// Get the template instance from our object factory
$templateInstance = ObjectFactory::createObjectByName($tpl);
} catch (FrameworkException $e) {
-
die
(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
+
exit
(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
$e->getMessage()
));
}
$e->getMessage()
));
}
@@
-166,14
+166,14
@@
final class ApplicationEntryPoint {
$responseInstance->flushBuffer();
} catch (FileIoException $e) {
// Even the template 'emergency_exit' wasn't found so output both message
$responseInstance->flushBuffer();
} catch (FileIoException $e) {
// Even the template 'emergency_exit' wasn't found so output both message
-
die
($message . ', exception: ' . $e->getMessage());
+
exit
($message . ', exception: ' . $e->getMessage());
}
// Good bye...
exit();
} else {
// Output message and die
}
// Good bye...
exit();
} else {
// Output message and die
-
die
(sprintf("[Main:] Emergency exit reached: <span class=\"emergency_span\">%s</span>",
+
exit
(sprintf("[Main:] Emergency exit reached: <span class=\"emergency_span\">%s</span>",
$message
));
}
$message
));
}