Merge with quitta-gsoc-2013

--HG--
branch : rc-botanic-webdev
hg/feature/sse2
Botanic 12 years ago
commit 0984bc4c25

@ -44,9 +44,9 @@ class Helpers{
foreach ( $variables[$template] as $key => $value ){ foreach ( $variables[$template] as $key => $value ){
$smarty -> assign( $key, $value ); $smarty -> assign( $key, $value );
} }
if( $vars['permission'] == 2 ){ if( isset($vars['permission']) && $vars['permission'] == 2 ){
$inherited = "extends:layout_admin.tpl|"; $inherited = "extends:layout_admin.tpl|";
}else if($vars['permission'] == 1){ }else if( isset($vars['permission']) && $vars['permission'] == 1){
$inherited = "extends:layout_user.tpl|"; $inherited = "extends:layout_user.tpl|";
}else{ }else{
$inherited =""; $inherited ="";
@ -60,7 +60,7 @@ class Helpers{
global $SITEBASE; global $SITEBASE;
$arr = array( $AMS_LIB . '/ingame_templates/', $arr = array( $AMS_LIB . '/ingame_templates/',
$AMS_LIB . '/configs', $AMS_LIB . '/configs',
$AMS_LIB . '/cache', //$AMS_LIB . '/cache',
$SITEBASE . '/cache/', $SITEBASE . '/cache/',
$SITEBASE . '/templates/', $SITEBASE . '/templates/',
$SITEBASE . '/templates_c/', $SITEBASE . '/templates_c/',
@ -68,7 +68,8 @@ class Helpers{
); );
foreach ( $arr as & $value ){ foreach ( $arr as & $value ){
if ( !file_exists( $value ) ){ if ( !file_exists( $value ) ){
mkdir( $value ); echo $value;
mkdir( $value);
} }
} }

@ -235,5 +235,122 @@ class Users{
// done! // done!
return $salt; return $salt;
} }
function create_Server_User($params)
{
try {
$hostname = 'localhost';
$port = '3306';
$dbname = 'nel';
$username = 'shard';
$password = '';
$dbh = new PDO("mysql:host=$hostname;port=$port;dbname=$dbname", $username, $password);
$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$statement = $dbh->prepare("INSERT INTO user (Login, Password, Email) VALUES (?, ?, ?)");
$statement->execute($params);
return "success";
}
catch (PDOException $e) {
return "fail";
}
// createPermissions(array($login));
}
function createUser($values){
$login = $values["name"];
$pass = $values["pass"];
$email = $values["mail"];
$webhost = $values["webhost"];
$webport = $values["webport"];
$webdbname = $values["webdbname"];
$webusername = $values["webusername"];
$webpassword = $values["webpassword"];
$shardhost = $values["shardhost"];
$shardport = $values["shardport"];
$sharddbname = $values["sharddbname"];
$shardusername = $values["shardusername"];
$shardpassword = $values["shardpassword"];
$salt = Users::generateSALT();
$hashpass = crypt($pass, $salt);
$params = array(
$login,
$hashpass,
$email
);
try{
//make connection with web db
$dbw = new PDO("mysql:host=$webhost;port=$webport;dbname=$webdbname", $webusername, $webpassword);
$dbw->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
//put into web db
$statement = $dbw->prepare("INSERT INTO ams_user (Login, Password, Email) VALUES (?, ?, ?)");
$statement->execute($params);
try {
//make connection with and put into shard db
$dbs = new PDO("mysql:host=$shardhost;port=$shardport;dbname=$sharddbname", $shardusername, $shardpassword);
$dbs->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$statement = $dbs->prepare("INSERT INTO user (Login, Password, Email) VALUES (?, ?, ?)");
$statement->execute($params);
}
catch (PDOException $e) {
//print_r($e);
//oh noooz, the shard is offline! Put in query queue at web db!
$params = array("type" => "createUser","query" => json_encode(array($login,$pass,$email)));
$statement = $dbw->prepare("INSERT INTO ams_querycache (type, query) VALUES (:type, :query)");
$statement->execute($params);
} }
}catch (PDOException $e) {
//go to error page or something, because can't access website db
print_r($e);
exit;
}
}
public function login($params){
$webhost = $params["webhost"];
$webport = $params["webport"];
$webdbname = $params["webdbname"];
$webusername = $params["webusername"];
$webpassword = $params["webpassword"];
try{
$dbw = new PDO("mysql:host=$webhost;port=$webport;dbname=$webdbname", $webusername, $webpassword);
$dbw->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$statement = $dbw->prepare("SELECT * FROM ams_user WHERE Login=:user");
$statement->execute(array('user' => $params['name']));
$count = $statement->rowCount();
if ($count==1) {
$row = $statement->fetch();
$salt = substr($row['Password'],0,2);
$hashed_input_pass = crypt($params["pass"], $salt);
if($hashed_input_pass == $row['Password']){
//handle successful login
print("nice welcome!");
$_SESSION['user'] = $params['name'];
$_SESSION['permission'] = $row['Permission'];
print( $_SESSION['user']);
return "success";
}else{
//handle login failure
print("Login failed");
return "failure";
}
}
}catch (PDOException $e) {
//go to error page or something, because can't access website db
print_r($e);
exit;
}
}
}

@ -5,10 +5,20 @@
// Variables for database access // Variables for database access
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
// where we can find the mysql database // where we can find the mysql database
$DBHOST = 'localhost' ;
$DBNAME = 'nel' ; $WEBDBHOST = 'localhost';
$DBUSERNAME = 'shard' ; $WEBDBPORT = '3306';
$DBPASSWORD = '' ; $WEBDBNAME = 'ryzom_ams';
$WEBDBUSERNAME = 'shard';
$WEBDBPASSWORD = '' ;
$SHARDDBHOST = 'localhost' ;
$SHARDDBPORT = '3306';
$SHARDDBNAME = 'nel' ;
$SHARDDBUSERNAME = 'shard' ;
$SHARDDBPASSWORD = '' ;
// If true= the server will add automatically unknown user in the database // If true= the server will add automatically unknown user in the database
// (in nel.user= nel.permission= ring.ring_user and ring.characters // (in nel.user= nel.permission= ring.ring_user and ring.characters

@ -12,7 +12,7 @@ function add_user(){
'init' => $_POST["Email"], 'init' => $_POST["Email"],
'unhashpass' => $_POST["Password"], 'unhashpass' => $_POST["Password"],
'status' => 1, 'status' => 1,
'access' => REQUEST_TIME 'access' => $_SERVER['REQUEST_TIME']
); );
//header( 'Location: email_sent.php' ); //header( 'Location: email_sent.php' );
write_user( $edit ); write_user( $edit );
@ -25,14 +25,42 @@ function add_user(){
$result['prevEmail'] = $_POST["Email"]; $result['prevEmail'] = $_POST["Email"];
$result['no_visible_elements'] = 'TRUE'; $result['no_visible_elements'] = 'TRUE';
helpers :: loadtemplate( 'register', $result); helpers :: loadtemplate( 'register', $result);
exit;
} }
} }
function write_user(){ function write_user($newUser){
global $WEBDBHOST;
global $WEBDBPORT;
global $WEBDBNAME;
global $WEBDBUSERNAME;
global $WEBDBPASSWORD;
global $SHARDDBHOST;
global $SHARDDBPORT;
global $SHARDDBNAME;
global $SHARDDBUSERNAME;
global $SHARDDBPASSWORD;
$values["name"] = $newUser["name"];
$values["pass"] = $newUser["pass"];
$values["mail"] = $newUser["mail"];
$values["webhost"] = $WEBDBHOST;
$values["webport"] = $WEBDBPORT;
$values["webdbname"] = $WEBDBNAME;
$values["webusername"] = $WEBDBUSERNAME;
$values["webpassword"] = $WEBDBPASSWORD ;
$values["shardhost"] = $SHARDDBHOST;
$values["shardport"] = $SHARDDBPORT;
$values["sharddbname"] = $SHARDDBNAME;
$values["shardusername"] = $SHARDDBUSERNAME;
$values["shardpassword"] = $SHARDDBPASSWORD;
$result = Users :: createUser($values);
// add user locally here
print('Awesome'); print('Awesome');
} }

