projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed GET continuation after timeot and logout page access without authorization.
[fa-stable.git]
/
includes
/
main.inc
diff --git
a/includes/main.inc
b/includes/main.inc
index e45f5973856f65c3dd4b55ca3036bac4963f4fd8..1a2478e9f6a9580c54aa0d50d354f05be1d3981f 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/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/errors.inc");
include_once($path_to_root . "/includes/types.inc");
include_once($path_to_root . "/includes/systypes.inc");
@@
-20,7
+19,7
@@
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/db/audit_trail_db.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 . "/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 . "/admin/db/users_db.inc");
include_once($path_to_root . "/includes/ui/ui_view.inc");
@@
-57,17
+56,17
@@
function end_page($no_menu=false, $is_index=false)
page_footer($no_menu, $is_index);
}
page_footer($no_menu, $is_index);
}
-function flush_dir($path)
+function flush_dir($path
, $wipe = false
)
{
$dir = opendir($path);
while(false !== ($fname = readdir($dir))) {
{
$dir = opendir($path);
while(false !== ($fname = readdir($dir))) {
- if($fname=='.' || $fname=='..' ||
$fname=='index.php'
) continue;
+ if($fname=='.' || $fname=='..' ||
(!$wipe && $fname=='index.php')
) continue;
if(is_dir($path.'/'.$fname)) {
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);
} else
@unlink($path.'/'.$fname);
- }
+ }
}
function cache_js_file($fpath, $text)
}
function cache_js_file($fpath, $text)
@@
-141,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
$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)
//look for start of quote
if(!$inQuote && !$inComment)