Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12798] XoopsModules/xnewsletter/branches/luciorota/ xnewsletter
|
From: <luc...@us...> - 2014-09-22 20:06:23
|
Revision: 12798
http://sourceforge.net/p/xoops/svn/12798
Author: luciorota
Date: 2014-09-22 20:06:12 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
convert to Unix file format 'cause this is the standard for Xoops files
standardize var names
minor bug fixes
add method to protocol handler to create a protocol using only 1 line of code (IN PROGRESS)
fixed db bug
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/catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/header.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/common.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/oninstall.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/print.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/subscription.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/xnewsletter_letter_print.tpl
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-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -70,6 +70,6 @@
}
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-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -139,8 +139,8 @@
break;
case 'run_bmh':
- require_once('bmh_callback_database.php');
- require_once(XOOPS_ROOT_PATH . '/modules/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php');
+ require_once 'bmh_callback_database.php' ;
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php';
$accountCriteria = new CriteriaCompo();
$accountCriteria->add(new Criteria('accounts_use_bmh', '1'));
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -232,7 +232,7 @@
$subscr_id = $_REQUEST['subscr_id'];
$catsubscrObj_cat = $xnewsletter->getHandler('cat')->get($_REQUEST['cat_id']);
if ($catsubscrObj_cat->getVar('cat_mailinglist') > 0) {
- require_once(XOOPS_ROOT_PATH . "/modules/xnewsletter/include/mailinglist.php");
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(0, $subscr_id, $catsubscrObj_cat->getVar('cat_mailinglist'));
}
redirect_header('catsubscr.php', 3, _AM_XNEWSLETTER_FORMDELOK);
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -60,9 +60,9 @@
$importObjs = $xnewsletter->getHandler('import')->getAll($importCriteria);
if ($importsCount > 0) {
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $action = $_SERVER["REQUEST_URI"];
+ $action = $_SERVER['REQUEST_URI'];
$unique_id = uniqid(mt_rand());
$form = "<br/>";
$form .= "<form name=\"form_import_{$unique_id}\" id=\"form_import_{$unique_id}\" action=\"{$currentFile}\" method=\"post\" enctype=\"multipart/form-data\">";
@@ -330,7 +330,7 @@
unset($cat_mls);
if ($cat_mailinglist > 0) {
- require_once(XOOPS_ROOT_PATH . "/modules/xnewsletter/include/mailinglist.php");
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(1, $subscr_id, $cat_mailinglist);
}
} else {
@@ -396,7 +396,7 @@
echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
break;
}
- require_once($pluginFile);
+ require_once $pluginFile;
$function = 'xnewsletter_plugin_getdata_' . $plugin;
if (!function_exists($function)) {
@@ -450,7 +450,7 @@
echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
break;
}
- require_once($pluginFile);
+ require_once $pluginFile;
$function = "xnewsletter_plugin_getform_{$plugin}";
if (!function_exists($function)) {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -346,7 +346,7 @@
}
// upload attachments
$uploadedFiles = array();
- include_once XOOPS_ROOT_PATH . "/class/uploader.php";
+ include_once XOOPS_ROOT_PATH . '/class/uploader.php';
$uploaddir = XOOPS_UPLOAD_PATH . $xnewsletter->getConfig('xn_attachment_path') . $letter_id . '/';
// check upload_dir
if (!is_dir($uploaddir)) {
@@ -389,11 +389,6 @@
//
$xnewsletter->getHandler('attachment')->insert($attachmentObj);
}
- // create item in protocol
- $protocolObj = $xnewsletter->getHandler('protocol')->create();
- $protocolObj->setVar('protocol_letter_id', $letter_id);
- $protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_success', true);
$action = xnewsletterRequest::getInt('letter_action', _XNEWSLETTER_LETTER_ACTION_VAL_NO);
switch ($action) {
case _XNEWSLETTER_LETTER_ACTION_VAL_PREVIEW:
@@ -409,6 +404,13 @@
$redirectUrl = '?op=list_letters';
break;
}
+ // create item in protocol
+ $xnewsletter->getHandler('protocol')->protocol($letter_id, 0, _AM_XNEWSLETTER_LETTER_ACTION_SAVED, _XNEWSLETTER_PROTOCOL_STATUS_SAVED, array(), true);
+/*
+ $protocolObj = $xnewsletter->getHandler('protocol')->create();
+ $protocolObj->setVar('protocol_letter_id', $letter_id);
+ $protocolObj->setVar('protocol_subscriber_id', 0);
+ $protocolObj->setVar('protocol_success', true);
$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
@@ -421,6 +423,8 @@
} else {
echo 'Error create protocol: ' . $protocolObj->getHtmlErrors();
}
+*/
+ redirect_header($redirectUrl, 3, _AM_XNEWSLETTER_FORMOK);
} else {
echo 'Error create letter: ' . $letterObj->getHtmlErrors();
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -103,15 +103,10 @@
// IN PROGRESS
$protocol_status .= "...";
}
- echo "
- <td>
- <a href='?op=list_letter&letter_id=0'>" . $protocol_status . "</a>
- </td>
- <td>{$protocol_created_formatted}</td>
- <td class='center'>
- <a href='?op=list_letter&letter_id=0'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_details.png alt='" . _AM_XNEWSLETTER_DETAILS . "' title='" . _AM_XNEWSLETTER_DETAILS . "' /></a>
- </td>
- </tr>";
+ echo "<td><a href='?op=list_letter&letter_id=0'>{$protocol_status}</a></td>";
+ echo "<td>{$protocol_created_formatted}</td>";
+ echo "<td class='center'><a href='?op=list_letter&letter_id=0'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_details.png alt='" . _AM_XNEWSLETTER_DETAILS . "' title='" . _AM_XNEWSLETTER_DETAILS . "' /></a></td>";
+ echo "</tr>";
foreach (array_keys($letterObjs) as $i) {
$protocolCriteria = new CriteriaCompo();
@@ -145,16 +140,10 @@
if ($protocolCount > 2) {
$protocol_status .= "...";
}
- echo "
- <td class='center'>
- <a href='?op=list_letter&letter_id=" . $i . "'>" . $protocol_status . "</a>
- </td>
- <td class='center'>" . $protocol_created . "</td>
- <td class='center'>
- <a href='?op=list_letter&letter_id=" . $i . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_details.png alt='" . _AM_XNEWSLETTER_DETAILS . "' title='"
- . _AM_XNEWSLETTER_DETAILS . "' /></a>
- </td>
- </tr>";
+ echo "<td class='center'><a href='?op=list_letter&letter_id={$i}'>{$protocol_status}</a></td>";
+ echo "<td class='center'>{$protocol_created}</td>";
+ echo "<td class='center'><a href='?op=list_letter&letter_id={$i}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_details.png alt='" . _AM_XNEWSLETTER_DETAILS . "' title='" . _AM_XNEWSLETTER_DETAILS . "' /></a></td>";
+ echo "</tr>";
}
}
}
@@ -224,11 +213,7 @@
echo "<td>" . $success . "</td>";
echo "<td>" . XoopsUser::getUnameFromId($protocolObj->getVar('protocol_submitter'), 'S') . "</td>";
echo "<td>" . formatTimeStamp($protocolObj->getVar('protocol_created'), 'L') . "</td>";
-
- echo "
- <td>
- <a href='?op=delete_protocol&protocol_id=" . $protocol_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>
- </td>";
+ echo "<td><a href='?op=delete_protocol&protocol_id={$protocol_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a></td>";
echo "</tr>";
}
}
@@ -238,54 +223,6 @@
echo "<br />";
break;
- case 'new_protocol':
- echo $protocolAdmin->addNavigation($currentFile);
- $protocolAdmin->addItemButton(_AM_XNEWSLETTER_PROTOCOLLIST, '?op=list', 'list');
- echo $protocolAdmin->renderButton();
- //
- $protocolObj = $xnewsletter->getHandler('protocol')->create();
- $form = $protocolObj->getForm();
- $form->display();
- break;
-
- case 'save_protocol':
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($_REQUEST['protocol_id'])) {
- $protocolObj = $xnewsletter->getHandler('protocol')->get($_REQUEST['protocol_id']);
- } else {
- $protocolObj = $xnewsletter->getHandler('protocol')->create();
- }
-
- $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']);
- $protocolObj->setVar('protocol_created', strtotime($_REQUEST['protocol_created']));
-
- if ($xnewsletter->getHandler('protocol')->insert($protocolObj)) {
- redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
- }
-
- echo $protocolObj->getHtmlErrors();
- $form = $protocolObj->getForm();
- $form->display();
- break;
-
- case 'edit_protocol':
- echo $protocolAdmin->addNavigation($currentFile);
- $protocolAdmin->addItemButton(_AM_XNEWSLETTER_NEWPROTOCOL, '?op=new_protocol', 'add');
- $protocolAdmin->addItemButton(_AM_XNEWSLETTER_PROTOCOLLIST, '?op=list', 'list');
- echo $protocolAdmin->renderButton();
- //
- $protocolObj = $xnewsletter->getHandler('protocol')->get($_REQUEST['protocol_id']);
- $form = $protocolObj->getForm();
- $form->display();
- break;
-
case 'delete_protocol':
$protocolObj = $xnewsletter->getHandler('protocol')->get($_REQUEST['protocol_id']);
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -92,7 +92,7 @@
$pluginName = str_replace('.php', '', $file);
$pluginFile = XNEWSLETTER_ROOT_PATH . '/plugins/' . $pluginName . '.php';
if (file_exists($pluginFile)) {
- require_once($pluginFile);
+ require_once $pluginFile;
$function = 'xnewsletter_plugin_getinfo_' . $pluginName;
$arrPlugin = $function();
$show_plugin = $this->tableExists($arrPlugin['tables'][0]);
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -78,52 +78,6 @@
{
return xnewsletter_sprintf($this->protocol_status_strs[$this->getVar('protocol_status_str_id')], $this->getVar('protocol_status_vars'));
}
-
- /**
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_PROTOCOL_ADD) : sprintf(_AM_XNEWSLETTER_PROTOCOL_EDIT);
-
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $form = new XoopsThemeForm($title, 'form', $action, 'post', true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $letterCriteria = new CriteriaCompo();
- $letterCriteria->setSort('letter_id');
- $letterCriteria->setOrder('DESC');
- $letter_select = new XoopsFormSelect(_AM_XNEWSLETTER_PROTOCOL_LETTER_ID, 'protocol_letter_id', $this->getVar('protocol_letter_id'));
- $letter_select->addOptionArray($this->xnewsletter->getHandler('letter')->getList($letterCriteria));
- $form->addElement($letter_select, true);
-
- $subscrCriteria = new CriteriaCompo();
- $subscrCriteria->setSort('subscr_id');
- $subscrCriteria->setOrder('ASC');
- $subscr_select = new XoopsFormSelect(_AM_XNEWSLETTER_PROTOCOL_SUBSCRIBER_ID, "protocol_subscriber_id", $this->getVar("protocol_subscriber_id"));
- $subscr_select->addOptionArray($this->xnewsletter->getHandler('subscr')->getList($subscrCriteria));
- $form->addElement($subscr_select, true);
-
-// IN PROGRESS
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_PROTOCOL_STATUS, "protocol_status", 50, 200, $this->getVar("protocol_status")), false);
-
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_PROTOCOL_SUCCESS, "protocol_success", 50, 255, $this->getVar("protocol_success")), false);
-
- $form->addElement(new XoopsFormSelectUser(_AM_XNEWSLETTER_PROTOCOL_SUBMITTER, "protocol_submitter", false, $this->getVar("protocol_submitter"), 1, false), true);
-
- $form->addElement(new XoopsFormTextDateSelect(_AM_XNEWSLETTER_PROTOCOL_CREATED, "protocol_created", "", $this->getVar("protocol_created")));
-
- $form->addElement(new XoopsFormHidden("op", "save_protocol"));
- $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
-
- return $form;
- }
}
/**
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -321,7 +321,7 @@
if ($this->xnewsletter->getHandler('catsubscr')->delete($catsubscrObj, $force)) {
// handle mailinglists
if ($cat_mailinglist != 0) {
- require_once(XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php');
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(0, $subscr_id, $cat_mailinglist);
}
} else {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -32,11 +32,13 @@
echo '<br/>start cron job<br/>';
-require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/task.inc.php';
+include_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/task.inc.php';
// execute all pending tasks
$result_exec = xnewsletter_executeTasks($xnewsletter->getConfig('xn_send_in_packages'), 0);
if ($result_exec != '') {
+ $newsletter->getHandler('protocol')->protocol(0, 0, 'Cron: ' . $result_exec, _XNEWSLETTER_PROTOCOL_STATUS_CRON, array('%result_exec' => $result_exec), true);
+/*
// you can enable the block for creating protocol for cron
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
@@ -54,5 +56,6 @@
} else {
echo $protocolObj->getHtmlErrors();
}
+*/
}
echo "<br/>result cron: {$result_exec}";
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/header.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/header.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/header.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -33,8 +33,6 @@
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
include_once XOOPS_ROOT_PATH . '/include/functions.php';
-global $xoopsConfig;
-
//Load languages
xoops_loadLanguage('admin', $xnewsletter->getModule()->dirname());
xoops_loadLanguage('modinfo', $xnewsletter->getModule()->dirname());
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/common.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/common.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/common.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -58,6 +58,6 @@
// Load Xoops handlers
$module_handler = xoops_gethandler('module');
$member_handler = xoops_gethandler('member');
-$notification_handler = &xoops_gethandler('notification');
+$notification_handler = xoops_gethandler('notification');
$gperm_handler = xoops_gethandler('groupperm');
$config_handler = xoops_gethandler('config');
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -455,15 +455,13 @@
*/
function xnewsletter_emailSize($letter_id = 0)
{
- require_once XNEWSLETTER_ROOT_PATH . '/class/class.xnewslettermailer.php';
+ include_once XNEWSLETTER_ROOT_PATH . '/class/class.xnewslettermailer.php';
- global $xoopsTpl;
$xnewsletter = XnewsletterXnewsletter::getInstance();
- if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH . "/class/template.php");
- $xoopsTpl = new XoopsTpl();
- }
+ include_once XOOPS_ROOT_PATH . '/class/template.php';
+ $xoopsTpl = new XoopsTpl();
+
// get template path
$template_path = XNEWSLETTER_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/templates/';
if (!is_dir($template_path)) {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/mailinglist.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/mailinglist.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/mailinglist.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -38,7 +38,6 @@
*/
function subscribingMLHandler($type, $subscr_id, $mailinglist_id)
{
- global $xoopsConfig;
$xnewsletter = XnewsletterXnewsletter::getInstance();
$subscrObj = $xnewsletter->getHandler('subscr')->get($subscr_id);
@@ -59,9 +58,9 @@
echo "<br />action_code: {$action_code}";
echo "<br />";
*/
- require_once(XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.phpmailer.php");
- require_once(XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.pop3.php");
- require_once(XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.smtp.php");
+ require_once XOOPS_ROOT_PATH . '/class/mail/phpmailer/class.phpmailer.php';
+ require_once XOOPS_ROOT_PATH . '/class/mail/phpmailer/class.pop3.php';
+ require_once XOOPS_ROOT_PATH . '/class/mail/phpmailer/class.smtp.php';
//get emails of subscribers
$recipients = array();
@@ -89,11 +88,11 @@
$xoopsMailer->setHTML(false);
//$xoopsMailer->setTemplate('activate.tpl');
$xoopsMailer->setToEmails($recipient["address"]);
- if (isset($xoopsConfig['adminmail'])) {
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ if (isset($GLOBALS['xoopsConfig']['adminmail'])) {
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
}
- if (isset($xoopsConfig['sitename'])) {
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ if (isset($GLOBALS['xoopsConfig']['sitename'])) {
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
}
//$xoopsMailer->setSubject($subject);
$xoopsMailer->setBody($action_code);
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/oninstall.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/oninstall.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/oninstall.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -28,8 +28,8 @@
*/
defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
-include_once(XOOPS_ROOT_PATH . "/modules/xnewsletter/include/common.php");
-@include_once(XOOPS_ROOT_PATH . "/modules/xnewsletter/language/" . $xoopsConfig['language'] . "/admin.php");
+include_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/common.php';
+@include_once XOOPS_ROOT_PATH . '/modules/xnewsletter/language/' . $GLOBALS['xoopsConfig']['language'] . '/admin.php';
define('INDEX_FILE_PATH', XOOPS_UPLOAD_PATH . "/index.html");
define('BLANK_FILE_PATH', XOOPS_UPLOAD_PATH . "/blank.gif");
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -27,23 +27,23 @@
* ****************************************************************************
*
* @param $xoopsModule
- * @param null $oldversion
+ * @param null $previousVersion
*
* @return bool
*/
-function xoops_module_update_xnewsletter(&$xoopsModule, $oldversion = null)
+function xoops_module_update_xnewsletter(&$xoopsModule, $previousVersion = null)
{
- if ($oldversion == 100) {
+ if ($previousVersion == 100) {
xoops_module_update_xnewsletter_101();
}
- if ($oldversion < 103) {
+ if ($previousVersion < 103) {
xoops_module_update_xnewsletter_103();
}
- if ($oldversion < 104) {
+ if ($previousVersion < 104) {
xoops_module_update_xnewsletter_104();
}
- if ($oldversion < 130) {
+ if ($previousVersion < 130) {
xoops_module_update_xnewsletter_130();
}
@@ -60,7 +60,7 @@
$dirname = basename(dirname(__DIR__));
rename($path, strtolower($dirname));
// update module dirname field in database to lowercase
- $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix("modules")}` SET `dirname` = '" . strtolower($dirname) . "'";
+ $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix('modules')}` SET `dirname` = '" . strtolower($dirname) . "'";
$sql .= " WHERE LOWER(`dirname`) = '" . strtolower($dirname) . "';";
if (!$GLOBALS['xoopsDB']->queryF($sql)) {
echo '<br />' . _MI_XNEWSLETTER_UPGRADEFAILED . ": UPDATE 'modules' SET `dirname` = '" . strtolower($dirname) . "'";
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -45,7 +45,7 @@
*/
include_once dirname(dirname(dirname(dirname(__DIR__)))) . '/mainfile.php';
-require_once(XOOPS_ROOT_PATH . '/modules/xnewsletter/include/phpmailer_bmh/phpmailer-bmh_rules.php');
+require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/phpmailer_bmh/phpmailer-bmh_rules.php' ;
define('VERBOSE_QUIET', 0); // means no output at all
define('VERBOSE_SIMPLE', 1); // means only output simple report
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -173,7 +173,7 @@
$xnewsletter = XnewsletterXnewsletter::getInstance();
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();
}
// get template path
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -510,11 +510,6 @@
//
$xnewsletter->getHandler('attachment')->insert($attachmentObj);
}
- // create item in protocol
- $protocolObj = $xnewsletter->getHandler('protocol')->create();
- $protocolObj->setVar('protocol_letter_id', $letter_id);
- $protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_success', true);
$action = xnewsletterRequest::getInt('letter_action', _XNEWSLETTER_LETTER_ACTION_VAL_NO);
switch ($action) {
case _XNEWSLETTER_LETTER_ACTION_VAL_PREVIEW :
@@ -530,6 +525,13 @@
$redirectUrl = '?op=list_letters';
break;
}
+ // create item in protocol
+ $xnewsletter->getHandler('protocol')->protocol($letter_id, 0, _AM_XNEWSLETTER_LETTER_ACTION_SAVED, _XNEWSLETTER_PROTOCOL_STATUS_SAVED, array(), true);
+/*
+ $protocolObj = $xnewsletter->getHandler('protocol')->create();
+ $protocolObj->setVar('protocol_letter_id', $letter_id);
+ $protocolObj->setVar('protocol_subscriber_id', 0);
+ $protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_status', _AM_XNEWSLETTER_LETTER_ACTION_SAVED); // ols 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
@@ -542,6 +544,8 @@
} else {
echo 'Error create protocol: ' . $protocolObj->getHtmlErrors();
}
+*/
+ redirect_header($redirectUrl, 3, _AM_XNEWSLETTER_FORMOK);
} else {
echo 'Error create letter: ' . $letterObj->getHtmlErrors();
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/csv.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/csv.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/csv.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -136,7 +136,7 @@
$title = _AM_XNEWSLETTER_IMPORT_CSV_OPT;
- include_once(XOOPS_ROOT_PATH . '/class/xoopsformloader.php');
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$form = new XoopsThemeForm($title, 'form_add_csv', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/xoopsuser.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/xoopsuser.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/xoopsuser.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -133,7 +133,7 @@
$title = _AM_XNEWSLETTER_IMPORT_XOOPSUSER;
- include_once(XOOPS_ROOT_PATH . '/class/xoopsformloader.php');
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$form = new XoopsThemeForm($title, 'form_add_xoopsuser', 'import.php', 'post', true);
$form->setExtra('enctype="multipart/form-data"');
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/print.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/print.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/print.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -96,7 +96,7 @@
redirect_header("letter.php", 3, _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERCONTENT);
}
-$xoopsTpl->assign('xoopsConfig', $xoopsConfig);
+$xoopsTpl->assign('xoopsConfig', $GLOBALS['xoopsConfig']);
$xoopsTpl->assign('xoops_meta_keywords', $xoops_meta_keywords);
$xoopsTpl->assign('xoops_meta_description', $xoops_meta_description);
@@ -110,18 +110,18 @@
*/
function xnewsletter_printPage($content)
{
- global $xoopsConfig, $xoops_meta_keywords, $xoops_meta_description;
+ global $xoops_meta_keywords, $xoops_meta_description;
$myts =& MyTextSanitizer::getInstance();
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo _LANGCODE; ?>" lang="<?php echo _LANGCODE; ?>">
<?php
echo "<head>\n";
- echo "<title>{$xoopsConfig['sitename']}</title>\n";
+ echo "<title>" . $GLOBALS['xoopsConfig']['sitename'] . "</title>\n";
echo "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />\n";
- echo "<meta name='AUTHOR' content='{$xoopsConfig['sitename']}' />\n";
+ echo "<meta name='AUTHOR' content='" . $GLOBALS['xoopsConfig']['sitename'] . "' />\n";
echo "<meta name='keywords' content='{$xoops_meta_keywords}' />\n";
- echo "<meta name='COPYRIGHT' content='Copyright (c) " . date('Y') . " by {$xoopsConfig['sitename']}' />\n";
+ echo "<meta name='COPYRIGHT' content='Copyright (c) " . date('Y') . " by " . $GLOBALS['xoopsConfig']['sitename'] . "' />\n";
echo "<meta name='DESCRIPTION' content='{$xoops_meta_description}' />\n";
echo "<meta name='GENERATOR' content='XOOPS' />\n";
echo "<!-- Sheet Css -->\n";
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/subscription.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/subscription.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/subscription.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -245,11 +245,11 @@
$xoopsMailer->useMail();
$xoopsMailer->setTemplate('activate.tpl');
$xoopsMailer->setToEmails($subscr_email);
- if (isset($xoopsConfig['adminmail'])) {
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ if (isset($GLOBALS['xoopsConfig']['adminmail'])) {
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
}
- if (isset($xoopsConfig['sitename'])) {
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ if (isset($GLOBALS['xoopsConfig']['sitename'])) {
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
}
$xoopsMailer->assign('EMAIL', $subscr_email);
$xoopsMailer->assign('SEX', $subscrObj->getVar('subscr_sex'));
@@ -513,11 +513,11 @@
$xoopsMailer->useMail();
$xoopsMailer->setTemplate(($saveType == 'update') ? 'update.tpl' : 'activate.tpl');
$xoopsMailer->setToEmails($subscr_email);
- if (isset($xoopsConfig['adminmail'])) {
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ if (isset($GLOBALS['xoopsConfig']['adminmail'])) {
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
}
- if (isset($xoopsConfig['sitename'])) {
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ if (isset($GLOBALS['xoopsConfig']['sitename'])) {
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
}
$xoopsMailer->assign('EMAIL', $subscr_email);
$xoopsMailer->assign('SEX', $subscrObj->getVar('subscr_sex') != '' ? $subscrObj->getVar('subscr_sex') : $subscr_sex);
@@ -641,7 +641,7 @@
}
// handle mailinglists
if ($cat_mailinglist > 0) {
- require_once(XOOPS_ROOT_PATH . "/modules/xnewsletter/include/mailinglist.php");
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(1, $subscr_id, $cat_mailinglist);
}
} else {
@@ -654,7 +654,7 @@
if ($xnewsletter->getHandler('catsubscr')->delete($catsubscrObj, true)) {
// handle mailinglists
if ($cat_mailinglist > 0) {
- require_once(XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php');
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(0, $subscr_id, $cat_mailinglist);
}
} else {
@@ -704,11 +704,11 @@
$xoopsMailer->setHTML();
$xoopsMailer->setTemplate('info_change.tpl');
$xoopsMailer->setToEmails($subscr_email);
- if (isset($xoopsConfig['adminmail'])) {
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ if (isset($GLOBALS['xoopsConfig']['adminmail'])) {
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
}
- if (isset($xoopsConfig['sitename'])) {
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ if (isset($GLOBALS['xoopsConfig']['sitename'])) {
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
}
$xoopsMailer->assign('EMAIL', $subscr_email);
$xoopsMailer->assign('SEX', $subscr_sex);
@@ -862,11 +862,11 @@
$xoopsMailer->useMail();
$xoopsMailer->setTemplate('delete.tpl');
$xoopsMailer->setToEmails($subscrObj->getVar('subscr_email'));
- if (isset($xoopsConfig['adminmail'])) {
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ if (isset($GLOBALS['xoopsConfig']['adminmail'])) {
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
}
- if (isset($xoopsConfig['sitename'])) {
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ if (isset($GLOBALS['xoopsConfig']['sitename'])) {
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
}
$xoopsMailer->assign('EMAIL', $subscrObj->getVar('subscr_email'));
$xoopsMailer->assign('SEX', $subscrObj->getVar('subscr_sex'));
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/xnewsletter_letter_print.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/xnewsletter_letter_print.tpl 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/xnewsletter_letter_print.tpl 2014-09-22 20:06:12 UTC (rev 12798)
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$smarty.const._LANGCODE}>" lang="<{$smarty.const._LANGCODE}>">
<head>
- <title>' . $xoopsConfig['sitename'] . '</title>
+ <title><{$xoopsConfig.sitename}></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="AUTHOR" content="<{$xoopsConfig.sitename}>" />
<meta name="keywords" content="<{$xoops_meta_keywords}>" />
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php 2014-09-22 19:57:08 UTC (rev 12797)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php 2014-09-22 20:06:12 UTC (rev 12798)
@@ -51,7 +51,7 @@
//About
$modversion['module_status'] = 'Beta 1';
-$modversion['release_date'] = '2014/09/16';
+$modversion['release_date'] = '2014/09/22';
//$modversion['release'] = "1.3";
$modversion['demo_site_url'] = '';
$modversion['demo_site_name'] = '';
|
