bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-12 23:37:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

improved multitenancy support

Browse Source
This commit is contained in:
SJ
2013-01-05 16:42:36 +01:00
parent 7085f3c225
commit cafd477392
26 changed files with 417 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
webui/model/search/search.php
View File

@ -90,6 +90,7 @@ class ModelSearchSearch extends Model {
$f = $t = $fdomain = $tdomain = '';
$session_emails = $this->fix_email_address_for_sphinx($_SESSION['emails']);
$session_domains = $this->fix_email_address_for_sphinx($_SESSION['auditdomains']);
$all_your_addresses = $this->get_all_your_address();
@ -176,9 +177,17 @@ class ModelSearchSearch extends Model {
if(Registry::get('auditor_user') == 1 || ENABLE_FOLDER_RESTRICTIONS == 1) {
$domain_restrictions = '';
$sd = '';
foreach ($session_domains as $d) {
$sd .= '|'.$d;
}
$sd = preg_replace("/^\|/", "", $sd);
if(RESTRICTED_AUDITOR == 1) {
$domain_restrictions = ' (@todomain ' . $this->fix_email_address_for_sphinx($_SESSION['domain']) . ' | @fromdomain ' . $this->fix_email_address_for_sphinx($_SESSION['domain']) . ')';
/* !!!FIXME!!! test this evaluation */
$domain_restrictions = ' (@todomain ' . $sd . ' | @fromdomain ' . $sd . ')';
}
if($from == '' && $to == '') { return $domain_restrictions; }
@ -588,8 +597,12 @@ class ModelSearchSearch extends Model {
array_push($arr, $id);
if(Registry::get('auditor_user') == 1 && RESTRICTED_AUDITOR == 1) {
$q = "?";
array_push($a, $_SESSION['domain']);
while(list($k, $v) = each($_SESSION['auditdomains'])) {
if(validdomain($v) == 1) {
$q .= ",?";
array_push($a, $v);
}
}
}
else {
while(list($k, $v) = each($_SESSION['emails'])) {
@ -598,10 +611,9 @@ class ModelSearchSearch extends Model {
array_push($a, $v);
}
}
$q = preg_replace("/^\,/", "", $q);
}
$q = preg_replace("/^\,/", "", $q);
$arr = array_merge($arr, $a, $a);
@ -639,8 +651,12 @@ class ModelSearchSearch extends Model {
$q2 = preg_replace("/^\,/", "", $q2);
if(Registry::get('auditor_user') == 1 && RESTRICTED_AUDITOR == 1) {
$q = "?";
array_push($a, $_SESSION['domain']);
while(list($k, $v) = each($_SESSION['auditdomains'])) {
if(validdomain($v) == 1) {
$q .= ",?";
array_push($a, $v);
}
}
}
else {
if(Registry::get('auditor_user') == 0) {
@ -651,10 +667,10 @@ class ModelSearchSearch extends Model {
}
}
}
$q = preg_replace("/^\,/", "", $q);
}
$q = preg_replace("/^\,/", "", $q);
if(Registry::get('auditor_user') == 1 && RESTRICTED_AUDITOR == 0) {
$query = $this->db->query("SELECT id FROM `" . TABLE_META . "` WHERE `id` IN ($q2)", $arr);