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

Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #33)

Browse source 
fixed php warnings and errors
This commit is contained in:
Matthew Lagoe 2013-10-23 18:08:15 -07:00
commit 89b58b2e4e
5 changed files with 81 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,70 +19,71 @@ class Sync{
$pid = pcntl_fork(); $pid = pcntl_fork();
} }
$pidfile = '/tmp/ams_cron_pid'; $pidfile = '/tmp/ams_cron_pid';
if(isset($pid)) {
// We're the main process.
} else {
if(!file_exists($pidfile)) {
$pid = getmypid();
$file = fopen($pidfile, 'w');
fwrite($file, $pid); if(isset($pid)) {
fclose($file); // We're the main process.
} else {
if(!file_exists($pidfile)) {
$pid = getmypid();
$file = fopen($pidfile, 'w');
try { fwrite($file, $pid);
$dbl = new DBLayer("lib"); fclose($file);
$statement = $dbl->executeWithoutParams("SELECT * FROM ams_querycache");
$rows = $statement->fetchAll();
foreach ($rows as $record) {
$db = new DBLayer($record['db']); try {
switch($record['type']) { $dbl = new DBLayer("lib");
case 'createPermissions': $statement = $dbl->executeWithoutParams("SELECT * FROM ams_querycache");
$decode = json_decode($record['query']); $rows = $statement->fetchAll();
$values = array('username' => $decode[0]); foreach ($rows as $record) {
//make connection with and put into shard db & delete from the lib
$sth = $db->execute("SELECT UId FROM user WHERE Login= :username;", $values); $db = new DBLayer($record['db']);
$result = $sth->fetchAll(); switch($record['type']) {
foreach ($result as $UId) { case 'createPermissions':
$ins_values = array('id' => $UId['UId']); $decode = json_decode($record['query']);
$db->execute("INSERT INTO permission (UId, ClientApplication, AccessPrivilege) VALUES (:id, 'r2', 'OPEN');", $ins_values); $values = array('username' => $decode[0]);
$db->execute("INSERT INTO permission (UId, ClientApplication, AccessPrivilege) VALUES (:id , 'ryzom_open', 'OPEN');", $ins_values); //make connection with and put into shard db & delete from the lib
} $sth = $db->execute("SELECT UId FROM user WHERE Login= :username;", $values);
break; $result = $sth->fetchAll();
case 'change_pass': foreach ($result as $UId) {
$decode = json_decode($record['query']); $ins_values = array('id' => $UId['UId']);
$values = array('user' => $decode[0], 'pass' => $decode[1]); $db->execute("INSERT INTO permission (UId, ClientApplication, AccessPrivilege) VALUES (:id, 'r2', 'OPEN');", $ins_values);
//make connection with and put into shard db & delete from the lib $db->execute("INSERT INTO permission (UId, ClientApplication, AccessPrivilege) VALUES (:id , 'ryzom_open', 'OPEN');", $ins_values);
$db->execute("UPDATE user SET Password = :pass WHERE Login = :user",$values); }
break; break;
case 'change_mail': case 'change_pass':
$decode = json_decode($record['query']); $decode = json_decode($record['query']);
$values = array('user' => $decode[0], 'mail' => $decode[1]); $values = array('user' => $decode[0], 'pass' => $decode[1]);
//make connection with and put into shard db & delete from the lib //make connection with and put into shard db & delete from the lib
$db->execute("UPDATE user SET Email = :mail WHERE Login = :user",$values); $db->execute("UPDATE user SET Password = :pass WHERE Login = :user",$values);
break; break;
case 'createUser': case 'change_mail':
$decode = json_decode($record['query']); $decode = json_decode($record['query']);
$values = array('login' => $decode[0], 'pass' => $decode[1], 'mail' => $decode[2] ); $values = array('user' => $decode[0], 'mail' => $decode[1]);
//make connection with and put into shard db & delete from the lib //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->execute("UPDATE user SET Email = :mail WHERE Login = :user",$values);
break; break;
case 'createUser':
$decode = json_decode($record['query']);
$values = array('login' => $decode[0], 'pass' => $decode[1], 'mail' => $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);
break;
}
$dbl->execute("DELETE FROM ams_querycache WHERE SID=:SID",array('SID' => $record['SID']));
}
if ($display == true) {
print('Syncing completed');
} }
$dbl->execute("DELETE FROM ams_querycache WHERE SID=:SID",array('SID' => $record['SID']));
} }
if ($display == true) { catch (PDOException $e) {
print('Syncing completed'); if ($display == true) {
print('Something went wrong! The shard is probably still offline!');
print_r($e);
}
} }
unlink($pidfile);
} }
catch (PDOException $e) {
if ($display == true) {
print('Something went wrong! The shard is probably still offline!');
print_r($e);
}
}
unlink($pidfile);
}
} }
} }
} }

2
code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/autoload/webusers.php
View file

