Added css parameter in page()

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

diff --git a/includes/main.inc b/includes/main.inc
index cffb8ee67c9871bc519b0df6851d368cdb20e472..ad004fea5a937bef84696b15a658fce2d5aa4c69 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -47,31 +47,18 @@ function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $scri
        }
 }
 
-function end_page($no_menu=false, $is_index=false, $hide_back_link=false)
+function end_page($no_menu=false, $is_index=false, $hide_back_link=false, $type_no=0, $trans_no=0)
 {
        global $path_to_root;
 
        if (!$is_index && !$hide_back_link && function_exists('hyperlink_back'))
-               hyperlink_back(true, $no_menu);
+               hyperlink_back(true, $no_menu, $type_no, $trans_no);
        div_end();      // end of _page_body section
 
        include($path_to_root . "/includes/page/footer.inc");
        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;
@@ -312,7 +299,6 @@ function copy_file($file, $from, $to)
                return @copy($from.'/'.$file, $to.'/'.$file);
        }
 }
-
 /*
        Search for file, looking first for company specific version, then for 
        version provided by any extension module, finally in main FA directory.
@@ -325,8 +311,8 @@ function find_custom_file($rep)
        global $installed_extensions, $comp_path, $path_to_root;
 
        // customized per company version
-       $path = $comp_path.'/'.user_company();
-       $file = $path.$rep;
+       $path = company_path();
+       $file = $path.'/'.$rep;
        if (file_exists($file)) {
                // add local include path
                set_include_path($path.PATH_SEPARATOR.get_include_path());