mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 11:36:08 +02:00
Code Issues Releases Wiki Activity

Issue #2846 LAN vars cleanup

Browse Source
This commit is contained in:
Cameron
2017-11-06 13:48:08 -08:00
parent 6b05ae7dd4
commit 70df3a3ae6
24 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/admin_log.php
View File

@@ -351,7 +351,7 @@ class admin_log_ui extends e_admin_ui
if($del_count = $sql->delete($db_table, $qry))
{
// Add in a log event
$message = $db_name.str_replace(array('--OLD--', '--NUM--'), array($old_string, $del_count), RL_LAN_057);
$message = $db_name.str_replace(array('[x]', '[y]'), array($old_string, $del_count), RL_LAN_057);
$mes->addSuccess($message);
$log->log_event($db_msg, "db_Delete - earlier than {$old_string} (past {$back_count} days)[!br!]".$message.'[!br!]'.$db_table.' '.$qry, E_LOG_INFORMATIVE, '');
}
@@ -1008,7 +1008,7 @@ if(($action == "backdel") && isset($_POST['backdeltype']))
if($del_count = $sql->db_Delete($db_table, $qry))
{
// Add in a log event
$message = $db_name.str_replace(array('--OLD--', '--NUM--'), array($old_string, $del_count), RL_LAN_057);
$message = $db_name.str_replace(array('[x]', '[y]'), array($old_string, $del_count), RL_LAN_057);
$mes->addSuccess($message);
e107::getLog()->add($db_msg, "db_Delete - earlier than {$old_string} (past {$qs[2]} days)[!br!]".$message.'[!br!]'.$db_table.' '.$qry, E_LOG_INFORMATIVE, '');
}

2
e107_admin/administrator.php
View File

@@ -93,7 +93,7 @@ if (isset($_POST['del_admin']) && count($_POST['del_admin']))
}
$mes->addAuto($sql -> db_Update("user", "user_admin=0, user_perms='' WHERE user_id= ".$aID), 'update', ADMSLAN_61, LAN_DELETED_FAILED, false);
$logMsg = str_replace(array('--ID--', '--NAME--'),array($aID, $row['user_name']),ADMSLAN_73);
$logMsg = str_replace(array('[x]', '[y]'),array($aID, $row['user_name']),ADMSLAN_73);
e107::getLog()->add('ADMIN_02',$logMsg,E_LOG_INFORMATIVE,'');
}

8
e107_admin/banlist.php
View File

@@ -1011,7 +1011,7 @@ switch ($action)
if (count($banLogEntries))
{
$text .= "   ".str_replace('--NUM--', $num_entry, BANLAN_87);
$text .= "   ".str_replace('[y]', $num_entry, BANLAN_87);
}
echo $text;
@@ -1037,7 +1037,7 @@ switch ($action)
{
$result = $sql->db_Delete('banlist',"`banlist_bantype` < ".eIPHandler::BAN_TYPE_WHITELIST." AND `banlist_banexpires` > 0 AND `banlist_banexpires` < ".time());
banlist_adminlog('12', $result);
$mes->addSuccess(str_replace('--NUM--', $result, BANLAN_48));
$mes->addSuccess(str_replace('[y]', $result, BANLAN_48));
}
list($ban_access_guest, $ban_access_member) = explode(',', varset($pref['ban_max_online_access'], '100,200'));
@@ -1657,8 +1657,8 @@ function process_csv($filename, $override_imports, $override_expiry, $separator
if ($override_imports)
$sql->db_Delete('banlist', "`banlist_bantype` = ".eIPHandler::BAN_TYPE_TEMPORARY);
@unlink($filename); // Delete file once done
$mes->addSuccess(str_replace('--NUM--', $line_num, BANLAN_51).$filename);
return str_replace('--NUM--', $line_num, BANLAN_51).$filename;
$mes->addSuccess(str_replace('[y]', $line_num, BANLAN_51).$filename);
return str_replace('[y]', $line_num, BANLAN_51).$filename;
}

36
e107_admin/mailout.php
View File

