Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12788] XoopsModules/xnewsletter/branches/mamba/ xnewsletter
|
From: <be...@us...> - 2014-09-17 13:55:23
|
Revision: 12788
http://sourceforge.net/p/xoops/svn/12788
Author: beckmi
Date: 2014-09-17 13:55:08 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
Updating some changes from Luciorota
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/template.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/docs/update.txt
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/constants.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/EasyPeasyICS.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/ntlm_sasl_client.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/sql/mysql.sql
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xewsletter_accounts.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/mail_template/info_change.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/templates/basic.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/templates/xoops.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -292,7 +292,7 @@
echo "<td class='center'>" . $arr_measure_type[$bhmObj->getVar("bmh_measure")] . "</td>";
echo "<td class='center'>" . formatTimeStamp($bhmObj->getVar("bmh_created"), "S") . "</td>";
- echo "<td class='center'>";
+ echo "<td class='center width20'>";
echo " <a href='?op=handle_bmh&bmh_id=" . $bhm_id . "&bmh_measure=" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "&filter=" . $filter . "'><img src=" . XNEWSLETTER_ICONS_URL
. "/xn_nothing.png alt='" . _AM_XNEWSLETTER_BMH_MEASURE_NOTHING . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE_NOTHING . "' /></a>";
echo " <a href='?op=handle_bmh&bmh_id=" . $bhm_id . "&bmh_measure=" . _XNEWSLETTER_BMH_MEASURE_VAL_QUIT . "&filter=" . $filter . "'><img src=" . XNEWSLETTER_ICONS_URL
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/letter.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/letter.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -409,7 +409,9 @@
$redirectUrl = '?op=list_letters';
break;
}
- $protocolObj->setVar('protocol_status', _AM_XNEWSLETTER_LETTER_ACTION_SAVED);
+ $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_created', time());
//
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/attachment.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/attachment.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -85,7 +85,7 @@
$mode_select = new XoopsFormRadio(_AM_XNEWSLETTER_ATTACHMENT_MODE, 'attachment_mode', $this->getVar('attachment_mode'));
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASATTACHMENT);
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASLINK, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASLINK);
- //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // IN PROGRESS
+ //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // for future features
$form->addElement($mode_select);
$form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ATTACHMENT_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/bmh.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/bmh.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,16 +44,16 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("bmh_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("bmh_rule_no", XOBJ_DTYPE_TXTBOX, null, false, 10);
- $this->initVar("bmh_rule_cat", XOBJ_DTYPE_TXTBOX, null, false, 50);
- $this->initVar("bmh_bouncetype", XOBJ_DTYPE_TXTBOX, null, false, 50);
- $this->initVar("bmh_remove", XOBJ_DTYPE_TXTBOX, null, false, 50);
- $this->initVar("bmh_email", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("bmh_subject", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("bmh_measure", XOBJ_DTYPE_INT, null, false);
- $this->initVar("bmh_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("bmh_created", XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('bmh_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('bmh_rule_no', XOBJ_DTYPE_TXTBOX, null, false, 10);
+ $this->initVar('bmh_rule_cat', XOBJ_DTYPE_TXTBOX, null, false, 50);
+ $this->initVar('bmh_bouncetype', XOBJ_DTYPE_TXTBOX, null, false, 50);
+ $this->initVar('bmh_remove', XOBJ_DTYPE_TXTBOX, null, false, 50);
+ $this->initVar('bmh_email', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('bmh_subject', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('bmh_measure', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('bmh_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('bmh_created', XOBJ_DTYPE_INT, time(), false);
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/cat.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/cat.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -48,12 +48,12 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("cat_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("cat_name", XOBJ_DTYPE_TXTBOX, '', false, 100);
- $this->initVar("cat_info", XOBJ_DTYPE_TXTAREA, '', false);
- $this->initVar("cat_mailinglist", XOBJ_DTYPE_INT, 0, false);
- $this->initVar("cat_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("cat_created", XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('cat_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('cat_name', XOBJ_DTYPE_TXTBOX, '', false, 100);
+ $this->initVar('cat_info', XOBJ_DTYPE_TXTAREA, '', false);
+ $this->initVar('cat_mailinglist', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('cat_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('cat_created', XOBJ_DTYPE_INT, time(), false);
$this->initVar('dohtml', XOBJ_DTYPE_INT, false); // boolean
$this->initVar('dosmiley', XOBJ_DTYPE_INT, true); // boolean
$this->initVar('doxcode', XOBJ_DTYPE_INT, true); // boolean
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/import.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/import.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,15 +44,15 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("import_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("import_email", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_firstname", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_lastname", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_sex", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_cat_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("import_subscr_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("import_catsubscr_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("import_status", XOBJ_DTYPE_INT, false, false); // boolean
+ $this->initVar('import_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('import_email', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('import_firstname', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('import_lastname', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('import_sex', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('import_cat_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('import_subscr_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('import_catsubscr_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('import_status', XOBJ_DTYPE_INT, false, false); // boolean
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/letter.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/letter.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,18 +44,18 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("letter_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("letter_title", XOBJ_DTYPE_TXTBOX, null, true, 100);
- $this->initVar("letter_content", XOBJ_DTYPE_TXTAREA, null, true);
- $this->initVar("letter_template", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("letter_cats", XOBJ_DTYPE_TXTBOX, null, false, 100); // IN PROGRESS: AN ARRAY SHOULD BE BETTER
- $this->initVar("letter_attachment", XOBJ_DTYPE_TXTBOX, null, false, 200);
- $this->initVar("letter_account", XOBJ_DTYPE_INT, null, false);
- $this->initVar("letter_email_test", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("letter_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("letter_created", XOBJ_DTYPE_INT, time(), false); // timestamp
- $this->initVar("letter_sender", XOBJ_DTYPE_INT, null, false);
- $this->initVar("letter_sent", XOBJ_DTYPE_INT, false, false); // timestamp or false
+ $this->initVar('letter_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('letter_title', XOBJ_DTYPE_TXTBOX, null, true, 100);
+ $this->initVar('letter_content', XOBJ_DTYPE_TXTAREA, null, true);
+ $this->initVar('letter_template', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('letter_cats', XOBJ_DTYPE_TXTBOX, null, false, 100); // IN PROGRESS: AN ARRAY SHOULD BE BETTER
+ $this->initVar('letter_attachment', XOBJ_DTYPE_TXTBOX, null, false, 200);
+ $this->initVar('letter_account', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('letter_email_test', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('letter_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('letter_created', XOBJ_DTYPE_INT, time(), false); // timestamp
+ $this->initVar('letter_sender', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('letter_sent', XOBJ_DTYPE_INT, false, false); // timestamp or false
}
/**
@@ -168,7 +168,7 @@
$mode_select = new XoopsFormRadio(_AM_XNEWSLETTER_ATTACHMENT_MODE, "existing_attachments_mode[{$attachment_id}]", $attachmentObj->getVar("attachment_mode"), ' ');
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASATTACHMENT);
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASLINK, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASLINK);
- //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // IN PROGRESS
+ //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // for future features
$delete_attachment_tray->addElement($mode_select);
$delete_attachment_tray->addElement(new XoopsFormLabel('', $attachmentObj->getVar('attachment_name')));
$delete_button = new XoopsFormButton('', "delete_attachment_{$i}", _DELETE, 'submit');
@@ -185,7 +185,7 @@
$mode_select = new XoopsFormRadio(_AM_XNEWSLETTER_ATTACHMENT_MODE, "new_attachments_mode[{$j}]", _XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT, ' ');
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASATTACHMENT);
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASLINK, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASLINK);
- //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // IN PROGRESS
+ //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // for future features
$add_attachment_tray->addElement($mode_select);
$add_attachment_tray->addElement(new XoopsFormFile('', "new_attachment_index={$j}", $this->xnewsletter->getConfig('xn_maxsize')));
$attachment_tray->addElement($add_attachment_tray);
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/mailinglist.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/mailinglist.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/mailinglist.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,14 +44,14 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("mailinglist_id", XOBJ_DTYPE_INT, null, fals);
- $this->initVar("mailinglist_name", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("mailinglist_email", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("mailinglist_listname", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("mailinglist_subscribe", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("mailinglist_unsubscribe", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("mailinglist_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("mailinglist_created", XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('mailinglist_id', XOBJ_DTYPE_INT, null, fals);
+ $this->initVar('mailinglist_name', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('mailinglist_email', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('mailinglist_listname', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('mailinglist_subscribe', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('mailinglist_unsubscribe', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('mailinglist_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('mailinglist_created', XOBJ_DTYPE_INT, time(), false);
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/protocol.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/protocol.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -36,6 +36,15 @@
{
public $xnewsletter = null;
+ public $protocol_status_strs
+ = array(
+ _XNEWSLETTER_PROTOCOL_STATUS_SAVED => _AM_XNEWSLETTER_PROTOCOL_STATUS_SAVED,
+ _XNEWSLETTER_PROTOCOL_STATUS_ERROR_CREATE_TASK => _AM_XNEWSLETTER_PROTOCOL_STATUS_ERROR_CREATE_TASK,
+ _XNEWSLETTER_PROTOCOL_STATUS_OK_SEND_TEST => _AM_XNEWSLETTER_PROTOCOL_STATUS_OK_SEND_TEST,
+ _XNEWSLETTER_PROTOCOL_STATUS_OK_SEND => _AM_XNEWSLETTER_PROTOCOL_STATUS_OK_SEND,
+ _XNEWSLETTER_PROTOCOL_STATUS_ERROR_SEND => _AM_XNEWSLETTER_PROTOCOL_STATUS_ERROR_SEND
+ // INPROGRESS
+ );
//Constructor
/**
*
@@ -44,13 +53,15 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("protocol_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("protocol_letter_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("protocol_subscriber_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("protocol_status", XOBJ_DTYPE_TXTBOX, '', false, 200);
- $this->initVar("protocol_success", XOBJ_DTYPE_OTHER, null, false); // boolean
- $this->initVar("protocol_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("protocol_created", XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_letter_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_subscriber_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_status', XOBJ_DTYPE_TXTBOX, '', false, 200); // old style
+ $this->initVar('protocol_success', XOBJ_DTYPE_OTHER, null, false); // boolean
+ $this->initVar('protocol_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_created', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_status_str_id', XOBJ_DTYPE_TXTBOX, '', false); // new from v1.3
+ $this->initVar('protocol_status_vars', XOBJ_DTYPE_ARRAY, array(), false); // new from v1.3
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/subscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/subscr.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/subscr.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,18 +44,18 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("subscr_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("subscr_email", XOBJ_DTYPE_TXTBOX, '', false, 100);
- $this->initVar("subscr_firstname", XOBJ_DTYPE_TXTBOX, '', true, 100);
- $this->initVar("subscr_lastname", XOBJ_DTYPE_TXTBOX, '', false, 100);
- $this->initVar("subscr_uid", XOBJ_DTYPE_INT, null, false);
- $this->initVar("subscr_sex", XOBJ_DTYPE_TXTBOX, '', false, 100);
- $this->initVar("subscr_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("subscr_created", XOBJ_DTYPE_INT, time(), false);
- $this->initVar("subscr_actkey", XOBJ_DTYPE_TXTBOX, '', false, 255);
- $this->initVar("subscr_ip", XOBJ_DTYPE_TXTBOX, xoops_getenv('REMOTE_ADDR'), false, 32);
- $this->initVar("subscr_activated", XOBJ_DTYPE_INT, 0, false); // IN PROGRESS: should be false or timestamp
- $this->initVar("subscr_actoptions", XOBJ_DTYPE_ARRAY, array(), false);
+ $this->initVar('subscr_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('subscr_email', XOBJ_DTYPE_TXTBOX, '', false, 100);
+ $this->initVar('subscr_firstname', XOBJ_DTYPE_TXTBOX, '', true, 100);
+ $this->initVar('subscr_lastname', XOBJ_DTYPE_TXTBOX, '', false, 100);
+ $this->initVar('subscr_uid', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('subscr_sex', XOBJ_DTYPE_TXTBOX, '', false, 100);
+ $this->initVar('subscr_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('subscr_created', XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('subscr_actkey', XOBJ_DTYPE_TXTBOX, '', false, 255);
+ $this->initVar('subscr_ip', XOBJ_DTYPE_TXTBOX, xoops_getenv('REMOTE_ADDR'), false, 32);
+ $this->initVar('subscr_activated', XOBJ_DTYPE_INT, 0, false); // IN PROGRESS: should be false or timestamp
+ $this->initVar('subscr_actoptions', XOBJ_DTYPE_ARRAY, array(), false);
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/task.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/task.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/task.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -39,12 +39,12 @@
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
$this->XoopsObject();
- $this->initVar("task_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("task_letter_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("task_subscr_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("task_starttime", XOBJ_DTYPE_INT, null, false);
- $this->initVar("task_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("task_created", XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('task_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('task_letter_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('task_subscr_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('task_starttime', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('task_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('task_created', XOBJ_DTYPE_INT, time(), false);
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/template.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/template.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/template.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,12 +44,12 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("template_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("template_title", XOBJ_DTYPE_TXTBOX, '', true, 100);
- $this->initVar("template_description", XOBJ_DTYPE_TXTAREA, '', false);
- $this->initVar("template_content", XOBJ_DTYPE_TXTAREA, '', true);
- $this->initVar("template_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("template_created", XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('template_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('template_title', XOBJ_DTYPE_TXTBOX, '', true, 100);
+ $this->initVar('template_description', XOBJ_DTYPE_TXTAREA, '', false);
+ $this->initVar('template_content', XOBJ_DTYPE_TXTAREA, '', true);
+ $this->initVar('template_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('template_created', XOBJ_DTYPE_INT, time(), false);
}
/**
Deleted: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_attachment.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_attachment.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -1,114 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
- * ****************************************************************************
- * XNEWSLETTER - MODULE FOR XOOPS
- * Copyright (c) 2007 - 2012
- * Goffy ( wedega.com )
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting
- * source code which is considered copyrighted (c) material of the
- * original comment or credit authors.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * ---------------------------------------------------------------------------
- *
- * @copyright Goffy ( wedega.com )
- * @license GNU General Public License 2.0
- * @package xNewsletter
- * @author Goffy ( web...@we... )
- *
- * Version : $Id $
- * ****************************************************************************
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
-/**
- * Class xnewsletter_attachment
- */
-class xnewsletter_attachment extends XoopsObject
-{
- //Constructor
- /**
- *
- */
- public function __construct()
- {
- $this->initVar("attachment_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("attachment_letter_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("attachment_name", XOBJ_DTYPE_TXTBOX, null, false, 200);
- $this->initVar("attachment_type", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("attachment_submitter", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("attachment_created", XOBJ_DTYPE_INT, null, false, 10);
- }
-
- /**
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
- $mydirname = basename(dirname(__DIR__));
-
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_ATTACHMENT_ADD) : sprintf(_AM_XNEWSLETTER_ATTACHMENT_EDIT);
-
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, "form", $action, "post", true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $letterHandler =& xoops_getModuleHandler("xNewsletter_letter", "xNewsletter");
- $criteria = new CriteriaCompo();
- $criteria->setSort('letter_id');
- $criteria->setOrder('DESC');
- $letter_select = new XoopsFormSelect(_AM_XNEWSLETTER_PROTOCOL_LETTER_ID, "attachment_letter_id", $this->getVar("attachment_letter_id"));
- $letter_select->addOptionArray($letterHandler->getList($criteria));
- $form->addElement($letter_select, true);
-
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_ATTACHMENT_NAME, "attachment_name", 50, 255, $this->getVar("attachment_name")), true);
-
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_ATTACHMENT_TYPE, "attachment_type", 50, 255, $this->getVar("attachment_type")), false);
-
- $time = ($this->isNew()) ? time() : $this->getVar("attachment_created");
- $form->addElement(new XoopsFormHidden("attachment_submitter", $GLOBALS['xoopsUser']->uid()));
- $form->addElement(new XoopsFormHidden("attachment_created", $time));
-
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ATTACHMENT_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ATTACHMENT_CREATED, formatTimestamp($time, 's')));
-
- //$form->addElement(new XoopsFormSelectUser(_AM_XNEWSLETTER_ATTACHMENT_SUBMITTER, "attachment_submitter", false, $this->getVar("attachment_submitter"), 1, false), true);
- //$form->addElement(new XoopsFormTextDateSelect(_AM_XNEWSLETTER_ATTACHMENT_CREATED, "attachment_created", "", $this->getVar("attachment_created")));
-
- $form->addElement(new XoopsFormHidden("op", "save_attachment"));
- $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
-
- return $form;
- }
-}
-
-/**
- * Class XnewsletterXnewsletter_attachmentHandler
- */
-class XnewsletterXnewsletter_attachmentHandler extends XoopsPersistableObjectHandler
-{
- /**
- * @param null|object $db
- */
- public function __construct(&$db)
- {
- parent::__construct($db, "xnewsletter_attachment", "xnewsletter_attachment", "attachment_id", "attachment_letter_id");
- }
-}
Deleted: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_bmh.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_bmh.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -1,126 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
- * ****************************************************************************
- * XNEWSLETTER - MODULE FOR XOOPS
- * Copyright (c) 2007 - 2012
- * Goffy ( wedega.com )
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting
- * source code which is considered copyrighted (c) material of the
- * original comment or credit authors.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * ---------------------------------------------------------------------------
- *
- * @copyright Goffy ( wedega.com )
- * @license GNU General Public License 2.0
- * @package xNewsletter
- * @author Goffy ( web...@we... )
- *
- * Version : $Id $
- * ****************************************************************************
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
-/**
- * Class xnewsletter_bmh
- */
-class xnewsletter_bmh extends XoopsObject
-{
- //Constructor
- /**
- *
- */
- public function __construct()
- {
- $this->initVar("bmh_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("bmh_rule_no", XOBJ_DTYPE_TXTBOX, null, false, 10);
- $this->initVar("bmh_rule_cat", XOBJ_DTYPE_TXTBOX, null, false, 50);
- $this->initVar("bmh_bouncetype", XOBJ_DTYPE_TXTBOX, null, false, 50);
- $this->initVar("bmh_remove", XOBJ_DTYPE_TXTBOX, null, false, 50);
- $this->initVar("bmh_email", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("bmh_subject", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("bmh_measure", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("bmh_submitter", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("bmh_created", XOBJ_DTYPE_INT, null, false, 10);
- }
-
- /**
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
-
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_BMH_ADD) : sprintf(_AM_XNEWSLETTER_BMH_EDIT);
-
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, "form", $action, "post", true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $account_default = $this->getVar("bmh_accounts_id");
- $accountsHandler =& xoops_getModuleHandler("xNewsletter_accounts", "xNewsletter");
- $crit_accounts = new CriteriaCompo();
- $crit_accounts->setSort("accounts_id");
- $crit_accounts->setOrder("ASC");
- $opt_accounts = new XoopsFormSelect(_AM_XNEWSLETTER_BMH_ACCOUNTS_ID, "bmh_accounts_id", $account_default);
- $opt_accounts->addOptionArray($accountsHandler->getList($crit_accounts));
- $form->addElement($opt_accounts, false);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_RULE_NO, "bmh_rule_no", 50, 255, $this->getVar("bmh_rule_no")), true);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_RULE_CAT, "bmh_rule_cat", 50, 255, $this->getVar("bmh_rule_cat")), true);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_BOUNCETYPE, "bmh_bouncetype", 50, 255, $this->getVar("bmh_bouncetype")), true);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_REMOVE, "bmh_remove", 50, 255, $this->getVar("bmh_remove")), true);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_EMAIL, "bmh_email", 50, 255, $this->getVar("bmh_email")), true);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_SUBJECT, "bmh_subject", 50, 255, $this->getVar("bmh_subject")), false);
-
- $measure_select = new XoopsFormSelect(_AM_XNEWSLETTER_BMH_MEASURE, "bmh_measure", $this->getVar("bmh_measure"));
- $measure_select->addOption(_AM_XNEWSLETTER_BMH_MEASURE_VAL_PENDING, _AM_XNEWSLETTER_BMH_MEASURE_PENDING);
- $measure_select->addOption(_AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING, _AM_XNEWSLETTER_BMH_MEASURE_NOTHING);
- $measure_select->addOption(_AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT, _AM_XNEWSLETTER_BMH_MEASURE_QUIT);
- $form->addElement($measure_select, true);
-
- $time = ($this->isNew()) ? time() : $this->getVar("bmh_created");
- $form->addElement(new XoopsFormHidden("bmh_submitter", $GLOBALS['xoopsUser']->uid()));
- $form->addElement(new XoopsFormHidden("bmh_created", $time));
-
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_BMH_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_BMH_CREATED, formatTimestamp($time, 's')));
-
- //$form->addElement(new XoopsFormSelectUser(_AM_XNEWSLETTER_BMH_SUBMITTER, "bmh_submitter", false, $this->getVar("bmh_submitter"), 1, false), true);
- //$form->addElement(new XoopsFormTextDateSelect(_AM_XNEWSLETTER_BMH_CREATED, "bmh_created", "", $this->getVar("bmh_created")));
-
- $form->addElement(new XoopsFormHidden("op", "save_bmh"));
- $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
-
- return $form;
- }
-}
-
-/**
- * Class XnewsletterXnewsletter_bmhHandler
- */
-class XnewsletterXnewsletter_bmhHandler extends XoopsPersistableObjectHandler
-{
- /**
- * @param null|object $db
- */
- public function __construct(&$db)
- {
- parent::__construct($db, "xnewsletter_bmh", "xnewsletter_bmh", "bmh_id", "bmh_rule_no");
- }
-}
Deleted: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_cat.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_cat.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -1,213 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
- * ****************************************************************************
- * XNEWSLETTER - MODULE FOR XOOPS
- * Copyright (c) 2007 - 2012
- * Goffy ( wedega.com )
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting
- * source code which is considered copyrighted (c) material of the
- * original comment or credit authors.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * ---------------------------------------------------------------------------
- *
- * @copyright Goffy ( wedega.com )
- * @license GPL 2.0
- * @package xNewsletter
- * @author Goffy ( web...@we... )
- *
- * Version : $Id $
- * ****************************************************************************
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
-/**
- * Class xnewsletter_cat
- */
-class xnewsletter_cat extends XoopsObject
-{
- //Constructor
- /**
- *
- */
- public function __construct()
- {
- $this->initVar("cat_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("cat_name", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("cat_info", XOBJ_DTYPE_TXTBOX);
- $this->initVar("cat_mailinglist", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("cat_submitter", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("cat_created", XOBJ_DTYPE_INT, null, false, 10);
- }
-
- /**
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
-
- include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/class/xNewsletter_mailinglist.php";
- $mailinglistHandler =& xoops_getModuleHandler("xNewsletter_mailinglist", "xNewsletter");
- $gperm_handler = xoops_gethandler('groupperm');
- global $xoopsModule;
- $mid = $xoopsModule->mid();
-
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_CAT_ADD) : sprintf(_AM_XNEWSLETTER_CAT_EDIT);
-
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, "form", $action, "post", true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_CAT_NAME, "cat_name", 50, 255, $this->getVar("cat_name")), true);
- $form->addElement(new XoopsFormTextArea(_AM_XNEWSLETTER_CAT_INFO, "cat_info", $this->getVar("cat_info"), 4, 47), false);
-
- $member_handler = &xoops_gethandler('member');
- $userGroups = $member_handler->getGroupList();
-
- // create admin checkbox
- foreach ($userGroups as $group_id => $group_name) {
- if ($group_id == XOOPS_GROUP_ADMIN) {
- $group_id_admin = $group_id;
- $group_name_admin = $group_name;
- }
- }
- $select_perm_admin = new XoopsFormCheckBox("", "admin", XOOPS_GROUP_ADMIN);
- $select_perm_admin->addOption($group_id_admin, $group_name_admin);
- $select_perm_admin->setExtra("disabled='disabled'");
-
- // ********************************************************
- // permission read cat
- $cat_gperms_read = &$gperm_handler->getGroupIds('newsletter_read_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_read = $this->isNew() ? "0" : $cat_gperms_read;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_READ, '');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_read", $arr_cat_gperms_read);
- foreach ($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN) {
- $select_perm->addOption($group_id, $group_name);
- }
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- // ********************************************************
- // permission create cat
- $cat_gperms_create =& $gperm_handler->getGroupIds('newsletter_create_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_create = $this->isNew() ? "0" : $cat_gperms_create;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_CREATE . _AM_XNEWSLETTER_CAT_GPERMS_CREATE_DESC, '');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_create", $arr_cat_gperms_create);
- foreach ($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) {
- $select_perm->addOption($group_id, $group_name);
- }
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- // ********************************************************
- // permission admin cat
- $cat_gperms_admin =& $gperm_handler->getGroupIds('newsletter_admin_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_admin = $this->isNew() ? "0" : $cat_gperms_admin;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_ADMIN . _AM_XNEWSLETTER_CAT_GPERMS_ADMIN_DESC, '');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_admin", $arr_cat_gperms_admin);
- foreach ($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) {
- $select_perm->addOption($group_id, $group_name);
- }
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- // ********************************************************
- // permission list subscriber of this cat
- $cat_gperms_list =& $gperm_handler->getGroupIds('newsletter_list_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_admin = $this->isNew() ? "0" : $cat_gperms_list;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_LIST, '');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_list", $arr_cat_gperms_admin);
- foreach ($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) {
- $select_perm->addOption($group_id, $group_name);
- }
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- $cat_mailinglist = $this->isNew() ? "0" : $this->getVar("cat_mailinglist");
- $crit_mailinglist = new CriteriaCompo();
- $crit_mailinglist->setSort("mailinglist_id");
- $crit_mailinglist->setOrder("ASC");
- $numrows_mailinglist = $mailinglistHandler->getCount();
- if ($numrows_mailinglist > 0) {
- $opt_mailinglist = new XoopsFormRadio(_AM_XNEWSLETTER_LETTER_MAILINGLIST, "cat_mailinglist", $cat_mailinglist);
- $opt_mailinglist->addOption("0", _AM_XNEWSLETTER_LETTER_MAILINGLIST_NO);
- $mailinglist_arr = $mailinglistHandler->getall($crit_mailinglist);
- foreach (array_keys($mailinglist_arr) as $i) {
- $opt_mailinglist->addOption($i, $mailinglist_arr[$i]->getVar("mailinglist_name"));
- }
- $form->addElement($opt_mailinglist);
- }
-
- $time = ($this->isNew()) ? time() : $this->getVar("cat_created");
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ACCOUNTS_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ACCOUNTS_CREATED, formatTimestamp($time, 's')));
-
- $form->addElement(new XoopsFormHidden("op", "save_cat"));
- $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
-
- return $form;
- }
-}
-
-/**
- * Class XnewsletterXnewsletter_catHandler
- */
-class XnewsletterXnewsletter_catHandler extends XoopsPersistableObjectHandler
-{
- /**
- * @param null|object $db
- */
- public function __construct(&$db)
- {
- parent::__construct($db, "xnewsletter_cat", "xnewsletter_cat", "cat_id", "cat_name");
- }
-}
Deleted: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_catsubscr.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_catsubscr.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -1,127 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
- * ****************************************************************************
- * XNEWSLETTER - MODULE FOR XOOPS
- * Copyright (c) 2007 - 2012
- * Goffy ( wedega.com )
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting
- * source code which is considered copyrighted (c) material of the
- * original comment or credit authors.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * ---------------------------------------------------------------------------
- *
- * @copyright Goffy ( wedega.com )
- * @license GPL 2.0
- * @package xNewsletter
- * @author Goffy ( web...@we... )
- *
- * Version : $Id $
- * ****************************************************************************
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
-/**
- * Class xnewsletter_catsubscr
- */
-class xnewsletter_catsubscr extends XoopsObject
-{
- //Constructor
- /**
- *
- */
- public function __construct()
- {
- $this->initVar("catsubscr_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("catsubscr_catid", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("catsubscr_subscrid", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("catsubscr_quited", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("catsubscr_submitter", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("catsubscr_created", XOBJ_DTYPE_INT, null, false, 10);
- }
-
- /**
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
-
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_CATSUBSCR_ADD) : sprintf(_AM_XNEWSLETTER_CATSUBSCR_EDIT);
-
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, "form", $action, "post", true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $catHandler =& xoops_getModuleHandler("xNewsletter_cat", "xNewsletter");
- $criteria = new CriteriaCompo();
- $criteria->setSort('cat_id ASC, cat_name');
- $criteria->setOrder('ASC');
- $cat_select = new XoopsFormSelect(_AM_XNEWSLETTER_CATSUBSCR_CATID, "catsubscr_catid", $this->getVar("catsubscr_catid"));
- $cat_select->addOptionArray($catHandler->getList());
- $form->addElement($cat_select, true);
-
- $subscrHandler =& xoops_getModuleHandler("xNewsletter_subscr", "xNewsletter");
- $criteria = new CriteriaCompo();
- $criteria->setSort('subscr_email ');
- $criteria->setOrder('ASC');
- $subscr_select = new XoopsFormSelect(_AM_XNEWSLETTER_CATSUBSCR_SUBSCRID, "catsubscr_subscrid", $this->getVar("catsubscr_subscrid"));
- $subscr_select->addOptionArray($subscrHandler->getList());
- $form->addElement($subscr_select, true);
-
- $quited_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CATSUBSCR_QUITED, " ");
-
- $quit_now = new XoopsFormRadio("", "catsubscr_quit_now", 0);
- $quit_now->addOption(0, _AM_XNEWSLETTER_CATSUBSCR_QUIT_NONE);
- $quit_now->addOption(1, _AM_XNEWSLETTER_CATSUBSCR_QUIT_NOW);
- $quit_now->addOption(2, _AM_XNEWSLETTER_CATSUBSCR_QUIT_REMOVE);
- $quited_tray->addElement($quit_now, false);
- $quited_tray->addElement(new XoopsFormLabel("", $this->getVar("catsubscr_quited")));
- $form->addElement($quited_tray, false);
-
- $time = ($this->isNew()) ? time() : $this->getVar("catsubscr_created");
- $form->addElement(new XoopsFormHidden("catsubscr_submitter", $GLOBALS['xoopsUser']->uid()));
- $form->addElement(new XoopsFormHidden("catsubscr_created", $time));
-
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_CATSUBSCR_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_CATSUBSCR_CREATED, formatTimestamp($time, 's')));
-
- //$form->addElement(new XoopsFormSelectUser(_AM_XNEWSLETTER_CATSUBSCR_SUBMITTER, "catsubscr_submitter", false, $this->getVar("catsubscr_submitter"), 1, false), true);
- //$form->addElement(new XoopsFormTextDateSelect(_AM_XNEWSLETTER_CATSUBSCR_CREATED, "catsubscr_created", "", $this->getVar("catsubscr_created")));
-
- $form->addElement(new XoopsFormHidden("op", "save_catsubscr"));
- $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
-
- return $form;
- }
-}
-
-/**
- * Class XnewsletterXnewsletter_catsubscrHandler
- */
-class XnewsletterXnewsletter_catsubscrHandler extends XoopsPersistableObjectHandler
-{
- /**
- * @param null|object $db
- */
- public function __construct(&$db)
- {
- parent::__construct($db, "xnewsletter_catsubscr", "xnewsletter_catsubscr", "catsubscr_id", "catsubscr_catid");
- }
-}
Deleted: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_import.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_import.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_import.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -1,203 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
- * ****************************************************************************
- * XNEWSLETTER - MODULE FOR XOOPS
- * Copyright (c) 2007 - 2012
- * Goffy ( wedega.com )
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting
- * source code which is considered copyrighted (c) material of the
- * original comment or credit authors.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * ---------------------------------------------------------------------------
- *
- * @copyright Goffy ( wedega.com )
- * @license GPL 2.0
- * @package xNewsletter
- * @author Goffy ( web...@we... )
- *
- * Version : $Id $
- * ****************************************************************************
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
-/**
- * Class xnewsletter_import
- */
-class xnewsletter_import extends XoopsObject
-{
- //Constructor
- /**
- *
- */
- public function __construct()
- {
- $this->initVar("import_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("import_email", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_firstname", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_lastname", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_sex", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_cat_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("import_subscr_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("import_catsubscr_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("import_status", XOBJ_DTYPE_INT, null, false, 1);
- }
-
- /**
- * @param $plugin
- * @param int $action_after_read
- * @param int $limitcheck
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getFormSearch($plugin, $action_after_read = 1, $limitcheck = 0, $action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
-
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = _AM_XNEWSLETTER_IMPORT_SEARCH;
-
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, "form_select_import", $action, "post", true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $catHandler =& xoops_getModuleHandler("xNewsletter_cat", "xNewsletter");
- $criteria = new CriteriaCompo();
- $criteria->setSort('cat_id ASC, cat_name');
- $criteria->setOrder('ASC');
- $cat_select = new XoopsFormSelect(_AM_XNEWSLETTER_IMPORT_PRESELECT_CAT, "cat_id", "1");
- $cat_select->addOptionArray($catHandler->getList());
- $form->addElement($cat_select, false);
-
- $opt_import_type = new XoopsFormRadio(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, "plugin", $plugin);
- $opt_import_type->setextra('onclick="document.forms.form_select_import.submit()"');
- $aFiles = XoopsLists::getFileListAsArray(XNEWSLETTER_PATH . "/plugins/");
- $arrPlugin = array();
- $currpluginhasform = 0;
- foreach ($aFiles as $file) {
- if (substr($file, strlen($file) - 4, 4) == '.php') {
- $pluginName = str_replace('.php', '', $file);
- $pluginFile = XNEWSLETTER_PATH . "/plugins/" . $pluginName . '.php';
- if (file_exists($pluginFile)) {
- require_once($pluginFile);
- $function = 'xnewsletter_plugin_getinfo_' . $pluginName;
- $arrPlugin = $function();
- $show_plugin = $this->tableExists($arrPlugin['tables'][0]);
- if ($show_plugin === true && @is_array($arrPlugin['tables'][1])) {
- $show_plugin = $this->tableExists($arrPlugin['tables'][1]);
- }
-
- if ($show_plugin === true) {
- $label = "<img src='" . $arrPlugin['icon'] . "' title='" . $arrPlugin['descr'] . "' alt='" . $arrPlugin['descr'] . "' style='height:32px;margin-bottom:5px;margin-right:5px' />"
- . $arrPlugin['descr'] . "<br/>";
- $opt_import_type->addOption($arrPlugin['name'], $label);
- $form->addElement(new XoopsFormHidden("hasform_" . $pluginName, $arrPlugin['hasform']));
- if ($plugin == $pluginName && $arrPlugin['hasform'] == 1) {
- $currpluginhasform = 1;
- }
- }
- }
- }
- }
- $form->addElement($opt_import_type, false);
-
- //option, whether data should be shown for check or directly imported
- $check_after = new XoopsFormRadio(_AM_XNEWSLETTER_IMPORT_AFTER_READ, "action_after_read", $action_after_read);
- $check_after->addOption(0, _AM_XNEWSLETTER_IMPORT_READ_IMPORT);
- $check_after->addOption(1, _AM_XNEWSLETTER_IMPORT_READ_CHECK);
- $check_after->setextra('onclick="document.forms.form_select_import.submit()"');
- $form->addElement($check_after, false);
-
- //limit for import
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_IMPORT_CHECK_LIMIT, "100000"), false);
- if ($action_after_read == 0) {
- if ($limitcheck < 500 && $limitcheck > 0) {
- $limitcheck = 500;
- }
- } else {
- if ($limitcheck > 200) {
- $limitcheck = 200;
- }
- }
- $sel_limitcheck = new XoopsFormSelect(_AM_XNEWSLETTER_IMPORT_CHECK_LIMIT_PACKAGE, "limitcheck", $limitcheck);
- $sel_limitcheck->addOption(0, _AM_XNEWSLETTER_IMPORT_NOLIMIT);
- if ($action_after_read == 0) {
- $sel_limitcheck->addOption(500, 500);
- $sel_limitcheck->addOption(1000, 1000);
- $sel_limitcheck->ad...
[truncated message content] |
