Menu
▾
▴
xoops-svn
|
From: <go...@us...> - 2013-10-16 05:28:21
|
Revision: 12178
http://sourceforge.net/p/xoops/svn/12178
Author: goffy
Date: 2013-10-16 05:28:13 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
update to version 1.1
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/admin/about.php
XoopsModules/xnewsletter/trunk/xNewsletter/admin/accounts.php
XoopsModules/xnewsletter/trunk/xNewsletter/admin/admin_header.php
XoopsModules/xnewsletter/trunk/xNewsletter/admin/bmh.php
XoopsModules/xnewsletter/trunk/xNewsletter/admin/index.php
XoopsModules/xnewsletter/trunk/xNewsletter/admin/letter.php
XoopsModules/xnewsletter/trunk/xNewsletter/admin/maintenance.php
XoopsModules/xnewsletter/trunk/xNewsletter/admin/menu.php
XoopsModules/xnewsletter/trunk/xNewsletter/admin/protocol.php
XoopsModules/xnewsletter/trunk/xNewsletter/admin/sendletter.php
XoopsModules/xnewsletter/trunk/xNewsletter/admin/subscr.php
XoopsModules/xnewsletter/trunk/xNewsletter/blocks/blocks_catsubscr.php
XoopsModules/xnewsletter/trunk/xNewsletter/blocks/blocks_letter.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_accounts.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_attachment.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_bmh.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_cat.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_catsubscr.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_mailinglist.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_protocol.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/trunk/xNewsletter/docs/install.txt
XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_attachment_del.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_catsubscr_temp.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_check.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_copy.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_delete.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_details.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_edit.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_failed.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_nothing.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_ok.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_preview.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_quit.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_resend.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_send.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_sendtest.png
XoopsModules/xnewsletter/trunk/xNewsletter/include/config.php
XoopsModules/xnewsletter/trunk/xNewsletter/include/functions.php
XoopsModules/xnewsletter/trunk/xNewsletter/include/mailinglist.php
XoopsModules/xnewsletter/trunk/xNewsletter/include/onupdate.php
XoopsModules/xnewsletter/trunk/xNewsletter/include/search.inc.php
XoopsModules/xnewsletter/trunk/xNewsletter/index.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/blocks.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/help/help.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/templates/basic.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/templates/xoops.html
XoopsModules/xnewsletter/trunk/xNewsletter/letter.php
XoopsModules/xnewsletter/trunk/xNewsletter/protocol.php
XoopsModules/xnewsletter/trunk/xNewsletter/sendletter.php
XoopsModules/xnewsletter/trunk/xNewsletter/sql/mysql.sql
XoopsModules/xnewsletter/trunk/xNewsletter/subscription.php
XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html
XoopsModules/xnewsletter/trunk/xNewsletter/xoops_version.php
Added Paths:
-----------
XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php
XoopsModules/xnewsletter/trunk/xNewsletter/admin/task.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_task.php
XoopsModules/xnewsletter/trunk/xNewsletter/cron.php
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_delete_2.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_edit_2.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_import.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_task.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/letter_template/kletterfreaks.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/letter_template/nf_bg_green.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/letter_template/nf_bg_red.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/letter_template/nf_logo.png
XoopsModules/xnewsletter/trunk/xNewsletter/images/letter_template/nf_logo_trans.png
XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/admin.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/blocks.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/help/
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/help/help.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/help/index.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/index.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/mail_template/
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/mail_template/activate.tpl
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/mail_template/delete.tpl
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/mail_template/index.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/mail_template/info_change.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/mail_template/update.tpl
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/main.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/modinfo.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/templates/
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/templates/basic.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/templates/index.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/templates/kletterfreaks.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/templates/naturfreunde_gruen.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/templates/naturfreunde_rot.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/templates/naturfreunde_weiss.html
XoopsModules/xnewsletter/trunk/xNewsletter/language/german/templates/xoops.html
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/csv.php
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/csv.png
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/evennews.php
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/sample1col.csv
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/sample4col.csv
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/system_user.png
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/trunk/xNewsletter/plugins/xoopsuser.php
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/admin/about.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/admin/about.php 2013-10-15 22:20:13 UTC (rev 12177)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/admin/about.php 2013-10-16 05:28:13 UTC (rev 12178)
@@ -31,7 +31,7 @@
//global $indexAdmin;
echo $indexAdmin->addNavigation("about.php");
-echo $indexAdmin->renderabout('6KJ7RW5DR3VTJ', false);
+echo $indexAdmin->renderabout('9P3B3FXKF868J', false);
include "admin_footer.php";
?>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/admin/accounts.php 2013-10-15 22:20:13 UTC (rev 12177)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/admin/accounts.php 2013-10-16 05:28:13 UTC (rev 12178)
@@ -297,7 +297,7 @@
global $xoopsDB;
$verif_accounts_default = "1";
//reset old accounts_default
- $sql = "UPDATE `".$xoopsDB->prefix("xnewsletter_accounts")."` SET `accounts_default` = '0'";
+ $sql = "UPDATE `".$xoopsDB->prefix("mod_xnewsletter_accounts")."` SET `accounts_default` = '0'";
$result= $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
} else {
$verif_accounts_default = "0";
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/admin/admin_header.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/admin/admin_header.php 2013-10-15 22:20:13 UTC (rev 12177)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/admin/admin_header.php 2013-10-16 05:28:13 UTC (rev 12178)
@@ -68,6 +68,8 @@
$protocolHandler =& xoops_getModuleHandler('xNewsletter_protocol', $dirname);
$mailinglistHandler =& xoops_getModuleHandler('xNewsletter_mailinglist', $dirname);
$bmhHandler =& xoops_getModuleHandler('xNewsletter_bmh', $dirname);
+$importHandler =& xoops_getModuleHandler('xNewsletter_import', $dirname);
+$taskHandler =& xoops_getModuleHandler('xNewsletter_task', $dirname);
$myts = MyTextSanitizer::getInstance();
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/admin/bmh.php 2013-10-15 22:20:13 UTC (rev 12177)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/admin/bmh.php 2013-10-16 05:28:13 UTC (rev 12178)
@@ -46,7 +46,7 @@
$obj_bmh =& $bmhHandler->get($bmh_id);
$bmh_email = $obj_bmh->getVar("bmh_email");
- $sql = "SELECT subscr_id FROM " . $xoopsDB->prefix("xnewsletter_subscr") . " WHERE (";
+ $sql = "SELECT subscr_id FROM " . $xoopsDB->prefix("mod_xnewsletter_subscr") . " WHERE (";
$sql .= "subscr_email='" . $bmh_email . "'";
$sql .= ") LIMIT 1;";
if ( $user = $xoopsDB->query($sql) ) {
@@ -54,6 +54,10 @@
$subscr_id = intval($row_user[0]);
}
if ($subscr_id == 0) {
+ //set bmh_measure for all entries in bmh with this email
+ $sql_upd_measure = "UPDATE ".$xoopsDB->prefix("mod_xnewsletter_bmh")." SET `bmh_measure` = '"._AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING."'";
+ $sql_upd_measure .=" WHERE ((`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_email` ='".$bmh_email."') AND (`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_measure` ='0'))";
+ $xoopsDB->query($sql_upd_measure);
redirect_header("bmh.php?op=list", 5, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
}
$obj_subscr =& $subscrHandler->get($subscr_id);
@@ -63,11 +67,11 @@
$actionprot_err = $obj_subscr->getHtmlErrors()."<br/><br/><br/>";
$count_err++;
}
+
//delete subscription
$crit_catsubscr = new CriteriaCompo();
$crit_catsubscr->add(new Criteria('catsubscr_subscrid', $subscr_id));
$numrows_catsubscr = $catsubscrHandler->getCount($crit_catsubscr);
-
if ($numrows_catsubscr > 0) {
$catsubscr_arr = $catsubscrHandler->getall($crit_catsubscr);
foreach (array_keys($catsubscr_arr) as $cat) {
@@ -87,14 +91,14 @@
}
}
}
-
+
if ($count_err == 0) {
- redirect_header("bmh.php?op=handle_bmh&bmh_id=".$bmh_id."&bmh_measure="._AM_XNEWSLETTER_BMH_MEASURE_VAL_DELETE."&filter=".$filter."'", 3, _AM_XNEWSLETTER_FORMDELOK);
+ redirect_header("bmh.php?op=handle_bmh&bmh_id=".$bmh_id."&bmh_measure="._AM_XNEWSLETTER_BMH_MEASURE_VAL_DELETE."&filter=".$filter, 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
echo $actionprot_err;
}
} else {
- xoops_confirm(array("ok" => 1, "bmh_id" => $bmh_id, "op" => "bmh_delsubscr", "filter" => $filter), "bmh.php", sprintf(_AM_XNEWSLETTER_BMH_MEASURE_DELETE_SURE));
+ xoops_confirm(array("ok" => 1, "bmh_id" => $bmh_id, "op" => "bmh_delsubscr", "filter" => $filter), "bmh.php", sprintf(_AM_XNEWSLETTER_BMH_MEASURE_DELETE_SURE));
}
break;
@@ -108,25 +112,25 @@
redirect_header("bmh.php?op=list&filter=".$filter."'", 3, _AM_XNEWSLETTER_BMH_MEASURE_ALREADY_DELETED);
}
+ $bmh_email = $obj_bmh->getVar("bmh_email");
+
if ($bmh_measure == _AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT) {
- $bmh_email = $obj_bmh->getVar("bmh_email");
-
- $sql = "UPDATE `".$xoopsDB->prefix("xnewsletter_subscr")."` INNER JOIN `";
- $sql .= $xoopsDB->prefix("xnewsletter_catsubscr")."` ON `subscr_id` = `catsubscr_subscrid` ";
+ $sql = "UPDATE `".$xoopsDB->prefix("mod_xnewsletter_subscr")."` INNER JOIN `";
+ $sql .= $xoopsDB->prefix("mod_xnewsletter_catsubscr")."` ON `subscr_id` = `catsubscr_subscrid` ";
$sql .= "SET `catsubscr_quited` = ".time()." WHERE (((`subscr_email`)='";
$sql .= $bmh_email. "'))";
$result= $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
}
- //Form bmh_measure
- $obj_bmh->setVar("bmh_measure", $bmh_measure);
- //Form bmh_submitter
- $obj_bmh->setVar("bmh_submitter", $xoopsUser->uid());
- //Form bmh_created
- $obj_bmh->setVar("bmh_created", time());
+ //set bmh_measure for all entries in bmh with this email
+ $sql_upd = "UPDATE ".$xoopsDB->prefix("mod_xnewsletter_bmh")." SET ";
+ $sql_upd .="`bmh_measure` = '".$bmh_measure."'";
+ $sql_upd .=", `bmh_submitter` = '".$xoopsUser->uid()."'";
+ $sql_upd .=", `bmh_created` = '".time()."'";
+ $sql_upd .=" WHERE ((`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_email` ='".$bmh_email."') AND (`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_measure` ='0'))";
+ $result= $xoopsDB->queryF($sql_upd) or die ("MySQL-Error: " . mysql_error());
- if ($bmhHandler->insert($obj_bmh)) {
- redirect_header("bmh.php?op=list&filter=".$filter, 3, _AM_XNEWSLETTER_FORMOK);
- }
+ redirect_header("bmh.php?op=list&filter=".$filter, 3, _AM_XNEWSLETTER_FORMOK);
+
echo $obj_bmh->getHtmlErrors();
break;
@@ -149,7 +153,7 @@
$bmh = new BounceMailHandler();
$bmh->verbose = VERBOSE_SIMPLE; //VERBOSE_REPORT; //VERBOSE_DEBUG; //VERBOSE_QUIET; // default is VERBOSE_SIMPLE
//$bmh->use_fetchstructure = true; // true is default, no need to speficy
- //$bmh->testmode = false; // false is default, no need to specify
+ //$bmh->testmode = true; // false is default, no need to specify
//$bmh->debug_body_rule = false; // false is default, no need to specify
//$bmh->debug_dsn_rule = false; // false is default, no need to specify
//$bmh->purge_unprocessed = false; // false is default, no need to specify
Added: XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php (rev 0)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php 2013-10-16 05:28:13 UTC (rev 12178)
@@ -0,0 +1,440 @@
+<?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 $
+ * ****************************************************************************
+ */
+
+include "admin_header.php";
+xoops_cp_header();
+
+global $xoopsUser, $xoopsDB;
+
+$basic_limit_import_checked = 100;
+$basic_limit_import_at_once = 10;
+
+$op = xNewsletter_CleanVars($_REQUEST, 'op', 'default', 'string');
+$plugin = xNewsletter_CleanVars($_REQUEST, 'plugin', 'csv', 'string');
+$cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id', 0, 'int');
+$action_after_read = xNewsletter_CleanVars($_REQUEST, 'action_after_read', 1, 'int');
+$start = xNewsletter_CleanVars($_REQUEST, 'start', 0, 'int' );
+$limitcheck = xNewsletter_CleanVars($_REQUEST, 'limitcheck', $basic_limit_import_checked, 'int' );
+$skipcatsubscrexist = xNewsletter_CleanVars($_REQUEST, 'skipcatsubscrexist', 1, 'int' );
+$check_import = xNewsletter_CleanVars($_REQUEST, 'check_import', 0, 'int');
+
+// echo "<br/>op:$op plugin:$plugin cat_id:$cat_id action_after_read:$action_after_read start:$start limitcheck:$limitcheck skipcatsubscrexist:$skipcatsubscrexist<br/><br/>";
+
+echo $indexAdmin->addNavigation("import.php");
+
+switch ($op)
+{
+ case "show_formcheck":
+
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
+ echo $indexAdmin->renderButton();
+
+ $importHandler =& xoops_getModuleHandler("xNewsletter_import", "xNewsletter");
+ $crit_import = new CriteriaCompo();
+ $crit_import->setSort("import_id");
+ $crit_import->setOrder("ASC");
+ $numrows = $importHandler->getCount($crit_import);
+
+ $crit_import->setStart($start);
+ $crit_import->setLimit($limitcheck);
+ $import_arr = $importHandler->getall($crit_import);
+
+ if ($numrows > 0) {
+ include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
+
+ $action = $_SERVER["REQUEST_URI"];
+ $unique_id = uniqid(mt_rand());
+ $form = "<br/><form name=\"form_import_".$unique_id."\" id=\"form_import_".$unique_id."\" action=\"import.php\" method=\"post\" enctype=\"multipart/form-data\">";
+
+ $showlimit = str_replace("%s", $start+1, _AM_XNEWSLETTER_IMPORT_SHOW);
+ if ($limitcheck < $numrows) {
+ $showlimit = str_replace("%l", $limitcheck, $showlimit);
+ } else {
+ $showlimit = str_replace("%l", $numrows, $showlimit);
+ }
+ $showlimit = str_replace("%n", $numrows, $showlimit);
+
+ $form .="<table width=\"100%\" cellspacing=\"1\" class=\"outer\">
+ <tr>
+ <td align=\"left\" colspan='8'>".$showlimit."</td>
+ </tr>";
+
+ $class = "odd";
+ $form .="
+ <tr>
+ <th align=\"center\"> </th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_EMAIL."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_SEX."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_LASTNAME."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_CAT_NAME."</th>
+ </tr>";
+
+ $class = "odd";
+ $counter = 0;
+
+ //get data for dropdown with cats
+ $catHandler =& xoops_getModuleHandler("xNewsletter_cat", "xNewsletter");
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('cat_id ASC, cat_name');
+ $criteria->setOrder('ASC');
+ $cat_arr=$catHandler->getall($criteria);
+
+ foreach (array_keys($import_arr) as $i) {
+ $counter++;
+ $form .= "<tr class=\"".$class."\">";
+ $class = ($class == "even") ? "odd" : "even";
+ $form .= "<td align=\"center\">".$counter;
+ $form .= "<input type='hidden' name='import_id_".$counter."' title='import_id_".$counter."' id='import_id_".$counter."' value='".$import_arr[$i]->getVar("import_id")."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $form .= "<input type='text' disabled=disabled name='email_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_EMAIL."' id='email_".$counter."' value='".$import_arr[$i]->getVar("import_email")."' />";
+ $form .= "</td>";
+
+ $form .= "<td align=\"center\">";
+ $sex = $import_arr[$i]->getVar("import_sex");
+ $form .= "<select size=\"1\" name=\"sex_".$counter."\" id=\"sex_".$counter."\" title=\""._AM_XNEWSLETTER_SUBSCR_SEX."\" ";
+ $form .= "value=\"".$sex."\">";
+ $form .= "<option value=\"\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_EMPTY."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FEMALE) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_MALE."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_MALE) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_MALE."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_COMP."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_COMP) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_COMP."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."</option>";
+ $form .= "</select>\n";
+ $form .= "</td>";
+
+ $form .= "<td align=\"center\">";
+ $form .= "<input type='text' name='firstname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."' id='firstname_".$counter."' value='".$import_arr[$i]->getVar("import_firstname")."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $form .= "<input type='text' name='lastname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_LASTNAME."' id='lastname_".$counter."' value='".$import_arr[$i]->getVar("import_lastname")."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $subscr_id = $import_arr[$i]->getVar("import_subscr_id");
+ $form .= "<input type='hidden' name='subscr_id_".$counter."' title='subscr_id' id='subscr_id_".$counter."' value='".$subscr_id."' />";
+ if ($subscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICON."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $catsubscr_id = $import_arr[$i]->getVar("import_catsubscr_id");
+ $form .= "<input type='hidden' name='catsubscr_id_".$counter."' title='catsubscr_id' id='catsubscr_id_".$counter."' value='".$catsubscr_id."' />";
+ if ($catsubscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICON."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' />";
+ $form .= "</td>";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+
+ $curr_cat_id =$import_arr[$i]->getVar("import_cat_id");
+ $form .= "<select size=\"1\" name=\"cat_id_".$counter."\" id=\"cat_id_".$counter."\" title=\"cat\" ";
+ $form .= "value=\"".$curr_cat_id."\">";
+ $cat_select = "<option value=\"0\"";
+ $cat_select .= ">"._AM_XNEWSLETTER_IMPORT_NOIMPORT."</option>";
+ foreach (array_keys($cat_arr) as $j)
+ {
+ $cat_select .= "<option value=\"".$j."\"";
+ if ($curr_cat_id == $j) $cat_select .= " selected=\"selected\"";
+ $cat_select .= ">".$cat_arr[$j]->getVar("cat_name")."</option>";
+ }
+
+ $form .= $cat_select;
+ $form .= "</select>\n";
+
+ $form .= "</td>";
+ $form .= "</tr>";
+ }
+ $form .= "<tr class=\"".$class."\">";
+ $class = ($class == "even") ? "odd" : "even";
+ $form .= "<td colspan=\"8\"align=\"center\">";
+ $form .= "<input type='hidden' name='counter' title='counter' id='counter' value='".$counter."' />";
+ $form .= "<input type='hidden' name='limitcheck' title='limitcheck' id='limitcheck' value='".$limitcheck."' />";
+ $form .= "<input type='hidden' name='op' title='op' id='op' value='apply_import_form' />";
+ $form .= "<input type='submit' class='formButton' name='submit' id='submit' value='"._AM_XNEWSLETTER_IMPORT_EXEC."' title='"._AM_XNEWSLETTER_IMPORT_EXEC."' />";
+ $form .= "</td></tr>";
+
+ $form .= "</table></form>";
+ echo $form;
+ }
+ break;
+
+ case "apply_import_form":
+ //update mod_xnewsletter with settings form_import
+ $counter = xNewsletter_CleanVars($_REQUEST, 'counter', 0, 'int');
+
+ for ($i=1; $i < ($counter+1); $i++) {
+ $import_id = xNewsletter_CleanVars($_REQUEST, 'import_id_'.$i, 'default', 'string');
+ $subscr_firstname = xNewsletter_CleanVars($_REQUEST, 'firstname_'.$i, '', 'string');
+ $subscr_lastname = xNewsletter_CleanVars($_REQUEST, 'lastname_'.$i, '', 'string');
+ $subscr_sex = xNewsletter_CleanVars($_REQUEST, 'sex_'.$i, '', 'string');
+ $cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id_'.$i, 0, 'int');
+
+ if ($cat_id > 0) {
+ if ($subscr_id==0) {
+ //update sex, firstname, lastname
+ $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_sex`='$subscr_sex', `import_firstname`='$subscr_firstname', `import_lastname`='$subscr_lastname' WHERE `import_id`=$import_id";
+ $result=$xoopsDB->queryF($sql);
+ }
+ }
+ //update cat_id and import_status
+ $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_cat_id`='$cat_id', `import_status`=1 WHERE `import_id`=$import_id";
+ $result=$xoopsDB->queryF($sql);
+ }
+
+ redirect_header("import.php?op=exec_import_final&check_import=1&limitcheck=".$limitcheck, 0, "");
+ break;
+
+ case "exec_import_final":
+
+ //execute final import of all data from mod_xnewsletter_import, where import_status = 1
+ //delete data from mod_xnewsletter_import, when imported (successful or not)
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
+ echo $indexAdmin->renderButton();
+
+ $ip = xoops_getenv("REMOTE_ADDR");
+ $submitter = $xoopsUser->uid();
+
+ $crit_import = new CriteriaCompo();
+ $crit_import->add(new Criteria('import_status', "1"));
+ $numrows_total = $importHandler->getCount();
+ $numrows_act = $importHandler->getCount($crit_import);
+ if ( $numrows_act > 0 ) {
+ $sql = "SELECT * FROM ".$xoopsDB->prefix("mod_xnewsletter_import")." WHERE ((import_status)=1)";
+ $sql .= " ORDER BY `import_id` ASC";
+ $counter = 0;
+ $users_import = $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
+ while ($user_import = mysql_fetch_assoc($users_import)) {
+ $import_id = $user_import["import_id"];
+ $subscr_email = $user_import["import_email"];
+ $subscr_firstname = $user_import["import_firstname"];
+ $subscr_lastname = $user_import["import_lastname"];
+ $subscr_sex = $user_import["import_sex"];
+ $cat_id = $user_import["import_cat_id"];
+ $subscr_id = $user_import["import_subscr_id"];
+ $catsubscr_id = $user_import["import_catsubscr_id"];
+ $subscribe = 0;
+
+ if ($cat_id == 0) {
+ create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_SKIP), 1, $submitter);
+ } else {
+ //register email
+ if ($subscr_id==0) {
+ $subscr_uid = 0;
+ $sql = "SELECT `uid` FROM ".$xoopsDB->prefix("users")." WHERE (`email`='";
+ $sql .= $subscr_email;
+ $sql .= "') LIMIT 1";
+ if ( $user = $xoopsDB->queryF($sql) ) {
+ $row_user = mysql_fetch_array($user);
+ $subscr_uid = $row_user[0];
+ }
+ unset($row_user);
+ unset($user);
+
+ $sql = "INSERT INTO `".$xoopsDB->prefix('mod_xnewsletter_subscr')."` (`subscr_email`, `subscr_firstnam...
[truncated message content] |
|
From: <go...@us...> - 2013-10-16 15:02:17
|
Revision: 12180
http://sourceforge.net/p/xoops/svn/12180
Author: goffy
Date: 2013-10-16 15:02:14 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
updated changelog.txt
fixed bug when filter subscribers in admin/subscr.php (feichtl/goffy)
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/admin/subscr.php
XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/admin/subscr.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/admin/subscr.php 2013-10-16 12:02:34 UTC (rev 12179)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/admin/subscr.php 2013-10-16 15:02:14 UTC (rev 12180)
@@ -106,7 +106,6 @@
$limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
$crit_subscr = new CriteriaCompo();
-
if ($op == 'apply_filter') {
if ($filter_subscr_firstname != '')
$crit_subscr->add(new Criteria("subscr_firstname",$filter_subscr_firstname,$filter_subscr));
@@ -124,7 +123,11 @@
$subscr_arr = $subscrHandler->getall($crit_subscr);
if ( $numrows > $limit ) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
+ $linklist = "op=$op&filter_subscr=$filter_subscr";
+ $linklist .= "&filter_subscr_firstname=$filter_subscr_firstname";
+ $linklist .= "&filter_subscr_lastname=$filter_subscr_lastname";
+ $linklist .= "&filter_subscr_email=$filter_subscr_email";
+ $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', $linklist);
$pagenav = $pagenav->renderNav(4);
} else {
$pagenav = '';
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-10-16 12:02:34 UTC (rev 12179)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-10-16 15:02:14 UTC (rev 12180)
@@ -1,5 +1,20 @@
Version 1.2
--------------
+ - fixed bug when filter subscribers in admin/subscr.php (feichtl/goffy)
+ - french translation (pierredelu)
+ - corrected english language files (cesag)
+ - added plugin for import from module 'subscribers' (cesag/goffy)
+ - changed english language file from ansi to utf8 without bom, corrected translation errors (cesag/goffy)
+ - changed redirect_header from subscription.php to index.php after successful deleting a subscription (cesag/goffy)
+ - added plugin for module 'evennews' (tatane/goffy)
+ - added the possibility to show a list of subscriptions for each subscriber in admin/tab subscriber (goffy)
+ - updated help file concerning import tool (goffy)
+ - changed query to queryF to solve problems while running imports (goffy)
+ - Fix error $protocolHandler (alfred)
+ - added the possibility to search for subscriptions concerning an email, if the current user have the right to see/edit subscriptions of other persons (goffy)
+ - resize images to xoops standard 16x16 (mamba/goffy)
+ - fixed bug in showing tasklist, if email is deleted between creation of task and execution (goffy)
+ - fix sql-injection (alfred)
- Update Adminindex (alfred)
- fix userinput (alfred)
|
|
From: <go...@us...> - 2013-10-16 16:24:15
|
Revision: 12181
http://sourceforge.net/p/xoops/svn/12181
Author: goffy
Date: 2013-10-16 16:24:12 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
transfered error text to language file (feichtl/goffy)
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php
XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php 2013-10-16 15:02:14 UTC (rev 12180)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php 2013-10-16 16:24:12 UTC (rev 12181)
@@ -353,7 +353,7 @@
$pluginFile = XNEWSLETTER_PATH . "/plugins/" . $plugin . '.php';
if ( !file_exists($pluginFile) ) {
- echo "Error: File ".$plugin."' doesn't exist";
+ echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
break;
}
require_once($pluginFile);
@@ -361,6 +361,7 @@
$function = 'xnewsletter_plugin_getdata_' . $plugin;
if (!function_exists($function)) {
echo "Error: require function 'xnewsletter_plugin_getdata_".$plugin."' doesn't exist";
+ echo str_replace("%f", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION);
break;
}
@@ -404,14 +405,14 @@
$pluginFile = XNEWSLETTER_PATH . "/plugins/" . $plugin . '.php';
if ( !file_exists($pluginFile) ) {
- echo "Error: File ".$plugin."' doesn't exist";
+ echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
break;
}
require_once($pluginFile);
$function = 'xnewsletter_plugin_getform_' . $plugin;
if (!function_exists($function) ) {
- echo "Error: require function 'xnewsletter_plugin_getform_".$plugin."' doesn't exist";
+ echo str_replace("%f", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION);
break;
}
//$form = $function( $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist );
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-10-16 15:02:14 UTC (rev 12180)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-10-16 16:24:12 UTC (rev 12181)
@@ -1,5 +1,6 @@
Version 1.2
--------------
+ - transfered error text to language file (feichtl/goffy)
- fixed bug when filter subscribers in admin/subscr.php (feichtl/goffy)
- french translation (pierredelu)
- corrected english language files (cesag)
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt 2013-10-16 15:02:14 UTC (rev 12180)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt 2013-10-16 16:24:12 UTC (rev 12181)
@@ -7,4 +7,11 @@
admin.php
----------
define("_AM_XNEWSLETTER_IMPORT_INFO","Add all users of a group to a newsletter");
-define("_AM_XNEWSLETTER_IMPORT_CSV","One column ( email ) or four columns ( email | sex | firstname | lastname)<br />see sample1col.csv and sample4col.csv in /plugins");
\ No newline at end of file
+define("_AM_XNEWSLETTER_IMPORT_CSV","One column ( email ) or four columns ( email | sex | firstname | lastname)<br />see sample1col.csv and sample4col.csv in /plugins");
+
+Version 1.2
+----------------
+admin.php
+----------
+define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN","Error: required file 'plugins/%p.php' not found!");
+define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION","Error: required function 'xnewsletter_plugin_getdata_%f' doesn't exist!");
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php 2013-10-16 15:02:14 UTC (rev 12180)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php 2013-10-16 16:24:12 UTC (rev 12181)
@@ -403,4 +403,7 @@
define("_AM_XNEWSLETTER_SUBSCR_NO_CATSUBSCR","For this e-mail-address are no subscription to newsletter cats available");
+//version 1.2
+define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN","Error: required file 'plugins/%p.php' not found!");
+define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION","Error: required function 'xnewsletter_plugin_getdata_%f' doesn't exist!");
?>
\ No newline at end of file
|
|
From: <go...@us...> - 2013-10-21 09:19:30
|
Revision: 12190
http://sourceforge.net/p/xoops/svn/12190
Author: goffy
Date: 2013-10-21 09:19:26 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
added new block for general info (feichtl/goffy)
removed xoops captcha when unsubscribe by link (feichtl/goffy)
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php
XoopsModules/xnewsletter/trunk/xNewsletter/xoops_version.php
Added Paths:
-----------
XoopsModules/xnewsletter/trunk/xNewsletter/blocks/blocks_subscrinfo.php
XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html
Added: XoopsModules/xnewsletter/trunk/xNewsletter/blocks/blocks_subscrinfo.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/blocks/blocks_subscrinfo.php (rev 0)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/blocks/blocks_subscrinfo.php 2013-10-21 09:19:26 UTC (rev 12190)
@@ -0,0 +1,40 @@
+<?php
+/**
+ * ****************************************************************************
+ * XNEWSLETTER - MODULE FOR XOOPS
+ * Copyright (c) 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 : 1 Mon 2012/11/05 14:31:32 : Exp $
+ * ****************************************************************************
+ */
+
+function b_xnewsletter_subscrinfo($options) {
+
+ xoops_loadLanguage('modinfo', "xNewsletter");
+ $unique_id = uniqid(mt_rand());
+ $subscrinfo = array();
+ $subscrinfo["formname"] = "formsubscrinfo_".$unique_id;
+ $subscrinfo["formaction"] = XOOPS_URL."/modules/xNewsletter/subscription.php";
+ $subscrinfo["infotext"] = _MI_XNEWSLETTER_SUBSCRINFO_TEXT_BLOCK;
+ $subscrinfo["buttontext"] = _MI_XNEWSLETTER_SUBSCRIBE;
+
+ return $subscrinfo;
+
+}
+?>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php 2013-10-21 08:49:51 UTC (rev 12189)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php 2013-10-21 09:19:26 UTC (rev 12190)
@@ -67,8 +67,10 @@
$email_field->setExtra('disabled="disabled"');
}
$email_tray->addElement($email_field, false);
- $email_tray->addElement(new XoopsFormCaptcha('<br /><br />'), true);
- $email_tray->addElement(new XoopsFormButton("<br /><br />", "submit", _AM_XNEWSLETTER_SUBSCRIPTION_SEARCH_ADD, "submit"));
+ if ( $this->getVar("subscr_email") == "" ) {
+ $email_tray->addElement(new XoopsFormCaptcha('<br /><br />'), true);
+ $email_tray->addElement(new XoopsFormButton("<br /><br />", "submit", _AM_XNEWSLETTER_SUBSCRIPTION_SEARCH_ADD, "submit"));
+ }
$form->addElement($email_tray);
$form->addElement(new XoopsFormHidden("op", "exec_search"));
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-10-21 08:49:51 UTC (rev 12189)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-10-21 09:19:26 UTC (rev 12190)
@@ -1,5 +1,7 @@
Version 1.2
--------------
+ - added new block for general info (feichtl/goffy)
+ - removed xoops captcha when unsubscribe by link (feichtl/goffy)
- transfered error text to language file (feichtl/goffy)
- fixed bug when filter subscribers in admin/subscr.php (feichtl/goffy)
- french translation (pierredelu)
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt 2013-10-21 08:49:51 UTC (rev 12189)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt 2013-10-21 09:19:26 UTC (rev 12190)
@@ -15,3 +15,8 @@
----------
define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN","Error: required file 'plugins/%p.php' not found!");
define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION","Error: required function 'xnewsletter_plugin_getdata_%f' doesn't exist!");
+
+modinfo.php
+-----------
+define("_MI_XNEWSLETTER_SUBSCRINFO_BLOCK","Info Newsletter");
+define("_MI_XNEWSLETTER_SUBSCRINFO_TEXT_BLOCK","If you want to be informed in time, then subscribe to our newsletter");
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2013-10-21 08:49:51 UTC (rev 12189)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2013-10-21 09:19:26 UTC (rev 12190)
@@ -84,4 +84,7 @@
define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_TIME', "Time period for sending e-mails in packages");
define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_TIME_DESC', "Time period in minutes, when the next package should be sent. Only used, if 'Send e-mails in packages' is bigger than 0.");
define('_MI_XNEWSLETTER_UPGRADEFAILED', "Error while updating module");
+// version 1.2
+define("_MI_XNEWSLETTER_SUBSCRINFO_BLOCK","Info Newsletter");
+define("_MI_XNEWSLETTER_SUBSCRINFO_TEXT_BLOCK","If you want to be informed in time, then subscribe to our newsletter");
?>
\ No newline at end of file
Added: XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html (rev 0)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html 2013-10-21 09:19:26 UTC (rev 12190)
@@ -0,0 +1,10 @@
+<form name="<{$block.formname}>" id="<{$block.formname}>" action="<{$block.formaction}>" method="post" enctype="multipart/form-data">
+ <table class="outer">
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td style="text-align:center"><{$block.infotext}></td>
+ </tr>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td style="text-align:center"><input type="submit" class="formButton" name="submit" id="submit" value="<{$block.buttontext}>" title="<{$block.buttontext}>" /></td>
+ </tr>
+ </table>
+</form>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/xoops_version.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/xoops_version.php 2013-10-21 08:49:51 UTC (rev 12189)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/xoops_version.php 2013-10-21 09:19:26 UTC (rev 12190)
@@ -22,7 +22,7 @@
* @package xNewsletter
* @author Goffy ( web...@we... )
*
- * Version : $Id: xoops_version.php 181 2013-08-31 20:32:00Z alfred $
+ * Version : $Id: xoops_version.php 200 2013-10-19 21:20:11Z goffy $
* ****************************************************************************
*/
@@ -32,7 +32,7 @@
xoops_load('XoopsLists');
$modversion['name'] = _MI_XNEWSLETTER_NAME;
-$modversion['version'] = 1.2;
+$modversion['version'] = 1.1;
$modversion['description'] = _MI_XNEWSLETTER_DESC;
$modversion['author'] = "Goffy, Alfred";
$modversion['credits'] = "";
@@ -56,10 +56,10 @@
$modversion['module_website_url'] = "wedega.com";
$modversion['module_website_name'] = "Webdesign Gabor";
$modversion['release'] = "1.0";
-$modversion['module_status'] = "Final";
+$modversion['module_status'] = "Stable";
$modversion['release_info'] = "";
$modversion['release_file'] = XOOPS_URL."/modules/{$dirname}/docs/";
-$modversion['release_date'] = "2013/10/20";
+$modversion['release_date'] = "2013/08/27";
$modversion['manual'] = "xNewsletter.txt";
$modversion['manual_file'] = XOOPS_URL."/modules/{$dirname}/docs/";
@@ -338,9 +338,20 @@
$b++;
$modversion['blocks'][$b] = array(
+ 'file' => 'blocks_subscrinfo.php' ,
+ 'name' => _MI_XNEWSLETTER_SUBSCRINFO_BLOCK ,
+ 'description' => '' ,
+ 'show_func' => 'b_xnewsletter_subscrinfo' ,
+ 'edit_func' => '' ,
+ 'template' => 'xnewsletter_subscrinfo_block.html',
+ 'can_clone' => true ,
+ 'options' => ''
+);
+
+$b++;
+$modversion['blocks'][$b] = array(
'file' => 'blocks_catsubscr.php' ,
'name' => _MI_XNEWSLETTER_CATSUBSCR_BLOCK_RECENT ,
- //'description' => _MI_APCAL_BNAME_MINICAL_DESC ,
'description' => '' ,
'show_func' => 'b_xnewsletter_catsubscr' ,
'edit_func' => 'b_xnewsletter_catsubscr_edit' ,
@@ -353,7 +364,6 @@
$modversion['blocks'][$b] = array(
'file' => 'blocks_catsubscr.php' ,
'name' => _MI_XNEWSLETTER_CATSUBSCR_BLOCK_DAY ,
- //'description' => _MI_APCAL_BNAME_MINICAL_DESC ,
'description' => '' ,
'show_func' => 'b_xnewsletter_catsubscr' ,
'edit_func' => 'b_xnewsletter_catsubscr_edit' ,
@@ -366,7 +376,6 @@
$modversion['blocks'][$b] = array(
'file' => 'blocks_letter.php' ,
'name' => _MI_XNEWSLETTER_LETTER_BLOCK_RECENT ,
- //'description' => _MI_APCAL_BNAME_MINICAL_DESC ,
'description' => '' ,
'show_func' => 'b_xnewsletter_letter' ,
'edit_func' => 'b_xnewsletter_letter_edit' ,
@@ -379,7 +388,6 @@
$modversion['blocks'][$b] = array(
'file' => 'blocks_letter.php' ,
'name' => _MI_XNEWSLETTER_LETTER_BLOCK_DAY ,
- //'description' => _MI_APCAL_BNAME_MINICAL_DESC ,
'description' => '' ,
'show_func' => 'b_xnewsletter_letter' ,
'edit_func' => 'b_xnewsletter_letter_edit' ,
@@ -392,7 +400,6 @@
$modversion['blocks'][$b] = array(
'file' => 'blocks_letter.php' ,
'name' => _MI_XNEWSLETTER_LETTER_BLOCK_RANDOM ,
- //'description' => _MI_APCAL_BNAME_MINICAL_DESC ,
'description' => '' ,
'show_func' => 'b_xnewsletter_letter' ,
'edit_func' => 'b_xnewsletter_letter_edit' ,
|
|
From: <luc...@us...> - 2013-10-26 20:53:12
|
Revision: 12216
http://sourceforge.net/p/xoops/svn/12216
Author: luciorota
Date: 2013-10-26 20:53:10 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
added the possibility to clone a newsletter
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/admin/letter.php
XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
Added Paths:
-----------
XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_clone.png
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/admin/letter.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/admin/letter.php 2013-10-24 17:32:31 UTC (rev 12215)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/admin/letter.php 2013-10-26 20:53:10 UTC (rev 12216)
@@ -225,6 +225,9 @@
echo " <a href='letter.php?op=edit_letter&letter_id=".$i."'>
<img src=".XNEWSLETTER_ICON."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' style='padding:1px' />
</a>";
+ echo " <a href='letter.php?op=clone_letter&letter_id=".$i."'>
+ <img src=".XNEWSLETTER_ICON."/xn_clone.png alt='"._CLONE."' title='"._CLONE."' style='padding:1px' />
+ </a>";
echo " <a href='letter.php?op=delete_letter&letter_id=".$i."'>
<img src=".XNEWSLETTER_ICON."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' style='padding:1px' />
</a>";
@@ -279,7 +282,10 @@
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("letter.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- $obj_letter =& $letterHandler->get($letter_id);
+ if ($letter_id > 0)
+ $obj_letter =& $letterHandler->get($letter_id);
+ else
+ $obj_letter =& $letterHandler->create();
//Form letter_title
$obj_letter->setVar("letter_title", $_REQUEST["letter_title"]);
@@ -401,6 +407,19 @@
$form = $obj_letter->getForm(false, true);
$form->display();
break;
+
+ case "clone_letter":
+ echo $indexAdmin->addNavigation("letter.php");
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWLETTER, 'letter.php?op=new_letter', 'add');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_LETTERLIST, 'letter.php?op=list', 'list');
+ echo $indexAdmin->renderButton();
+ $obj_letter = $letterHandler->get($letter_id);
+ $obj_letter->setNew();
+ $obj_letter->setVar('letter_id', 0);
+ $obj_letter->setVar('letter_title', sprintf('cloned: %s', $obj_letter->getVar('letter_title')));
+ $form = $obj_letter->getForm('letter.php', true);
+ $form->display();
+ break;
case "delete_letter":
$obj_letter =& $letterHandler->get($letter_id);
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-10-24 17:32:31 UTC (rev 12215)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-10-26 20:53:10 UTC (rev 12216)
@@ -11,6 +11,7 @@
- changed redirect_header from subscription.php to index.php after successful deleting a subscription (cesag/goffy)
- added plugin for module 'evennews' (tatane/goffy)
- added the possibility to show a list of subscriptions for each subscriber in admin/tab subscriber (goffy)
+ - added the possibility to clone a newsletter (luciorota)
- updated help file concerning import tool (goffy)
- changed query to queryF to solve problems while running imports (goffy)
- Fix error $protocolHandler (alfred)
Added: XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_clone.png
===================================================================
(Binary files differ)
Index: XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_clone.png
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_clone.png 2013-10-24 17:32:31 UTC (rev 12215)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_clone.png 2013-10-26 20:53:10 UTC (rev 12216)
Property changes on: XoopsModules/xnewsletter/trunk/xNewsletter/images/icons/xn_clone.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
|
|
From: <go...@us...> - 2013-11-26 17:15:30
|
Revision: 12233
http://sourceforge.net/p/xoops/svn/12233
Author: goffy
Date: 2013-11-26 17:15:27 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
added new error code if no emailaccount available (cesag/goffy)
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php 2013-11-26 14:08:09 UTC (rev 12232)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php 2013-11-26 17:15:27 UTC (rev 12233)
@@ -178,7 +178,9 @@
}
//read data of account
- $obj_account = $accountsHandler->get($obj_letter->getVar("letter_account"));
+ $letter_account = $obj_letter->getVar("letter_account");
+ if ( $letter_account == "" && $letter_account == 0) return _MA_XNEWSLETTER_ACCOUNTS_NONEAVAIL;
+ $obj_account = $accountsHandler->get($letter_account);
$account_type = $obj_account->getVar("accounts_type");
$account_yourname = $obj_account->getVar("accounts_yourname");
$account_yourmail = $obj_account->getVar("accounts_yourmail");
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php 2013-11-26 14:08:09 UTC (rev 12232)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php 2013-11-26 17:15:27 UTC (rev 12233)
@@ -86,4 +86,6 @@
define('_MA_XNEWSLETTER_SUBSCRIPTION_UNFINISHED', "<span style='color:red'>Attention: the registration has not been confirm till now. Please click on the activating link in the e-mail we sent you. If you did not get this e-mail, please click <a href='%link'>here</a> to get this mail once more.</span>");
define('_MA_XNEWSLETTER_PLEASE_LOGIN', "The email address %s belongs to a registered user. <br /> please login to change the data.");
define('_MA_XNEWSLETTER_LETTER_NONEAVAIL', "No newsletters available for the moment");
+//1.2.2
+define('_MA_XNEWSLETTER_ACCOUNTS_NONEAVAIL', "No email-accounts available for the moment");
?>
\ No newline at end of file
|
|
From: <luc...@us...> - 2013-12-07 22:43:35
|
Revision: 12235
http://sourceforge.net/p/xoops/svn/12235
Author: luciorota
Date: 2013-12-07 22:43:32 +0000 (Sat, 07 Dec 2013)
Log Message:
-----------
added possibility to use title tag in letter templates
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-11-26 23:01:25 UTC (rev 12234)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-12-07 22:43:32 UTC (rev 12235)
@@ -1,38 +1,39 @@
-Version 1.2
---------------
- - added new block for general info (feichtl/goffy)
- - removed xoops captcha when unsubscribe by link (feichtl/goffy)
- - transfered error text to language file (feichtl/goffy)
- - fixed bug when filter subscribers in admin/subscr.php (feichtl/goffy)
- - french translation (pierredelu)
- - corrected english language files (cesag)
- - added plugin for import from module 'subscribers' (cesag/goffy)
- - changed english language file from ansi to utf8 without bom, corrected translation errors (cesag/goffy)
- - changed redirect_header from subscription.php to index.php after successful deleting a subscription (cesag/goffy)
- - added plugin for module 'evennews' (tatane/goffy)
- - added the possibility to show a list of subscriptions for each subscriber in admin/tab subscriber (goffy)
- - added the possibility to clone a newsletter (luciorota)
- - updated help file concerning import tool (goffy)
- - changed query to queryF to solve problems while running imports (goffy)
- - Fix error $protocolHandler (alfred)
- - added the possibility to search for subscriptions concerning an email, if the current user have the right to see/edit subscriptions of other persons (goffy)
- - resize images to xoops standard 16x16 (mamba/goffy)
- - fixed bug in showing tasklist, if email is deleted between creation of task and execution (goffy)
- - fix sql-injection (alfred)
- - Update Adminindex (alfred)
- - fix userinput (alfred)
-
-Version 1.1
---------------
- - Add option to send newsletters in packages by using a cronjob (goffy)
- - Rebuilt importtool based on temporary table (goffy)
- - Changed table names to new xoops table scheme(table name starts with mod_) (goffy)
- - Add Importtool for rmbulletin, xoopsuser, csv, weblinks, smartpartner (goffy)
- - Fix images from xoops (goffy)
- - Fix errors in languages(alfred)
- - fix error none subscriber for send newsletter (goffy)
- - fix error in blocks (goffy)
-
-Version 1.0
---------------
- - Original release xNewsletter (goffy,alfred)
+Version 1.2
+--------------
+ - added possibility to use title tag in letter templates (luciorota)
+ - added new block for general info (feichtl/goffy)
+ - removed xoops captcha when unsubscribe by link (feichtl/goffy)
+ - transfered error text to language file (feichtl/goffy)
+ - fixed bug when filter subscribers in admin/subscr.php (feichtl/goffy)
+ - french translation (pierredelu)
+ - corrected english language files (cesag)
+ - added plugin for import from module 'subscribers' (cesag/goffy)
+ - changed english language file from ansi to utf8 without bom, corrected translation errors (cesag/goffy)
+ - changed redirect_header from subscription.php to index.php after successful deleting a subscription (cesag/goffy)
+ - added plugin for module 'evennews' (tatane/goffy)
+ - added the possibility to show a list of subscriptions for each subscriber in admin/tab subscriber (goffy)
+ - added the possibility to clone a newsletter (luciorota)
+ - updated help file concerning import tool (goffy)
+ - changed query to queryF to solve problems while running imports (goffy)
+ - Fix error $protocolHandler (alfred)
+ - added the possibility to search for subscriptions concerning an email, if the current user have the right to see/edit subscriptions of other persons (goffy)
+ - resize images to xoops standard 16x16 (mamba/goffy)
+ - fixed bug in showing tasklist, if email is deleted between creation of task and execution (goffy)
+ - fix sql-injection (alfred)
+ - Update Adminindex (alfred)
+ - fix userinput (alfred)
+
+Version 1.1
+--------------
+ - Add option to send newsletters in packages by using a cronjob (goffy)
+ - Rebuilt importtool based on temporary table (goffy)
+ - Changed table names to new xoops table scheme(table name starts with mod_) (goffy)
+ - Add Importtool for rmbulletin, xoopsuser, csv, weblinks, smartpartner (goffy)
+ - Fix images from xoops (goffy)
+ - Fix errors in languages(alfred)
+ - fix error none subscriber for send newsletter (goffy)
+ - fix error in blocks (goffy)
+
+Version 1.0
+--------------
+ - Original release xNewsletter (goffy,alfred)
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php 2013-11-26 23:01:25 UTC (rev 12234)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php 2013-12-07 22:43:32 UTC (rev 12235)
@@ -1,426 +1,420 @@
-<?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");
-}
-
-function Create_Tasklist($op, $letter_id, $xn_send_in_packages, $xn_send_in_packages_time) {
- global $xoopsUser, $xoopsDB, $letterHandler, $subscrHandler, $protocolHandler;
-
- $submitter = (is_object($xoopsUser) && isset($xoopsUser)) ? $xoopsUser->uid(): 0;
-
- //check data before creating task list
- if ($letter_id == 0)
- redirect_header("letter.php", 3, _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID);
-
- $obj_letter =& $letterHandler->get($letter_id);
- if (count($obj_letter)==0)
- redirect_header("letter.php", 3, _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID);
-
- //read categories
- $letter_cats = $obj_letter->getVar("letter_cats");
- if ( $letter_cats == "") //no cats
- redirect_header("letter.php", 3, _MA_XNEWSLETTER_LETTER_NONEAVAIL);
-
- if ($op=="send_test") {
- //check for valid email for testing
- $letter_email_test = $obj_letter->getVar("letter_email_test");
- if ($letter_email_test=="")
- redirect_header("letter.php", 3, _AM_XNEWSLETTER_SEND_ERROR_NO_EMAIL);
- }
-
- //get emails of subscribers
- $recipients = array();
- if ($op == "send_test") {
- $recipients[] = 0;
- } else {
- //read all subscribers
- $sql = "SELECT subscr_id, subscr_actkey ";
- $sql .= "FROM ".$xoopsDB->prefix("mod_xnewsletter_subscr")." INNER JOIN ".$xoopsDB->prefix("mod_xnewsletter_catsubscr")." ON subscr_id = catsubscr_subscrid ";
- $sql .= "WHERE subscr_activated=1 AND (((catsubscr_catid) In (";
- $sql .= str_replace("|",",",$letter_cats);
- $sql .= "))) GROUP BY subscr_id;";
-
- $subscribers = $xoopsDB->query($sql) or die();
-
- while ($subscriber = $xoopsDB->fetchArray($subscribers)) {
- $subscr_id = $subscriber["subscr_id"];
- if ($op == 'resend_letter') {
- //read subscribers, where send failed
- $protocol_crit = new CriteriaCompo();
- $protocol_crit->add(new Criteria("protocol_letter_id", $letter_id));
- $protocol_crit->add(new Criteria("protocol_subscriber_id", $subscr_id));
- $protocol_crit->add(new Criteria("protocol_success", 1));
- $protocol_numrows = $protocolHandler->getCount($protocol_crit);
- if ($protocol_numrows > 0) $subscr_id = 0; //letter already successfully sent
- }
- if ($subscr_id > 0) {
- if ($subscriber["subscr_actkey"] == "") {
- $u = $subscrHandler->get($subscr_id);
- $subscriber["subscr_actkey"] = xoops_makepass();
- $u->setVar("subscr_actkey", $subscriber["subscr_actkey"] );
- $subscrHandler->insert($u);
- unset($u);
- }
- $recipients[] = $subscriber["subscr_id"];
- }
- }
- }
-
- if (count($recipients) == 0) {
- redirect_header("letter.php", 3, _AM_XNEWSLETTER_SEND_ERROR_NO_SUBSCR);
- } else {
- //creating task list
- $counter = 0;
- $task_starttime = time() - 1;
- foreach($recipients as $subscriber_id)
- {
- //calculate start time, if letter should be sent in packages
- if ($xn_send_in_packages > 0) {
- if ($counter == $xn_send_in_packages) {
- $task_starttime = $task_starttime + 60*$xn_send_in_packages_time;
- $counter = 0;
- }
- }
- $counter++;
- //create task list item
- $sql = "INSERT INTO `".$xoopsDB->prefix('mod_xnewsletter_task')."` (`task_letter_id`, `task_subscr_id`, `task_starttime`, `task_submitter`, `task_created` ) VALUES ($letter_id, ".$subscriber_id.", $task_starttime, ".$submitter.",".time().")";
- if (!$xoopsDB->queryF($sql)) {
- $obj_protocol =& $protocolHandler->create();
- $obj_protocol->setVar("protocol_letter_id", $letter_id);
- $obj_protocol->setVar("protocol_subscriber_id", $subscriber_id);
- $obj_protocol->setVar("protocol_status", _AM_XNEWSLETTER_TASK_ERROR_CREATE);
- $obj_protocol->setVar("protocol_success", "0");
- $obj_protocol->setVar("protocol_submitter", $submitter);
- $obj_protocol->setVar("protocol_created", time());
- $protocolHandler->insert($obj_protocol);
- unset($obj_protocol);
- }
- }
- }
- return true;
-}
-
-
-function Execute_Tasks( $xn_send_in_packages, $letter_id = 0 ) {
-
- require_once XOOPS_ROOT_PATH."/modules/xNewsletter/include/functions.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" );
-
- global $XoopsTpl, $xoopsDB, $xoopsUser, $letterHandler, $accountsHandler, $subscrHandler, $attachmentHandler, $xoopsModuleConfig;
-
- $protocolHandler =& xoops_getModuleHandler("xNewsletter_protocol", "xNewsletter");
-
- if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH."/class/template.php");
- $xoopsTpl = new XoopsTpl();
- }
- //get template path
- $template_path = XNEWSLETTER_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/templates/';
- if (!is_dir($template_path)) $template_path = XNEWSLETTER_PATH.'/language/english/templates/';
- if (!is_dir($template_path)) {
- return str_replace("%p",$template_path, _AM_XNEWSLETTER_SEND_ERROR_INALID_TEMPLATE_PATH);
- }
-
- //get letters ready to send groups by letter_id
- $sql = "SELECT `task_letter_id` FROM ".$xoopsDB->prefix('mod_xnewsletter_task');
- if ($letter_id > 0) $sql .= " WHERE (`task_letter_id`=".$letter_id.")";
- $sql .= " GROUP BY `task_letter_id`";
- if (!$task_letters = $xoopsDB->query($sql))
- {
- return _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID;
- }
-
- while ($task_letter = $xoopsDB->fetchArray($task_letters)) {
-
- $letter_id = $task_letter["task_letter_id"];
-
- $obj_letter =& $letterHandler->get($letter_id);
- if (count($obj_letter)==0)
- {
- return _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID;
- }
-
- //read categories
- $letter_cats = $obj_letter->getVar("letter_cats");
- if ( $letter_cats == "") //no cats
- {
- return _MA_XNEWSLETTER_LETTER_NONEAVAIL;
- }
-
- //read data of account
- $letter_account = $obj_letter->getVar("letter_account");
- if ( $letter_account == "" && $letter_account == 0) return _MA_XNEWSLETTER_ACCOUNTS_NONEAVAIL;
- $obj_account = $accountsHandler->get($letter_account);
- $account_type = $obj_account->getVar("accounts_type");
- $account_yourname = $obj_account->getVar("accounts_yourname");
- $account_yourmail = $obj_account->getVar("accounts_yourmail");
- $account_username = $obj_account->getVar("accounts_username");
- $account_password = $obj_account->getVar("accounts_password");
- $account_server_out = $obj_account->getVar("accounts_server_out");
- $account_port_out = $obj_account->getVar("accounts_port_out");
- $account_securetype_out = $obj_account->getVar("accounts_securetype_out");
-
- //create basic mail body
- $letter_title = $obj_letter->getVar("letter_title");
- $letter_content = $obj_letter->getVar("letter_content", "n");
-
- $tpl = new XoopsTpl();
- $tpl->assign('content', $letter_content);
-
- // read template
- $letter_template = $obj_letter->getVar("letter_template");
-
- //get emails of subscribers
- $recipients = array();
- $sql_tasklist = "SELECT `task_id`, `task_subscr_id` FROM ".$xoopsDB->prefix('mod_xnewsletter_task')." WHERE ((`task_letter_id`= ".$letter_id.") AND (`task_starttime` < ".time()."))";
- if (!$task_letters = $xoopsDB->query($sql_tasklist)) {
- return $task_letters->getErrors();
- }
- $recipients = array();
- while ($task_letter = $xoopsDB->fetchArray($task_letters)) {
- $subscr_id = $task_letter["task_subscr_id"];
- $task_id = $task_letter["task_id"];
- if ($subscr_id==0) {
- $recipients[] = array(
- "task_id" => $task_id,
- "address" => $obj_letter->getVar("letter_email_test"),
- "firstname" => "John",
- "lastname" => "Doe",
- "subscr_sex" => "Mr.",
- "subscriber_id" => "0",
- "catsubscr_id" => "0",
- "subscriber_actkey" => "Test"
- );
- } else {
- $sql_subscr = "SELECT * FROM ".$xoopsDB->prefix('mod_xnewsletter_subscr')." WHERE `subscr_id`= ".$subscr_id;
- if (!$task_subscrs = $xoopsDB->query($sql_subscr))
- {
- return $task_subscrs->getErrors();
- }
-
- $subscriber = $xoopsDB->fetchArray($task_subscrs);
- $recipients[] = array(
- "task_id" => $task_id,
- "address" => $subscriber["subscr_email"],
- "firstname" => $subscriber["subscr_firstname"],
- "lastname" => $subscriber["subscr_lastname"],
- "subscr_sex" => $subscriber["subscr_sex"],
- "subscriber_id" => $subscriber["subscr_id"],
- "subscriber_actkey" => $subscriber["subscr_actkey"]
- );
- }
- if ($xn_send_in_packages > 0 && count($recipients)==$xn_send_in_packages) break;
- }
-
- if (count($recipients) == 0) {
- return null;
- }
-
- //read attachments
- $attachment_crit = new CriteriaCompo();
- $attachment_crit->add(new Criteria("attachment_letter_id", $letter_id));
- $attachment_crit->setSort("attachment_id");
- $attachment_crit->setOrder("ASC");
- $att_numrows= $attachmentHandler->getCount($attachment_crit);
- if ($att_numrows > 0) {
- $attachment_arr = $attachmentHandler->getall($attachment_crit);
- foreach (array_keys($attachment_arr) as $attid) {
- $uploaddir = XOOPS_UPLOAD_PATH.$xoopsModuleConfig['xn_attachment_path'];
- if (substr($uploaddir, -1)!="/") $uploaddir .= "/"; //check, whether path seperator is existing
- $uploaddir .= $letter_id."/";
- $attachments[] = $uploaddir.$attachment_arr[$attid]->getVar("attachment_name");
- }
- } else {
- $attachments = array();
- }
-
- $senderuid = (is_object($xoopsUser) && isset($xoopsUser)) ? $xoopsUser->uid(): 0;
- $count_total = 0;
- $count_err = 0;
-
- try {
-
- if ($account_type == _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
- $pop = new POP3();
- $pop->Authorise($account_server_out, $account_port_out, 30, $account_username, $account_password, 1);
- }
-
- $mail = new PHPMailer();
-
- $mail->CharSet = _CHARSET; //use xoops default character set
-
- if ($account_type == _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
- //$mail->IsSendmail(); Fix Error
- }
-
- $mail->Username = $account_username; // SMTP account username
- $mail->Password = $account_password; // SMTP account password
-
- if ($account_type == _AM_ACCOUNTS_TYPE_VAL_POP3) {
- $mail->IsSMTP();
- //$mail->SMTPDebug = 2;
- $mail->Host = $account_server_out;
- }
-
- if ($account_type == _AM_ACCOUNTS_TYPE_VAL_SMTP || $account_type == _AM_ACCOUNTS_TYPE_VAL_GMAIL) {
- $mail->Port = $account_port_out; // set the SMTP port
- $mail->Host = $account_server_out; //sometimes necessary to repeat
- }
-
- if ($account_securetype_out !="") {
- $mail->SMTPAuth = true;
- $mail->SMTPSecure = $account_securetype_out; // sets the prefix to the server
- }
-
- $mail->SetFrom($account_yourmail, $account_yourname);
- $mail->AddReplyTo($account_yourmail, $account_yourname);
- $mail->Subject = $letter_title;
-
- foreach ($recipients as $recipient) {
-
- $subscriber_id = $recipient["subscriber_id"];
-
- $tpl->assign('sex', $recipient["subscr_sex"]);
- $tpl->assign('firstname', $recipient["firstname"]);
- $tpl->assign('lastname', $recipient["lastname"]);
- $tpl->assign('subscr_email', $recipient["address"]);
-
- $code = XOOPS_URL . "||" . $subscriber_id . "||" . $recipient["subscriber_actkey"] . "||" . $recipient["address"];
- $code = base64_encode( $code );
- $link = XOOPS_URL . "/modules/xNewsletter/subscription.php?op=unsub&email=" . $recipient["address"] . "&actkey=" . $code;
- $tpl->assign('unsubscribe_link', $link);
-
- $body = $tpl->fetch($template_path.$letter_template.'.html');
-
- $mail->AddAddress($recipient["address"], $recipient["firstname"]." ".$recipient["lastname"]);
-
- //$mail->AltBody = _AM_XNEWSLETTER_LETTER_EMAIL_ALTBODY;
-
- $mail->MsgHTML($body);
- $mail->AltBody = strip_tags($body . "\n" . $link);
-
- foreach ($attachments as $attachment) {
- if ( file_exists($attachment)) {
- $mail->AddAttachment($attachment);
- echo "<br>att exist:".$attachment;
- } else {
- echo "<br>att not exist:".$attachment;
- }
- }
- $count_total ++;
- if ( $mail->Send()) {
- if ($subscriber_id == 0) {
- $protocol_status = _AM_XNEWSLETTER_SEND_SUCCESS_TEST." (".$recipient["address"].")";
- } else {
- $protocol_status = _AM_XNEWSLETTER_SEND_SUCCESS;
- }
- $protocol_success = "1";
- } else {
- $protocol_status = _AM_XNEWSLETTER_FAILED . "-> " . $mail->ErrorInfo;
- $protocol_success = "0";
- $count_err ++;
- }
- //create item in protocol for this email
- $text_clean = array("<strong>", "</strong>", "<br/>", "<br />");
- $protocol_status = str_replace($text_clean,"",$protocol_status);
-
- $mail->ClearAddresses();
-
- //delete item in table task
- $sql_del="DELETE FROM ".$xoopsDB->prefix('mod_xnewsletter_task')." WHERE `task_id`=".$recipient["task_id"];
- $result = $xoopsDB->queryF($sql_del);
-
- $obj_protocol =& $protocolHandler->create();
- $obj_protocol->setVar("protocol_letter_id", $letter_id);
- $obj_protocol->setVar("protocol_subscriber_id", $subscriber_id);
- $obj_protocol->setVar("protocol_status", $protocol_status);
- $obj_protocol->setVar("protocol_success", $protocol_success);
- $obj_protocol->setVar("protocol_submitter", $senderuid);
- $obj_protocol->setVar("protocol_created", time());
-
- if ($protocolHandler->insert($obj_protocol)) {
- //create protocol is ok
- } else {
- echo $obj_protocol->getHtmlErrors();
- }
- unset($obj_protocol);
- }
-
- unset($mail);
-
- } catch (phpmailerException $e) {
- $protocol_status = _AM_XNEWSLETTER_SEND_ERROR_PHPMAILER . $e->errorMessage(); //error messages from PHPMailer
- $count_err ++;
- $protocol_success = "0";
- } catch (Exception $e) {
- $protocol_status = _AM_XNEWSLETTER_SEND_ERROR_PHPMAILER . $e->getMessage(); //error messages from anything else!
- $count_err ++;
- $protocol_success = "0";
- }
-
- }
-
- //create final protocol item
- if ($count_err > 0) {
- $protocol_status = _AM_XNEWSLETTER_SEND_ERROR_NUMBER;
- $protocol_status = str_replace("%e",$count_err,$protocol_status);
- $protocol_status = str_replace("%t",$count_total,$protocol_status);
- $protocol_success = 0;
- } else {
- $protocol_success = 1;
- if ($count_total > 0) {
- $protocol_status = _AM_XNEWSLETTER_SEND_SUCCESS_NUMBER;
- $protocol_status = str_replace("%t",$count_total,$protocol_status);
- } else {
- $protocol_status = '';
- }
- }
- $obj_protocol =& $protocolHandler->create();
- $obj_protocol->setVar("protocol_letter_id", $letter_id);
- $obj_protocol->setVar("protocol_subscriber_id", "0");
- $obj_protocol->setVar("protocol_status", $protocol_status);
- $obj_protocol->setVar("protocol_success", $protocol_success);
- $obj_protocol->setVar("protocol_submitter", $senderuid);
- $obj_protocol->setVar("protocol_created", time());
-
- if ($protocolHandler->insert($obj_protocol)) {
- //create protocol is ok
- } else {
- echo $obj_protocol->getHtmlErrors();
- }
- unset($obj_protocol);
-
- return $protocol_status;
-}
-
-?>
\ No newline at end of file
+<?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");
+}
+
+function Create_Tasklist($op, $letter_id, $xn_send_in_packages, $xn_send_in_packages_time) {
+ global $xoopsUser, $xoopsDB, $letterHandler, $subscrHandler, $protocolHandler;
+
+ $submitter = (is_object($xoopsUser) && isset($xoopsUser)) ? $xoopsUser->uid(): 0;
+
+ //check data before creating task list
+ if ($letter_id == 0) {
+ redirect_header("letter.php", 3, _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID);
+ }
+
+ $obj_letter =& $letterHandler->get($letter_id);
+ if (count($obj_letter)==0) {
+ redirect_header("letter.php", 3, _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID);
+ }
+
+ //read categories
+ $letter_cats = $obj_letter->getVar("letter_cats");
+ if ( $letter_cats == "") {
+ //no cats
+ redirect_header("letter.php", 3, _MA_XNEWSLETTER_LETTER_NONEAVAIL);
+ }
+
+ if ($op=="send_test") {
+ //check for valid email for testing
+ $letter_email_test = $obj_letter->getVar("letter_email_test");
+ if ($letter_email_test=="")
+ redirect_header("letter.php", 3, _AM_XNEWSLETTER_SEND_ERROR_NO_EMAIL);
+ }
+
+ //get emails of subscribers
+ $recipients = array();
+ if ($op == "send_test") {
+ $recipients[] = 0;
+ } else {
+ //read all subscribers
+ $sql = "SELECT subscr_id, subscr_actkey ";
+ $sql .= "FROM ".$xoopsDB->prefix("mod_xnewsletter_subscr")." INNER JOIN ".$xoopsDB->prefix("mod_xnewsletter_catsubscr")." ON subscr_id = catsubscr_subscrid ";
+ $sql .= "WHERE subscr_activated=1 AND (((catsubscr_catid) In (";
+ $sql .= str_replace("|",",",$letter_cats);
+ $sql .= "))) GROUP BY subscr_id;";
+
+ $subscribers = $xoopsDB->query($sql) or die();
+
+ while ($subscriber = $xoopsDB->fetchArray($subscribers)) {
+ $subscr_id = $subscriber["subscr_id"];
+ if ($op == 'resend_letter') {
+ //read subscribers, where send failed
+ $protocol_crit = new CriteriaCompo();
+ $protocol_crit->add(new Criteria("protocol_letter_id", $letter_id));
+ $protocol_crit->add(new Criteria("protocol_subscriber_id", $subscr_id));
+ $protocol_crit->add(new Criteria("protocol_success", 1));
+ $protocol_numrows = $protocolHandler->getCount($protocol_crit);
+ if ($protocol_numrows > 0) $subscr_id = 0; //letter already successfully sent
+ }
+ if ($subscr_id > 0) {
+ if ($subscriber["subscr_actkey"] == "") {
+ $u = $subscrHandler->get($subscr_id);
+ $subscriber["subscr_actkey"] = xoops_makepass();
+ $u->setVar("subscr_actkey", $subscriber["subscr_actkey"] );
+ $subscrHandler->insert($u);
+ unset($u);
+ }
+ $recipients[] = $subscriber["subscr_id"];
+ }
+ }
+ }
+
+ if (count($recipients) == 0) {
+ redirect_header("letter.php", 3, _AM_XNEWSLETTER_SEND_ERROR_NO_SUBSCR);
+ } else {
+ //creating task list
+ $counter = 0;
+ $task_starttime = time() - 1;
+ foreach($recipients as $subscriber_id) {
+ //calculate start time, if letter should be sent in packages
+ if ($xn_send_in_packages > 0) {
+ if ($counter == $xn_send_in_packages) {
+ $task_starttime = $task_starttime + 60*$xn_send_in_packages_time;
+ $counter = 0;
+ }
+ }
+ $counter++;
+ //create task list item
+ $sql = "INSERT INTO `".$xoopsDB->prefix('mod_xnewsletter_task')."` (`task_letter_id`, `task_subscr_id`, `task_starttime`, `task_submitter`, `task_created` ) VALUES ($letter_id, ".$subscriber_id.", $task_starttime, ".$submitter.",".time().")";
+ if (!$xoopsDB->queryF($sql)) {
+ $obj_protocol =& $protocolHandler->create();
+ $obj_protocol->setVar("protocol_letter_id", $letter_id);
+ $obj_protocol->setVar("protocol_subscriber_id", $subscriber_id);
+ $obj_protocol->setVar("protocol_status", _AM_XNEWSLETTER_TASK_ERROR_CREATE);
+ $obj_protocol->setVar("protocol_success", "0");
+ $obj_protocol->setVar("protocol_submitter", $submitter);
+ $obj_protocol->setVar("protocol_created", time());
+ $protocolHandler->insert($obj_protocol);
+ unset($obj_protocol);
+ }
+ }
+ }
+return true;
+}
+
+
+
+function Execute_Tasks( $xn_send_in_packages, $letter_id = 0 ) {
+ require_once XOOPS_ROOT_PATH."/modules/xNewsletter/include/functions.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" );
+
+ global $XoopsTpl, $xoopsDB, $xoopsUser, $letterHandler, $accountsHandler, $subscrHandler, $attachmentHandler, $xoopsModuleConfig;
+
+ $protocolHandler =& xoops_getModuleHandler("xNewsletter_protocol", "xNewsletter");
+
+ if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+ }
+ //get template path
+ $template_path = XNEWSLETTER_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/templates/';
+ if (!is_dir($template_path)) $template_path = XNEWSLETTER_PATH.'/language/english/templates/';
+ if (!is_dir($template_path)) {
+ return str_replace("%p",$template_path, _AM_XNEWSLETTER_SEND_ERROR_INALID_TEMPLATE_PATH);
+ }
+
+ //get letters ready to send groups by letter_id
+ $sql = "SELECT `task_letter_id` FROM ".$xoopsDB->prefix('mod_xnewsletter_task');
+ if ($letter_id > 0) $sql .= " WHERE (`task_letter_id`=".$letter_id.")";
+ $sql .= " GROUP BY `task_letter_id`";
+ if (!$task_letters = $xoopsDB->query($sql)) {
+ return _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID;
+ }
+
+ while ($task_letter = $xoopsDB->fetchArray($task_letters)) {
+ $letter_id = ...
[truncated message content] |
|
From: <luc...@us...> - 2013-12-09 21:08:41
|
Revision: 12237
http://sourceforge.net/p/xoops/svn/12237
Author: luciorota
Date: 2013-12-09 21:08:35 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
added newsletter info field is html compatible
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/admin/cat.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_cat.php
XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/trunk/xNewsletter/header.php
XoopsModules/xnewsletter/trunk/xNewsletter/index.php
XoopsModules/xnewsletter/trunk/xNewsletter/letter.php
XoopsModules/xnewsletter/trunk/xNewsletter/print.php
XoopsModules/xnewsletter/trunk/xNewsletter/protocol.php
XoopsModules/xnewsletter/trunk/xNewsletter/sendletter.php
XoopsModules/xnewsletter/trunk/xNewsletter/sql/mysql.sql
XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/xNewsletter_footer.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/xNewsletter_header.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/xNewsletter_index.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/xnewsletter_letter.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/xnewsletter_letter_list.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/xnewsletter_protocol.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/xnewsletter_subscription.html
XoopsModules/xnewsletter/trunk/xNewsletter/templates/xnewsletter_subscription_result.html
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/admin/cat.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/admin/cat.php 2013-12-09 20:59:44 UTC (rev 12236)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/admin/cat.php 2013-12-09 21:08:35 UTC (rev 12237)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* ****************************************************************************
* - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
@@ -31,310 +31,307 @@
//global $pathIcon, $indexAdmin;
global $xoopsModuleConfig;
// We recovered the value of the argument op in the URL$
-$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
+$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
$cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id', 0, 'int');
-switch ($op)
-{
- case "list":
- default:
- echo $indexAdmin->addNavigation('cat.php');
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCAT, 'cat.php?op=new_cat', 'add');
- echo $indexAdmin->renderButton();
- $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
- $criteria = new CriteriaCompo();
- $criteria->setSort("cat_id ASC, cat_name");
- $criteria->setOrder("ASC");
- $numrows = $catHandler->getCount();
- $start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $cat_arr = $catHandler->getall($criteria);
- if ( $numrows > $limit ) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
- $pagenav = $pagenav->renderNav(4);
- } else {
- $pagenav = '';
- }
-
- // View Table
- if ($numrows > 0)
- {
- echo "<table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width2'>"._AM_XNEWSLETTER_CAT_ID."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_NAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_INFO."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_GPERMS_ADMIN."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_GPERMS_CREATE."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_GPERMS_LIST."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_GPERMS_READ."</th>";
- if (isset($xoopsModuleConfig['xn_use_mailinglist']) && $xoopsModuleConfig['xn_use_mailinglist'] == 1) {
- echo "<th class='center'>"._AM_XNEWSLETTER_CAT_MAILINGLIST."</th>";
- }
- echo "<th class='center width5'>"._AM_XNEWSLETTER_FORMACTION."</th>
- </tr>";
-
- $class = "odd";
+switch ($op) {
+ case "list" :
+ default:
+ echo $indexAdmin->addNavigation('cat.php');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCAT, 'cat.php?op=new_cat', 'add');
+ echo $indexAdmin->renderButton();
+ $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("cat_id ASC, cat_name");
+ $criteria->setOrder("ASC");
+ $numrows = $catHandler->getCount();
+ $start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $cat_arr = $catHandler->getall($criteria);
+ if ( $numrows > $limit ) {
+ include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
+ $pagenav = $pagenav->renderNav(4);
+ } else {
+ $pagenav = '';
+ }
- $member_handler =& xoops_gethandler('member');
- $grouplist = $member_handler->getGroupList();
- global $xoopsModule;
- $mid = $xoopsModule->mid();
- $gperm_handler = xoops_gethandler('groupperm');
+ // View Table
+ if ($numrows > 0) {
+ echo "<table class='outer width100' cellspacing='1'>";
+ echo "<tr>";
+ echo " <th class='center width2'>"._AM_XNEWSLETTER_CAT_ID . "</th>";
+ echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_NAME . "</th>";
+ echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_INFO . "</th>";
+ echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_ADMIN . "</th>";
+ echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_CREATE . "</th>";
+ echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_LIST . "</th>";
+ echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_READ . "</th>";
+ if (isset($xoopsModuleConfig['xn_use_mailinglist']) && $xoopsModuleConfig['xn_use_mailinglist'] == 1) {
+ echo "<th class='center'>" . _AM_XNEWSLETTER_CAT_MAILINGLIST . "</th>";
+ }
+ echo "<th class='center width5'>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
+ echo "</tr>";
- foreach (array_keys($cat_arr) as $i)
- {
- echo "<tr class='".$class."'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>".$i."</td>";
- echo "<td class='center'>".$cat_arr[$i]->getVar("cat_name")."</td>";
- echo "<td class='center'>".$cat_arr[$i]->getVar("cat_info")."</td>";
-
- //cat_gperms_admin;
- $arr_cat_gperms_admin = "";
- $cat_gperms_admin = "";
- $arr_cat_gperms_admin =& $gperm_handler->getGroupIds('newsletter_admin_cat', $i, $mid);
- sort ( $arr_cat_gperms_admin );
- foreach($arr_cat_gperms_admin as $groupid_admin) {
- $cat_gperms_admin .= $grouplist[$groupid_admin]." | ";
- }
- $cat_gperms_admin = substr($cat_gperms_admin, 0, -3);
- echo "<td class='center'>".$cat_gperms_admin."</td>";
-
- //cat_gperms_create
- $arr_cat_gperms_create = "";
- $cat_gperms_create = "";
- $arr_cat_gperms_create =& $gperm_handler->getGroupIds('newsletter_create_cat', $i, $mid);
- sort ( $arr_cat_gperms_create );
- foreach($arr_cat_gperms_create as $groupid_create) {
- $cat_gperms_create .= $grouplist[$groupid_create]." | ";
- }
- $cat_gperms_create = substr($cat_gperms_create, 0, -3);
- echo "<td class='center'>".$cat_gperms_create."</td>";
+ $class = "odd";
- //cat_gperms_list
- $cat_gperms_list = "";
- $arr_cat_gperms_list = "";
- $arr_cat_gperms_list = & $gperm_handler->getGroupIds('newsletter_list_cat', $i, $mid);
- sort ( $arr_cat_gperms_list );
- foreach($arr_cat_gperms_list as $groupid_list) {
- $cat_gperms_list .= $grouplist[$groupid_list]." | ";
- }
- $cat_gperms_list = substr($cat_gperms_list, 0, -3);
- echo "<td class='center'>".$cat_gperms_list."</td>";
-
- //cat_gperms_read
- $cat_gperms_read = "";
- $arr_cat_groupperms = "";
- $arr_cat_groupperms = & $gperm_handler->getGroupIds('newsletter_read_cat', $i, $mid);
- sort ( $arr_cat_groupperms );
- foreach($arr_cat_groupperms as $groupid_read) {
- $cat_gperms_read .= $grouplist[$groupid_read]." | ";
- }
- $cat_gperms_read = substr($cat_gperms_read, 0, -3);
- echo "<td class='center'>".$cat_gperms_read."</td>";
-
-
- if (isset($xoopsModuleConfig['xn_use_mailinglist']) && $xoopsModuleConfig['xn_use_mailinglist'] == 1) {
- echo "<td class='center'>".$cat_arr[$i]->getVar("cat_mailinglist")."</td>";
- }
- echo "<td class='center width5' nowrap='nowrap'>
- <a href='cat.php?op=edit_cat&cat_id=".$i."'><img src=".XNEWSLETTER_ICON."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>
- <a href='cat.php?op=delete_cat&cat_id=".$i."'><img src=".XNEWSLETTER_ICON."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' /></a>
- </td>";
- echo "</tr>";
- }
- echo "</table><br /><br />";
- echo "<br /><div class='center'>" . $pagenav . "</div><br />";
- } else {
- echo "<table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width2'>"._AM_XNEWSLETTER_CAT_ID."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_NAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_INFO."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_GPERMS_ADMIN."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_GPERMS_CREATE."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_GPERMS_READ."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_GPERMS_LIST."</th>
- <th class='center'>"._AM_XNEWSLETTER_CAT_MAILINGLIST."</th>
- <th class='center width5'>"._AM_XNEWSLETTER_FORMACTION."</th>
- </tr>";
- echo "</table><br /><br />";
- }
-
- break;
+ $member_handler =& xoops_gethandler('member');
+ $grouplist = $member_handler->getGroupList();
+ global $xoopsModule;
+ $mid = $xoopsModule->mid();
+ $gperm_handler = xoops_gethandler('groupperm');
- case "new_cat":
+ foreach (array_keys($cat_arr) as $i) {
+ echo "<tr class='" . $class . "'>";
+ $class = ($class == "even") ? "odd" : "even";
+ echo "<td class='center'>" . $i . "</td>";
+ echo "<td class='center'>" . $cat_arr[$i]->getVar("cat_name") . "</td>";
+ echo "<td>" . $cat_arr[$i]->getVar("cat_info") . "</td>";
+
+ // cat_gperms_admin;
+ $arr_cat_gperms_admin = "";
+ $cat_gperms_admin = "";
+ $arr_cat_gperms_admin =& $gperm_handler->getGroupIds('newsletter_admin_cat', $i, $mid);
+ sort ( $arr_cat_gperms_admin );
+ foreach($arr_cat_gperms_admin as $groupid_admin) {
+ $cat_gperms_admin .= $grouplist[$groupid_admin] . " | ";
+ }
+ $cat_gperms_admin = substr($cat_gperms_admin, 0, -3);
+ echo "<td class='center'>" . $cat_gperms_admin . "</td>";
+
+ // cat_gperms_create
+ $arr_cat_gperms_create = "";
+ $cat_gperms_create = "";
+ $arr_cat_gperms_create =& $gperm_handler->getGroupIds('newsletter_create_cat', $i, $mid);
+ sort ( $arr_cat_gperms_create );
+ foreach($arr_cat_gperms_create as $groupid_create) {
+ $cat_gperms_create .= $grouplist[$groupid_create]." | ";
+ }
+ $cat_gperms_create = substr($cat_gperms_create, 0, -3);
+ echo "<td class='center'>" . $cat_gperms_create . "</td>";
+
+ // cat_gperms_list
+ $cat_gperms_list = "";
+ $arr_cat_gperms_list = "";
+ $arr_cat_gperms_list = & $gperm_handler->getGroupIds('newsletter_list_cat', $i, $mid);
+ sort ( $arr_cat_gperms_list );
+ foreach($arr_cat_gperms_list as $groupid_list) {
+ $cat_gperms_list .= $grouplist[$groupid_list] . " | ";
+ }
+ $cat_gperms_list = substr($cat_gperms_list, 0, -3);
+ echo "<td class='center'>" . $cat_gperms_list . "</td>";
+
+ // cat_gperms_read
+ $cat_gperms_read = "";
+ $arr_cat_groupperms = "";
+ $arr_cat_groupperms = & $gperm_handler->getGroupIds('newsletter_read_cat', $i, $mid);
+ sort ( $arr_cat_groupperms );
+ foreach($arr_cat_groupperms as $groupid_read) {
+ $cat_gperms_read .= $grouplist[$groupid_read] . " | ";
+ }
+ $cat_gperms_read = substr($cat_gperms_read, 0, -3);
+ echo "<td class='center'>". $cat_gperms_read . "</td>";
+
+ if (isset($xoopsModuleConfig['xn_use_mailinglist']) && $xoopsModuleConfig['xn_use_mailinglist'] == 1) {
+ echo "<td class='center'>" . $cat_arr[$i]->getVar("cat_mailinglist") . "</td>";
+ }
+ echo "<td class='center width5' nowrap='nowrap'>";
+ echo "<a href='cat.php?op=edit_cat&cat_id=" . $i . "'><img src=".XNEWSLETTER_ICON."/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>";
+ echo " <a href='cat.php?op=delete_cat&cat_id=" . $i . "'><img src=" . XNEWSLETTER_ICON . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
+ echo "</td>";
+ echo "</tr>";
+ }
+ echo "</table><br /><br />";
+ echo "<br /><div class='center'>" . $pagenav . "</div><br />";
+ } else {
+ echo "<table class='outer width100' cellspacing='1'>";
+ echo "<tr>";
+ echo "<th class='center width2'>" . _AM_XNEWSLETTER_CAT_ID . "</th>";
+ echo "<th class='center'>" . _AM_XNEWSLETTER_CAT_NAME . "</th>";
+ echo "<th class='center'>" . _AM_XNEWSLETTER_CAT_INFO . "</th>";
+ echo "<th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_ADMIN . "</th>";
+ echo "<th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_CREATE . "</th>";
+ echo "<th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_READ . "</th>";
+ echo "<th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_LIST . "</th>";
+ echo "<th class='center'>" . _AM_XNEWSLETTER_CAT_MAILINGLIST . "</th>";
+ echo "<th class='center width5'>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
+ echo "</tr>";
+ echo "</table><br /><br />";
+ }
+ break;
+
+ case "new_cat" :
echo $indexAdmin->addNavigation("cat.php");
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, 'cat.php?op=list', 'list');
echo $indexAdmin->renderButton();
$obj =& $catHandler->create();
$form = $obj->getForm();
- $form->display();
- break;
-
- case "save_cat":
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("cat.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
-
- $obj =& $catHandler->get($cat_id);
-
- //Form cat_name
- $obj->setVar("cat_name", xNewsletter_CleanVars( $_REQUEST, "cat_name", "", "string") );
- //Form cat_info
- $obj->setVar("cat_info", xNewsletter_CleanVars( $_REQUEST, "cat_info", "", "string") );
-
- global $xoopsDB, $xoopsModule;
+ $form->display();
+ break;
- $mid = $xoopsModule->mid();
- $gperm_handler = xoops_gethandler('groupperm');
-
- //Form cat_mailinglist
- $cat_mailinglist = !empty($_REQUEST["cat_mailinglist"]) ? intval($_REQUEST["cat_mailinglist"]) : 0;
- $obj->setVar("cat_mailinglist", $cat_mailinglist);
-
- //Form cat_submitter
- $obj->setVar("cat_submitter", $xoopsUser->uid());
- //Form cat_created
- $obj->setVar("cat_created", time());
-
- if ($catHandler->insert($obj)) {
-
- $cat_id = $obj->getVar("cat_id");
-
- //Form cat_gperms_admin
- $arr_cat_gperms_create = $_POST["cat_gperms_admin"];
- if ($cat_id > 0) {
- $sql = "DELETE FROM `".$xoopsDB->prefix("group_permission")."` WHERE `gperm_name`='newsletter_admin_cat' AND `gperm_itemid`=$cat_id;";
- $xoopsDB->query($sql);
- }
- //admin
- $gperm =& $gperm_handler->create();
- $gperm->setVar('gperm_groupid', XOOPS_GROUP_ADMIN);
- $gperm->setVar('gperm_name', 'newsletter_admin_cat');
- $gperm->setVar('gperm_modid', $mid);
- $gperm->setVar('gperm_itemid', $cat_id);
- $gperm_handler->insert($gperm);
- unset($gperm);
- foreach($arr_cat_gperms_create as $key => $cat_groupperm) {
- $gperm =& $gperm_handler->create();
- $gperm->setVar('gperm_groupid', $cat_groupperm);
- $gperm->setVar('gperm_name', 'newsletter_admin_cat');
- $gperm->setVar('gperm_modid', $mid);
- $gperm->setVar('gperm_itemid', $cat_id);
- $gperm_handler->insert($gperm);
- unset($gperm);
- }
-
- //Form cat_gperms_create
- $arr_cat_gperms_create = $_POST["cat_gperms_create"];
- if ($cat_id > 0) {
- $sql = "DELETE FROM `".$xoopsDB->prefix("group_permission")."` WHERE `gperm_name`='newsletter_create_cat' AND `gperm_itemid`=$cat_id;";
- $xoopsDB->query($sql);
- }
- //admin
- $gperm =& $gperm_handler->create();
- $gperm->setVar('gperm_groupid', XOOPS_GROUP_ADMIN);
- $gperm->setVar('gperm_name', 'newsletter_create_cat');
- $gperm->setVar('gperm_modid', $mid);
- $gperm->setVar('gperm_itemid', $cat_id);
- $gperm_handler->insert($gperm);
- unset($gperm);
- foreach($arr_cat_gperms_create as $key => $cat_groupperm) {
- $gperm =& $gperm_handler->create();
- $gperm->setVar('gperm_groupid', $cat_groupperm);
- $gperm->setVar('gperm_name', 'newsletter_create_cat');
- $gperm->setVar('gperm_modid', $mid);
- $gperm->setVar('gperm_itemid', $cat_id);
- $gperm_handler->insert($gperm);
- unset($gperm);
- }
-
- //Form cat_gperms_read
- $arr_cat_gperms_read = $_POST["cat_gperms_read"];
- if ($cat_id > 0) {
- $sql = "DELETE FROM `".$xoopsDB->prefix("group_permission")."` WHERE `gperm_name`='newsletter_read_cat' AND `gperm_itemid`=$cat_id;";
- $xoopsDB->query($sql);
- }
- //admin
- $gperm =& $gperm_handler->create();
- $gperm->setVar('gperm_groupid', XOOPS_GROUP_ADMIN);
- $gperm->setVar('gperm_name', 'newsletter_read_cat');
- $gperm->setVar('gperm_modid', $mid);
- $gperm->setVar('gperm_itemid', $cat_id);
- $gperm_handler->insert($gperm);
- unset($gperm);
- foreach($arr_cat_gperms_read as $key => $cat_groupperm) {
- $gperm =& $gperm_handler->create();
- $gperm->setVar('gperm_groupid', $cat_groupperm);
- $gperm->setVar('gperm_name', 'newsletter_read_cat');
- $gperm->setVar('gperm_modid', $mid);
- $gperm->setVar('gperm_itemid', $cat_id);
- $gperm_handler->insert($gperm);
- unset($gperm);
- }
-
- //Form cat_gperms_list
- $arr_cat_gperms_list = $_POST["cat_gperms_list"];
- if ($cat_id > 0) {
- $sql = "DELETE FROM `".$xoopsDB->prefix("group_permission")."` WHERE `gperm_name`='newsletter_list_cat' AND `gperm_itemid`=$cat_id;";
- $xoopsDB->query($sql);
- }
- //admin
- $gperm =& $gperm_handler->create();
- $gperm->setVar('gperm_groupid', XOOPS_GROUP_ADMIN);
- $gperm->setVar('gperm_name', 'newsletter_list_cat');
- $gperm->setVar('gperm_modid', $mid);
- $gperm->setVar('gperm_itemid', $cat_id);
- $gperm_handler->insert($gperm);
- unset($gperm);
- foreach($arr_cat_gperms_list as $key => $cat_groupperm) {
- $gperm =& $gperm_handler->create();
- $gperm->setVar('gperm_groupid', $cat_groupperm);
- $gperm->setVar('gperm_name', 'newsletter_list_cat');
- $gperm->setVar('gperm_modid', $mid);
- $gperm->setVar('gperm_itemid', $cat_id);
- $gperm_handler->insert($gperm);
- unset($gperm);
- }
-
- redirect_header("cat.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
- }
+ case "save_cat":
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("cat.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+
+ $obj =& $catHandler->get($cat_id);
- echo $obj->getHtmlErrors();
- $form =& $obj->getForm();
- $form->display();
- break;
-
- case "edit_cat":
- echo $indexAdmin->addNavigation("cat.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCAT, 'cat.php?op=new_cat', 'add');
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, 'cat.php?op=list', 'list');
- echo $indexAdmin->renderButton();
- $obj = $catHandler->get($cat_id);
- $form = $obj->getForm();
- $form->display();
- break;
-
- case "delete_cat":
- $obj =& $catHandler->get($_REQUEST["cat_id"]);
- if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("cat.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
- if ($catHandler->delete($obj)) {
- redirect_header("cat.php", 3, _AM_XNEWSLETTER_FORMDELOK);
- } else {
- echo $obj->getHtmlErrors();
- }
- } else {
- xoops_confirm(array("ok" => 1, "cat_id" => $cat_id, "op" => "delete_cat"), $_SERVER["REQUEST_URI"], sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $obj->getVar("cat_name")));
- }
- break;
+ // Form cat_name
+ $obj->setVar("cat_name", $_POST["cat_name"] );
+ // Form cat_info
+ $obj->setVar("cat_info", $_POST["cat_info"] );
+
+ global $xoopsDB, $xoopsModule;
+
+ $mid = $xoopsModule->mid();
+ $gperm_handler = xoops_gethandler('groupperm');
+
+ // Form cat_mailinglist
+ $cat_mailinglist = !empty($_REQUEST["cat_mailinglist"]) ? intval($_REQUEST["cat_mailinglist"]) : 0;
+ $obj->setVar("cat_mailinglist", $cat_mailinglist);
+
+ // Form cat_submitter
+ $obj->setVar("cat_submitter", $xoopsUser->uid());
+ // Form cat_created
+ $obj->setVar("cat_created", time());
+
+ if ($catHandler->insert($obj)) {
+ $cat_id = $obj->getVar("cat_id");
+
+ //Form cat_gperms_admin
+ $arr_cat_gperms_create = $_POST["cat_gperms_admin"];
+ if ($cat_id > 0) {
+ $sql = "DELETE FROM `" . $xoopsDB->prefix("group_permission") . "`";
+ $sql.= " WHERE `gperm_name`='newsletter_admin_cat' AND `gperm_itemid`={$cat_id};";
+ $xoopsDB->query($sql);
+ }
+ //admin
+ $gperm =& $gperm_handler->create();
+ $gperm->setVar('gperm_groupid', XOOPS_GROUP_ADMIN);
+ $gperm->setVar('gperm_name', 'newsletter_admin_cat');
+ $gperm->setVar('gperm_modid', $mid);
+ $gperm->setVar('gperm_itemid', $cat_id);
+ $gperm_handler->insert($gperm);
+ unset($gperm);
+ foreach($arr_cat_gperms_create as $key => $cat_groupperm) {
+ $gperm =& $gperm_handler->create();
+ $gperm->setVar('gperm_groupid', $cat_groupperm);
+ $gperm->setVar('gperm_name', 'newsletter_admin_cat');
+ $gperm->setVar('gperm_modid', $mid);
+ $gperm->setVar('gperm_itemid', $cat_id);
+ $gperm_handler->insert($gperm);
+ unset($gperm);
+ }
+
+ // Form cat_gperms_create
+ $arr_cat_gperms_create = $_POST["cat_gperms_create"];
+ if ($cat_id > 0) {
+ $sql = "DELETE FROM `".$xoopsDB->prefix("group_permission")."`";
+ $sql.= " WHERE `gperm_name`='newsletter_create_cat' AND `gperm_itemid`={$cat_id};";
+ $xoopsDB->query($sql);
+ }
+ //admin
+ $gperm =& $gperm_handler->create();
+ $gperm->setVar('gperm_groupid', XOOPS_GROUP_ADMIN);
+ $gperm->setVar('gperm_name', 'newsletter_create_cat');
+ $gperm->setVar('gperm_modid', $mid);
+ $gperm->setVar('gperm_itemid', $cat_id);
+ $gperm_handler->insert($gperm);
+ unset($gperm);
+ foreach($arr_cat_gperms_create as $key => $cat_groupperm) {
+ $gperm =& $gperm_handler->create();
+ $gperm->setVar('gperm_groupid', $cat_groupperm);
+ $gperm->setVar('gperm_name', 'newsletter_create_cat');
+ $gperm->setVar('gperm_modid', $mid);
+ $gperm->setVar('gperm_itemid', $cat_id);
+ $gperm_handler->insert($gperm);
+ unset($gperm);
+ }
+
+ // Form cat_gperms_read
+ $arr_cat_gperms_read = $_POST["cat_gperms_read"];
+ if ($cat_id > 0) {
+ $sql = "DELETE FROM `" . $xoopsDB->prefix("group_permission") . "`";
+ $sql.= " WHERE `gperm_name`='newsletter_read_cat' AND `gperm_itemid`={$cat_id};";
+ $xoopsDB->query($sql);
+ }
+ //admin
+ $gperm =& $gperm_handler->create();
+ $gperm->setVar('gperm_groupid', XOOPS_GROUP_ADMIN);
+ $gperm->setVar('gperm_name', 'newsletter_read_cat');
+ $gperm->setVar('gperm_modid', $mid);
+ $gperm->setVar('gperm_itemid', $cat_id);
+ $gperm_handler->insert($gperm);
+ unset($gperm);
+ foreach($arr_cat_gperms_read as $key => $cat_groupperm) {
+ $gperm =& $gperm_handler->create();
+ $gperm->setVar('gperm_groupid', $cat_groupperm);
+ $gperm->setVar('gperm_name', 'newsletter_read_cat');
+ $gperm->setVar('gperm_modid', $mid);
+ $gperm->setVar('gperm_itemid', $cat_id);
+ $gperm_handler->insert($gperm);
+ unset($gperm);
+ }
+
+ // Form cat_gperms_list
+ $arr_cat_gperms_list = $_POST["cat_gperms_list"];
+ if ($cat_id > 0) {
+ $sql = "DELETE FROM `" . $xoopsDB->prefix("group_permission") . "`";
+ $sql.= " WHERE `gperm_name`='newsletter_list_cat' AND `gperm_itemid`={$cat_id};";
+ $xoopsDB->query($sql);
+ }
+ //admin
+ $gperm =& $gperm_handler->create();
+ $gperm->setVar('gperm_groupid', XOOPS_GROUP_ADMIN);
+ $gperm->setVar('gperm_name', 'newsletter_list_cat');
+ $gperm->setVar('gperm_modid', $mid);
+ $gperm->setVar('gperm_itemid', $cat_id);
+ $gperm_handler->insert($gperm);
+ unset($gperm);
+ foreach($arr_cat_gperms_list as $key => $cat_groupperm) {
+ $gperm =& $gperm_handler->create();
+ $gperm->setVar('gperm_groupid', $cat_groupperm);
+ $gperm->setVar('gperm_name', 'newsletter_list_cat');
+ $gperm->setVar('gperm_modid', $mid);
+ $gperm->setVar('gperm_itemid', $cat_id);
+ $gperm_handler->insert($gperm);
+ unset($gperm);
+ }
+
+ redirect_header("cat.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
+ }
+
+ echo $obj->getHtmlErrors();
+ $form =& $obj->getForm();
+ $form->display();
+ break;
+
+ case "edit_cat" :
+ echo $indexAdmin->addNavigation("cat.php");
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCAT, 'cat.php?op=new_cat', 'add');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, 'cat.php?op=list', 'list');
+ echo $indexAdmin->renderButton();
+ $obj = $catHandler->get($cat_id);
+ $form = $obj->getForm();
+ $form->display();
+ break;
+
+ case "delete_cat" :
+ $obj =& $catHandler->get($_REQUEST["cat_id"]);
+ if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("cat.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if ($catHandler->delete($obj)) {
+ redirect_header("cat.php", 3, _AM_XNEWSLETTER_FORMDELOK);
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array("ok" => 1, "cat_id" => $cat_id, "op" => "delete_cat"), $_SERVER["REQUEST_URI"], sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $obj->getVar("cat_name")));
+ }
+ break;
}
include "admin_footer.php";
-?>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_cat.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_cat.php 2013-12-09 20:59:44 UTC (rev 12236)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_cat.php 2013-12-09 21:08:35 UTC (rev 12237)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* ****************************************************************************
* - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
@@ -27,159 +27,160 @@
*/
if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root ...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X