From: Janusz Dobrowolski Date: Sun, 22 Feb 2009 10:49:21 +0000 (+0000) Subject: Application startup code cleaup. X-Git-Tag: v2.4.2~19^2~1518 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=e3b48984f41047ad16201ff1e757af02d228d79e;p=fa-stable.git Application startup code cleaup. --- diff --git a/applications/customers.php b/applications/customers.php index 5dc0881c..96d1f812 100644 --- a/applications/customers.php +++ b/applications/customers.php @@ -9,7 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - include_once("./modules/installed_modules.php"); class customers_app extends application { function customers_app() diff --git a/applications/dimensions.php b/applications/dimensions.php index f4dace29..f23715be 100644 --- a/applications/dimensions.php +++ b/applications/dimensions.php @@ -9,7 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - include_once("./modules/installed_modules.php"); class dimensions_app extends application { function dimensions_app() diff --git a/applications/generalledger.php b/applications/generalledger.php index e6908252..9cadfe62 100644 --- a/applications/generalledger.php +++ b/applications/generalledger.php @@ -9,7 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - include_once("./modules/installed_modules.php"); class general_ledger_app extends application { function general_ledger_app() diff --git a/applications/inventory.php b/applications/inventory.php index 43e40387..9ef37bd0 100644 --- a/applications/inventory.php +++ b/applications/inventory.php @@ -9,7 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - include_once("./modules/installed_modules.php"); class inventory_app extends application { function inventory_app() diff --git a/applications/manufacturing.php b/applications/manufacturing.php index 01ea6e7a..c4244a37 100644 --- a/applications/manufacturing.php +++ b/applications/manufacturing.php @@ -9,7 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - include_once("./modules/installed_modules.php"); class manufacturing_app extends application { function manufacturing_app() diff --git a/applications/setup.php b/applications/setup.php index a36e44e1..801d0530 100644 --- a/applications/setup.php +++ b/applications/setup.php @@ -9,7 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - include_once("./modules/installed_modules.php"); class setup_app extends application { function setup_app() diff --git a/applications/suppliers.php b/applications/suppliers.php index 8aacea96..7058716e 100644 --- a/applications/suppliers.php +++ b/applications/suppliers.php @@ -9,7 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - include_once("./modules/installed_modules.php"); class suppliers_app extends application { function suppliers_app() diff --git a/frontaccounting.php b/frontaccounting.php index 0f4c98d7..246d8dc4 100644 --- a/frontaccounting.php +++ b/frontaccounting.php @@ -9,17 +9,16 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - include_once('applications/application.php'); - include_once('applications/customers.php'); - include_once('applications/suppliers.php'); - include_once('applications/inventory.php'); - include_once('applications/manufacturing.php'); - include_once('applications/dimensions.php'); - include_once('applications/generalledger.php'); - include_once('applications/setup.php'); - include_once('installed_extensions.php'); - $path_to_root="."; - include_once($path_to_root . "/includes/session.inc"); + include_once($path_to_root . '/applications/application.php'); + include_once($path_to_root . '/applications/customers.php'); + include_once($path_to_root . '/applications/suppliers.php'); + include_once($path_to_root . '/applications/inventory.php'); + include_once($path_to_root . '/applications/manufacturing.php'); + include_once($path_to_root . '/applications/dimensions.php'); + include_once($path_to_root . '/applications/generalledger.php'); + include_once($path_to_root . '/applications/setup.php'); + include_once($path_to_root . '/installed_extensions.php'); + include_once($path_to_root . '/modules/installed_modules.php'); class front_accounting { diff --git a/includes/lang/language.php b/includes/lang/language.php index 50a88dfc..62866f0b 100644 --- a/includes/lang/language.php +++ b/includes/lang/language.php @@ -56,7 +56,6 @@ class language $locale = $path_to_root . "/lang/" . $_SESSION['language']->code . "/locale.inc"; // check id file exists only once for session $_SESSION['language']->is_locale_file = file_exists($locale); - reload_page(""); } } @@ -102,39 +101,6 @@ function has_locale($fun=null) return false; } -session_name('FrontAccounting'.user_company()); -session_start(); -// this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks -header("Cache-control: private"); - -// Page Initialisation -if (!isset($_SESSION['languages'])) -{ - language::load_languages(); -} - -$lang = $_SESSION['language']; - -// get_text support -get_text::init(); -get_text::set_language($lang->code, $lang->encoding); -//get_text::add_domain("wa", $path_to_root . "/lang"); -get_text::add_domain($lang->code, $path_to_root . "/lang"); -// Unnecessary for ajax calls. -// Due to bug in php 4.3.10 for this version set globally in php.ini -ini_set('default_charset', $_SESSION['language']->encoding); - -if (!function_exists("_")) -{ - function _($text) - { - $retVal = get_text::gettext($text); - if ($retVal == "") - return $text; - return $retVal; - } -} - function _set($key,$value) { get_text::set_var($key,$value); @@ -160,6 +126,14 @@ function reload_page($msg) $Ajax->redirect($_SERVER['PHP_SELF']); } - - +if (!function_exists("_")) +{ + function _($text) + { + $retVal = get_text::gettext($text); + if ($retVal == "") + return $text; + return $retVal; + } +} ?> \ No newline at end of file diff --git a/includes/session.inc b/includes/session.inc index d3d6689e..4a67da7a 100644 --- a/includes/session.inc +++ b/includes/session.inc @@ -1,154 +1,164 @@ . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the License here . ***********************************************************************/ - function output_html($text) - { - global $before_box, $Ajax, $messages; - // Fatal errors are not send to error_handler, - // so we must check the output - if ($text && preg_match('/\bFatal error(<.*?>)?:(.*)/i', $text, $m)) { - $Ajax->aCommands = array(); // Don't update page via ajax on errors +function output_html($text) +{ + global $before_box, $Ajax, $messages; + // Fatal errors are not send to error_handler, + // so we must check the output + if ($text && preg_match('/\bFatal error(<.*?>)?:(.*)/i', $text, $m)) { + $Ajax->aCommands = array(); // Don't update page via ajax on errors $text = preg_replace('/\bFatal error(<.*?>)?:(.*)/i','', $text); $messages[] = array(E_ERROR, $m[2], null, null); - } - $Ajax->run(); - return in_ajax() ? fmt_errors() : ($before_box.fmt_errors().$text); } - - if (!isset($path_to_root)) + $Ajax->run(); + return in_ajax() ? fmt_errors() : ($before_box.fmt_errors().$text); +} +//---------------------------------------------------------------------------------------- + +function kill_login() +{ + session_unset(); + session_destroy(); +} +//---------------------------------------------------------------------------------------- + +function login_fail() +{ + header("HTTP/1.1 401 Authorization Required"); + echo "


" . _("Incorrect Password") . "

"; + echo "" . _("The user and password combination is not valid for the system.") . "

"; + + echo _("If you are not an authorized user, please contact your system administrator to obtain an account to enable you to use the system."); + echo "
" . _("Back") . ""; + echo "
"; + + kill_login(); + die(); +} + +//---------------------------------------------------------------------------------------- + +function check_page_security($page_security) +{ + if (!$_SESSION["wa_current_user"]->check_user_access()) { - $path_to_root = "."; + echo "


"; + echo "" . _("Security settings have not been defined for your user account."); + echo "
" . _("Please contact your system administrator.") . ""; + + kill_login(); + exit; } - include_once($path_to_root . "/includes/current_user.inc"); + if (!$_SESSION["wa_current_user"]->can_access_page($page_security)) + { + page(_("Access denied")); + echo "



"; + echo _("The security settings on your account do not permit you to access this function"); + echo ""; + echo "



"; + end_page(); + //kill_login(); + exit; + } +} + +//----------------------------------------------------------------------------- +// Removing magic quotes from nested arrays/variables +// +function strip_quotes($data) +{ + if(get_magic_quotes_gpc()) { + if(is_array($data)) { + foreach($data as $k => $v) { + $data[$k] = strip_quotes($data[$k]); + } + } else + return stripslashes($data); + } + return $data; +} -/* - // Make sure this directory exists and is writable! - $session_save_path = dirname(__FILE__).'/tmp/'; -*/ +//============================================================================ +if (!isset($path_to_root)) +{ + $path_to_root = "."; +} - $session_save_path = session_save_path(); - if (strpos($session_save_path, ";") !== false) - $session_save_path = substr($session_save_path, strpos($session_save_path, ";") + 1); +// Prevent register_globals vulnerability +if (isset($_GET['path_to_root']) || isset($_POST['path_to_root'])) + die("Restricted access"); - if (isset($session_save_path)) - { - session_save_path($session_save_path); - unset($session_save_path); - } - if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root'])) - die("Restricted access"); - include_once($path_to_root . "/includes/lang/language.php"); - include_once($path_to_root . "/config_db.php"); - include_once($path_to_root . "/config.php"); - include_once($path_to_root . "/includes/ajax.inc"); - $Ajax =& new Ajax(); +include_once($path_to_root . "/frontaccounting.php"); +include_once($path_to_root . "/includes/current_user.inc"); +include_once($path_to_root . "/includes/lang/language.php"); +include_once($path_to_root . "/config_db.php"); +include_once($path_to_root . "/includes/ajax.inc"); - include_once($path_to_root . "/includes/main.inc"); +/* + Make sure this directory exists and is writable! +// $session_save_path = dirname(__FILE__).'/../tmp/'; +*/ - //---------------------------------------------------------------------------------------- +session_name('FrontAccounting'); +session_start(); +// this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks +header("Cache-control: private"); - function kill_login() - { - session_unset(); - session_destroy(); - } +// Page Initialisation +if (!isset($_SESSION['languages'])) +{ + language::load_languages(); +} - //---------------------------------------------------------------------------------------- +$lang = $_SESSION['language']; - function login_fail() - { - echo "


" . _("Incorrect Password") . "

"; - echo "" . _("The user and password combination is not valid for the system.") . "

"; +// get_text support +get_text::init(); +get_text::set_language($lang->code, $lang->encoding); +//get_text::add_domain("wa", $path_to_root . "/lang"); +get_text::add_domain($lang->code, $path_to_root . "/lang"); - echo _("If you are not an authorized user, please contact your system administrator to obtain an account to enable you to use the system."); - echo "
" . _("Back") . ""; - echo "
"; +// Necessary for ajax calls. Due to bug in php 4.3.10 for this +// version set globally in php.ini +ini_set('default_charset', $_SESSION['language']->encoding); - kill_login(); - die(); - } +include_once($path_to_root . "/config.php"); - //---------------------------------------------------------------------------------------- +$Ajax =& new Ajax(); - function check_page_security($page_security) - { - if (!$_SESSION["wa_current_user"]->check_user_access()) - { - echo "


"; - echo "" . _("Security settings have not been defined for your user account."); - echo "
" . _("Please contact your system administrator.") . ""; +include_once($path_to_root . "/includes/main.inc"); - kill_login(); - exit; - } +include_once($path_to_root . "/includes/ui/ui_msgs.inc"); - if (!$_SESSION["wa_current_user"]->can_access_page($page_security)) - { - page(_("Access denied")); - echo "



"; - echo _("The security settings on your account do not permit you to access this function"); - echo ""; - echo "



"; - //echo '' - end_page(); - //kill_login(); - exit; - } - } +// intercept all output to destroy it in case of ajax call +register_shutdown_function('ob_end_flush'); +ob_start('output_html',0); - //----------------------------------------------------------------------------- - // Removing magic quotes from nested arrays/variables - // - function strip_quotes($data) - { - if(get_magic_quotes_gpc()) { - if(is_array($data)) { - foreach($data as $k => $v) { - $data[$k] = strip_quotes($data[$k]); - } - } else - return stripslashes($data); - } - return $data; - } +// colect all error msgs +set_error_handler('error_handler' /*, errtypes */); +if (!isset($_SESSION["wa_current_user"])) + $_SESSION["wa_current_user"] = new current_user(); - //---------------------------------------------------------------------------------------- - if (!isset($_SESSION["wa_current_user"]) || - (isset($_SESSION["wa_current_user"]) && !$_SESSION["wa_current_user"]->logged_in())) +if (!$_SESSION["wa_current_user"]->logged_in()) +{ + // Show login screen + if (!isset($_POST["user_name_entry_field"]) or $_POST["user_name_entry_field"] == "") { - - $_SESSION["wa_current_user"] = new current_user(); - - // Show login screen - if (!isset($_POST["user_name_entry_field"]) or $_POST["user_name_entry_field"] == "") - { - include($path_to_root . "/access/login.php"); - $Ajax->redirect($path_to_root . "/access/login.php"); - exit; - } - } - include_once($path_to_root . "/includes/ui/ui_msgs.inc"); - // intercept all output to destroy it in case of ajax call - register_shutdown_function('ob_end_flush'); - ob_start('output_html',0); - // colect all error msgs - set_error_handler('error_handler' /*, errtypes */); - - if (isset($_POST["user_name_entry_field"])) - { + include($path_to_root . "/access/login.php"); + $Ajax->redirect($path_to_root . "/access/login.php"); + exit; + } else { $succeed = $_SESSION["wa_current_user"]->login($_POST["company_login_name"], $_POST["user_name_entry_field"], md5($_POST["password"])); @@ -159,18 +169,22 @@ // Incorrect password login_fail(); } - } + $lang = $_SESSION['language']; + get_text::set_language($lang->code, $lang->encoding); + } +} + - // Run with debugging messages for the system administrator(s) but not anyone else - /*if (in_array(15, $security_groups[$_SESSION["AccessLevel"]])) { - $debug = 1; - } else { - $debug = 0; - }*/ +// Run with debugging messages for the system administrator(s) but not anyone else +/*if (in_array(15, $security_groups[$_SESSION["AccessLevel"]])) { + $debug = 1; +} else { + $debug = 0; +}*/ - //---------------------------------------------------------------------------------------- +//---------------------------------------------------------------------------------------- - check_page_security($page_security); +check_page_security($page_security); // POST vars cleanup needed for direct reuse. // We quote all values later with db_escape() before db update. diff --git a/index.php b/index.php index 4df1f106..5074e174 100644 --- a/index.php +++ b/index.php @@ -10,16 +10,16 @@ See the License here . ***********************************************************************/ $path_to_root="."; - $page_security = 1; ini_set('xdebug.auto_trace',1); - include_once("frontaccounting.php"); include_once("includes/session.inc"); + if (!isset($_SESSION["App"])) $_SESSION["App"] = new front_accounting(); $app = &$_SESSION["App"]; if (isset($_GET['application'])) $app->selected_application = $_GET['application']; + $app->display(); context_reset(); ?> \ No newline at end of file diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php index bf51fb55..48fd487a 100644 --- a/themes/aqua/renderer.php +++ b/themes/aqua/renderer.php @@ -23,7 +23,7 @@ function menu_header($title, $no_menu, $is_index) { - global $path_to_root, $applications, $help_base_url, $db_connections; + global $path_to_root, $help_base_url, $db_connections; // you can owerride the table styles from config.php here, if you want. //global $table_style, $table_style2; //$table_style = "cellpadding=3 border=1 bordercolor='#8cacbb' style='border-collapse: collapse'"; @@ -40,15 +40,16 @@ echo "\n"; if (!$no_menu) { + $applications = $_SESSION['App']->applications; $local_path_to_root = $path_to_root; $sel_app = $_SESSION['sel_app']; echo "
"; echo "
"; - foreach($applications as $app => $name) + foreach($applications as $app) { - $acc = access_string($name); - echo "" .$acc[0] . ""; } echo "
"; diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php index bf51fb55..5d1bbd70 100644 --- a/themes/cool/renderer.php +++ b/themes/cool/renderer.php @@ -23,7 +23,7 @@ function menu_header($title, $no_menu, $is_index) { - global $path_to_root, $applications, $help_base_url, $db_connections; + global $path_to_root, $help_base_url, $db_connections; // you can owerride the table styles from config.php here, if you want. //global $table_style, $table_style2; //$table_style = "cellpadding=3 border=1 bordercolor='#8cacbb' style='border-collapse: collapse'"; @@ -40,6 +40,7 @@ echo "		\n"; if (!$no_menu) { + $applications = $_SESSION['App']->applications; $local_path_to_root = $path_to_root; $sel_app = $_SESSION['sel_app']; echo "
"; diff --git a/themes/default/renderer.php b/themes/default/renderer.php index fe530663..e3e58605 100644 --- a/themes/default/renderer.php +++ b/themes/default/renderer.php @@ -23,7 +23,8 @@ function menu_header($title, $no_menu, $is_index) { - global $path_to_root, $applications, $help_base_url, $db_connections; + global $path_to_root, $help_base_url, $db_connections; + // you can owerride the table styles from config.php here, if you want. //global $table_style, $table_style2; //$table_style = "cellpadding=3 border=1 bordercolor='#8cacbb' style='border-collapse: collapse'"; @@ -40,15 +41,16 @@ echo "\n"; if (!$no_menu) { + $applications = $_SESSION['App']->applications; $local_path_to_root = $path_to_root; $sel_app = $_SESSION['sel_app']; echo "
"; echo "
"; - foreach($applications as $app => $name) + foreach($applications as $app) { - $acc = access_string($name); - echo "" .$acc[0] . ""; } echo "
";