Index: trunk/core/kernel/application.php =================================================================== diff -u -N -r2351 -r2363 --- trunk/core/kernel/application.php (.../application.php) (revision 2351) +++ trunk/core/kernel/application.php (.../application.php) (revision 2363) @@ -300,11 +300,23 @@ $debugger->dumpVars($http_query->_Params); } + $this->ProcessSpecialURL(); $event_manager->ProcessRequest(); $this->RequestProcessed = true; } /** + * Raise specific events based on non-standard (no described in config files) + * params given in url if no other params are given + * @todo by now is called before $event_manager->ProcessRequrest() method anyway + * @author Alex + */ + function ProcessSpecialURL() + { + + } + + /** * Actually runs the parser against current template and stores parsing result * * This method gets t variable passed to the script, loads the template given in t variable and Index: trunk/kernel/units/users/users_event_handler.php =================================================================== diff -u -N -r2310 -r2363 --- trunk/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 2310) +++ trunk/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 2363) @@ -14,7 +14,7 @@ else { $t = $this->Application->GetVar('t'); - $this->Application->Redirect($t ? $t : 'index'); + $this->Application->Redirect($t ? $t : 'index', $_GET); } } @@ -51,10 +51,7 @@ $object->Load($user_id); if( $object->GetDBField('Status') == STATUS_ACTIVE ) { - $sql = 'SELECT GroupId FROM %s WHERE (PortalUserId = %s) AND ( (MembershipExpires IS NULL) OR ( MembershipExpires >= UNIX_TIMESTAMP() ) )'; - $sql = sprintf($sql, TABLE_PREFIX.'UserGroup', $user_id); - - $groups = $this->Conn->GetCol($sql); + $groups = $object->getMembershipGroups(true); if(!$groups) $groups = Array(); if (!defined('ADMIN')) array_push($groups, $this->Application->ConfigValue('User_LoggedInGroup') ); $this->Application->StoreVar( 'UserGroups', implode(',', $groups) ); Index: trunk/core/kernel/utility/debugger.php =================================================================== diff -u -N -r2347 -r2363 --- trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 2347) +++ trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 2363) @@ -33,6 +33,7 @@ 'DBG_HANDLE_ERRORS'=>DBG_ZEND_PRESENT?0:1, 'DBG_SHOW_MEMORY_USAGE'=>1, 'DBG_IGNORE_STRICT_ERRORS'=>1, + 'DBG_DOMVIEWER'=>'/temp/domviewer.html', 'DOC_ROOT'=> str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack 'DBG_LOCAL_BASE_PATH'=>'w:'); @@ -367,6 +368,9 @@ { $script = $_SERVER['SCRIPT_FILENAME']; $this->appendHTML('ScriptName: '.$this->getFileLink($script,1,basename($script)).' ('.dirname($script).')'); + + $this->appendHTML('DomViewer:  '); + ob_start(); ?> @@ -488,6 +492,7 @@ $this->profileFinish('script_runtime'); if( dbg_ConstOn('DBG_ZEND_PRESENT') ) return; + dbg_safeDefine('DBG_RAISE_ON_WARNINGS',0); dbg_safeDefine('DBG_WINDOW_WIDTH', 700); @@ -623,6 +628,15 @@