Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12456] XoopsModules/xnewsletter/branches/luciorota/ xNewsletter
|
From: <luc...@us...> - 2014-04-17 21:08:01
|
Revision: 12456
http://sourceforge.net/p/xoops/svn/12456
Author: luciorota
Date: 2014-04-17 21:07:56 +0000 (Thu, 17 Apr 2014)
Log Message:
-----------
import procedure: check if limit options are compatible with php.ini 'max_input_vars' setting
standardize (in progress)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_subscrinfo.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/search.inc.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -25,7 +25,7 @@
* Version : $Id $
* ****************************************************************************
*/
-
+$currentFile = basename(__FILE__);
include "admin_header.php";
xoops_cp_header();
@@ -43,32 +43,31 @@
$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($currentFile);
-echo $indexAdmin->addNavigation("import.php");
-
switch ($op) {
case "show_formcheck":
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
- $crit_import = new CriteriaCompo();
- $crit_import->setSort("import_id");
- $crit_import->setOrder("ASC");
- $numrows = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
+ $import_criteria = new CriteriaCompo();
+ $import_criteria->setSort("import_id");
+ $import_criteria->setOrder("ASC");
+ $numrows = $xnewsletter->getHandler('xNewsletter_import')->getCount($import_criteria);
- $crit_import->setStart($start);
- $crit_import->setLimit($limitcheck);
- $import_arr = $xnewsletter->getHandler('xNewsletter_import')->getall($crit_import);
+ $import_criteria->setStart($start);
+ $import_criteria->setLimit($limitcheck);
+ $import_arr = $xnewsletter->getHandler('xNewsletter_import')->getall($import_criteria);
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\">";
+ $form = "<br/>";
+ $form .= "<form name=\"form_import_{$unique_id}\" id=\"form_import_{$unique_id}\" action=\"{$currentFile}\" method=\"post\" enctype=\"multipart/form-data\">";
- $showlimit = str_replace("%s", $start+1, _AM_XNEWSLETTER_IMPORT_SHOW);
+ $showlimit = str_replace("%s", $start + 1, _AM_XNEWSLETTER_IMPORT_SHOW);
if ($limitcheck < $numrows) {
$showlimit = str_replace("%l", $limitcheck, $showlimit);
} else {
@@ -76,22 +75,23 @@
}
$showlimit = str_replace("%n", $numrows, $showlimit);
- $form .="<table width=\"100%\" cellspacing=\"1\" class=\"outer\">
+ $form .= "
+ <table width=\"100%\" cellspacing=\"1\" class=\"outer\">
<tr>
- <td align=\"left\" colspan='8'>".$showlimit."</td>
+ <td align=\"left\" colspan='8'>" . $showlimit . "</td>
</tr>";
$class = "odd";
- $form .="
+ $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>
+ <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";
@@ -105,7 +105,7 @@
foreach (array_keys($import_arr) as $i) {
$counter++;
- $form .= "<tr class=\"".$class."\">";
+ $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")."' />";
@@ -116,41 +116,48 @@
$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 .= "<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>";
+ 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>";
+ 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 .= "<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 .= "<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_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' />";
+ if ($subscr_id > 0)
+ $form .= "<img src='".XNEWSLETTER_ICONS_URL."/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_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' />";
+ if ($catsubscr_id > 0)
+ $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' />";
$form .= "</td>";
$form .= "</td>";
$form .= "<td align=\"center\">";
@@ -190,7 +197,7 @@
//update mod_xnewsletter with settings form_import
$counter = xNewsletter_CleanVars($_REQUEST, 'counter', 0, 'int');
- for ($i=1; $i < ($counter+1); $i++) {
+ 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');
@@ -198,35 +205,41 @@
$cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id_'.$i, 0, 'int');
if ($cat_id > 0) {
- if ($subscr_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";
+ $sql = "UPDATE {$xoopsDB->prefix('mod_xnewsletter_import')}";
+ $sql .= " SET `import_sex`='{$subscr_sex}', `import_firstname`='{$subscr_firstname}', `import_lastname`='{$subscr_lastname}'";
+ $sql .= " 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";
+ $sql = "UPDATE {$xoopsDB->prefix('mod_xnewsletter_import')}";
+ $sql .= " SET `import_cat_id`='{$cat_id}', `import_status`=1";
+ $sql.= " WHERE `import_id`={$import_id}";
$result=$xoopsDB->queryF($sql);
}
- redirect_header("import.php?op=exec_import_final&check_import=1&limitcheck=".$limitcheck, 0, "");
+ redirect_header("{$currentFile}?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');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
$ip = xoops_getenv("REMOTE_ADDR");
$submitter = $xoopsUser->uid();
- $crit_import = new CriteriaCompo();
- $crit_import->add(new Criteria('import_status', "1"));
+ $import_criteria = new CriteriaCompo();
+ $import_criteria->add(new Criteria('import_status', '1'));
$numrows_total = $xnewsletter->getHandler('xNewsletter_import')->getCount();
- $numrows_act = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
+ $numrows_act = $xnewsletter->getHandler('xNewsletter_import')->getCount($import_criteria);
if ( $numrows_act > 0 ) {
- $sql = "SELECT * FROM ".$xoopsDB->prefix("mod_xnewsletter_import")." WHERE ((import_status)=1)";
+ $sql = "SELECT *";
+ $sql .= " FROM {$xoopsDB->prefix("mod_xnewsletter_import")}";
+ $sql .= " WHERE ((import_status)=1)";
$sql .= " ORDER BY `import_id` ASC";
$counter = 0;
$users_import = $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
@@ -242,47 +255,53 @@
$subscribe = 0;
if ($cat_id == 0) {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_SKIP), 1, $submitter);
+ createProtocol(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) ) {
+ $sql = "SELECT `uid`";
+ $sql .= " FROM {$xoopsDB->prefix('users')}";
+ $sql .= " WHERE (`email`='{$subscr_email}') 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_firstname`, `subscr_lastname`, `subscr_uid`, `subscr_sex`, `subscr_submitter`, `subscr_created`, `subscr_ip`, `subscr_activated`, `subscr_actoptions`) VALUES ('".$subscr_email."','".$subscr_firstname."','".$subscr_lastname."',".intval($subscr_uid).",'".$subscr_sex."',".$submitter.",".time().",'".$ip."','1','')";
+ $sql = "INSERT";
+ $sql .= " INTO `{$xoopsDB->prefix('mod_xnewsletter_subscr')}`";
+ $sql .= " (`subscr_email`, `subscr_firstname`, `subscr_lastname`, `subscr_uid`, `subscr_sex`, `subscr_submitter`, `subscr_created`, `subscr_ip`, `subscr_activated`, `subscr_actoptions`)";
+ $sql .= " VALUES ('{$subscr_email}', '{$subscr_firstname}', '{$subscr_lastname}', " . intval($subscr_uid) . ", '{$subscr_sex}', {$submitter}, " . time() . ",'{$ip}', '1', '')";
if (!$xoopsDB->queryF($sql)) {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
+ createProtocol(str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
} else {
//register email successful
- $resulttext = $subscr_email.": "._AM_XNEWSLETTER_IMPORT_RESULT_REG_OK." | ";
+ $resulttext = $subscr_email . ": " . _AM_XNEWSLETTER_IMPORT_RESULT_REG_OK . " | ";
$subscr_id = $xoopsDB->getInsertId();
$subscribe=1;
}
} else {
//email already registered
- $resulttext = $subscr_email.": "._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST." | ";
+ $resulttext = $subscr_email . ": " ._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST . " | ";
$subscribe=1;
}
if ($subscribe == 1) {
if ($catsubscr_id==0) {
//add subscription of this email
- $sql = "INSERT INTO `".$xoopsDB->prefix('mod_xnewsletter_catsubscr')."` (`catsubscr_catid`, `catsubscr_subscrid`, `catsubscr_submitter`, `catsubscr_created`) VALUES (".$cat_id.",".$subscr_id.",".$submitter.",".time().")";
+ $sql = "INSERT";
+ $sql .= " INTO `{$xoopsDB->prefix('mod_xnewsletter_catsubscr')}`";
+ $sql .= " (`catsubscr_catid`, `catsubscr_subscrid`, `catsubscr_submitter`, `catsubscr_created`)";
+ $sql .= " VALUES ({$cat_id}, {$subscr_id}, {$submitter}," . time() . ")";
if ($xoopsDB->queryF($sql)) {
- create_prot ( $resulttext._AM_XNEWSLETTER_IMPORT_RESULT_SUBSCR_OK, 1, $submitter);
+ createProtocol($resulttext . _AM_XNEWSLETTER_IMPORT_RESULT_SUBSCR_OK, 1, $submitter);
//handle mailinglists
$cat_mailinglist = 0;
- $sql = "SELECT `cat_mailinglist` FROM ".$xoopsDB->prefix("mod_xnewsletter_cat")." WHERE (`cat_id`=";
- $sql .= $cat_id;
- $sql .= ") LIMIT 1";
- if ( $cat_mls = $xoopsDB->queryF($sql) ) {
+ $sql = "SELECT `cat_mailinglist`";
+ $sql .= " FROM {$xoopsDB->prefix("mod_xnewsletter_cat")}";
+ $sql .= " WHERE (`cat_id`={$cat_id}) LIMIT 1";
+ if ($cat_mls = $xoopsDB->queryF($sql)) {
$cat_ml = mysql_fetch_array($cat_mls);
$cat_mailinglist = $cat_ml[0];
}
@@ -290,18 +309,20 @@
unset($cat_mls);
if ($cat_mailinglist > 0) {
- require_once( XOOPS_ROOT_PATH."/modules/xNewsletter/include/mailinglist.php" );
+ require_once(XOOPS_ROOT_PATH . "/modules/xNewsletter/include/mailinglist.php");
subscribingMLHandler(1, $subscr_id, $cat_mailinglist);
}
} else {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
+ createProtocol(str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
}
} else {
- create_prot ( $resulttext._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST, 1, $submitter);
+ createProtocol($resulttext . _AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST, 1, $submitter);
}
}
}
- $sql_del = "DELETE FROM ".$xoopsDB->prefix('mod_xnewsletter_import')." WHERE `import_id`=".$import_id;
+ $sql_del = "DELETE";
+ $sql_del .= " FROM {$xoopsDB->prefix('mod_xnewsletter_import')}";
+ $sql_del .= " WHERE `import_id`={$import_id}";
$result = $xoopsDB->queryF($sql_del);
}
@@ -314,7 +335,7 @@
$numrows_pend = $xnewsletter->getHandler('xNewsletter_import')->getCount();
if ($numrows_pend > 0) {
- $form_continue = "<form id='form_continue' enctype='multipart/form-data' method='post' action='import.php' name='form_continue'>";
+ $form_continue = "<form id='form_continue' enctype='multipart/form-data' method='post' action='{$currentFile}' name='form_continue'>";
$form_continue .= "<input id='submit' class='formButton' type='submit' title='"._AM_XNEWSLETTER_IMPORT_CONTINUE."' value='"._AM_XNEWSLETTER_IMPORT_CONTINUE."' name='submit'>";
$form_continue .= '<input id="limitcheck" type="hidden" value="'.$limitcheck.'" name="limitcheck">';
if ($check_import==1) {
@@ -344,8 +365,8 @@
//set cat_id as preselected, update information about existing registration/subscriptions
//if ($action_after_read==1) execute import else show form for check before executing import
- $pluginFile = XNEWSLETTER_ROOT_PATH . "/plugins/" . $plugin . '.php';
- if ( !file_exists($pluginFile) ) {
+ $pluginFile = XNEWSLETTER_ROOT_PATH . "/plugins/{$plugin}.php";
+ if (!file_exists($pluginFile)) {
echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
break;
}
@@ -353,14 +374,14 @@
$function = 'xnewsletter_plugin_getdata_' . $plugin;
if (!function_exists($function)) {
- echo "Error: require function 'xnewsletter_plugin_getdata_".$plugin."' doesn't exist";
+ echo "Error: require function 'xnewsletter_plugin_getdata_{$plugin}' doesn't exist";
echo str_replace("%f", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION);
break;
}
//delete all existing data
$sql = "TRUNCATE TABLE ".$xoopsDB->prefix('mod_xnewsletter_import');
- $result=$xoopsDB->queryF($sql);
+ $result= $xoopsDB->queryF($sql);
//import data into mod_xnewsletter_import with plugin
if ($plugin == 'csv') {
@@ -379,37 +400,37 @@
}
if ($numData > 0) {
- if ($action_after_read==0) {
+ if ($action_after_read == 0) {
//execute import without check
- redirect_header("import.php?op=exec_import_final&action_after_read=0&limitcheck=".$limitcheck, 0, "");
+ redirect_header("{$currentFile}?op=exec_import_final&action_after_read=0&limitcheck={$limitcheck}", 0, '');
} else {
//show form for check before executing import
- redirect_header("import.php?op=show_formcheck&action_after_read=1&plugin=".$plugin."&limitcheck=".$limitcheck, 0, "");
+ redirect_header("{$currentFile}?op=show_formcheck&action_after_read=1&plugin={$plugin}&limitcheck={$limitcheck}", 0, '');
}
} else {
- redirect_header("import.php", 3, _AM_XNEWSLETTER_IMPORT_NODATA);
+ redirect_header($currentFile, 3, _AM_XNEWSLETTER_IMPORT_NODATA);
}
break;
case "form_additional":
//show form for additional settings
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
- $pluginFile = XNEWSLETTER_ROOT_PATH . "/plugins/" . $plugin . '.php';
- if ( !file_exists($pluginFile) ) {
+ $pluginFile = XNEWSLETTER_ROOT_PATH . "/plugins/{$plugin}.php";
+ if (!file_exists($pluginFile)) {
echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
break;
}
require_once($pluginFile);
- $function = 'xnewsletter_plugin_getform_' . $plugin;
- if (!function_exists($function) ) {
+ $function = "xnewsletter_plugin_getform_{$plugin}";
+ if (!function_exists($function)) {
echo str_replace("%f", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION);
break;
}
//$form = $function( $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist );
- $form = call_user_func($function, $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist );
+ $form = call_user_func($function, $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist);
$form->display();
break;
@@ -423,10 +444,12 @@
}
include "admin_footer.php";
-function create_prot($prot_text, $success, $submitter) {
+
+
+function createProtocol($prot_text, $success, $submitter) {
global $xoopsDB;
-
- $sql = "INSERT INTO `{$xoopsDB->prefix('mod_xnewsletter_protocol')}` (`protocol_letter_id`, `protocol_subscriber_id`, `protocol_status`, `protocol_success`, `protocol_submitter`, `protocol_created`)";
- $sql.= " VALUES (0,0,'{$prot_text}', {$success}, {$submitter}, " . time() . ")";
+ $sql = "INSERT INTO `{$xoopsDB->prefix('mod_xnewsletter_protocol')}`";
+ $sql .= " (`protocol_letter_id`, `protocol_subscriber_id`, `protocol_status`, `protocol_success`, `protocol_submitter`, `protocol_created`)";
+ $sql .= " VALUES (0,0,'{$prot_text}', {$success}, {$submitter}, " . time() . ")";
$xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_catsubscr.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_catsubscr.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -1,8 +1,10 @@
<?php
/**
* ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
* XNEWSLETTER - MODULE FOR XOOPS
- * Copyright (c) 2012
+ * Copyright (c) 2007 - 2012
* Goffy ( wedega.com )
*
* You may not change or alter any portion of this comment or credits
@@ -23,22 +25,21 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
-include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/include/functions.php";
+
function b_xnewsletter_catsubscr($options) {
- include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/class/xNewsletter_catsubscr.php";
- $myts =& MyTextSanitizer::getInstance();
+ global $xoopsUser;
+ $xnewsletter = xNewsletterxNewsletter::getInstance();
+ $myts = MyTextSanitizer::getInstance();
$catsubscr = array();
$type_block = $options[0];
$nb_catsubscr = $options[1];
$length_title = $options[2];
- $xnewsletter->getHandler('xNewsletter_catsubscr') =& xoops_getModuleHandler("xnewsletter_catsubscr", "xNewsletter");
- $xnewsletter->getHandler('xNewsletter_cat')=& xoops_getModuleHandler('xNewsletter_cat', 'xNewsletter');
- $xnewsletter->getHandler('xNewsletter_subscr')=& xoops_getModuleHandler('xNewsletter_subscr', 'xNewsletter');
-
$criteria = new CriteriaCompo();
array_shift($options);
array_shift($options);
@@ -76,29 +77,32 @@
if ($length_title > 0 && strlen($cat_name) > $length_title)
$cat_name = substr($cat_name, 0, $length_title) . "...";
$catsubscr[$i]["catsubscr_newsletter"] = $cat_name;
- $catsubscr[$i]["catsubscr_created"] = formatTimeStamp($catsubscr_arr[$i]->getVar("catsubscr_created"),"S");
+ $catsubscr[$i]["catsubscr_created"] = formatTimeStamp($catsubscr_arr[$i]->getVar("catsubscr_created"), "S");
}
}
return $catsubscr;
}
+
+
function b_xnewsletter_catsubscr_edit($options) {
- $xnewsletter->getHandler('xNewsletter_cat')=& xoops_getModuleHandler('xNewsletter_cat', 'xNewsletter');
+ global $xoopsUser;
+ $xnewsletter = xNewsletterxNewsletter::getInstance();
- $form = ""._MB_XNEWSLETTER_LETTER_DISPLAY."\n";
+ $form = "" . _MB_XNEWSLETTER_LETTER_DISPLAY . "\n";
$form .= "<input type=\"hidden\" name=\"options[0]\" value=\"" . $options[0] . "\" />";
$form .= "<input name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\"" . $options[1] . "\" type=\"text\" /> <br />";
- $form .= ""._MB_XNEWSLETTER_LETTER_TITLELENGTH." : <input name=\"options[2]\" size=\"5\" maxlength=\"255\" value=\"" . $options[2] . "\" type=\"text\" /><br /><br />";
+ $form .= "" . _MB_XNEWSLETTER_LETTER_TITLELENGTH . " : <input name=\"options[2]\" size=\"5\" maxlength=\"255\" value=\"" . $options[2] . "\" type=\"text\" /><br /><br />";
array_shift($options);
array_shift($options);
array_shift($options);
- $form .= ""._MB_XNEWSLETTER_LETTER_CATTODISPLAY."<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">";
+ $form .= "" . _MB_XNEWSLETTER_LETTER_CATTODISPLAY . "<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">";
$form .= "<option value=\"0\" " . (array_search(0, $options) === false ? "" : "selected=\"selected\"") . ">" ._MB_XNEWSLETTER_CATSUBSCR_ALLCAT . "</option>";
- $cat_crit = new CriteriaCompo();
- $cat_crit->setSort("cat_id");
- $cat_crit->setOrder("ASC");
- $cat_arr = $xnewsletter->getHandler('xNewsletter_cat')->getall($cat_crit);
+ $cat_criteria = new CriteriaCompo();
+ $cat_criteria->setSort("cat_id");
+ $cat_criteria->setOrder("ASC");
+ $cat_arr = $xnewsletter->getHandler('xNewsletter_cat')->getall($cat_criteria);
foreach (array_keys($cat_arr) as $i) {
$form .= "<option value=\"" . $i . "\" " . (array_search($i, $options) === false ? "" : "selected=\"selected\"") . ">" . $cat_arr[$i]->getVar("cat_name") . "</option>";
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_letter.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_letter.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -25,9 +25,11 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
+
+
function b_xnewsletter_letter($options) {
global $xoopsUser;
$myts = MyTextSanitizer::getInstance();
@@ -82,8 +84,9 @@
if ($showCat == true) {
$letter[$i]['letter_id'] = $letter_arr[$i]->getVar('letter_id');
$letter_title = $letter_arr[$i]->getVar('letter_title');
- if ($length_title > 0 && strlen($letter_title) > $length_title)
+ if ($length_title > 0 && strlen($letter_title) > $length_title) {
$letter_title = substr($letter_title, 0, $length_title) . '...';
+ }
$letter[$i]['letter_title'] = $letter_title;
// $letter[$i]["letter_content"] = $letter_arr[$i]->getVar("letter_content");
// $letter[$i]["letter_cats"] = $letter_arr[$i]->getVar("letter_cats");
@@ -96,8 +99,9 @@
return $letter;
}
+
+
function b_xnewsletter_letter_edit($options) {
-
$form = "" . _MB_XNEWSLETTER_LETTER_DISPLAY . "\n";
$form .= "<input type=\"hidden\" name=\"options[0]\" value=\"{$options[0]}\" />";
$form .= "<input name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\"{$options[1]}\" type=\"text\" />";
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_subscrinfo.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_subscrinfo.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_subscrinfo.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -1,8 +1,10 @@
<?php
/**
* ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
* XNEWSLETTER - MODULE FOR XOOPS
- * Copyright (c) 2012
+ * Copyright (c) 2007 - 2012
* Goffy ( wedega.com )
*
* You may not change or alter any portion of this comment or credits
@@ -23,7 +25,11 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
+
+
function b_xnewsletter_subscrinfo($options) {
xoops_loadLanguage('modinfo', 'xNewsletter');
$unique_id = uniqid(mt_rand());
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -113,16 +113,20 @@
if ($limitcheck > 200) $limitcheck = 200;
}
$sel_limitcheck = new XoopsFormSelect(_AM_XNEWSLETTER_IMPORT_CHECK_LIMIT_PACKAGE, "limitcheck", $limitcheck);
- $sel_limitcheck->addOption(0, _AM_XNEWSLETTER_IMPORT_NOLIMIT);
if ($action_after_read == 0 ) {
+ $sel_limitcheck->addOption(0, _AM_XNEWSLETTER_IMPORT_NOLIMIT);
$sel_limitcheck->addOption(500, 500);
$sel_limitcheck->addOption(1000, 1000);
$sel_limitcheck->addOption(10000, 10000);
$sel_limitcheck->addOption(25000, 25000);
} else {
- $sel_limitcheck->addOption(50, 50);
- $sel_limitcheck->addOption(100, 100);
- $sel_limitcheck->addOption(200, 200);
+ $limitOptions = array(25, 50, 100, 200, 400);
+ foreach ($limitOptions as $limitOption) {
+ // check if limit options are compatible with php.ini 'max_input_vars' setting
+ if ((ini_get('max_input_vars') == 0) || ((($limitOption * 7) + 4) < ini_get('max_input_vars'))) {
+ $sel_limitcheck->addOption($limitOption, $limitOption);
+ }
+ }
}
$form->addElement($sel_limitcheck, false);
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt 2014-04-17 21:07:56 UTC (rev 12456)
@@ -1,10 +1,12 @@
Version 1.3
--------------
+ - import procedure: check if limit options are compatible with php.ini 'max_input_vars' setting (luciorota)
- templatize user side (luciorota)
- standardize code (luciorota)
- added html2txt function for non-HTML mail clients (luciorota)
- added: breadcrumb class (luciorota)
- added: updating to XOOPS 2.5.7 Multi-page help (luciorota)
+ - fixed: when there is an apostrophe in the title, a backslash is obtained on reading the email (luciorota)
Version 1.2
--------------
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/mailinglist.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/mailinglist.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/mailinglist.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -25,26 +25,24 @@
* Version : 1 Thu 2012/12/06 12:57:01 : Exp $
* ****************************************************************************
*/
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(__FILE__) . '/common.php';
+
function subscribingMLHandler($type, $subscr_id, $mailinglist_id) {
global $xoopsUser, $xoopsConfig;
- include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/class/xNewsletter_subscr.php";
- include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/class/xNewsletter_mailinglist.php";
- include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/class/xNewsletter_protocol.php";
+ $xnewsletter = xNewsletterxNewsletter::getInstance();
- $xnewsletter->getHandler('xNewsletter_subscr')=& xoops_getModuleHandler('xNewsletter_subscr', 'xNewsletter');
- $xnewsletter->getHandler('xNewsletter_mailinglist')=& xoops_getModuleHandler('xNewsletter_mailinglist', 'xNewsletter');
+ $subscrObj = $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
+ $subscr_email = $subscrObj->getVar("subscr_email");
- $obj_subscr =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
- $subscr_email = $obj_subscr->getVar("subscr_email");
-
- $obj_mailinglist = $xnewsletter->getHandler('xNewsletter_mailinglist')->get($mailinglist_id);
- $mailinglist_email = $obj_mailinglist->getVar("mailinglist_email");
+ $mailinglistObj = $xnewsletter->getHandler('xNewsletter_mailinglist')->get($mailinglist_id);
+ $mailinglist_email = $mailinglistObj->getVar("mailinglist_email");
if ($type == 1) {
- $action_code = $obj_mailinglist->getVar("mailinglist_subscribe");
+ $action_code = $mailinglistObj->getVar("mailinglist_subscribe");
} else {
- $action_code = $obj_mailinglist->getVar("mailinglist_unsubscribe");
+ $action_code = $mailinglistObj->getVar("mailinglist_unsubscribe");
}
$action_code = str_replace("{email}", $subscr_email, $action_code);
@@ -53,11 +51,10 @@
echo "<br />mailinglist_id: {$mailinglist_id}";
echo "<br />action_code: {$action_code}";
echo "<br />";
-/* */
- 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" );
+ 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");
//get emails of subscribers
$recipients = array();
@@ -71,7 +68,7 @@
);
$letter_id = 0;
- $senderuid = (is_object($xoopsUser) && isset($xoopsUser)) ? $xoopsUser->uid() : 0;
+ $senderUid = (is_object($xoopsUser) && isset($xoopsUser)) ? $xoopsUser->uid() : 0;
$subject = "";
@@ -102,31 +99,30 @@
$text_clean = array("<strong>", "</strong>", "<br/>", "<br />");
$protocol_status = str_replace($text_clean, "", $protocol_status);
- $xnewsletter->getHandler('xNewsletter_protocol') =& xoops_getModuleHandler("xNewsletter_protocol", "xNewsletter");
- $obj_protocol =& $xnewsletter->getHandler('xNewsletter_protocol')->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", 1);
- $obj_protocol->setVar("protocol_submitter", $senderuid);
- $obj_protocol->setVar("protocol_created", time());
+ $protocolObj = $xnewsletter->getHandler('xNewsletter_protocol')->create();
+ $protocolObj->setVar("protocol_letter_id", $letter_id);
+ $protocolObj->setVar("protocol_subscriber_id", $subscriber_id);
+ $protocolObj->setVar("protocol_status", $protocol_status);
+ $protocolObj->setVar("protocol_success", 1);
+ $protocolObj->setVar("protocol_submitter", $senderUid);
+ $protocolObj->setVar("protocol_created", time());
- if ($xnewsletter->getHandler('xNewsletter_protocol')->insert($obj_protocol)) {
+ if ($xnewsletter->getHandler('xNewsletter_protocol')->insert($protocolObj)) {
//create protocol is ok
- $obj_protocol2 =& $xnewsletter->getHandler('xNewsletter_protocol')->create();
- $obj_protocol2->setVar("protocol_letter_id", $letter_id);
- $obj_protocol2->setVar("protocol_subscriber_id", $subscriber_id);
- $obj_protocol2->setVar("protocol_status", _AM_XNEWSLETTER_SEND_SUCCESS_ML);
- $obj_protocol2->setVar("protocol_success", 1);
- $obj_protocol2->setVar("protocol_submitter", $senderuid);
- $obj_protocol2->setVar("protocol_created", time());
- if ($xnewsletter->getHandler('xNewsletter_protocol')->insert($obj_protocol2)) {
+ $protocolObj2 = $xnewsletter->getHandler('xNewsletter_protocol')->create();
+ $protocolObj2->setVar("protocol_letter_id", $letter_id);
+ $protocolObj2->setVar("protocol_subscriber_id", $subscriber_id);
+ $protocolObj2->setVar("protocol_status", _AM_XNEWSLETTER_SEND_SUCCESS_ML);
+ $protocolObj2->setVar("protocol_success", 1);
+ $protocolObj2->setVar("protocol_submitter", $senderUid);
+ $protocolObj2->setVar("protocol_created", time());
+ if ($xnewsletter->getHandler('xNewsletter_protocol')->insert($protocolObj2)) {
return true;
} else {
- return $obj_protocol2->getHtmlErrors();
+ return $protocolObj2->getHtmlErrors();
}
} else {
- return $obj_protocol->getHtmlErrors();
+ return $protocolObj->getHtmlErrors();
}
}
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/search.inc.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/search.inc.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/search.inc.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -29,7 +29,9 @@
function xnewsletter_search($queryarray, $andor, $limit, $offset, $userid) {
global $xoopsDB;
- $sql = "SELECT cat_id, cat_name, cat_submitter, cat_created FROM {$xoopsDB->prefix("mod_xnewsletter_cat")} WHERE cat_created > 0";
+ $sql = "SELECT cat_id, cat_name, cat_submitter, cat_created";
+ $sql.= " FROM {$xoopsDB->prefix("mod_xnewsletter_cat")}";
+ $sql.= " WHERE cat_created > 0";
if ($userid != 0) {
$sql .= " AND cat_submitter=" . intval($userid) . " ";
}
|