@@ -754,7 +754,7 @@ class mailout_main_ui extends e_admin_ui
}
else
{
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_188);
$errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_188);
}
}
@@ -764,11 +764,11 @@ class mailout_main_ui extends e_admin_ui
{
if ($this->mailAdmin->activateEmail($mailId, TRUE))
{
e107::getMessage()->addSuccess(str_replace('--ID--', $mailId, LAN_MAILOUT_187));
e107::getMessage()->addSuccess(str_replace('[x]', $mailId, LAN_MAILOUT_187));
}
else
{
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_166);
$errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_166);
}
}
@@ -778,11 +778,11 @@ class mailout_main_ui extends e_admin_ui
{
if ($this->mailAdmin->cancelEmail($mailId))
{
e107::getMessage()->addSuccess(str_replace('--ID--', $mailId, LAN_MAILOUT_220));
e107::getMessage()->addSuccess(str_replace('[x]', $mailId, LAN_MAILOUT_220));
}
else
{
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_221);
$errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_221);
}
}
@@ -2134,11 +2134,11 @@ switch ($action)
$action = 'held';
if ($mailAdmin->holdEmail($mailId))
{
$mes->addSuccess(str_replace('--ID--', $mailId, LAN_MAILOUT_229));
$mes->addSuccess(str_replace('[x]', $mailId, LAN_MAILOUT_229));
}
else
{
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_230);
$errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_230);
}
break;
@@ -2146,11 +2146,11 @@ switch ($action)
$action = $pageMode; // Want to return to some other page
if ($mailAdmin->cancelEmail($mailId))
{
$mes->addSuccess(str_replace('--ID--', $mailId, LAN_MAILOUT_220));
$mes->addSuccess(str_replace('[x]', $mailId, LAN_MAILOUT_220));
}
else
{
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_221);
$errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_221);
}
break;
@@ -2168,11 +2168,11 @@ switch ($action)
{
if ($mailAdmin->activateEmail($mailId, TRUE))
{
$mes->addSuccess(str_replace('--ID--', $mailId, LAN_MAILOUT_187));
$mes->addSuccess(str_replace('[x]', $mailId, LAN_MAILOUT_187));
}
else
{
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_166);
$errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_166);
}
$action = 'held';
}
@@ -2200,7 +2200,7 @@ switch ($action)
$midAction = 'midDeleteEmail';
if (!isset($_POST['mailIDConf']) || (intval($_POST['mailIDConf']) != $mailId))
{
$errors[] = str_replace(array('--ID--', '--CHECK--'), array($mailId, intval($_POST['mailIDConf'])), LAN_MAILOUT_174);
$errors[] = str_replace(array('[x]', '[z]'), array($mailId, intval($_POST['mailIDConf'])), LAN_MAILOUT_174);
break;
}
break;
@@ -2265,7 +2265,7 @@ switch ($midAction)
e107::getLog()->add('MAIL_04','ID: '.$mailId,E_LOG_INFORMATIVE,'');
if (($result === FALSE) || !is_array($result))
{
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_166);
$errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_166);
}
else
{
@@ -2273,22 +2273,22 @@ switch ($midAction)
{
if ($result['content'] === FALSE)
{
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_167);
$errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_167);
}
else
{
$mes->addSuccess(str_replace('--ID--', $mailId, LAN_MAILOUT_167));
$mes->addSuccess(str_replace('[x]', $mailId, LAN_MAILOUT_167));
}
}
if (isset($result['recipients']))
{
if ($result['recipients'] === FALSE)
{
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_169);
$errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_169);
}
else
{
$mes->addSuccess(str_replace(array('--ID--', '--NUM--'), array($mailId, $result['recipients']), LAN_MAILOUT_170));
$mes->addSuccess(str_replace(array('[x]', '[y]'), array($mailId, $result['recipients']), LAN_MAILOUT_170));
}
}
}
@@ -2313,7 +2313,7 @@ switch ($midAction)
}
else
{
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_188);
$errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_188);
}
break;
}

4
e107_admin/update_routines.php
View File

@@ -1277,7 +1277,7 @@ function update_706_to_800($type='')
$s_prefs = $eArrayStorage -> WriteArray($s_prefs);
// Could we use $sysprefs->set($s_prefs,'notify_prefs') instead - avoids caching problems ????
$status = ($sql -> update("core", "e107_value='".$s_prefs."' WHERE e107_name='notify_prefs'") !== FALSE) ? E_MESSAGE_DEBUG : E_MESSAGE_ERROR;
$message = str_replace('--COUNT--',$nt_changed,LAN_UPDATE_20);
$message = str_replace('[x]',$nt_changed,LAN_UPDATE_20);
$log->logMessage($message, $status);
}
@@ -1320,7 +1320,7 @@ function update_706_to_800($type='')
$i++;
}
unset($mailHandler);
$log->logMessage(str_replace('--COUNT--', $i, LAN_UPDATE_28));
$log->logMessage(str_replace('[x]', $i, LAN_UPDATE_28));
}

2
e107_admin/users.php
View File

@@ -2360,7 +2360,7 @@ class users_admin_ui extends e_admin_ui
// $sql->db_Delete("user","user_id='{$u['user_id']}' ");
// $sql->db_Delete("user_extended","user_extended_id='{$u['user_id']}' ");
// }
// e107::getLog()->add('USET_04',str_replace(array('--COUNT--','--TYPE--'),array(count($uList),$bantype),USRLAN_160),E_LOG_INFORMATIVE);
// e107::getLog()->add('USET_04',str_replace(array('[x]','--TYPE--'),array(count($uList),$bantype),USRLAN_160),E_LOG_INFORMATIVE);
// }
// $ns->tablerender(USRLAN_57,"<div style='text-align:center'><b>".$text."</b></div>");
// unset ($text);