From 102ada96dfce61472e9ecb5edcf899938707b963 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 21 Feb 2012 14:36:10 +0100 Subject: [PATCH 1/2] Fixing error due a wrong merge see #4402 --- main/inc/local.inc.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php index 891cef0b8c..a5e4d3d884 100644 --- a/main/inc/local.inc.php +++ b/main/inc/local.inc.php @@ -619,7 +619,7 @@ if ($gidReq && $gidReq != $gid) { $is_platformAdmin = false; $is_allowedCreateCourse = false; - if (isset($_user['user_id']) && $_user['user_id'] && ! api_is_anonymous()) // a uid is given (log in succeeded) + if (isset($_user['user_id']) && $_user['user_id'] && ! api_is_anonymous()) { // a uid is given (log in succeeded) $user_table = Database::get_main_table(TABLE_MAIN_USER); $admin_table = Database::get_main_table(TABLE_MAIN_ADMIN); @@ -661,16 +661,17 @@ if ($gidReq && $gidReq != $gid) { UserManager::update_extra_field_value($_user['user_id'], 'already_logged_in', 'true'); api_session_register('is_platformAdmin'); api_session_register('is_allowedCreateCourse'); - - // If request_uri is setted we have to go further to have course permissions - if (empty($_SESSION['request_uri']) || !isset($_SESSION['request_uri'])) { - if( $_SESSION['noredirection'] ) {//If we just want to reser info without redirecting user - unset($_SESSION['noredirection']); - } else { - require_once api_get_path(LIBRARY_PATH).'loginredirection.lib.php'; - LoginRedirection::redirect(); - } - + + // If request_uri is setted we have to go further to have course permissions + if (empty($_SESSION['request_uri']) || !isset($_SESSION['request_uri'])) { + if ($_SESSION['noredirection']) { + //If we just want to reser info without redirecting user + unset($_SESSION['noredirection']); + } else { + require_once api_get_path(LIBRARY_PATH).'loginredirection.lib.php'; + LoginRedirection::redirect(); + } + } } else { header('location:'.api_get_path(WEB_PATH)); //exit("WARNING UNDEFINED UID !! "); From 9bacebe56053037a1205f296e261acd5ef62b765 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 21 Feb 2012 14:36:51 +0100 Subject: [PATCH 2/2] More CSS changes due #4400 --- main/css/academica/default.css | 3 +-- main/css/baby_orange/default.css | 3 +-- main/css/blue_lagoon/default.css | 6 ++---- main/css/chamilo_electric_blue/default.css | 2 +- main/css/chamilo_orange/default.css | 4 +--- main/css/chamilo_red/default.css | 2 +- main/css/chamilo_sport_red/default.css | 6 +++--- main/css/cool_blue/default.css | 4 +--- main/template/default/layout/main_header.tpl | 2 +- 9 files changed, 12 insertions(+), 20 deletions(-) diff --git a/main/css/academica/default.css b/main/css/academica/default.css index 5f1ece10d6..863ea34859 100644 --- a/main/css/academica/default.css +++ b/main/css/academica/default.css @@ -112,8 +112,7 @@ input[type=button], input[type=submit] { } /* header 3 styles */ #header3 { - border-bottom: 1px solid #aeaeae; - height:50px; + border-bottom: 1px solid #aeaeae; font-weight: bold; margin: 0; padding: 0; diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css index 24224f50ea..08b6b526b0 100644 --- a/main/css/baby_orange/default.css +++ b/main/css/baby_orange/default.css @@ -111,8 +111,7 @@ input[type=button], input[type=submit] { } /* header 3 styles */ #header3 { - border-bottom: 1px solid #aeaeae; - height:50px; + border-bottom: 1px solid #aeaeae; font-weight: bold; margin: 0; padding: 0; diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index 802d63535e..bd1cbbcfcd 100644 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -407,7 +407,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus { background-image: url(images/tab-repeat.png); background-position: 0px 0px; background-repeat: repeat-x;/*border: 1px solid green;*/ - height:41px; + padding-left:0px; padding-right:0px; width: 100%; @@ -424,9 +424,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus { color: #a8a7a7; background: none; } -#header3 ul { - PADDING-RIGHT: 10px; - PADDING-LEFT: 10px; +#header3 ul { PADDING-BOTTOM: 0px; MARGIN: 0px; LIST-STYLE-TYPE: none; diff --git a/main/css/chamilo_electric_blue/default.css b/main/css/chamilo_electric_blue/default.css index 3b2bcae449..5470777a9d 100644 --- a/main/css/chamilo_electric_blue/default.css +++ b/main/css/chamilo_electric_blue/default.css @@ -24,7 +24,7 @@ a:active { } #header1 { - background-image:url(images/bg-header1.gif); + /* background-image:url(images/bg-header1.gif); */ } diff --git a/main/css/chamilo_orange/default.css b/main/css/chamilo_orange/default.css index 5f558f7abf..8ea3bf1c94 100644 --- a/main/css/chamilo_orange/default.css +++ b/main/css/chamilo_orange/default.css @@ -24,11 +24,9 @@ a:active { } #header1 { - background-image:url(images/bg-header1.gif); + /* background-image:url(images/bg-header1.gif); */ } - - .subnav-fixed { position: fixed; top: 38px; diff --git a/main/css/chamilo_red/default.css b/main/css/chamilo_red/default.css index bdad7ef6ce..5052520992 100644 --- a/main/css/chamilo_red/default.css +++ b/main/css/chamilo_red/default.css @@ -24,7 +24,7 @@ a:active { } #header1 { - background-image:url(images/bg-header1.gif); + /* background-image:url(images/bg-header1.gif); */ } diff --git a/main/css/chamilo_sport_red/default.css b/main/css/chamilo_sport_red/default.css index eaf9184141..6b526546ba 100755 --- a/main/css/chamilo_sport_red/default.css +++ b/main/css/chamilo_sport_red/default.css @@ -104,9 +104,9 @@ a:active { } #header1 { - background-image: url("images/bg-header1.gif"); - border-top: 5px solid #900217; - height: 47px; + /* background-image: url("images/bg-header1.gif"); + border-top: 5px solid #900217; */ + /* height: 47px; */ margin-bottom: 43px; } #header3 { diff --git a/main/css/cool_blue/default.css b/main/css/cool_blue/default.css index b95d9b0dcf..e377b492de 100644 --- a/main/css/cool_blue/default.css +++ b/main/css/cool_blue/default.css @@ -442,9 +442,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus { #header3 a:hover { color: #a8a7a7; } -#header3 ul { - PADDING-RIGHT: 10px; - PADDING-LEFT: 10px; +#header3 ul { PADDING-BOTTOM: 0px; MARGIN: 0px; LIST-STYLE-TYPE: none; diff --git a/main/template/default/layout/main_header.tpl b/main/template/default/layout/main_header.tpl index 2cba3d1c50..d7d1bdd496 100644 --- a/main/template/default/layout/main_header.tpl +++ b/main/template/default/layout/main_header.tpl @@ -52,5 +52,5 @@ {* breadcrumb *} {$breadcrumb} -
+
{/if} \ No newline at end of file