mirror of
https://github.com/torrentpier/torrentpier
synced 2025-08-21 13:54:02 -07:00
Merge pull request #211 from Exile37/feature/deprecated_each
Deprecated each() function in php 7.2
This commit is contained in:
Yuriy Pikhtarev
GitHub
commit
74ab0dca58
15 changed files with 49 additions and 45 deletions
|
|
@ -158,10 +158,10 @@ if (empty($forum_id)) {
|
|||
));
|
||||
} else {
|
||||
// Output the authorisation details if an id was specified
|
||||
$forum_name = $forum_rows[0]['forum_name'];
|
||||
$forum_name = reset($forum_rows)['forum_name'];
|
||||
|
||||
@reset($simple_auth_ary);
|
||||
while (list($key, $auth_levels) = each($simple_auth_ary)) {
|
||||
reset($simple_auth_ary);
|
||||
foreach ($simple_auth_ary as $key => $auth_levels) {
|
||||
$matched = 1;
|
||||
for ($k = 0, $kMax = count($auth_levels); $k < $iMax; $k++) {
|
||||
$matched_type = $key;
|
||||
|
|
|
|||
|
|
@ -275,8 +275,8 @@ if (empty($forum_id) && empty($cat_id)) {
|
|||
|
||||
$category_rows = DB()->sql_fetchrowset($result);
|
||||
|
||||
$cat_id = $category_rows[0]['cat_id'];
|
||||
$cat_name = $category_rows[0]['cat_title'];
|
||||
$cat_id = reset($category_rows)['cat_id'];
|
||||
$cat_name = reset($category_rows)['cat_title'];
|
||||
|
||||
$template->assign_block_vars('cat_row', array(
|
||||
'CAT_NAME' => htmlCHR($cat_name),
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ if (isset($_REQUEST['addforum']) || isset($_REQUEST['addcategory'])) {
|
|||
|
||||
if ($mode == 'addforum' && isset($_POST['addforum']) && isset($_POST['forumname']) && is_array($_POST['addforum'])) {
|
||||
$req_cat_id = array_keys($_POST['addforum']);
|
||||
$cat_id = $req_cat_id[0];
|
||||
$cat_id = reset($req_cat_id);
|
||||
$forumname = stripslashes($_POST['forumname'][$cat_id]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ if (isset($_POST['mode']) || isset($_GET['mode'])) {
|
|||
}
|
||||
|
||||
$delimeter = '=+:';
|
||||
$smiley_paks = [];
|
||||
|
||||
// Read a listing of uploaded smilies for use in the add or edit smliey code
|
||||
$dir = @opendir(BB_ROOT . $bb_cfg['smilies_path']);
|
||||
|
|
@ -127,7 +128,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) {
|
|||
} else {
|
||||
// Display the script to get the smile_pak cfg file
|
||||
$smile_paks_select = '<select name="smile_pak"><option value="">' . $lang['SELECT_PAK'] . '</option>';
|
||||
while (list($key, $value) = @each($smiley_paks)) {
|
||||
foreach ($smiley_paks as $key => $value) {
|
||||
if (!empty($value)) {
|
||||
$smile_paks_select .= '<option>' . $value . '</option>';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') {
|
|||
|
||||
ksort($module);
|
||||
|
||||
while (list($cat, $action_array) = each($module)) {
|
||||
foreach ($module as $cat => $action_array) {
|
||||
$cat = (!empty($lang[$cat])) ? $lang[$cat] : preg_replace('/_/', ' ', $cat);
|
||||
|
||||
$template->assign_block_vars('catrow', array(
|
||||
|
|
@ -58,7 +58,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') {
|
|||
ksort($action_array);
|
||||
|
||||
$row_count = 0;
|
||||
while (list($action, $file) = each($action_array)) {
|
||||
foreach ($action_array as $action => $file) {
|
||||
$row_class = !($row_count % 2) ? 'row1' : 'row2';
|
||||
|
||||
$action = (!empty($lang[$action])) ? $lang[$action] : preg_replace('/_/', ' ', $action);
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@ function get_var($var_name, $default, $multibyte = false)
|
|||
$type = gettype($default);
|
||||
$key_type = null;
|
||||
} else {
|
||||
list($key_type, $type) = each($default);
|
||||
list($key_type, $type) = $default;
|
||||
$type = gettype($type);
|
||||
$key_type = gettype($key_type);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ function generate_smilies($mode)
|
|||
$row = 0;
|
||||
$col = 0;
|
||||
|
||||
while (list($smile_url, $data) = @each($rowset)) {
|
||||
foreach ($rowset as $smile_url => $data) {
|
||||
if (!$col) {
|
||||
$template->assign_block_vars('smilies_row', array());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1028,13 +1028,13 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false)
|
|||
if (!is_array($default)) {
|
||||
$type = gettype($default);
|
||||
} else {
|
||||
list($key_type, $type) = each($default);
|
||||
list($key_type, $type) = $default;
|
||||
$type = gettype($type);
|
||||
$key_type = gettype($key_type);
|
||||
if ($type == 'array') {
|
||||
reset($default);
|
||||
$default = current($default);
|
||||
list($sub_key_type, $sub_type) = each($default);
|
||||
list($sub_key_type, $sub_type) = $default;
|
||||
$sub_type = gettype($sub_type);
|
||||
$sub_type = ($sub_type == 'array') ? 'NULL' : $sub_type;
|
||||
$sub_key_type = gettype($sub_key_type);
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ function tz_select($default, $select_name = 'timezone')
|
|||
}
|
||||
$tz_select = '<select name="' . $select_name . '">';
|
||||
|
||||
while (list($offset, $zone) = @each($lang['TZ'])) {
|
||||
foreach ($lang['TZ'] as $offset => $zone) {
|
||||
$selected = ($offset == $default) ? ' selected="selected"' : '';
|
||||
$tz_select .= '<option value="' . $offset . '"' . $selected . '>' . $zone . '</option>';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ function smtpmail($mail_to, $subject, $message, $headers = '')
|
|||
@reset($header_array);
|
||||
|
||||
$headers = $cc = $bcc = '';
|
||||
while (list(, $header) = each($header_array)) {
|
||||
foreach ($header_array as $header) {
|
||||
if (preg_match('#^cc:#si', $header)) {
|
||||
$cc = preg_replace('#^cc:(.*)#si', '\1', $header);
|
||||
} elseif (preg_match('#^bcc:#si', $header)) {
|
||||
|
|
@ -134,24 +134,27 @@ function smtpmail($mail_to, $subject, $message, $headers = '')
|
|||
server_parse($socket, "250", __LINE__);
|
||||
}
|
||||
|
||||
// Ok now do the CC and BCC fields...
|
||||
@reset($bcc);
|
||||
while (list(, $bcc_address) = each($bcc)) {
|
||||
// Add an additional bit of error checking to bcc header...
|
||||
$bcc_address = trim($bcc_address);
|
||||
if (preg_match('#[^ ]+\@[^ ]+#', $bcc_address)) {
|
||||
fwrite($socket, "RCPT TO: <$bcc_address>\r\n");
|
||||
server_parse($socket, "250", __LINE__);
|
||||
if (!empty($bcc)) {
|
||||
reset($bcc);
|
||||
foreach ($bcc as $bcc_address) {
|
||||
// Add an additional bit of error checking to bcc header...
|
||||
$bcc_address = trim($bcc_address);
|
||||
if (preg_match('#[^ ]+\@[^ ]+#', $bcc_address)) {
|
||||
fwrite($socket, "RCPT TO: <$bcc_address>\r\n");
|
||||
server_parse($socket, "250", __LINE__);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@reset($cc);
|
||||
while (list(, $cc_address) = each($cc)) {
|
||||
// Add an additional bit of error checking to cc header
|
||||
$cc_address = trim($cc_address);
|
||||
if (preg_match('#[^ ]+\@[^ ]+#', $cc_address)) {
|
||||
fwrite($socket, "RCPT TO: <$cc_address>\r\n");
|
||||
server_parse($socket, "250", __LINE__);
|
||||
if (!empty($cc)) {
|
||||
reset($cc);
|
||||
foreach ($cc as $cc_address) {
|
||||
// Add an additional bit of error checking to cc header
|
||||
$cc_address = trim($cc_address);
|
||||
if (preg_match('#[^ ]+\@[^ ]+#', $cc_address)) {
|
||||
fwrite($socket, "RCPT TO: <$cc_address>\r\n");
|
||||
server_parse($socket, "250", __LINE__);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ if ($by_letter_req) {
|
|||
} elseif ($by_letter_req === 'others') {
|
||||
$by_letter = 'others';
|
||||
$letter_sql = "username REGEXP '^[!-@\\[-`].*$'";
|
||||
} elseif ($letter_req = preg_replace("#[^$letters_range]#ui", '', iconv('windows-1251', 'UTF-8', $by_letter_req[0]))) {
|
||||
} elseif ($letter_req = preg_replace("#[^$letters_range]#ui", '', iconv('windows-1251', 'UTF-8', reset($by_letter_req)))) {
|
||||
$by_letter = DB()->escape($letter_req);
|
||||
$letter_sql = "LOWER(username) LIKE '$by_letter%'";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ function return_msg_mcp($status_msg)
|
|||
global $topic_id, $req_topics, $forum_id, $lang, $mode;
|
||||
|
||||
if (count($req_topics) == 1) {
|
||||
$topic_id = $req_topics[0];
|
||||
$topic_id = reset($req_topics);
|
||||
}
|
||||
|
||||
$message = $status_msg;
|
||||
|
|
|
|||
20
privmsg.php
20
privmsg.php
|
|
@ -545,14 +545,14 @@ if ($mode == 'read') {
|
|||
} while ($row = DB()->sql_fetchrow($result));
|
||||
|
||||
if (count($update_users)) {
|
||||
while (list($type, $users) = each($update_users)) {
|
||||
while (list($user_id, $dec) = each($users)) {
|
||||
foreach ($update_users as $type => $users) {
|
||||
foreach ($users as $user_id => $dec) {
|
||||
$update_list[$type][$dec][] = $user_id;
|
||||
}
|
||||
}
|
||||
unset($update_users);
|
||||
|
||||
while (list($type, $dec_ary) = each($update_list)) {
|
||||
foreach ($update_list as $type => $dec_ary) {
|
||||
switch ($type) {
|
||||
case 'new':
|
||||
$type = "user_new_privmsg";
|
||||
|
|
@ -563,7 +563,7 @@ if ($mode == 'read') {
|
|||
break;
|
||||
}
|
||||
|
||||
while (list($dec, $user_ary) = each($dec_ary)) {
|
||||
foreach ($dec_ary as $dec => $user_ary) {
|
||||
$user_ids = implode(', ', $user_ary);
|
||||
|
||||
$sql = "UPDATE " . BB_USERS . "
|
||||
|
|
@ -698,24 +698,24 @@ if ($mode == 'read') {
|
|||
do {
|
||||
switch ($row['privmsgs_type']) {
|
||||
case PRIVMSGS_NEW_MAIL:
|
||||
@$update_users['new'][$row['privmsgs_to_userid']]++;
|
||||
$update_users['new'][$row['privmsgs_to_userid']]++;
|
||||
break;
|
||||
|
||||
case PRIVMSGS_UNREAD_MAIL:
|
||||
@$update_users['unread'][$row['privmsgs_to_userid']]++;
|
||||
$update_users['unread'][$row['privmsgs_to_userid']]++;
|
||||
break;
|
||||
}
|
||||
} while ($row = DB()->sql_fetchrow($result));
|
||||
|
||||
if (count($update_users)) {
|
||||
while (list($type, $users) = each($update_users)) {
|
||||
while (list($user_id, $dec) = each($users)) {
|
||||
foreach ($update_users as $type => $users) {
|
||||
foreach ($users as $user_id => $dec) {
|
||||
$update_list[$type][$dec][] = $user_id;
|
||||
}
|
||||
}
|
||||
unset($update_users);
|
||||
|
||||
while (list($type, $dec_ary) = each($update_list)) {
|
||||
foreach ($update_list as $type => $dec_ary) {
|
||||
switch ($type) {
|
||||
case 'new':
|
||||
$type = "user_new_privmsg";
|
||||
|
|
@ -726,7 +726,7 @@ if ($mode == 'read') {
|
|||
break;
|
||||
}
|
||||
|
||||
while (list($dec, $user_ary) = each($dec_ary)) {
|
||||
foreach ($dec_ary as $dec => $user_ary) {
|
||||
$user_ids = implode(', ', $user_ary);
|
||||
|
||||
$sql = "UPDATE " . BB_USERS . " SET $type = $type - $dec WHERE user_id IN ($user_ids)";
|
||||
|
|
|
|||
|
|
@ -592,7 +592,7 @@ if ($post_mode) {
|
|||
|
||||
foreach ($sorted_rows as $topic_id => $topic_posts) {
|
||||
// Topic title block
|
||||
$first_post = $topic_posts[0];
|
||||
$first_post = reset($topic_posts);
|
||||
$topic_id = (int)$topic_id;
|
||||
$forum_id = (int)$first_post['forum_id'];
|
||||
$is_unread_t = is_unread($first_post['topic_last_post_time'], $topic_id, $forum_id);
|
||||
|
|
|
|||
|
|
@ -661,7 +661,7 @@ for ($i = 0; $i < $total_posts; $i++) {
|
|||
'\"', '"',
|
||||
substr(
|
||||
preg_replace_callback('#(\>(((?>([^><]+|(?R)))*)\<))#s', function ($matches) use ($orig_word, $replacement_word) {
|
||||
return preg_replace($orig_word, $replacement_word, $matches[0]);
|
||||
return preg_replace($orig_word, $replacement_word, reset($matches));
|
||||
}, '>' . $user_sig . '<'), 1, -1
|
||||
)
|
||||
);
|
||||
|
|
@ -671,7 +671,7 @@ for ($i = 0; $i < $total_posts; $i++) {
|
|||
'\"', '"',
|
||||
substr(
|
||||
preg_replace_callback('#(\>(((?>([^><]+|(?R)))*)\<))#s', function ($matches) use ($orig_word, $replacement_word) {
|
||||
return preg_replace($orig_word, $replacement_word, $matches[0]);
|
||||
return preg_replace($orig_word, $replacement_word, reset($matches));
|
||||
}, '>' . $message . '<'), 1, -1
|
||||
)
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue