aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-05 23:09:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

restructuring of AMS database functions to work with CRUD

Browse source 
--HG--
branch : Gsoc14-ryzomAppImprovements
This commit is contained in:
shubham_meena 2014-05-28 03:48:44 +05:30
parent a92f32c1c4
commit 8a28b3583a
18 changed files with 129 additions and 176 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/assigned.php
View file

@ -80,9 +80,9 @@ class Assigned{
$dbl = new DBLayer("lib");
//check if ticket is already assigned
if($user_id == 0 && $dbl->execute(" SELECT * FROM `assigned` WHERE `Ticket` = :ticket_id", array('ticket_id' => $ticket_id) )->rowCount() ){
if($user_id == 0 && $dbl->select("`assigned`", array('ticket_id' => $ticket_id), "`Ticket` = :ticket_id")->rowCount() ){
return true;
}else if( $dbl->execute(" SELECT * FROM `assigned` WHERE `Ticket` = :ticket_id and `User` = :user_id", array('ticket_id' => $ticket_id, 'user_id' => $user_id) )->rowCount()){
}else if( $dbl->select("`assigned`", array('ticket_id' => $ticket_id, 'user_id' => $user_id), "`Ticket` = :ticket_id and `User` = :user_id")->rowCount() ){
return true;
}else{
return false;
@ -115,9 +115,7 @@ class Assigned{
*/
public function create() {
$dbl = new DBLayer("lib");
$query = "INSERT INTO `assigned` (`User`,`Ticket`) VALUES (:user, :ticket)";
$values = Array('user' => $this->getUser(), 'ticket' => $this->getTicket());
$dbl->execute($query, $values);
$dbl->insert("`assigned`", Array('User' => $this->getUser(), 'Ticket' => $this->getTicket());
}
@ -127,9 +125,7 @@ class Assigned{
*/
public function delete() {
$dbl = new DBLayer("lib");
$query = "DELETE FROM `assigned` WHERE `User` = :user_id and `Ticket` = :ticket_id";
$values = array('user_id' => $this->getUser() ,'ticket_id' => $this->getTicket());
$dbl->execute($query, $values);
$dbl->delete("`assigned`", array('user_id' => $this->getUser() ,'ticket_id' => $this->getTicket(), "`User` = :user_id and `Ticket` = :ticket_id");
}
/**
@ -139,7 +135,7 @@ class Assigned{
*/
public function load($ticket_id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM `assigned` WHERE `Ticket` = :ticket_id", Array('ticket_id' => $ticket_id));
$statement = $dbl->select("`assigned`", Array('ticket_id' => $ticket_id), "`Ticket` = :ticket_id");
$row = $statement->fetch();
$this->set($row);
}
@ -181,4 +177,4 @@ class Assigned{
}
}
}

14
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/forwarded.php
View file

@ -55,7 +55,7 @@ class Forwarded{
*/
public static function isForwarded( $ticket_id) {
$dbl = new DBLayer("lib");
if( $dbl->execute(" SELECT * FROM `forwarded` WHERE `Ticket` = :ticket_id", array('ticket_id' => $ticket_id))->rowCount()){
if( $dbl->select("`forwarded`", array('ticket_id' => $ticket_id), "`Ticket` = :ticket_id")->rowCount() ){
return true;
}else{
return false;
@ -90,9 +90,7 @@ class Forwarded{
*/
public function create() {
$dbl = new DBLayer("lib");
$query = "INSERT INTO `forwarded` (`Group`,`Ticket`) VALUES (:group, :ticket)";
$values = Array('group' => $this->getGroup(), 'ticket' => $this->getTicket());
$dbl->execute($query, $values);
$dbl->insert("`forwarded`", Array('Group' => $this->getGroup(), 'Ticket' => $this->getTicket()));
}
@ -102,9 +100,7 @@ class Forwarded{
*/
public function delete() {
$dbl = new DBLayer("lib");
$query = "DELETE FROM `forwarded` WHERE `Group` = :group_id and `Ticket` = :ticket_id";
$values = array('group_id' => $this->getGroup() ,'ticket_id' => $this->getTicket());
$dbl->execute($query, $values);
$dbl->delete("`forwarded`", array('group_id' => $this->getGroup() ,'ticket_id' => $this->getTicket(), "`Group` = :group_id and `Ticket` = :ticket_id");
}
@ -115,7 +111,7 @@ class Forwarded{
*/
public function load( $ticket_id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM `forwarded` WHERE `Ticket` = :ticket_id", Array('ticket_id' => $ticket_id));
$statement = $dbl->select("`forwarded`", Array('ticket_id' => $ticket_id), "`Ticket` = :ticket_id");
$row = $statement->fetch();
$this->set($row);
}
@ -156,4 +152,4 @@ class Forwarded{
}
}
}

2
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php
View file

@ -206,7 +206,7 @@ class Helpers{
$dbr = new DBLayer("ring");
if (isset($_GET['UserId']) && isset($_COOKIE['ryzomId'])){
$id = $_GET['UserId'];
$statement = $dbr->execute("SELECT * FROM ring_users WHERE user_id=:id AND cookie =:cookie", array('id' => $id, 'cookie' => $_COOKIE['ryzomId']));
$statement = $dbr->select("ring_users", array('id' => $id, 'cookie' => $_COOKIE['ryzomId']), "user_id=:id AND cookie =:cookie");
if ($statement->rowCount() ){
$entry = $statement->fetch();
//print_r($entry);

12
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/in_support_group.php
View file

@ -21,7 +21,7 @@ class In_Support_Group{
public static function userExistsInSGroup( $user_id, $group_id) {
$dbl = new DBLayer("lib");
//check if name is already used
if( $dbl->execute(" SELECT * FROM `in_support_group` WHERE `User` = :user_id and `Group` = :group_id ", array('user_id' => $user_id, 'group_id' => $group_id) )->rowCount() ){
if( $dbl->select("in_support_group", array('user_id' => $user_id, 'group_id' => $group_id), "`User` = :user_id and `Group` = :group_id")->rowCount() ){
return true;
}else{
return false;
@ -54,9 +54,7 @@ class In_Support_Group{
*/
public function create() {
$dbl = new DBLayer("lib");
$query = "INSERT INTO `in_support_group` (`User`,`Group`) VALUES (:user, :group)";
$values = Array('user' => $this->user, 'group' => $this->group);
$dbl->execute($query, $values);
$dbl->insert("`in_support_group`", Array('User' => $this->user, 'Group' => $this->group);
}
@ -66,9 +64,7 @@ class In_Support_Group{
*/
public function delete() {
$dbl = new DBLayer("lib");
$query = "DELETE FROM `in_support_group` WHERE `User` = :user_id and `Group` = :group_id";
$values = array('user_id' => $this->getUser() ,'group_id' => $this->getGroup());
$dbl->execute($query, $values);
$dbl->delete("`in_support_group`", array('user_id' => $this->getUser() ,'group_id' => $this->getGroup(), "`User` = :user_id and `Group` = :group_id");
}
/*
@ -118,4 +114,4 @@ class In_Support_Group{
}
}
}

9
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/mail_handler.php
View file

@ -118,12 +118,7 @@ class Mail_Handler{
$id_user = $recipient;
$recipient = NULL;
}
$query = "INSERT INTO email (Recipient,Subject,Body,Status,Attempts,Sender,UserId,MessageId,TicketId) VALUES (:recipient, :subject, :body, :status, :attempts, :sender, :id_user, :messageId, :ticketId)";
$values = array('recipient' => $recipient, 'subject' => $subject, 'body' => $body, 'status' => 'NEW', 'attempts'=> 0, 'sender' => $from,'id_user' => $id_user, 'messageId' => 0, 'ticketId'=> $ticket_id);
$db = new DBLayer("lib");
$db->execute($query, $values);
$db->insert("email", array('Recipient' => $recipient, 'Subject' => $subject, 'Body' => $body, 'Status' => 'NEW', 'Attempts'=> 0, 'Sender' => $from,'UserId' => $id_user, 'MessageId' => 0, 'TicketId'=> $ticket_id));
}
@ -173,7 +168,7 @@ class Mail_Handler{
//select all new & failed emails & try to send them
//$emails = db_query("select * from email where status = 'NEW' or status = 'FAILED'");
$statement = $this->db->executeWithoutParams("select * from email where Status = 'NEW' or Status = 'FAILED'");
$statement = $this->db->select("email",array(null), "Status = 'NEW' or Status = 'FAILED'");
$emails = $statement->fetchAll();
foreach($emails as $email) {

8
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/querycache.php
View file

@ -47,7 +47,7 @@ class Querycache{
*/
public function load_With_SID( $id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM ams_querycache WHERE SID=:id", array('id' => $id));
$statement = $dbl->select("ams_querycache", array('id' => $id), "SID=:id");
$row = $statement->fetch();
$this->set($row);
}
@ -58,9 +58,7 @@ class Querycache{
*/
public function update(){
$dbl = new DBLayer("lib");
$query = "UPDATE ams_querycache SET type= :t, query = :q, db = :d WHERE SID=:id";
$values = Array('id' => $this->getSID(), 't' => $this->getType(), 'q' => $this->getQuery(), 'd' => $this->getDb());
$statement = $dbl->execute($query, $values);
$dbl->update("ams_querycache", Array('type' => $this->getType(), 'query' => $this->getQuery(), 'db' => $this->getDb(), "SID=$this->getSID()" );
}
////////////////////////////////////////////Getters////////////////////////////////////////////////////
@ -127,4 +125,4 @@ class Querycache{
$this->db= $d;
}
}
}

24
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/support_group.php
View file

@ -24,7 +24,7 @@ class Support_Group{
*/
public static function getGroup($id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM support_group WHERE SGroupId = :id", array('id' => $id));
$statement = $dbl->select("support_group", array('id' => $id), "SGroupId = :id");
$row = $statement->fetch();
$instanceGroup = new self();
$instanceGroup->set($row);
@ -102,10 +102,10 @@ class Support_Group{
public static function supportGroup_EntryNotExists( $name, $tag) {
$dbl = new DBLayer("lib");
//check if name is already used
if( $dbl->execute("SELECT * FROM support_group WHERE Name = :name",array('name' => $name))->rowCount() ){
if( $dbl->select("support_group", array('name' => $name), "Name = :name")->rowCount() ){
return "NAME_TAKEN";
}
else if( $dbl->execute("SELECT * FROM support_group WHERE Tag = :tag",array('tag' => $tag))->rowCount() ){
else if( $dbl->select("support_group", array('tag' => $tag), "Tag = :tag")->rowCount() ){
return "TAG_TAKEN";
}else{
return "SUCCESS";
@ -121,7 +121,7 @@ class Support_Group{
public static function supportGroup_Exists( $id) {
$dbl = new DBLayer("lib");
//check if supportgroup id exist
if( $dbl->execute("SELECT * FROM support_group WHERE SGroupId = :id",array('id' => $id ))->rowCount() ){
if( $dbl->select("support_group", array('id' => $id ), "SGroupId = :id")->rowCount() ){
return true;
}else{
return false;
@ -305,9 +305,7 @@ class Support_Group{
*/
public function create() {
$dbl = new DBLayer("lib");
$query = "INSERT INTO support_group (Name, Tag, GroupEmail, IMAP_MailServer, IMAP_Username, IMAP_Password) VALUES (:name, :tag, :groupemail, :imap_mailserver, :imap_username, :imap_password)";
$values = Array('name' => $this->getName(), 'tag' => $this->getTag(), 'groupemail' => $this->getGroupEmail(), 'imap_mailserver' => $this->getIMAP_MailServer(), 'imap_username' => $this->getIMAP_Username(), 'imap_password' => $this->getIMAP_Password());
$dbl->execute($query, $values);
$dbl->insert("support_group", Array('Name' => $this->getName(), 'Tag' => $this->getTag(), 'GroupEmail' => $this->getGroupEmail(), 'IMAP_MailServer' => $this->getIMAP_MailServer(), 'IMAP_Username' => $this->getIMAP_Username(), 'IMAP_Password' => $this->getIMAP_Password());
}
@ -318,7 +316,7 @@ class Support_Group{
*/
public function load_With_SGroupId( $id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM `support_group` WHERE `SGroupId` = :id", array('id' => $id));
$statement = $dbl->select("`support_group`", array('id' => $id), "`SGroupId` = :id");
$row = $statement->fetch();
$this->set($row);
}
@ -329,9 +327,7 @@ class Support_Group{
*/
public function update(){
$dbl = new DBLayer("lib");
$query = "UPDATE `support_group` SET `Name` = :name, `Tag` = :tag, `GroupEmail` = :groupemail, `IMAP_MailServer` = :mailserver, `IMAP_Username` = :username, `IMAP_Password` = :password WHERE `SGroupId` = :id";
$values = Array('id' => $this->getSGroupId(), 'name' => $this->getName(), 'tag' => $this->getTag(), 'groupemail' => $this->getGroupEmail(), 'mailserver' => $this->getIMAP_MailServer(), 'username' => $this->getIMAP_Username(), 'password' => $this->getIMAP_Password() );
$statement = $dbl->execute($query, $values);
$dbl->update("`support_group`", Array('Name' => $this->getName(), 'Tag' => $this->getTag(), 'GroupEmail' => $this->getGroupEmail(), 'IMAP_MailServer' => $this->getIMAP_MailServer(), 'IMAP_Username' => $this->getIMAP_Username(), 'IMAP_password' => $this->getIMAP_Password(), "`SGroupId` = $this->getSGroupId()");
}
@ -341,9 +337,7 @@ class Support_Group{
*/
public function delete(){
$dbl = new DBLayer("lib");
$query = "DELETE FROM `support_group` WHERE `SGroupId` = :id";
$values = Array('id' => $this->getSGroupId());
$statement = $dbl->execute($query, $values);
$dbl->delete("`support_group`", Array('id' => $this->getSGroupId(), "`SGroupId` = :id");
}
////////////////////////////////////////////Getters////////////////////////////////////////////////////
@ -453,4 +447,4 @@ class Support_Group{
public function setIMAP_Password($p){
$this->iMap_Password = $p;
}
}
}

25
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/sync.php
View file

@ -42,34 +42,37 @@ class Sync{
$decode = json_decode($record['query']);
$values = array('username' => $decode[0]);
//make connection with and put into shard db & delete from the lib
$sth = $db->execute("SELECT UId FROM user WHERE Login= :username;", $values);
$sth=$db->selectWithParameter("UId", "user", $values, "Login= :username" );
$result = $sth->fetchAll();
foreach ($result as $UId) {
$ins_values = array('id' => $UId['UId']);
$db->execute("INSERT INTO permission (UId, ClientApplication, AccessPrivilege) VALUES (:id, 'r2', 'OPEN');", $ins_values);
$db->execute("INSERT INTO permission (UId, ClientApplication, AccessPrivilege) VALUES (:id , 'ryzom_open', 'OPEN');", $ins_values);
$ins_values = array('UId' => $UId['UId']);
$ins_values['ClientApplication'] = "r2";
$ins_values['AccessPrivilege'] = "OPEN";
$db->insert("permission", $ins_values);
$ins_values['ClientApplication'] = 'ryzom_open';
$db->insert("permission",$ins_values);
}
break;
case 'change_pass':
$decode = json_decode($record['query']);
$values = array('user' => $decode[0], 'pass' => $decode[1]);
$values = array('Password' => $decode[1]);
//make connection with and put into shard db & delete from the lib
$db->execute("UPDATE user SET Password = :pass WHERE Login = :user",$values);
$db->update("user", $values, "Login = $decode[0]");
break;
case 'change_mail':
$decode = json_decode($record['query']);
$values = array('user' => $decode[0], 'mail' => $decode[1]);
$values = array('Email' => $decode[1]);
//make connection with and put into shard db & delete from the lib
$db->execute("UPDATE user SET Email = :mail WHERE Login = :user",$values);
$db->update("user", $values, "Login = $decode[0]");
break;
case 'createUser':
$decode = json_decode($record['query']);
$values = array('login' => $decode[0], 'pass' => $decode[1], 'mail' => $decode[2] );
$values = array('Login' => $decode[0], 'Password' => $decode[1], 'Email' => $decode[2] );
//make connection with and put into shard db & delete from the lib
$db->execute("INSERT INTO user (Login, Password, Email) VALUES (:login, :pass, :mail)",$values);
$db->insert("user", $values);
break;
}
$dbl->execute("DELETE FROM ams_querycache WHERE SID=:SID",array('SID' => $record['SID']));
$dbl->delete("ams_querycache", array('SID' => $record['SID']), "SID=:SID");
}
if ($display == true) {
print('Syncing completed');

14
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket.php
View file

@ -27,7 +27,7 @@ class Ticket{
public static function ticketExists($id) {
$dbl = new DBLayer("lib");
//check if ticket exists
if( $dbl->execute(" SELECT * FROM `ticket` WHERE `TId` = :ticket_id", array('ticket_id' => $id) )->rowCount() ){
if( $dbl->select("`ticket`", array('ticket_id' => $id), "`TId` = :ticket_id")->rowCount() ){
return true;
}else{
return false;
@ -343,9 +343,7 @@ class Ticket{
*/
public function create(){
$dbl = new DBLayer("lib");
$query = "INSERT INTO ticket (Timestamp, Title, Status, Queue, Ticket_Category, Author, Priority) VALUES (now(), :title, :status, :queue, :tcat, :author, :priority)";
$values = Array('title' => $this->title, 'status' => $this->status, 'queue' => $this->queue, 'tcat' => $this->ticket_category, 'author' => $this->author, 'priority' => $this->priority);
$this->tId = $dbl->executeReturnId($query, $values); ;
$this->tId = $dbl->executeReturnId("ticket", Array('Timestamp'=>now(), 'Title' => $this->title, 'Status' => $this->status, 'Queue' => $this->queue, 'Ticket_Category' => $this->ticket_category, 'Author' => $this->author, 'Priority' => $this->priority));
}
@ -356,7 +354,7 @@ class Ticket{
*/
public function load_With_TId( $id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM ticket WHERE TId=:id", array('id' => $id));
$statement = $dbl->select("ticket", array('id' => $id), "TId=:id");
$row = $statement->fetch();
$this->tId = $row['TId'];
$this->timestamp = $row['Timestamp'];
@ -374,9 +372,7 @@ class Ticket{
*/
public function update(){
$dbl = new DBLayer("lib");
$query = "UPDATE ticket SET Timestamp = :timestamp, Title = :title, Status = :status, Queue = :queue, Ticket_Category = :tcat, Author = :author, Priority = :priority WHERE TId=:id";
$values = Array('id' => $this->tId, 'timestamp' => $this->timestamp, 'title' => $this->title, 'status' => $this->status, 'queue' => $this->queue, 'tcat' => $this->ticket_category, 'author' => $this->author, 'priority' => $this->priority);
$statement = $dbl->execute($query, $values);
$dbl->update("ticket", Array('Timestamp' => $this->timestamp, 'Title' => $this->title, 'Status' => $this->status, 'Queue' => $this->queue, 'Ticket_Category' => $this->ticket_category, 'Author' => $this->author, 'Priority' => $this->priority), "TId=$this->tId");
}
@ -575,4 +571,4 @@ class Ticket{
$this->priority = $p;
}
}
}

15
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_category.php
View file

@ -16,10 +16,7 @@ class Ticket_Category{
*/
public static function createTicketCategory( $name) {
$dbl = new DBLayer("lib");
$query = "INSERT INTO ticket_category (Name) VALUES (:name)";
$values = Array('name' => $name);
$dbl->execute($query, $values);
$dbl->insert("ticket_category", Array('Name' => $name));
}
@ -40,7 +37,7 @@ class Ticket_Category{
*/
public static function getAllCategories() {
$dbl = new DBLayer("lib");
$statement = $dbl->executeWithoutParams("SELECT * FROM ticket_category");
$statement = $dbl->select("ticket_category", array(null), "1");
$row = $statement->fetchAll();
$result = Array();
foreach($row as $category){
@ -70,7 +67,7 @@ class Ticket_Category{
*/
public function load_With_TCategoryId( $id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM ticket_category WHERE TCategoryId=:id", array('id' => $id));
$statement = $dbl->select("ticket_category", array('id' => $id), "TCategoryId=:id");
$row = $statement->fetch();
$this->tCategoryId = $row['TCategoryId'];
$this->name = $row['Name'];
@ -82,9 +79,7 @@ class Ticket_Category{
*/
public function update(){
$dbl = new DBLayer("lib");
$query = "UPDATE ticket_category SET Name = :name WHERE TCategoryId=:id";
$values = Array('id' => $this->tCategoryId, 'name' => $this->name);
$statement = $dbl->execute($query, $values);
$dbl->update("ticket_category", Array('Name' => $this->name), "TCategoryId = $this->tCategoryId");
}
////////////////////////////////////////////Getters////////////////////////////////////////////////////
@ -126,4 +121,4 @@ class Ticket_Category{
}
}
}

12
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_content.php
View file

@ -43,9 +43,7 @@ class Ticket_Content{
*/
public function create() {
$dbl = new DBLayer("lib");
$query = "INSERT INTO ticket_content (Content) VALUES (:content)";
$values = Array('content' => $this->content);
$this->tContentId = $dbl->executeReturnId($query, $values); ;
$this->tContentId = $dbl->executeReturnId("ticket_content", Array('Content' => $this->content));
}
@ -56,7 +54,7 @@ class Ticket_Content{
*/
public function load_With_TContentId( $id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM ticket_content WHERE TContentId=:id", array('id' => $id));
$statement = $dbl->select("ticket_content", array('id' => $id), "TContentId=:id");
$row = $statement->fetch();
$this->tContentId = $row['TContentId'];
$this->content = $row['Content'];
@ -67,9 +65,7 @@ class Ticket_Content{
*/
public function update(){
$dbl = new DBLayer("lib");
$query = "UPDATE ticket_content SET Content = :content WHERE TContentId=:id";
$values = Array('id' => $this->tContentId, 'content' => $this->content);
$statement = $dbl->execute($query, $values);
$dbl->update("ticket_content", Array('Content' => $this->content), "TContentId = $this->tContentId");
}
////////////////////////////////////////////Getters////////////////////////////////////////////////////
@ -110,4 +106,4 @@ class Ticket_Content{
$this->tContentId = $c;
}
}
}

18
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_info.php
View file

@ -52,7 +52,7 @@ class Ticket_Info{
public static function TicketHasInfo($ticket_id) {
$dbl = new DBLayer("lib");
//check if ticket is already assigned
if( $dbl->execute(" SELECT * FROM `ticket_info` WHERE `Ticket` = :ticket_id", array('ticket_id' => $ticket_id) )->rowCount() ){
if( $dbl->select("`ticket_info`", array('ticket_id' => $ticket_id), "`Ticket` = :ticket_id")->rowCount() ){
return true;
}else{
return false;
@ -102,7 +102,7 @@ class Ticket_Info{
*/
public function load_With_TInfoId( $id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM ticket_info WHERE TInfoId=:id", array('id' => $id));
$statement = $dbl->select("ticket_info", array('id' => $id), "TInfoId=:id");
$row = $statement->fetch();
$this->set($row);
}
@ -115,7 +115,7 @@ class Ticket_Info{
*/
public function load_With_Ticket( $id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM ticket_info WHERE Ticket=:id", array('id' => $id));
$statement = $dbl->select("ticket_info", array('id' => $id), "Ticket=:id");
$row = $statement->fetch();
$this->set($row);
}
@ -127,12 +127,10 @@ class Ticket_Info{
*/
public function create() {
$dbl = new DBLayer("lib");
$query = "INSERT INTO ticket_info ( Ticket, ShardId, UserPosition,ViewPosition, ClientVersion, PatchVersion,ServerTick, ConnectState, LocalAddress, Memory, OS,
Processor, CPUID, CpuMask, HT, NeL3D, UserId) VALUES ( :ticket, :shardid, :userposition, :viewposition, :clientversion, :patchversion, :servertick, :connectstate, :localaddress, :memory, :os, :processor, :cpuid, :cpu_mask, :ht, :nel3d, :user_id )";
$values = Array('ticket' => $this->getTicket(), 'shardid' => $this->getShardId(), 'userposition' => $this->getUser_Position(), 'viewposition' => $this->getView_Position(), 'clientversion' => $this->getClient_Version(),
'patchversion' => $this->getPatch_Version(), 'servertick' => $this->getServer_Tick(), 'connectstate' => $this->getConnect_State(), 'localaddress' => $this->getLocal_Address(), 'memory' => $this->getMemory(), 'os'=> $this->getOS(), 'processor' => $this->getProcessor(), 'cpuid' => $this->getCPUId(),
'cpu_mask' => $this->getCpu_Mask(), 'ht' => $this->getHT(), 'nel3d' => $this->getNel3D(), 'user_id' => $this->getUser_Id());
$dbl->execute($query, $values);
$values = Array('Ticket' => $this->getTicket(), 'ShardId' => $this->getShardId(), 'UserPosition' => $this->getUser_Position(), 'ViewPosition' => $this->getView_Position(), 'ClientVersion' => $this->getClient_Version(),
'PatchVersion' => $this->getPatch_Version(), 'ServerTick' => $this->getServer_Tick(), 'ConnectState' => $this->getConnect_State(), 'LocalAddress' => $this->getLocal_Address(), 'Memory' => $this->getMemory(), 'OS'=> $this->getOS(), 'Processor' => $this->getProcessor(), 'CPUID' => $this->getCPUId(),
'CpuMask' => $this->getCpu_Mask(), 'HT' => $this->getHT(), 'NeL3D' => $this->getNel3D(), 'UserId' => $this->getUser_Id());
$dbl->insert("ticket_info",$values);
}
@ -411,4 +409,4 @@ Processor, CPUID, CpuMask, HT, NeL3D, UserId) VALUES ( :ticket, :shardid, :user
}
}
}

16
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php
View file

@ -82,9 +82,8 @@ class Ticket_Log{
global $TICKET_LOGGING;
if($TICKET_LOGGING){
$dbl = new DBLayer("lib");
$query = "INSERT INTO ticket_log (Timestamp, Query, Ticket, Author) VALUES (now(), :query, :ticket, :author )";
$values = Array('ticket' => $ticket_id, 'author' => $author_id, 'query' => json_encode(array($action,$arg)));
$dbl->execute($query, $values);
$values = Array('Timestamp'=>now(), 'Query' => json_encode(array($action,$arg)), 'Ticket' => $ticket_id, 'Author' => $author_id);
$dbl->insert("ticket_log", $values);
}
}
@ -148,7 +147,7 @@ class Ticket_Log{
*/
public function load_With_TLogId( $id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM ticket_log WHERE TLogId=:id", array('id' => $id));
$dbl->select("ticket_log", array('id' => $id), "TLogId=:id");
$row = $statement->fetch();
$this->set($row);
}
@ -159,9 +158,10 @@ class Ticket_Log{
*/
public function update(){
$dbl = new DBLayer("lib");
$query = "UPDATE ticket_log SET Timestamp = :timestamp, Query = :query, Author = :author, Ticket = :ticket WHERE TLogId=:id";
$values = Array('id' => $this->getTLogId(), 'timestamp' => $this->getTimestamp(), 'query' => $this->getQuery(), 'author' => $this->getAuthor(), 'ticket' => $this->getTicket() );
$statement = $dbl->execute($query, $values);
$values = Array('timestamp' => $this->getTimestamp(), 'query' => $this->getQuery(), 'author' => $this->getAuthor(), 'ticket' => $this->getTicket() );
$dbl->update("ticket_log", $values, "TLogId = $this->getTLogId()");
}
////////////////////////////////////////////Getters////////////////////////////////////////////////////
@ -273,4 +273,4 @@ class Ticket_Log{
}
}
}

12
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_reply.php
View file

@ -123,9 +123,7 @@ class Ticket_Reply{
*/
public function create(){
$dbl = new DBLayer("lib");
$query = "INSERT INTO ticket_reply (Ticket, Content, Author, Timestamp, Hidden) VALUES (:ticket, :content, :author, now(), :hidden)";
$values = Array('ticket' => $this->ticket, 'content' => $this->content, 'author' => $this->author, 'hidden' => $this->hidden);
$this->tReplyId = $dbl->executeReturnId($query, $values);
$this->tReplyId = $dbl->executeReturnId("ticket_reply", Array('Ticket' => $this->ticket, 'Content' => $this->content, 'Author' => $this->author,'Timestamp'=>now(), 'Hidden' => $this->hidden));
}
/**
@ -135,7 +133,7 @@ class Ticket_Reply{
*/
public function load_With_TReplyId( $id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM ticket_reply WHERE TReplyId=:id", array('id' => $id));
$statement = $dbl->select("ticket_reply", array('id' => $id), "TReplyId=:id");
$row = $statement->fetch();
$this->tReplyId = $row['TReplyId'];
$this->ticket = $row['Ticket'];
@ -150,9 +148,7 @@ class Ticket_Reply{
*/
public function update(){
$dbl = new DBLayer("lib");
$query = "UPDATE ticket SET Ticket = :ticket, Content = :content, Author = :author, Timestamp = :timestamp, Hidden = :hidden WHERE TReplyId=:id";
$values = Array('id' => $this->tReplyId, 'timestamp' => $this->timestamp, 'ticket' => $this->ticket, 'content' => $this->content, 'author' => $this->author, 'hidden' => $this->hidden);
$statement = $dbl->execute($query, $values);
$dbl->update("ticket", Array('Ticket' => $this->ticket, 'Content' => $this->content, 'Author' => $this->author, 'Timestamp' => $this->timestamp, 'Hidden' => $this->hidden), "TReplyId=$this->tReplyId, ");
}
////////////////////////////////////////////Getters////////////////////////////////////////////////////
@ -249,4 +245,4 @@ class Ticket_Reply{
public function setHidden($h){
$this->hidden = $h;
}
}
}

17
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_user.php
View file

@ -21,10 +21,7 @@ class Ticket_User{
*/
public static function createTicketUser( $extern_id, $permission) {
$dbl = new DBLayer("lib");
$query = "INSERT INTO ticket_user (Permission, ExternId) VALUES (:perm, :ext_id)";
$values = Array('perm' => $permission, 'ext_id' => $extern_id);
$dbl->execute($query, $values);
$dbl->insert("ticket_user",array('Permission' => $permission, 'ExternId' => $extern_id));
}
@ -73,7 +70,7 @@ class Ticket_User{
*/
public static function getModsAndAdmins() {
$dbl = new DBLayer("lib");
$statement = $dbl->executeWithoutParams("SELECT * FROM `ticket_user` WHERE `Permission` > 1");
$statement = $dbl->select("ticket_user", array(null), "`Permission` > 1" );
$rows = $statement->fetchAll();
$result = Array();
foreach($rows as $user){
@ -93,7 +90,7 @@ class Ticket_User{
public static function constr_ExternId( $id) {
$instance = new self();
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM ticket_user WHERE ExternId=:id", array('id' => $id));
$statement = $dbl->select("ticket_user" ,array('id'=>$id) ,"ExternId=:id");
$row = $statement->fetch();
$instance->tUserId = $row['TUserId'];
$instance->permission = $row['Permission'];
@ -196,7 +193,7 @@ class Ticket_User{
*/
public function load_With_TUserId( $id) {
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT * FROM ticket_user WHERE TUserId=:id", array('id' => $id));
$statement = $dbl->select("ticket_user" ,array('id'=>$id), "TUserId=:id" );
$row = $statement->fetch();
$this->tUserId = $row['TUserId'];
$this->permission = $row['Permission'];
@ -209,9 +206,7 @@ class Ticket_User{
*/
public function update(){
$dbl = new DBLayer("lib");
$query = "UPDATE ticket_user SET Permission = :perm, ExternId = :ext_id WHERE TUserId=:id";
$values = Array('id' => $this->tUserId, 'perm' => $this->permission, 'ext_id' => $this->externId);
$statement = $dbl->execute($query, $values);
$dbl->update("ticket_user" ,array('Permission' => $this->permission, 'ExternId' => $this->externId) ,"TUserId=$this->tUserId");
}
////////////////////////////////////////////Getters////////////////////////////////////////////////////
@ -266,4 +261,4 @@ class Ticket_User{
}
}
}

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

@ -291,9 +291,10 @@ class Users{
//make connection with and put into shard db
$values['user_id']= $user_id;
$dbs = new DBLayer("shard");
$dbs->execute("INSERT INTO user (Login, Password, Email) VALUES (:name, :pass, :mail)",$values);
$dbs->insert("user", $values);
$dbr = new DBLayer("ring");
$dbr->execute("INSERT INTO ring_users (user_id, user_name, user_type) VALUES (:user_id, :name, 'ut_pioneer')",$values);
$values['user_type'] = 'ut_pioneer';
$dbr->insert("ring_users", $values);
ticket_user::createTicketUser( $user_id, 1);
return "ok";
}
@ -301,7 +302,7 @@ class Users{
//oh noooz, the shard is offline! Put in query queue at ams_lib db!
try {
$dbl = new DBLayer("lib");
$dbl->execute("INSERT INTO ams_querycache (type, query, db) VALUES (:type, :query, :db)",array("type" => "createUser",
$dbl->insert("ams_querycache", array("type" => "createUser",
"query" => json_encode(array($values["name"],$values["pass"],$values["mail"])), "db" => "shard"));
ticket_user::createTicketUser( $user_id , 1 );
return "shardoffline";
@ -323,21 +324,20 @@ class Users{
try {
$values = array('username' => $pvalues[0]);
$dbs = new DBLayer("shard");
$sth = $dbs->execute("SELECT UId FROM user WHERE Login= :username;", $values);
$sth = $dbs->selectWithParameter("UId", "user", $values, "Login= :username");
$result = $sth->fetchAll();
foreach ($result as $UId) {
$ins_values = array('id' => $UId['UId']);
$dbs->execute("INSERT INTO permission (UId, ClientApplication, AccessPrivilege) VALUES (:id, 'r2', 'OPEN');", $ins_values);
$dbs->execute("INSERT INTO permission (UId, ClientApplication, AccessPrivilege) VALUES (:id , 'ryzom_open', 'OPEN');", $ins_values);
$ins_values = array('UId' => $UId['UId'], 'clientApplication' => 'r2', 'AccessPrivilege' => 'OPEN');
$dbs->insert("permission", $ins_values);
$ins_values['clientApplication'] = 'ryzom_open';
$dbs->insert("permission", $ins_values);
}
}
catch (PDOException $e) {
//oh noooz, the shard is offline! Put it in query queue at ams_lib db!
$dbl = new DBLayer("lib");
$dbl->execute("INSERT INTO ams_querycache (type, query, db) VALUES (:type, :query, :db)",array("type" => "createPermissions",
"query" => json_encode(array($pvalues[0])), "db" => "shard"));
$dbl->insert("ams_querycache", array("type" => "createPermissions",
"query" => json_encode(array($pvalues[0])), "db" => "shard"));
}
return true;
}
@ -421,19 +421,19 @@ class Users{
*/
protected static function setAmsPassword($user, $pass){
$values = Array('user' => $user, 'pass' => $pass);
$values = Array('Password' => $pass);
try {
//make connection with and put into shard db
$dbs = new DBLayer("shard");
$dbs->execute("UPDATE user SET Password = :pass WHERE Login = :user ",$values);
$dbs->update("user", $values, "Login = $user");
return "ok";
}
catch (PDOException $e) {
//oh noooz, the shard is offline! Put in query queue at ams_lib db!
try {
$dbl = new DBLayer("lib");
$dbl->execute("INSERT INTO ams_querycache (type, query, db) VALUES (:type, :query, :db)",array("type" => "change_pass",
$dbl->insert("ams_querycache", array("type" => "change_pass",
"query" => json_encode(array($values["user"],$values["pass"])), "db" => "shard"));
return "shardoffline";
}catch (PDOException $e) {
@ -451,19 +451,19 @@ class Users{
*/
protected static function setAmsEmail($user, $mail){
$values = Array('user' => $user, 'mail' => $mail);
$values = Array('Email' => $mail);
try {
//make connection with and put into shard db
$dbs = new DBLayer("shard");
$dbs->execute("UPDATE user SET Email = :mail WHERE Login = :user ",$values);
$dbs->update("user", $values, "Login = $user");
return "ok";
}
catch (PDOException $e) {
//oh noooz, the shard is offline! Put in query queue at ams_lib db!
try {
$dbl = new DBLayer("lib");
$dbl->execute("INSERT INTO ams_querycache (type, query, db) VALUES (:type, :query, :db)",array("type" => "change_mail",
$dbl->insert("ams_querycache", array("type" => "change_mail",
"query" => json_encode(array($values["user"],$values["mail"])), "db" => "shard"));
return "shardoffline";
}catch (PDOException $e) {
@ -474,4 +474,4 @@ class Users{
}

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

@ -53,7 +53,7 @@ class WebUsers extends Users{
*/
protected function checkUserNameExists($username){
$dbw = new DBLayer("web");
return $dbw->execute("SELECT * FROM ams_user WHERE Login = :name",array('name' => $username))->rowCount();
return $dbw->select("ams_user", array('name' => $username), "Login = :name")->rowCount();
}
@ -65,7 +65,7 @@ class WebUsers extends Users{
*/
protected function checkEmailExists($email){
$dbw = new DBLayer("web");
return $dbw->execute("SELECT * FROM ams_user WHERE Email = :email",array('email' => $email))->rowCount();
return $dbw->select("ams_user" ,array('email' => $email),"Email = :email")->rowCount();
}
@ -78,7 +78,7 @@ class WebUsers extends Users{
public static function checkLoginMatch($username,$password){
$dbw = new DBLayer("web");
$statement = $dbw->execute("SELECT * FROM ams_user WHERE Login=:user", array('user' => $username));
$statement = $dbw->select("ams_user", array('value' => $value),"Login=:value OR Email=:value");
$row = $statement->fetch();
$salt = substr($row['Password'],0,2);
$hashed_input_pass = crypt($password, $salt);
@ -97,7 +97,7 @@ class WebUsers extends Users{
*/
public static function getId($username){
$dbw = new DBLayer("web");
$statement = $dbw->execute("SELECT * FROM ams_user WHERE Login=:username", array('username' => $username));
$statement = $dbw->select("ams_user", array('username' => $username), "Login=:username");
$row = $statement->fetch();
return $row['UId'];
}
@ -110,7 +110,7 @@ class WebUsers extends Users{
*/
public static function getIdFromEmail($email){
$dbw = new DBLayer("web");
$statement = $dbw->execute("SELECT * FROM ams_user WHERE Email=:email", array('email' => $email));
$statement = $dbw->select("ams_user", array('email' => $email), "Email=:email");
$row = $statement->fetch();
if(!empty($row)){
return $row['UId'];
@ -134,7 +134,7 @@ class WebUsers extends Users{
public function getUsername(){
$dbw = new DBLayer("web");
if(! isset($this->login) || $this->login == ""){
$statement = $dbw->execute("SELECT * FROM ams_user WHERE UId=:id", array('id' => $this->uId));
$statement = $dbw->select("ams_user", array('id' => $this->uId), "UId=:id");
$row = $statement->fetch();
$this->set($row);
}
@ -148,7 +148,7 @@ class WebUsers extends Users{
public function getEmail(){
$dbw = new DBLayer("web");
if(! isset($this->email) || $this->email == ""){
$statement = $dbw->execute("SELECT * FROM ams_user WHERE UId=:id", array('id' => $this->uId));
$statement = $dbw->select("ams_user", array('id' => $this->uId), "UId=:id");
$row = $statement->fetch();
$this->set($row);
}
@ -160,7 +160,7 @@ class WebUsers extends Users{
*/
public function getHashedPass(){
$dbw = new DBLayer("web");
$statement = $dbw->execute("SELECT * FROM ams_user WHERE UId=:id", array('id' => $this->uId));
$statement = $dbw->select("ams_user", array('id' => $this->uId), "UId=:id");
$row = $statement->fetch();
return $row['Password'];
}
@ -174,7 +174,7 @@ class WebUsers extends Users{
$dbw = new DBLayer("web");
if(! (isset($this->firstname) && isset($this->lastname) && isset($this->gender) && isset($this->country) && isset($this->receiveMail) ) ||
$this->firstname == "" || $this->lastname == "" || $this->gender == "" || $this->country == "" || $this->receiveMail == ""){
$statement = $dbw->execute("SELECT * FROM ams_user WHERE UId=:id", array('id' => $this->uId));
$statement = $dbw->select("ams_user", array('id' => $this->uId), "UId=:id");
$row = $statement->fetch();
$this->set($row);
}
@ -189,7 +189,7 @@ class WebUsers extends Users{
public function getReceiveMail(){
$dbw = new DBLayer("web");
if(! isset($this->receiveMail) || $this->receiveMail == ""){
$statement = $dbw->execute("SELECT * FROM ams_user WHERE UId=:id", array('id' => $this->uId));
$statement = $dbw->select("ams_user", array('id' => $this->uId), "UId=:id");
$row = $statement->fetch();
$this->set($row);
}
@ -203,7 +203,7 @@ class WebUsers extends Users{
public function getLanguage(){
$dbw = new DBLayer("web");
if(! isset($this->language) || $this->language == ""){
$statement = $dbw->execute("SELECT * FROM ams_user WHERE UId=:id", array('id' => $this->uId));
$statement = $dbw->select("ams_user", array('id' => $this->uId), "UId=:id");
$row = $statement->fetch();
$this->set($row);
}
@ -234,11 +234,11 @@ class WebUsers extends Users{
$hashpass = crypt($pass, WebUsers::generateSALT());
$reply = WebUsers::setAmsPassword($user, $hashpass);
$values = Array('user' => $user, 'pass' => $hashpass);
$values = Array('pass' => $hashpass);
try {
//make connection with and put into shard db
$dbw = new DBLayer("web");
$dbw->execute("UPDATE ams_user SET Password = :pass WHERE Login = :user ",$values);
$dbw->update("ams_user", $values,"Login = $user");
}
catch (PDOException $e) {
//ERROR: the web DB is offline
@ -256,11 +256,11 @@ class WebUsers extends Users{
*/
public static function setEmail($user, $mail){
$reply = WebUsers::setAmsEmail($user, $mail);
$values = Array('user' => $user, 'mail' => $mail);
$values = Array('Email' => $mail);
try {
//make connection with and put into shard db
$dbw = new DBLayer("web");
$dbw->execute("UPDATE ams_user SET Email = :mail WHERE Login = :user ",$values);
$dbw->update("ams_user", $values, "Login = $user");
}
catch (PDOException $e) {
//ERROR: the web DB is offline
@ -276,11 +276,11 @@ class WebUsers extends Users{
* @param $receivemail the receivemail setting .
*/
public static function setReceiveMail($user, $receivemail){
$values = Array('user' => $user, 'receivemail' => $receivemail);
$values = Array('Receivemail' => $receivemail);
try {
//make connection with and put into shard db
$dbw = new DBLayer("web");
$dbw->execute("UPDATE ams_user SET ReceiveMail = :receivemail WHERE UId = :user ",$values);
$dbw->update("ams_user", $values, "UId = $user" );
}
catch (PDOException $e) {
//ERROR: the web DB is offline
@ -295,11 +295,11 @@ class WebUsers extends Users{
* @param $language the new language value.
*/
public static function setLanguage($user, $language){
$values = Array('user' => $user, 'language' => $language);
$values = Array('Language' => $language);
try {
//make connection with and put into shard db
$dbw = new DBLayer("web");
$dbw->execute("UPDATE ams_user SET Language = :language WHERE UId = :user ",$values);
$dbw->update("ams_user", $values, "UId = $user");
}
catch (PDOException $e) {
//ERROR: the web DB is offline
@ -344,15 +344,15 @@ class WebUsers extends Users{
$lang = $DEFAULT_LANGUAGE;
}
$values = Array('name' => $name, 'pass' => $pass, 'mail' => $mail, 'lang' => $lang);
$values = Array('Login' => $name, 'Password' => $pass, 'Email' => $mail, 'Language' => $lang);
try {
$dbw = new DBLayer("web");
return $dbw->executeReturnId("INSERT INTO ams_user (Login, Password, Email, Language) VALUES (:name, :pass, :mail, :lang)",$values);
return $dbw->executeReturnId("ams_user", $values);
}
catch (PDOException $e) {
//ERROR: the web DB is offline
}
}
}
}

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

@ -66,15 +66,14 @@ function write_user($newUser){
$hashpass = crypt($newUser["pass"], WebUsers::generateSALT());
$params = array(
'name' => $newUser["name"],
'pass' => $hashpass,
'mail' => $newUser["mail"]
'Login' => $newUser["name"],
'Password' => $hashpass,
'Email' => $newUser["mail"]
);
try{
//make new webuser
$user_id = WebUsers::createWebuser($params['name'], $params['pass'], $params['mail']);
$user_id = WebUsers::createWebuser($params['Login'], $params['Password'], $params['Email']);
//Create the user on the shard + in case shard is offline put copy of query in query db
//returns: ok, shardoffline or liboffline
$result = WebUsers::createUser($params, $user_id);