X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fmain.inc;h=e1b03fd2579a544fa544e0990d14adb87cd4cb20;hb=0079bcececc5700a07b4bffb546f4ef5870d4ea9;hp=05c8d626fb5cc28c6827053577e9fdfc231ecded;hpb=4d5e7f226ff4816a67fe29bf5f0ed11acbcbd33b;p=fa-stable.git

diff --git a/includes/main.inc b/includes/main.inc
index 05c8d626..e1b03fd2 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -1,89 +1,76 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     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 <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-    include_once($path_to_root . "/includes/db/connect_db.inc");
+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");
-    include_once($path_to_root . "/includes/references.inc");
-    include_once($path_to_root . "/includes/prefs/sysprefs.inc");
-    include_once($path_to_root . "/includes/db/comments_db.inc");
-    include_once($path_to_root . "/includes/db/sql_functions.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");
+include_once($path_to_root . "/includes/references.inc");
+include_once($path_to_root . "/includes/db/comments_db.inc");
+include_once($path_to_root . "/includes/db/sql_functions.inc");
+include_once($path_to_root . "/includes/db/audit_trail_db.inc");
+//include_once($path_to_root . "/includes/validation.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");
+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)
+{
 
-    	global $path_to_root, $installed_extensions;
+   	global $path_to_root, $page_security;
 
-    	$hide_menu = $no_menu;
 
-		if ($no_menu==false && count($installed_extensions))
-		{
-			global $applications;
-			foreach ($installed_extensions as $ext)
-			{
-				$s = $applications['system'];
-				array_pop($applications);
-				$applications[$ext['name']] = $ext['title'];;
-				$applications['system'] = $s;
-			}	
-		}	
+   	$hide_menu = $no_menu;
 
-    	include($path_to_root . "/includes/page/header.inc");
+   	include($path_to_root . "/includes/page/header.inc");
 
-    	page_header($title, $no_menu, $is_index, $onload, $js);
-		error_box();
-		if($script_only) {		
-			echo '<noscript>';
-			echo display_heading(_('This page is usable only with javascript enabled browsers.'));
-			echo '</noscript>';
-			div_start('_page_body', null, true);
-		} else {
-			div_start('_page_body'); // whole page content for ajax reloading
-		}
-    }
-
-    function end_page($no_menu=false, $is_index=false)
-    {
-    	global $path_to_root, $Ajax;
+   	page_header($title, $no_menu, $is_index, $onload, $js);
+	check_page_security($page_security);
+//	error_box();
+	if($script_only) {		
+		echo '<noscript>';
+		echo display_heading(_('This page is usable only with javascript enabled browsers.'));
+		echo '</noscript>';
+		div_start('_page_body', null, true);
+	} else {
+		div_start('_page_body'); // whole page content for ajax reloading
+	}
+}
 
+function end_page($no_menu=false, $is_index=false, $hide_back_link=false)
+{
+   	global $path_to_root, $Ajax;
     	$hide_menu = $no_menu;
-
 		div_end();	// _page_body section
-    	include($path_to_root . "/includes/page/footer.inc");
-
-    	page_footer($no_menu, $is_index);
-    }
+   	include($path_to_root . "/includes/page/footer.inc");
+    	page_footer($no_menu, $is_index, $hide_back_link);
+}
 
-    function flush_dir($path) {
+function flush_dir($path, $wipe = false) 
+{
 	$dir = opendir($path);
 	while(false !== ($fname = readdir($dir))) {
-		if($fname=='.' || $fname=='..' || $fname=='index.php') continue;
+		if($fname=='.' || $fname=='..' || $fname=='CVS' || (!$wipe && $fname=='index.php')) continue;
   		if(is_dir($path.'/'.$fname)) {
-		    flush_dir($path.'/'.$fname);
-		    @rmdir($path.'/'.$fname);
+		    flush_dir($path.'/'.$fname, $wipe);
+		    if ($wipe) @rmdir($path.'/'.$fname);
 		} else
 		    @unlink($path.'/'.$fname);
-  	}
-    }
+	}
+}
 
-    function cache_js_file($fpath, $text) 
-    {
+function cache_js_file($fpath, $text) 
+{
 	global $go_debug;
 
 	if(!$go_debug) $text = js_compress($text);
@@ -93,34 +80,34 @@
 	if (!fwrite($file, $text)) return false;
 	return fclose($file);
 
-    }
+}
 
-    function add_js_file($filename) 
-    {
+function add_js_file($filename) 
+{
 	  global $js_static;
 
 	  $search = array_search($filename, $js_static);
 	  if ($search === false || $search === null) // php>4.2.0 returns null
 		$js_static[] = $filename;	
-    }
+}
 
-    function add_js_ufile($filename) 
-    {
+function add_js_ufile($filename) 
+{
 	  global $js_userlib;
 
 	  $search = array_search($filename, $js_userlib);
 	  if ($search === false || $search === null) // php>4.2.0 returns null
 		$js_userlib[] = $filename;
-    }
+}
 
-    function add_js_source($text) 
-    {
+function add_js_source($text) 
+{
 	  global $js_lib;
 	  
 	  $search = array_search($text, $js_lib);
 	  if ($search === false || $search === null) // php>4.2.0 returns null
 		$js_lib[] = $text;
-    }
+}
 
 /**
  * Compresses the Javascript code for more efficient delivery.
@@ -153,10 +140,11 @@ function js_compress($sJS)
 		$inNormalComment = false;
 	
 		//loop through line's characters and take out any literal strings, replace them with ___i___ where i is the index of this string
-		for($j=0;$j<strlen($line);$j++)
+		$len = strlen($line);
+		for($j=0;$j<$len;$j++)
 		{
-			$c = substr($line,$j,1);
-			$d = substr($line,$j,2);
+			$c = $line[$j];		// this is _really_ faster than subst
+			$d = $c.$line[$j+1];
 	
 			//look for start of quote
 			if(!$inQuote && !$inComment)
@@ -270,37 +258,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