In-Portal

Index: branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r5615 -r5631 --- branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5615) +++ branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5631) @@ -370,7 +370,7 @@ else { // all done -> redirect $updater->clearData(); - $this->Application->StoreVar('PermCache_UpdateRequired', 0); + $this->Application->RemoveVar('PermCache_UpdateRequired'); $this->Application->Redirect($params['destination_template']); } Index: branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r5615 -r5631 --- branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5615) +++ branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5631) @@ -370,7 +370,7 @@ else { // all done -> redirect $updater->clearData(); - $this->Application->StoreVar('PermCache_UpdateRequired', 0); + $this->Application->RemoveVar('PermCache_UpdateRequired'); $this->Application->Redirect($params['destination_template']); } Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/popups/editor.tpl =================================================================== diff -u -N -r5365 -r5631 --- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/popups/editor.tpl (.../editor.tpl) (revision 5365) +++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/popups/editor.tpl (.../editor.tpl) (revision 5631) @@ -1,52 +1,9 @@ - - - -In-Portal + -"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Index: branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php =================================================================== diff -u -N -r5629 -r5631 --- branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php (.../application.php) (revision 5629) +++ branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php (.../application.php) (revision 5631) @@ -1388,6 +1388,9 @@ } } + $buffer_content = ob_get_clean(); + echo $this->UseOutputCompression() ? gzencode($buffer_content) : $buffer_content; + $session =& $this->recallObject('Session'); $session->SaveData(); $this->SaveBlocksCache(); Index: branches/unlabeled/unlabeled-1.6.2/core/units/categories/cache_updater.php =================================================================== diff -u -N -r5627 -r5631 --- branches/unlabeled/unlabeled-1.6.2/core/units/categories/cache_updater.php (.../cache_updater.php) (revision 5627) +++ branches/unlabeled/unlabeled-1.6.2/core/units/categories/cache_updater.php (.../cache_updater.php) (revision 5631) @@ -163,7 +163,7 @@ } } - function InitUpdater($continue) + function InitUpdater() { $this->Stack =& new clsRecursionStack(); $sql = 'DELETE FROM '.TABLE_PREFIX.'PermCache'; Index: branches/unlabeled/unlabeled-1.6.2/kernel/units/categories/cache_updater.php =================================================================== diff -u -N -r5627 -r5631 --- branches/unlabeled/unlabeled-1.6.2/kernel/units/categories/cache_updater.php (.../cache_updater.php) (revision 5627) +++ branches/unlabeled/unlabeled-1.6.2/kernel/units/categories/cache_updater.php (.../cache_updater.php) (revision 5631) @@ -163,7 +163,7 @@ } } - function InitUpdater($continue) + function InitUpdater() { $this->Stack =& new clsRecursionStack(); $sql = 'DELETE FROM '.TABLE_PREFIX.'PermCache'; Index: branches/unlabeled/unlabeled-1.15.2/kernel/admin_templates/incs/ajax.js =================================================================== diff -u -N -r5563 -r5631 --- branches/unlabeled/unlabeled-1.15.2/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 5563) +++ branches/unlabeled/unlabeled-1.15.2/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 5631) @@ -219,8 +219,9 @@ return false; } - $object.showProgress($responce); - $object.Query(); + if ($object.showProgress($responce)) { + $object.Query(); + } } AjaxProgressBar.prototype.errorCallback = function($request, $params, $object) { @@ -239,6 +240,12 @@ } AjaxProgressBar.prototype.showProgress = function ($percent) { + if ($percent.length == 0 && typeof($Debugger) != 'undefined') { + $Debugger.Clear(); + alert('Empty Responce! May Be Fatal Error Occured'); + return false; + } + this.ProgressPercent = $percent; var $now = this.GetMicroTime(); this.ProgressTime[this.ProgressTime.length] = $now - this.LastResponceTime; @@ -252,4 +259,5 @@ document.getElementById('progress_bar[done]').style.width = $display_progress + '%'; document.getElementById('progress_bar[left]').style.width = (100 - $display_progress) + '%'; + return true; } \ No newline at end of file Index: branches/unlabeled/unlabeled-1.8.2/core/kernel/utility/debugger/debugger.js =================================================================== diff -u -N -r5552 -r5631 --- branches/unlabeled/unlabeled-1.8.2/core/kernel/utility/debugger/debugger.js (.../debugger.js) (revision 5552) +++ branches/unlabeled/unlabeled-1.8.2/core/kernel/utility/debugger/debugger.js (.../debugger.js) (revision 5631) @@ -69,8 +69,17 @@ window.onscroll = function(ev) { window.$Debugger.Resize(ev); } window.onresize = function(ev) { window.$Debugger.Resize(ev); } document.onkeydown = function(ev) { window.$Debugger.KeyDown(ev); } + + var $body = document.getElementsByTagName('BODY')[0]; + $body.insertBefore(this.GetToolbar('$Debugger'), $body.firstChild); } +Debugger.prototype.GetToolbar = function($var_name) { + var $span = document.createElement('SPAN'); + $span.innerHTML = '
'; + return $span; +} + Debugger.prototype.AppendRow = function($html) { this.RowCount++; var $tr = document.createElement('TR'); Index: branches/unlabeled/unlabeled-1.18.2/kernel/admin_templates/incs/header.tpl =================================================================== diff -u -N -r5550 -r5631 --- branches/unlabeled/unlabeled-1.18.2/kernel/admin_templates/incs/header.tpl (.../header.tpl) (revision 5550) +++ branches/unlabeled/unlabeled-1.18.2/kernel/admin_templates/incs/header.tpl (.../header.tpl) (revision 5631) @@ -36,7 +36,6 @@ - @@ -45,10 +44,4 @@ - - - - - - \ No newline at end of file Index: branches/unlabeled/unlabeled-1.11.2/kernel/admin_templates/popups/translator.tpl =================================================================== diff -u -N -r5303 -r5631 --- branches/unlabeled/unlabeled-1.11.2/kernel/admin_templates/popups/translator.tpl (.../translator.tpl) (revision 5303) +++ branches/unlabeled/unlabeled-1.11.2/kernel/admin_templates/popups/translator.tpl (.../translator.tpl) (revision 5631) @@ -2,7 +2,7 @@ -In-Portal +In-Portal :: Administration Panel "> @@ -15,7 +15,7 @@ - + @@ -27,22 +27,19 @@ var t = ''; var popups = '1'; var multiple_windows = '1'; -var main_title = 'In-Portal'; +var main_title = ''; var tpl_changed = 0; var base_url = ''; +var $base_path = ''; +var img_path = '/img/'; -var img_path = "img/"; - - - - Index: branches/unlabeled/unlabeled-1.123.2/kernel/action.php =================================================================== diff -u -N -r5626 -r5631 --- branches/unlabeled/unlabeled-1.123.2/kernel/action.php (.../action.php) (revision 5626) +++ branches/unlabeled/unlabeled-1.123.2/kernel/action.php (.../action.php) (revision 5631) @@ -4,18 +4,10 @@ // ====== Debugger related: begin ====== $script = basename($_SERVER['PHP_SELF']); - $skipDebug = Array('index.php', 'tree.php', 'head.php', 'credits.php'); - if( admin_login() && !in_array($script, $skipDebug) ) - { - if( IsDebugMode() ) - { - if($Action) $debugger->setHTMLByIndex(1,'Kernel Action: '.$Action.'','append'); - if (!constOn('REDIRECT_REQUIRED')) { - echo ''; - if (!constOn('DBG_ZEND_PRESENT')) { - echo '
'; - } - } + $skipDebug = Array('index.php', 'credits.php'); + if (admin_login() && !in_array($script, $skipDebug)) { + if (IsDebugMode() && $Action) { + $debugger->setHTMLByIndex(1, 'Kernel Action: '.$Action.'', 'append'); } } unset($script, $skipDebug);