Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12190] XoopsModules/xnewsletter/trunk/xNewsletter
|
From: <go...@us...> - 2013-10-21 09:19:30
|
Revision: 12190
http://sourceforge.net/p/xoops/svn/12190
Author: goffy
Date: 2013-10-21 09:19:26 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
added new block for general info (feichtl/goffy)
removed xoops captcha when unsubscribe by link (feichtl/goffy)
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt
XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php
XoopsModules/xnewsletter/trunk/xNewsletter/xoops_version.php
Added Paths:
-----------
XoopsModules/xnewsletter/trunk/xNewsletter/blocks/blocks_subscrinfo.php
XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html
Added: XoopsModules/xnewsletter/trunk/xNewsletter/blocks/blocks_subscrinfo.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/blocks/blocks_subscrinfo.php (rev 0)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/blocks/blocks_subscrinfo.php 2013-10-21 09:19:26 UTC (rev 12190)
@@ -0,0 +1,40 @@
+<?php
+/**
+ * ****************************************************************************
+ * XNEWSLETTER - MODULE FOR XOOPS
+ * Copyright (c) 2012
+ * Goffy ( wedega.com )
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting
+ * source code which is considered copyrighted (c) material of the
+ * original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright Goffy ( wedega.com )
+ * @license GPL 2.0
+ * @package xNewsletter
+ * @author Goffy ( web...@we... )
+ *
+ * Version : 1 Mon 2012/11/05 14:31:32 : Exp $
+ * ****************************************************************************
+ */
+
+function b_xnewsletter_subscrinfo($options) {
+
+ xoops_loadLanguage('modinfo', "xNewsletter");
+ $unique_id = uniqid(mt_rand());
+ $subscrinfo = array();
+ $subscrinfo["formname"] = "formsubscrinfo_".$unique_id;
+ $subscrinfo["formaction"] = XOOPS_URL."/modules/xNewsletter/subscription.php";
+ $subscrinfo["infotext"] = _MI_XNEWSLETTER_SUBSCRINFO_TEXT_BLOCK;
+ $subscrinfo["buttontext"] = _MI_XNEWSLETTER_SUBSCRIBE;
+
+ return $subscrinfo;
+
+}
+?>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php 2013-10-21 08:49:51 UTC (rev 12189)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php 2013-10-21 09:19:26 UTC (rev 12190)
@@ -67,8 +67,10 @@
$email_field->setExtra('disabled="disabled"');
}
$email_tray->addElement($email_field, false);
- $email_tray->addElement(new XoopsFormCaptcha('<br /><br />'), true);
- $email_tray->addElement(new XoopsFormButton("<br /><br />", "submit", _AM_XNEWSLETTER_SUBSCRIPTION_SEARCH_ADD, "submit"));
+ if ( $this->getVar("subscr_email") == "" ) {
+ $email_tray->addElement(new XoopsFormCaptcha('<br /><br />'), true);
+ $email_tray->addElement(new XoopsFormButton("<br /><br />", "submit", _AM_XNEWSLETTER_SUBSCRIPTION_SEARCH_ADD, "submit"));
+ }
$form->addElement($email_tray);
$form->addElement(new XoopsFormHidden("op", "exec_search"));
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-10-21 08:49:51 UTC (rev 12189)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt 2013-10-21 09:19:26 UTC (rev 12190)
@@ -1,5 +1,7 @@
Version 1.2
--------------
+ - added new block for general info (feichtl/goffy)
+ - removed xoops captcha when unsubscribe by link (feichtl/goffy)
- transfered error text to language file (feichtl/goffy)
- fixed bug when filter subscribers in admin/subscr.php (feichtl/goffy)
- french translation (pierredelu)
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt 2013-10-21 08:49:51 UTC (rev 12189)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt 2013-10-21 09:19:26 UTC (rev 12190)
@@ -15,3 +15,8 @@
----------
define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN","Error: required file 'plugins/%p.php' not found!");
define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION","Error: required function 'xnewsletter_plugin_getdata_%f' doesn't exist!");
+
+modinfo.php
+-----------
+define("_MI_XNEWSLETTER_SUBSCRINFO_BLOCK","Info Newsletter");
+define("_MI_XNEWSLETTER_SUBSCRINFO_TEXT_BLOCK","If you want to be informed in time, then subscribe to our newsletter");
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2013-10-21 08:49:51 UTC (rev 12189)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/modinfo.php 2013-10-21 09:19:26 UTC (rev 12190)
@@ -84,4 +84,7 @@
define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_TIME', "Time period for sending e-mails in packages");
define('_MI_XNEWSLETTER_SEND_IN_PACKAGES_TIME_DESC', "Time period in minutes, when the next package should be sent. Only used, if 'Send e-mails in packages' is bigger than 0.");
define('_MI_XNEWSLETTER_UPGRADEFAILED', "Error while updating module");
+// version 1.2
+define("_MI_XNEWSLETTER_SUBSCRINFO_BLOCK","Info Newsletter");
+define("_MI_XNEWSLETTER_SUBSCRINFO_TEXT_BLOCK","If you want to be informed in time, then subscribe to our newsletter");
?>
\ No newline at end of file
Added: XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html (rev 0)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html 2013-10-21 09:19:26 UTC (rev 12190)
@@ -0,0 +1,10 @@
+<form name="<{$block.formname}>" id="<{$block.formname}>" action="<{$block.formaction}>" method="post" enctype="multipart/form-data">
+ <table class="outer">
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td style="text-align:center"><{$block.infotext}></td>
+ </tr>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td style="text-align:center"><input type="submit" class="formButton" name="submit" id="submit" value="<{$block.buttontext}>" title="<{$block.buttontext}>" /></td>
+ </tr>
+ </table>
+</form>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/xoops_version.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/xoops_version.php 2013-10-21 08:49:51 UTC (rev 12189)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/xoops_version.php 2013-10-21 09:19:26 UTC (rev 12190)
@@ -22,7 +22,7 @@
* @package xNewsletter
* @author Goffy ( web...@we... )
*
- * Version : $Id: xoops_version.php 181 2013-08-31 20:32:00Z alfred $
+ * Version : $Id: xoops_version.php 200 2013-10-19 21:20:11Z goffy $
* ****************************************************************************
*/
@@ -32,7 +32,7 @@
xoops_load('XoopsLists');
$modversion['name'] = _MI_XNEWSLETTER_NAME;
-$modversion['version'] = 1.2;
+$modversion['version'] = 1.1;
$modversion['description'] = _MI_XNEWSLETTER_DESC;
$modversion['author'] = "Goffy, Alfred";
$modversion['credits'] = "";
@@ -56,10 +56,10 @@
$modversion['module_website_url'] = "wedega.com";
$modversion['module_website_name'] = "Webdesign Gabor";
$modversion['release'] = "1.0";
-$modversion['module_status'] = "Final";
+$modversion['module_status'] = "Stable";
$modversion['release_info'] = "";
$modversion['release_file'] = XOOPS_URL."/modules/{$dirname}/docs/";
-$modversion['release_date'] = "2013/10/20";
+$modversion['release_date'] = "2013/08/27";
$modversion['manual'] = "xNewsletter.txt";
$modversion['manual_file'] = XOOPS_URL."/modules/{$dirname}/docs/";
@@ -338,9 +338,20 @@
$b++;
$modversion['blocks'][$b] = array(
+ 'file' => 'blocks_subscrinfo.php' ,
+ 'name' => _MI_XNEWSLETTER_SUBSCRINFO_BLOCK ,
+ 'description' => '' ,
+ 'show_func' => 'b_xnewsletter_subscrinfo' ,
+ 'edit_func' => '' ,
+ 'template' => 'xnewsletter_subscrinfo_block.html',
+ 'can_clone' => true ,
+ 'options' => ''
+);
+
+$b++;
+$modversion['blocks'][$b] = array(
'file' => 'blocks_catsubscr.php' ,
'name' => _MI_XNEWSLETTER_CATSUBSCR_BLOCK_RECENT ,
- //'description' => _MI_APCAL_BNAME_MINICAL_DESC ,
'description' => '' ,
'show_func' => 'b_xnewsletter_catsubscr' ,
'edit_func' => 'b_xnewsletter_catsubscr_edit' ,
@@ -353,7 +364,6 @@
$modversion['blocks'][$b] = array(
'file' => 'blocks_catsubscr.php' ,
'name' => _MI_XNEWSLETTER_CATSUBSCR_BLOCK_DAY ,
- //'description' => _MI_APCAL_BNAME_MINICAL_DESC ,
'description' => '' ,
'show_func' => 'b_xnewsletter_catsubscr' ,
'edit_func' => 'b_xnewsletter_catsubscr_edit' ,
@@ -366,7 +376,6 @@
$modversion['blocks'][$b] = array(
'file' => 'blocks_letter.php' ,
'name' => _MI_XNEWSLETTER_LETTER_BLOCK_RECENT ,
- //'description' => _MI_APCAL_BNAME_MINICAL_DESC ,
'description' => '' ,
'show_func' => 'b_xnewsletter_letter' ,
'edit_func' => 'b_xnewsletter_letter_edit' ,
@@ -379,7 +388,6 @@
$modversion['blocks'][$b] = array(
'file' => 'blocks_letter.php' ,
'name' => _MI_XNEWSLETTER_LETTER_BLOCK_DAY ,
- //'description' => _MI_APCAL_BNAME_MINICAL_DESC ,
'description' => '' ,
'show_func' => 'b_xnewsletter_letter' ,
'edit_func' => 'b_xnewsletter_letter_edit' ,
@@ -392,7 +400,6 @@
$modversion['blocks'][$b] = array(
'file' => 'blocks_letter.php' ,
'name' => _MI_XNEWSLETTER_LETTER_BLOCK_RANDOM ,
- //'description' => _MI_APCAL_BNAME_MINICAL_DESC ,
'description' => '' ,
'show_func' => 'b_xnewsletter_letter' ,
'edit_func' => 'b_xnewsletter_letter_edit' ,
|
