Merged changes from main branch up to release 2.2.1

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

diff --git a/includes/main.inc b/includes/main.inc
index ee4417e24d86b661e4c95eded084fed79a992273..b0878fb5004450b941b39fe611ad9fa81b2ef3d9 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -11,7 +11,6 @@
 ***********************************************************************/
 include_once($path_to_root . "/includes/db/connect_db.inc");
 
-include_once($path_to_root . "/includes/reserved.inc");
 include_once($path_to_root . "/includes/errors.inc");
 include_once($path_to_root . "/includes/types.inc");
 include_once($path_to_root . "/includes/systypes.inc");
@@ -25,18 +24,19 @@ include_once($path_to_root . "/includes/db/audit_trail_db.inc");
 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");
-include_once($path_to_root . "/installed_extensions.php");
        
 function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false)
 {
 
-       global $path_to_root;
+       global $path_to_root, $page_security;
+
 
        $hide_menu = $no_menu;
 
        include($path_to_root . "/includes/page/header.inc");
 
        page_header($title, $no_menu, $is_index, $onload, $js);
+       check_page_security($page_security);
 //     error_box();
        if($script_only) {              
                echo '<noscript>';
@@ -61,7 +61,7 @@ function flush_dir($path, $wipe = false)
 {
        $dir = opendir($path);
        while(false !== ($fname = readdir($dir))) {
-               if($fname=='.' || $fname=='..' || (!$wipe && $fname=='index.php')) continue;
+               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);
@@ -259,37 +259,5 @@ function js_compress($sJS)
        }
        return $sJS;
 }
-//-----------------------------------------------------------------------------
-//     Inserts $elements into $array at position $index.
-//     $elements is list of any objects
-//
-function array_insert(&$array, $index, $elements)
-{
-       if (!is_array($elements)) $elements = array($elements);
-
-       $head  = array_splice($array, 0, $index);
-       $array = array_merge($head, $elements, $array);
-}
-
-function array_remove(&$array, $index, $len=1)
-{
-       array_splice($array, $index, $len);
-}
-
-function array_replace(&$array, $index, $len, $elements)
-{
-       array_splice($array, $index, $len);
-       array_insert($array, $index, $elements);
-}
-
-function array_append(&$array, $elements)
-{
-       foreach($elements as $key => $el) {
-               if(is_int($key))
-                       $array[] = $el;
-               else
-                       $array[$key] = $el;
-       }
-}
 
 ?>
\ No newline at end of file