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

Settings page layout set!

Browse source
This commit is contained in:
Quitta 2013-07-01 18:28:37 +02:00
parent a95960841e
commit 10213a0530
9 changed files with 177 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php
View file

@ -9,10 +9,10 @@ class Users{
*/ */
public function check_Register($values){ public function check_Register($values){
// check values // check values
if ( isset( $values["Username"] ) and isset( $values["Password"] ) and isset( $values["Email"] ) ){ if ( isset( $values["Username"] ) and isset( $values["Password"] ) and isset( $values["ConfirmPass"] ) and isset( $values["Email"] ) ){
$user = Users::checkUser( $values["Username"] ); $user = Users::checkUser( $values["Username"] );
$pass = Users::checkPassword( $values["Password"] ); $pass = Users::checkPassword( $values["Password"] );
$cpass = Users::confirmPassword($pass); $cpass = Users::confirmPassword($pass,$values["Password"],$values["ConfirmPass"]);
$email = Users::checkEmail( $values["Email"] ); $email = Users::checkEmail( $values["Email"] );
}else{ }else{
$user = ""; $user = "";
@ -134,12 +134,13 @@ class Users{
* @takes $pass * @takes $pass
* @return string Info: Verify's $_POST["Password"] is the same as $_POST["ConfirmPass"] * @return string Info: Verify's $_POST["Password"] is the same as $_POST["ConfirmPass"]
*/ */
private function confirmPassword($pass_result) private function confirmPassword($pass_result,$pass,$confirmpass)
{ {
if ( ( $_POST["Password"] ) != ( $_POST["ConfirmPass"] ) ){ if ($confirmpass==""){
return "Passwords do not match.";
}else if ($_POST["ConfirmPass"]==""){
return "You have to fill in the confirmation password."; return "You have to fill in the confirmation password.";
}
else if ( ( $pass ) != ( $confirmpass ) ){
return "Passwords do not match.";
}else if($pass_result != "success"){ }else if($pass_result != "success"){
return; return;
}else{ }else{
@ -288,7 +289,7 @@ class Users{
//make connection with and put into shard db //make connection with and put into shard db
global $cfg; global $cfg;
$dbs = new DBLayer($cfg['db']['shard']); $dbs = new DBLayer($cfg['db']['shard']);
$dbs->execute("INSERT INTO user (Login, Password, Email) VALUES (:name, :pass, :mail)",$values["params"]); $dbs->execute("INSERT INTO user (Login, Password, Email) VALUES (:name, :pass, :mail)",$values);
return "ok"; return "ok";
} }
catch (PDOException $e) { catch (PDOException $e) {
@ -305,6 +306,48 @@ class Users{
} }
} }
protected function checkLoginMatch($user,$pass){
print('This is the base class!');
}
public function check_change_password($values){
if ( isset( $values["user"] ) and isset( $values["CurrentPass"] ) and isset( $values["ConfirmNewPass"] ) and isset( $values["NewPass"] ) ){
$match = $this->checkLoginMatch($values["user"],$values["CurrentPass"]);
$newpass = $this->checkPassword($values["NewPass"]);
$confpass = $this->confirmPassword($newpass,$values["NewPass"],$values["ConfirmNewPass"]);
}else{
$match = "";
$newpass = "";
$confpass = "";
}
if ( ( $match != "fail" ) and ( $newpass == "success" ) and ( $confpass == "success" ) ){
return "success";
}else{
$pageElements = array(
'match_error_message' => $match,
'newpass_error_message' => $newpass,
'confirmnewpass_error_message' => $confpass
);
if ( $match != "fail" ){
$pageElements['MATCH_ERROR'] = 'FALSE';
}else{
$pageElements['MATCH_ERROR'] = 'TRUE';
}
if ( $newpass != "success" ){
$pageElements['NEWPASSWORD_ERROR'] = 'TRUE';
}else{
$pageElements['NEWPASSWORD_ERROR'] = 'FALSE';
}
if ( $confpass != "success" ){
$pageElements['CNEWPASSWORD_ERROR'] = 'TRUE';
}else{
$pageElements['CNEWPASSWORD_ERROR'] = 'FALSE';
}
return $pageElements;
}
}
} }

27
code/ryzom/tools/server/ryzom_ams/www/html/autoload/webusers.php
View file

@ -26,4 +26,31 @@ class WebUsers extends Users{
$dbw = new DBLayer($cfg['db']['web']); $dbw = new DBLayer($cfg['db']['web']);
return $dbw->execute("SELECT * FROM ams_user WHERE Email = :email",array('email' => $email))->rowCount(); return $dbw->execute("SELECT * FROM ams_user WHERE Email = :email",array('email' => $email))->rowCount();
} }
/**
* Function checkUserPassMatch
*
* @takes $username,$password
* @return string Info: Returns true or false if a login match is found in the web db
*/
public function checkLoginMatch($username,$password){
global $cfg;
$dbw = new DBLayer($cfg['db']['web']);
$statement = $dbw->execute("SELECT * FROM ams_user WHERE Login=:user", array('user' => $username));
$row = $statement->fetch();
$salt = substr($row['Password'],0,2);
$hashed_input_pass = crypt($password, $salt);
if($hashed_input_pass == $row['Password']){
return $row;
}else{
return "fail";
}
}
} }

2
code/ryzom/tools/server/ryzom_ams/www/html/func/add_user.php
View file

@ -2,7 +2,7 @@
function add_user(){ function add_user(){
$params = Array('Username' => $_POST["Username"], 'Password' => $_POST["Password"], 'Email' => $_POST["Email"]); $params = Array('Username' => $_POST["Username"], 'Password' => $_POST["Password"], 'ConfirmPass' => $_POST["ConfirmPass"], 'Email' => $_POST["Email"]);
$webUser = new WebUsers; $webUser = new WebUsers;
$result = $webUser->check_Register($params); $result = $webUser->check_Register($params);

30
code/ryzom/tools/server/ryzom_ams/www/html/func/change_password.php Normal file
View file

@ -0,0 +1,30 @@
<?php
function change_password(){
try{
if(isset($_SESSION["user"])){
$webUser = new WebUsers();
$params = Array( 'user' => $_SESSION["user"], 'CurrentPass' => $_POST["CurrentPass"], 'NewPass' => $_POST["NewPass"], 'ConfirmNewPass' => $_POST["ConfirmNewPass"]);
$result = $webUser->check_change_password($params);
if ($result == "success"){
//edit stuff into db
}else{
$result['prevCurrentPass'] = $_POST["CurrentPass"];
$result['prevNewPass'] = $_POST["NewPass"];
$result['prevConfirmNewPass'] = $_POST["ConfirmNewPass"];
$result['permission'] = $_SESSION['permission'];
$result['no_visible_elements'] = 'FALSE';
helpers :: loadtemplate( 'settings', $result);
exit;
}
}
}catch (PDOException $e) {
//go to error page or something, because can't access website db
print_r($e);
exit;
}
}

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

@ -5,16 +5,11 @@ function login(){
global $cfg; global $cfg;
try{ try{
$dbw = new DBLayer($cfg['db']['web']); $result = WebUsers::checkLoginMatch($_POST["Username"],$_POST["Password"]);
$statement = $dbw->execute("SELECT * FROM ams_user WHERE Login=:user", array('user' => $_POST['Username'])); if( $result != "fail"){
$row = $statement->fetch();
$salt = substr($row['Password'],0,2);
$hashed_input_pass = crypt($_POST["Password"], $salt);
if($hashed_input_pass == $row['Password']){
//handle successful login //handle successful login
$_SESSION['user'] = $_POST["Username"]; $_SESSION['user'] = $_POST["Username"];
$_SESSION['permission'] = $row['Permission']; $_SESSION['permission'] = $result['Permission'];
//go back to the index page. //go back to the index page.
header( 'Location: index.php' ); header( 'Location: index.php' );
exit; exit;

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

@ -77,17 +77,17 @@
</div> </div>
<div class="box-content"> <div class="box-content">
<ul class="nav nav-tabs" id="myTab"> <ul class="nav nav-tabs" id="myTab">
<li class="active"><a href="#info">Info</a></li> <li><a href="#info">Info</a></li>
<li><a href="#custom">Custom</a></li> <li class="active"><a href="#custom">Custom</a></li>
<li><a href="#messages">Messages</a></li> <li><a href="#messages">Messages</a></li>
</ul> </ul>
<div id="myTabContent" class="tab-content"> <div id="myTabContent" class="tab-content">
<div class="tab-pane active" id="info"> <div class="tab-pane" id="info">
<h3>Charisma <small>a fully featued template</small></h3> <h3>Charisma <small>a fully featued template</small></h3>
<p>Its a fully featured, responsive template for your admin panel. Its optimized for tablet and mobile phones. Scan the QR code below to view it in your mobile device.</p> <img alt="QR Code" class="charisma_qr center" src="img/qrcode136.png" /> <p>Its a fully featured, responsive template for your admin panel. Its optimized for tablet and mobile phones. Scan the QR code below to view it in your mobile device.</p> <img alt="QR Code" class="charisma_qr center" src="img/qrcode136.png" />
</div> </div>
<div class="tab-pane" id="custom"> <div class="tab-pane active" id="custom">
<h3>Custom <small>small text</small></h3> <h3>Custom <small>small text</small></h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor.</p> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor.</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi.</p> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi.</p>

1
code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl
View file

@ -2,6 +2,7 @@
{block name=menu} {block name=menu}
<li class="nav-header hidden-tablet">Main</li> <li class="nav-header hidden-tablet">Main</li>
<li style="margin-left: -2px;"><a class="ajax-link" href="index.php"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li> <li style="margin-left: -2px;"><a class="ajax-link" href="index.php"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li>
<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=settings"><i class="icon-cog"></i><span class="hidden-tablet"> Settings</span></a></li>
<li class="nav-header hidden-tablet">Admin</li> <li class="nav-header hidden-tablet">Admin</li>
<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=libuserlist"><i class="icon-th-list"></i><span class="hidden-tablet"> Liblist</span></a></li> <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=libuserlist"><i class="icon-th-list"></i><span class="hidden-tablet"> Liblist</span></a></li>
<li class="nav-header hidden-tablet">Actions</li> <li class="nav-header hidden-tablet">Actions</li>

1
code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_user.tpl
View file

@ -2,6 +2,7 @@
{block name=menu} {block name=menu}
<li class="nav-header hidden-tablet">Main</li> <li class="nav-header hidden-tablet">Main</li>
<li style="margin-left: -2px;" class="active"><a class="ajax-link" href="index.php"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li> <li style="margin-left: -2px;" class="active"><a class="ajax-link" href="index.php"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li>
<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=settings"><i class="icon-cog"></i><span class="hidden-tablet"> Settings</span></a></li>
<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=userlist"><i class="icon-home"></i><span class="hidden-tablet"> Demo Userlist</span></a></li> <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=userlist"><i class="icon-home"></i><span class="hidden-tablet"> Demo Userlist</span></a></li>
<li class="nav-header hidden-tablet">Actions</li> <li class="nav-header hidden-tablet">Actions</li>
<li style="margin-left: -2px;"><a href="?page=logout"><i class="icon-off"></i><span class="hidden-tablet"> Logout </span></a></li> <li style="margin-left: -2px;"><a href="?page=logout"><i class="icon-off"></i><span class="hidden-tablet"> Logout </span></a></li>

90
code/ryzom/tools/server/ryzom_ams/www/html/templates/settings.tpl
View file

@ -1,52 +1,51 @@
{block name=content} {block name=content}
<div class="row-fluid"> <div class="row-fluid sortable ui-sortable">
<div class="box span12"> <div class="box span4">
<div class="box-header well"> <div class="box-header well" data-original-title="">
<h2><i class=" icon-user"></i> Settings</h2> <h2><i class="icon-th"></i> Change Password</h2>
<div class="box-icon"> <div class="box-icon">
<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a> <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a> <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
</div>
</div> </div>
</div> <div class="box-content">
<div class="box-content"> <div class="row-fluid">
<ul class="nav nav-tabs" id="myTab">
<li class="active"><a href="#info">Change Password</a></li>
<li><a href="#custom">Change Email</a></li>
<li><a href="#messages">Change Info</a></li>
</ul>
<div id="myTabContent" class="tab-content">
<div class="tab-pane active" id="info">
<form id="changePassword" class="form-vertical" method="post" action="index.php"> <form id="changePassword" class="form-vertical" method="post" action="index.php">
<legend>Change Password</legend> <legend>Change Password</legend>
<div class="control-group"> <div class="control-group {if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}error{else if
isset($match_error_message) and $match_error_message neq "fail"}success{else}{/if}">
<label class="control-label">Current Password</label> <label class="control-label">Current Password</label>
<div class="controls"> <div class="controls">
<div class="input-prepend"> <div class="input-prepend">
<span class="add-on" style="margin-left:5px;"><i class="icon-lock"></i></span> <span class="add-on" style="margin-left:5px;"><i class="icon-lock"></i></span>
<input type="password" class="input-xlarge" id="CurrentPass" name="CurrentPass" placeholder="Your current password"> <input type="password" class="input-xlarge" id="CurrentPass" name="CurrentPass" placeholder="Your current password" {if isset($prevCurrentPass)}value="{$prevCurrentPass}"{/if}>
</div> {if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}<span class="help-inline">The password is incorrect</span>{/if}
</div>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group {if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}error{else if
isset($newpass_error_message) and $newpass_error_message eq "success"}success{else}{/if}">
<label class="control-label">New Password</label> <label class="control-label">New Password</label>
<div class="controls"> <div class="controls">
<div class="input-prepend"> <div class="input-prepend">
<span class="add-on" style="margin-left:5px;"><i class="icon-tag"></i></span> <span class="add-on" style="margin-left:5px;"><i class="icon-tag"></i></span>
<input type="password" class="input-xlarge" id="NewPass" name="NewPass" placeholder="Your new password"> <input type="password" class="input-xlarge" id="NewPass" name="NewPass" placeholder="Your new password" {if isset($prevNewPass)}value="{$prevNewPass}"{/if}>
</div> {if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$newpass_error_message}</span>{/if}
</div>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}error{else if
isset($confirmnewpass_error_message) and $confirmnewpass_error_message eq "success"}success{else}{/if}">
<label class="control-label">Confirm New Password</label> <label class="control-label">Confirm New Password</label>
<div class="controls"> <div class="controls">
<div class="input-prepend"> <div class="input-prepend">
<span class="add-on" style="margin-left:5px;"><i class="icon-tags"></i></span> <span class="add-on" style="margin-left:5px;"><i class="icon-tags"></i></span>
<input type="password" class="input-xlarge" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password"> <input type="password" class="input-xlarge" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password" {if isset($prevConfirmNewPass)}value="{$prevConfirmNewPass}"{/if}>
</div> {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$confirmnewpass_error_message}</span>{/if}
</div>
</div> </div>
</div> </div>
@ -60,7 +59,19 @@
</div> </div>
</form> </form>
</div> </div>
<div class="tab-pane" id="custom"> </div>
</div><!--/span-->
<div class="box span4">
<div class="box-header well" data-original-title="">
<h2><i class="icon-th"></i> Change Email</h2>
<div class="box-icon">
<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
</div>
</div>
<div class="box-content">
<div class="row-fluid">
<form id="changeEmail" class="form-vertical" method="post" action="index.php"> <form id="changeEmail" class="form-vertical" method="post" action="index.php">
<legend>Change Email</legend> <legend>Change Email</legend>
<div class="control-group"> <div class="control-group">
@ -81,7 +92,19 @@
</div> </div>
</form> </form>
</div> </div>
<div class="tab-pane" id="messages"> </div>
</div><!--/span-->
<div class="box span4">
<div class="box-header well" data-original-title="">
<h2><i class="icon-th"></i> Change Info</h2>
<div class="box-icon">
<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
</div>
</div>
<div class="box-content">
<div class="row-fluid">
<form id="changeEmail" class="form-vertical" method="post" action="index.php"> <form id="changeEmail" class="form-vertical" method="post" action="index.php">
<legend>Change Info</legend> <legend>Change Info</legend>
@ -105,10 +128,11 @@
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label">Country</label> <label class="control-label">Country</label>
<div class="controls"> <div class="controls">
<select> <select>
<option value="AA" selected="selected">Select one</option>
<option value="AF">Afghanistan</option> <option value="AF">Afghanistan</option>
<option value="AX">Åland Islands</option> <option value="AX">Åland Islands</option>
<option value="AL">Albania</option> <option value="AL">Albania</option>
@ -393,8 +417,10 @@
</form> </form>
</div> </div>
</div> </div>
</div> </div><!--/span-->
</div><!--/span--> </div><!--/row-->
</div>
{/block} {/block}