Changeset 635
- Timestamp:
- 04/13/08 13:08:54 (9 months ago)
- Files:
-
- trunk/A2BCustomer_UI/forgotpassword.php (modified) (1 diff)
- trunk/A2BCustomer_UI/templates_c (modified) (1 prop)
- trunk/A2BCustomer_UI/templates/default/index.tpl (modified) (2 diffs)
- trunk/A2Billing_UI/templates_c (modified) (1 prop)
- trunk/addons/Doc/login-forgetpassword-page.info (added)
- trunk/common/lib/customer.defines.php (modified) (1 diff)
- trunk/common/lib/customer.module.access.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/A2BCustomer_UI/forgotpassword.php
r566 r635 78 78 $error = 3; 79 79 } 80 81 if(strlen(RETURN_URL_DISTANT_FORGETPASSWORD)>1 && $show_message){ 82 Header ("Location: $URL_CALLBACK_FORGETPASSWORD?error=$error"); 83 die(); 84 } 85 80 86 81 87 switch($error) trunk/A2BCustomer_UI/templates_c
- Property svn:ignore set to
%%0E^0E4^0E407559%%footer.tpl.php
%%45^45E^45E480CD%%index.tpl.php
%%72^72D^72DAF6E8%%main.tpl.php
- Property svn:ignore set to
trunk/A2BCustomer_UI/templates/default/index.tpl
r215 r635 1 1 <HTML> 2 2 <HEAD> 3 <link rel="shortcut icon" href="templates/{$SKIN_NAME}/images/favicon.ico"> 4 <link rel="icon" href="templates/{$SKIN_NAME}/images/animated_favicon1.gif" type="image/gif"> 5 6 <title>..:: {$CCMAINTITLE} ::..</title> 7 8 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 9 {if ($CSS_NAME!="" && $CSS_NAME!="default")} 10 <link href="templates/default/css/{$CSS_NAME}.css" rel="stylesheet" type="text/css"> 11 {else} 12 <link href="templates/default/css/main.css" rel="stylesheet" type="text/css"> 13 <link href="templates/default/css/menu.css" rel="stylesheet" type="text/css"> 14 <link href="templates/default/css/style-def.css" rel="stylesheet" type="text/css"> 15 {/if} 16 17 3 <link rel="shortcut icon" href="templates/{$SKIN_NAME}/images/favicon.ico"> 4 <link rel="icon" href="templates/{$SKIN_NAME}/images/animated_favicon1.gif" type="image/gif"> 5 6 <title>..:: {$CCMAINTITLE} ::..</title> 7 8 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 9 {if ($CSS_NAME!="" && $CSS_NAME!="default")} 10 <link href="templates/default/css/{$CSS_NAME}.css" rel="stylesheet" type="text/css"> 11 {else} 12 <link href="templates/default/css/main.css" rel="stylesheet" type="text/css"> 13 <link href="templates/default/css/menu.css" rel="stylesheet" type="text/css"> 14 <link href="templates/default/css/style-def.css" rel="stylesheet" type="text/css"> 15 {/if} 18 16 </HEAD> 19 17 … … 57 55 <input type="hidden" name="done" value="submit_log"> 58 56 59 {if ($error == 1)} 60 57 {if ($error == 1)} 58 <font face="Arial, Helvetica, Sans-serif" size="2" color="red"> 59 <b>AUTHENTICATION REFUSED, please check your user/password!</b> 60 </font> 61 {elseif ($error==2)} 62 e="Arial, Helvetica, Sans-serif" size="2" color="red"> 63 <b>INACTIVE ACCOUNT, Please activate your account!</b> 64 </font> 65 {elseif ($error==3)} 66 <font face="Arial, Helvetica, Sans-serif" size="2" color="red"> 67 <b>BLOCKED ACCOUNT, Please contact your administrator!</b> 68 </font> 69 {/if} 61 70 62 <font face="Arial, Helvetica, Sans-serif" size="2" color="red"> 63 <b>AUTHENTICATION REFUSED, please check your user/password!</b> 64 </font> 65 {elseif ($error==2)} 66 <font face="Arial, Helvetica, Sans-serif" size="2" color="red"> 67 <b>INACTIVE ACCOUNT, Please activate your account!</b> 68 </font> 69 {elseif ($error==3)} 70 <font face="Arial, Helvetica, Sans-serif" size="2" color="red"> 71 <b>BLOCKED ACCOUNT, Please contact your administrator!</b> 72 </font> 73 {/if} 74 <br><br> 71 <br><br> 75 72 76 73 <table style="border: 1px solid #C1C1C1"> trunk/A2Billing_UI/templates_c
- Property svn:ignore set to
%%01^019^019F0DED%%signup_footer.tpl.php
%%0E^0E4^0E407559%%footer.tpl.php
%%45^45E^45E480CD%%index.tpl.php
%%72^72D^72DAF6E8%%main.tpl.php
%%F8^F82^F82C393C%%signup_header.tpl.php
- Property svn:ignore set to
trunk/common/lib/customer.defines.php
r570 r635 108 108 define ("SIGNUP_LINK", isset($A2B->config["webcustomerui"]['signup_page_url'])?$A2B->config["webcustomerui"]['signup_page_url']:null); 109 109 define ("ACTIVATEDBYUSER", isset($A2B->config["signup"]['activatedbyuser'])?$A2B->config["signup"]['activatedbyuser']:null); 110 110 define ("RETURN_URL_DISTANT_LOGIN", isset($A2B->config["webcustomerui"]['return_url_distant_login'])?$A2B->config["webcustomerui"]['return_url_distant_login']:null); 111 define ("RETURN_URL_DISTANT_FORGETPASSWORD", isset($A2B->config["webcustomerui"]['return_url_distant_forgetpassword'])?$A2B->config["webcustomerui"]['return_url_distant_forgetpassword']:null); 111 112 112 113 // INCLUDE FILES trunk/common/lib/customer.module.access.php
r561 r635 45 45 } 46 46 47 if(strlen(RETURN_URL_DISTANT_LOGIN)>1) 48 $C_RETURN_URL_DISTANT_LOGIN = RETURN_URL_DISTANT_LOGIN; 49 else 50 $C_RETURN_URL_DISTANT_LOGIN = 'index.php'; 51 52 47 53 if ((!session_is_registered('pr_login') || !session_is_registered('pr_password') || !session_is_registered('cus_rights') || (isset($_POST["done"]) && $_POST["done"]=="submit_log") )){ 48 54 … … 66 72 { 67 73 if($return == -1) { 68 Header ("Location: index.php?error=3");74 Header ("Location: $C_RETURN_URL_DISTANT_LOGIN?error=3"); 69 75 } else { 70 Header ("Location: index.php?error=2");76 Header ("Location: $C_RETURN_URL_DISTANT_LOGIN?error=2"); 71 77 } 72 78 } else { 73 Header ("Location: index.php?error=1");79 Header ("Location: $C_RETURN_URL_DISTANT_LOGIN?error=1"); 74 80 } 75 81 die();
