Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12793] XoopsModules/xnewsletter/branches/luciorota/ xnewsletter
|
From: <luc...@us...> - 2014-09-18 21:15:46
|
Revision: 12793
http://sourceforge.net/p/xoops/svn/12793
Author: luciorota
Date: 2014-09-18 21:15:31 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
WIN to UNIX file format
use $GLOBALS[...] instead of global $...
improve protocol system (in progress)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/index.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/menu.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_subscrinfo.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/accounts.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/attachment.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/bmh.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/cat.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/task.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/template.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/constants.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/search.inc.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/evennews.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/sendletter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/sql/mysql.sql
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/subscription.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -31,7 +31,7 @@
include_once dirname(__DIR__) . '/include/common.php';
// Include xoops admin header
-include_once XOOPS_ROOT_PATH . "/include/cp_functions.php";
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
$pathIcon16 = XOOPS_URL . '/' . $xnewsletter->getModule()->getInfo('icons16');
$pathIcon32 = XOOPS_URL . '/' . $xnewsletter->getModule()->getInfo('icons32');
@@ -58,18 +58,18 @@
$myts = MyTextSanitizer::getInstance();
-if ($xoopsUser) {
+if ($GLOBALS['xoopsUser']) {
$moduleperm_handler =& xoops_gethandler('groupperm');
- if (!$moduleperm_handler->checkRight('module_admin', $xnewsletter->getModule()->mid(), $xoopsUser->getGroups())) {
+ if (!$moduleperm_handler->checkRight('module_admin', $xnewsletter->getModule()->mid(), $GLOBALS['xoopsUser']->getGroups())) {
redirect_header(XOOPS_URL, 1, _NOPERM);
exit();
}
} else {
- redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
exit();
}
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH . "/class/template.php");
+ include_once(XOOPS_ROOT_PATH . '/class/template.php');
$xoopsTpl = new XoopsTpl();
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -45,18 +45,18 @@
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
$bmh_email = $bmhObj->getVar('bmh_email');
- $sql = "SELECT subscr_id FROM {$xoopsDB->prefix("xnewsletter_subscr")}";
+ $sql = "SELECT subscr_id FROM {$GLOBALS['xoopsDB']->prefix("xnewsletter_subscr")}";
$sql .= " WHERE (subscr_email='{$bmh_email}')";
$sql .= " LIMIT 1;";
- if ($user = $xoopsDB->query($sql)) {
- $row_user = $xoopsDB->fetchRow($user);
+ if ($user = $GLOBALS['xoopsDB']->query($sql)) {
+ $row_user = $GLOBALS['xoopsDB']->fetchRow($user);
$subscr_id = (int)$row_user[0];
}
if ($subscr_id == 0) {
//set bmh_measure for all entries in bmh with this email
- $sql_upd_measure = "UPDATE {$xoopsDB->prefix('xnewsletter_bmh')} SET `bmh_measure` = '" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "'";
- $sql_upd_measure .= " WHERE ((`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
- $xoopsDB->query($sql_upd_measure);
+ $sql_upd_measure = "UPDATE {$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')} SET `bmh_measure` = '" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "'";
+ $sql_upd_measure .= " WHERE ((`{$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
+ $GLOBALS['xoopsDB']->query($sql_upd_measure);
redirect_header('?op=list', 3, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
}
$subscrObj = $xnewsletter->getHandler('subscr')->get($subscr_id);
@@ -118,18 +118,18 @@
$bmh_email = $bmhObj->getVar("bmh_email");
if ($bmh_measure == _XNEWSLETTER_BMH_MEASURE_VAL_QUIT) {
- $sql = "UPDATE `{$xoopsDB->prefix('xnewsletter_subscr')}` INNER JOIN `{$xoopsDB->prefix('xnewsletter_catsubscr')}` ON `subscr_id` = `catsubscr_subscrid`";
+ $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_subscr')}` INNER JOIN `{$GLOBALS['xoopsDB']->prefix('xnewsletter_catsubscr')}` ON `subscr_id` = `catsubscr_subscrid`";
$sql .= " SET `catsubscr_quited` = " . time();
$sql .= " WHERE (((`subscr_email`)='{$bmh_email}'))";
- if (!$result = $xoopsDB->queryF($sql)) {
+ if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
die ('MySQL-Error: ' . mysql_error());
}
}
//set bmh_measure for all entries in bmh with this email
- $sql_upd = "UPDATE {$xoopsDB->prefix('xnewsletter_bmh')}";
- $sql_upd .= " SET `bmh_measure` = '{$bmh_measure}', `bmh_submitter` = '{$xoopsUser->uid()}', `bmh_created` = '" . time() . "'";
- $sql_upd .= " WHERE ((`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
- if (!$result = $xoopsDB->queryF($sql_upd)) {
+ $sql_upd = "UPDATE {$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')}";
+ $sql_upd .= " SET `bmh_measure` = '{$bmh_measure}', `bmh_submitter` = '{$GLOBALS['xoopsUser']->uid()}', `bmh_created` = '" . time() . "'";
+ $sql_upd .= " WHERE ((`{$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
+ if (!$result = $GLOBALS['xoopsDB']->queryF($sql_upd)) {
die ('MySQL-Error: ' . mysql_error());
}
@@ -319,7 +319,7 @@
case 'save_bmh':
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($currentFile, 3, implode(',', $GLOBALS["xoopsSecurity"]->getErrors()));
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -35,7 +35,6 @@
*/
function callbackAction($msgnum, $bounce_type, $email, $subject, $xheader, $remove, $rule_no = false, $rule_cat = false, $totalFetched = 0)
{
- global $xoopsUser;
$xnewsletter = XnewsletterXnewsletter::getInstance();
if ($rule_no != '0000') {
@@ -48,7 +47,7 @@
$bmhObj->setVar('bmh_email', $email);
$bmhObj->setVar('bmh_subject', $subject);
$bmhObj->setVar('bmh_measure', '0');
- $bmhObj->setVar('bmh_submitter', $xoopsUser->uid());
+ $bmhObj->setVar('bmh_submitter', $GLOBALS['xoopsUser']->uid());
$bmhObj->setVar('bmh_created', time());
//
if (!$xnewsletter->getHandler('bmh')->insert($bmhObj)) {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -160,7 +160,7 @@
$catObj->setVar('cat_name', xnewsletterRequest::getString('cat_name', ''));
$catObj->setVar('cat_info', $_REQUEST['cat_info']);
$catObj->setVar('cat_mailinglist', xnewsletterRequest::getInt('cat_mailinglist', 0));
- $catObj->setVar('cat_submitter', $xoopsUser->uid());
+ $catObj->setVar('cat_submitter', $GLOBALS['xoopsUser']->uid());
$catObj->setVar('cat_created', time());
$catObj->setVar('dohtml', isset($_REQUEST['dohtml']));
$catObj->setVar('dosmiley', isset($_REQUEST['dosmiley']));
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -220,17 +220,17 @@
if ($cat_id > 0) {
if ($subscr_id == 0) {
//update sex, firstname, lastname
- $sql = "UPDATE {$xoopsDB->prefix('xnewsletter_import')}";
+ $sql = "UPDATE {$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}";
$sql .= " SET `import_sex`='{$subscr_sex}', `import_firstname`='{$subscr_firstname}', `import_lastname`='{$subscr_lastname}'";
$sql .= " WHERE `import_id`={$import_id}";
- $result = $xoopsDB->queryF($sql);
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
}
}
//update cat_id and import_status
- $sql = "UPDATE {$xoopsDB->prefix('xnewsletter_import')}";
+ $sql = "UPDATE {$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}";
$sql .= " SET `import_cat_id`='{$cat_id}', `import_status`=1";
$sql .= " WHERE `import_id`={$import_id}";
- $result = $xoopsDB->queryF($sql);
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
}
redirect_header("?op=exec_import_final&check_import=1&limitcheck={$limitcheck}", 0, '');
@@ -242,8 +242,8 @@
$indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
//
- $ip = xoops_getenv("REMOTE_ADDR");
- $submitter = $xoopsUser->uid();
+ $ip = xoops_getenv('REMOTE_ADDR');
+ $submitter = $GLOBALS['xoopsUser']->uid();
$importCriteria = new CriteriaCompo();
$importCriteria->add(new Criteria('import_status', true));
@@ -251,11 +251,11 @@
$numrows_act = $xnewsletter->getHandler('import')->getCount($importCriteria);
if ($numrows_act > 0) {
$sql = "SELECT *";
- $sql .= " FROM {$xoopsDB->prefix('xnewsletter_import')}";
+ $sql .= " FROM {$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}";
$sql .= " WHERE ((import_status)=1)";
$sql .= " ORDER BY `import_id` ASC";
$counter = 0;
- if (!$users_import = $xoopsDB->queryF($sql)) {
+ if (!$users_import = $GLOBALS['xoopsDB']->queryF($sql)) {
die ('MySQL-Error: ' . mysql_error());
}
while ($user_import = mysql_fetch_assoc($users_import)) {
@@ -267,18 +267,20 @@
$cat_id = $user_import['import_cat_id'];
$subscr_id = $user_import['import_subscr_id'];
$catsubscr_id = $user_import['import_catsubscr_id'];
- $subscribe = 0;
+ $subscribe = false;
if ($cat_id == 0) {
- createProtocol(str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_SKIP), true, $submitter);
+// IN PROGRESS
+ $status = str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_SKIP);
+ $xnewsletter->getHandler('protocol')->protocol(0, 0, $status, _XNEWSLETTER_PROTOCOL_STATUS_SKIP_IMPORT, array('%subscr_email' => $subscr_email), true);
} else {
//register email
if ($subscr_id == 0) {
$subscr_uid = 0;
- $sql = "SELECT `uid`";
- $sql .= " FROM {$xoopsDB->prefix('users')}";
+ $sql = "SELECT `uid`";
+ $sql .= " FROM {$GLOBALS['xoopsDB']->prefix('users')}";
$sql .= " WHERE (`email`='{$subscr_email}') LIMIT 1";
- if ($user = $xoopsDB->queryF($sql)) {
+ if ($user = $GLOBALS['xoopsDB']->queryF($sql)) {
$row_user = mysql_fetch_array($user);
$subscr_uid = $row_user[0];
}
@@ -286,37 +288,41 @@
unset($user);
$sql = "INSERT";
- $sql .= " INTO `{$xoopsDB->prefix('xnewsletter_subscr')}`";
+ $sql .= " INTO `{$GLOBALS['xoopsDB']->prefix('xnewsletter_subscr')}`";
$sql .= " (`subscr_email`, `subscr_firstname`, `subscr_lastname`, `subscr_uid`, `subscr_sex`, `subscr_submitter`, `subscr_created`, `subscr_ip`, `subscr_activated`, `subscr_actoptions`)";
- $sql .= " VALUES ('{$subscr_email}', '{$subscr_firstname}', '{$subscr_lastname}', " . intval($subscr_uid) . ", '{$subscr_sex}', {$submitter}, " . time() . ",'{$ip}', 1, '')";
- if (!$xoopsDB->queryF($sql)) {
- createProtocol(str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), false, $submitter);
+ $sql .= " VALUES ('{$subscr_email}', '{$subscr_firstname}', '{$subscr_lastname}', " . (int) $subscr_uid . ", '{$subscr_sex}', {$submitter}, " . time() . ",'{$ip}', 1, '')";
+ if (!$GLOBALS['xoopsDB']->queryF($sql)) {
+// IN PROGRESS
+ $status = str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED);
+ $xnewsletter->getHandler('protocol')->protocol(0, 0, $status, _XNEWSLETTER_PROTOCOL_STATUS_ERROR_IMPORT, array('%subscr_email' => $subscr_email), false);
} else {
//register email successful
$resulttext = $subscr_email . ': ' . _AM_XNEWSLETTER_IMPORT_RESULT_REG_OK . ' | ';
- $subscr_id = $xoopsDB->getInsertId();
- $subscribe = 1;
+ $subscr_id = $GLOBALS['xoopsDB']->getInsertId();
+ $subscribe = true;
}
} else {
//email already registered
$resulttext = $subscr_email . ': ' . _AM_XNEWSLETTER_IMPORT_EMAIL_EXIST . ' | ';
- $subscribe = 1;
+ $subscribe = true;
}
- if ($subscribe == 1) {
+ if ($subscribe) {
if ($catsubscr_id == 0) {
//add subscription of this email
$sql = "INSERT";
- $sql .= " INTO `{$xoopsDB->prefix('xnewsletter_catsubscr')}`";
+ $sql .= " INTO `{$GLOBALS['xoopsDB']->prefix('xnewsletter_catsubscr')}`";
$sql .= " (`catsubscr_catid`, `catsubscr_subscrid`, `catsubscr_submitter`, `catsubscr_created`)";
$sql .= " VALUES ({$cat_id}, {$subscr_id}, {$submitter}," . time() . ")";
- if ($xoopsDB->queryF($sql)) {
- createProtocol($resulttext . _AM_XNEWSLETTER_IMPORT_RESULT_SUBSCR_OK, true, $submitter);
+ if ($GLOBALS['xoopsDB']->queryF($sql)) {
+// IN PROGRESS
+ $status = $resulttext . _AM_XNEWSLETTER_IMPORT_RESULT_SUBSCR_OK;
+ $xnewsletter->getHandler('protocol')->protocol(0, 0, $status, _XNEWSLETTER_PROTOCOL_STATUS_OK_IMPORT, array('%result_text' => $resulttext), true);
//handle mailinglists
$cat_mailinglist = 0;
- $sql = "SELECT `cat_mailinglist`";
- $sql .= " FROM {$xoopsDB->prefix("xnewsletter_cat")}";
+ $sql = "SELECT `cat_mailinglist`";
+ $sql .= " FROM {$GLOBALS['xoopsDB']->prefix("xnewsletter_cat")}";
$sql .= " WHERE (`cat_id`={$cat_id}) LIMIT 1";
- if ($cat_mls = $xoopsDB->queryF($sql)) {
+ if ($cat_mls = $GLOBALS['xoopsDB']->queryF($sql)) {
$cat_ml = mysql_fetch_array($cat_mls);
$cat_mailinglist = $cat_ml[0];
}
@@ -328,17 +334,23 @@
subscribingMLHandler(1, $subscr_id, $cat_mailinglist);
}
} else {
- createProtocol(str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), false, $submitter);
+// IN PROGRESS
+ $status = str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED);
+ $xnewsletter->getHandler('protocol')->protocol(0, 0, $status, _XNEWSLETTER_PROTOCOL_STATUS_ERROR_IMPORT, array('%subscr_email' => $subscr_email), false);
+
}
} else {
- createProtocol($resulttext . _AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST, true, $submitter);
+// IN PROGRESS
+ $status = $resulttext . _AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST;
+ $xnewsletter->getHandler('protocol')->protocol(0, 0, $status, _XNEWSLETTER_PROTOCOL_STATUS_EXIST_IMPORT, array('%result_text' => $resulttext), false);
+
}
}
}
$sql_del = "DELETE";
- $sql_del .= " FROM {$xoopsDB->prefix('xnewsletter_import')}";
+ $sql_del .= " FROM {$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}";
$sql_del .= " WHERE `import_id`={$import_id}";
- $result = $xoopsDB->queryF($sql_del);
+ $result = $GLOBALS['xoopsDB']->queryF($sql_del);
}
echo "<div style='margin-top:20px;margin-bottom:20px;color:#ff0000;font-weight:bold;font-size:14px'>";
@@ -357,8 +369,8 @@
$form_continue .= '<input id="op" type="hidden" value="show_formcheck" name="op">';
} else {
// set import_status = 1 for next package
- $sql_update = "UPDATE " . $xoopsDB->prefix("xnewsletter_import") . " SET `import_status`=1 ORDER BY import_id LIMIT " . $limitcheck;
- $xoopsDB->queryF($sql_update);
+ $sql_update = "UPDATE " . $GLOBALS['xoopsDB']->prefix("xnewsletter_import") . " SET `import_status`=1 ORDER BY import_id LIMIT " . $limitcheck;
+ $GLOBALS['xoopsDB']->queryF($sql_update);
//execute import for the next package
$form_continue .= '<input id="op" type="hidden" value="exec_import_final" name="op">';
}
@@ -394,8 +406,8 @@
}
//delete all existing data
- $sql = "TRUNCATE TABLE " . $xoopsDB->prefix('xnewsletter_import');
- $result = $xoopsDB->queryF($sql);
+ $sql = "TRUNCATE TABLE " . $GLOBALS['xoopsDB']->prefix('xnewsletter_import');
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
//import data into xnewsletter_import with plugin
if ($plugin == 'csv') {
@@ -459,19 +471,3 @@
break;
}
include_once __DIR__ . '/admin_footer.php';
-
-/**
- * @param $prot_text
- * @param $success
- * @param $submitter
- */
-function createProtocol($prot_text, $success, $submitter)
-{
- global $xoopsDB;
- $sql = "INSERT INTO `{$xoopsDB->prefix('xnewsletter_protocol')}`";
- $sql .= " (`protocol_letter_id`, `protocol_subscriber_id`, `protocol_status`, `protocol_success`, `protocol_submitter`, `protocol_created`)";
- $sql .= " VALUES (0,0,'{$prot_text}', {$success}, {$submitter}, " . time() . ")";
- if (!$xoopsDB->queryF($sql)) {
- die ('MySQL-Error: ' . mysql_error());
- }
-}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/index.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/index.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/index.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -31,7 +31,7 @@
include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
-// count "total"
+// count 'total'
$catCount = $xnewsletter->getHandler('cat')->getCount();
$accountsCount = $xnewsletter->getHandler('accounts')->getCount();
$subscrCount = $xnewsletter->getHandler('subscr')->getCount();
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -38,8 +38,6 @@
switch ($op) {
case 'show_preview':
case 'show_letter_preview':
- global $XoopsTpl;
-
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_LETTERLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
@@ -225,9 +223,11 @@
$protocolCriteria->setOrder('DESC');
$protocolCriteria->setLimit(1);
$protocolObjs = $xnewsletter->getHandler('protocol')->getAll($protocolCriteria);
+// IN PROGRESS
$protocol_status = '';
$protocol_letter_id = 0;
foreach ($protocolObjs as $protocolObj) {
+// IN PROGRESS
$protocol_status .= $protocolObj->getVar('protocol_status');
$protocol_letter_id = $protocolObj->getVar('protocol_letter_id');
}
@@ -382,7 +382,7 @@
$attachmentObj->setVar('attachment_letter_id', $letter_id);
$attachmentObj->setVar('attachment_name', $file['name']);
$attachmentObj->setVar('attachment_type', $file['type']);
- $attachmentObj->setVar('attachment_submitter', $xoopsUser->uid());
+ $attachmentObj->setVar('attachment_submitter', $GLOBALS['xoopsUser']->uid());
$attachmentObj->setVar('attachment_created', time());
$attachmentObj->setVar('attachment_size', $file['size']);
$attachmentObj->setVar('attachment_mode', $file['mode']);
@@ -412,7 +412,7 @@
$protocolObj->setVar('protocol_status', _AM_XNEWSLETTER_LETTER_ACTION_SAVED); // old style
$protocolObj->setVar('protocol_status_str_id', _XNEWSLETTER_PROTOCOL_STATUS_SAVED); // new from v1.3
$protocolObj->setVar('protocol_status_vars', array()); // new from v1.3
- $protocolObj->setVar('protocol_submitter', $xoopsUser->uid());
+ $protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
//
if ($xnewsletter->getHandler('protocol')->insert($protocolObj)) {
@@ -450,9 +450,9 @@
if ($xnewsletter->getHandler('letter')->delete($letterObj)) {
//delete protocols
$sql = "DELETE";
- $sql .= " FROM `{$xoopsDB->prefix('xnewsletter_protocol')}`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}`";
$sql .= " WHERE `protocol_letter_id`={$letter_id}";
- if (!$result = $xoopsDB->query($sql)) {
+ if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
die('MySQL-Error: ' . mysql_error());
}
// delete attachments
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -150,15 +150,17 @@
case 'del_import':
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
- $result = $xoopsDB->queryF("TRUNCATE TABLE `{$xoopsDB->prefix('xnewsletter_import')}`");
- $result = $xoopsDB->queryF("REPAIR TABLE `{$xoopsDB->prefix('xnewsletter_import')}`");
- $result = $xoopsDB->queryF("OPTIMIZE TABLE `{$xoopsDB->prefix('xnewsletter_import')}`");
- $result = $xoopsDB->queryF("ALTER TABLE `{$xoopsDB->prefix('xnewsletter_import')}` AUTO_INCREMENT =1");
+ $result = $GLOBALS['xoopsDB']->queryF("TRUNCATE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("REPAIR TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("OPTIMIZE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("ALTER TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}` AUTO_INCREMENT =1");
//
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' import] ' . _AM_XNEWSLETTER_MAINTENANCE_DELETE_IMPORT_OK);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' import] ' . _AM_XNEWSLETTER_MAINTENANCE_DELETE_IMPORT_OK;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -190,15 +192,15 @@
foreach ($subscrArrays as $subscrArray) {
$subscrObj = $xnewsletter->getHandler('subscr')->get((int)$subscrArray['subscr_id']);
$sql = "DELETE";
- $sql .= " FROM `{$xoopsDB->prefix('xnewsletter_subscr')}`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix('xnewsletter_subscr')}`";
$sql .= " WHERE subscr_id={$subscrArray['subscr_id']}";
- $result = $xoopsDB->queryF($sql);
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
if ($result) {
// Newsletterlist delete
$sql = "DELETE";
- $sql .= " FROM `{$xoopsDB->prefix('xnewsletter_catsubscr')}`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix('xnewsletter_catsubscr')}`";
$sql .= " WHERE catsubscr_subscrid={$subscrArray['subscr_id']}";
- $result = $xoopsDB->queryF($sql);
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
if (!$result) {
$errors[] = 'Error CAT-Subscr-ID: ' . $subscrArray['subscr_id'] . ' / ' . $result->getHtmlErrors();
}
@@ -213,7 +215,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' reguser] ' . $error);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' reguser] ' . $error;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', false);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -225,7 +229,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' reguser] ' . sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETEUSEROK, $deleted));
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' reguser] ' . sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETEUSEROK, $deleted);
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -247,15 +253,17 @@
case 'del_oldprotocol':
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
- $result = $xoopsDB->queryF("TRUNCATE TABLE `{$xoopsDB->prefix('xnewsletter_protocol')}`");
- $result = $xoopsDB->queryF("REPAIR TABLE `{$xoopsDB->prefix('xnewsletter_protocol')}`");
- $result = $xoopsDB->queryF("OPTIMIZE TABLE `{$xoopsDB->prefix('xnewsletter_protocol')}`");
- $result = $xoopsDB->queryF("ALTER TABLE `{$xoopsDB->prefix('xnewsletter_protocol')}` AUTO_INCREMENT =1");
+ $result = $GLOBALS['xoopsDB']->queryF("TRUNCATE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("REPAIR TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("OPTIMIZE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("ALTER TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}` AUTO_INCREMENT =1");
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' prot] ' . _AM_XNEWSLETTER_MAINTENANCE_DELETEPROTOK);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' prot] ' . _AM_XNEWSLETTER_MAINTENANCE_DELETEPROTOK;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -276,18 +284,18 @@
$deleted = 0;
$errors = array();
$sql = "SELECT Count(`catsubscr_id`) AS `nb_ids`";
- $sql .= " FROM `{$xoopsDB->prefix("xnewsletter_catsubscr")}` LEFT JOIN `{$xoopsDB->prefix("xnewsletter_subscr")}` ON `catsubscr_subscrid` = `subscr_id`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix("xnewsletter_catsubscr")}` LEFT JOIN `{$GLOBALS['xoopsDB']->prefix("xnewsletter_subscr")}` ON `catsubscr_subscrid` = `subscr_id`";
$sql .= " WHERE (`subscr_id` Is Null)";
- if ($result = $xoopsDB->query($sql)) {
- $row_result = $xoopsDB->fetchRow($result);
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
+ $row_result = $GLOBALS['xoopsDB']->fetchRow($result);
$number_ids = $row_result[0];
}
if ($number_ids > 0) {
- $sql = "DELETE `{$xoopsDB->prefix("xnewsletter_catsubscr")}`";
- $sql .= " FROM `{$xoopsDB->prefix("xnewsletter_catsubscr")}` LEFT JOIN `{$xoopsDB->prefix("xnewsletter_subscr")}` ON `catsubscr_subscrid` = `subscr_id`";
+ $sql = "DELETE `{$GLOBALS['xoopsDB']->prefix("xnewsletter_catsubscr")}`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix("xnewsletter_catsubscr")}` LEFT JOIN `{$GLOBALS['xoopsDB']->prefix("xnewsletter_subscr")}` ON `catsubscr_subscrid` = `subscr_id`";
$sql .= " WHERE (`subscr_id` Is Null)";
- $result = $xoopsDB->query($sql);
- if ($result = $xoopsDB->query($sql)) {
+ $result = $GLOBALS['xoopsDB']->query($sql);
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
++$deleted;
} else {
$errors[] = 'Error delete catsubscr: ' . $result->getHtmlErrors();
@@ -299,7 +307,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' catsubscr] ' . $error);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' catsubscr] ' . $error;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', false);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -311,8 +321,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $status = $number_ids == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_SUBCR_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_SUBCR_OK, $number_ids);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' catsubscr] ' . $status);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' catsubscr] ' . $number_ids == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_SUBCR_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_SUBCR_OK, $number_ids);
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -336,15 +347,15 @@
if ($use_mailinglist == 0 || $use_mailinglist == '0') {
//set cat_mailinglist = 0, if use mailinglist = false (if someone changed module preferences later)
$sql = "SELECT Count(`cat_id`) AS `nb_ids`";
- $sql .= " FROM `{$xoopsDB->prefix("xnewsletter_cat")}`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix("xnewsletter_cat")}`";
$sql .= " WHERE (`cat_mailinglist` > 0)";
- if ($result = $xoopsDB->query($sql)) {
- $row_result = $xoopsDB->fetchRow($result);
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
+ $row_result = $GLOBALS['xoopsDB']->fetchRow($result);
$number_ids = $row_result[0];
}
if ($number_ids > 0) {
- $sql = "UPDATE `{$xoopsDB->prefix("xnewsletter_cat")}` SET `cat_mailinglist` = 0";
- if ($result = $xoopsDB->query($sql)) {
+ $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix("xnewsletter_cat")}` SET `cat_mailinglist` = 0";
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
++$update;
} else {
$errors[] = "Error update cat_mailinglist: " . $result->getHtmlErrors();
@@ -353,16 +364,16 @@
} else {
//set cat_mailinglist = 0, if mailinglist_id is no more existing in table mailinglist
$sql = "SELECT Count(`cat_mailinglist`) AS `nb_ids`";
- $sql .= " FROM `{$xoopsDB->prefix("xnewsletter_cat")}` LEFT JOIN `{$xoopsDB->prefix("xnewsletter_mailinglist")}` ON `cat_mailinglist` = `mailinglist_id`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix("xnewsletter_cat")}` LEFT JOIN `{$GLOBALS['xoopsDB']->prefix("xnewsletter_mailinglist")}` ON `cat_mailinglist` = `mailinglist_id`";
$sql .= " WHERE (((`mailinglist_id`) Is Null) AND ((`cat_mailinglist`)>0)) HAVING (((Count(`cat_mailinglist`))>0));";
- if ($result = $xoopsDB->query($sql)) {
- $row_result = $xoopsDB->fetchRow($result);
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
+ $row_result = $GLOBALS['xoopsDB']->fetchRow($result);
$number_ids = $row_result[0];
}
if ($number_ids > 0) {
- $sql = "UPDATE `{$xoopsDB->prefix("xnewsletter_cat")}` LEFT JOIN `{$xoopsDB->prefix("xnewsletter_mailinglist")}` ON `cat_mailinglist` = `mailinglist_id` SET `cat_mailinglist` = 0";
+ $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix("xnewsletter_cat")}` LEFT JOIN `{$GLOBALS['xoopsDB']->prefix("xnewsletter_mailinglist")}` ON `cat_mailinglist` = `mailinglist_id` SET `cat_mailinglist` = 0";
$sql .= " WHERE (((`cat_mailinglist`)>0) AND ((`mailinglist_id`) Is Null));";
- if ($result = $xoopsDB->query($sql)) {
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
++$update;
} else {
$errors[] = "Error update cat_mailinglist: " . $result->getHtmlErrors();
@@ -375,7 +386,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' ml] ' . $error);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' ml] ' . $error;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', false);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -387,8 +400,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $status = $number_ids == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_OK, $number_ids);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' ml] ' . $status);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' ml] ' . $number_ids == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_OK, $number_ids);
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -446,7 +460,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' cat] ' . $error);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' cat] ' . $error;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', false);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -458,8 +474,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $status = $update == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_CATNL_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_CATNL_OK, $update);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' cat] ' . $status);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' cat] ' . $update == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_CATNL_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_CATNL_OK, $update);
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/menu.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/menu.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/menu.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -33,67 +33,67 @@
$adminmenu = array();
$i = 1;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU1;
-$adminmenu[$i]["link"] = "admin/index.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/home.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU1;
+$adminmenu[$i]['link'] = 'admin/index.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/home.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU3;
-$adminmenu[$i]["link"] = "admin/cat.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_category.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU3;
+$adminmenu[$i]['link'] = 'admin/cat.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_category.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU4;
-$adminmenu[$i]["link"] = "admin/subscr.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_subscribers.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU4;
+$adminmenu[$i]['link'] = 'admin/subscr.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_subscribers.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU5;
-$adminmenu[$i]["link"] = "admin/catsubscr.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_category_subscr.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU5;
+$adminmenu[$i]['link'] = 'admin/catsubscr.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_category_subscr.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU6;
-$adminmenu[$i]["link"] = "admin/letter.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_newsletter.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU6;
+$adminmenu[$i]['link'] = 'admin/letter.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_newsletter.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU_TEMPLATES;
-$adminmenu[$i]["link"] = "admin/template.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/tpls.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU_TEMPLATES;
+$adminmenu[$i]['link'] = 'admin/template.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/tpls.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU7;
-$adminmenu[$i]["link"] = "admin/attachment.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_attachment.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU7;
+$adminmenu[$i]['link'] = 'admin/attachment.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_attachment.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU8;
-$adminmenu[$i]["link"] = "admin/protocol.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_protocol.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU8;
+$adminmenu[$i]['link'] = 'admin/protocol.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_protocol.png';
if ($xnewsletter->getConfig('xn_use_mailinglist') == 1) {
++$i;
- $adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU9;
- $adminmenu[$i]["link"] = "admin/mailinglist.php";
- $adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_mailinglist.png";
+ $adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU9;
+ $adminmenu[$i]['link'] = 'admin/mailinglist.php';
+ $adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_mailinglist.png';
}
if ($xnewsletter->getConfig('xn_send_in_packages') > 0) {
++$i;
- $adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU13;
- $adminmenu[$i]["link"] = "admin/task.php";
- $adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_task.png";
+ $adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU13;
+ $adminmenu[$i]['link'] = 'admin/task.php';
+ $adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_task.png';
}
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU10;
-$adminmenu[$i]["link"] = "admin/bmh.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_bmh.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU10;
+$adminmenu[$i]['link'] = 'admin/bmh.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_bmh.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU2;
-$adminmenu[$i]["link"] = "admin/accounts.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_accounts.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU2;
+$adminmenu[$i]['link'] = 'admin/accounts.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_accounts.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU11;
-$adminmenu[$i]["link"] = "admin/maintenance.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_maintenance.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU11;
+$adminmenu[$i]['link'] = 'admin/maintenance.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_maintenance.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU12;
-$adminmenu[$i]["link"] = "admin/import.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_import.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU12;
+$adminmenu[$i]['link'] = 'admin/import.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_import.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU99;
-$adminmenu[$i]["link"] = "admin/about.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/about.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU99;
+$adminmenu[$i]['link'] = 'admin/about.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/about.png';
unset($i);
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -84,6 +84,7 @@
$protocolCount = $xnewsletter->getHandler('protocol')->getCount($protocolCriteria);
$protocolCriteria->setLimit(2);
$protocolObjs = $xnewsletter->getHandler('protocol')->getAll($protocolCriteria);
+// IN PROGRESS
$protocol_status = '';
$protocol_created = '';
$protocol_created_formatted = '';
@@ -91,12 +92,15 @@
foreach ($protocolObjs as $protocol_id => $protocolObj) {
++$p;
if (count($protocolObjs) > 1) {
+// IN PROGRESS
$protocol_status .= "($p) ";
}
+// IN PROGRESS
$protocol_status .= $protocolObj->getVar('protocol_status') . "<br/>";
$protocol_created_formatted .= formatTimeStamp($protocolObj->getVar('protocol_created'), 'M') . "<br/>";
}
if ($protocolCount > 2) {
+// IN PROGRESS
$protocol_status .= "...";
}
echo "
@@ -118,6 +122,7 @@
if ($protocolCount > 0) {
$protocolCriteria->setLimit(2);
$protocolObjs = $xnewsletter->getHandler('protocol')->getAll($protocolCriteria);
+// IN PROGRESS
$protocol_status = '';
$protocol_created = '';
@@ -130,8 +135,10 @@
foreach ($protocolObjs as $protocol) {
++$p;
if (count($protocolObjs) > 1) {
+// IN PROGRESS
$protocol_status .= "($p) ";
}
+// IN PROGRESS
$protocol_status .= $protocol->getVar('protocol_status') . "<br/>";
$protocol_created .= formatTimeStamp($protocol->getVar('protocol_created'), 'M') . "<br/>";
}
@@ -158,7 +165,7 @@
break;
case 'list_letter':
- $letter_id = isset($_REQUEST["letter_id"]) ? $_REQUEST['letter_id'] : '0';
+ $letter_id = isset($_REQUEST['letter_id']) ? $_REQUEST['letter_id'] : '0';
echo $protocolAdmin->addNavigation($currentFile);
$protocolAdmin->addItemButton(_AM_XNEWSLETTER_PROTOCOLLIST, '?op=list', 'list');
//
@@ -187,7 +194,7 @@
// View Table
$letterObj = $xnewsletter->getHandler('letter')->get($letter_id);
- echo "<h2>" . $letterObj->getVar("letter_title") . "</h2>";
+ echo "<h2>" . $letterObj->getVar('letter_title') . "</h2>";
echo "
<table class='outer width100' cellspacing='1'>
<tr>
@@ -207,11 +214,12 @@
echo "<td>" . $protocol_id . "</td>";
$subscrObj = $xnewsletter->getHandler('subscr')->get($protocolObj->getVar('protocol_subscriber_id'));
$subscriber = ($subscrObj) ? $subscrObj->getVar('subscr_email') : _AM_XNEWSLETTER_PROTOCOL_NO_SUBSCREMAIL;
- if ($subscriber == "") {
- $subscriber = "-";
+ if ($subscriber == '') {
+ $subscriber = '-';
}
$success = ($protocolObj->getVar('protocol_success') == true) ? XNEWSLETTER_IMG_OK : XNEWSLETTER_IMG_FAILED;
echo "<td>" . $subscriber . "</td>";
+// IN PROGRESS
echo "<td>" . $protocolObj->getVar('protocol_status') . "</td>";
echo "<td>" . $success . "</td>";
echo "<td>" . XoopsUser::getUnameFromId($protocolObj->getVar('protocol_submitter'), 'S') . "</td>";
@@ -252,6 +260,7 @@
$protocolObj->setVar('protocol_letter_id', $_REQUEST['protocol_letter_id']);
$protocolObj->setVar('protocol_subscriber_id', $_REQUEST['protocol_subscriber_id']);
+// IN PROGRESS
$protocolObj->setVar('protocol_status', $_REQUEST['protocol_status']);
$protocolObj->setVar('protocol_success', $_REQUEST['protocol_success']);
$protocolObj->setVar('protocol_submitter', $_REQUEST['protocol_submitter']);
@@ -272,7 +281,7 @@
$protocolAdmin->addItemButton(_AM_XNEWSLETTER_PROTOCOLLIST, '?op=list', 'list');
echo $protocolAdmin->renderButton();
//
- $protocolObj = $xnewsletter->getHandler('protocol')->get($_REQUEST["protocol_id"]);
+ $protocolObj = $xnewsletter->getHandler('protocol')->get($_REQUEST['protocol_id']);
$form = $protocolObj->getForm();
$form->display();
break;
@@ -298,15 +307,15 @@
break;
case 'delete_protocol_list':
- $letter_id = isset($_REQUEST["letter_id"]) ? $_REQUEST["letter_id"] : 0;
+ $letter_id = isset($_REQUEST['letter_id']) ? $_REQUEST['letter_id'] : 0;
if ($letter_id > 0) {
- $letterObj = $xnewsletter->getHandler('letter')->get($_REQUEST["letter_id"]);
+ $letterObj = $xnewsletter->getHandler('letter')->get($_REQUEST['letter_id']);
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $sql = "DELETE FROM `{$xoopsDB->prefix("xnewsletter_protocol")}` WHERE `protocol_letter_id`={$letter_id}";
- $result = $xoopsDB->query($sql);
+ $sql = "DELETE FROM `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}` WHERE `protocol_letter_id`={$letter_id}";
+ $result = $GLOBALS['xoopsDB']->query($sql);
if ($result) {
redirect_header($currentFile, 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_catsubscr.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_catsubscr.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -26,7 +26,7 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__DIR__) . '/include/common.php';
/**
@@ -36,7 +36,6 @@
*/
function b_xnewsletter_catsubscr($options)
{
- global $xoopsUser;
$xnewsletter = XnewsletterXnewsletter::getInstance();
$myts = MyTextSanitizer::getInstance();
@@ -52,39 +51,39 @@
$catsubscrCriteria = new CriteriaCompo();
switch ($type_block) {
// For the block: catsubscr recents
- case "recent":
- $catsubscrCriteria->setSort("catsubscr_created");
- $catsubscrCriteria->setOrder("DESC");
+ case 'recent':
+ $catsubscrCriteria->setSort('catsubscr_created');
+ $catsubscrCriteria->setOrder('DESC');
break;
// For the block: catsubscr of today
- case "day":
- $catsubscrCriteria->add(new Criteria("catsubscr_created", strtotime(date("Y/m/d")), ">="));
- $catsubscrCriteria->add(new Criteria("catsubscr_created", strtotime(date("Y/m/d")) + 86400, "<="));
- $catsubscrCriteria->setSort("catsubscr_created");
- $catsubscrCriteria->setOrder("ASC");
+ case 'day':
+ $catsubscrCriteria->add(new Criteria('catsubscr_created', strtotime(date('Y/m/d')), '>='));
+ $catsubscrCriteria->add(new Criteria('catsubscr_created', strtotime(date('Y/m/d')) + 86400, '<='));
+ $catsubscrCriteria->setSort('catsubscr_created');
+ $catsubscrCriteria->setOrder('ASC');
break;
}
$catsubscrCriteria->setLimit($nb_catsubscr);
$catsubscrObjs = $xnewsletter->getHandler('catsubscr')->getAll($catsubscrCriteria);
foreach ($catsubscrObjs as $catsubscr_id => $catsubscrObj) {
- $cat_id = $catsubscrObj->getVar("catsubscr_catid");
+ $cat_id = $catsubscrObj->getVar('catsubscr_catid');
if (in_array($cat_id, $options) || $options[0] == '0') {
- $subscr_id = $catsubscrObj->getVar("catsubscr_subscrid");
+ $subscr_id = $catsubscrObj->getVar('catsubscr_subscrid');
$subscrObj = $xnewsletter->getHandler('subscr')->get($subscr_id);
- $email = $subscrObj->getVar("subscr_email");
+ $email = $subscrObj->getVar('subscr_email');
if ($length_title > 0 && strlen($email) > $length_title) {
- $email = substr($email, 0, $length_title) . "...";
+ $email = substr($ema...
[truncated message content] |
