X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fmain.inc;h=55a97b2bc80d0c01dbbd8a00f23886e0bf273919;hb=7b9032da05f92d030cf5ba36e1d524d123129159;hp=ad004fea5a937bef84696b15a658fce2d5aa4c69;hpb=2b52d96d333df41086ee8df25ad15818219e8d59;p=fa-stable.git diff --git a/includes/main.inc b/includes/main.inc index ad004fea..55a97b2b 100644 --- a/includes/main.inc +++ b/includes/main.inc @@ -24,7 +24,7 @@ include_once($path_to_root . "/admin/db/users_db.inc"); include_once($path_to_root . "/includes/ui/ui_view.inc"); include_once($path_to_root . "/includes/ui/ui_controls.inc"); -function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false) +function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false, $css='') { global $path_to_root, $page_security; @@ -34,7 +34,7 @@ function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $scri include($path_to_root . "/includes/page/header.inc"); - page_header($title, $no_menu, $is_index, $onload, $js); + page_header($title, $no_menu, $is_index, $onload, $js, $css); check_page_security($page_security); // error_box(); if($script_only) { @@ -259,7 +259,7 @@ function check_write($path) ) return 0; return is_writable($path) ? (is_dir($path) ? 1 : -1) - : ($path =='.' ? 0 : check_write(dirname($path))); + : (is_file($path) ? 0 : ($path == '.' ? 0 : check_write(dirname($path)))); } /* @@ -312,10 +312,10 @@ function find_custom_file($rep) // customized per company version $path = company_path(); - $file = $path.'/'.$rep; + $file = $path.$rep; if (file_exists($file)) { // add local include path - set_include_path($path.PATH_SEPARATOR.get_include_path()); + set_include_path(dirname($file).PATH_SEPARATOR.get_include_path()); return $file; } // file added by active extension modules @@ -340,5 +340,4 @@ function find_custom_file($rep) return null; } - ?> \ No newline at end of file