Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Made it possible to redirect to a specific page after login in

Browse source 
--HG--
branch : quitta-gsoc-2013
This commit is contained in:
Quitta 2013-09-20 05:33:39 +02:00
parent 7d3bd1a4ba
commit 78adc25c8d
5 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/client/src/client_cfg.cpp
View file

@ -325,7 +325,7 @@ CClientConfig::CClientConfig()
DisplayAccountButtons = true;
CreateAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=register";
ConditionsTermsURL = "https://secure.ryzom.com/signup/terms_of_use.php";
EditAccountURL = "https://secure.ryzom.com/payment_profile/index.php";
EditAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=settings";
BetaAccountURL = "http://www.ryzom.com/profile";
ForgetPwdURL = "https://secure.ryzom.com/payment_profile/lost_secure_password.php";
FreeTrialURL = "http://www.ryzom.com/join/?freetrial=1";

13
code/ryzom/tools/server/ryzom_ams/www/html/func/login.php
View file

@ -22,11 +22,20 @@ function login(){
$user = new WebUsers($_SESSION['id']);
$_SESSION['Language'] = $user->getLanguage();
$GETString = "";
foreach($_GET as $key => $value){
$GETString = $GETString . $key . '=' . $value . "&";
}
if($GETString != ""){
$GETString = '?'.$GETString;
}
//go back to the index page.
if (Helpers::check_if_game_client()) {
header( 'Location: '. $INGAME_WEBPATH );
header( 'Location: '. $INGAME_WEBPATH . $GETString);
}else{
header( 'Location: '. $WEBPATH );
header( 'Location: '. $WEBPATH . $GETString);
}
exit;
}else{

8
code/ryzom/tools/server/ryzom_ams/www/html/inc/login.php
View file

@ -26,6 +26,14 @@ function login(){
}
}
$pageElements['ingame_webpath'] = $INGAME_WEBPATH;
$GETString = "";
foreach($_GET as $key => $value){
$GETString = $GETString . $key . '=' . $value . "&";
}
if($GETString != ""){
$GETString = '?'.$GETString;
}
$pageElements['getstring'] = $GETString;
return $pageElements;
}

9
code/ryzom/tools/server/ryzom_ams/www/html/index.php
View file

@ -30,7 +30,16 @@ if ( ! isset( $_GET["page"]) ){
$page = 'login';
}
}else{
if(isset($_SESSION['user'])){
$page = $_GET["page"];
}else{
if($_GET["page"] == 'register'){
$page = 'register';
}else{
$page = 'login';
}
}
}
//check if ingame & page= register

2
code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl
View file

@ -12,7 +12,7 @@
<div class="alert alert-info">
{$login_info}
</div>
<form method="post" action="index.php" class="form-horizontal">
<form method="post" action="index.php{$getstring}" class="form-horizontal">
<fieldset>
<div data-rel="tooltip" class="input-prepend" data-original-title="Username">
<span class="add-on"><i class="icon-user"></i></span><input type="text" value="" id="Username" name="Username" class="input-large span10" placeholder="Username">