Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12786] XoopsModules/xnewsletter/branches/mamba/ xnewsletter
|
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 {
@imap_createmailbox($mbox, imap_utf7_encode('{' . $command . '}' . $accounts_softbox));
$foldercreated = 1;
@@ -133,8 +136,8 @@
if ($foldercreated == 1) {
$folders_recheck = imap_listmailbox($mbox, "{" . $command . "}", "*");
while (list( $key, $val) = each ($folders_recheck)) {
- if ("{" . $command . "}" . $accounts_hardbox == $val) $accounts_hardbox_ok = 1;
- if ("{" . $command . "}" . $accounts_softbox == $val) $accounts_softbox_ok = 1;
+ if ("{" . $command . "}" . $accounts_hardbox == $val) $accounts_hardbox_ok = true;
+ if ("{" . $command . "}" . $accounts_softbox == $val) $accounts_softbox_ok = true;
}
}
}
@@ -143,29 +146,29 @@
echo "</tr>";
echo "<tr>";
if ($accountObj->getVar("accounts_use_bmh") == '1') {
- if ($accounts_inbox_ok == 1 && $accounts_hardbox_ok == 1 && $accounts_softbox_ok == 1) {
- echo "<td class='center width5'>" . XNEWSLETTER_IMG_OK . "</td>";
+ if ($accounts_inbox_ok == true && $accounts_hardbox_ok == true && $accounts_softbox_ok == true) {
+ echo "<td>" . XNEWSLETTER_IMG_OK . "</td>";
} else {
- echo "<td class='center width5'>" . XNEWSLETTER_IMG_FAILED . "</td>";
+ echo "<td>" . XNEWSLETTER_IMG_FAILED . "</td>";
}
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH . "</td>";
- echo "<td class='left'>";
+ echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH . "</td>";
+ echo "<td>";
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_INBOX . " ";
- if ($accounts_inbox_ok == 1) {
+ if ($accounts_inbox_ok == true) {
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . XNEWSLETTER_IMG_OK;
} else {
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . XNEWSLETTER_IMG_FAILED;
}
echo "<br />";
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX." ";
- if ($accounts_hardbox_ok == 1) {
+ if ($accounts_hardbox_ok == true) {
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . XNEWSLETTER_IMG_OK;
} else {
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . XNEWSLETTER_IMG_FAILED;
}
echo "<br />";
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_SOFTBOX . " ";
- if ($accounts_softbox_ok == 1) {
+ if ($accounts_softbox_ok == true) {
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . XNEWSLETTER_IMG_OK;
} else {
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . XNEWSLETTER_IMG_FAILED;
@@ -173,9 +176,9 @@
echo "<br />";
echo "</td>";
} else {
- echo "<td class='center width5'>" . XNEWSLETTER_IMG_OK . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH._AM_XNEWSLETTER_ACCOUNTS_CHECK_SKIPPED . "</td>";
- echo "<td class='center'></td>";
+ echo "<td>" . XNEWSLETTER_IMG_OK . "</td>";
+ echo "<td>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH._AM_XNEWSLETTER_ACCOUNTS_CHECK_SKIPPED . "</td>";
+ echo "<td></td>";
}
echo "</tr>";
}
@@ -184,7 +187,8 @@
echo "</table>";
break;
- case "list":
+ case 'list':
+ case 'list_accounts':
default:
echo $indexAdmin->addNavigation($currentFile) ;
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, '?op=new_account', 'add');
@@ -195,12 +199,12 @@
$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);
if ($accountsCount > $limit) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($accountsCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
@@ -208,73 +212,54 @@
}
// View Table
+ echo "<table class='outer width100' cellspacing='1'>";
+ echo "<tr>";
+ echo " <th>" . _AM_XNEWSLETTER_ACCOUNTS_ID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_ACCOUNTS_TYPE . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_ACCOUNTS_NAME . "</th>";
+ 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 "</tr>";
+
if ($accountsCount > 0) {
- echo "<table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width2'>" . _AM_XNEWSLETTER_ACCOUNTS_ID . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_TYPE . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_NAME . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURNAME . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURMAIL . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_DEFAULT . "</th>
- <th class='center width10'>"._AM_XNEWSLETTER_FORMACTION . "</th>
- </tr>";
-
- $class = "odd";
-
+ $class = 'odd';
foreach ($accountsObjs as $accounts_id => $accountsObj) {
echo "<tr class='".$class."'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>" . $accounts_id . "</td>";
- $arr_accounts_type=array(
- _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL => _AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPMAIL,
- _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL => _AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPSENDMAIL,
- _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3 => _AM_XNEWSLETTER_ACCOUNTS_TYPE_POP3,
- _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP => _AM_XNEWSLETTER_ACCOUNTS_TYPE_SMTP,
- _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL => _AM_XNEWSLETTER_ACCOUNTS_TYPE_GMAIL);
- echo "<td class='center'>" . $arr_accounts_type[$accountsObj->getVar("accounts_type")] . "</td>";
- echo "<td class='center'>" . $accountsObj->getVar("accounts_name") . "</td>";
- echo "<td class='center'>" . $accountsObj->getVar("accounts_yourname") . "</td>";
- echo "<td class='center'>" . $accountsObj->getVar("accounts_yourmail") . "</td>";
- $verif_accounts_default = ($accountsObj->getVar("accounts_default") == 1) ? _YES : _NO;
- echo "<td class='center'>" . $verif_accounts_default . "</td>";
+ $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_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
+ );
+ 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 width5'>";
- 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") != _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accountsObj->getVar("accounts_type") != _AM_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 "<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 " <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 "</td>";
echo "</tr>";
}
- echo "</table><br /><br />";
- echo "<br /><div class='center'>" . $pagenav . "</div><br />";
- } else {
- echo "<table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width2'>" . _AM_XNEWSLETTER_ACCOUNTS_ID . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_TYPE . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_NAME . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURNAME . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURMAIL . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_USERNAME . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_PASSWORD . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_SERVER_IN . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_PORT_IN . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_IN . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_SERVER_OUT . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_PORT_OUT . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_OUT . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_DEFAULT . "</th>
- <th class='center width10'>" . _AM_XNEWSLETTER_FORMACTION . "</th>
- </tr>";
- echo "</table><br /><br />";
- }
-
+ }
+ echo "</table>";
+ echo "<br />";
+ echo "<div>{$pagenav}</div>";
+ echo "<br />";
break;
- case "new_account":
+ case 'new_account':
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
@@ -285,9 +270,9 @@
$form->display();
break;
- case "save_accounts":
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ case 'save_accounts':
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
$accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
@@ -295,28 +280,28 @@
$accountObj = xnewsletter_setPost($accountObj, $_POST);
$accountsCriteria = new CriteriaCompo();
- $accountsCriteria->add(new Criteria("accounts_default", 1));
+ $accountsCriteria->add(new Criteria('accounts_default', 1));
$count_accounts_default = $xnewsletter->getHandler('accounts')->getCount($accountsCriteria);
if ($count_accounts_default > 0) {
- if ($accountObj->getVar("accounts_default") == 1) {
- global $xoopsDB;
- $verif_accounts_default = "1";
+ if ($accountObj->getVar('accounts_default') == 1) {
+ $verif_accounts_default = 1;
//reset old accounts_default
- $sql = "UPDATE `{$xoopsDB->prefix("xnewsletter_accounts")}` SET `accounts_default` = '0'";
- if(!$result = $xoopsDB->query($sql)) die ("MySQL-Error: " . mysql_error());
+ if(!$xnewsletter->getHandler('accounts')->updateAll('accounts_default', 0, null, false)) {
+ exit('MySQL-Error: ' . mysql_error());
+ }
} else {
- $verif_accounts_default = "0";
+ $verif_accounts_default = 0;
}
} else {
- $verif_accounts_default = "1";
+ $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 ) {
+ $accountObj->setVar('accounts_default', $verif_accounts_default);
+ if ($accountObj->getVar('accounts_yourmail') != '' && $accountObj->getVar('accounts_yourmail') != _AM_XNEWSLETTER_ACCOUNTS_TYPE_YOUREMAIL ) {
if ($xnewsletter->getHandler('accounts')->insert($accountObj)) {
if ($save_and_check == 'none') {
- redirect_header("?op=list", 2, _AM_XNEWSLETTER_FORMOK);
+ redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
} else {
- redirect_header("?op=check_account&accounts_id={$accountObj->getVar("accounts_id")}", 2, _AM_XNEWSLETTER_FORMOK);
+ redirect_header("?op=check_account&accounts_id={$accountObj->getVar('accounts_id')}", 3, _AM_XNEWSLETTER_FORMOK);
}
}
} else {
@@ -328,7 +313,7 @@
$form->display();
break;
- case "edit_account":
+ case 'edit_account':
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, '?op=new_account', 'add');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
@@ -342,11 +327,11 @@
$form->display();
break;
- case "delete_account":
+ case 'delete_account':
$accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
- if (isset($_POST["ok"]) && $_POST["ok"] == "1") {
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if ($xnewsletter->getHandler('accounts')->delete($accountObj)) {
redirect_header($currentFile, 3, _AM_XNEWSLETTER_FORMDELOK);
@@ -354,7 +339,7 @@
echo $accountObj->getHtmlErrors();
}
} else {
- xoops_confirm(array("ok" => 1, "accounts_id" => $accounts_id, "op" => "delete_account"), $currentFile, sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $accountObj->getVar("accounts_name")));
+ xoops_confirm(array('ok' => true, 'accounts_id' => $accounts_id, 'op' => 'delete_account'), $currentFile, sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $accountObj->getVar('accounts_name')));
}
break;
}
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_header.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_header.php 2014-09-16 21:48:09 UTC (rev 12785)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_header.php 2014-09-17 10:47:21 UTC (rev 12786)
@@ -32,6 +32,11 @@
// Include xoops admin header
include_once XOOPS_ROOT_PATH . "/include/cp_functions.php";
+$pathIcon16 = XOOPS_URL . '/' . $xnewsletter->getModule()->getInfo('icons16');
+$pathIcon32 = XOOPS_URL . '/' . $xnewsletter->getModule()->getInfo('icons32');
+$pathModuleAdmin = XOOPS_ROOT_PATH . '/' . $xnewsletter->getModule()->getInfo('dirmoduleadmin');
+require_once $pathModuleAdmin . '/moduleadmin/moduleadmin.php';
+
//Load languages
xoops_loadLanguage('admin', $xnewsletter->getModule()->dirname());
xoops_loadLanguage('modinfo', $xnewsletter->getModule()->dirname());
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/attachment.php 2014-09-16 21:48:09 UTC (rev 12785)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/attachment.php 2014-09-17 10:47:21 UTC (rev 12786)
@@ -31,138 +31,104 @@
xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = XnewsletterRequest::getString('op', 'list');
-$attachment_id = XnewsletterRequest::getInt('attachment_id', 0);
+$op = xnewsletterRequest::getString('op', 'list');
+$attachment_id = xnewsletterRequest::getInt('attachment_id', 0);
switch ($op) {
- case "list" :
- default :
+ case 'list':
+ default:
echo $indexAdmin->addNavigation($currentFile);
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWATTACHMENT, '?op=new_attachment', 'add');
echo $indexAdmin->renderButton();
//
$limit = $xnewsletter->getConfig('adminperpage');
$attachmentCriteria = new CriteriaCompo();
- $attachmentCriteria->setSort("attachment_letter_id DESC, attachment_id");
- $attachmentCriteria->setOrder("DESC");
- $attachmentsCount = $xnewsletter->getHandler('attachment')->getCount();
- $start = XnewsletterRequest::getInt('start', 0);
+ $attachmentCriteria->setSort('attachment_letter_id DESC, attachment_id');
+ $attachmentCriteria->setOrder('DESC');
+ $attachmentCount = $xnewsletter->getHandler('attachment')->getCount();
+ $start = xnewsletterRequest::getInt('start', 0);
$attachmentCriteria->setStart($start);
$attachmentCriteria->setLimit($limit);
- $attachmentObjs = $xnewsletter->getHandler('attachment')->getAll($attachmentCriteria);
- if ($attachmentsCount > $limit) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
- $pagenav = new XoopsPageNav($attachmentsCount, $limit, $start, 'start', 'op=list');
+ $attachmentObjs = $xnewsletter->getHandler('attachment')->getObjects($attachmentCriteria, true);
+ if ($attachmentCount > $limit) {
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ $pagenav = new XoopsPageNav($attachmentCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
$pagenav = '';
}
-
- // View Table
- if ($attachmentsCount>0) {
- echo "
- <table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width2'>" . _AM_XNEWSLETTER_ATTACHMENT_ID . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_LETTER_ID . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_NAME . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_TYPE . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_SUBMITTER . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_CREATED . "</th>
- <th class='center width5'>" . _AM_XNEWSLETTER_FORMACTION . "</th>
- </tr>
- ";
-
- $class = "odd";
-
+ // output table
+ echo "<table class='outer' cellspacing='1'>";
+ echo "<tr>";
+ echo " <th>" . _AM_XNEWSLETTER_ATTACHMENT_ID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_ATTACHMENT_LETTER_ID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_ATTACHMENT_NAME . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_ATTACHMENT_SIZE . "<br />" . _AM_XNEWSLETTER_ATTACHMENT_TYPE . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_ATTACHMENT_SUBMITTER . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_ATTACHMENT_CREATED . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
+ echo "</tr>";
+ if ($attachmentCount > 0) {
+ $class = 'odd';
foreach ($attachmentObjs as $attachment_id => $attachmentObj) {
- echo "<tr class='" . $class . "'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>" . $attachment_id . "</td>";
-
- $letter =& $xnewsletter->getHandler('letter')->get($attachmentObj->getVar("attachment_letter_id"));
- $title_letter = $letter->getVar("letter_title");
- echo "<td class='center'>" . $title_letter . "</td>";
- echo "<td class='center'>" . $attachmentObj->getVar("attachment_name") . "</td>";
- echo "<td class='center'>" . $attachmentObj->getVar("attachment_type") . "</td>";
- echo "<td class='center'>" . XoopsUser::getUnameFromId($attachmentObj->getVar("attachment_submitter"), "S") . "</td>";
- echo "<td class='center'>" . formatTimeStamp($attachmentObj->getVar("attachment_created"), "S") . "</td>";
-
- echo "
- <td class='center width5' nowrap='nowrap'>
- <a href='?op=edit_attachment&attachment_id=" . $attachment_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>
-
- <a href='?op=delete_attachment&attachment_id=" . $attachment_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>
- </td>
- ";
- echo "</tr>";
+ $letterObj = $xnewsletter->getHandler('letter')->get($attachmentObj->getVar('attachment_letter_id'));
+ echo "<tr class='{$class}'>";
+ $class = ($class == 'even') ? 'odd' : 'even';
+ echo "<td class='center'>{$attachment_id}</td>";
+ echo "<td>" . $letterObj->getVar('letter_title') . "</td>";
+ echo "<td>" . $attachmentObj->getVar('attachment_name') . "</td>";
+ echo "<td>";
+ echo "<span title='" . $attachmentObj->getVar('attachment_size') . " B'>" . xnewsletter_bytesToSize1024($attachmentObj->getVar('attachment_size')) . "</span>";
+ echo "<br />";
+ echo $attachmentObj->getVar('attachment_type');
+ echo "</td>";
+ echo "<td>" . XoopsUser::getUnameFromId($attachmentObj->getVar('attachment_submitter'), 'S') . "</td>";
+ echo "<td>" . formatTimeStamp($attachmentObj->getVar('attachment_created'), 'S') . "</td>";
+ echo "<td>";
+ echo " <a href='?op=edit_attachment&attachment_id={$attachment_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>";
+ echo " ";
+ echo " <a href='?op=delete_attachment&attachment_id={$attachment_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
+ echo "</td>";
}
- echo "</table><br /><br />";
- echo "<br /><div class='center'>" . $pagenav . "</div><br />";
- } else {
- echo "
- <table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width2'>" . _AM_XNEWSLETTER_ATTACHMENT_ID . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_LETTER_ID . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_NAME . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_TYPE . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_SUBMITTER . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_CREATED . "</th>
- <th class='center width5'>" . _AM_XNEWSLETTER_FORMACTION . "</th>
- </tr>
- </table><br /><br />
- ";
}
+ echo "</table>";
+ echo "<br />";
+ echo "<div>" . $pagenav . "</div>";
+ echo "<br />";
break;
- case "new_attachment" :
+ case 'edit_attachment':
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ATTACHMENTLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
//
- $attachmentObj = $xnewsletter->getHandler('attachment')->create();
+ $attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
$form = $attachmentObj->getForm();
$form->display();
break;
- case "save_attachment" :
- if (!$GLOBALS["xoopsSecurity"]->check()) {
- redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ case 'save_attachment':
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
-
+ //
$attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
- $attachmentObj->setVar("attachment_letter_id", XnewsletterRequest::getInt('attachment_letter_id', 0));
- $attachmentObj->setVar("attachment_name", XnewsletterRequest::getString('attachment_name', ''));
- $attachmentObj->setVar("attachment_type", XnewsletterRequest::getInt('attachment_type', 0));
- $attachmentObj->setVar("attachment_submitter", XnewsletterRequest::getInt('attachment_submitter', 0));
- $attachmentObj->setVar("attachment_created", XnewsletterRequest::getInt('attachment_created', time()));
-
+ $attachmentObj->setVar('attachment_mode', xnewsletterRequest::getInt('attachment_mode', _XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT));
+ //
if ($xnewsletter->getHandler('attachment')->insert($attachmentObj)) {
- redirect_header("?op=list", 2, _AM_XNEWSLETTER_FORMOK);
+ redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
+ exit();
+ } else {
+ echo $attachmentObj->getHtmlErrors();
+ $form = $attachmentObj->getForm();
+ $form->display();
}
-
- echo $attachmentObj->getHtmlErrors();
- $form = $attachmentObj->getForm();
- $form->display();
break;
- case "edit_attachment" :
- echo $indexAdmin->addNavigation($currentFile);
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWATTACHMENT, '?op=new_attachment', 'add');
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ATTACHMENTLIST, '?op=list', 'list');
- echo $indexAdmin->renderButton();
- //
+ case 'delete_attachment':
$attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
- $form = $attachmentObj->getForm();
- $form->display();
- break;
-
- case "delete_attachment" :
- $attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
- if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
- if (!$GLOBALS["xoopsSecurity"]->check()) {
- redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if ($xnewsletter->getHandler('attachment')->delete($attachmentObj)) {
redirect_header($currentFile, 3, _AM_XNEWSLETTER_FORMDELOK);
@@ -170,8 +136,9 @@
...
[truncated message content] |