@ -185,7 +185,7 @@ class WebUsers extends Users{
* check if the user is logged in. * check if the user is logged in.
* @return true or false * @return true or false
*/ */
public function isLoggedIn(){ public static function isLoggedIn(){
if(isset($_SESSION['user'])){ if(isset($_SESSION['user'])){
return true; return true;
} }

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

@ -215,7 +215,7 @@ class WebUsers extends Users{
* check if the user is logged in. * check if the user is logged in.
* @return true or false * @return true or false
*/ */
public function isLoggedIn(){ public static function isLoggedIn(){
if(isset($_SESSION['user'])){ if(isset($_SESSION['user'])){
return true; return true;
} }

6
code/ryzom/tools/server/ryzom_ams/www/html/inc/show_queue.php
View file

@ -82,7 +82,11 @@ function show_queue(){
case "create_queue": case "create_queue":
$userid = filter_var($_POST['userid'], FILTER_SANITIZE_NUMBER_INT); $userid = filter_var($_POST['userid'], FILTER_SANITIZE_NUMBER_INT);
$groupid = filter_var($_POST['groupid'], FILTER_SANITIZE_NUMBER_INT); if (isset($_POST['groupid'])) {
$groupid = filter_var($_POST['groupid'], FILTER_SANITIZE_NUMBER_INT);
} else {
$groupid = 0;
}
$what = filter_var($_POST['what'], FILTER_SANITIZE_STRING); $what = filter_var($_POST['what'], FILTER_SANITIZE_STRING);
$how = filter_var($_POST['how'], FILTER_SANITIZE_STRING); $how = filter_var($_POST['how'], FILTER_SANITIZE_STRING);
$who = filter_var($_POST['who'], FILTER_SANITIZE_STRING); $who = filter_var($_POST['who'], FILTER_SANITIZE_STRING);

20
code/ryzom/tools/server/ryzom_ams/www/html/templates/show_queue.tpl
View file

@ -16,29 +16,29 @@
<form id="create_queue" class="form-vertical" method="post" action="index.php?page=show_queue&get=create" style="margin:0px 0px 0px;"> <form id="create_queue" class="form-vertical" method="post" action="index.php?page=show_queue&get=create" style="margin:0px 0px 0px;">
Show Show
<select style="width: 136px;" name="what"> <select style="width: 136px;" name="what">
<option value="all" {if $prev_created_what eq "all"}selected="selected"{/if}>all</option> <option value="all" {if isset($prev_created_what) eq "all"}selected="selected"{/if}>all</option>
<option value="waiting_for_support" {if $prev_created_what eq "waiting_for_support"}selected="selected"{/if}>waiting for support</option> <option value="waiting_for_support" {if isset($prev_created_what) eq "waiting_for_support"}selected="selected"{/if}>waiting for support</option>
<option value="waiting_for_users" {if $prev_created_what eq "waiting_for_users"}selected="selected"{/if}>waiting for user</option> <option value="waiting_for_users" {if isset($prev_created_what) eq "waiting_for_users"}selected="selected"{/if}>waiting for user</option>
<option value="closed" {if $prev_created_what eq "closed"}selected="selected"{/if}>closed</option> <option value="closed" {if isset($prev_created_what) eq "closed"}selected="selected"{/if}>closed</option>
</select> </select>
tickets tickets
<select style="width: 110px;" name="how"> <select style="width: 110px;" name="how">
<option value="assigned" {if $prev_created_how eq "assigned"}selected="selected"{/if}>assigned</option> <option value="assigned" {if isset($prev_created_how) eq "assigned"}selected="selected"{/if}>assigned</option>
<option value="not_assigned" {if $prev_created_how eq "not_assigned"}selected="selected"{/if}>not assigned</option> <option value="not_assigned" {if isset($prev_created_how) eq "not_assigned"}selected="selected"{/if}>not assigned</option>
</select> </select>
to to
<select style="width: 140px;" name="who" onchange="aimedforwhochanged(this.value);"> <select style="width: 140px;" name="who" onchange="aimedforwhochanged(this.value);">
<option value="user" {if $prev_created_who eq "user"}selected="selected"{/if}>user</option> <option value="user" {if isset($prev_created_who) eq "user"}selected="selected"{/if}>user</option>
<option value="support_group" {if $prev_created_who eq "support_group"}selected="selected"{/if}>support group</option> <option value="support_group" {if isset($prev_created_who) eq "support_group"}selected="selected"{/if}>support group</option>
</select> </select>
<span id="userList" {if $prev_created_who eq "user"}style="display:inline;"{else if $prev_created_who eq "support_group"}style="display:none;"{else}style="display:inline;"{/if}> <span id="userList" {if isset($prev_created_who) eq "user"}style="display:inline;"{else if isset($prev_created_who) eq "support_group"}style="display:none;"{else}style="display:inline;"{/if}>
<select style="width: 140px;" name="userid"> <select style="width: 140px;" name="userid">
{foreach from=$teamlist item=member} {foreach from=$teamlist item=member}
<option value="{$member.tUserId}" {if isset($prev_created_userid)} {if $prev_created_userid eq $member.tUserId}selected="selected"{/if}{else if $user_id eq $member.tUserId}selected="selected"{/if}>{$member.name}</option> <option value="{$member.tUserId}" {if isset($prev_created_userid)} {if $prev_created_userid eq $member.tUserId}selected="selected"{/if}{else if $user_id eq $member.tUserId}selected="selected"{/if}>{$member.name}</option>
{/foreach} {/foreach}
</select> </select>
</span> </span>
<span id="supportGroupList" {if $prev_created_who eq "user"}style="display:none;"{else if $prev_created_who eq "support_group"}style="display:inline;"{else}style="display:none;"{/if}> <span id="supportGroupList" {if isset($prev_created_who) eq "user"}style="display:none;"{else if isset($prev_created_who) eq "support_group"}style="display:inline;"{else}style="display:none;"{/if}>
<select style="width: 140px;" name="groupid"> <select style="width: 140px;" name="groupid">
{foreach from=$grouplist item=group} {foreach from=$grouplist item=group}
<option value="{$group.sGroupId}" {if $prev_created_groupid eq $group.sGroupId}selected="selected"{/if}>{$group.name}</option> <option value="{$group.sGroupId}" {if $prev_created_groupid eq $group.sGroupId}selected="selected"{/if}>{$group.name}</option>