@ -1,39 +1,51 @@
<?php <?php
error_reporting(E_ALL);
ini_set('display_errors', 'on');
require( '../config.php' ); require( '../config.php' );
require( '../../ams_lib/libinclude.php' ); require( '../../ams_lib/libinclude.php' );
//default page session_start();
$page = 'login';
print("[" . $_SESSION['user'] . "] ");
if ( isset( $_POST["function"] ) ){ //Decide what page to load
require( "inc/" . $_POST["function"] . ".php" ); if(isset($_SESSION['user'])){
$tempReturn = $_POST["function"](); $page = 'home';
$functionReturn = array_merge($tempReturn,$_POST); }else{
if ( isset($_POST["callBack"])){ //default page
$page = $_POST["callBack"]; $page = 'login';
}
if ( isset( $_GET["page"] ) ){
$page = $_GET["page"];
} }
//perform an action in case one is specified
if ( isset( $_POST["function"] ) ){
require( "inc/" . $_POST["function"] . ".php" );
$return = $_POST["function"]();
} }
function loadpage ( $page ){ function loadpage ( $page ){
require_once( 'autoload/' . $page . '.php' ); require_once( 'autoload/' . $page . '.php' );
} }
if ( isset( $_GET["page"] ) ){
$page = $_GET["page"];
}
//Page Handling //Set permission
if($page == 'login' || $page == 'register'){ if(isset($_SESSION['Permission'])){
$no_visible_elements = 'TRUE'; $return['permission'] = $_SESSION['Permission'];
}else{
//default permission
$return['permission'] = 0;
} }
if ( isset($functionReturn) ){
$return = array_merge(array( 'permission' => 1, 'no_visible_elements' => $no_visible_elements ),$functionReturn); //hide sidebar + topbar in case of login/register
if($page == 'login' || $page == 'register'){
$return['no_visible_elements'] = 'TRUE';
}else{ }else{
$return = array( 'permission' => 1, 'no_visible_elements' => $no_visible_elements ); $return['no_visible_elements'] = 'FALSE';
} }
//print_r($return);
helpers :: loadTemplate( $page , $return ); helpers :: loadTemplate( $page , $return );
session_destroy();

