mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +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)) if($del_count = $sql->delete($db_table, $qry))
{ {
// Add in a log event // 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); $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, ''); $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)) if($del_count = $sql->db_Delete($db_table, $qry))
{ {
// Add in a log event // 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); $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, ''); 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); $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,''); 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)) if (count($banLogEntries))
{ {
$text .= "   ".str_replace('--NUM--', $num_entry, BANLAN_87); $text .= "   ".str_replace('[y]', $num_entry, BANLAN_87);
} }
echo $text; 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()); $result = $sql->db_Delete('banlist',"`banlist_bantype` < ".eIPHandler::BAN_TYPE_WHITELIST." AND `banlist_banexpires` > 0 AND `banlist_banexpires` < ".time());
banlist_adminlog('12', $result); 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')); 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) if ($override_imports)
$sql->db_Delete('banlist', "`banlist_bantype` = ".eIPHandler::BAN_TYPE_TEMPORARY); $sql->db_Delete('banlist', "`banlist_bantype` = ".eIPHandler::BAN_TYPE_TEMPORARY);
@unlink($filename); // Delete file once done @unlink($filename); // Delete file once done
$mes->addSuccess(str_replace('--NUM--', $line_num, BANLAN_51).$filename); $mes->addSuccess(str_replace('[y]', $line_num, BANLAN_51).$filename);
return str_replace('--NUM--', $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 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)) 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 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)) 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 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'; $action = 'held';
if ($mailAdmin->holdEmail($mailId)) if ($mailAdmin->holdEmail($mailId))
{ {
$mes->addSuccess(str_replace('--ID--', $mailId, LAN_MAILOUT_229)); $mes->addSuccess(str_replace('[x]', $mailId, LAN_MAILOUT_229));
} }
else else
{ {
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_230); $errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_230);
} }
break; break;
@@ -2146,11 +2146,11 @@ switch ($action)
$action = $pageMode; // Want to return to some other page $action = $pageMode; // Want to return to some other page
if ($mailAdmin->cancelEmail($mailId)) if ($mailAdmin->cancelEmail($mailId))
{ {
$mes->addSuccess(str_replace('--ID--', $mailId, LAN_MAILOUT_220)); $mes->addSuccess(str_replace('[x]', $mailId, LAN_MAILOUT_220));
} }
else else
{ {
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_221); $errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_221);
} }
break; break;
@@ -2168,11 +2168,11 @@ switch ($action)
{ {
if ($mailAdmin->activateEmail($mailId, TRUE)) if ($mailAdmin->activateEmail($mailId, TRUE))
{ {
$mes->addSuccess(str_replace('--ID--', $mailId, LAN_MAILOUT_187)); $mes->addSuccess(str_replace('[x]', $mailId, LAN_MAILOUT_187));
} }
else else
{ {
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_166); $errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_166);
} }
$action = 'held'; $action = 'held';
} }
@@ -2200,7 +2200,7 @@ switch ($action)
$midAction = 'midDeleteEmail'; $midAction = 'midDeleteEmail';
if (!isset($_POST['mailIDConf']) || (intval($_POST['mailIDConf']) != $mailId)) 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;
} }
break; break;
@@ -2265,7 +2265,7 @@ switch ($midAction)
e107::getLog()->add('MAIL_04','ID: '.$mailId,E_LOG_INFORMATIVE,''); e107::getLog()->add('MAIL_04','ID: '.$mailId,E_LOG_INFORMATIVE,'');
if (($result === FALSE) || !is_array($result)) if (($result === FALSE) || !is_array($result))
{ {
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_166); $errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_166);
} }
else else
{ {
@@ -2273,22 +2273,22 @@ switch ($midAction)
{ {
if ($result['content'] === FALSE) if ($result['content'] === FALSE)
{ {
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_167); $errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_167);
} }
else else
{ {
$mes->addSuccess(str_replace('--ID--', $mailId, LAN_MAILOUT_167)); $mes->addSuccess(str_replace('[x]', $mailId, LAN_MAILOUT_167));
} }
} }
if (isset($result['recipients'])) if (isset($result['recipients']))
{ {
if ($result['recipients'] === FALSE) if ($result['recipients'] === FALSE)
{ {
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_169); $errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_169);
} }
else 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 else
{ {
$errors[] = str_replace('--ID--', $mailId, LAN_MAILOUT_188); $errors[] = str_replace('[x]', $mailId, LAN_MAILOUT_188);
} }
break; 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); $s_prefs = $eArrayStorage -> WriteArray($s_prefs);
// Could we use $sysprefs->set($s_prefs,'notify_prefs') instead - avoids caching problems ???? // 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; $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); $log->logMessage($message, $status);
} }
@@ -1320,7 +1320,7 @@ function update_706_to_800($type='')
$i++; $i++;
} }
unset($mailHandler); 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","user_id='{$u['user_id']}' ");
// $sql->db_Delete("user_extended","user_extended_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>"); // $ns->tablerender(USRLAN_57,"<div style='text-align:center'><b>".$text."</b></div>");
// unset ($text); // unset ($text);

12
e107_handlers/mailout_admin_class.php
View File

