Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12237] XoopsModules/xnewsletter/trunk/xNewsletter
|
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 path not defined");
+ die("XOOPS root path not defined");
}
class xnewsletter_cat extends XoopsObject
{
- //Constructor
- public function __construct()
- {
- $this->initVar("cat_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("cat_name", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("cat_info", XOBJ_DTYPE_TXTBOX);
- $this->initVar("cat_mailinglist", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("cat_submitter", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("cat_created", XOBJ_DTYPE_INT, null, false, 10);
- }
+ //Constructor
+ public function __construct()
+ {
+ $this->initVar("cat_id", XOBJ_DTYPE_INT, null, false, 8);
+ $this->initVar("cat_name", XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar("cat_info", XOBJ_DTYPE_TXTAREA, null, false);
+ $this->initVar("cat_mailinglist", XOBJ_DTYPE_INT, null, false, 8);
+ $this->initVar("cat_submitter", XOBJ_DTYPE_INT, null, false, 10);
+ $this->initVar("cat_created", XOBJ_DTYPE_INT, null, false, 10);
+ }
-
- public function getForm($action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
-
- include_once XOOPS_ROOT_PATH."/modules/xNewsletter/class/xNewsletter_mailinglist.php";
- $mailinglistHandler =& xoops_getModuleHandler("xNewsletter_mailinglist", "xNewsletter");
- $gperm_handler = xoops_gethandler('groupperm');
- global $xoopsModule;
- $mid = $xoopsModule->mid();
-
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_CAT_ADD) : sprintf(_AM_XNEWSLETTER_CAT_EDIT);
- include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, "form", $action, "post", true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_CAT_NAME, "cat_name", 50, 255, $this->getVar("cat_name")), true);
- $form->addElement(new XoopsFormTextArea(_AM_XNEWSLETTER_CAT_INFO, "cat_info", $this->getVar("cat_info"), 4, 47), false);
+ public function getForm($action = false)
+ {
+ global $xoopsDB, $xoopsModuleConfig;
+
+ include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/class/xNewsletter_mailinglist.php";
+ $mailinglistHandler =& xoops_getModuleHandler("xNewsletter_mailinglist", "xNewsletter");
+ $gperm_handler = xoops_gethandler('groupperm');
+ global $xoopsModule;
+ $mid = $xoopsModule->mid();
+
+ if ($action === false) {
+ $action = $_SERVER["REQUEST_URI"];
+ }
+
+ $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_CAT_ADD) : sprintf(_AM_XNEWSLETTER_CAT_EDIT);
+
+ include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
+ $form = new XoopsThemeForm($title, "form", $action, "post", true);
+ $form->setExtra('enctype="multipart/form-data"');
+
+ $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_CAT_NAME, "cat_name", 50, 255, $this->getVar("cat_name",'e')), true);
+ $form->addElement(new XoopsFormDhtmlTextArea(_AM_XNEWSLETTER_CAT_INFO, "cat_info", $this->getVar("cat_info",'e')), false);
+
+ $member_handler = &xoops_gethandler('member');
+ $userGroups = $member_handler->getGroupList();
- $member_handler = &xoops_gethandler('member');
- $userGroups = $member_handler->getGroupList();
-
- // create admin checkbox
- foreach($userGroups as $group_id => $group_name) {
- if ($group_id == XOOPS_GROUP_ADMIN) {$group_id_admin = $group_id; $group_name_admin = $group_name;}
- }
- $select_perm_admin = new XoopsFormCheckBox("", "admin", XOOPS_GROUP_ADMIN);
- $select_perm_admin->addOption($group_id_admin, $group_name_admin);
- $select_perm_admin->setExtra("disabled='disabled'");
-
- // ********************************************************
- // permission read cat
- $cat_gperms_read = & $gperm_handler->getGroupIds('newsletter_read_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_read = $this->isNew() ? "0" : $cat_gperms_read;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_READ,'');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_read", $arr_cat_gperms_read);
- foreach($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN) $select_perm->addOption($group_id, $group_name);
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- // ********************************************************
- // permission create cat
- $cat_gperms_create =& $gperm_handler->getGroupIds('newsletter_create_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_create = $this->isNew() ? "0" : $cat_gperms_create;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_CREATE._AM_XNEWSLETTER_CAT_GPERMS_CREATE_DESC,'');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_create", $arr_cat_gperms_create);
- foreach($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) $select_perm->addOption($group_id, $group_name);
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- // ********************************************************
- // permission admin cat
- $cat_gperms_admin =& $gperm_handler->getGroupIds('newsletter_admin_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_admin = $this->isNew() ? "0" : $cat_gperms_admin;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_ADMIN._AM_XNEWSLETTER_CAT_GPERMS_ADMIN_DESC,'');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_admin", $arr_cat_gperms_admin);
- foreach($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) $select_perm->addOption($group_id, $group_name);
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- // ********************************************************
- // permission list subscriber of this cat
- $cat_gperms_list =& $gperm_handler->getGroupIds('newsletter_list_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_admin = $this->isNew() ? "0" : $cat_gperms_list;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_LIST,'');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_list", $arr_cat_gperms_admin);
- foreach($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) $select_perm->addOption($group_id, $group_name);
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- $cat_mailinglist = $this->isNew() ? "0" : $this->getVar("cat_mailinglist");
- $crit_mailinglist = new CriteriaCompo();
- $crit_mailinglist->setSort("mailinglist_id");
- $crit_mailinglist->setOrder("ASC");
- $numrows_mailinglist = $mailinglistHandler->getCount();
- if ($numrows_mailinglist > 0) {
- $opt_mailinglist = new XoopsFormRadio(_AM_XNEWSLETTER_LETTER_MAILINGLIST, "cat_mailinglist", $cat_mailinglist);
- $opt_mailinglist->addOption("0", _AM_XNEWSLETTER_LETTER_MAILINGLIST_NO);
- $mailinglist_arr = $mailinglistHandler->getall($crit_mailinglist);
- foreach (array_keys($mailinglist_arr) as $i) {
- $opt_mailinglist->addOption($i, $mailinglist_arr[$i]->getVar("mailinglist_name"));
- }
- $form->addElement($opt_mailinglist);
- }
+ // create admin checkbox
+ foreach($userGroups as $group_id => $group_name) {
+ if ($group_id == XOOPS_GROUP_ADMIN) {$group_id_admin = $group_id; $group_name_admin = $group_name;}
+ }
+ $select_perm_admin = new XoopsFormCheckBox("", "admin", XOOPS_GROUP_ADMIN);
+ $select_perm_admin->addOption($group_id_admin, $group_name_admin);
+ $select_perm_admin->setExtra("disabled='disabled'");
- $time = ($this->isNew()) ? time() : $this->getVar("cat_created");
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ACCOUNTS_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ACCOUNTS_CREATED, formatTimestamp($time,'s') ));
-
- $form->addElement(new XoopsFormHidden("op", "save_cat"));
- $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
- return $form;
- }
+ // ********************************************************
+ // permission read cat
+ $cat_gperms_read = & $gperm_handler->getGroupIds('newsletter_read_cat', $this->getVar("cat_id"), $mid);
+ $arr_cat_gperms_read = $this->isNew() ? "0" : $cat_gperms_read;
+
+ $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_READ,'');
+ // checkbox webmaster
+ $perms_tray->addElement($select_perm_admin, false);
+ // checkboxes other groups
+ $select_perm = new XoopsFormCheckBox("", "cat_gperms_read", $arr_cat_gperms_read);
+ foreach($userGroups as $group_id => $group_name) {
+ if ($group_id != XOOPS_GROUP_ADMIN) $select_perm->addOption($group_id, $group_name);
+ }
+ $perms_tray->addElement($select_perm, false);
+ $form->addElement($perms_tray, false);
+ unset($perms_tray);
+ unset($select_perm);
+
+ // ********************************************************
+ // permission create cat
+ $cat_gperms_create =& $gperm_handler->getGroupIds('newsletter_create_cat', $this->getVar("cat_id"), $mid);
+ $arr_cat_gperms_create = $this->isNew() ? "0" : $cat_gperms_create;
+
+ $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_CREATE._AM_XNEWSLETTER_CAT_GPERMS_CREATE_DESC,'');
+ // checkbox webmaster
+ $perms_tray->addElement($select_perm_admin, false);
+ // checkboxes other groups
+ $select_perm = new XoopsFormCheckBox("", "cat_gperms_create", $arr_cat_gperms_create);
+ foreach($userGroups as $group_id => $group_name) {
+ if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) $select_perm->addOption($group_id, $group_name);
+ }
+ $perms_tray->addElement($select_perm, false);
+ $form->addElement($perms_tray, false);
+ unset($perms_tray);
+ unset($select_perm);
+
+ // ********************************************************
+ // permission admin cat
+ $cat_gperms_admin =& $gperm_handler->getGroupIds('newsletter_admin_cat', $this->getVar("cat_id"), $mid);
+ $arr_cat_gperms_admin = $this->isNew() ? "0" : $cat_gperms_admin;
+
+ $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_ADMIN._AM_XNEWSLETTER_CAT_GPERMS_ADMIN_DESC,'');
+ // checkbox webmaster
+ $perms_tray->addElement($select_perm_admin, false);
+ // checkboxes other groups
+ $select_perm = new XoopsFormCheckBox("", "cat_gperms_admin", $arr_cat_gperms_admin);
+ foreach($userGroups as $group_id => $group_name) {
+ if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) $select_perm->addOption($group_id, $group_name);
+ }
+ $perms_tray->addElement($select_perm, false);
+ $form->addElement($perms_tray, false);
+ unset($perms_tray);
+ unset($select_perm);
+
+ // ********************************************************
+ // permission list subscriber of this cat
+ $cat_gperms_list =& $gperm_handler->getGroupIds('newsletter_list_cat', $this->getVar("cat_id"), $mid);
+ $arr_cat_gperms_admin = $this->isNew() ? "0" : $cat_gperms_list;
+
+ $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_LIST,'');
+ // checkbox webmaster
+ $perms_tray->addElement($select_perm_admin, false);
+ // checkboxes other groups
+ $select_perm = new XoopsFormCheckBox("", "cat_gperms_list", $arr_cat_gperms_admin);
+ foreach($userGroups as $group_id => $group_name) {
+ if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) $select_perm->addOption($group_id, $group_name);
+ }
+ $perms_tray->addElement($select_perm, false);
+ $form->addElement($perms_tray, false);
+ unset($perms_tray);
+ unset($select_perm);
+
+ $cat_mailinglist = $this->isNew() ? "0" : $this->getVar("cat_mailinglist");
+ $crit_mailinglist = new CriteriaCompo();
+ $crit_mailinglist->setSort("mailinglist_id");
+ $crit_mailinglist->setOrder("ASC");
+ $numrows_mailinglist = $mailinglistHandler->getCount();
+ if ($numrows_mailinglist > 0) {
+ $opt_mailinglist = new XoopsFormRadio(_AM_XNEWSLETTER_LETTER_MAILINGLIST, "cat_mailinglist", $cat_mailinglist);
+ $opt_mailinglist->addOption("0", _AM_XNEWSLETTER_LETTER_MAILINGLIST_NO);
+ $mailinglist_arr = $mailinglistHandler->getall($crit_mailinglist);
+ foreach (array_keys($mailinglist_arr) as $i) {
+ $opt_mailinglist->addOption($i, $mailinglist_arr[$i]->getVar("mailinglist_name"));
+ }
+ $form->addElement($opt_mailinglist);
+ }
+
+ $time = ($this->isNew()) ? time() : $this->getVar("cat_created");
+ $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ACCOUNTS_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
+ $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ACCOUNTS_CREATED, formatTimestamp($time,'s') ));
+
+ $form->addElement(new XoopsFormHidden("op", "save_cat"));
+ $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
+ return $form;
+ }
}
+
+
class xNewsletterxnewsletter_catHandler extends XoopsPersistableObjectHandler
{
- public function __construct(&$db)
- {
- parent::__construct($db, "mod_xnewsletter_cat", "xnewsletter_cat", "cat_id", "cat_name");
- }
-}
-?>
\ No newline at end of file
+ public function __construct(&$db)
+ {
+ parent::__construct($db, "mod_xnewsletter_cat", "xnewsletter_cat", "cat_id", "cat_name");
+ }
+}
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-12-09 20:59:44 UTC (rev 12236)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-12-09 21:08:35 UTC (rev 12237)
@@ -1,39 +1,40 @@
-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)
+Version 1.2
+--------------
+ - added newsletter info field is html compatible (luciorota)
+ - added new tag <{$title}> 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/header.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/header.php 2013-12-09 20:59:44 UTC (rev 12236)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/header.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 )
@@ -32,27 +32,25 @@
include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . "/include/config.php";
include_once XNEWSLETTER_PATH . "/include/functions.php";
-$myts = & MyTextSanitizer::getInstance();
-$style = XNEWSLETTER_URL . "/css/style.css";
+$myts = & MyTextSanitizer::getInstance();
+$style = XNEWSLETTER_URL . "/css/style.css";
global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
if (empty($xoopsModuleConfig)) {
- $config_handler =& xoops_gethandler("config");
- $xoopsModuleConfig =& $config_handler->getConfigsByCat(0,$xoopsModule->mid());
+ $config_handler =& xoops_gethandler("config");
+ $xoopsModuleConfig =& $config_handler->getConfigsByCat(0,$xoopsModule->mid());
}
// Get the module instances
-$accountsHandler =& xoops_getModuleHandler('xNewsletter_accounts',XNEWSLETTER_DIRNAME);
-$catHandler =& xoops_getModuleHandler('xNewsletter_cat',XNEWSLETTER_DIRNAME);
-$subscrHandler =& xoops_getModuleHandler('xNewsletter_subscr',XNEWSLETTER_DIRNAME);
-$catsubscrHandler =& xoops_getModuleHandler('xNewsletter_catsubscr',XNEWSLETTER_DIRNAME);
-$letterHandler =& xoops_getModuleHandler('xNewsletter_letter',XNEWSLETTER_DIRNAME);
-$attachmentHandler =& xoops_getModuleHandler('xNewsletter_attachment',XNEWSLETTER_DIRNAME);
-$protocolHandler =& xoops_getModuleHandler('xNewsletter_protocol',XNEWSLETTER_DIRNAME);
-$mailinglistHandler =& xoops_getModuleHandler('xNewsletter_mailinglist',XNEWSLETTER_DIRNAME);
+$accountsHandler =& xoops_getModuleHandler('xNewsletter_accounts', XNEWSLETTER_DIRNAME);
+$catHandler =& xoops_getModuleHandler('xNewsletter_cat', XNEWSLETTER_DIRNAME);
+$subscrHandler =& xoops_getModuleHandler('xNewsletter_subscr', XNEWSLETTER_DIRNAME);
+$catsubscrHandler =& xoops_getModuleHandler('xNewsletter_catsubscr', XNEWSLETTER_DIRNAME);
+$letterHandler =& xoops_getModuleHandler('xNewsletter_letter', XNEWSLETTER_DIRNAME);
+$attachmentHandler =& xoops_getModuleHandler('xNewsletter_attachment', XNEWSLETTER_DIRNAME);
+$protocolHandler =& xoops_getModuleHandler('xNewsletter_protocol', XNEWSLETTER_DIRNAME);
+$mailinglistHandler =& xoops_getModuleHandler('xNewsletter_mailinglist', XNEWSLETTER_DIRNAME);
-xoops_loadLanguage('modinfo', XNEWSLETTER_DIRNAME);
-xoops_loadLanguage('main', XNEWSLETTER_DIRNAME);
-xoops_loadLanguage('admin', XNEWSLETTER_DIRNAME);
-
-?>
\ No newline at end of file
+xoops_loadLanguage('modinfo', XNEWSLETTER_DIRNAME);
+xoops_loadLanguage('main', XNEWSLETTER_DIRNAME);
+xoops_loadLanguage('admin', XNEWSLETTER_DIRNAME);
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/index.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/index.php 2013-12-09 20:59:44 UTC (rev 12236)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/index.php 2013-12-09 21:08:35 UTC (rev 12237)
@@ -31,11 +31,11 @@
$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
if ($op == "list_letter") {
- $xoopsOption['template_main'] = 'xNewsletter_letter_list.html';
+ $xoopsOption['template_main'] = 'xNewsletter_letter_list.html';
} elseif ($op == "show_preview") {
$xoopsOption['template_main'] = 'xNewsletter_letter.html';
} else {
- $xoopsOption['template_main'] = 'xNewsletter_index.html';
+ $xoopsOption['template_main'] = 'xNewsletter_index.html';
}
include XOOPS_ROOT_PATH."/header.php";
@@ -49,111 +49,105 @@
$xoTheme->addMeta('meta', 'description', strip_tags(_MA_XNEWSLETTER_DESC));
$xoopsTpl->assign('adv', $GLOBALS['xoopsModuleConfig']['advertise']);
-switch ($op)
-{
- case "show_preview":
-
- $template_path = XNEWSLETTER_PATH . '/language/'.$GLOBALS['xoopsConfig']['language'].'/templates/';
- if (!is_dir($template_path))
- $template_path = XNEWSLETTER_PATH . '/language/english/templates/';
-
- $obj =& $letterHandler->get($_REQUEST["letter_id"]);
- $template = $template_path . $obj->getVar("letter_template").".html";
-
- $xoopsTpl->assign('sex', _AM_XNEWSLETTER_SUBSCR_SEX_MALE);
- $xoopsTpl->assign('firstname', _AM_XNEWSLETTER_SUBSCR_FIRSTNAME);
- $xoopsTpl->assign('lastname', _AM_XNEWSLETTER_SUBSCR_LASTNAME);
- $xoopsTpl->assign('content', $obj->getVar("letter_content", "n"));
- $xoopsTpl->assign('unsubscribe_url', XOOPS_URL.'/modules/xNewsletter/');
- $xoopsTpl->assign('catsubscr_id', "0");
+switch ($op) {
+ case "show_preview" :
+ $template_path = XNEWSLETTER_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/templates/';
+ if (!is_dir($template_path)) {
+ $template_path = XNEWSLETTER_PATH . '/language/english/templates/';
+ }
- $content = "";
- $content .= "<h2>".$obj->getVar("letter_title")."</h2>";
- $content .= "<div style='clear:both;'><div style='padding:10px;border:1px solid black;'>";
- $content .= $xoopsTpl->fetch($template);
- $content .= "</div></div><a href='".XNEWSLETTER_URL."/index.php?op=list_letter'>"._BACK."</a></div><div style='clear:both;'>";
- $xoopsTpl->assign('content', $content);
-
- break;
-
- case "list_letter":
+ $obj =& $letterHandler->get($_REQUEST["letter_id"]);
+ $template = $template_path . $obj->getVar("letter_template").".html";
- $letters = array();
- $criteria = new CriteriaCompo();
- $criteria->setSort("letter_id");
- $criteria->setOrder("DESC");
- $numrows = $letterHandler->getCount();
- $letter_arr = $letterHandler->getall($criteria);
-
- // Table View
- if ($numrows > 0)
- {
- $langs = array("letter_title" => _AM_XNEWSLETTER_LETTER_TITLE,
- //"letter_content" => _AM_XNEWSLETTER_LETTER_CONTENT,
- "letter_cats" => _MA_XNEWSLETTER_LETTER_CATS,
- "letter_created" => _AM_XNEWSLETTER_LETTER_CREATED,
- "btn_showpreview" => _AM_XNEWSLETTER_LETTER_ACTION_PREVIEW
- );
- $xoopsTpl->assign($langs);
- $xoopsTpl->assign("pathImageIcon", XNEWSLETTER_ICON);
-
- //get newsletters available for current user
- $gperm_handler =& xoops_gethandler('groupperm');
- $mid = $xoopsModule->mid();
- $member_handler =& xoops_gethandler('member');
- $currentuid = (is_object($xoopsUser) && isset($xoopsUser)) ? $xoopsUser->uid(): 0;
- if ($currentuid == 0) {
- $my_group_ids = array(XOOPS_GROUP_ANONYMOUS);
- } else {
- $my_group_ids = $member_handler->getGroupsByUser( $currentuid ) ;
- }
+ $xoopsTpl->assign('sex', _AM_XNEWSLETTER_SUBSCR_SEX_MALE);
+ $xoopsTpl->assign('firstname', _AM_XNEWSLETTER_SUBSCR_FIRSTNAME);
+ $xoopsTpl->assign('lastname', _AM_XNEWSLETTER_SUBSCR_LASTNAME);
+ $xoopsTpl->assign('content', $obj->getVar("letter_content", "n"));
+ $xoopsTpl->assign('unsubscribe_url', XOOPS_URL . '/modules/xNewsletter/');
+ $xoopsTpl->assign('catsubscr_id', "0");
- $letters = array();
- foreach (array_keys($letter_arr) as $letter) {
- $count_cats_avail = 0;
- $letter_cats = "";
- $cat_arr = explode("|" , $letter_arr[$letter]->getVar("letter_cats"));
- foreach($cat_arr as $cat) {
- $cat_obj = $catHandler->get($cat);
- $show = $gperm_handler->checkRight( 'newsletter_read_cat', $cat_obj->getVar("cat_id"), $my_group_ids, $mid ) ;
- if ($show == 1) {
- $count_cats_avail++;
- $letter_cats .= $cat_obj->getVar("cat_name")."<br/>";
- }
- }
- $letter_cats = substr($letter_cats, 0, -5);
- if ($count_cats_avail > 0) {
- $letters[] = array(
- "letter_id" => $letter,
- "letter_title" => $letter_arr[$letter]->getVar("letter_title"),
- //"letter_content" => $letter_arr[$letter]->getVar("letter_content"),
- "letter_cats" => $letter_cats,
- "letter_created" => formatTimeStamp($letter_arr[$letter]->getVar("letter_created"),"M")
- );
- }
- }
+ $content = "";
+ $content .= "<h2>" . $obj->getVar("letter_title") . "</h2>";
+ $content .= "<div style='clear:both;'><div style='padding:10px;border:1px solid black;'>";
+ $content .= $xoopsTpl->fetch($template);
+ $content .= "</div></div><a href='" . XNEWSLETTER_URL . "/index.php?op=list_letter'>" . _BACK . "</a></div><div style='clear:both;'>";
+ $xoopsTpl->assign('content', $content);
+ break;
- if ( count($letters) == 0 ) {
- redirect_header("index.php", 3, _MA_XNEWSLETTER_LETTER_NONEAVAIL);
- }
-
- } else {
- redirect_header("index.php", 3, _MA_XNEWSLETTER_LETTER_NONEAVAIL);
- }
- $xoopsTpl->assign('letters', $letters);
- break;
-
- case "list":
- default:
- $xoopsTpl->assign('xnewsletter_content', _MA_XNEWSLETTER_WELCOME);
- break;
-
+ case "list_letter" :
+ $letters = array();
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("letter_id");
+ $criteria->setOrder("DESC");
+ $numrows = $letterHandler->getCount();
+ $letter_arr = $letterHandler->getall($criteria);
+
+ // Table View
+ if ($numrows > 0) {
+ $langs = array(
+ "letter_title" => _AM_XNEWSLETTER_LETTER_TITLE,
+ //"letter_content" => _AM_XNEWSLETTER_LETTER_CONTENT,
+ "letter_cats" => _MA_XNEWSLETTER_LETTER_CATS,
+ "letter_created" => _AM_XNEWSLETTER_LETTER_CREATED,
+ "btn_showpreview" => _AM_XNEWSLETTER_LETTER_ACTION_PREVIEW
+ );
+ $xoopsTpl->assign($langs);
+ $xoopsTpl->assign("pathImageIcon", XNEWSLETTER_ICON);
+
+ // get newsletters available for current user
+ $gperm_handler =& xoops_gethandler('groupperm');
+ $mid = $xoopsModule->mid();
+ $member_handler =& xoops_gethandler('member');
+ $currentuid = (is_object($xoopsUser) && isset($xoopsUser)) ? $xoopsUser->uid(): 0;
+ if ($currentuid == 0) {
+ $my_group_ids = array(XOOPS_GROUP_ANONYMOUS);
+ } else {
+ $my_group_ids = $member_handler->getGroupsByUser( $currentuid );
+ }
+
+ $letters = array();
+ foreach (array_keys($letter_arr) as $letter) {
+ $count_cats_avail = 0;
+ $letter_cats = "";
+ $cat_arr = explode("|" , $letter_arr[$letter]->getVar(...
[truncated message content] |
