Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2014-09-17 10:47:30
|
Revision: 12786
http://sourceforge.net/p/xoops/svn/12786
Author: beckmi
Date: 2014-09-17 10:47:21 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
Adding changes by Luciorota
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/about.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_header.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/index.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/maintenance.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/menu.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/sendletter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/blocks/blocks_letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/accounts.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/breadcrumb.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/request.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/session.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/template.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/cron.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/docs/changelog.txt
XoopsModules/xnewsletter/branches/mamba/xnewsletter/docs/install.txt
XoopsModules/xnewsletter/branches/mamba/xnewsletter/header.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/common.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/constants.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/html2text/epl-v10.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/onupdate.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/index.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/common.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/main.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/modinfo.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/templates/basic.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/templates/xoops.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/evennews.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/sample1col.csv
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/sample4col.csv
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/print.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/sendletter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/sql/mysql.sql
XoopsModules/xnewsletter/branches/mamba/xnewsletter/subscription.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_index.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_letter.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_letter_list_letters.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_letter_list_subscrs.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_letter_preview.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_protocol.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_subscription.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_subscription_list_subscriptions.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_subscription_result.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/xoops_version.php
Added Paths:
-----------
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/template.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/assets/images/icons/printer.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/assets/images/icons/tpls.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/assets/images/icons/tpls_small.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/class.xnewslettermailer.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_accounts.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/css/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/css/index.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/css/style.css
XoopsModules/xnewsletter/branches/mamba/xnewsletter/docs/update.txt
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/bookmarks/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/bookmarks/index.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/about.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/add.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/alert.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/arrow.gif
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/home.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/index.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/off.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/on.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_accounts.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_attachment.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_attachment_del.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_bmh.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_category.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_category_subscr.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_catsubscr_temp.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_check.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_copy.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_delete.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_delete_2.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_details.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_edit.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_edit_2.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_failed.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_import.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_mailinglist.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_maintenance.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_newsletter.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_nothing.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_ok.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_preview.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_protocol.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_quit.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_resend.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_send.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_sendtest.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_subscribers.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xn_task.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/icons/xoopsmicrobutton.gif
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/index.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/letter_template/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/letter_template/xoops-bg.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/letter_template/xoops-logo.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/xNewsletter.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/oninstall.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/LICENSE
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/PHPMailerAutoload.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/README.md
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/changelog.md
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/class.phpmailer.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/class.pop3.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/class.smtp.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/EasyPeasyICS.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/README.md
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/class.html2text.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/htmlfilter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/ntlm_sasl_client.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ar.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-be.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-br.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ca.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ch.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-cz.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-de.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-dk.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-el.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-eo.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-es.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-et.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-fa.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-fi.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-fo.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-fr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-gl.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-he.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-hr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-hu.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-it.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ja.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ka.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-lt.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-lv.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-nl.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-no.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-pl.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-pt.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ro.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ru.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-se.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-sk.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-sr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-tr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-uk.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-vi.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-zh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-zh_cn.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/mail_template/info_change.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/templates/basic.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/templates/xoops.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/admin.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/blocks.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/common.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/help/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/help/help.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/help/index.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/index.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/mail_template/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/mail_template/activate.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/mail_template/delete.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/mail_template/index.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/mail_template/info_change.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/mail_template/update.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/main.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/modinfo.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/templates/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/templates/basic.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/templates/index.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/templates/xoops.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/blocks/xnewsletter_letter_block_day.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/blocks/xnewsletter_letter_block_random.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/blocks/xnewsletter_letter_block_recent.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_footer.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_header.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_index.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_empty.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_letter.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_letter_list.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_letter_print.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_protocol.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_subscription.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_subscription_result.html
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_index_list_letters.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_print.tpl
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/about.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/about.php 2014-09-16 21:48:09 UTC (rev 12785)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/about.php 2014-09-17 10:47:21 UTC (rev 12786)
@@ -30,7 +30,7 @@
xoops_cp_header();
//global $indexAdmin;
-echo $indexAdmin->addNavigation("about.php");
-echo $indexAdmin->renderabout('9P3B3FXKF868J', false);
+echo $indexAdmin->addNavigation('about.php');
+echo $indexAdmin->renderAbout('9P3B3FXKF868J', false);
include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/accounts.php 2014-09-16 21:48:09 UTC (rev 12785)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/accounts.php 2014-09-17 10:47:21 UTC (rev 12786)
@@ -31,15 +31,15 @@
xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = XnewsletterRequest::getString('op', 'list');
-$save_and_check = XnewsletterRequest::getString('save_and_check', 'none');
-$accounts_id = XnewsletterRequest::getInt('accounts_id', 0);
-$post = XnewsletterRequest::getString('post', '');
+$op = xnewsletterRequest::getString('op', 'list');
+$save_and_check = xnewsletterRequest::getString('save_and_check', 'none');
+$accounts_id = xnewsletterRequest::getInt('accounts_id', 0);
+$post = xnewsletterRequest::getString('post', '');
-if ($post == "" && $op == "save_accounts" && $save_and_check =="none" ) $op = "edit_account";
+if ($post == '' && $op == 'save_accounts' && $save_and_check =='none') $op = "edit_account";
switch ($op) {
- case "check_account" :
+ case 'check_account':
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
@@ -50,81 +50,84 @@
$accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
}
- $mailhost = $accountObj->getVar("accounts_server_in");
- $port = $accountObj->getVar("accounts_port_in");
- switch ($accountObj->getVar("accounts_type")) {
- case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3:
- $service = "pop3";
+ $mailhost = $accountObj->getVar('accounts_server_in');
+ $port = $accountObj->getVar('accounts_port_in');
+ switch ($accountObj->getVar('accounts_type')) {
+ case _XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3:
+ $service = 'pop3';
break;
- case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP:
- case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL:
- $service = "imap";
+ case _XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP:
+ case _XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL:
+ $service = 'imap';
break;
- case "default":
+ case 'default':
default:
- $service = "";
+ $service = '';
break;
}
- $service_option = $accountObj->getVar("accounts_securetype_in");
- $accounts_password = $accountObj->getVar("accounts_password");
- $accounts_username = $accountObj->getVar("accounts_username");
- $accounts_inbox = $accountObj->getVar("accounts_inbox"); $accounts_inbox_ok = 0;
- $accounts_hardbox = $accountObj->getVar("accounts_hardbox"); $accounts_hardbox_ok = 0;
- $accounts_softbox = $accountObj->getVar("accounts_softbox"); $accounts_softbox_ok = 0;
+ $service_option = $accountObj->getVar('accounts_securetype_in');
+ $accounts_password = $accountObj->getVar('accounts_password');
+ $accounts_username = $accountObj->getVar('accounts_username');
+ $accounts_inbox = $accountObj->getVar('accounts_inbox');
+ $accounts_inbox_ok = false;
+ $accounts_hardbox = $accountObj->getVar('accounts_hardbox');
+ $accounts_hardbox_ok = false;
+ $accounts_softbox = $accountObj->getVar('accounts_softbox');
+ $accounts_softbox_ok = false;
$command = $mailhost . ":" . $port;
if ($service !='') $command .= '/' . $service;
if ($service_option !='') $command .= '/' . $service_option;
- echo "<table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width5'></th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_INFO . "</th>
- </tr>";
+ echo "<table class='outer width100' cellspacing='1'>";
+ echo "<tr>";
+ echo " <th></th>";
+ echo " <th>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_INFO . "</th>";
+ echo "</tr>";
$mbox = @imap_open("{" . $command . "}", $accounts_username, $accounts_password); // or die ("can't connect: " . imap_last_error());
if ($mbox === false) {
echo "<tr>";
- echo "<td class='center width5'>" . XNEWSLETTER_IMG_FAILED . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
- echo "<td class='left'>" . imap_last_error() . "</td>";
+ echo "<td>" . XNEWSLETTER_IMG_FAILED . "</td>";
+ echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
+ echo "<td>" . imap_last_error() . "</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>" . XNEWSLETTER_IMG_OK . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
- echo "<td class='left'></td>";
+ echo "<td>" . XNEWSLETTER_IMG_OK . "</td>";
+ echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
+ echo "<td></td>";
echo "</tr>";
$folders = imap_listmailbox($mbox, "{" . $command . "}", "*");
if ($folders == false) {
echo "<tr>";
- echo "<td class='center width5'>" . XNEWSLETTER_IMG_FAILED . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
- echo "<td class='left'>" . imap_last_error() . "</td>";
+ echo "<td>" . XNEWSLETTER_IMG_FAILED . "</td>";
+ echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
+ echo "<td>" . imap_last_error() . "</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>" . XNEWSLETTER_IMG_OK . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
- echo "<td class='left'>";
+ echo "<td>" . XNEWSLETTER_IMG_OK . "</td>";
+ echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
+ echo "<td>";
if (is_array($folders)) {
- reset ($folders);
- sort ($folders);
+ reset($folders);
+ sort($folders);
$foldercreated = 0;
- while (list( $key, $val) = each ($folders)) {
+ while (list( $key, $val) = each($folders)) {
echo "($key) ";
- echo imap_utf7_decode (str_replace("{" . $command . "}", "", $val)) . "<br>\n";
- if ("{" . $command . "}" . $accounts_inbox == $val) $accounts_inbox_ok = 1;
+ echo imap_utf7_decode (str_replace("{" . $command . "}", '', $val)) . "<br>\n";
+ if ("{" . $command . "}" . $accounts_inbox == $val) $accounts_inbox_ok = true;
if ("{" . $command . "}" . $accounts_hardbox == $val) {
- $accounts_hardbox_ok = 1;
+ $accounts_hardbox_ok = true;
} else {
@imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_hardbox));
$foldercreated = 1;
}
if ("{" . $command . "}" . $accounts_softbox == $val) {
- $accounts_softbox_ok = 1;
+ $accounts_softbox_ok = true;
} else {
...
[truncated message content] |
|
From: <be...@us...> - 2014-09-17 10:58:42
|
Revision: 12787
http://sourceforge.net/p/xoops/svn/12787
Author: beckmi
Date: 2014-09-17 10:58:25 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
Clean-up of assets, PSR-2, __DIR__, English updates, centering icons in Actions (work in progress)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/about.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_footer.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_header.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/index.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/maintenance.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/menu.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/sendletter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/template.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/assets/css/module.css
XoopsModules/xnewsletter/branches/mamba/xnewsletter/attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/blocks/blocks_catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/blocks/blocks_letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/blocks/blocks_subscrinfo.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/accounts.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/breadcrumb.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/class.xnewslettermailer.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/request.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/session.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/template.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xnewsletter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/cron.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/docs/changelog.txt
XoopsModules/xnewsletter/branches/mamba/xnewsletter/header.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/common.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/config.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/constants.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/html2text/epl-v10.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/html2text/html2text.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/install.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/oninstall.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/onupdate.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/PHPMailerAutoload.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/class.phpmailer.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/class.pop3.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/class.smtp.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/EasyPeasyICS.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/class.html2text.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/htmlfilter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/ntlm_sasl_client.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ar.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-be.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-br.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ca.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ch.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-cz.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-de.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-dk.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-el.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-eo.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-es.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-et.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-fa.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-fi.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-fo.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-fr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-gl.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-he.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-hr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-hu.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-it.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ja.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ka.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-lt.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-lv.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-nl.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-no.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-pl.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-pt.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ro.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-ru.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-se.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-sk.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-sr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-tr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-uk.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-vi.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-zh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/language/phpmailer.lang-zh_cn.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer_bmh/phpmailer-bmh_rules.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/search.inc.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/index.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/blocks.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/common.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/main.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/modinfo.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/admin.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/blocks.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/common.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/main.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/modinfo.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/evennews.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/print.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/sendletter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/sql/mysql.sql
XoopsModules/xnewsletter/branches/mamba/xnewsletter/subscription.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/xoops_version.php
Added Paths:
-----------
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xewsletter_accounts.php
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_accounts.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/css/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/images/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/module.css
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/blocks/xnewsletter_letter_block_day.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/blocks/xnewsletter_letter_block_random.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/blocks/xnewsletter_letter_block_recent.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_footer.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_header.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xNewsletter_index.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_letter.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_letter_list.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_protocol.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_subscription.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/templates/xnewsletter_subscription_result.html
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/about.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/about.php 2014-09-17 10:47:21 UTC (rev 12786)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/about.php 2014-09-17 10:58:25 UTC (rev 12787)
@@ -17,20 +17,21 @@
* 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... )
*
+ * @copyright Goffy ( wedega.com )
+ * @license GPL 2.0
+ * @package xnewsletter
+ * @author Goffy ( web...@we... )
+ *
* Version : $Id $
* ****************************************************************************
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
//global $indexAdmin;
echo $indexAdmin->addNavigation('about.php');
echo $indexAdmin->renderAbout('9P3B3FXKF868J', false);
-include_once dirname(__FILE__) . '/admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/accounts.php 2014-09-17 10:47:21 UTC (rev 12786)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/accounts.php 2014-09-17 10:58:25 UTC (rev 12787)
@@ -17,17 +17,18 @@
* 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... )
*
+ * @copyright Goffy ( wedega.com )
+ * @license GPL 2.0
+ * @package xnewsletter
+ * @author Goffy ( web...@we... )
+ *
* Version : $Id $
* ****************************************************************************
*/
$currentFile = basename(__FILE__);
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
// We recovered the value of the argument op in the URL$
@@ -36,7 +37,9 @@
$accounts_id = xnewsletterRequest::getInt('accounts_id', 0);
$post = xnewsletterRequest::getString('post', '');
-if ($post == '' && $op == 'save_accounts' && $save_and_check =='none') $op = "edit_account";
+if ($post == '' && $op == 'save_accounts' && $save_and_check == 'none') {
+ $op = "edit_account";
+}
switch ($op) {
case 'check_account':
@@ -51,7 +54,7 @@
}
$mailhost = $accountObj->getVar('accounts_server_in');
- $port = $accountObj->getVar('accounts_port_in');
+ $port = $accountObj->getVar('accounts_port_in');
switch ($accountObj->getVar('accounts_type')) {
case _XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3:
$service = 'pop3';
@@ -65,19 +68,23 @@
$service = '';
break;
}
- $service_option = $accountObj->getVar('accounts_securetype_in');
- $accounts_password = $accountObj->getVar('accounts_password');
- $accounts_username = $accountObj->getVar('accounts_username');
- $accounts_inbox = $accountObj->getVar('accounts_inbox');
- $accounts_inbox_ok = false;
- $accounts_hardbox = $accountObj->getVar('accounts_hardbox');
+ $service_option = $accountObj->getVar('accounts_securetype_in');
+ $accounts_password = $accountObj->getVar('accounts_password');
+ $accounts_username = $accountObj->getVar('accounts_username');
+ $accounts_inbox = $accountObj->getVar('accounts_inbox');
+ $accounts_inbox_ok = false;
+ $accounts_hardbox = $accountObj->getVar('accounts_hardbox');
$accounts_hardbox_ok = false;
- $accounts_softbox = $accountObj->getVar('accounts_softbox');
+ $accounts_softbox = $accountObj->getVar('accounts_softbox');
$accounts_softbox_ok = false;
$command = $mailhost . ":" . $port;
- if ($service !='') $command .= '/' . $service;
- if ($service_option !='') $command .= '/' . $service_option;
+ if ($service != '') {
+ $command .= '/' . $service;
+ }
+ if ($service_option != '') {
+ $command .= '/' . $service_option;
+ }
echo "<table class='outer width100' cellspacing='1'>";
echo "<tr>";
@@ -90,7 +97,7 @@
if ($mbox === false) {
echo "<tr>";
echo "<td>" . XNEWSLETTER_IMG_FAILED . "</td>";
- echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
+ echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX . _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
echo "<td>" . imap_last_error() . "</td>";
echo "</tr>";
} else {
@@ -104,26 +111,28 @@
if ($folders == false) {
echo "<tr>";
echo "<td>" . XNEWSLETTER_IMG_FAILED . "</td>";
- echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
+ echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS . _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
echo "<td>" . imap_last_error() . "</td>";
echo "</tr>";
} else {
echo "<tr>";
echo "<td>" . XNEWSLETTER_IMG_OK . "</td>";
- echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
+ echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
echo "<td>";
if (is_array($folders)) {
reset($folders);
sort($folders);
$foldercreated = 0;
- while (list( $key, $val) = each($folders)) {
+ while (list($key, $val) = each($folders)) {
echo "($key) ";
- echo imap_utf7_decode (str_replace("{" . $command . "}", '', $val)) . "<br>\n";
- if ("{" . $command . "}" . $accounts_inbox == $val) $accounts_inbox_ok = true;
+ echo imap_utf7_decode(str_replace("{" . $command . "}", '', $val)) . "<br>\n";
+ if ("{" . $command . "}" . $accounts_inbox == $val) {
+ $accounts_inbox_ok = true;
+ }
if ("{" . $command . "}" . $accounts_hardbox == $val) {
$accounts_hardbox_ok = true;
} else {
- @imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_hardbox));
+ @imap_createmailbox($mbox, imap_utf7_encode('{' . $command . '}' . $accounts_hardbox));
$foldercreated = 1;
}
if ("{" . $command . "}" . $accounts_softbox == $val) {
@@ -135,9 +144,13 @@
}
if ($foldercreated == 1) {
$folders_recheck = imap_listmailbox($mbox, "{" . $command . "}", "*");
- while (list( $key, $val) = each ($folders_recheck)) {
- if ("{" . $command . "}" . $accounts_hardbox == $val) $accounts_hardbox_ok = true;
- if ("{" . $command . "}" . $accounts_softbox == $val) $accounts_softbox_ok = true;
+ while (list($key, $val) = each($folders_recheck)) {
+ if ("{" . $command . "}" . $accounts_hardbox == $val) {
+ $accounts_hardbox_ok = true;
+ }
+ if ("{" . $command . "}" . $accounts_softbox == $val) {
+ $accounts_softbox_ok = true;
+ }
}
}
}
@@ -160,7 +173,7 @@
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . XNEWSLETTER_IMG_FAILED;
}
echo "<br />";
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX." ";
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX . " ";
if ($accounts_hardbox_ok == true) {
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . XNEWSLETTER_IMG_OK;
} else {
@@ -177,7 +190,7 @@
echo "</td>";
} else {
echo "<td>" . XNEWSLETTER_IMG_OK . "</td>";
- echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH._AM_XNEWSLETTER_ACCOUNTS_CHECK_SKIPPED . "</td>";
+ echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH . _AM_XNEWSLETTER_ACCOUNTS_CHECK_SKIPPED . "</td>";
echo "<td></td>";
}
echo "</tr>";
@@ -190,16 +203,16 @@
case 'list':
case 'list_accounts':
default:
- echo $indexAdmin->addNavigation($currentFile) ;
+ echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, '?op=new_account', 'add');
echo $indexAdmin->renderButton();
//
- $limit = $xnewsletter->getConfig('adminperpage');
+ $limit = $xnewsletter->getConfig('adminperpage');
$accountsCriteria = new CriteriaCompo();
$accountsCriteria->setSort("accounts_id ASC, accounts_type");
$accountsCriteria->setOrder("ASC");
$accountsCount = $xnewsletter->getHandler('accounts')->getCount();
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = xnewsletterRequest::getInt('start', 0);
$accountsCriteria->setStart($start);
$accountsCriteria->setLimit($limit);
$accountsObjs = $xnewsletter->getHandler('accounts')->getAll($accountsCriteria);
@@ -220,39 +233,40 @@
echo " <th>" . _AM_XNEWSLETTER_ACCOUNTS_YOURNAME . "</th>";
echo " <th>" . _AM_XNEWSLETTER_ACCOUNTS_YOURMAIL . "</th>";
echo " <th>" . _AM_XNEWSLETTER_ACCOUNTS_DEFAULT . "</th>";
- echo " <th>"._AM_XNEWSLETTER_FORMACTION . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
echo "</tr>";
if ($accountsCount > 0) {
$class = 'odd';
foreach ($accountsObjs as $accounts_id => $accountsObj) {
- echo "<tr class='".$class."'>";
+ echo "<tr class='" . $class . "'>";
$class = ($class == 'even') ? 'odd' : 'even';
echo "<td class='center'>{$accounts_id}</td>";
$accounts_types = array(
- _XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL => _AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPMAIL,
+ _XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL => _AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPMAIL,
_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL => _AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPSENDMAIL,
- _XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3 => _AM_XNEWSLETTER_ACCOUNTS_TYPE_POP3,
- _XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP => _AM_XNEWSLETTER_ACCOUNTS_TYPE_SMTP,
- _XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL => _AM_XNEWSLETTER_ACCOUNTS_TYPE_GMAIL
+ _XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3 => _AM_XNEWSLETTER_ACCOUNTS_TYPE_POP3,
+ _XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP => _AM_XNEWSLETTER_ACCOUNTS_TYPE_SMTP,
+ _XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL => _AM_XNEWSLETTER_ACCOUNTS_TYPE_GMAIL
);
echo "<td>{$accounts_types[$accountsObj->getVar('accounts_type')]}</td>";
echo "<td>{$accountsObj->getVar('accounts_name')}</td>";
echo "<td>{$accountsObj->getVar('accounts_yourname')}</td>";
echo "<td>{$accountsObj->getVar('accounts_yourmail')}</td>";
$verif_accounts_default = ($accountsObj->getVar('accounts_default') == 1) ? _YES : _NO;
- echo "<td>{$verif_accounts_default}</td>";
+ echo "<td class='center'>{$verif_accounts_default}</td>";
- echo "<td>";
- echo " <a href='?op=edit_account&accounts_id={$accounts_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='"._EDIT . "' /></a>";
+ echo "<td class='center'>";
+ echo " <a href='?op=edit_account&accounts_id={$accounts_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>";
echo " <a href='?op=delete_account&accounts_id={$accounts_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
if ($accountsObj->getVar("accounts_type") != _XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accountsObj->getVar('accounts_type') != _XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
- echo " <a href='?op=check_account&accounts_id={$accounts_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_check.png alt='" . _AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK . "' title='" . _AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK . "' /></a>";
+ echo " <a href='?op=check_account&accounts_id={$accounts_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_check.png alt='" . _AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK . "' title='"
+ . _AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK . "' /></a>";
}
echo "</td>";
echo "</tr>";
}
- }
+ }
echo "</table>";
echo "<br />";
echo "<div>{$pagenav}</div>";
@@ -266,7 +280,7 @@
//
$accountObj = $xnewsletter->getHandler('accounts')->create();
$accountObj = xnewsletter_setPost($accountObj, $_POST);
- $form = $accountObj->getForm();
+ $form = $accountObj->getForm();
$form->display();
break;
@@ -275,9 +289,9 @@
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
+ $accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
$_POST['accounts_id'] = $accounts_id;
- $accountObj = xnewsletter_setPost($accountObj, $_POST);
+ $accountObj = xnewsletter_setPost($accountObj, $_POST);
$accountsCriteria = new CriteriaCompo();
$accountsCriteria->add(new Criteria('accounts_default', 1));
@@ -286,7 +300,7 @@
if ($accountObj->getVar('accounts_default') == 1) {
$verif_accounts_default = 1;
//reset old accounts_default
- if(!$xnewsletter->getHandler('accounts')->updateAll('accounts_default', 0, null, false)) {
+ if (!$xnewsletter->getHandler('accounts')->updateAll('accounts_default', 0, null, false)) {
exit('MySQL-Error: ' . mysql_error());
}
} else {
@@ -296,7 +310,7 @@
$verif_accounts_default = 1;
}
$accountObj->setVar('accounts_default', $verif_accounts_default);
- if ($accountObj->getVar('accounts_yourmail') != '' && $accountObj->getVar('accounts_yourmail') != _AM_XNEWSLETTER_ACCOUNTS_TYPE_YOUREMAIL ) {
+ if ($accountObj->getVar('accounts_y...
[truncated message content] |
|
From: <be...@us...> - 2014-09-17 13:55:23
|
Revision: 12788
http://sourceforge.net/p/xoops/svn/12788
Author: beckmi
Date: 2014-09-17 13:55:08 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
Updating some changes from Luciorota
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/template.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/docs/update.txt
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/constants.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/EasyPeasyICS.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/phpmailer/extras/ntlm_sasl_client.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/sql/mysql.sql
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xewsletter_accounts.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/mail_template/info_change.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/templates/basic.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/english/templates/xoops.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter/language/italian/
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -292,7 +292,7 @@
echo "<td class='center'>" . $arr_measure_type[$bhmObj->getVar("bmh_measure")] . "</td>";
echo "<td class='center'>" . formatTimeStamp($bhmObj->getVar("bmh_created"), "S") . "</td>";
- echo "<td class='center'>";
+ echo "<td class='center width20'>";
echo " <a href='?op=handle_bmh&bmh_id=" . $bhm_id . "&bmh_measure=" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "&filter=" . $filter . "'><img src=" . XNEWSLETTER_ICONS_URL
. "/xn_nothing.png alt='" . _AM_XNEWSLETTER_BMH_MEASURE_NOTHING . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE_NOTHING . "' /></a>";
echo " <a href='?op=handle_bmh&bmh_id=" . $bhm_id . "&bmh_measure=" . _XNEWSLETTER_BMH_MEASURE_VAL_QUIT . "&filter=" . $filter . "'><img src=" . XNEWSLETTER_ICONS_URL
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/letter.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/letter.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -409,7 +409,9 @@
$redirectUrl = '?op=list_letters';
break;
}
- $protocolObj->setVar('protocol_status', _AM_XNEWSLETTER_LETTER_ACTION_SAVED);
+ $protocolObj->setVar('protocol_status', _AM_XNEWSLETTER_LETTER_ACTION_SAVED); // old style
+ $protocolObj->setVar('protocol_status_str_id', _XNEWSLETTER_PROTOCOL_STATUS_SAVED); // new from v1.3
+ $protocolObj->setVar('protocol_status_vars', array()); // new from v1.3
$protocolObj->setVar('protocol_submitter', $xoopsUser->uid());
$protocolObj->setVar('protocol_created', time());
//
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/attachment.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/attachment.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -85,7 +85,7 @@
$mode_select = new XoopsFormRadio(_AM_XNEWSLETTER_ATTACHMENT_MODE, 'attachment_mode', $this->getVar('attachment_mode'));
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASATTACHMENT);
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASLINK, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASLINK);
- //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // IN PROGRESS
+ //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // for future features
$form->addElement($mode_select);
$form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ATTACHMENT_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/bmh.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/bmh.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,16 +44,16 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("bmh_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("bmh_rule_no", XOBJ_DTYPE_TXTBOX, null, false, 10);
- $this->initVar("bmh_rule_cat", XOBJ_DTYPE_TXTBOX, null, false, 50);
- $this->initVar("bmh_bouncetype", XOBJ_DTYPE_TXTBOX, null, false, 50);
- $this->initVar("bmh_remove", XOBJ_DTYPE_TXTBOX, null, false, 50);
- $this->initVar("bmh_email", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("bmh_subject", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("bmh_measure", XOBJ_DTYPE_INT, null, false);
- $this->initVar("bmh_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("bmh_created", XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('bmh_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('bmh_rule_no', XOBJ_DTYPE_TXTBOX, null, false, 10);
+ $this->initVar('bmh_rule_cat', XOBJ_DTYPE_TXTBOX, null, false, 50);
+ $this->initVar('bmh_bouncetype', XOBJ_DTYPE_TXTBOX, null, false, 50);
+ $this->initVar('bmh_remove', XOBJ_DTYPE_TXTBOX, null, false, 50);
+ $this->initVar('bmh_email', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('bmh_subject', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('bmh_measure', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('bmh_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('bmh_created', XOBJ_DTYPE_INT, time(), false);
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/cat.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/cat.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -48,12 +48,12 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("cat_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("cat_name", XOBJ_DTYPE_TXTBOX, '', false, 100);
- $this->initVar("cat_info", XOBJ_DTYPE_TXTAREA, '', false);
- $this->initVar("cat_mailinglist", XOBJ_DTYPE_INT, 0, false);
- $this->initVar("cat_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("cat_created", XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('cat_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('cat_name', XOBJ_DTYPE_TXTBOX, '', false, 100);
+ $this->initVar('cat_info', XOBJ_DTYPE_TXTAREA, '', false);
+ $this->initVar('cat_mailinglist', XOBJ_DTYPE_INT, 0, false);
+ $this->initVar('cat_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('cat_created', XOBJ_DTYPE_INT, time(), false);
$this->initVar('dohtml', XOBJ_DTYPE_INT, false); // boolean
$this->initVar('dosmiley', XOBJ_DTYPE_INT, true); // boolean
$this->initVar('doxcode', XOBJ_DTYPE_INT, true); // boolean
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/import.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/import.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,15 +44,15 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("import_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("import_email", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_firstname", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_lastname", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_sex", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("import_cat_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("import_subscr_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("import_catsubscr_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("import_status", XOBJ_DTYPE_INT, false, false); // boolean
+ $this->initVar('import_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('import_email', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('import_firstname', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('import_lastname', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('import_sex', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('import_cat_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('import_subscr_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('import_catsubscr_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('import_status', XOBJ_DTYPE_INT, false, false); // boolean
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/letter.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/letter.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,18 +44,18 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("letter_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("letter_title", XOBJ_DTYPE_TXTBOX, null, true, 100);
- $this->initVar("letter_content", XOBJ_DTYPE_TXTAREA, null, true);
- $this->initVar("letter_template", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("letter_cats", XOBJ_DTYPE_TXTBOX, null, false, 100); // IN PROGRESS: AN ARRAY SHOULD BE BETTER
- $this->initVar("letter_attachment", XOBJ_DTYPE_TXTBOX, null, false, 200);
- $this->initVar("letter_account", XOBJ_DTYPE_INT, null, false);
- $this->initVar("letter_email_test", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("letter_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("letter_created", XOBJ_DTYPE_INT, time(), false); // timestamp
- $this->initVar("letter_sender", XOBJ_DTYPE_INT, null, false);
- $this->initVar("letter_sent", XOBJ_DTYPE_INT, false, false); // timestamp or false
+ $this->initVar('letter_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('letter_title', XOBJ_DTYPE_TXTBOX, null, true, 100);
+ $this->initVar('letter_content', XOBJ_DTYPE_TXTAREA, null, true);
+ $this->initVar('letter_template', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('letter_cats', XOBJ_DTYPE_TXTBOX, null, false, 100); // IN PROGRESS: AN ARRAY SHOULD BE BETTER
+ $this->initVar('letter_attachment', XOBJ_DTYPE_TXTBOX, null, false, 200);
+ $this->initVar('letter_account', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('letter_email_test', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('letter_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('letter_created', XOBJ_DTYPE_INT, time(), false); // timestamp
+ $this->initVar('letter_sender', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('letter_sent', XOBJ_DTYPE_INT, false, false); // timestamp or false
}
/**
@@ -168,7 +168,7 @@
$mode_select = new XoopsFormRadio(_AM_XNEWSLETTER_ATTACHMENT_MODE, "existing_attachments_mode[{$attachment_id}]", $attachmentObj->getVar("attachment_mode"), ' ');
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASATTACHMENT);
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASLINK, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASLINK);
- //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // IN PROGRESS
+ //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // for future features
$delete_attachment_tray->addElement($mode_select);
$delete_attachment_tray->addElement(new XoopsFormLabel('', $attachmentObj->getVar('attachment_name')));
$delete_button = new XoopsFormButton('', "delete_attachment_{$i}", _DELETE, 'submit');
@@ -185,7 +185,7 @@
$mode_select = new XoopsFormRadio(_AM_XNEWSLETTER_ATTACHMENT_MODE, "new_attachments_mode[{$j}]", _XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT, ' ');
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASATTACHMENT);
$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_ASLINK, _AM_XNEWSLETTER_ATTACHMENT_MODE_ASLINK);
- //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // IN PROGRESS
+ //$mode_select->addOption(_XNEWSLETTER_ATTACHMENTS_MODE_AUTO, _AM_XNEWSLETTER_ATTACHMENT_MODE_AUTO); // for future features
$add_attachment_tray->addElement($mode_select);
$add_attachment_tray->addElement(new XoopsFormFile('', "new_attachment_index={$j}", $this->xnewsletter->getConfig('xn_maxsize')));
$attachment_tray->addElement($add_attachment_tray);
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/mailinglist.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/mailinglist.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/mailinglist.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,14 +44,14 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("mailinglist_id", XOBJ_DTYPE_INT, null, fals);
- $this->initVar("mailinglist_name", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("mailinglist_email", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("mailinglist_listname", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("mailinglist_subscribe", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("mailinglist_unsubscribe", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("mailinglist_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("mailinglist_created", XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('mailinglist_id', XOBJ_DTYPE_INT, null, fals);
+ $this->initVar('mailinglist_name', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('mailinglist_email', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('mailinglist_listname', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('mailinglist_subscribe', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('mailinglist_unsubscribe', XOBJ_DTYPE_TXTBOX, null, false, 100);
+ $this->initVar('mailinglist_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('mailinglist_created', XOBJ_DTYPE_INT, time(), false);
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/protocol.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/protocol.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -36,6 +36,15 @@
{
public $xnewsletter = null;
+ public $protocol_status_strs
+ = array(
+ _XNEWSLETTER_PROTOCOL_STATUS_SAVED => _AM_XNEWSLETTER_PROTOCOL_STATUS_SAVED,
+ _XNEWSLETTER_PROTOCOL_STATUS_ERROR_CREATE_TASK => _AM_XNEWSLETTER_PROTOCOL_STATUS_ERROR_CREATE_TASK,
+ _XNEWSLETTER_PROTOCOL_STATUS_OK_SEND_TEST => _AM_XNEWSLETTER_PROTOCOL_STATUS_OK_SEND_TEST,
+ _XNEWSLETTER_PROTOCOL_STATUS_OK_SEND => _AM_XNEWSLETTER_PROTOCOL_STATUS_OK_SEND,
+ _XNEWSLETTER_PROTOCOL_STATUS_ERROR_SEND => _AM_XNEWSLETTER_PROTOCOL_STATUS_ERROR_SEND
+ // INPROGRESS
+ );
//Constructor
/**
*
@@ -44,13 +53,15 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("protocol_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("protocol_letter_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("protocol_subscriber_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("protocol_status", XOBJ_DTYPE_TXTBOX, '', false, 200);
- $this->initVar("protocol_success", XOBJ_DTYPE_OTHER, null, false); // boolean
- $this->initVar("protocol_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("protocol_created", XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_letter_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_subscriber_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_status', XOBJ_DTYPE_TXTBOX, '', false, 200); // old style
+ $this->initVar('protocol_success', XOBJ_DTYPE_OTHER, null, false); // boolean
+ $this->initVar('protocol_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_created', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('protocol_status_str_id', XOBJ_DTYPE_TXTBOX, '', false); // new from v1.3
+ $this->initVar('protocol_status_vars', XOBJ_DTYPE_ARRAY, array(), false); // new from v1.3
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/subscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/subscr.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/subscr.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,18 +44,18 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("subscr_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("subscr_email", XOBJ_DTYPE_TXTBOX, '', false, 100);
- $this->initVar("subscr_firstname", XOBJ_DTYPE_TXTBOX, '', true, 100);
- $this->initVar("subscr_lastname", XOBJ_DTYPE_TXTBOX, '', false, 100);
- $this->initVar("subscr_uid", XOBJ_DTYPE_INT, null, false);
- $this->initVar("subscr_sex", XOBJ_DTYPE_TXTBOX, '', false, 100);
- $this->initVar("subscr_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("subscr_created", XOBJ_DTYPE_INT, time(), false);
- $this->initVar("subscr_actkey", XOBJ_DTYPE_TXTBOX, '', false, 255);
- $this->initVar("subscr_ip", XOBJ_DTYPE_TXTBOX, xoops_getenv('REMOTE_ADDR'), false, 32);
- $this->initVar("subscr_activated", XOBJ_DTYPE_INT, 0, false); // IN PROGRESS: should be false or timestamp
- $this->initVar("subscr_actoptions", XOBJ_DTYPE_ARRAY, array(), false);
+ $this->initVar('subscr_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('subscr_email', XOBJ_DTYPE_TXTBOX, '', false, 100);
+ $this->initVar('subscr_firstname', XOBJ_DTYPE_TXTBOX, '', true, 100);
+ $this->initVar('subscr_lastname', XOBJ_DTYPE_TXTBOX, '', false, 100);
+ $this->initVar('subscr_uid', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('subscr_sex', XOBJ_DTYPE_TXTBOX, '', false, 100);
+ $this->initVar('subscr_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('subscr_created', XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('subscr_actkey', XOBJ_DTYPE_TXTBOX, '', false, 255);
+ $this->initVar('subscr_ip', XOBJ_DTYPE_TXTBOX, xoops_getenv('REMOTE_ADDR'), false, 32);
+ $this->initVar('subscr_activated', XOBJ_DTYPE_INT, 0, false); // IN PROGRESS: should be false or timestamp
+ $this->initVar('subscr_actoptions', XOBJ_DTYPE_ARRAY, array(), false);
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/task.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/task.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/task.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -39,12 +39,12 @@
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
$this->XoopsObject();
- $this->initVar("task_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("task_letter_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("task_subscr_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("task_starttime", XOBJ_DTYPE_INT, null, false);
- $this->initVar("task_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("task_created", XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('task_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('task_letter_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('task_subscr_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('task_starttime', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('task_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('task_created', XOBJ_DTYPE_INT, time(), false);
}
/**
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/template.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/template.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/template.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -44,12 +44,12 @@
{
$this->xnewsletter = XnewsletterXnewsletter::getInstance();
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
- $this->initVar("template_id", XOBJ_DTYPE_INT, null, false);
- $this->initVar("template_title", XOBJ_DTYPE_TXTBOX, '', true, 100);
- $this->initVar("template_description", XOBJ_DTYPE_TXTAREA, '', false);
- $this->initVar("template_content", XOBJ_DTYPE_TXTAREA, '', true);
- $this->initVar("template_submitter", XOBJ_DTYPE_INT, null, false);
- $this->initVar("template_created", XOBJ_DTYPE_INT, time(), false);
+ $this->initVar('template_id', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('template_title', XOBJ_DTYPE_TXTBOX, '', true, 100);
+ $this->initVar('template_description', XOBJ_DTYPE_TXTAREA, '', false);
+ $this->initVar('template_content', XOBJ_DTYPE_TXTAREA, '', true);
+ $this->initVar('template_submitter', XOBJ_DTYPE_INT, null, false);
+ $this->initVar('template_created', XOBJ_DTYPE_INT, time(), false);
}
/**
Deleted: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_attachment.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_attachment.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -1,114 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
- * ****************************************************************************
- * XNEWSLETTER - MODULE FOR XOOPS
- * Copyright (c) 2007 - 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 GNU General Public License 2.0
- * @package xNewsletter
- * @author Goffy ( web...@we... )
- *
- * Version : $Id $
- * ****************************************************************************
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
-/**
- * Class xnewsletter_attachment
- */
-class xnewsletter_attachment extends XoopsObject
-{
- //Constructor
- /**
- *
- */
- public function __construct()
- {
- $this->initVar("attachment_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("attachment_letter_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("attachment_name", XOBJ_DTYPE_TXTBOX, null, false, 200);
- $this->initVar("attachment_type", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("attachment_submitter", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("attachment_created", XOBJ_DTYPE_INT, null, false, 10);
- }
-
- /**
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
- $mydirname = basename(dirname(__DIR__));
-
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_ATTACHMENT_ADD) : sprintf(_AM_XNEWSLETTER_ATTACHMENT_EDIT);
-
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, "form", $action, "post", true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $letterHandler =& xoops_getModuleHandler("xNewsletter_letter", "xNewsletter");
- $criteria = new CriteriaCompo();
- $criteria->setSort('letter_id');
- $criteria->setOrder('DESC');
- $letter_select = new XoopsFormSelect(_AM_XNEWSLETTER_PROTOCOL_LETTER_ID, "attachment_letter_id", $this->getVar("attachment_letter_id"));
- $letter_select->addOptionArray($letterHandler->getList($criteria));
- $form->addElement($letter_select, true);
-
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_ATTACHMENT_NAME, "attachment_name", 50, 255, $this->getVar("attachment_name")), true);
-
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_ATTACHMENT_TYPE, "attachment_type", 50, 255, $this->getVar("attachment_type")), false);
-
- $time = ($this->isNew()) ? time() : $this-...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X