Layout improvements.

[fa-stable.git] / includes / main.inc

diff --git a/includes/main.inc b/includes/main.inc
index ef86d4383903f587fda2eda5ab7e5f6b2eac000c..55a97b2bc80d0c01dbbd8a00f23886e0bf273919 100644 (file)
--- 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) {              
@@ -59,19 +59,6 @@ function end_page($no_menu=false, $is_index=false, $hide_back_link=false, $type_
        page_footer($no_menu, $is_index, $hide_back_link);
 }
 
-function flush_dir($path, $wipe = false) 
-{
-       $dir = opendir($path);
-       while(false !== ($fname = readdir($dir))) {
-               if($fname=='.' || $fname=='..' || $fname=='CVS' || (!$wipe && $fname=='index.php')) continue;
-               if(is_dir($path.'/'.$fname)) {
-                   flush_dir($path.'/'.$fname, $wipe);
-                   if ($wipe) @rmdir($path.'/'.$fname);
-               } else
-                   @unlink($path.'/'.$fname);
-       }
-}
-
 function cache_js_file($fpath, $text) 
 {
        global $go_debug;
@@ -272,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,21 +299,6 @@ function copy_file($file, $from, $to)
                return @copy($from.'/'.$file, $to.'/'.$file);
        }
 }
-/*
-       Returns current path to company private folder.
-       (Current path can change after chdir).
-*/
-function company_path($comp=null)
-{
-       global $path_to_root, $comp_path;
-
-       if (!isset($comp))
-               $comp = user_company();
-
-       // if path is relative, set current path_to_root
-       return ($comp_path[0]=='.' ? $path_to_root.'/'.basename($comp_path) : $comp_path)
-                       . '/'.$comp;
-}
 /*
        Search for file, looking first for company specific version, then for 
        version provided by any extension module, finally in main FA directory.
@@ -340,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
@@ -368,5 +340,4 @@ function find_custom_file($rep)
        return null;
 }
 
-
 ?>
\ No newline at end of file