Index: trunk/themes/default/incs/inportal_main.css =================================================================== diff -u -r13 -r232 --- trunk/themes/default/incs/inportal_main.css (.../inportal_main.css) (revision 13) +++ trunk/themes/default/incs/inportal_main.css (.../inportal_main.css) (revision 232) @@ -773,4 +773,16 @@ .relevance-bar { border-color: red; border-width: 1px; - } \ No newline at end of file + } + +/* debug output styles */ + +.debug_table { + border: 1px solid green; + border-width: 0 0 1 1; +} + +.debug_table TD { + border: 1px solid green; + border-width: 1 1 0 0; +} \ No newline at end of file Index: trunk/kernel/include/usersession.php =================================================================== diff -u -r228 -r232 --- trunk/kernel/include/usersession.php (.../usersession.php) (revision 228) +++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 232) @@ -363,9 +363,10 @@ function Login($userLogin, $userPassword) { global $expired, $objConfig; - - if($userLogin=="root") + + if($userLogin == "root") { + // logging in "root" (admin only) $rootpass = $objConfig->Get("RootPass"); if($rootpass!=$userPassword) { @@ -382,6 +383,7 @@ } else { + // logging in any user (admin & front) $pre = GetTablePrefix(); $sql = "SELECT *,MD5(".$pre."PortalUser.Password) as md5pw FROM ".$pre."PortalUser LEFT JOIN ".$pre."UserGroup USING (PortalUserId) " ."LEFT JOIN ".$pre."PortalGroup ON (".$pre."UserGroup.GroupId=".$pre."PortalGroup.GroupId) @@ -451,6 +453,16 @@ $this->ResetSysPermCache(); $this->PermCache = array(); $this->Update(); + + if($userLogin != 'root') + { + if( ! $this->HasSystemPermission('LOGIN') ) + { + $this->Logout(); + return false; + } + } + return true; } Index: trunk/admin/include/style.css =================================================================== diff -u -r203 -r232 --- trunk/admin/include/style.css (.../style.css) (revision 203) +++ trunk/admin/include/style.css (.../style.css) (revision 232) @@ -437,7 +437,6 @@ /* debug output styles */ - .debug_table { border: 1px solid green; border-width: 0 0 1 1; Index: trunk/kernel/frontaction.php =================================================================== diff -u -r91 -r232 --- trunk/kernel/frontaction.php (.../frontaction.php) (revision 91) +++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 232) @@ -1,4 +1,31 @@ $Action]
\n"; +} + +if( defined('DEBUG_ACTIONS') && (DEBUG_ACTIONS & FRONT_SHOW_REQUEST) == FRONT_SHOW_REQUEST ) +{ + // don't show debug output in tree & header of admin & while logging in + $script = basename($_SERVER['PHP_SELF']); + + echo '
'; + echo "ScriptName: $script (".dirname($_SERVER['PHP_SELF']).")

"; + echo ''; + echo ''; + + foreach($_REQUEST as $key => $value) + { + if( trim($value) == '' ) $value = ' '; + $src = isset($_GET[$key]) ? 'GE' : (isset($_POST[$key]) ? 'PO' : (isset($_COOKIE[$key]) ? 'CO' : '?') ); + echo ''; + } + echo '
SrcNameValue
'.$src.''.$key.''.print_r($value, true).'
'; + echo '
'; + unset($script); +} + switch($Action) { case "m_login":