bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-13 00:57:03 +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

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);