Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12421] XoopsModules/xnewsletter/branches/luciorota/ xNewsletter
|
From: <luc...@us...> - 2014-04-05 02:54:27
|
Revision: 12421
http://sourceforge.net/p/xoops/svn/12421
Author: luciorota
Date: 2014-04-05 02:54:22 +0000 (Sat, 05 Apr 2014)
Log Message:
-----------
standardization: fixed some errors
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/common.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_subscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_subscr.php 2014-04-03 13:51:04 UTC (rev 12420)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_subscr.php 2014-04-05 02:54:22 UTC (rev 12421)
@@ -228,7 +228,7 @@
//$form->addElement(new XoopsFormSelectUser(_AM_XNEWSLETTER_SUBSCR_SUBMITTER, "subscr_submitter", false, $this->getVar("subscr_submitter"), 1, false), true);
if ( $this->getVar("subscr_id") > 0 ) {
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_SUBSCR_CREATED, formatTimestamp($this->getVar("subscr_created"), $xnewsletter->getConfig('dateformat')) . " [" . $this->getVar("subscr_ip") . "]"));
+ $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_SUBSCR_CREATED, formatTimestamp($this->getVar("subscr_created"), $this->xnewsletter->getConfig('dateformat')) . " [" . $this->getVar("subscr_ip") . "]"));
$form->addElement(new XoopsFormHidden('subscr_created', $this->getVar("subscr_created")));
$form->addElement(new XoopsFormHidden('subscr_ip', $this->getVar("subscr_ip")));
} else {
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/common.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/common.php 2014-04-03 13:51:04 UTC (rev 12420)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/common.php 2014-04-05 02:54:22 UTC (rev 12421)
@@ -35,6 +35,7 @@
//include_once XOOPS_ROOT_PATH . '/class/tree.php';
//include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ include_once XNEWSLETTER_ROOT_PATH . '/include/config.php'; // IN PROGRESS
include_once XNEWSLETTER_ROOT_PATH . '/include/functions.php';
include_once XNEWSLETTER_ROOT_PATH . '/include/constants.php';
include_once XNEWSLETTER_ROOT_PATH . '/class/session.php'; // xNewsletterSession class
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php 2014-04-03 13:51:04 UTC (rev 12420)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php 2014-04-05 02:54:22 UTC (rev 12421)
@@ -30,12 +30,6 @@
die("XOOPS root path not defined");
}
-$dirname = basename( dirname(dirname(__FILE__)));
-define("XNEWSLETTER_DIRNAME", $dirname);
-define("XNEWSLETTER_PATH", XOOPS_ROOT_PATH . "/modules/" . XNEWSLETTER_DIRNAME);
-define("XNEWSLETTER_URL", XOOPS_URL . "/modules/" . XNEWSLETTER_DIRNAME);
-define("XNEWSLETTER_ICONS_URL", XNEWSLETTER_URL . '/images/icons');
-
// module information
$moduleImageUrl = XNEWSLETTER_URL . "/images/xNewsletter.png";
$moduleCopyrightHtml = ""; //"<br /><br /><a href='' title='' target='_blank'><img src='{$moduleImageUrl}' alt='' /></a>";
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php 2014-04-03 13:51:04 UTC (rev 12420)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php 2014-04-05 02:54:22 UTC (rev 12421)
@@ -133,7 +133,7 @@
$cat_ids = explode('|' , $letterObj->getVar('letter_cats'));
foreach ($cat_ids as $cat_id) {
$catObj = $xnewsletter->getHandler('xNewsletter_cat')->get($cat_id);
- if ($gperm_handler->checkRight('newsletter_read_cat', $catObj->getVar('cat_id'), $groups, $xnewsletter->getModule->mid())) {
+ if ($gperm_handler->checkRight('newsletter_read_cat', $catObj->getVar('cat_id'), $groups, $xnewsletter->getModule()->mid())) {
$catsAvailableCount++;
unset($letter_array['letter_cats']);
$letter_array['letter_cats'][] = $catObj->toArray();
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php 2014-04-03 13:51:04 UTC (rev 12420)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php 2014-04-05 02:54:22 UTC (rev 12421)
@@ -106,7 +106,7 @@
$catObjs = $xnewsletter->getHandler('xNewsletter_cat')->getAll($criteria_cats, null, true, true);
// cats table
foreach ($catObjs as $cat_id => $catObj) {
- $permissionShowCats[$cat_id] = $gperm_handler->checkRight('newsletter_list_cat', $cat_id, $groups, $xnewsletter->getModule->mid());
+ $permissionShowCats[$cat_id] = $gperm_handler->checkRight('newsletter_list_cat', $cat_id, $groups, $xnewsletter->getModule()->mid());
if ($permissionShowCats[$cat_id] == true) {
$cat_array = $catObj->toArray();
$criteria_catsubscrs = new CriteriaCompo();
@@ -298,7 +298,7 @@
unset($letter_array['letter_cats']); // IN PROGRESS
foreach ($cat_ids as $cat_id) {
$catObj = $xnewsletter->getHandler('xNewsletter_cat')->get($cat_id);
- if ($gperm_handler->checkRight('newsletter_read_cat', $catObj->getVar('cat_id'), $groups, $xnewsletter->getModule->mid())) {
+ if ($gperm_handler->checkRight('newsletter_read_cat', $catObj->getVar('cat_id'), $groups, $xnewsletter->getModule()->mid())) {
$catsAvailableCount++;
$letter_array['letter_cats'][] = $catObj->toArray();
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php 2014-04-03 13:51:04 UTC (rev 12420)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php 2014-04-05 02:54:22 UTC (rev 12421)
@@ -52,8 +52,8 @@
$op = 'delete_subscription';
}
if ($op == 'unsub') {
+ $op = 'list_subscriptions';
$xoopsOption['template_main'] = 'xnewsletter_subscription.html';
- $op = 'list_subscriptions';
$_SESSION['redirect_mail'] = xNewsletter_CleanVars($_REQUEST, 'email', '', 'string');
$_SESSION['unsub'] = '1';
}
@@ -168,7 +168,7 @@
if ($subscr_email == '') {
redirect_header($currentFile, 3, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NOEMAIL);
}
- if (!checkEmail($subscr_email))
+ if (!xNewsletter_checkEmail($subscr_email))
redirect_header($currentFile, 3, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NOEMAIL);
@@ -593,7 +593,7 @@
}
}
- if ((isset($_POST['ok']) && $_POST['ok'] == 1) || $activationKey) {
+ if ((isset($_POST['ok']) && $_POST['ok'] == true) || $activationKey) {
$count_err = 0;
$actionProts_error = '';
@@ -637,7 +637,8 @@
}
if ($valid) {
- $sql = "SELECT subscr_id FROM {$xoopsDB->prefix("mod_xnewsletter_subscr")}";
+ $sql = "SELECT subscr_id";
+ $sql.= " FROM {$xoopsDB->prefix("mod_xnewsletter_subscr")}";
$sql.= " WHERE (subscr_email='{$subscr_email}' AND subscr_id={$subscr_id}";
if ($activationKey)
$sql .= " AND subscr_actkey='{$code}'";
@@ -661,9 +662,9 @@
//delete subscription
$criteria_catsubscr = new CriteriaCompo();
$criteria_catsubscr->add(new Criteria('catsubscr_subscrid', $subscr_id));
- $numrows_catsubscr = $xnewsletter->getHandler('xNewsletter_catsubscr')->getCount($criteria_catsubscr);
+ $catsubscrCount = $xnewsletter->getHandler('xNewsletter_catsubscr')->getCount($criteria_catsubscr);
- if ($numrows_catsubscr > 0) {
+ if ($catsubscrCount > 0) {
$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"));
@@ -693,12 +694,12 @@
echo $actionProts_error;
}
} else {
- if (!$GLOBALS["xoopsSecurity"]->check()) {
- redirect_header('subscr.php', 3, implode(',', $GLOBALS["xoopsSecurity"]->getErrors()));
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('subscr.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
$subscrObj =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
- $subscrObj->setVar("subscr_actkey", xoops_makepass());
+ $subscrObj->setVar('subscr_actkey', xoops_makepass());
if (!$xnewsletter->getHandler('xNewsletter_subscr')->insert($subscrObj)) {
redirect_header($currentFile, 2, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR);
}
@@ -729,7 +730,7 @@
}
} else {
$subscrObj =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
- xoops_confirm(array("ok" => 1, "subscr_id" => $subscr_id, "subscr_email" => $subscr_email, "op" => "delete_subscription"), $currentFile, sprintf(_MA_XNEWSLETTER_SUBSCRIPTION_DELETE_SURE));
+ xoops_confirm(array('ok' => true, 'subscr_id' => $subscr_id, 'subscr_email' => $subscr_email, 'op' => 'delete_subscription'), $currentFile, sprintf(_MA_XNEWSLETTER_SUBSCRIPTION_DELETE_SURE));
}
break;
@@ -758,7 +759,7 @@
$subscr_email = xNewsletter_CleanVars($_REQUEST, 'subscr_email', '', 'string');
if ($subscr_email != '') {
// existing email from search form
- if (!checkEmail($subscr_email))
+ if (!xNewsletter_checkEmail($subscr_email))
redirect_header($currentFile, 3, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NOEMAIL);
xoops_load("captcha");
$xoopsCaptcha = XoopsCaptcha::getinstance();
@@ -769,7 +770,7 @@
$showSubscrSearchForm = false;
}
} elseif (is_object($xoopsUser) && isset($xoopsUser)) {
- // take actual xoops user
+ // take actual xoops user email
$subscr_email = $xoopsUser->email();
$showSubscrSearchForm = false;
} else {
@@ -780,7 +781,7 @@
$xoopsTpl->assign('showSubscrSearchForm', $showSubscrSearchForm);
if ($showSubscrSearchForm) {
// show form search
- $subscrObj =& $xnewsletter->getHandler('xNewsletter_subscr')->create();
+ $subscrObj = $xnewsletter->getHandler('xNewsletter_subscr')->create();
$redirect_mail = (isset($_SESSION['redirect_mail'])) ? $_SESSION['redirect_mail'] : '';
if ($redirect_mail != '') {
$subscrObj->setVar('subscr_email', $redirect_mail);
@@ -803,8 +804,8 @@
// look for existing subscriptions
$criteria_subscr = new CriteriaCompo();
$criteria_subscr->add(new Criteria('subscr_email', $subscr_email));
- $criteria_subscr->setSort("subscr_id");
- $criteria_subscr->setOrder("ASC");
+ $criteria_subscr->setSort('subscr_id');
+ $criteria_subscr->setOrder('ASC');
$subscrCount = $xnewsletter->getHandler('xNewsletter_subscr')->getCount($criteria_subscr);
$xoopsTpl->assign('subscrCount', $subscrCount);
|
