Index: trunk/core/kernel/startup.php
===================================================================
diff -u -N -r3369 -r3431
--- trunk/core/kernel/startup.php (.../startup.php) (revision 3369)
+++ trunk/core/kernel/startup.php (.../startup.php) (revision 3431)
@@ -2,7 +2,7 @@
define('KERNEL_PATH', FULL_PATH.'/kernel/kernel4');
include_once(KERNEL_PATH.'/globals.php'); // non OOP functions used through kernel, e.g. print_pre
-
+
if( constOn('ADMIN') ) define('SPECIAL_TEMPLATES_FOLDER', '/kernel/admin_templates');
define('INPORTAL_ENV', 1);
@@ -16,10 +16,10 @@
safeDefine('INPORTAL_TAGS', true);
safeDefine('SERVER_NAME', $_SERVER['HTTP_HOST']);
safeDefine('KERNEL_PATH', FULL_PATH.'/kernel4');
-
+
$https_mark = getArrayValue($_SERVER, 'HTTPS');
safeDefine('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
-
+
$vars = parse_portal_ini(FULL_PATH.'/config.php');
if($vars === false)
@@ -28,7 +28,7 @@
echo 'In-Portal is probably not installed, or configuration file is missing.
';
echo 'Please use the installation script to fix the problem.
';
if ( !preg_match('/admin/', __FILE__) ) $ins = '/admin';
-
+
echo 'Go to installation script
';
flush();
exit;
@@ -49,15 +49,15 @@
define('GW_CLASS_PATH', MODULES_PATH.'/in-commerce/units/gateways/gw_classes'); // Payment Gateway Classes Path
safeDefine('ENV_VAR_NAME','env');
-
+
k4_include_once(KERNEL_PATH.'/application.php');
k4_include_once(MODULES_PATH.'/kernel/units/general/my_application.php');
if( file_exists(FULL_PATH.'/debug.php') )
{
k4_include_once(FULL_PATH.'/debug.php');
if( constOn('DEBUG_MODE') ) include_once(KERNEL_PATH.'/utility/debugger.php');
- }
+ }
k4_include_once(KERNEL_PATH.'/db/db_connection.php');
@@ -71,29 +71,32 @@
safeDefine('CACHE_CONFIGS_FILES', 1);
safeDefine('EXPERIMENTAL_PRE_PARSE', 1);
safeDefine('SILENT_LOG', 0);
-
+
k4_include_once(KERNEL_PATH."/kbase.php");
k4_include_once(KERNEL_PATH.'/utility/event.php');
k4_include_once(KERNEL_PATH."/utility/factory.php");
k4_include_once(KERNEL_PATH."/languages/phrases_cache.php");
if( !function_exists('adodb_mktime') ) k4_include_once(KERNEL_PATH.'/utility/adodb-time.inc.php');
-
+
// We should get rid of these includes:
k4_include_once(KERNEL_PATH."/db/dblist.php");
k4_include_once(KERNEL_PATH."/db/dbitem.php");
-
+
k4_include_once(KERNEL_PATH.'/processors/tag_processor.php');
k4_include_once(KERNEL_PATH."/db/db_tag_processor.php");
-
+
k4_include_once(KERNEL_PATH."/event_handler.php");
k4_include_once(KERNEL_PATH.'/db/db_event_handler.php');
k4_include_once(MODULES_PATH.'/kernel/units/general/inp_db_event_handler.php');
-
+
k4_include_once(KERNEL_PATH."/utility/temp_handler.php"); // needed because of static calls from kBase
// up to here
// global constants
define ('FALSE_ON_NULL', 1);
define ('EMPTY_ON_NULL', 2);
+ define ('KG_TO_POUND', 2.20462262);
+ define ('POUND_TO_KG', 0.45359237);
+
?>
\ No newline at end of file