@ -1,44 +0,0 @@
<?php
$no_visible_elements=true;
include('header.php'); ?>
<div class="row-fluid">
<div class="span12 center login-header">
<img src="img/mainlogo.png"/>
</div><!--/span-->
</div><!--/row-->
<div class="row-fluid">
<div class="well span5 center login-box">
<div class="alert alert-info">
Please login with your Username and Password.
</div>
<form class="form-horizontal" action="index.php" method="post">
<fieldset>
<div class="input-prepend" title="Username" data-rel="tooltip">
<span class="add-on"><i class="icon-user"></i></span><input autofocus class="input-large span10" name="username" id="username" type="text" value="" />
</div>
<div class="clearfix"></div>
<div class="input-prepend" title="Password" data-rel="tooltip">
<span class="add-on"><i class="icon-lock"></i></span><input class="input-large span10" name="password" id="password" type="password" value="" />
</div>
<div class="clearfix"></div>
<div class="input-prepend">
<label class="remember" for="remember"><input type="checkbox" id="remember" />Remember me</label>
</div>
<div class="clearfix"></div>
<p class="center span5">
<button type="submit" class="btn btn-primary">Login</button>
</p>
</fieldset>
</form>
<div class="alert alert-info">
<strong>Register</strong>
If you dont have an account yet, create one <a href="register.php">here</a>!
</div>
</div><!--/span-->
</div><!--/row-->
<?php include('footer.php'); ?>

@ -0,0 +1,19 @@
CREATE DATABASE IF NOT EXISTS `ryzom_ams`;
USE `ryzom_ams`;
DROP TABLE IF EXISTS ams_user;
DROP TABLE IF EXISTS ams_querycache;
CREATE TABLE IF NOT EXISTS `ams_user` (
`UId` int(10) NOT NULL AUTO_INCREMENT,
`Login` varchar(64) NOT NULL DEFAULT '',
`Password` varchar(13) DEFAULT NULL,
`Email` varchar(255) NOT NULL DEFAULT '',
`Permission` int(3) NOT NULL DEFAULT 1,
PRIMARY KEY (`UId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='contains all users information for ryzom_ams';
CREATE TABLE ams_querycache (
`SID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
`type` VARCHAR( 64 ) NOT NULL ,
`query` VARCHAR( 512 ) NOT NULL
);

@ -15,12 +15,12 @@
<form method="post" action="index.php" class="form-horizontal"> <form method="post" action="index.php" class="form-horizontal">
<fieldset> <fieldset>
<div data-rel="tooltip" class="input-prepend" data-original-title="Username"> <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" autofocus=""> <span class="add-on"><i class="icon-user"></i></span><input type="text" value="" id="Username" name="Username" class="input-large span10" autofocus="">
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div data-rel="tooltip" class="input-prepend" data-original-title="Password"> <div data-rel="tooltip" class="input-prepend" data-original-title="Password">
<span class="add-on"><i class="icon-lock"></i></span><input type="password" value="" id="password" name="password" class="input-large span10"> <span class="add-on"><i class="icon-lock"></i></span><input type="password" value="" id="Password" name="Password" class="input-large span10">
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
@ -30,6 +30,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<p class="center span5"> <p class="center span5">
<input type="hidden" name="function" value="login">
<button class="btn btn-primary" type="submit">Login</button> <button class="btn btn-primary" type="submit">Login</button>
</p> </p>
</fieldset> </fieldset>

@ -106,7 +106,6 @@
{/if} {/if}
<input type="hidden" name="function" value="add_user"> <input type="hidden" name="function" value="add_user">
<input type="hidden" name="callBack" value="register">
<div class="control-group"> <div class="control-group">
<label class="control-label"></label> <label class="control-label"></label>
<div class="controls"> <div class="controls">

Loading…
Cancel
Save