mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +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

16
e107_plugins/pm/admin_config.php
View File

@@ -596,7 +596,7 @@ class private_msg_ui extends e_admin_ui
}
}
$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
{
@@ -613,7 +613,7 @@ class private_msg_ui extends e_admin_ui
}
}
$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"))
{
$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
{
$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`
WHERE `#user`.`user_id` IS NULL"))
{
$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
{
$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());
$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
{
@@ -724,7 +724,7 @@ class private_msg_ui extends e_admin_ui
$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)
{ // Mostly for testing - probably disable this
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"))
{
$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']);

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_66", "No maintenance tasks specified");
define("ADLAN_PM_67", "PM DB maintenance started");
define("ADLAN_PM_68", "--COUNT-- blocks to deleted users removed");
define("ADLAN_PM_69", "--COUNT-- blocks from deleted users removed");
define("ADLAN_PM_70", "Database error --NUM--: --TEXT-- removing user blocks");
define("ADLAN_PM_68", "[x] blocks to deleted users removed");
define("ADLAN_PM_69", "[x] blocks from deleted users removed");
define("ADLAN_PM_70", "Database error [y]: [z] removing user blocks");
define("ADLAN_PM_71", "Time-expired messages");
define("ADLAN_PM_72", "No PM timeouts set");
define("ADLAN_PM_73", "--COUNT-- time-expired PMs deleted");
define("ADLAN_PM_74", "Removed --COUNT-- messages sent by deleted users");
define("ADLAN_PM_75", "Removed --COUNT-- messages received by deleted users");
define("ADLAN_PM_73", "[x] time-expired PMs deleted");
define("ADLAN_PM_74", "Removed [x] messages sent 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_77", "(Empty all fields and Update to delete a limit)");
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_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");

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_04", "PM Handler");
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", "");

16
e107_plugins/pm/pm_conf.php
View File

@@ -652,7 +652,7 @@ function doMaint($opts, $pmPrefs)
}
}
$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
{
@@ -669,7 +669,7 @@ function doMaint($opts, $pmPrefs)
}
}
$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"))
{
$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
{
$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`
WHERE `#user`.`user_id` IS NULL"))
{
$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
{
$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());
$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
{
@@ -780,7 +780,7 @@ function doMaint($opts, $pmPrefs)
$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)
{ // Mostly for testing - probably disable this
if (count($orphans))