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

Fixed: Some problems with AMS, patches by depyraken (thanks a lot!)

Browse source
This commit is contained in:
kervala 2016-05-08 13:28:25 +02:00
parent c303fa16e4
commit be17d6664c
2 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
code/web/private_php/ams/autoload/users.php
View file

@ -336,36 +336,31 @@ class Users{
public static function createPermissions($pvalues) { public static function createPermissions($pvalues) {
try { try {
$values = array('username' => $pvalues[0]); // bind to the shard database (guess so :p)
$dbs = new DBLayer("shard"); $dbs = new DBLayer("shard");
$sth = $dbs->selectWithParameter("UId", "user", $values, "Login= :username");
$result = $sth->fetchAll();
$dbl = new DBLayer("lib");
$UId = $result['0']['UId'];
$statement = $dbl->execute("SELECT * FROM `settings` WHERE `Setting` = :setting", Array('setting' => 'Domain_Auto_Add'));
$json = $statement->fetch();
$json = json_decode($json['Value'],true);
$db = new DBLayer( 'shard' );
// get all domains // retrieve the user UId
$statement = $db -> executeWithoutParams( "SELECT * FROM domain" ); $values = array('username' => $pvalues[0]);
$rows = $statement -> fetchAll(); $statement = $dbs->selectWithParameter("UId", "user", $values, "Login= :username");
$result = $statement->fetchAll();
$UId = $result['0']['UId'];
// retrieve the default access privileges (don't understand what exactly is done)
$dbl = new DBLayer("lib");
$statement = $dbl->execute("SELECT Value FROM `settings` WHERE `Setting` = :setting", Array('setting' => 'Domain_Auto_Add'));
//$statement = $dbl->execute("SELECT * FROM `settings` WHERE `Setting` = :setting", Array('setting' => 'Domain_Auto_Add'));
$json = $statement->fetch();
$accessPriv = $json['Value'];
//$accessPriv = json_decode($json['Value'],true);
// get all shardIds and domain_ids
$statement = $dbs -> executeWithoutParams( "SELECT ShardId, domain_id FROM shard" );
$shardIds = $statement -> fetchAll();
//error_log(print_r($rows,true)); foreach($shardIds as $shardId) { // add default access privileges to the user for each shard
//error_log(print_r($result,true)); $ins_values = array('UId' => $UId, 'DomainId' => $shardId['domain_id'], 'ShardId' => $shardId['ShardId'], 'AccessPrivilege' => $accessPriv);
//error_log(print_r($json,true)); $dbs->insert("permission", $ins_values);
if ($json) foreach ($json as $key => $value) { }
//error_log(print_r($key,true));
//error_log(print_r($value,true));
$ins_values = array('UId' => $UId, 'DomainId' => $key, 'AccessPrivilege' => $value['1']);
error_log(print_r($ins_values,true));
$dbs = new DBLayer("shard");
$dbs->insert("permission", $ins_values);
}
} }
catch (PDOException $e) { catch (PDOException $e) {
//oh noooz, the shard is offline! Put it in query queue at ams_lib db! //oh noooz, the shard is offline! Put it in query queue at ams_lib db!

2
code/web/private_php/ams/plugins/Domain_Management/Domain_Management.php
View file

@ -156,7 +156,7 @@ function domain_management_hook_return_global()
} }
function api_key_management_hook_activate() function domain_management_hook_activate()
{ {
$dbl = new DBLayer( "lib" ); $dbl = new DBLayer( "lib" );
$sql = "INSERT INTO `settings` (Setting) $sql = "INSERT INTO `settings` (Setting)