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

Replaced most each() calls with foreach() in preparation to support php 8

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2022-01-19 15:40:42 +01:00
parent 7aec4647a5
commit 7a66346036
22 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webui/model/audit/audit.php
View File

@ -43,7 +43,7 @@ class ModelAuditAudit extends Model {
if(Registry::get('admin_user') == 0 && RESTRICTED_AUDITOR == 1) {
$auditdomains = $session->get("auditdomains");
while(list($k, $v) = each($auditdomains)) {
foreach($auditdomains as $k => $v) {
if($q) { $q .= ","; }
$q .= "?";
array_push($arr, $v);

6
webui/model/google/google.php
View File

@ -76,7 +76,7 @@ class ModelGoogleGoogle extends Model {
$messages = $storage->piler_batch_fetch($from, $to);
while(list($k, $v) = each($messages)) {
foreach($messages as $k => $v) {
$uuid = $storage->getUniqueId($k);
$tmpname = "piler-" . $email . "-" . $k . "-" . $uuid . ".eml";
@ -98,7 +98,7 @@ class ModelGoogleGoogle extends Model {
}
syslog(LOG_INFO, "downloaded $count messages for $email");
syslog(LOG_INFO, "downloaded $count messages for $email");
return $count;
}
@ -174,5 +174,3 @@ class ModelGoogleGoogle extends Model {
}
?>

4
webui/model/health/health.php
View File

@ -199,7 +199,7 @@ class ModelHealthHealth extends Model {
public function meminfo() {
$m = explode("\n", file_get_contents("/proc/meminfo"));
while(list($k, $v) = each($m)) {
foreach($m as $k => $v) {
$a = preg_split("/\ {1,}/", $v);
if(isset($a[0]) && $a[0]) { $_m[$a[0]] = $a[1]; }
}
@ -219,7 +219,7 @@ class ModelHealthHealth extends Model {
$partitions = Registry::get('partitions_to_monitor');
while(list($k, $v) = each($output)) {
foreach($output as $k => $v) {
if($k > 0) {
$p = preg_split("/\ {1,}/", $v);
if(isset($p[5]) && in_array($p[5], $partitions) && !isset($a[$p[5]])) {

2
webui/model/mail/mail.php
View File

@ -26,7 +26,7 @@ class ModelMailMail extends Model {
fputs($r, "MAIL FROM: <$from>\r\n");
$l = fgets($r, 4096);
while(list($k, $v) = each($to)) {
foreach($to as $k => $v) {
fputs($r, "RCPT TO: <$v>\r\n");
$l = fgets($r, 4096);
}

8
webui/model/search/message.php
View File

@ -213,7 +213,7 @@ class ModelSearchMessage extends Model {
$a = explode(" ", $terms);
$terms = array();
while(list($k, $v) = each($a)) {
foreach($a as $k => $v) {
if(strlen($v) >= 3 && !in_array($v, $fields)) {
$v = preg_replace("/\*/", "", $v);
if($v) { array_push($terms, $v); }
@ -223,7 +223,7 @@ class ModelSearchMessage extends Model {
if(count($terms) <= 0) { return $s; }
if($html == 0) {
while(list($k, $v) = each($terms)) {
foreach($terms as $k => $v) {
$s = preg_replace("/$v/i", "<span class=\"mssghglght\">$v</span>", $s);
}
@ -233,7 +233,7 @@ class ModelSearchMessage extends Model {
$tokens = preg_split("/\</", $s);
$s = '';
while(list($k, $token) = each($tokens)) {
foreach($tokens as $k => $token) {
$pos = strpos($token, ">");
if($pos > 0) {
@ -245,7 +245,7 @@ class ModelSearchMessage extends Model {
$str = substr($token, $pos+1, $len);
reset($terms);
while(list($k, $v) = each($terms)) {
foreach($terms as $k => $v) {
$str = preg_replace("/$v/i", "<span class=\"mssghglght\">$v</span>", $str);
}

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

@ -16,7 +16,7 @@ class ModelSearchSearch extends Model {
$session = Registry::get('session');
while(list($k,$v) = each($data)) {
foreach($data as $k => $v) {
if($v) { if(is_array($v)) { $v = implode(" ", $v); } $s .= '&' . $k . '=' . $v; }
}
@ -113,7 +113,7 @@ class ModelSearchSearch extends Model {
$session = Registry::get('session');
$i = 0;
while(list($k, $v) = each($data['match'])) {
foreach($data['match'] as $k => $v) {
if($v == "@attachment_types") {
list($k, $v) = each($data['match']);
$i++;
@ -199,7 +199,7 @@ class ModelSearchSearch extends Model {
if(ENABLE_FOLDER_RESTRICTIONS == 1) {
$s = explode(" ", $data['folders']);
while(list($k,$v) = each($s)) {
foreach($s as $k => $v) {
if(in_array($v, $session->get("folders"))) {
array_push($__folders, $v);
}
@ -347,7 +347,7 @@ class ModelSearchSearch extends Model {
$s = preg_replace("/httpX/", "http:", $s);
$b = explode(" ", $s);
while(list($k, $v) = each($b)) {
foreach($b as $k => $v) {
if($v == '') { continue; }
if($v == 'from:') { $token = 'match'; $a['match'][] = FROM_TOKEN; continue; }
@ -441,7 +441,7 @@ class ModelSearchSearch extends Model {
$offset = $page * $pagelen;
$s = explode(" ", $extra_folders);
while(list($k,$v) = each($s)) {
foreach($s as $k => $v) {
if(in_array($v, $session->get("extra_folders")) && is_numeric($v)) {
array_push($__folders, $v);
if($q) { $q .= ",?"; }
@ -649,7 +649,7 @@ class ModelSearchSearch extends Model {
if(!$emails) { return $s; }
while(list($k, $v) = each($emails)) {
foreach($emails as $k => $v) {
if($s) { $s .= '| ' . $this->fix_email_address_for_sphinx($v); }
else { $s = $this->fix_email_address_for_sphinx($v); }
}
@ -704,7 +704,7 @@ class ModelSearchSearch extends Model {
$auditdomains = $session->get("auditdomains");
while(list($k, $v) = each($auditdomains)) {
foreach($auditdomains as $k => $v) {
if(validdomain($v) == 1 && !in_array($v, $a)) {
$q .= ",?";
array_push($a, $v);
@ -720,7 +720,7 @@ class ModelSearchSearch extends Model {
$emails = $session->get("emails");
while(list($k, $v) = each($emails)) {
foreach($emails as $k => $v) {
if(validemail($v) == 1) {
$q .= ",?";
array_push($a, $v);
@ -776,7 +776,7 @@ class ModelSearchSearch extends Model {
$auditdomains = $session->get("auditdomains");
while(list($k, $v) = each($auditdomains)) {
foreach($auditdomains as $k => $v) {
if(validdomain($v) == 1 && !in_array($v, $a)) {
$q .= ",?";
array_push($a, $v);
@ -787,7 +787,7 @@ class ModelSearchSearch extends Model {
if(Registry::get('auditor_user') == 0) {
$emails = $session->get("emails");
while(list($k, $v) = each($emails)) {
foreach($emails as $k => $v) {
if(validemail($v) == 1) {
$q .= ",?";
array_push($a, $v);
@ -915,7 +915,7 @@ class ModelSearchSearch extends Model {
$a = explode(" ", $s);
$s = '';
while(list($k, $v) = each($a)) {
foreach($a as $k => $v) {
if(substr($v, 0, 4) == 'http') {
$v = preg_replace("/http(s){0,1}\:\/\//", "__URL__", $v);

2
webui/model/stat/chart.php
View File

@ -69,7 +69,7 @@ class ModelStatChart extends Model {
if($query->num_rows >= 15) {
$i = 0;
while(list($k, $v) = each($dates)) {
foreach($dates as $k => $v) {
$i++;
if($i % 3) { $dates[$k] = ""; }
}

2
webui/model/user/import.php
View File

@ -155,7 +155,7 @@ class ModelUserImport extends Model {
/* build a list of DNs to exclude from the import */
while (list($k, $v) = each($globals)) {
foreach($globals as $k => $v) {
if(preg_match("/^reject_/", $k)) {
$exclude[$v] = $v;
}