Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12291] XoopsModules/xnewsletter/branches/luciorota/ xNewsletter/plugins
|
From: <luc...@us...> - 2014-02-07 20:41:52
|
Revision: 12291
http://sourceforge.net/p/xoops/svn/12291
Author: luciorota
Date: 2014-02-07 20:41:47 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
fixed error when importing fields with quote
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/evennews.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/csv.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/csv.php 2014-02-07 11:05:17 UTC (rev 12290)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/csv.php 2014-02-07 20:41:47 UTC (rev 12291)
@@ -41,8 +41,9 @@
-function xnewsletter_plugin_getdata_csv( $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist, $file, $delimiter, $header ) {
+function xnewsletter_plugin_getdata_csv($cat_id, $action_after_read, $limitCheck, $skipCatsubscrExist, $file, $delimiter, $header) {
global $xoopsDB;
+ $importHandler =& xoops_getModuleHandler('xNewsletter_import', 'xNewsletter');
require_once XNEWSLETTER_PATH . "/include/functions.php";
@@ -62,32 +63,46 @@
$lastname = isset($lineArray[3]) ? $lineArray[3] : "";
if ($email != "") {
- $subscr_id = xnewsletter_plugin_checkemail($email);
- $catsubscr_id = xnewsletter_plugin_checkemail_cat($subscr_id, $cat_id);
+ $subscr_id = xNewsletter_pluginCheckEmail($email);
+ $catsubscr_id = xNewsletter_pluginCheckCatSubscr($subscr_id, $cat_id);
- if ($skipcatsubscrexist == 1 && $catsubscr_id > 0) {
+ if ($skipCatsubscrExist == 1 && $catsubscr_id > 0) {
//skip existing subscriptions
} else {
$currcatid = $catsubscr_id > 0 ? 0 : $cat_id;
- $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
- $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
- $result_insert = $xoopsDB->queryF($sql);
+ $importObj = $importHandler->create();
+ $importObj->setVar('import_email', $email);
+ $importObj->setVar('import_sex', $sex);
+ $importObj->setVar('import_firstname', $firstname);
+ $importObj->setVar('import_lastname', $lastname);
+ $importObj->setVar('import_cat_id', $currcatid);
+ $importObj->setVar('import_subscr_id', $subscr_id);
+ $importObj->setVar('import_catsubscr_id', $catsubscr_id);
+ $importObj->setVar('import_status', $import_status);
+ if (!$importHandler->insert($importObj)) {
+ echo $importObj->getHtmlErrors();
+ exit();
+ }
+ unset($importObj);
+// $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
+// $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
+// $result_insert = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
$j++;
}
}
}
$i++;
if ($j == 100000) break; //maximum number of processing to avoid cache overflow
- if ($limitcheck > 0 && $j == $limitcheck) $import_status = 0;
+ if ($limitCheck > 0 && $j == $limitCheck) $import_status = 0;
}
- fclose($handle);
+ fclose($handle);
}
return $j;
}
-function xnewsletter_plugin_getform_csv( $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist, $action=false) {
+function xnewsletter_plugin_getform_csv( $cat_id, $action_after_read, $limitCheck, $skipCatsubscrExist, $action = false) {
if ($action === false) {
$action = $_SERVER["REQUEST_URI"];
}
@@ -108,8 +123,8 @@
$form->addElement(new XoopsFormHidden("plugin", "csv"));
$form->addElement(new XoopsFormHidden("cat_id", $cat_id));
$form->addElement(new XoopsFormHidden("action_after_read", $action_after_read));
- $form->addElement(new XoopsFormHidden("limitcheck", $limitcheck));
- $form->addElement(new XoopsFormHidden("skipcatsubscrexist", $skipcatsubscrexist));
+ $form->addElement(new XoopsFormHidden("limitcheck", $limitCheck));
+ $form->addElement(new XoopsFormHidden("skipcatsubscrexist", $skipCatsubscrExist));
$form->addElement(new XoopsFormHidden("op", "searchdata"));
$form->addElement(new XoopsFormButton("", "submit", _AM_XNEWSLETTER_IMPORT_CONTINUE, "submit"));
return $form;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/evennews.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/evennews.php 2014-02-07 11:05:17 UTC (rev 12290)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/evennews.php 2014-02-07 20:41:47 UTC (rev 12291)
@@ -43,6 +43,7 @@
function xnewsletter_plugin_getdata_evennews( $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist ) {
global $xoopsDB;
+ $importHandler =& xoops_getModuleHandler('xNewsletter_import', 'xNewsletter');
require_once XNEWSLETTER_PATH . "/include/functions.php";
@@ -51,7 +52,8 @@
$i = 0;
$j = 0;
- $sql = "SELECT `user_email`, `user_name`, `user_nick` FROM {$xoopsDB->prefix("evennews_members")}";
+ $sql = "SELECT `user_email`, `user_name`, `user_nick`";
+ $sql .= " FROM {$xoopsDB->prefix("evennews_members")}";
$sql .= " WHERE (`user_email` is not null and not(`user_email`=''))";
$result_users = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
while ($lineArray = mysql_fetch_array($result_users)) {
@@ -61,16 +63,30 @@
$firstname = $lineArray[1];
$lastname = $lineArray[2];
- $subscr_id = xnewsletter_plugin_checkemail($email);
- $catsubscr_id = xnewsletter_plugin_checkemail_cat($subscr_id, $cat_id);
+ $subscr_id = xNewsletter_pluginCheckEmail($email);
+ $catsubscr_id = xNewsletter_pluginCheckCatSubscr($subscr_id, $cat_id);
if ($skipcatsubscrexist == 1 && $catsubscr_id > 0) {
//skip existing subscriptions
} else {
$currcatid = $catsubscr_id > 0 ? 0 : $cat_id;
- $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
- $sql.= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
- $result_insert = mysql_query($sql);
+ $importObj = $importHandler->create();
+ $importObj->setVar('import_email', $email);
+ $importObj->setVar('import_sex', $sex);
+ $importObj->setVar('import_firstname', $firstname);
+ $importObj->setVar('import_lastname', $lastname);
+ $importObj->setVar('import_cat_id', $currcatid);
+ $importObj->setVar('import_subscr_id', $subscr_id);
+ $importObj->setVar('import_catsubscr_id', $catsubscr_id);
+ $importObj->setVar('import_status', $import_status);
+ if (!$importHandler->insert($importObj)) {
+ echo $importObj->getHtmlErrors();
+ exit();
+ }
+ unset($importObj);
+// $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
+// $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
+// $result_insert = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
$j++;
}
$i++;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/rmbulletin.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/rmbulletin.php 2014-02-07 11:05:17 UTC (rev 12290)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/rmbulletin.php 2014-02-07 20:41:47 UTC (rev 12291)
@@ -43,6 +43,7 @@
function xnewsletter_plugin_getdata_rmbulletin( $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist ) {
global $xoopsDB;
+ $importHandler =& xoops_getModuleHandler('xNewsletter_import', 'xNewsletter');
require_once XNEWSLETTER_PATH . "/include/functions.php";
@@ -51,7 +52,8 @@
$i = 0;
$j = 0;
- $sql = "SELECT `email` FROM ".$xoopsDB->prefix("rmb_users");
+ $sql = "SELECT `email`";
+ $sql .= " FROM ".$xoopsDB->prefix("rmb_users");
$result_users = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
while ($lineArray = mysql_fetch_array($result_users)) {
$i++;
@@ -60,16 +62,30 @@
$firstname = "";
$lastname = "";
- $subscr_id = xnewsletter_plugin_checkemail($email);
- $catsubscr_id = xnewsletter_plugin_checkemail_cat($subscr_id, $cat_id);
+ $subscr_id = xNewsletter_pluginCheckEmail($email);
+ $catsubscr_id = xNewsletter_pluginCheckCatSubscr($subscr_id, $cat_id);
if ($skipcatsubscrexist == 1 && $catsubscr_id > 0) {
//skip existing subscriptions
} else {
$currcatid = $catsubscr_id > 0 ? 0 : $cat_id;
- $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
- $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
- $result_insert=mysql_query($sql);
+ $importObj = $importHandler->create();
+ $importObj->setVar('import_email', $email);
+ $importObj->setVar('import_sex', $sex);
+ $importObj->setVar('import_firstname', $firstname);
+ $importObj->setVar('import_lastname', $lastname);
+ $importObj->setVar('import_cat_id', $currcatid);
+ $importObj->setVar('import_subscr_id', $subscr_id);
+ $importObj->setVar('import_catsubscr_id', $catsubscr_id);
+ $importObj->setVar('import_status', $import_status);
+ if (!$importHandler->insert($importObj)) {
+ echo $importObj->getHtmlErrors();
+ exit();
+ }
+ unset($importObj);
+// $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
+// $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
+// $result_insert = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
$j++;
}
$i++;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/smartpartner.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/smartpartner.php 2014-02-07 11:05:17 UTC (rev 12290)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/smartpartner.php 2014-02-07 20:41:47 UTC (rev 12291)
@@ -43,7 +43,8 @@
function xnewsletter_plugin_getdata_smartpartner( $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist ) {
global $xoopsDB;
-
+ $importHandler =& xoops_getModuleHandler('xNewsletter_import', 'xNewsletter');
+
require_once XNEWSLETTER_PATH . "/include/functions.php";
$table_import = $xoopsDB->prefix('mod_xnewsletter_import');
@@ -51,7 +52,9 @@
$i = 0;
$j = 0;
- $sql = "SELECT `contact_email`, `contact_name` FROM " . $xoopsDB->prefix("smartpartner_partner") . " WHERE (`contact_email` is not null and not(`contact_email`=''))";
+ $sql = "SELECT `contact_email`, `contact_name`";
+ $sql .= " FROM " . $xoopsDB->prefix("smartpartner_partner");
+ $sql .= " WHERE (`contact_email` is not null and not(`contact_email`=''))";
$result_users = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
while ($lineArray = mysql_fetch_array($result_users)) {
$i++;
@@ -60,16 +63,30 @@
$firstname = "";
$lastname = $lineArray[1];
- $subscr_id = xnewsletter_plugin_checkemail($email);
- $catsubscr_id = xnewsletter_plugin_checkemail_cat($subscr_id, $cat_id);
+ $subscr_id = xNewsletter_pluginCheckEmail($email);
+ $catsubscr_id = xNewsletter_pluginCheckCatSubscr($subscr_id, $cat_id);
if ($skipcatsubscrexist == 1 && $catsubscr_id > 0) {
//skip existing subscriptions
} else {
$currcatid = $catsubscr_id > 0 ? 0 : $cat_id;
- $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
- $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
- $result_insert=mysql_query($sql);
+ $importObj = $importHandler->create();
+ $importObj->setVar('import_email', $email);
+ $importObj->setVar('import_sex', $sex);
+ $importObj->setVar('import_firstname', $firstname);
+ $importObj->setVar('import_lastname', $lastname);
+ $importObj->setVar('import_cat_id', $currcatid);
+ $importObj->setVar('import_subscr_id', $subscr_id);
+ $importObj->setVar('import_catsubscr_id', $catsubscr_id);
+ $importObj->setVar('import_status', $import_status);
+ if (!$importHandler->insert($importObj)) {
+ echo $importObj->getHtmlErrors();
+ exit();
+ }
+ unset($importObj);
+// $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
+// $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
+// $result_insert = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
$j++;
}
$i++;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/subscribers.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/subscribers.php 2014-02-07 11:05:17 UTC (rev 12290)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/subscribers.php 2014-02-07 20:41:47 UTC (rev 12291)
@@ -43,6 +43,7 @@
function xnewsletter_plugin_getdata_subscribers( $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist ) {
global $xoopsDB;
+ $importHandler =& xoops_getModuleHandler('xNewsletter_import', 'xNewsletter');
require_once XNEWSLETTER_PATH . "/include/functions.php";
@@ -51,7 +52,9 @@
$i = 0;
$j = 0;
- $sql = "SELECT `user_email`, `user_name` FROM " . $xoopsDB->prefix("subscribers_user") . " WHERE (`user_email` is not null and not(`user_email`=''))";
+ $sql = "SELECT `user_email`, `user_name`";
+ $sql .= " FROM " . $xoopsDB->prefix("subscribers_user");
+ $sql .= " WHERE (`user_email` is not null and not(`user_email`=''))";
$result_users = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
while ($lineArray = mysql_fetch_array($result_users)) {
$i++;
@@ -60,16 +63,30 @@
$firstname = "";
$lastname = $lineArray[1];
- $subscr_id = xnewsletter_plugin_checkemail($email);
- $catsubscr_id = xnewsletter_plugin_checkemail_cat($subscr_id, $cat_id);
+ $subscr_id = xNewsletter_pluginCheckEmail($email);
+ $catsubscr_id = xNewsletter_pluginCheckCatSubscr($subscr_id, $cat_id);
if ($skipcatsubscrexist == 1 && $catsubscr_id > 0) {
//skip existing subscriptions
} else {
$currcatid = $catsubscr_id > 0 ? 0 : $cat_id;
- $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
- $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
- $result_insert=mysql_query($sql);
+ $importObj = $importHandler->create();
+ $importObj->setVar('import_email', $email);
+ $importObj->setVar('import_sex', $sex);
+ $importObj->setVar('import_firstname', $firstname);
+ $importObj->setVar('import_lastname', $lastname);
+ $importObj->setVar('import_cat_id', $currcatid);
+ $importObj->setVar('import_subscr_id', $subscr_id);
+ $importObj->setVar('import_catsubscr_id', $catsubscr_id);
+ $importObj->setVar('import_status', $import_status);
+ if (!$importHandler->insert($importObj)) {
+ echo $importObj->getHtmlErrors();
+ exit();
+ }
+ unset($importObj);
+// $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
+// $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
+// $result_insert = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
$j++;
}
$i++;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/weblinks.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/weblinks.php 2014-02-07 11:05:17 UTC (rev 12290)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/weblinks.php 2014-02-07 20:41:47 UTC (rev 12291)
@@ -43,6 +43,7 @@
function xnewsletter_plugin_getdata_weblinks($cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist) {
global $xoopsDB;
+ $importHandler =& xoops_getModuleHandler('xNewsletter_import', 'xNewsletter');
require_once XNEWSLETTER_PATH . "/include/functions.php";
@@ -51,7 +52,8 @@
$i = 0;
$j = 0;
- $sql = "SELECT `mail`, `name` FROM " . $xoopsDB->prefix("weblinks_link");
+ $sql = "SELECT `mail`, `name`";
+ $sql .= " FROM " . $xoopsDB->prefix("weblinks_link");
$result_users = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
while ($lineArray = mysql_fetch_array($result_users)) {
$i++;
@@ -60,16 +62,30 @@
$firstname = "";
$lastname = $lineArray[1];
- $subscr_id = xnewsletter_plugin_checkemail($email);
- $catsubscr_id = xnewsletter_plugin_checkemail_cat($subscr_id, $cat_id);
+ $subscr_id = xNewsletter_pluginCheckEmail($email);
+ $catsubscr_id = xNewsletter_pluginCheckCatSubscr($subscr_id, $cat_id);
if ($skipcatsubscrexist == 1 && $catsubscr_id > 0) {
//skip existing subscriptions
} else {
$currcatid = $catsubscr_id > 0 ? 0 : $cat_id;
- $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
- $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
- $result_insert = mysql_query($sql);
+ $importObj = $importHandler->create();
+ $importObj->setVar('import_email', $email);
+ $importObj->setVar('import_sex', $sex);
+ $importObj->setVar('import_firstname', $firstname);
+ $importObj->setVar('import_lastname', $lastname);
+ $importObj->setVar('import_cat_id', $currcatid);
+ $importObj->setVar('import_subscr_id', $subscr_id);
+ $importObj->setVar('import_catsubscr_id', $catsubscr_id);
+ $importObj->setVar('import_status', $import_status);
+ if (!$importHandler->insert($importObj)) {
+ echo $importObj->getHtmlErrors();
+ exit();
+ }
+ unset($importObj);
+// $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
+// $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
+// $result_insert = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
$j++;
}
$i++;
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php 2014-02-07 11:05:17 UTC (rev 12290)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php 2014-02-07 20:41:47 UTC (rev 12291)
@@ -42,8 +42,9 @@
-function xnewsletter_plugin_getdata_xoopsuser($cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist,$arr_groups) {
+function xnewsletter_plugin_getdata_xoopsuser($cat_id, $action_after_read, $limitcheck, $skipCatsubscrExist, $arr_groups) {
global $xoopsDB;
+ $importHandler =& xoops_getModuleHandler('xNewsletter_import', 'xNewsletter');
require_once XNEWSLETTER_PATH . "/include/functions.php";
@@ -52,17 +53,10 @@
$i = 0;
$j = 0;
- $groups = '';
$sql = "SELECT `email`, `name`,`uname` FROM {$xoopsDB->prefix("groups_users_link")}";
$sql .= " INNER JOIN {$xoopsDB->prefix("users")} ON {$xoopsDB->prefix("groups_users_link")}.uid = {$xoopsDB->prefix("users")}.uid";
- $sql .= " WHERE ({$xoopsDB->prefix("groups_users_link")}.groupid IN (";
- foreach($arr_groups as $key => $groupid) {
- if (!$groups=='')
- $groups .= ",";
- $groups .= $groupid;
- }
- $sql .= $groups;
- $sql .= ")) GROUP BY `email`, `name`, `uname`";
+ $sql .= " WHERE ({$xoopsDB->prefix("groups_users_link")}.groupid IN (" . implode(',', $arr_groups) . "))";
+ $sql .= " GROUP BY `email`, `name`, `uname`";
$result_users = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
while ($lineArray = mysql_fetch_array($result_users)) {
@@ -72,28 +66,42 @@
$firstname = "";
$lastname = ($lineArray[1]=='') ? $lineArray[2] : $lineArray[1];
- $subscr_id = xnewsletter_plugin_checkemail($email);
- $catsubscr_id = xnewsletter_plugin_checkemail_cat($subscr_id, $cat_id);
+ $subscr_id = xNewsletter_pluginCheckEmail($email);
+ $catsubscr_id = xNewsletter_pluginCheckCatSubscr($subscr_id, $cat_id);
- if ($skipcatsubscrexist == 1 && $catsubscr_id > 0) {
+ if ($skipCatsubscrExist == 1 && $catsubscr_id > 0) {
//skip existing subscriptions
} else {
$currcatid = $catsubscr_id > 0 ? 0 : $cat_id;
- $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
- $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
- $result_insert = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
+ $importObj = $importHandler->create();
+ $importObj->setVar('import_email', $email);
+ $importObj->setVar('import_sex', $sex);
+ $importObj->setVar('import_firstname', $firstname);
+ $importObj->setVar('import_lastname', $lastname);
+ $importObj->setVar('import_cat_id', $currcatid);
+ $importObj->setVar('import_subscr_id', $subscr_id);
+ $importObj->setVar('import_catsubscr_id', $catsubscr_id);
+ $importObj->setVar('import_status', $import_status);
+ if (!$importHandler->insert($importObj)) {
+ echo $importObj->getHtmlErrors();
+ exit();
+ }
+ unset($importObj);
+// $sql = "INSERT INTO {$table_import} (import_email, import_sex, import_firstname, import_lastname, import_cat_id, import_subscr_id, import_catsubscr_id, import_status)";
+// $sql .= " VALUES ('$email', '$sex', '$firstname', '$lastname', $currcatid, $subscr_id, $catsubscr_id, $import_status)";
+// $result_insert = $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
$j++;
}
$i++;
if ($j == 100000) break; //maximum number of processing to avoid cache overflow
- if ($limitcheck > 0 && $j == $limitcheck) $import_status = 0;
+ if ($limitCheck > 0 && $j == $limitCheck) $import_status = 0;
}
return $j;
}
-function xnewsletter_plugin_getform_xoopsuser($cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist) {
+function xnewsletter_plugin_getform_xoopsuser($cat_id, $action_after_read, $limitCheck, $skipCatsubscrExist) {
global $xoopsDB, $xoopsModuleConfig;
$member_handler = &xoops_gethandler('member');
@@ -125,8 +133,8 @@
$form->addElement(new XoopsFormHidden("plugin", "xoopsuser"));
$form->addElement(new XoopsFormHidden("cat_id", $cat_id));
$form->addElement(new XoopsFormHidden("action_after_read", $action_after_read));
- $form->addElement(new XoopsFormHidden("limitcheck", $limitcheck));
- $form->addElement(new XoopsFormHidden("skipcatsubscrexist", $skipcatsubscrexist));
+ $form->addElement(new XoopsFormHidden("limitcheck", $limitCheck));
+ $form->addElement(new XoopsFormHidden("skipcatsubscrexist", $skipCatsubscrExist));
$form->addElement(new XoopsFormHidden("op", "searchdata"));
$form->addElement(new XoopsFormButton("", "submit", _AM_XNEWSLETTER_IMPORT_CONTINUE, "submit"));
return $form;
|