@@ -1871,7 +1871,7 @@ class mailoutAdminClass extends e107MailManager
{ {
if($res) if($res)
$results[] = str_replace(array( $results[] = str_replace(array(
'--COUNT--', '[x]',
'--TABLE--' '--TABLE--'
), array( ), array(
$res, $res,
@@ -1887,7 +1887,7 @@ class mailoutAdminClass extends e107MailManager
{ {
if($res) if($res)
$results[] = str_replace(array( $results[] = str_replace(array(
'--COUNT--', '[x]',
'--TABLE--' '--TABLE--'
), array( ), array(
$res, $res,
@@ -1906,7 +1906,7 @@ class mailoutAdminClass extends e107MailManager
elseif($res) elseif($res)
{ {
if($res) if($res)
$results[] = str_replace('--COUNT--', $res, LAN_MAILOUT_226); $results[] = str_replace('[x]', $res, LAN_MAILOUT_226);
} }
// Scan content table for anomalies, out of time records // Scan content table for anomalies, out of time records
@@ -1938,8 +1938,8 @@ class mailoutAdminClass extends e107MailManager
} }
if(count($items)) if(count($items))
$results[] = str_replace(array( $results[] = str_replace(array(
'--COUNT--', '[x]',
'--RECORDS--' '[y]'
), array( ), array(
count($items), count($items),
implode(', ', $items) implode(', ', $items)
@@ -2047,7 +2047,7 @@ class mailoutAdminClass extends e107MailManager
} }
} }
if($changeCount) if($changeCount)
$results[] = str_replace('--COUNT--', $changeCount, LAN_MAILOUT_237); $results[] = str_replace('[x]', $changeCount, LAN_MAILOUT_237);
} }
e107::getLog()->add('MAIL_05', implode('[!br!]', $results), E_LOG_INFORMATIVE, ''); e107::getLog()->add('MAIL_05', implode('[!br!]', $results), E_LOG_INFORMATIVE, '');

2
e107_handlers/user_handler.php
View File

@@ -1994,7 +1994,7 @@ class e_userperms
} }
e107::getMessage()->addAuto($sysuser->set('user_perms', $perm)->save(), 'update', sprintf(LAN_UPDATED, $tp->toDB($_POST['ad_name'])), false, false); e107::getMessage()->addAuto($sysuser->set('user_perms', $perm)->save(), 'update', sprintf(LAN_UPDATED, $tp->toDB($_POST['ad_name'])), false, false);
$logMsg = str_replace(array('--ID--', '--NAME--'),array($modID, $a_name),ADMSLAN_72).$perm; $logMsg = str_replace(array('[x]', '[y]'),array($modID, $a_name),ADMSLAN_72).$perm;
e107::getLog()->add('ADMIN_01',$logMsg,E_LOG_INFORMATIVE,''); e107::getLog()->add('ADMIN_01',$logMsg,E_LOG_INFORMATIVE,'');
} }

2
e107_languages/English/admin/lan_admin_log.php
View File

@@ -52,7 +52,7 @@ define("RL_LAN_053", "User Audit Log");
define("RL_LAN_054", "Nothing to delete, or database error"); define("RL_LAN_054", "Nothing to delete, or database error");
// define("RL_LAN_055", "Cancel"); // define("RL_LAN_055", "Cancel");
//define("RL_LAN_056", "Nothing deleted"); //define("RL_LAN_056", "Nothing deleted");
define("RL_LAN_057", " - events older than --OLD-- (--NUM-- entries) deleted"); define("RL_LAN_057", " - events older than [x] ([y] entries) deleted");
define("RL_LAN_058", "Priority Filter:"); define("RL_LAN_058", "Priority Filter:");
define("RL_LAN_059", "Caller Filter:"); define("RL_LAN_059", "Caller Filter:");
define("RL_LAN_060", "IP Address Filter:"); define("RL_LAN_060", "IP Address Filter:");

4
e107_languages/English/admin/lan_administrator.php
View File

@@ -76,8 +76,8 @@ define("ADMSLAN_62", "Plugin Manager");
// define("ADMSLAN_70", "Return to Administrator Listing"); // define("ADMSLAN_70", "Return to Administrator Listing");
define("ADMSLAN_71", "Click here to display privileges"); define("ADMSLAN_71", "Click here to display privileges");
define("ADMSLAN_72", "Admin ID: --ID-- name: --NAME-- new permissions: "); define("ADMSLAN_72", "Admin ID: [x] name: [y] new permissions: ");
define("ADMSLAN_73", "Admin ID: --ID-- name: --NAME--"); define("ADMSLAN_73", "Admin ID: [x] name: [y]");
// define("ADMSLAN_75", ""); // define("ADMSLAN_75", "");
//define("ADMSLAN_76", "Manage language-packs");//ADLAN_132 //define("ADMSLAN_76", "Manage language-packs");//ADLAN_132

6
e107_languages/English/admin/lan_banlist.php
View File

@@ -52,10 +52,10 @@ define("BANLAN_44", "Use expiry date/time from import");
define("BANLAN_45", "Import"); define("BANLAN_45", "Import");
define("BANLAN_46", "Import File:"); define("BANLAN_46", "Import File:");
define("BANLAN_47", "File upload error"); define("BANLAN_47", "File upload error");
define("BANLAN_48", "Deleted --NUM-- expired ban list entries"); define("BANLAN_48", "Deleted [y] expired ban list entries");
define("BANLAN_49", "CSV import: Unbalanced quotes in line "); define("BANLAN_49", "CSV import: Unbalanced quotes in line ");
define("BANLAN_50", "CSV import: Error writing banlist record at line "); define("BANLAN_50", "CSV import: Error writing banlist record at line ");
define("BANLAN_51", "CSV import: Success, --NUM-- lines imported from file "); define("BANLAN_51", "CSV import: Success, [y] lines imported from file ");
define("BANLAN_52", "Whitelist"); define("BANLAN_52", "Whitelist");
define("BANLAN_53", "Add to Whitelist"); define("BANLAN_53", "Add to Whitelist");
define("BANLAN_54", "No entries in whitelist"); define("BANLAN_54", "No entries in whitelist");
@@ -91,7 +91,7 @@ define("BANLAN_83", "Date/Time");
define("BANLAN_84", "IP Address"); define("BANLAN_84", "IP Address");
define("BANLAN_85", "Additional information"); define("BANLAN_85", "Additional information");
define("BANLAN_86", "Ban-related events"); define("BANLAN_86", "Ban-related events");
define("BANLAN_87", "Total --NUM-- entries in list"); define("BANLAN_87", "Total [y] entries in list");
define("BANLAN_88", "Empty Ban Action Log"); define("BANLAN_88", "Empty Ban Action Log");
define("BANLAN_89", "Log File Deleted"); define("BANLAN_89", "Log File Deleted");
define("BANLAN_90", "Error deleting log file"); define("BANLAN_90", "Error deleting log file");

2
e107_languages/English/admin/lan_e107_update.php
View File

@@ -28,7 +28,7 @@ define("LAN_UPDATE_24", "Deleting Deprecated Table Field: ");
define("LAN_UPDATE_25", "Deleting obsolete table: "); define("LAN_UPDATE_25", "Deleting obsolete table: ");
define("LAN_UPDATE_26", "Extending IP address field: "); define("LAN_UPDATE_26", "Extending IP address field: ");
define("LAN_UPDATE_27", "Adding Table: "); define("LAN_UPDATE_27", "Adding Table: ");
define("LAN_UPDATE_28", "--COUNT-- saved emails moved"); define("LAN_UPDATE_28", "[x] saved emails moved");
define("LAN_UPDATE_29", "Depending on your particular configuration, you may need to run the upgrade process several times."); define("LAN_UPDATE_29", "Depending on your particular configuration, you may need to run the upgrade process several times.");
// Everything below here needs reviewing. // Everything below here needs reviewing.

36
e107_languages/English/admin/lan_mailout.php
View File

@@ -178,15 +178,15 @@ define("LAN_MAILOUT_162", "IMPORTANT! You need to make this file executable");
define("LAN_MAILOUT_163", "Edit/Send Mail"); define("LAN_MAILOUT_163", "Edit/Send Mail");
define("LAN_MAILOUT_164", "Email information not found"); define("LAN_MAILOUT_164", "Email information not found");
define("LAN_MAILOUT_165", "Confirm delete the following stored email, including any recipient records"); define("LAN_MAILOUT_165", "Confirm delete the following stored email, including any recipient records");
define("LAN_MAILOUT_166", "General error deleting mail ref: --ID--"); define("LAN_MAILOUT_166", "General error deleting mail ref: [x]");
define("LAN_MAILOUT_167", "Error deleting mail content ref: --ID--"); define("LAN_MAILOUT_167", "Error deleting mail content ref: [x]");
define("LAN_MAILOUT_168", "Mail content deleted ref: --ID--"); define("LAN_MAILOUT_168", "Mail content deleted ref: [x]");
define("LAN_MAILOUT_169", "Error deleting mail recipients ref: --ID--"); define("LAN_MAILOUT_169", "Error deleting mail recipients ref: [x]");
define("LAN_MAILOUT_170", "Deleted --NUM-- recipients for mail ref: --ID--"); define("LAN_MAILOUT_170", "Deleted [y] recipients for mail ref: [x]");
define("LAN_MAILOUT_171", "Confirm email delete"); define("LAN_MAILOUT_171", "Confirm email delete");
define("LAN_MAILOUT_172", "Mail Type/Status"); define("LAN_MAILOUT_172", "Mail Type/Status");
define("LAN_MAILOUT_173", "Recipients"); define("LAN_MAILOUT_173", "Recipients");
define("LAN_MAILOUT_174", "Security check fail: --ID-- --CHECK--"); define("LAN_MAILOUT_174", "Security check fail: [x] [z]");
define("LAN_MAILOUT_175", "Before"); define("LAN_MAILOUT_175", "Before");
define("LAN_MAILOUT_176", "Equal to"); define("LAN_MAILOUT_176", "Equal to");
define("LAN_MAILOUT_177", "After"); define("LAN_MAILOUT_177", "After");
@@ -198,9 +198,9 @@ define("LAN_MAILOUT_182", "Tidy database tables");
define("LAN_MAILOUT_183", "Error tidying database"); define("LAN_MAILOUT_183", "Error tidying database");
define("LAN_MAILOUT_184", "Database tidied"); define("LAN_MAILOUT_184", "Database tidied");
define("LAN_MAILOUT_185", "Emails added to send queue"); define("LAN_MAILOUT_185", "Emails added to send queue");
define("LAN_MAILOUT_186", "General error putting mail ref: --ID-- on hold"); define("LAN_MAILOUT_186", "General error putting mail ref: [x] on hold");
define("LAN_MAILOUT_187", "Email --ID-- put on hold"); define("LAN_MAILOUT_187", "Email [x] put on hold");
define("LAN_MAILOUT_188", "General error sending mail ref: --ID--"); define("LAN_MAILOUT_188", "General error sending mail ref: [x]");
define("LAN_MAILOUT_189", "Test address"); define("LAN_MAILOUT_189", "Test address");
// Admin menu text // Admin menu text
@@ -219,7 +219,7 @@ define("LAN_MAILOUT_202", "No text in email body");
define("LAN_MAILOUT_203", "No sender name specified"); define("LAN_MAILOUT_203", "No sender name specified");
define("LAN_MAILOUT_204", "No sender email address specified"); define("LAN_MAILOUT_204", "No sender email address specified");
define("LAN_MAILOUT_205", "Email send format error"); define("LAN_MAILOUT_205", "Email send format error");
define("LAN_MAILOUT_206", "Invalid mail ID (--ID--) specified"); define("LAN_MAILOUT_206", "Invalid mail ID ([x]) specified");
define("LAN_MAILOUT_207", "Template load error"); define("LAN_MAILOUT_207", "Template load error");
define("LAN_MAILOUT_208", "Template conversion error"); define("LAN_MAILOUT_208", "Template conversion error");
@@ -236,24 +236,24 @@ define("LAN_MAILOUT_218", "Cancelled");
define("LAN_MAILOUT_219", "Partial"); define("LAN_MAILOUT_219", "Partial");
// General messages continued // General messages continued
define("LAN_MAILOUT_220", "Email ID --ID-- cancelled"); define("LAN_MAILOUT_220", "Email ID [x] cancelled");
define("LAN_MAILOUT_221", "Error cancelling email with ID --ID--"); define("LAN_MAILOUT_221", "Error cancelling email with ID [x]");
define("LAN_MAILOUT_222", "Default email format"); define("LAN_MAILOUT_222", "Default email format");
define("LAN_MAILOUT_223", "(Used for some system-generated emails)"); define("LAN_MAILOUT_223", "(Used for some system-generated emails)");
define("LAN_MAILOUT_224", "Inc. Images"); define("LAN_MAILOUT_224", "Inc. Images");
define("LAN_MAILOUT_225", "Include images in email"); define("LAN_MAILOUT_225", "Include images in email");
define("LAN_MAILOUT_226", "--COUNT-- orphaned recipient record(s) removed"); define("LAN_MAILOUT_226", "[x] orphaned recipient record(s) removed");
define("LAN_MAILOUT_227", "Deleted --COUNT-- records from --TABLE--"); define("LAN_MAILOUT_227", "Deleted [x] records from --TABLE--");
define("LAN_MAILOUT_228", "--COUNT-- anomalies in mail_content corrected; records: --RECORDS--"); define("LAN_MAILOUT_228", "[x] anomalies in mail_content corrected; records: [y]");
define("LAN_MAILOUT_229", "Email ID --ID-- put on hold"); define("LAN_MAILOUT_229", "Email ID [x] put on hold");
define("LAN_MAILOUT_230", "Error holding email with ID --ID--"); define("LAN_MAILOUT_230", "Error holding email with ID [x]");
define("LAN_MAILOUT_231", "Bounced emails - Processing method"); define("LAN_MAILOUT_231", "Bounced emails - Processing method");
define("LAN_MAILOUT_232", "None"); define("LAN_MAILOUT_232", "None");
define("LAN_MAILOUT_233", "Auto-process script"); define("LAN_MAILOUT_233", "Auto-process script");
define("LAN_MAILOUT_234", "Mail account"); define("LAN_MAILOUT_234", "Mail account");
define("LAN_MAILOUT_235", "(Your server must forward or 'pipe' from the email address above to the script path above.)"); define("LAN_MAILOUT_235", "(Your server must forward or 'pipe' from the email address above to the script path above.)");
define("LAN_MAILOUT_236", "Last Bounce Processed"); define("LAN_MAILOUT_236", "Last Bounce Processed");
define("LAN_MAILOUT_237", "Summary counters updated on --COUNT-- emails"); define("LAN_MAILOUT_237", "Summary counters updated on [x] emails");
define("LAN_MAILOUT_238", "Earliest time to send"); define("LAN_MAILOUT_238", "Earliest time to send");
define("LAN_MAILOUT_239", "Latest time to send"); define("LAN_MAILOUT_239", "Latest time to send");
define("LAN_MAILOUT_240", "Notify me when run complete"); define("LAN_MAILOUT_240", "Notify me when run complete");

4
e107_languages/English/admin/lan_users.php
View File

@@ -159,7 +159,7 @@ define("USRLAN_154", "Clear email for checked");
define("USRLAN_155", "Total {TOTAL} emails found. {DELCOUNT} deleted through options.<br />{DELUSER} users marked as 'bounced' (out of {FOUND} emails)"); define("USRLAN_155", "Total {TOTAL} emails found. {DELCOUNT} deleted through options.<br />{DELUSER} users marked as 'bounced' (out of {FOUND} emails)");
define("USRLAN_156", "Email address is already in use"); define("USRLAN_156", "Email address is already in use");
// define("USRLAN_160", "Total --COUNT-- users of type --TYPE-- pruned"); // define("USRLAN_160", "Total [x] users of type --TYPE-- pruned");
define("USRLAN_161", "User ID [x] name [y] banned"); define("USRLAN_161", "User ID [x] name [y] banned");
define("USRLAN_162", "User ID [x] name [y] unbanned"); define("USRLAN_162", "User ID [x] name [y] unbanned");
// define("USRLAN_163", "User ID --UID-- deleted"); // define("USRLAN_163", "User ID --UID-- deleted");
@@ -169,7 +169,7 @@ define("USRLAN_166", "User ID [x] name [y] approved");
//FIX ME USERLAN_160 - USERLAN_166 need to be reworked avoid duplication. //FIX ME USERLAN_160 - USERLAN_166 need to be reworked avoid duplication.
define("USRLAN_167", "Validation email ID [x] resent to [y] at [z]"); define("USRLAN_167", "Validation email ID [x] resent to [y] at [z]");
// define("USRLAN_168", "Re-send --COUNT-- validation emails"); // define("USRLAN_168", "Re-send [x] validation emails");
define("USRLAN_169", "Total [x] bounced emails deleted"); define("USRLAN_169", "Total [x] bounced emails deleted");
define("USRLAN_170", "Random user name"); define("USRLAN_170", "Random user name");
define("USRLAN_171", "Random password"); define("USRLAN_171", "Random password");

2
e107_languages/English/lan_user.php
View File

@@ -104,7 +104,7 @@ define("LAN_USER_73", "choice of Content/Mail-lists");
define("LAN_USER_74", "Custom Title"); define("LAN_USER_74", "Custom Title");
define("LAN_USER_75", "Your --SOMETHING-- is required"); // Replaces LAN_SIGNUP_6, LAN_SIGNUP_7 combination define("LAN_USER_75", "Your --SOMETHING-- is required"); // Replaces LAN_SIGNUP_6, LAN_SIGNUP_7 combination
define("LAN_USER_76", "Subscribed to"); // LAN_USET_5 define("LAN_USER_76", "Subscribed to"); // LAN_USET_5
define("LAN_USER_77", "Your password must be at least --COUNT-- characters long."); // Replaces LAN_SIGNUP_4, LAN_SIGNUP_5 combination define("LAN_USER_77", "Your password must be at least [x] characters long."); // Replaces LAN_SIGNUP_4, LAN_SIGNUP_5 combination
define("LAN_USER_78", "Min."); // LAN_SIGNUP_1 define("LAN_USER_78", "Min."); // LAN_SIGNUP_1
define("LAN_USER_79", "chars."); // LAN_SIGNUP_2 define("LAN_USER_79", "chars."); // LAN_SIGNUP_2
define("LAN_USER_80", "the name displayed on site"); // LAN_8 define("LAN_USER_80", "the name displayed on site"); // LAN_8

2
e107_languages/English/lan_usersettings.php
View File

@@ -84,7 +84,7 @@ define("LAN_USET_14", "Login name too long. Please choose another");
define("LAN_USET_15", "Display name too long. Please choose another"); define("LAN_USET_15", "Display name too long. Please choose another");
define("LAN_USET_16", "Tick box to delete existing photo without uploading another"); define("LAN_USET_16", "Tick box to delete existing photo without uploading another");
define("LAN_USET_17", "Display name already used. Please choose another"); define("LAN_USET_17", "Display name already used. Please choose another");
define("LAN_USET_18", "User data changed by admin: --ID--, login name: --LOGNAME--"); define("LAN_USET_18", "User data changed by admin: [x], login name: [y]");
//define("LAN_USET_19", "Custom Title"); Now LAN_USER_74 //define("LAN_USET_19", "Custom Title"); Now LAN_USER_74
define("LAN_USET_20", "You must also change the user's password if you are changing their login name or email address"); define("LAN_USET_20", "You must also change the user's password if you are changing their login name or email address");
define("LAN_USET_21", "Please validate the changes by re-entering your password: "); define("LAN_USET_21", "Please validate the changes by re-entering your password: ");

4
e107_plugins/newsletter/admin_config.php
View File

@@ -507,8 +507,8 @@ class newsletter
else else
{ {
$mailer->activateEmail($mailMainID, FALSE); // Actually mark the email for sending $mailer->activateEmail($mailMainID, FALSE); // Actually mark the email for sending
//$this->message = str_replace('--COUNT--', $counters['add'],NLLAN_40); //$this->message = str_replace('[x]', $counters['add'],NLLAN_40);
$mes->addSuccess(str_replace('--COUNT--', $counters['add'], NLLAN_40)); $mes->addSuccess(str_replace('[x]', $counters['add'], NLLAN_40));
} }
$sql->update('newsletter', "newsletter_flag='1' WHERE newsletter_id=".$issue); $sql->update('newsletter', "newsletter_flag='1' WHERE newsletter_id=".$issue);

2
e107_plugins/newsletter/languages/English_admin.php
View File

@@ -51,7 +51,7 @@ define("NLLAN_36", "Update Newsletter Issue");
define("NLLAN_37", "Create Newsletter Issue"); define("NLLAN_37", "Create Newsletter Issue");
//define("NLLAN_38", "Newsletter updated in database."); //define("NLLAN_38", "Newsletter updated in database.");
define("NLLAN_39", "Newsletter issue saved in database - to send out, click the \"Release Issue\" button in the Options menu."); define("NLLAN_39", "Newsletter issue saved in database - to send out, click the \"Release Issue\" button in the Options menu.");
define("NLLAN_40", "Mailout added to mailout queue - issue sent to --COUNT-- subscriber(s)."); define("NLLAN_40", "Mailout added to mailout queue - issue sent to [x] subscriber(s).");
define("NLLAN_41", "No subscribers found - email cancelled"); define("NLLAN_41", "No subscribers found - email cancelled");
//define("NLLAN_42", "Newsletter deleted."); //define("NLLAN_42", "Newsletter deleted.");
//define("NLLAN_43", "Newsletter issue deleted."); //define("NLLAN_43", "Newsletter issue deleted.");

16
e107_plugins/pm/admin_config.php
View File

@@ -596,7 +596,7 @@ class private_msg_ui extends e_admin_ui
} }
} }
$start = time(); $start = time();
$results[E_MESSAGE_SUCCESS][$start] = str_replace('--COUNT--', $cnt, ADLAN_PM_74); $results[E_MESSAGE_SUCCESS][$start] = str_replace('[x]', $cnt, ADLAN_PM_74);
} }
if (isset($opts['rec'])) // Want pm_to = deleted user and pm_sent_del = 1 if (isset($opts['rec'])) // Want pm_to = deleted user and pm_sent_del = 1
{ {
@@ -613,7 +613,7 @@ class private_msg_ui extends e_admin_ui
} }
} }
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_SUCCESS][$start] = str_replace('--COUNT--', $cnt, ADLAN_PM_75); $results[E_MESSAGE_SUCCESS][$start] = str_replace('[x]', $cnt, ADLAN_PM_75);
} }
@@ -623,23 +623,23 @@ class private_msg_ui extends e_admin_ui
WHERE `#user`.`user_id` IS NULL")) WHERE `#user`.`user_id` IS NULL"))
{ {
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_ERROR][$start] = str_replace(array('--NUM--', '--TEXT--'), array($this->sql->getLastErrorNum, $this->sql->getLastErrorText), ADLAN_PM_70); $results[E_MESSAGE_ERROR][$start] = str_replace(array('[y]', '[z]'), array($this->sql->getLastErrorNum, $this->sql->getLastErrorText), ADLAN_PM_70);
} }
else else
{ {
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_SUCCESS][$start] = str_replace('--COUNT--', $res, ADLAN_PM_69); $results[E_MESSAGE_SUCCESS][$start] = str_replace('[x]', $res, ADLAN_PM_69);
} }
if ($res = $db2->gen("DELETE `#private_msg_block` FROM `#private_msg_block` LEFT JOIN `#user` ON `#private_msg_block`.`pm_block_to` = `#user`.`user_id` if ($res = $db2->gen("DELETE `#private_msg_block` FROM `#private_msg_block` LEFT JOIN `#user` ON `#private_msg_block`.`pm_block_to` = `#user`.`user_id`
WHERE `#user`.`user_id` IS NULL")) WHERE `#user`.`user_id` IS NULL"))
{ {
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_ERROR][$start] = str_replace(array('--NUM--', '--TEXT--'), array($this->sql->getLastErrorNum, $this->sql->getLastErrorText), ADLAN_PM_70); $results[E_MESSAGE_ERROR][$start] = str_replace(array('[y]', '[z]'), array($this->sql->getLastErrorNum, $this->sql->getLastErrorText), ADLAN_PM_70);
} }
else else
{ {
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_SUCCESS][$start] = str_replace('--COUNT--', $res, ADLAN_PM_68); $results[E_MESSAGE_SUCCESS][$start] = str_replace('[x]', $res, ADLAN_PM_68);
} }
} }
@@ -674,7 +674,7 @@ class private_msg_ui extends e_admin_ui
} }
} }
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_SUCCESS][$start] = str_replace('--COUNT--', $cnt, ADLAN_PM_73); $results[E_MESSAGE_SUCCESS][$start] = str_replace('[x]', $cnt, ADLAN_PM_73);
} }
else else
{ {
@@ -724,7 +724,7 @@ class private_msg_ui extends e_admin_ui
$orphans[] = $fd['fname']; $orphans[] = $fd['fname'];
} }
} }
$attachMessage = str_replace(array('--ORPHANS--', '--MISSING--'), array(count($orphans), count($missing)), ADLAN_PM_79); $attachMessage = str_replace(array('[x]', '[y]'), array(count($orphans), count($missing)), ADLAN_PM_79);
if (TRUE) if (TRUE)
{ // Mostly for testing - probably disable this { // Mostly for testing - probably disable this
if (count($orphans)) if (count($orphans))

2
e107_plugins/pm/e_cron.php
View File

@@ -134,7 +134,7 @@ class pm_cron // include plugin-folder in the name.
if ($this->ourDB->select('generic', '*', "`gen_type` = 'pm_bulk' LIMIT 1")) if ($this->ourDB->select('generic', '*', "`gen_type` = 'pm_bulk' LIMIT 1"))
{ {
$pmRow = $this->ourDB->fetch(); $pmRow = $this->ourDB->fetch();
$this->logLine("\r\n\r\n".str_replace('--NUM--',$pmRow['gen_intdata'],LAN_EC_PM_06).date('D j M Y G:i:s')); $this->logLine("\r\n\r\n".str_replace('[y]',$pmRow['gen_intdata'],LAN_EC_PM_06).date('D j M Y G:i:s'));
$this->ourDB->delete('generic', "`gen_type` = 'pm_bulk' AND `gen_id` = ".$pmRow['gen_id']); $this->ourDB->delete('generic', "`gen_type` = 'pm_bulk' AND `gen_id` = ".$pmRow['gen_id']);

14
e107_plugins/pm/languages/English_admin.php
View File

@@ -60,18 +60,18 @@ define("ADLAN_PM_64", "Messages received");
define("ADLAN_PM_65", "User blocks"); define("ADLAN_PM_65", "User blocks");
define("ADLAN_PM_66", "No maintenance tasks specified"); define("ADLAN_PM_66", "No maintenance tasks specified");
define("ADLAN_PM_67", "PM DB maintenance started"); define("ADLAN_PM_67", "PM DB maintenance started");
define("ADLAN_PM_68", "--COUNT-- blocks to deleted users removed"); define("ADLAN_PM_68", "[x] blocks to deleted users removed");
define("ADLAN_PM_69", "--COUNT-- blocks from deleted users removed"); define("ADLAN_PM_69", "[x] blocks from deleted users removed");
define("ADLAN_PM_70", "Database error --NUM--: --TEXT-- removing user blocks"); define("ADLAN_PM_70", "Database error [y]: [z] removing user blocks");
define("ADLAN_PM_71", "Time-expired messages"); define("ADLAN_PM_71", "Time-expired messages");
define("ADLAN_PM_72", "No PM timeouts set"); define("ADLAN_PM_72", "No PM timeouts set");
define("ADLAN_PM_73", "--COUNT-- time-expired PMs deleted"); define("ADLAN_PM_73", "[x] time-expired PMs deleted");
define("ADLAN_PM_74", "Removed --COUNT-- messages sent by deleted users"); define("ADLAN_PM_74", "Removed [x] messages sent by deleted users");
define("ADLAN_PM_75", "Removed --COUNT-- messages received by deleted users"); define("ADLAN_PM_75", "Removed [x] messages received by deleted users");
//define("ADLAN_PM_76", "No changes made - nothing logged"); //define("ADLAN_PM_76", "No changes made - nothing logged");
define("ADLAN_PM_77", "(Empty all fields and Update to delete a limit)"); define("ADLAN_PM_77", "(Empty all fields and Update to delete a limit)");
define("ADLAN_PM_78", "Check attachments"); define("ADLAN_PM_78", "Check attachments");
define("ADLAN_PM_79", "--ORPHANS-- unused attachments deleted. --MISSING-- missing attachments noted"); define("ADLAN_PM_79", "[x] unused attachments deleted. [y] missing attachments noted");
define("ADLAN_PM_80", "Preference formats updated"); define("ADLAN_PM_80", "Preference formats updated");
define("ADLAN_PM_81", "Maximum number of PMs to send immediately"); define("ADLAN_PM_81", "Maximum number of PMs to send immediately");
define("ADLAN_PM_82", "If sending more than this, they are added to a queue and sent out using the cron task"); define("ADLAN_PM_82", "If sending more than this, they are added to a queue and sent out using the cron task");

2
e107_plugins/pm/languages/English_mailer.php
View File

@@ -28,7 +28,7 @@ define("LAN_EC_PM_02", "");
define("LAN_EC_PM_03", ""); define("LAN_EC_PM_03", "");
define("LAN_EC_PM_04", "PM Handler"); define("LAN_EC_PM_04", "PM Handler");
define("LAN_EC_PM_05", "Process large sends of PMs"); define("LAN_EC_PM_05", "Process large sends of PMs");
define("LAN_EC_PM_06", "Start bulk PM processing for --NUM-- recipients "); define("LAN_EC_PM_06", "Start bulk PM processing for [y] recipients ");
define("LAN_EC_PM_07", ""); define("LAN_EC_PM_07", "");

16
e107_plugins/pm/pm_conf.php
View File

@@ -652,7 +652,7 @@ function doMaint($opts, $pmPrefs)
} }
} }
$start = time(); $start = time();
$results[E_MESSAGE_SUCCESS][$start] = str_replace('--COUNT--', $cnt, ADLAN_PM_74); $results[E_MESSAGE_SUCCESS][$start] = str_replace('[x]', $cnt, ADLAN_PM_74);
} }
if (isset($opts['rec'])) // Want pm_to = deleted user and pm_sent_del = 1 if (isset($opts['rec'])) // Want pm_to = deleted user and pm_sent_del = 1
{ {
@@ -669,7 +669,7 @@ function doMaint($opts, $pmPrefs)
} }
} }
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_SUCCESS][$start] = str_replace('--COUNT--', $cnt, ADLAN_PM_75); $results[E_MESSAGE_SUCCESS][$start] = str_replace('[x]', $cnt, ADLAN_PM_75);
} }
@@ -679,23 +679,23 @@ function doMaint($opts, $pmPrefs)
WHERE `#user`.`user_id` IS NULL")) WHERE `#user`.`user_id` IS NULL"))
{ {
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_ERROR][$start] = str_replace(array('--NUM--', '--TEXT--'), array($this->sql->getLastErrorNum, $this->sql->getLastErrorText), ADLAN_PM_70); $results[E_MESSAGE_ERROR][$start] = str_replace(array('[y]', '[z]'), array($this->sql->getLastErrorNum, $this->sql->getLastErrorText), ADLAN_PM_70);
} }
else else
{ {
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_SUCCESS][$start] = str_replace('--COUNT--', $res, ADLAN_PM_69); $results[E_MESSAGE_SUCCESS][$start] = str_replace('[x]', $res, ADLAN_PM_69);
} }
if ($res = $db2->gen("DELETE `#private_msg_block` FROM `#private_msg_block` LEFT JOIN `#user` ON `#private_msg_block`.`pm_block_to` = `#user`.`user_id` if ($res = $db2->gen("DELETE `#private_msg_block` FROM `#private_msg_block` LEFT JOIN `#user` ON `#private_msg_block`.`pm_block_to` = `#user`.`user_id`
WHERE `#user`.`user_id` IS NULL")) WHERE `#user`.`user_id` IS NULL"))
{ {
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_ERROR][$start] = str_replace(array('--NUM--', '--TEXT--'), array($this->sql->getLastErrorNum, $this->sql->getLastErrorText), ADLAN_PM_70); $results[E_MESSAGE_ERROR][$start] = str_replace(array('[y]', '[z]'), array($this->sql->getLastErrorNum, $this->sql->getLastErrorText), ADLAN_PM_70);
} }
else else
{ {
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_SUCCESS][$start] = str_replace('--COUNT--', $res, ADLAN_PM_68); $results[E_MESSAGE_SUCCESS][$start] = str_replace('[x]', $res, ADLAN_PM_68);
} }
} }
@@ -730,7 +730,7 @@ function doMaint($opts, $pmPrefs)
} }
} }
$start = max($start + 1, time()); $start = max($start + 1, time());
$results[E_MESSAGE_SUCCESS][$start] = str_replace('--COUNT--', $cnt, ADLAN_PM_73); $results[E_MESSAGE_SUCCESS][$start] = str_replace('[x]', $cnt, ADLAN_PM_73);
} }
else else
{ {
@@ -780,7 +780,7 @@ function doMaint($opts, $pmPrefs)
$orphans[] = $fd['fname']; $orphans[] = $fd['fname'];
} }
} }
$attachMessage = str_replace(array('--ORPHANS--', '--MISSING--'), array(count($orphans), count($missing)), ADLAN_PM_79); $attachMessage = str_replace(array('[x]', '[y]'), array(count($orphans), count($missing)), ADLAN_PM_79);
if (TRUE) if (TRUE)
{ // Mostly for testing - probably disable this { // Mostly for testing - probably disable this
if (count($orphans)) if (count($orphans))

2
usersettings.php
View File

@@ -636,7 +636,7 @@ class usersettings_front // Begin Usersettings rewrite.
{ {
$log_action = USER_AUDIT_ADMIN; // If an admin did the mod, different heading $log_action = USER_AUDIT_ADMIN; // If an admin did the mod, different heading
// Embed a message saying who changed the data // Embed a message saying who changed the data
$changedUserData['message'] = str_replace(array('--ID--', '--LOGNAME--'), array(USERID, USERNAME), LAN_USET_18); $changedUserData['message'] = str_replace(array('[x]', '[y]'), array(USERID, USERNAME), LAN_USET_18);
e107::getLog()->user_audit($log_action, $do_log, $udata['user_id'], $udata['user_loginname']); e107::getLog()->user_audit($log_action, $do_log, $udata['user_id'], $udata['user_loginname']);
} }
else else