Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12433] XoopsModules/xnewsletter/branches/luciorota/ xNewsletter
|
From: <luc...@us...> - 2014-04-07 19:14:45
|
Revision: 12433
http://sourceforge.net/p/xoops/svn/12433
Author: luciorota
Date: 2014-04-07 19:14:42 +0000 (Mon, 07 Apr 2014)
Log Message:
-----------
fixed bugs in xoops_version.php
improved footer
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_accounts.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_attachment.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_bmh.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_cat.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_protocol.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_task.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/css/module.css
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_accounts.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_accounts.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -26,10 +26,8 @@
* ****************************************************************************
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
class xnewsletter_accounts extends XoopsObject
{
public $xnewsletter = null;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_attachment.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_attachment.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -26,10 +26,8 @@
* ****************************************************************************
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
class xnewsletter_attachment extends XoopsObject
{
public $xnewsletter = null;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_bmh.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_bmh.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -26,10 +26,8 @@
* ****************************************************************************
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
class xnewsletter_bmh extends XoopsObject
{
public $xnewsletter = null;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_cat.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_cat.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -26,10 +26,8 @@
* ****************************************************************************
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
class xnewsletter_cat extends XoopsObject
{
/**
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_catsubscr.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_catsubscr.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -26,10 +26,8 @@
* ****************************************************************************
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
class xnewsletter_catsubscr extends XoopsObject
{
public $xnewsletter = null;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -26,10 +26,8 @@
* ****************************************************************************
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
class xnewsletter_import extends XoopsObject
{
public $xnewsletter = null;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_letter.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_letter.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -26,10 +26,8 @@
* ****************************************************************************
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
class xnewsletter_letter extends XoopsObject
{
public $xnewsletter = null;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_mailinglist.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_mailinglist.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_mailinglist.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -26,10 +26,8 @@
* ****************************************************************************
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
class xnewsletter_mailinglist extends XoopsObject
{
public $xnewsletter = null;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_protocol.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_protocol.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -26,10 +26,8 @@
* ****************************************************************************
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
class xnewsletter_protocol extends XoopsObject
{
public $xnewsletter = null;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_subscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_subscr.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_subscr.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -26,10 +26,8 @@
* ****************************************************************************
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
class xnewsletter_subscr extends XoopsObject
{
public $xnewsletter = null;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_task.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_task.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_task.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -20,10 +20,8 @@
* @version $Id: xNewsletter_task.php 000000 2012-07-13 10:41:41Z txmodxoops $
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
class xnewsletter_task extends XoopsObject
{
public $xnewsletter = null;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/css/module.css
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/css/module.css 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/css/module.css 2014-04-07 19:14:42 UTC (rev 12433)
@@ -72,6 +72,7 @@
display: block;
}
+.xnewsletter_footerlinks,
.xnewsletter_adminlinks {
padding-top: 15px;
padding-bottom: 5px;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -18,6 +18,28 @@
* @author Xoops Development Team
* @version svn:$id$
*/
+$showEdit = false;
+$showCreate = false;
+$showList = true;
+
+if (is_object($xoopsUser) && isset($xoopsUser)) {
+ if (is_object($xoopsModule)) {
+ $mid = $xnewsletter->getModule()->mid();
+ $my_group_ids = $member_handler->getGroupsByUser($xoopsUser->uid());
+
+ $cat_criteria = new CriteriaCompo();
+ $cat_criteria->setSort('cat_id');
+ $cat_criteria->setOrder('ASC');
+ $catObjs = $xnewsletter->getHandler('xNewsletter_cat')->getAll($cat_criteria);
+ foreach ($catObjs as $catObj) {
+ if ($gperm_handler->checkRight('newsletter_create_cat', $catObj->getVar('cat_id'), $my_group_ids, $mid) == true)
+ $showCreate = true;
+ if ($gperm_handler->checkRight('newsletter_list_cat', $catObj->getVar('cat_id'), $my_group_ids, $mid) == true)
+ $showList = true;
+ }
+ }
+}
+
// copyright
$xoopsTpl->assign('copyright', $moduleCopyrightHtml); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('copyright_code', $moduleCopyrightHtml); // include/config.php
@@ -31,5 +53,8 @@
}
$xoopsTpl->assign('isAdmin', xNewsletter_userIsAdmin());
+$xoopsTpl->assign('showCreate', $showCreate);
+$xoopsTpl->assign('showList', $showList);
+
include_once XOOPS_ROOT_PATH . '/footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -157,9 +157,9 @@
}
} else {
// user not logged in
+ // NOP
}
-
if (!$activationKey) {
// activation key doesn't exist
if (!$GLOBALS["xoopsSecurity"]->check()) {
@@ -193,7 +193,6 @@
$code_selections .= $old_catsubcr_quited;
}
-
// save subscriber first
if ($subscr_id > 0) {
$subscrObj =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
@@ -232,8 +231,6 @@
$subscrObj->setVar('subscr_activated', 0);
}
-
-
if ($activationKey || $allowedWithoutActivationKey) {
// subscr_firstname
$subscrObj->setVar('subscr_firstname', xNewsletter_CleanVars($_REQUEST, 'subscr_firstname', '', 'string'));
@@ -255,8 +252,6 @@
$subscrObj->setVar('subscr_actoptions', serialize($code_options));
}
-
-
if ($xnewsletter->getHandler('xNewsletter_subscr')->insert($subscrObj)) {
if ($subscr_id < 1) {
$actionProts_ok[] = _MA_XNEWSLETTER_SUBSCRIPTION_REG_OK;
@@ -266,10 +261,10 @@
$subscr_id = $subscrObj->getVar('subscr_id');
if ($allowedWithoutActivationKey) {
- $valid = true;
+ $isValid = true;
$cat_selections = explode('|', $code_selections);
} else {
- $valid = false;
+ $isValid = false;
$xoopsMailer =& xoops_getMailer();
$xoopsMailer->reset();
$xoopsMailer->setTemplateDir();
@@ -302,51 +297,53 @@
} else {
// activation key exist
$activationKey_array = explode('||', base64_decode($activationKey));
- $valid = false;
+ $isValid = false;
if ($activationKey_array[0] == XOOPS_URL) { // from here
if (trim($activationKey_array[1]) != '') { // savetype ok
if ((int)$activationKey_array[2] > 0) { // user is ok
if (trim($activationKey_array[3]) != '') {
- $valid = true;
+ $isValid = true;
}
}
}
}
- if ($valid === false) redirect_header($currentFile, 5, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_INVALIDKEY);
+ if (!$isValid) {
+ redirect_header($currentFile, 5, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_INVALIDKEY);
+ } else {
+ $saveType = trim($activationKey_array[1]);
+ $subscr_id = (int)$activationKey_array[2];
+ $subscr_actkey = trim($activationKey_array[3]);
- $saveType = trim($activationKey_array[1]);
- $subscr_id = (int)$activationKey_array[2];
- $subscr_actkey = trim($activationKey_array[3]);
+ //check given data with table subscr
+ $criteria_subscr = new CriteriaCompo();
+ $criteria_subscr->add(new Criteria('subscr_id', $subscr_id));
+ $criteria_subscr->add(new Criteria('subscr_actkey', $subscr_actkey));
+ $subscrCount = $xnewsletter->getHandler('xNewsletter_subscr')->getCount($criteria_subscr);
+ if ($subscrCount == 0)
+ redirect_header($currentFile, 5, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NODATAKEY);
- //check given data with table subscr
- $criteria_subscr = new CriteriaCompo();
- $criteria_subscr->add(new Criteria('subscr_id', $subscr_id));
- $criteria_subscr->add(new Criteria('subscr_actkey', $subscr_actkey));
- $subscrCount = $xnewsletter->getHandler('xNewsletter_subscr')->getCount($criteria_subscr);
- if ($subscrCount == 0)
- redirect_header($currentFile, 5, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NODATAKEY);
-
- //read data from table subscr
- $subscrObj =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
- $actoptions = unserialize(trim($subscrObj->getVar('subscr_actoptions', 'N')));
- //format subscr_actoptions:selected_newsletters||firstname||lastname||sex||date||ip
- $cat_selections = explode('|', trim($actoptions[0]));
- $subscr_firstname = trim($actoptions[1]);
- $subscr_lastname = trim($actoptions[2]);
- $subscr_sex = trim($actoptions[3]);
- if ((int)$actoptions[4] < time() - 86400) { //Zeit checken -> 24 Stunden ??
- //Zeit abgelaufen
- $subscrObj->setVar('subscr_actkey', '');
- $subscrObj->setVar('subscr_actoptions', '');
- $xnewsletter->getHandler('xNewsletter_subscr')->insert($subscrObj);
- redirect_header($currentFile, 5, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NODATAKEY);
+ //read data from table subscr
+ $subscrObj =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
+ $actoptions = unserialize(trim($subscrObj->getVar('subscr_actoptions', 'N')));
+ //format subscr_actoptions:selected_newsletters||firstname||lastname||sex||date||ip
+ $cat_selections = explode('|', trim($actoptions[0]));
+ $subscr_firstname = trim($actoptions[1]);
+ $subscr_lastname = trim($actoptions[2]);
+ $subscr_sex = trim($actoptions[3]);
+ if ((int)$actoptions[4] < time() - 86400) { //Zeit checken -> 24 Stunden ??
+ //Zeit abgelaufen
+ $subscrObj->setVar('subscr_actkey', '');
+ $subscrObj->setVar('subscr_actoptions', '');
+ $xnewsletter->getHandler('xNewsletter_subscr')->insert($subscrObj);
+ redirect_header($currentFile, 5, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NODATAKEY);
+ }
}
}
- if ($valid) {
+ if ($isValid) {
// update xnewsletter_subscr
$subscrObj =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
if (!$allowedWithoutActivationKey) {
@@ -376,7 +373,6 @@
$actionProts_ok[] = _MA_XNEWSLETTER_SUBSCRIPTION_REG_UPDATE_CLOSED;
}
}
-
// handle current selections
foreach ($cat_selections as $sel) {
$selection = array();
@@ -386,11 +382,9 @@
$catsubcr = $selection[1];
$catsubcr_id_old = (int)$selection[2];
$catsubcr_quited_old = (int)$selection[3];
-
- $obj_cat = $xnewsletter->getHandler('xNewsletter_cat')->get($cat_id);
- $cat_mailinglist = $obj_cat->getVar('cat_mailinglist');
- $cat_name = $obj_cat->getVar('cat_name');
-
+ $catObj = $xnewsletter->getHandler('xNewsletter_cat')->get($cat_id);
+ $cat_mailinglist = $catObj->getVar('cat_mailinglist');
+ $cat_name = $catObj->getVar('cat_name');
if ($catsubcr == '1' && $catsubcr_id_old == 0) {
// subscribe
$catsubscrObj = $xnewsletter->getHandler('xNewsletter_catsubscr')->create();
@@ -402,8 +396,7 @@
$catsubscrObj->setVar("catsubscr_submitter", $submitterUid);
//Form catsubscr_submitter
$catsubscrObj->setVar("catsubscr_created", time());
-
- if ($xnewsletter->getHandler('xNewsletter_catsubscr')->insert($obj_catsubscr)) {
+ if ($xnewsletter->getHandler('xNewsletter_catsubscr')->insert($catsubscrObj)) {
$count_ok++;
if ($catsubcr_id_old > 0) {
$actionProts_ok[] = str_replace("%nl", $cat_name, _MA_XNEWSLETTER_SUBSCRIPTION_PROT_NO_CHANGE);
@@ -422,7 +415,7 @@
} elseif ($catsubcr == '0' && $catsubcr_id_old > 0) {
// unsubscribe / delete old subscription
$catsubscrObj = $xnewsletter->getHandler('xNewsletter_catsubscr')->get($catsubcr_id_old);
- if ($xnewsletter->getHandler('xNewsletter_catsubscr')->delete($obj_catsubscr, true)) {
+ if ($xnewsletter->getHandler('xNewsletter_catsubscr')->delete($catsubscrObj, true)) {
//handle mailinglists
if ($cat_mailinglist > 0) {
require_once(XOOPS_ROOT_PATH . "/modules/xNewsletter/include/mailinglist.php");
@@ -437,14 +430,13 @@
redirect_header($currentFile, 3, _AM_XNEWSLETTER_FORMDELNOTOK);
}
$actionProts_ok[] = str_replace ("%nl", $cat_name, _MA_XNEWSLETTER_SUBSCRIPTION_PROT_UNSUBSCRIBE);
-
} elseif ($catsubcr_id_old > 0 && $catsubcr_quited_old > 0) {
// newsletter stay selected, but catsubscr_quited will be removed
$catsubscrObj = $xnewsletter->getHandler('xNewsletter_catsubscr')->get($catsubcr_id_old);
//Form catsubscr_quited
$catsubscrObj->setVar('catsubscr_quited', '0');
- if ($xnewsletter->getHandler('xNewsletter_catsubscr')->insert($obj_catsubscr)) {
+ if ($xnewsletter->getHandler('xNewsletter_catsubscr')->insert($catsubscrObj)) {
$count_ok++;
$actionProts_ok[] = str_replace ("%nl", $cat_name, _MA_XNEWSLETTER_SUBSCRIPTION_PROT_DAT_QUITED_REMOVED);
} else {
@@ -615,7 +607,7 @@
if ($activationKey || $allowedWithoutActivationKey) {
// got actkey or user is allowed to delete without actkey
- $valid = false;
+ $isValid = false;
if ($activationKey) {
$activationKey_array = explode('||', base64_decode($activationKey));
if ($activationKey_array[0] == XOOPS_URL) {
@@ -624,19 +616,19 @@
// user is ok
if (trim($activationKey_array[2]) != '')
// code ok
- $valid = true;
+ $isValid = true;
}
}
- if ($valid) {
+ if ($isValid) {
$subscr_id = (int)$activationKey_array[1];
$code = trim($activationKey_array[2]);
$subscr_email = trim($activationKey_array[3]);
}
} elseif ($allowedWithoutActivationKey) {
- $valid = true;
+ $isValid = true;
}
- if ($valid) {
+ if ($isValid) {
$sql = "SELECT subscr_id";
$sql.= " FROM {$xoopsDB->prefix("mod_xnewsletter_subscr")}";
$sql.= " WHERE (subscr_email='{$subscr_email}' AND subscr_id={$subscr_id}";
@@ -668,10 +660,10 @@
$catsubscrObjs = $xnewsletter->getHandler('xNewsletter_catsubscr')->getall($criteria_catsubscr);
foreach (array_keys($catsubscrObjs) as $cat) {
$catsubscrObj =& $xnewsletter->getHandler('xNewsletter_catsubscr')->get($catsubscrObjs[$cat]->getVar("catsubscr_id"));
- $obj_cat =& $xnewsletter->getHandler('xNewsletter_cat')->get($catsubscrObjs[$cat]->getVar("catsubscr_catid"));
- $cat_mailinglist = $obj_cat->getVar("cat_mailinglist");
+ $catObj = $xnewsletter->getHandler('xNewsletter_cat')->get($catsubscrObjs[$cat]->getVar("catsubscr_catid"));
+ $cat_mailinglist = $catObj->getVar("cat_mailinglist");
- if ($xnewsletter->getHandler('xNewsletter_catsubscr')->delete($obj_catsubscr, true)) {
+ if ($xnewsletter->getHandler('xNewsletter_catsubscr')->delete($catsubscrObj, true)) {
//handle mailinglists
if ($cat_mailinglist > 0) {
require_once( XOOPS_ROOT_PATH . "/modules/xNewsletter/include/mailinglist.php");
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html 2014-04-07 19:14:42 UTC (rev 12433)
@@ -12,10 +12,28 @@
<{$copyright_code}>
</div>
+<div class="xnewsletter_adminlinks">
+ <a href='<{$smarty.const.XNEWSLETTER_URL}>/subscription.php?op=list_subscriptions'>
+ <{$smarty.const._MI_XNEWSLETTER_SUBSCRIBE}>
+ </a>
+ <a href='<{$smarty.const.XNEWSLETTER_URL}>/letter.php?op=list_letters'>
+ <{$smarty.const._MI_XNEWSLETTER_LIST}>
+ </a>
+<{if $showCreate == true}>
+ <a href='<{$smarty.const.XNEWSLETTER_URL}>/letter.php?op=new_letter'>
+ <{$smarty.const._MI_XNEWSLETTER_CREATE}>
+ </a>
+<{/if}>
+<{if $showList == true}>
+ <a href='<{$smarty.const.XNEWSLETTER_URL}>/letter.php?op=list_subscrs'>
+ <{$smarty.const._MI_XNEWSLETTER_LIST_SUBSCR}>
+ </a>
+<{/if}>
+</div>
+<div class="xnewsletter_adminlinks">
<{if $isAdmin == true}>
-<div class="xnewsletter_adminlinks">
<a href='<{$smarty.const.XNEWSLETTER_URL}>/admin/index.php'>
<{$smarty.const._MA_XNEWSLETTER_ADMIN}>
</a>
+<{/if}>
</div>
-<{/if}>
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php 2014-04-07 10:58:17 UTC (rev 12432)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php 2014-04-07 19:14:42 UTC (rev 12433)
@@ -126,17 +126,19 @@
// Menu
global $xoopsUser;
-include_once XOOPS_ROOT_PATH . "/modules/{$modversion['dirname']}/include/common.php";
$modversion['hasMain'] = true;
$subcount = 1;
-$modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_SUBSCRIBE ;
-$modversion['sub'][$subcount++]['url'] = "subscription.php?op=list_subscriptions" ;
+$modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_SUBSCRIBE;
+$modversion['sub'][$subcount++]['url'] = "subscription.php?op=list_subscriptions";
+$modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_LIST;
+$modversion['sub'][$subcount++]['url'] = "index.php?op=list_letters";
+
$showEdit = false;
$showCreate = false;
-$showList = false;
+$showList = true;
if (is_object($xoopsUser) && isset($xoopsUser)) {
$gperm_handler = xoops_gethandler('groupperm');
@@ -153,35 +155,22 @@
$cat_criteria->setOrder('ASC');
$catObjs = $catHandler->getAll($cat_criteria);
foreach ($catObjs as $catObj) {
- $show = $gperm_handler->checkRight('newsletter_create_cat', $catObj->getVar('cat_id'), $my_group_ids, $mid);
- if ($show == true)
+ if ($gperm_handler->checkRight('newsletter_create_cat', $catObj->getVar('cat_id'), $my_group_ids, $mid) == true)
$showCreate = true;
- }
- foreach ($catObjs as $catObj) {
- $show = $gperm_handler->checkRight('newsletter_list_cat', $catObj->getVar('cat_id'), $my_group_ids, $mid);
- if ($show == true)
+ if ($gperm_handler->checkRight('newsletter_list_cat', $catObj->getVar('cat_id'), $my_group_ids, $mid) == true)
$showList = true;
}
if ($showCreate == true) {
- $modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_LIST ;
- $modversion['sub'][$subcount++]['url'] = "letter.php?op=list_letters" ;
- $modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_CREATE ;
- $modversion['sub'][$subcount++]['url'] = "letter.php?op=new_letter" ;
- } else {
- $modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_LIST ;
- $modversion['sub'][$subcount++]['url'] = "index.php?op=list_letters" ;
+ $modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_CREATE;
+ $modversion['sub'][$subcount++]['url'] = "letter.php?op=new_letter";
}
if ($showList == true) {
- $modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_LIST_SUBSCR ;
- $modversion['sub'][$subcount++]['url'] = "letter.php?op=list_subscrs" ;
+ $modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_LIST_SUBSCR;
+ $modversion['sub'][$subcount++]['url'] = "letter.php?op=list_subscrs";
}
}
-} else {
- $modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_LIST ;
- $modversion['sub'][$subcount++]['url'] = "index.php?op=list_letters" ;
}
-
// Templates
$i = 1;
$modversion['templates'][$i]['file'] = $modversion['dirname'] . '_header.html';
|
