Index: core/admin_templates/designs/without_login_design.tpl =================================================================== --- /dev/null +++ core/admin_templates/designs/without_login_design.tpl @@ -0,0 +1,143 @@ + + + + + + + +
+ +
+ +
+ +
+ + + +
+ + + +

401 Authentication Required

+ +
+ +
+ +
+ +
+ + + + Index: core/admin_templates/incs/style_template.css =================================================================== --- core/admin_templates/incs/style_template.css +++ core/admin_templates/incs/style_template.css @@ -74,6 +74,11 @@ padding: 1px; } +.login-message { + max-width: 400px; + margin-bottom: 10px; +} + .disabled { background-color: #ebebeb; } Index: core/admin_templates/login.tpl =================================================================== --- core/admin_templates/login.tpl +++ core/admin_templates/login.tpl @@ -1,265 +1,127 @@ - - - - - - - -
- -
- -
- -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -

401 Authentication Required

- -
- -
- -
- -
- - - - - index"/> - - - - + + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + index"/> + + + + + + Index: core/admin_templates/login/forgot_password.tpl =================================================================== --- /dev/null +++ core/admin_templates/login/forgot_password.tpl @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + Index: core/admin_templates/login/forgot_password_reset.tpl =================================================================== --- /dev/null +++ core/admin_templates/login/forgot_password_reset.tpl @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: core/admin_templates/login/forgot_password_reset_confirm.tpl =================================================================== --- /dev/null +++ core/admin_templates/login/forgot_password_reset_confirm.tpl @@ -0,0 +1,15 @@ + + + + + + + Index: core/admin_templates/login/forgot_password_reset_notice.tpl =================================================================== --- /dev/null +++ core/admin_templates/login/forgot_password_reset_notice.tpl @@ -0,0 +1,8 @@ + + + + + Index: core/install/english.lang =================================================================== --- core/install/english.lang +++ core/install/english.lang @@ -51,16 +51,19 @@ UmVzZXQ= UmVzZXQgJmFtcDsgVmFsaWRhdGUgQ29uZmlnIEZpbGVz UmVzZXQgInJvb3QiIHBhc3N3b3Jk + UmV0dXJuIHRvIEhvbWU= U2F2ZQ== U2F2ZSBDaGFuZ2Vz U2VjdGlvbiBQcm9wZXJ0aWVz U2VjdGlvbiBUZW1wbGF0ZQ== U2VsZWN0IEFsbA== + U2VuZCBQYXNzd29yZA== U2V0IFZhbHVl U2hvdyBTdHJ1Y3R1cmU= U3luY2hyb25pemU= VW5zZWxlY3Q= VXA= + VXBkYXRl VXNl Ynk= Q2FuY2Vs @@ -1369,7 +1372,11 @@ UGxlYXNlIG1ha2Ugc3VyZSB0byBCQUNLVVAgeW91ciBkYXRhYmFzZShzKSBiZWZvcmUgcnVubmluZyB0aGlzIHV0aWxpdHkh RWRpdA== RW1haWw= + RW50ZXIgeW91ciBVc2VybmFtZSBvciBFbWFpbCBBZGRyZXNzIGJlbG93IHRvIGhhdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9uIHNlbnQgdG8gdGhlIGVtYWlsIGFkZHJlc3Mgb2YgeW91ciBhY2NvdW50Lg== Rm9sbG93aW5nIGxpbmVzIHdlcmUgTk9UIGltcG9ydGVk + WW91ciBwYXNzd29yZCBoYXMgYmVlbiByZXNldC4gVGhlIG5ldyBwYXNzd29yZCBoYXMgYmVlbiBzZW50IHRvIHlvdXIgZS1tYWlsIGFkZHJlc3MuIFlvdSBtYXkgbm93IGxvZ2luIHdpdGggdGhlIG5ldyBwYXNzd29yZC4= + QW4gYXV0b21hdGljIGVtYWlsIGhhcyBiZWVuIHNlbnQgdG8geW91ciBlbWFpbCBhZGRyZXNzIG9uIGZpbGUuIFBsZWFzZSBmb2xsb3cgdGhlIGxpbmsgaW4gdGhlIGVtYWlsIGluIG9yZGVyIHRvIHJlY2VpdmUgYSBuZXcgcGFzc3dvcmQuIA== + Rm9yZ290IHBhc3N3b3JkPw== RnJvbnQtRW5kIE9ubHk= R2VuZXJhbA== SG90 @@ -1387,6 +1394,7 @@ Tm9uZQ== Tm8gUGVybWlzc2lvbg== b3I= + UGxlYXNlIGNvbmZpcm0gdGhhdCB5b3Ugd2FudCB0byByZXNldCB5b3VyIHBhc3N3b3JkLiA= UGhvbmU= UG9wdWxhcg== UG9wdWxhcml0eQ== Index: core/install/upgrades.css =================================================================== --- core/install/upgrades.css +++ core/install/upgrades.css @@ -681,7 +681,7 @@ +++ style_template.css (working copy) @@ -60,7 +60,7 @@ } - + .bordered, table.bordered, .bordered-no-bottom { - border: 1px solid #000000; + border: 1px solid #000000 !important; @@ -690,7 +690,7 @@ } @@ -269,7 +269,7 @@ } - + /* Main row definition */ -.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2 { +.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2, .grid-edit-table .edit-form-odd > td, .grid-edit-table .edit-form-even > td { @@ -709,7 +709,7 @@ @@ -346,6 +346,29 @@ background-color: #FFFF00; } - + +div.filter, div.filter-active { + background-color: white; + border: 1px solid #AAAAAA; @@ -748,7 +748,7 @@ @@ -493,11 +516,18 @@ border-top-width: 0px; } - + +.form-notice, .form-warning { + font-size: 11px; +} @@ -757,7 +757,7 @@ color: red; - font-size: 11px; } - + +.form-notice { + color: green; +} @@ -766,7 +766,7 @@ color: red; padding-left: 1px; @@ -751,4 +781,17 @@ - + .summary-box li { padding-bottom: 4px; +} @@ -791,7 +791,7 @@ --- style_template.css (revision 15359) +++ style_template.css (working copy) @@ -424,7 +424,7 @@ - + .grid-status-bar td { background-color: @@TitleBarBgColor@@; - color: @@TitleBarColor@@; @@ -802,7 +802,7 @@ @@ -610,11 +610,13 @@ text-decoration: none; } - + -/* Left side of bluebar */ -.header_left_bg { +/* Page header (bluebar) */ @@ -815,7 +815,7 @@ + font-weight: normal; + padding: 2px 8px 2px 8px; } - + /* Right side of bluebar */ # ===== v 5.2.2-B1 ===== @@ -826,7 +826,7 @@ @@ -549,6 +549,10 @@ border-collapse: separate } - + +label.checkbox { + white-space: nowrap; +} @@ -840,10 +840,22 @@ =================================================================== --- style_template.css (revision 16502) +++ style_template.css (working copy) +@@ -74,6 +74,11 @@ + padding: 1px; + } + ++.login-message { + + max-width: 400px; + + margin-bottom: 10px; + +} ++ +.disabled { + background-color: #ebebeb; +} @@ -487,6 +487,14 @@ vertical-align: middle; } - + +.CodeMirror { + font-size: 13px; + border: 1px solid black; @@ -858,7 +870,7 @@ @@ -498,6 +506,18 @@ background: #fff none; } - + +.highlight-area, .code-highlight-area { + border: 1px solid black; + padding: 8px; Index: core/units/users/users_event_handler.php =================================================================== --- core/units/users/users_event_handler.php +++ core/units/users/users_event_handler.php @@ -856,12 +856,17 @@ $found = $allow_reset = false; $email_or_username = $object->GetDBField('ForgotLogin'); $is_email = strpos($email_or_username, '@') !== false; + $key_field = ($is_email ? 'Email' : 'Username'); + $where_clause = array( + $object->TableName . '.' . $key_field . ' = ' . $this->Conn->qstr($email_or_username), + $object->TableName . '.UserType = ' . ($this->Application->isAdmin ? UserType::ADMIN : UserType::USER), + ); + $sql = $user->GetSelectSQL() . ' + WHERE (' . implode(') AND (', $where_clause) . ')'; + $user_data = $this->Conn->GetRow($sql); - if ( strlen($email_or_username) ) { - $user->Load($email_or_username, $is_email ? 'Email' : 'Username'); - } - - if ( $user->isLoaded() ) { + if ( $user_data ) { + $user->LoadFromHash($user_data); $min_pwd_reset_delay = $this->Application->ConfigValue('Users_AllowReset'); $found = ($user->GetDBField('Status') == STATUS_ACTIVE) && strlen($user->GetDBField('Password')); @@ -1936,6 +1941,8 @@ $user_helper->loginUserById( $user->GetID() ); } } + + $this->setNextTemplate($event); } /**