Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2014-09-21 05:42:04
|
Revision: 12795
http://sourceforge.net/p/xoops/svn/12795
Author: beckmi
Date: 2014-09-21 05:41:46 +0000 (Sun, 21 Sep 2014)
Log Message:
-----------
converting $i++ to ++$i for improved performance
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xcache.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/class.tar.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/sqlutility.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.textsanitizer.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/preload.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.process_cached_inserts.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_compiled_include.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/block.textformat.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.config_load.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_date.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_table.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.mailto.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/modifier.escape.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/snoopy.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/tardownloader.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/template.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/bloggerapi.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/metaweblogapi.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopscomments.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formcheckbox.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formelementtray.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formradio.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/grouppermform.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_view.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.encoding.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_select.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/include/old_functions.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/include/xoopscodes.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/createconfigform.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_moduleinstaller.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/config.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configitem.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/main.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/main.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/main.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/block.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/gui.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/maintenance.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/menu.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.filters.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.functions.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.gif.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.ico.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/menu.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/menu.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/menu.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/search.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/category.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/item.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/userinfo.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/ProtectorMysqlDatabase.class.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/protector.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Arborize.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrCollections.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Background.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Font.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Ident.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Multiple.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Clone.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Lang.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/Host.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Nofollow.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/TargetBlank.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/List.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Config.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Encoder.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Iframe.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Legacy.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Nofollow.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/TargetBlank.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/AutoParagraph.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/Linkify.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/PurifierLinkify.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/RemoveEmpty.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Language.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/LanguageFactory.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/DOMLex.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/DirectLex.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/PH5P.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/PercentEncoder.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/MakeWellFormed.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/DisableResources.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/MakeAbsolute.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/SafeIframe.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/data.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/file.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/UnitConverter.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Zipper.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/onuninstall.php
XoopsCore/branches/2.5.x/2.5.8/upgrade/cnt-2.2.x-to-2.3.0/index.php
XoopsCore/branches/2.5.x/2.5.8/upgrade/language.php
XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php
XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.3-to-2.4.0/index.php
XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.0-to-2.4.1/index.php
Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-21 05:41:46 UTC (rev 12795)
@@ -9,6 +9,7 @@
- fix for Update setting Template import date to 0 (timgno/mamba)
- adding Adding language constants for Protector's Prefix Manager (slider84/mamba)
- allowing for "https" URL in YouTube links in Textsanitizer (mamba)
+- converting $i++ to ++$i for improved performance (mamba)
===============================
2014-06-20: Version 2.5.7 Final (Patch)
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -332,7 +332,7 @@
$iReqVerParts = array_map('intval', $reqVerParts);
$icount = $j = count($iReqVerParts);
$reqVer = $curVer = 0;
- for ($i=0; $i<$icount; $i++) {
+ for ($i=0; $i<$icount; ++$i) {
$j--;
$reqVer += $iReqVerParts[$i] * pow(10, $j);
if (isset($iCurrentVerParts[$i])) {
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -97,7 +97,7 @@
if (false != $rss2parser->parse()) {
$_items = $rss2parser->getItems();
$count = count($_items);
- for ($i = 0; $i < $count; $i ++) {
+ for ($i = 0; $i < $count; ++$i) {
$_items[$i]['title'] = XoopsLocal::convert_encoding($_items[$i]['title'], _CHARSET, 'UTF-8');
$_items[$i]['description'] = XoopsLocal::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8');
$items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++$cnt)] = $_items[$i];
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -149,7 +149,7 @@
<td>{$clicks}</td>
<td>{$percent}%</td>
<td><a href='banners.php?op=EmailStats&cid={$cid}&bid={$bid}' title='" . _BANNERS_STATS . "'>" . _BANNERS_STATS . "</a></td></tr></tbody>";
- $i++;
+ ++$i;
}
echo "</table>
<br /><br />
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xcache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xcache.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xcache.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -134,7 +134,7 @@
{
$result = true;
$this->__auth();
- for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++) {
+ for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; ++$i) {
if (!xcache_clear_cache(XC_TYPE_VAR, $i)) {
$result = false;
break;
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -213,8 +213,8 @@
$oImage = imagecreatetruecolor(100, 100);
$text_color = imagecolorallocate($oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
$FontSize = $this->config["fontsize_max"];
- for ($Angle = -30; $Angle <= 30; $Angle++) {
- for ($i = 65; $i <= 90; $i++) {
+ for ($Angle = -30; $Angle <= 30; ++$Angle) {
+ for ($i = 65; $i <= 90; ++$i) {
$CharDetails = imageftbbox($FontSize, $Angle, $this->font, chr($i), array());
$_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]);
if ($_MaxCharWidth > $MaxCharWidth) {
@@ -282,7 +282,7 @@
*/
function drawCode()
{
- for ($i = 0; $i < $this->config["num_chars"] ; $i++) {
+ for ($i = 0; $i < $this->config["num_chars"] ; ++$i) {
// select random greyscale colour
$text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
@@ -321,7 +321,7 @@
*/
function drawCircles()
{
- for ($i = 1; $i <= $this->config["background_num"]; $i++) {
+ for ($i = 1; $i <= $this->config["background_num"]; ++$i) {
$randomcolor = imagecolorallocate ($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
imagefilledellipse($this->oImage, mt_rand(0, $this->width - 10), mt_rand(0, $this->height - 3), mt_rand(10, 20), mt_rand(20, 30), $randomcolor);
}
@@ -332,7 +332,7 @@
*/
function drawLines()
{
- for ($i = 0; $i < $this->config["background_num"]; $i++) {
+ for ($i = 0; $i < $this->config["background_num"]; ++$i) {
$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
}
@@ -343,7 +343,7 @@
*/
function drawRectangles()
{
- for ($i = 1; $i <= $this->config["background_num"]; $i++) {
+ for ($i = 1; $i <= $this->config["background_num"]; ++$i) {
$randomcolor = imagecolorallocate ($this->oImage , mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
imagefilledrectangle($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
}
@@ -371,7 +371,7 @@
*/
function drawEllipses()
{
- for ($i = 1; $i <= $this->config["background_num"]; $i++) {
+ for ($i = 1; $i <= $this->config["background_num"]; ++$i) {
$randomcolor = imagecolorallocate ($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
imageellipse($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
}
@@ -382,10 +382,10 @@
*/
function drawPolygons()
{
- for ($i = 1; $i <= $this->config["background_num"]; $i++) {
+ for ($i = 1; $i <= $this->config["background_num"]; ++$i) {
$randomcolor = imagecolorallocate ($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
$coords = array();
- for ($j = 1; $j <= $this->config["polygon_point"]; $j++) {
+ for ($j = 1; $j <= $this->config["polygon_point"]; ++$j) {
$coords[] = mt_rand(0, $this->width);
$coords[] = mt_rand(0, $this->height);
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/class.tar.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/class.tar.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/class.tar.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -135,10 +135,10 @@
function __computeUnsignedChecksum($bytestring)
{
$unsigned_chksum = '';
- for ($i = 0; $i < 512; $i++) {
+ for ($i = 0; $i < 512; ++$i) {
$unsigned_chksum += ord($bytestring[$i]);
}
- for ($i = 0; $i < 8; $i++) {
+ for ($i = 0; $i < 8; ++$i) {
$unsigned_chksum -= ord($bytestring[148 + $i]);
$unsigned_chksum += ord(' ') * 8;
}
@@ -316,7 +316,7 @@
$header .= str_repeat(chr(0), 12);
// Compute header checksum
$checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)), 6, "0", STR_PAD_LEFT);
- for ($i = 0; $i < 6; $i ++) {
+ for ($i = 0; $i < 6; ++$i) {
$header[(148 + $i)] = substr($checksum, $i, 1);
}
$header[154] = chr(0);
@@ -351,7 +351,7 @@
$header .= str_repeat(chr(0), 12);
// Compute header checksum
$checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)), 6, "0", STR_PAD_LEFT);
- for ($i = 0; $i < 6; $i++) {
+ for ($i = 0; $i < 6; ++$i) {
$header[(148 + $i)] = substr($checksum, $i, 1);
}
$header[154] = chr(0);
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -99,7 +99,7 @@
function renderFlatView($admin_view = false)
{
$count = count($this->_comments);
- for ($i = 0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; ++$i) {
if (false != $this->_useIcons) {
$title = $this->_getTitleIcon($this->_comments[$i]->getVar('com_icon')) . ' ' . $this->_comments[$i]->getVar('com_title');
} else {
@@ -219,7 +219,7 @@
$current_prefix .= $prefix;
}
if (isset($thread[$key]['child']) && ! empty($thread[$key]['child'])) {
- $depth++;
+ ++$depth;
foreach ($thread[$key]['child'] as $childkey) {
if (!$admin_view && $thread[$childkey]['obj']->getVar('com_status') != XOOPS_COMMENT_ACTIVE) {
// skip this comment if it is not active and continue on processing its child comments instead
@@ -311,7 +311,7 @@
$prefix = $prefix + 25;
}
if (isset($thread[$key]['child']) && ! empty($thread[$key]['child'])) {
- $depth++;
+ ++$depth;
foreach ($thread[$key]['child'] as $childkey) {
if (!$admin_view && $thread[$childkey]['obj']->getVar('com_status') != XOOPS_COMMENT_ACTIVE) {
// skip this comment if it is not active and continue on processing its child comments instead
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -235,7 +235,7 @@
$count = count($this->criteriaElements);
if ($count > 0) {
$render_string = $this->criteriaElements[0]->render();
- for ($i = 1; $i < $count; $i++) {
+ for ($i = 1; $i < $count; ++$i) {
if (!$render = $this->criteriaElements[$i]->render())
continue;
$render_string .= (empty($render_string) ? "" : ' ' . $this->conditions[$i] . ' ') . $render;
@@ -271,7 +271,7 @@
$count = count($this->criteriaElements);
if ($count > 0) {
$retval = $this->criteriaElements[0]->renderLdap();
- for ($i = 1; $i < $count; $i++) {
+ for ($i = 1; $i < $count; ++$i) {
$cond = strtoupper($this->conditions[$i]);
$op = ($cond == "OR") ? "|" : "&";
$retval = "({$op}{$retval}" . $this->criteriaElements[$i]->renderLdap() . ")";
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/sqlutility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/sqlutility.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/sqlutility.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -78,7 +78,7 @@
$escaped_backslash = false;
while ($i - $j > 0 && $sql[$i - $j] == '\\') {
$escaped_backslash = !$escaped_backslash;
- $j++;
+ ++$j;
}
// ... if escaped backslashes: it's really the
// end of the string -> exit the loop
@@ -89,7 +89,7 @@
}
// ... else loop
else {
- $i++;
+ ++$i;
}
} // end if...elseif...else
} // end for
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -969,7 +969,7 @@
}
}
}
- $index++;
+ ++$index;
if (!$connection) {
throw new phpmailerException($this->Lang('connect_host'));
}
@@ -1112,10 +1112,10 @@
$line = explode($this->LE, $message);
$message = '';
- for ($i = 0 ;$i < count($line); $i++) {
+ for ($i = 0 ;$i < count($line); ++$i) {
$line_part = explode(' ', $line[$i]);
$buf = '';
- for ($e = 0; $e<count($line_part); $e++) {
+ for ($e = 0; $e<count($line_part); ++$e) {
$word = $line_part[$e];
if ($qp_mode and (strlen($word) > $length)) {
$space_left = $length - strlen($buf) - 1;
@@ -1318,7 +1318,7 @@
}
// Add custom headers
- for ($index = 0; $index < count($this->CustomHeader); $index++) {
+ for ($index = 0; $index < count($this->CustomHeader); ++$index) {
$result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
}
if (!$this->sign_key_file) {
@@ -1918,7 +1918,7 @@
$offset = $avgLength - $lookBack;
$chunk = mb_substr($str, $i, $offset, $this->CharSet);
$chunk = base64_encode($chunk);
- $lookBack++;
+ ++$lookBack;
} while (strlen($chunk) > $length);
$encoded .= $chunk . $this->LE;
@@ -1950,7 +1950,7 @@
while ( list(, $line) = each($lines) ) {
$linlen = strlen($line);
$newline = '';
- for ($i = 0; $i < $linlen; $i++) {
+ for ($i = 0; $i < $linlen; ++$i) {
$c = substr( $line, $i, 1 );
$dec = ord( $c );
if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
@@ -2593,7 +2593,7 @@
{
$tmp = '';
$line = '';
- for ($i = 0; $i < strlen($txt); $i++) {
+ for ($i = 0; $i < strlen($txt); ++$i) {
$ord = ord($txt[$i]);
if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
$line .= $txt[$i];
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -331,7 +331,7 @@
{
if (is_array($this->handler->keyName)) {
$clause = array();
- for ($i = 0; $i < count($this->handler->keyName); $i++) {
+ for ($i = 0; $i < count($this->handler->keyName); ++$i) {
$clause[] = "`" . $this->handler->keyName[$i] . "` = " . $this->handler->db->quote($object->getVar($this->handler->keyName[$i]));
}
$whereclause = implode(" AND ", $clause);
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.textsanitizer.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.textsanitizer.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -445,7 +445,7 @@
//-------------------------------------------------------------------------------
$count = sizeof($this->callbackPatterns);
- for ($i = 0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; ++$i) {
$text = preg_replace_callback($this->callbackPatterns[$i], $this->callbacks[$i] , $text);
}
//------------------------------------------------------------------------------
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -92,7 +92,7 @@
$ret .= '... ';
}
}
- $counter ++;
+ ++$counter;
}
$next = $this->current + $this->perpage;
if ($this->total > $next) {
@@ -129,7 +129,7 @@
} else {
$ret .= '<option value="' . $this->url . (($counter - 1) * $this->perpage) . $this->extra . '">' . $counter . '</option>';
}
- $counter ++;
+ ++$counter;
}
$ret .= '</select>';
if ($showbutton) {
@@ -176,7 +176,7 @@
$ret .= '<td class="paginact">...</td>';
}
}
- $counter ++;
+ ++$counter;
}
$next = $this->current + $this->perpage;
if ($this->total > $next) {
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/preload.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/preload.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/preload.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -92,7 +92,7 @@
$file = substr($file, 0, -4);
$this->_preloads[$i]['module'] = $module;
$this->_preloads[$i]['file'] = $file;
- $i++;
+ ++$i;
}
}
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -290,7 +290,7 @@
/* parse file line by line */
preg_match_all('!^.*\r?\n?!m', $contents, $match);
$lines = $match[0];
- for ($i=0, $count=count($lines); $i<$count; $i++) {
+ for ($i=0, $count=count($lines); $i<$count; ++$i) {
$line = $lines[$i];
if (empty($line)) continue;
@@ -324,7 +324,7 @@
$var_value = '';
while ($i<$count) {
if (($pos = strpos($lines[$i], '"""')) === false) {
- $var_value .= $lines[$i++];
+ $var_value .= $lines[++$i];
} else {
/* end of multiline-value */
$var_value .= substr($lines[$i], 0, $pos);
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -276,17 +276,17 @@
$text_blocks = preg_split("~{$ldq}.*?{$rdq}~s", $source_content);
/* loop through text blocks */
- for ($curr_tb = 0, $for_max = count($text_blocks); $curr_tb < $for_max; $curr_tb++) {
+ for ($curr_tb = 0, $for_max = count($text_blocks); $curr_tb < $for_max; ++$curr_tb) {
/* match anything resembling php tags */
if (preg_match_all('~(<\?(?:\w+|=)?|\?>|language\s*=\s*[\"\']?\s*php\s*[\"\']?)~is', $text_blocks[$curr_tb], $sp_match)) {
/* replace tags with placeholders to prevent recursive replacements */
$sp_match[1] = array_unique($sp_match[1]);
usort($sp_match[1], '_smarty_sort_length');
- for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) {
+ for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; ++$curr_sp) {
$text_blocks[$curr_tb] = str_replace($sp_match[1][$curr_sp],'%%%SMARTYSP'.$curr_sp.'%%%',$text_blocks[$curr_tb]);
}
/* process each one */
- for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) {
+ for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; ++$curr_sp) {
if ($this->php_handling == SMARTY_PHP_PASSTHRU) {
/* echo php contents */
$text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', '<?php echo \''.str_replace("'", "\'", $sp_match[1][$curr_sp]).'\'; ?>'."\n", $text_blocks[$curr_tb]);
@@ -307,7 +307,7 @@
/* Compile the template tags into PHP code. */
$compiled_tags = array();
- for ($i = 0, $for_max = count($template_tags); $i < $for_max; $i++) {
+ for ($i = 0, $for_max = count($template_tags); $i < $for_max; ++$i) {
$this->_current_line_no += substr_count($text_blocks[$i], "\n");
$compiled_tags[] = $this->_compile_tag($template_tags[$i]);
$this->_current_line_no += substr_count($template_tags[$i], "\n");
@@ -321,7 +321,7 @@
/* Reformat $text_blocks between 'strip' and '/strip' tags,
removing spaces, tabs and newlines. */
$strip = false;
- for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
+ for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; ++$i) {
if ($compiled_tags[$i] == '{strip}') {
$compiled_tags[$i] = '';
$strip = true;
@@ -330,7 +330,7 @@
}
if ($strip) {
/* strip all $text_blocks before the next '/strip' */
- for ($j = $i + 1; $j < $for_max; $j++) {
+ for ($j = $i + 1; $j < $for_max; ++$j) {
/* remove leading and trailing whitespaces of each line */
$text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]);
if ($compiled_tags[$j] == '{/strip}') {
@@ -353,7 +353,7 @@
$tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%';
/* Interleave the compiled contents and text blocks to get the final result. */
- for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
+ for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; ++$i) {
if ($compiled_tags[$i] == '') {
// tag result empty, remove first newline from following text block
$text_blocks[$i+1] = preg_replace('~^(\r\n|\r|\n)~', '', $text_blocks[$i+1]);
@@ -1279,7 +1279,7 @@
$is_arg_stack = array();
- for ($i = 0; $i < count($tokens); $i++) {
+ for ($i = 0; $i < count($tokens); ++$i) {
$token = &$tokens[$i];
@@ -1474,8 +1474,8 @@
switch ($expr_type) {
case 'even':
if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
- $expr_end++;
- $expr_arg = $tokens[$expr_end++];
+ ++$expr_end;
+ $expr_arg = $tokens[++$expr_end];
$expr = "!(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
} else
$expr = "!(1 & $is_arg)";
@@ -1483,8 +1483,8 @@
case 'odd':
if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
- $expr_end++;
- $expr_arg = $tokens[$expr_end++];
+ ++$expr_end;
+ $expr_arg = $tokens[++$expr_end];
$expr = "(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
} else
$expr = "(1 & $is_arg)";
@@ -1492,8 +1492,8 @@
case 'div':
if (@$tokens[$expr_end] == 'by') {
- $expr_end++;
- $expr_arg = $tokens[$expr_end++];
+ ++$expr_end;
+ $expr_arg = $tokens[++$expr_end];
$expr = "!($is_arg % " . $this->_parse_var_props($expr_arg) . ")";
} else {
$this->_syntax_error("expecting 'by' after 'div'", E_USER_ERROR, __FILE__, __LINE__);
@@ -1847,7 +1847,7 @@
$orig_vals = $match = $match[0];
$this->_parse_vars_props($match);
$replace = array();
- for ($i = 0, $count = count($match); $i < $count; $i++) {
+ for ($i = 0, $count = count($match); $i < $count; ++$i) {
$replace[$orig_vals[$i]] = $match[$i];
}
return strtr($parenth_args, $replace);
@@ -1909,7 +1909,7 @@
preg_match_all('~\|(@?\w+)((?>:(?:'. $this->_qstr_regexp . '|[^|]+))*)~', '|' . $modifier_string, $_match);
list(, $_modifiers, $modifier_arg_strings) = $_match;
- for ($_i = 0, $_for_max = count($_modifiers); $_i < $_for_max; $_i++) {
+ for ($_i = 0, $_for_max = count($_modifiers); $_i < $_for_max; ++$_i) {
$_modifier_name = $_modifiers[$_i];
if($_modifier_name == 'smarty') {
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.process_cached_inserts.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.process_cached_inserts.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.process_cached_inserts.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -17,7 +17,7 @@
$params['results'], $match);
list($cached_inserts, $insert_args) = $match;
- for ($i = 0, $for_max = count($cached_inserts); $i < $for_max; $i++) {
+ for ($i = 0, $for_max = count($cached_inserts); $i < $for_max; ++$i) {
if ($smarty->debugging) {
$_params = array();
require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -43,16 +43,16 @@
$level = 0;
$j = 0;
- for ($i=0, $results_count = count($results); $i < $results_count && $j < $match_count; $i++) {
+ for ($i=0, $results_count = count($results); $i < $results_count && $j < $match_count; ++$i) {
if ($results[$i] == $match[0][$j]) {
// nocache tag
if ($match[1][$j]) { // closing tag
$level--;
unset($results[$i]);
} else { // opening tag
- if ($level++ > 0) unset($results[$i]);
+ if (++$level > 0) unset($results[$i]);
}
- $j++;
+ ++$j;
} elseif ($level > 0) {
unset($results[$i]);
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_compiled_include.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_compiled_include.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_compiled_include.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -37,7 +37,7 @@
$_include_compiled .= "<?php";
$this_varname = ((double)phpversion() >= 5.0) ? '_smarty' : 'this';
- for ($_i = 0, $_for_max = count($_match_source); $_i < $_for_max; $_i++) {
+ for ($_i = 0, $_for_max = count($_match_source); $_i < $_for_max; ++$_i) {
$_match =& $_match_source[$_i];
$source = $_match[4];
if ($this_varname == '_smarty') {
@@ -56,7 +56,7 @@
if ($open_tag == '<?php ') break;
}
- for ($i=0, $count = count($tokens); $i < $count; $i++) {
+ for ($i=0, $count = count($tokens); $i < $count; ++$i) {
if (is_array($tokens[$i])) {
if ($tokens[$i][0] == T_VARIABLE && $tokens[$i][1] == '$this') {
$tokens[$i] = '$' . $this_varname;
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/block.textformat.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/block.textformat.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/block.textformat.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -75,7 +75,7 @@
$_paragraphs = preg_split('![\r\n][\r\n]!',$content);
$_output = '';
- for($_x = 0, $_y = count($_paragraphs); $_x < $_y; $_x++) {
+ for($_x = 0, $_y = count($_paragraphs); $_x < $_y; ++$_x) {
if ($_paragraphs[$_x] == '') {
continue;
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.config_load.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.config_load.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.config_load.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -120,7 +120,7 @@
$smarty->_config[1]['vars'] = @array_merge($smarty->_config[1]['vars'], $_config_vars);
$smarty->_config[1]['files'][$_file] = true;
} else if ($_scope == 'global') {
- for ($i = 1, $for_max = count($smarty->_config); $i < $for_max; $i++) {
+ for ($i = 1, $for_max = count($smarty->_config); $i < $for_max; ++$i) {
$smarty->_config[$i]['vars'] = @array_merge($smarty->_config[$i]['vars'], $_config_vars);
$smarty->_config[$i]['files'][$_file] = true;
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_date.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_date.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_date.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -180,14 +180,14 @@
$field_separator_count = -1;
if ($display_months) {
- $field_separator_count++;
+ ++$field_separator_count;
$month_names = array();
$month_values = array();
if(isset($month_empty)) {
$month_names[''] = $month_empty;
$month_values[''] = '';
}
- for ($i = 1; $i <= 12; $i++) {
+ for ($i = 1; $i <= 12; ++$i) {
$month_names[$i] = strftime($month_format, mktime(0, 0, 0, $i, 1, 2000));
$month_values[$i] = strftime($month_value_format, mktime(0, 0, 0, $i, 1, 2000));
}
@@ -218,13 +218,13 @@
}
if ($display_days) {
- $field_separator_count++;
+ ++$field_separator_count;
$days = array();
if (isset($day_empty)) {
$days[''] = $day_empty;
$day_values[''] = '';
}
- for ($i = 1; $i <= 31; $i++) {
+ for ($i = 1; $i <= 31; ++$i) {
$days[] = sprintf($day_format, $i);
$day_values[] = sprintf($day_value_format, $i);
}
@@ -254,7 +254,7 @@
}
if ($display_years) {
- $field_separator_count++;
+ ++$field_separator_count;
if (null !== $field_array){
$year_name = $field_array . '[' . $prefix . 'Year]';
} else {
@@ -302,7 +302,7 @@
}
// Loop through the field_order field
- for ($i = 0; $i <= 2; $i++){
+ for ($i = 0; $i <= 2; ++$i){
$c = substr($field_order, $i, 1);
switch ($c){
case 'D':
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -84,7 +84,7 @@
if ($display_hours) {
$hours = $use_24_hours ? range(0, 23) : range(1, 12);
$hour_fmt = $use_24_hours ? '%H' : '%I';
- for ($i = 0, $for_max = count($hours); $i < $for_max; $i++)
+ for ($i = 0, $for_max = count($hours); $i < $for_max; ++$i)
$hours[$i] = sprintf('%02d', $hours[$i]);
$html_result .= '<select name=';
if (null !== $field_array) {
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_table.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_table.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_table.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -127,7 +127,7 @@
$cols = ($hdir == 'right') ? $cols : array_reverse($cols);
$output .= "<thead><tr>\n";
- for ($r=0; $r<$cols_count; $r++) {
+ for ($r=0; $r<$cols_count; ++$r) {
$output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
$output .= $cols[$r];
$output .= "</th>\n";
@@ -136,11 +136,11 @@
}
$output .= "<tbody>\n";
- for ($r=0; $r<$rows; $r++) {
+ for ($r=0; $r<$rows; ++$r) {
$output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
$rx = ($vdir == 'down') ? $r*$cols_count : ($rows-1-$r)*$cols_count;
- for ($c=0; $c<$cols_count; $c++) {
+ for ($c=0; $c<$cols_count; ++$c) {
$x = ($hdir == 'right') ? $rx+$c : $rx+$cols_count-1-$c;
if ($inner!='cols') {
/* shuffle x to loop over rows*/
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.mailto.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.mailto.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.mailto.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -88,7 +88,7 @@
}
$mail_parm_vals = '';
- for ($i=0; $i<count($mail_parms); $i++) {
+ for ($i=0; $i<count($mail_parms); ++$i) {
$mail_parm_vals .= (0==$i) ? '?' : '&';
$mail_parm_vals .= $mail_parms[$i];
}
@@ -104,7 +104,7 @@
$string = 'document.write(\'<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>\');';
$js_encode = '';
- for ($x=0; $x < strlen($string); $x++) {
+ for ($x=0; $x < strlen($string); ++$x) {
$js_encode .= '%' . bin2hex($string[$x]);
}
@@ -113,7 +113,7 @@
} elseif ($encode == 'javascript_charcode' ) {
$string = '<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>';
- for($x = 0, $y = strlen($string); $x < $y; $x++ ) {
+ for($x = 0, $y = strlen($string); $x < $y; ++$x ) {
$ord[] = ord($string[$x]);
}
@@ -137,7 +137,7 @@
return;
}
$address_encode = '';
- for ($x=0; $x < strlen($address); $x++) {
+ for ($x=0; $x < strlen($address); ++$x) {
if(preg_match('!\w!',$address[$x])) {
$address_encode .= '%' . bin2hex($address[$x]);
} else {
@@ -145,7 +145,7 @@
}
}
$text_encode = '';
- for ($x=0; $x < strlen($text); $x++) {
+ for ($x=0; $x < strlen($text); ++$x) {
$text_encode .= '&#x' . bin2hex($text[$x]).';';
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/modifier.escape.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/modifier.escape.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/modifier.escape.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -40,7 +40,7 @@
case 'hex':
// escape every character into hex
$return = '';
- for ($x=0; $x < strlen($string); $x++) {
+ for ($x=0; $x < strlen($string); ++$x) {
$return .= '%' . bin2hex($string[$x]);
}
@@ -48,7 +48,7 @@
case 'hexentity':
$return = '';
- for ($x=0; $x < strlen($string); $x++) {
+ for ($x=0; $x < strlen($string); ++$x) {
$return .= '&#x' . bin2hex($string[$x]) . ';';
}
@@ -56,7 +56,7 @@
case 'decentity':
$return = '';
- for ($x=0; $x < strlen($string); $x++) {
+ for ($x=0; $x < strlen($string); ++$x) {
$return .= '&#' . ord($string[$x]) . ';';
}
@@ -73,7 +73,7 @@
case 'nonstd':
// escape non-standard chars, such as ms document quotes
$_res = '';
- for ($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
+ for ($_i = 0, $_len = strlen($string); $_i < $_len; ++$_i) {
$_ord = ord(substr($string, $_i, 1));
// non-standard char, escape it
if ($_ord >= 126) {
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -65,7 +65,7 @@
{
$_len = strlen($search_str);
$_pos = 0;
- for ($_i=0, $_count=count($replace); $_i<$_count; $_i++)
+ for ($_i=0, $_count=count($replace); $_i<$_count; ++$_i)
if (($_pos=strpos($subject, $search_str, $_pos))!==false)
$subject = substr_replace($subject, $replace[$_i], $_pos, $_len);
else
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -38,7 +38,7 @@
if ($currentPage > 1) {
$str .= '<a href="' . $xoops->url(str_replace( '%s', $offset - $pageSize, $url)) . '">Previous</a>';
}
- for ($i = $minPage; $i <= $maxPage; $i++) {
+ for ($i = $minPage; $i <= $maxPage; ++$i) {
$tgt = htmlspecialchars($xoops->url(str_replace('%s', ($i - 1) * $pageSize, $url)), ENT_QUOTES);
$str .= "<a href='$tgt'>$i</a>";
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/snoopy.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/snoopy.php 2014-09-18 21:56:17 UTC (rev 12794)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/snoopy.php 2014-09-21 05:41:46 UTC (rev 12795)
@@ -423,7 +423,7 @@
if($this->lastredirectaddr)
$URI = $this->lastredirectaddr;
if (is_array($this->results)) {
- for($x=0;$x<count($this->results);$x++)
+ for($x=0;$x<count($this->results);++$x)
$this->results[$x] = $this->_striplinks($this->results[$x]);
} else
$this->results = $this->_striplinks($this->results);
@@ -455,7 +455,7 @@
if ($this->fetch($URI)) {
if (is_array($this->results)) {
- for($x=0;$x<count($this->results);$x++)
+ for($x=0;$x<count($this->results);++$x)
$this->results[$x] = $this->_stripform($this->results[$x]);
} else
$this->results = $this->_stripform($this->results);
@@ -482,7 +482,7 @@
{
if ($this->fetch($URI)) {
if (is_array($this->results)) {
- for($x=0;$x<count($this->results);$x++)
+ for($x=0;$x<count($this->results);++$x)
$this->results[$x] = $this->_striptext($this->results[$x]);
} else
$this->results = $this->_striptext($this->results);
@@ -513,7 +513,7 @@
if($this->lastredirectaddr)
$URI = $this->lastredirectaddr;
if (is_array($this->results)) {
- for ($x=0;$x<count($this->results);$x++) {
+ for ($x=0;$x<count($this->results);++$x) {
$this->results[$x] = $this->_striplinks($this->results[$x]);
if($this->expandlinks)
$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
@@ -550,7 +550,7 @@
if($this->lastredirectaddr)
$URI = $this->lastredirectaddr;
if (is_array($this->results)) {
- for ($x=0;$x<count($this->results);$x++) {
+ for ($x=0;$x<count($this->results);++$x) {
$this->results[$x] = $this->_striptext($this->results[$x]);
if($this->expandlinks)
$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
@@ -931,7 +931,7 @@
// have we hit our frame depth and is there frame src to fetch?
if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match)) {
$this->results[] = $results;
- for($x=0; $x<count($match[1]); $x++)
+ for($x=0; $x<count($match[1]); ++$x)
$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
}
// have we already fetched framed content?
@@ -1015,7 +1015,7 @@
if(!empty($this->user) || !empty($this->pass))
$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
- for ($curr_header = 0; $curr_header < count($headers); $curr_header++) {
+ for ($curr_header = 0; $curr_header < count($headers); ++$curr_header) {
$safer_header = strtr( $headers[$curr_header], "\"", " " );
$cmdline_params .= " -H \"".$safer_header."\"";
}
@@ -1043,7 +1043,7 @@
$this->_redirectaddr = false;
unset($this->headers);
- for ($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++) {
+ for ($currentHeader = 0; $currentHeader < count($result_headers); ++$currentHeader) {
// if a header begins with Location: or URI:, set the redirect
if (preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader])) {
@@ -1077,7 +1077,7 @@
// have we hit our frame depth and is there frame src to fetch?
if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match)) {
$this->results[] = $results;
- for($x=0; $x<count($match[1]); $x++)
+ for($x=0; $x<count($match[1]); ++$x)
$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
}
// have we already fetched framed content?
@@ -1099,7 +1099,7 @@
function setcookies()
{
- for ($x=0; $x<count($this->headers); $x++) {
+ for ($x=0; $x<count($this->headers); ++$x) {
if(preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x],$match))
$this->cookies[$match[1]] = urldecode($match[2]);
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/tardownloader.php
=================================...
[truncated message content] |
|
From: <luc...@us...> - 2014-09-18 21:56:31
|
Revision: 12794
http://sourceforge.net/p/xoops/svn/12794
Author: luciorota
Date: 2014-09-18 21:56:17 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
$GLOBALS['...] instead of global $... IN PROGRESS
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/import.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/review.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/index.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/mirror.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/newlist.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/ratefile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/review.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/rss.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/singlefile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/topten.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/viewcat.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/visit.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-18 21:15:31 UTC (rev 12793)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-18 21:56:17 UTC (rev 12794)
@@ -104,7 +104,7 @@
include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
$customArray['fid'] = $fid;
$customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
- $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $customArray['groups'] = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
$customArray['prevEntry'] = getEntryValues( // is a Formulize function
$downloadObj->getVar('formulize_idreq'),
$customArray['formulize_mgr'],
@@ -458,8 +458,8 @@
$owner = '';
}
$ownerGroups = $member_handler->getGroupsByUser($owner, false);
- $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
- $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $uid = !empty($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
+ $groups = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
$entries = handleSubmission(
$formulize_mgr,
$entries,
@@ -557,11 +557,10 @@
print "<input type = submit name=patch_formulize value=\"Apply Patch for Formulize\">";
print "</form>";
} else {
- global $xoopsDB;
- $sqls[] = "ALTER TABLE " . $xoopsDB->prefix("wfdownloads_cat") . " ADD formulize_fid int(5) NOT NULL default '0';";
- $sqls[] = "ALTER TABLE " . $xoopsDB->prefix("wfdownloads_downloads") . " ADD formulize_idreq int(5) NOT NULL default '0';";
+ $sqls[] = "ALTER TABLE " . $GLOBALS['xoopsDB']->prefix('wfdownloads_cat') . " ADD formulize_fid int(5) NOT NULL default '0';";
+ $sqls[] = "ALTER TABLE " . $GLOBALS['xoopsDB']->prefix('wfdownloads_downloads') . " ADD formulize_idreq int(5) NOT NULL default '0';";
foreach ($sqls as $sql) {
- if (!$result = $xoopsDB->queryF($sql)) {
+ if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
exit("Error patching for Formulize.<br>SQL dump:<br>" . $sql
. "<br>Please contact <a hre...@fr...>Freeform Solutions</a> for assistance.");
}
@@ -874,8 +873,8 @@
$downloadObj->setVar('published', time());
$downloadObj->setVar('date', time());
$downloadObj->setVar('ipaddress', $_SERVER['REMOTE_ADDR']);
- $downloadObj->setVar('submitter', $xoopsUser->getVar('uid', 'e'));
- $downloadObj->setVar('publisher', $xoopsUser->getVar('uid', 'e'));
+ $downloadObj->setVar('submitter', $GLOBALS['xoopsUser']->getVar('uid', 'e'));
+ $downloadObj->setVar('publisher', $GLOBALS['xoopsUser']->getVar('uid', 'e'));
if (!$wfdownloads->getHandler('download')->insert($downloadObj)) {
wfdownloads_delFile($wfdownloads->getConfig('uploaddir') . '/' . $savedFileName);
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/import.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/import.php 2014-09-18 21:15:31 UTC (rev 12793)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/import.php 2014-09-18 21:56:17 UTC (rev 12794)
@@ -248,13 +248,12 @@
*/
function import_wfd_to_wfdownloads()
{
- global $xoopsDB;
- $module_handler =& xoops_gethandler('module');
+ $module_handler = xoops_gethandler('module');
// Get source module/config
$wfdDirname = 'wf' . 'downloads'; // don't modify, is for cloning
$wfdModule = $module_handler->getByDirname($wfdDirname);
if (empty($wfdModuleConfig)) {
- $config_handler = xoops_gethandler("config");
+ $config_handler = xoops_gethandler('config');
$wfdModuleConfig = $config_handler->getConfigsByCat(0, $wfdModule->mid());
}
$wfdCategoriesHandler = xoops_getModuleHandler('category', $wfdDirname);
@@ -301,47 +300,47 @@
echo "<br />";
$destination = array(
- "cat" => $xoopsDB->prefix("wfdownloads_cat"),
- "downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
- "mirrors" => $xoopsDB->prefix("wfdownloads_mirrors"),
- "reviews" => $xoopsDB->prefix("wfdownloads_reviews"),
- "broken" => $xoopsDB->prefix("wfdownloads_broken"),
- "mod" => $xoopsDB->prefix("wfdownloads_mod"),
- "votes" => $xoopsDB->prefix("wfdownloads_votedata")
+ "cat" => $GLOBALS['xoopsDB']->prefix("wfdownloads_cat"),
+ "downloads" => $GLOBALS['xoopsDB']->prefix("wfdownloads_downloads"),
+ "mirrors" => $GLOBALS['xoopsDB']->prefix("wfdownloads_mirrors"),
+ "reviews" => $GLOBALS['xoopsDB']->prefix("wfdownloads_reviews"),
+ "broken" => $GLOBALS['xoopsDB']->prefix("wfdownloads_broken"),
+ "mod" => $GLOBALS['xoopsDB']->prefix("wfdownloads_mod"),
+ "votes" => $GLOBALS['xoopsDB']->prefix("wfdownloads_votedata")
);
$source = array(
- "cat" => $xoopsDB->prefix("wf" . "downloads_cat"), // don't modify, is for cloning
- "downloads" => $xoopsDB->prefix("wf" . "downloads_downloads"), // don't modify, is for cloning
- "mirrors" => $xoopsDB->prefix("wf" . "downloads_mirrors"), // don't modify, is for cloning
- "reviews" => $xoopsDB->prefix("wf" . "downloads_reviews"), // don't modify, is for cloning
- "broken" => $xoopsDB->prefix("wf" . "downloads_broken"), // don't modify, is for cloning
- "mod" => $xoopsDB->prefix("wf" . "downloads_mod"), // don't modify, is for cloning
- "votes" => $xoopsDB->prefix("wf" . "downloads_votedata")
+ "cat" => $GLOBALS['xoopsDB']->prefix("wf" . "downloads_cat"), // don't modify, is for cloning
+ "downloads" => $GLOBALS['xoopsDB']->prefix("wf" . "downloads_downloads"), // don't modify, is for cloning
+ "mirrors" => $GLOBALS['xoopsDB']->prefix("wf" . "downloads_mirrors"), // don't modify, is for cloning
+ "reviews" => $GLOBALS['xoopsDB']->prefix("wf" . "downloads_reviews"), // don't modify, is for cloning
+ "broken" => $GLOBALS['xoopsDB']->prefix("wf" . "downloads_broken"), // don't modify, is for cloning
+ "mod" => $GLOBALS['xoopsDB']->prefix("wf" . "downloads_mod"), // don't modify, is for cloning
+ "votes" => $GLOBALS['xoopsDB']->prefix("wf" . "downloads_votedata")
); // don't modify, is for cloning
//Add temporary field to category table
- $xoopsDB->query("ALTER TABLE {$destination['cat']} ADD `old_cid` int NOT NULL default 0");
- $xoopsDB->query("ALTER TABLE {$destination['cat']} ADD `old_pid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE {$destination['cat']} ADD `old_cid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE {$destination['cat']} ADD `old_pid` int NOT NULL default 0");
//Add temporary fields to downloads table
- $xoopsDB->query("ALTER TABLE {$destination['downloads']} ADD `old_lid` int NOT NULL default 0");
- $xoopsDB->query("ALTER TABLE {$destination['downloads']} ADD `old_cid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE {$destination['downloads']} ADD `old_lid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE {$destination['downloads']} ADD `old_cid` int NOT NULL default 0");
//Get latest mirror ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(mirror_id) FROM {$destination['mirrors']}");
- list($max_mirrorid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(mirror_id) FROM {$destination['mirrors']}");
+ list($max_mirrorid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest review ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(review_id) FROM {$destination['reviews']}");
- list($max_reviewid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(review_id) FROM {$destination['reviews']}");
+ list($max_reviewid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest mod request ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(requestid) FROM {$destination['mod']}");
- list($max_requestid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(requestid) FROM {$destination['mod']}");
+ list($max_requestid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest report ID to determine, which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(reportid) FROM {$destination['broken']}");
- list($max_reportid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(reportid) FROM {$destination['broken']}");
+ list($max_reportid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest vote ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(ratingid) FROM {$destination['votes']}");
- list($max_ratingid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(ratingid) FROM {$destination['votes']}");
+ list($max_ratingid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Import data into category table
if (wfdownloads_checkModule('wf' . 'downloads') >= 320) {
@@ -357,8 +356,8 @@
$sql .= " `cid`, `pid`, `title`, `imgurl`, `description`, `total`, `summary`, `spotlighttop`, `spotlighthis`, `dohtml`, `dosmiley`, `doxcode`, `doimage`, `dobr`, `weight`";
$sql .= " FROM {$source['cat']}";
}
- $xoopsDB->query($sql);
- echo "Imported {$xoopsDB->getAffectedRows()} categories into {$destination['cat']}<br />";
+ $GLOBALS['xoopsDB']->query($sql);
+ echo "Imported {$GLOBALS['xoopsDB']->getAffectedRows()} categories into {$destination['cat']}<br />";
//Import data into downloads table
if (wfdownloads_checkModule('wf' . 'downloads') >= 320) {
@@ -374,8 +373,8 @@
$sql .= " 0, `lid`, `cid`, `title`, `url`, `filename`, `filetype`, `homepage`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `license`, `mirror`, `price`, `paypalemail`, `features`, `requirements`, `homepagetitle`, `forumid`, `limitations`, `dhistory`, `published`, `expired`, `updated`, `offline`, `summary`, `description`, `ipaddress`, `notifypub`";
$sql .= " FROM {$source['downloads']}";
}
- $xoopsDB->query($sql);
- echo "Imported {$xoopsDB->getAffectedRows()} downloads into {$destination['downloads']}<br />";
+ $GLOBALS['xoopsDB']->query($sql);
+ echo "Imported {$GLOBALS['xoopsDB']->getAffectedRows()} downloads into {$destination['downloads']}<br />";
//Import data into mirrors table
$sql = "INSERT INTO {$destination['mirrors']} (";
@@ -383,8 +382,8 @@
$sql .= " ) SELECT";
$sql .= " `lid`, `title`, `homeurl`, `location`, `continent`, `downurl`, `submit`, `date`, `uid`";
$sql .= " FROM {$source['mirrors']}";
- $xoopsDB->query($sql);
- echo "Imported {$xoopsDB->getAffectedRows()} mirrors into {$destination['mirrors']}<br />";
+ $GLOBALS['xoopsDB']->query($sql);
+ echo "Imported {$GLOBALS['xoopsDB']->getAffectedRows()} mirrors into {$destination['mirrors']}<br />";
//Import data into reviews table
if (wfdownloads_checkModule('wf' . 'downloads') >= 320) {
@@ -400,8 +399,8 @@
$sql .= " `lid`, `title`, `review`, `submit`, `date`, `uid`";
$sql .= " FROM {$source['reviews']}";
}
- $xoopsDB->query($sql);
- echo "Imported {$xoopsDB->getAffectedRows()} reviews into {$destination['reviews']}<br />";
+ $GLOBALS['xoopsDB']->query($sql);
+ echo "Imported {$GLOBALS['xoopsDB']->getAffectedRows()} reviews into {$destination['reviews']}<br />";
//Import data into brokens table
$sql = "INSERT INTO {$destination['broken']} (";
@@ -409,8 +408,8 @@
$sql .= " ) SELECT";
$sql .= " `lid`, `sender`, `date`, `ip`";
$sql .= " FROM {$source['broken']}";
- $xoopsDB->query($sql);
- echo "Imported {$xoopsDB->getAffectedRows()} broken reports into {$destination['broken']}<br />";
+ $GLOBALS['xoopsDB']->query($sql);
+ echo "Imported {$GLOBALS['xoopsDB']->getAffectedRows()} broken reports into {$destination['broken']}<br />";
//Import data into votedata table
$sql = "INSERT INTO {$destination['votes']} (";
@@ -418,8 +417,8 @@
$sql .= " ) SELECT";
$sql .= " `lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`";
$sql .= " FROM {$source['votes']}";
- $xoopsDB->query($sql);
- echo "Imported {$xoopsDB->getAffectedRows()} votes into {$destination['votes']}<br />";
+ $GLOBALS['xoopsDB']->query($sql);
+ echo "Imported {$GLOBALS['xoopsDB']->getAffectedRows()} votes into {$destination['votes']}<br />";
//Import data into mod request table
$sql = "INSERT INTO {$destination['mod']} (";
@@ -427,51 +426,51 @@
$sql .= " SELECT";
$sql .= " `lid`, `cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `screenshot`, `description`, `modifysubmitter`, `features`, `requirements`, `publisher`, `dhistory`, `summary`";
$sql .= " FROM {$source['mod']}";
- $xoopsDB->query($sql);
- echo "Imported {$xoopsDB->getAffectedRows()} modification requests into {$destination['mod']}<br />";
+ $GLOBALS['xoopsDB']->query($sql);
+ echo "Imported {$GLOBALS['xoopsDB']->getAffectedRows()} modification requests into {$destination['mod']}<br />";
// Update category ID to new value
- $xoopsDB->query("UPDATE {$destination['downloads']} d, {$destination['cat']} c SET d.cid=c.cid WHERE d.old_cid=c.old_cid AND d.old_cid != 0");
- $xoopsDB->query("UPDATE {$destination['cat']} c1, {$destination['cat']} c2 SET c1.pid=c2.cid WHERE c1.old_pid=c2.old_cid AND c1.old_pid != 0");
+ $GLOBALS['xoopsDB']->query("UPDATE {$destination['downloads']} d, {$destination['cat']} c SET d.cid=c.cid WHERE d.old_cid=c.old_cid AND d.old_cid != 0");
+ $GLOBALS['xoopsDB']->query("UPDATE {$destination['cat']} c1, {$destination['cat']} c2 SET c1.pid=c2.cid WHERE c1.old_pid=c2.old_cid AND c1.old_pid != 0");
// Update lid values in mod table
if ($max_requestid) {
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE {$destination['mod']} m, {$destination['cat']} c SET m.cid=c.cid WHERE m.requestid > {$max_requestid} AND c.old_cid=m.cid"
);
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE {$destination['mod']} m, {$destination['downloads']} d SET m.lid=d.lid WHERE m.requestid > {$max_requestid} AND m.lid=d.old_lid"
);
}
// Update lid values in mirrors table
if ($max_mirrorid) {
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE {$destination['mirrors']} v, {$destination['downloads']} d SET v.lid=d.lid WHERE v.mirror_id > {$max_mirrorid} AND v.lid=d.old_lid"
);
}
// Update lid values in reviews table
if ($max_reviewid) {
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE {$destination['reviews']} v, {$destination['downloads']} d SET v.lid=d.lid WHERE v.review_id > {$max_reviewid} AND v.lid=d.old_lid"
);
}
// Update lid values in votedata table
if ($max_ratingid) {
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE {$destination['votes']} v, {$destination['downloads']} d SET v.lid=d.lid WHERE v.ratingid > {$max_ratingid} AND v.lid=d.old_lid"
);
}
// Update lid values in broken table
if ($max_reportid) {
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE {$destination['broken']} b, {$destination['downloads']} d SET b.lid=d.lid WHERE b.reportid > {$max_reportid} AND b.lid=d.old_lid"
);
}
//Remove temporary fields
- $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " DROP `old_cid`");
- $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " DROP `old_pid`");
- $xoopsDB->query("ALTER TABLE " . $destination['downloads'] . " DROP `old_cid`");
- $xoopsDB->query("ALTER TABLE " . $destination['downloads'] . " DROP `old_lid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['cat'] . " DROP `old_cid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['cat'] . " DROP `old_pid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['downloads'] . " DROP `old_cid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['downloads'] . " DROP `old_lid`");
return null;
}
@@ -481,111 +480,109 @@
// =========================================================================================
function import_wmpdownloads_to_wfdownloads()
{
- global $xoopsDB;
-
echo "<br />";
echo _AM_WFDOWNLOADS_IMPORT_IMPORTINGDATA;
echo "<br />";
$destination = array(
- "cat" => $xoopsDB->prefix("wfdownloads_cat"),
- "downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
- "broken" => $xoopsDB->prefix("wfdownloads_broken"),
- "mod" => $xoopsDB->prefix("wfdownloads_mod"),
- "votes" => $xoopsDB->prefix("wfdownloads_votedata")
+ "cat" => $GLOBALS['xoopsDB']->prefix("wfdownloads_cat"),
+ "downloads" => $GLOBALS['xoopsDB']->prefix("wfdownloads_downloads"),
+ "broken" => $GLOBALS['xoopsDB']->prefix("wfdownloads_broken"),
+ "mod" => $GLOBALS['xoopsDB']->prefix("wfdownloads_mod"),
+ "votes" => $GLOBALS['xoopsDB']->prefix("wfdownloads_votedata")
);
$source = array(
- "cat" => $xoopsDB->prefix("wmpdownloads_cat"),
- "downloads" => $xoopsDB->prefix("wmpdownloads_downloads"),
- "broken" => $xoopsDB->prefix("wmpdownloads_broken"),
- "mod" => $xoopsDB->prefix("wmpdownloads_mod"),
- "votes" => $xoopsDB->prefix("wmpdownloads_votedata"),
- "text" => $xoopsDB->prefix("wmpdownloads_text")
+ "cat" => $GLOBALS['xoopsDB']->prefix("wmpdownloads_cat"),
+ "downloads" => $GLOBALS['xoopsDB']->prefix("wmpdownloads_downloads"),
+ "broken" => $GLOBALS['xoopsDB']->prefix("wmpdownloads_broken"),
+ "mod" => $GLOBALS['xoopsDB']->prefix("wmpdownloads_mod"),
+ "votes" => $GLOBALS['xoopsDB']->prefix("wmpdownloads_votedata"),
+ "text" => $GLOBALS['xoopsDB']->prefix("wmpdownloads_text")
);
//Add temporary field to category table
- $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " ADD `old_cid` int NOT NULL default 0");
- $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " ADD `old_pid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['cat'] . " ADD `old_cid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['cat'] . " ADD `old_pid` int NOT NULL default 0");
//Add temporary fields to downloads table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"ALTER TABLE " . $destination['downloads'] . " ADD `old_lid` int NOT NULL default 0,
ADD `old_cid` int NOT NULL default 0"
);
//Get latest mod request ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(requestid) FROM " . $destination['mod']);
- list($max_requestid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(requestid) FROM " . $destination['mod']);
+ list($max_requestid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest report ID to determine, which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(reportid) FROM " . $destination['broken']);
- list($max_reportid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(reportid) FROM " . $destination['broken']);
+ list($max_reportid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest vote ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(ratingid) FROM " . $destination['votes']);
- list($max_ratingid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(ratingid) FROM " . $destination['votes']);
+ list($max_ratingid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Import data into category table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT"
. " INTO " . $destination['cat']
. " (`old_cid`, `old_pid`, `title`, `imgurl`, `summary`)"
. " SELECT `cid`, `pid`, `title`, `imgurl`, ''"
. " FROM " . $source['cat']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " categories into " . $destination['cat'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " categories into " . $destination['cat'] . "<br />";
//Import data into downloads table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT"
. " INTO " . $destination['downloads']
. " (`cid`, `old_lid`, `old_cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `screenshot`, `submitter`, `status`, `published`, `hits`, `rating`, `votes`, `comments`, `features`, `requirements`, `dhistory`, `summary`, `description`)"
. " SELECT 0,`lid`, `cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `logourl`, `submitter`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, '', '','','', ''"
. " FROM " . $source['downloads']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " downloads into " . $destination['downloads'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " downloads into " . $destination['downloads'] . "<br />";
//Import data into brokens table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT"
. " INTO " . $destination['broken']
. " (`lid`, `sender`, `ip`)"
. " SELECT `lid`, `sender`, `ip`"
. " FROM " . $source['broken']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " broken reports into " . $destination['broken'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " broken reports into " . $destination['broken'] . "<br />";
//Import data into votedata table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT"
. " INTO " . $destination['votes']
. " (`lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`)"
. "SELECT `lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`"
. " FROM " . $source['votes']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " votes into " . $destination['votes'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " votes into " . $destination['votes'] . "<br />";
//Import data into mod request table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['mod']
. " (`lid`, `cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `screenshot`, `description`, `modifysubmitter`,`features`, `requirements`, `publisher`, `dhistory`, `summary`)"
. " SELECT `lid`, `cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `logourl`, `description`, `modifysubmitter`,'','','','',''"
. " FROM " . $source['mod']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
//Update category ID to new value
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['downloads'] . " d, " . $destination['cat'] . " c SET d.cid=c.cid"
. " WHERE d.old_cid=c.old_cid AND d.old_cid != 0"
);
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['cat'] . " c1, " . $destination['cat'] . " c2 SET c1.pid=c2.cid"
. " WHERE c1.old_pid=c2.old_cid AND c1.old_pid != 0"
);
if ($max_requestid) {
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['mod'] . " m, " . $destination['cat'] . " c SET m.cid=c.cid"
. " WHERE m.requestid > " . $max_requestid
. " AND c.old_cid=m.cid"
);
//Update lid values in mod table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['mod'] . " m, " . $destination['downloads'] . " d SET m.lid=d.lid"
. " WHERE m.requestid > " . $max_requestid
. " AND m.lid=d.old_lid"
@@ -593,7 +590,7 @@
}
if ($max_ratingid) {
//Update lid values in votedata table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['votes'] . " v, " . $destination['downloads'] . " d SET v.lid=d.lid"
. " WHERE v.ratingid > " . $max_ratingid
. " AND v.lid=d.old_lid"
@@ -601,21 +598,21 @@
}
if ($max_reportid) {
//Update lid values in brokens table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['broken'] . " b, " . $destination['downloads'] . " d SET b.lid=d.lid"
. " WHERE b.reportid > " . $max_reportid
. " AND b.lid=d.old_lid"
);
}
//Update description
- $xoopsDB->query("UPDATE " . $destination['downloads'] . " d, " . $source['text'] . " t SET d.description=t.description"
+ $GLOBALS['xoopsDB']->query("UPDATE " . $destination['downloads'] . " d, " . $source['text'] . " t SET d.description=t.description"
. " WHERE t.lid=d.old_lid");
//Remove temporary fields
- $xoopsDB->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_cid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_pid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_cid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_lid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_cid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_pid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_cid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_lid`");
}
@@ -624,106 +621,104 @@
// =========================================================================================
function import_pddownloads_to_wfdownloads()
{
- global $xoopsDB;
-
echo "<br />";
echo _AM_WFDOWNLOADS_IMPORT_IMPORTINGDATA;
echo "<br />";
$destination = array(
- "cat" => $xoopsDB->prefix("wfdownloads_cat"),
- "downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
- "broken" => $xoopsDB->prefix("wfdownloads_broken"),
- "mod" => $xoopsDB->prefix("wfdownloads_mod"),
- "votes" => $xoopsDB->prefix("wfdownloads_votedata")
+ "cat" => $GLOBALS['xoopsDB']->prefix("wfdownloads_cat"),
+ "downloads" => $GLOBALS['xoopsDB']->prefix("wfdownloads_downloads"),
+ "broken" => $GLOBALS['xoopsDB']->prefix("wfdownloads_broken"),
+ "mod" => $GLOBALS['xoopsDB']->prefix("wfdownloads_mod"),
+ "votes" => $GLOBALS['xoopsDB']->prefix("wfdownloads_votedata")
);
$source = array(
- "cat" => $xoopsDB->prefix("PDdownloads_cat"),
- "downloads" => $xoopsDB->prefix("PDdownloads_downloads"),
- "broken" => $xoopsDB->prefix("PDdownloads_broken"),
- "mod" => $xoopsDB->prefix("PDdownloads_mod"),
- "votes" => $xoopsDB->prefix("PDdownloads_votedata")
+ "cat" => $GLOBALS['xoopsDB']->prefix("PDdownloads_cat"),
+ "downloads" => $GLOBALS['xoopsDB']->prefix("PDdownloads_downloads"),
+ "broken" => $GLOBALS['xoopsDB']->prefix("PDdownloads_broken"),
+ "mod" => $GLOBALS['xoopsDB']->prefix("PDdownloads_mod"),
+ "votes" => $GLOBALS['xoopsDB']->prefix("PDdownloads_votedata")
);
//Add temporary field to category table
- $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " ADD `old_cid` int NOT NULL default 0");
- $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " ADD `old_pid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['cat'] . " ADD `old_cid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['cat'] . " ADD `old_pid` int NOT NULL default 0");
//Add temporary fields to downloads table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"ALTER TABLE " . $destination['downloads'] . " ADD `old_lid` int NOT NULL default 0,
ADD `old_cid` int NOT NULL default 0"
);
//Get latest mod request ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(requestid) FROM " . $destination['mod']);
- list($max_requestid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(requestid) FROM " . $destination['mod']);
+ list($max_requestid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest report ID to determine, which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(reportid) FROM " . $destination['broken']);
- list($max_reportid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(reportid) FROM " . $destination['broken']);
+ list($max_reportid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest vote ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(ratingid) FROM " . $destination['votes']);
- list($max_ratingid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(ratingid) FROM " . $destination['votes']);
+ list($max_ratingid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Import data into category table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['cat']
. " (`old_cid`, `old_pid`, `title`, `imgurl`, `description`, `total`, `weight`)"
. " SELECT `cid`, `pid`, `title`, `imgurl`, `description`, `total`, `weight`"
. " FROM " . $source['cat']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " categories into " . $destination['cat'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " categories into " . $destination['cat'] . "<br />";
//Import data into downloads table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['downloads']
. " (`cid`, `old_lid`, `old_cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `ipaddress`, `notifypub`)"
. " SELECT 0,`lid`, `cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `ipaddress`, `notifypub`"
. " FROM " . $source['downloads']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " downloads into " . $destination['downloads'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " downloads into " . $destination['downloads'] . "<br />";
//Import data into brokens table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['broken']
. " (`reportid`, `lid`, `sender`, `ip`, `date`, `confirmed`, `acknowledged`)"
. " SELECT `reportid`, `lid`, `sender`, `ip`, `date`, `confirmed`, `acknowledged`"
. " FROM " . $source['broken']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " broken reports into " . $destination['broken'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " broken reports into " . $destination['broken'] . "<br />";
//Import data into votedata table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['votes']
. " (`ratingid`, `lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`)"
. " SELECT `ratingid`, `lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`"
. " FROM " . $source['votes']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " votes into " . $destination['votes'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " votes into " . $destination['votes'] . "<br />";
//Import data into mod request table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['mod']
. " (`lid`, `cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `modifysubmitter`, `requestdate`)"
. " SELECT `lid`, `cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `modifysubmitter`, `requestdate`"
. " FROM " . $source['mod']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
//Update category ID to new value
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['downloads'] . " d, " . $destination['cat'] . " c SET d.cid=c.cid"
. " WHERE d.old_cid=c.old_cid AND d.old_cid != 0"
);
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['cat'] . " c1, " . $destination['cat'] . " c2 SET c1.pid=c2.cid"
. " WHERE c1.old_pid=c2.old_cid AND c1.old_pid != 0"
);
if ($max_requestid) {
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['mod'] . " m, " . $destination['cat'] . " c SET m.cid=c.cid"
. " WHERE m.requestid > " . $max_requestid
. " AND c.old_cid=m.cid"
);
//Update lid values in mod table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['mod'] . " m, " . $destination['downloads'] . " d SET m.lid=d.lid"
. " WHERE m.requestid > " . $max_requestid
. " AND m.lid=d.old_lid"
@@ -731,7 +726,7 @@
}
if ($max_ratingid) {
//Update lid values in votedata table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['votes'] . " v, " . $destination['downloads'] . " d SET v.lid=d.lid"
. " WHERE v.ratingid > " . $max_ratingid
. " AND v.lid=d.old_lid"
@@ -739,7 +734,7 @@
}
if ($max_reportid) {
//Update lid values in brokens table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['broken'] . " b, " . $destination['downloads'] . " d SET b.lid=d.lid"
. " WHERE b.reportid > " . $max_reportid
. " AND b.lid=d.old_lid"
@@ -747,10 +742,10 @@
}
//Remove temporary fields
- $xoopsDB->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_cid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_pid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_cid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_lid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_cid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_pid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_cid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_lid`");
}
@@ -759,107 +754,105 @@
// =========================================================================================
function import_mydownloads_to_wfdownloads()
{
- global $xoopsDB;
-
echo "<br />";
echo _AM_WFDOWNLOADS_IMPORT_IMPORTINGDATA;
echo "<br />";
$destination = array(
- "cat" => $xoopsDB->prefix("wfdownloads_cat"),
- "downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
- "broken" => $xoopsDB->prefix("wfdownloads_broken"),
- "mod" => $xoopsDB->prefix("wfdownloads_mod"),
- "votes" => $xoopsDB->prefix("wfdownloads_votedata")
+ "cat" => $GLOBALS['xoopsDB']->prefix("wfdownloads_cat"),
+ "downloads" => $GLOBALS['xoopsDB']->prefix("wfdownloads_downloads"),
+ "broken" => $GLOBALS['xoopsDB']->prefix("wfdownloads_broken"),
+ "mod" => $GLOBALS['xoopsDB']->prefix("wfdownloads_mod"),
+ "votes" => $GLOBALS['xoopsDB']->prefix("wfdownloads_votedata")
);
$source = array(
- "cat" => $xoopsDB->prefix("mydownloads_cat"),
- "downloads" => $xoopsDB->prefix("mydownloads_downloads"),
- "broken" => $xoopsDB->prefix("mydownloads_broken"),
- "mod" => $xoopsDB->prefix("mydownloads_mod"),
- "votes" => $xoopsDB->prefix("mydownloads_votedata"),
- "text" => $xoopsDB->prefix("mydownloads_text")
+ "cat" => $GLOBALS['xoopsDB']->prefix("mydownloads_cat"),
+ "downloads" => $GLOBALS['xoopsDB']->prefix("mydownloads_downloads"),
+ "broken" => $GLOBALS['xoopsDB']->prefix("mydownloads_broken"),
+ "mod" => $GLOBALS['xoopsDB']->prefix("mydownloads_mod"),
+ "votes" => $GLOBALS['xoopsDB']->prefix("mydownloads_votedata"),
+ "text" => $GLOBALS['xoopsDB']->prefix("mydownloads_text")
);
//Add temporary field to category table
- $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " ADD `old_cid` int NOT NULL default 0");
- $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " ADD `old_pid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['cat'] . " ADD `old_cid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['cat'] . " ADD `old_pid` int NOT NULL default 0");
//Add temporary fields to downloads table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"ALTER TABLE " . $destination['downloads'] . " ADD `old_lid` int NOT NULL default 0,
ADD `old_cid` int NOT NULL default 0"
);
//Get latest mod request ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(requestid) FROM " . $destination['mod']);
- list($max_requestid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(requestid) FROM " . $destination['mod']);
+ list($max_requestid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest report ID to determine, which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(reportid) FROM " . $destination['broken']);
- list($max_reportid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(reportid) FROM " . $destination['broken']);
+ list($max_reportid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest vote ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(ratingid) FROM " . $destination['votes']);
- list($max_ratingid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(ratingid) FROM " . $destination['votes']);
+ list($max_ratingid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Import data into category table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['cat']
. " (`old_cid`, `old_pid`, `title`, `imgurl`, `summary`)"
. " SELECT `cid`, `pid`, `title`, `imgurl`, ''"
. " FROM " . $source['cat']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " categories into " . $destination['cat'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " categories into " . $destination['cat'] . "<br />";
//Import data into downloads table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['downloads']
. " (`cid`, `old_lid`, `old_cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `screenshot`, `submitter`, `status`, `published`, `hits`, `rating`, `votes`, `comments`, `features`, `requirements`, `dhistory`, `summary`, `description`)"
. " SELECT 0,`lid`, `cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `logourl`, `submitter`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, '', '','','', ''"
. " FROM " . $source['downloads']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " downloads into " . $destination['downloads'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " downloads into " . $destination['downloads'] . "<br />";
//Import data into brokens table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['broken']
. " (`lid`, `sender`, `ip`)"
. " SELECT `lid`, `sender`, `ip`"
. " FROM " . $source['broken']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " broken reports into " . $destination['broken'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " broken reports into " . $destination['broken'] . "<br />";
//Import data into votedata table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['votes']
. " (`lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`)"
. " SELECT `lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`"
. " FROM " . $source['votes']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " votes into " . $destination['votes'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " votes into " . $destination['votes'] . "<br />";
//Import data into mod request table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['mod']
. " (`lid`, `cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `screenshot`, `description`, `modifysubmitter`,`features`, `requirements`, `publisher`, `dhistory`, `summary`)"
. " SELECT `lid`, `cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `logourl`, `description`, `modifysubmitter`,'','','','',''"
. " FROM " . $source['mod']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
//Update category ID to new value
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['downloads'] . " d, " . $destination['cat'] . " c SET d.cid=c.cid"
. " WHERE d.old_cid=c.old_cid AND d.old_cid != 0"
);
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['cat'] . " c1, " . $destination['cat'] . " c2 SET c1.pid=c2.cid"
. " WHERE c1.old_pid=c2.old_cid AND c1.old_pid != 0"
);
if ($max_requestid) {
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['mod'] . " m, " . $destination['cat'] . " c SET m.cid=c.cid"
. " WHERE m.requestid > " . $max_requestid
. " AND c.old_cid=m.cid"
);
//Update lid values in mod table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['mod'] . " m, " . $destination['downloads'] . " d SET m.lid=d.lid"
. " WHERE m.requestid > " . $max_requestid
. " AND m.lid=d.old_lid"
@@ -867,7 +860,7 @@
}
if ($max_ratingid) {
//Update lid values in votedata table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['votes'] . " v, " . $destination['downloads'] . " d SET v.lid=d.lid"
. " WHERE v.ratingid > " . $max_ratingid
. " AND v.lid=d.old_lid"
@@ -875,23 +868,23 @@
}
if ($max_reportid) {
//Update lid values in brokens table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['broken'] . " b, " . $destination['downloads'] . " d SET b.lid=d.lid"
. " WHERE b.reportid > " . $max_reportid
. " AND b.lid=d.old_lid"
);
}
//Update description
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['downloads'] . " d, " . $source['text'] . " t SET d.description=t.description"
. " WHERE t.lid=d.old_lid"
);
//Remove temporary fields
- $xoopsDB->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_cid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_pid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_cid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_lid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_cid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_pid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_cid`");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_lid`");
}
@@ -900,112 +893,110 @@
// =========================================================================================
function import_tdmdownloads_to_wfdownloads()
{
- global $xoopsDB;
-
echo "<br /><span style='font-weight: bold;'>Importing Data</span><br />";
$destination = array(
- "cat" => $xoopsDB->prefix("wfdownloads_cat"),
- "downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
- "broken" => $xoopsDB->prefix("wfdownloads_broken"),
- "mod" => $xoopsDB->prefix("wfdownloads_mod"),
- "votes" => $xoopsDB->prefix("wfdownloads_votedata")
+ "cat" => $GLOBALS['xoopsDB']->prefix("wfdownloads_cat"),
+ "downloads" => $GLOBALS['xoopsDB']->prefix("wfdownloads_downloads"),
+ "broken" => $GLOBALS['xoopsDB']->prefix("wfdownloads_broken"),
+ "mod" => $GLOBALS['xoopsDB']->prefix("wfdownloads_mod"),
+ "votes" => $GLOBALS['xoopsDB']->prefix("wfdownloads_votedata")
);
$source = array(
- "cat" => $xoopsDB->prefix("tdmdownloads_cat"),
- "downloads" => $xoopsDB->prefix("tdmdownloads_downloads"),
- "broken" => $xoopsDB->prefix("tdmdownloads_broken"),
- "mod" => $xoopsDB->prefix("tdmdownloads_mod"),
- "votes" => $xoopsDB->prefix("tdmdownloads_votedata"),
- "field" => $xoopsDB->prefix("tdmdownloads_field"),
- "fielddata" => $xoopsDB->prefix("tdmdownloads_fielddata"),
- "modfielddata" => $xoopsDB->prefix("tdmdownloads_modfielddata"),
- "downlimit" => $xoopsDB->prefix("tdmdownloads_downlimit")
+ "cat" => $GLOBALS['xoopsDB']->prefix("tdmdownloads_cat"),
+ "downloads" => $GLOBALS['xoopsDB']->prefix("tdmdownloads_downloads"),
+ "broken" => $GLOBALS['xoopsDB']->prefix("tdmdownloads_broken"),
+ "mod" => $GLOBALS['xoopsDB']->prefix("tdmdownloads_mod"),
+ "votes" => $GLOBALS['xoopsDB']->prefix("tdmdownloads_votedata"),
+ "field" => $GLOBALS['xoopsDB']->prefix("tdmdownloads_field"),
+ "fielddata" => $GLOBALS['xoopsDB']->prefix("tdmdownloads_fielddata"),
+ "modfielddata" => $GLOBALS['xoopsDB']->prefix("tdmdownloads_modfielddata"),
+ "downlimit" => $GLOBALS['xoopsDB']->prefix("tdmdownloads_downlimit")
);
//Add temporary field to category table
- $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " ADD `old_cid` int NOT NULL default 0");
- $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " ADD `old_pid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['cat'] . " ADD `old_cid` int NOT NULL default 0");
+ $GLOBALS['xoopsDB']->query("ALTER TABLE " . $destination['cat'] . " ADD `old_pid` int NOT NULL default 0");
//Add temporary fields to downloads table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"ALTER TABLE " . $destination['downloads'] . " ADD `old_lid` int NOT NULL default 0,
ADD `old_cid` int NOT NULL default 0"
);
//Get latest mod request ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(requestid) FROM " . $destination['mod']);
- list($max_requestid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(requestid) FROM " . $destination['mod']);
+ list($max_requestid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest report ID to determine, which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(reportid) FROM " . $destination['broken']);
- list($max_reportid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(reportid) FROM " . $destination['broken']);
+ list($max_reportid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Get latest vote ID to determine which records will need an updated lid value afterwards
- $result = $xoopsDB->query("SELECT MAX(ratingid) FROM " . $destination['votes']);
- list($max_ratingid) = $xoopsDB->fetchRow($result);
+ $result = $GLOBALS['xoopsDB']->query("SELECT MAX(ratingid) FROM " . $destination['votes']);
+ list($max_ratingid) = $GLOBALS['xoopsDB']->fetchRow($result);
//Import data into category table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT"
. " INTO " . $destination['cat']
. " (`old_cid`, `old_pid`, `title`, `imgurl`, `description`, `weight`, `dohtml`)"
. " SELECT `cat_cid`, `cat_pid`, `cat_title`, `cat_imgurl`, `cat_description_main`, `cat_weight`, 1"
. " FROM " . $source['cat']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " categories into " . $destination['cat'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " categories into " . $destination['cat'] . "<br />";
//Import data into downloads table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT"
. " INTO " . $destination['downloads']
. " (`cid`, `old_lid`, `old_cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `screenshot`, `submitter`, `status`, `published`, `hits`, `rating`, `votes`, `comments`, `features`, `requirements`, `dhistory`, `summary`, `description`, `dohtml`)"
. " SELECT 0, `lid`, `cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `logourl`, `submitter`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, '', '', '', '', `description`, 1"
. " FROM " . $source['downloads']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " downloads into " . $destination['downloads'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " downloads into " . $destination['downloads'] . "<br />";
//Import data into brokens table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT"
. " INTO " . $destination['broken']
. " (`lid`, `sender`, `ip`)"
. " SELECT `lid`, `sender`, `ip`"
. " FROM " . $source['broken']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " broken reports into " . $destination['broken'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " broken reports into " . $destination['broken'] . "<br />";
//Import data into votedata table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT"
. " INTO " . $destination['votes']
. " (`lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`)"
. " SELECT `lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`"
. " FROM " . $source['votes']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " votes into " . $destination['votes'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " votes into " . $destination['votes'] . "<br />";
/*
//Import data into mod request table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"INSERT INTO " . $destination['mod'] . " (`lid`, `cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `screenshot`, `description`, `modifysubmitter`,`features`, `requirements`, `publisher`, `dhistory`, `summary`)
SELECT `lid`, `cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `logourl`, `description`, `modifysubmitter`,'','','','','' FROM "
. $source['mod']
);
- echo "Imported " . $xoopsDB->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
+ echo "Imported " . $GLOBALS['xoopsDB']->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
*/
//Update category ID to new value
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['downloads'] . " d, " . $destination['cat'] . " c SET d.cid=c.cid"
. " WHERE d.old_cid=c.old_cid AND d.old_cid != 0"
);
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['cat'] . " c1, " . $destination['cat'] . " c2 SET c1.pid=c2.cid"
. " WHERE c1.old_pid=c2.old_cid AND c1.old_pid != 0"
);
/*
if ($max_requestid) {
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['mod'] . " m, " . $destination['cat'] . " c SET m.cid=c.cid"
. " WHERE m.requestid > " . $max_requestid
. " AND c.old_cid=m.cid"
);
//Update lid values in mod table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['mod'] . " m, " . $destination['downloads'] . " d SET m.lid=d.lid"
. " WHERE m.requestid > " . $max_requestid
. " AND m.lid=d.old_lid"
@@ -1014,7 +1005,7 @@
*/
if ($max_ratingid) {
//Update lid values in votedata table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['votes'] . " v, " . $destination['downloads'] . " d SET v.lid=d.lid"
. " WHERE v.ratingid > " . $max_ratingid
. " AND v.lid=d.old_lid"
@@ -1022,7 +1013,7 @@
}
if ($max_reportid) {
//Update lid values in brokens table
- $xoopsDB->query(
+ $GLOBALS['xoopsDB']->query(
"UPDATE " . $destination['broken'] . " b, " . $destination['downloads'] . " d SET b.lid=d.lid"
. " WHERE b.reportid > " . $max_reportid
. " AND b.lid=d.old_lid"
@@ -1030,9 +1021,8 @@
}
//Remove temporary fields
- $xoopsDB->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_cid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_pid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_cid`");
- $xoopsDB...
[truncated message content] |
|
From: <luc...@us...> - 2014-09-18 21:15:46
|
Revision: 12793
http://sourceforge.net/p/xoops/svn/12793
Author: luciorota
Date: 2014-09-18 21:15:31 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
WIN to UNIX file format
use $GLOBALS[...] instead of global $...
improve protocol system (in progress)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/index.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/menu.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_subscrinfo.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/accounts.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/attachment.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/bmh.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/cat.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/task.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/template.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/constants.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/search.inc.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/evennews.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/sendletter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/sql/mysql.sql
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/subscription.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/admin_header.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -31,7 +31,7 @@
include_once dirname(__DIR__) . '/include/common.php';
// Include xoops admin header
-include_once XOOPS_ROOT_PATH . "/include/cp_functions.php";
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
$pathIcon16 = XOOPS_URL . '/' . $xnewsletter->getModule()->getInfo('icons16');
$pathIcon32 = XOOPS_URL . '/' . $xnewsletter->getModule()->getInfo('icons32');
@@ -58,18 +58,18 @@
$myts = MyTextSanitizer::getInstance();
-if ($xoopsUser) {
+if ($GLOBALS['xoopsUser']) {
$moduleperm_handler =& xoops_gethandler('groupperm');
- if (!$moduleperm_handler->checkRight('module_admin', $xnewsletter->getModule()->mid(), $xoopsUser->getGroups())) {
+ if (!$moduleperm_handler->checkRight('module_admin', $xnewsletter->getModule()->mid(), $GLOBALS['xoopsUser']->getGroups())) {
redirect_header(XOOPS_URL, 1, _NOPERM);
exit();
}
} else {
- redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
exit();
}
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH . "/class/template.php");
+ include_once(XOOPS_ROOT_PATH . '/class/template.php');
$xoopsTpl = new XoopsTpl();
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -45,18 +45,18 @@
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
$bmh_email = $bmhObj->getVar('bmh_email');
- $sql = "SELECT subscr_id FROM {$xoopsDB->prefix("xnewsletter_subscr")}";
+ $sql = "SELECT subscr_id FROM {$GLOBALS['xoopsDB']->prefix("xnewsletter_subscr")}";
$sql .= " WHERE (subscr_email='{$bmh_email}')";
$sql .= " LIMIT 1;";
- if ($user = $xoopsDB->query($sql)) {
- $row_user = $xoopsDB->fetchRow($user);
+ if ($user = $GLOBALS['xoopsDB']->query($sql)) {
+ $row_user = $GLOBALS['xoopsDB']->fetchRow($user);
$subscr_id = (int)$row_user[0];
}
if ($subscr_id == 0) {
//set bmh_measure for all entries in bmh with this email
- $sql_upd_measure = "UPDATE {$xoopsDB->prefix('xnewsletter_bmh')} SET `bmh_measure` = '" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "'";
- $sql_upd_measure .= " WHERE ((`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
- $xoopsDB->query($sql_upd_measure);
+ $sql_upd_measure = "UPDATE {$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')} SET `bmh_measure` = '" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "'";
+ $sql_upd_measure .= " WHERE ((`{$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
+ $GLOBALS['xoopsDB']->query($sql_upd_measure);
redirect_header('?op=list', 3, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
}
$subscrObj = $xnewsletter->getHandler('subscr')->get($subscr_id);
@@ -118,18 +118,18 @@
$bmh_email = $bmhObj->getVar("bmh_email");
if ($bmh_measure == _XNEWSLETTER_BMH_MEASURE_VAL_QUIT) {
- $sql = "UPDATE `{$xoopsDB->prefix('xnewsletter_subscr')}` INNER JOIN `{$xoopsDB->prefix('xnewsletter_catsubscr')}` ON `subscr_id` = `catsubscr_subscrid`";
+ $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_subscr')}` INNER JOIN `{$GLOBALS['xoopsDB']->prefix('xnewsletter_catsubscr')}` ON `subscr_id` = `catsubscr_subscrid`";
$sql .= " SET `catsubscr_quited` = " . time();
$sql .= " WHERE (((`subscr_email`)='{$bmh_email}'))";
- if (!$result = $xoopsDB->queryF($sql)) {
+ if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
die ('MySQL-Error: ' . mysql_error());
}
}
//set bmh_measure for all entries in bmh with this email
- $sql_upd = "UPDATE {$xoopsDB->prefix('xnewsletter_bmh')}";
- $sql_upd .= " SET `bmh_measure` = '{$bmh_measure}', `bmh_submitter` = '{$xoopsUser->uid()}', `bmh_created` = '" . time() . "'";
- $sql_upd .= " WHERE ((`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
- if (!$result = $xoopsDB->queryF($sql_upd)) {
+ $sql_upd = "UPDATE {$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')}";
+ $sql_upd .= " SET `bmh_measure` = '{$bmh_measure}', `bmh_submitter` = '{$GLOBALS['xoopsUser']->uid()}', `bmh_created` = '" . time() . "'";
+ $sql_upd .= " WHERE ((`{$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$GLOBALS['xoopsDB']->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
+ if (!$result = $GLOBALS['xoopsDB']->queryF($sql_upd)) {
die ('MySQL-Error: ' . mysql_error());
}
@@ -319,7 +319,7 @@
case 'save_bmh':
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($currentFile, 3, implode(',', $GLOBALS["xoopsSecurity"]->getErrors()));
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -35,7 +35,6 @@
*/
function callbackAction($msgnum, $bounce_type, $email, $subject, $xheader, $remove, $rule_no = false, $rule_cat = false, $totalFetched = 0)
{
- global $xoopsUser;
$xnewsletter = XnewsletterXnewsletter::getInstance();
if ($rule_no != '0000') {
@@ -48,7 +47,7 @@
$bmhObj->setVar('bmh_email', $email);
$bmhObj->setVar('bmh_subject', $subject);
$bmhObj->setVar('bmh_measure', '0');
- $bmhObj->setVar('bmh_submitter', $xoopsUser->uid());
+ $bmhObj->setVar('bmh_submitter', $GLOBALS['xoopsUser']->uid());
$bmhObj->setVar('bmh_created', time());
//
if (!$xnewsletter->getHandler('bmh')->insert($bmhObj)) {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -160,7 +160,7 @@
$catObj->setVar('cat_name', xnewsletterRequest::getString('cat_name', ''));
$catObj->setVar('cat_info', $_REQUEST['cat_info']);
$catObj->setVar('cat_mailinglist', xnewsletterRequest::getInt('cat_mailinglist', 0));
- $catObj->setVar('cat_submitter', $xoopsUser->uid());
+ $catObj->setVar('cat_submitter', $GLOBALS['xoopsUser']->uid());
$catObj->setVar('cat_created', time());
$catObj->setVar('dohtml', isset($_REQUEST['dohtml']));
$catObj->setVar('dosmiley', isset($_REQUEST['dosmiley']));
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -220,17 +220,17 @@
if ($cat_id > 0) {
if ($subscr_id == 0) {
//update sex, firstname, lastname
- $sql = "UPDATE {$xoopsDB->prefix('xnewsletter_import')}";
+ $sql = "UPDATE {$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}";
$sql .= " SET `import_sex`='{$subscr_sex}', `import_firstname`='{$subscr_firstname}', `import_lastname`='{$subscr_lastname}'";
$sql .= " WHERE `import_id`={$import_id}";
- $result = $xoopsDB->queryF($sql);
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
}
}
//update cat_id and import_status
- $sql = "UPDATE {$xoopsDB->prefix('xnewsletter_import')}";
+ $sql = "UPDATE {$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}";
$sql .= " SET `import_cat_id`='{$cat_id}', `import_status`=1";
$sql .= " WHERE `import_id`={$import_id}";
- $result = $xoopsDB->queryF($sql);
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
}
redirect_header("?op=exec_import_final&check_import=1&limitcheck={$limitcheck}", 0, '');
@@ -242,8 +242,8 @@
$indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
//
- $ip = xoops_getenv("REMOTE_ADDR");
- $submitter = $xoopsUser->uid();
+ $ip = xoops_getenv('REMOTE_ADDR');
+ $submitter = $GLOBALS['xoopsUser']->uid();
$importCriteria = new CriteriaCompo();
$importCriteria->add(new Criteria('import_status', true));
@@ -251,11 +251,11 @@
$numrows_act = $xnewsletter->getHandler('import')->getCount($importCriteria);
if ($numrows_act > 0) {
$sql = "SELECT *";
- $sql .= " FROM {$xoopsDB->prefix('xnewsletter_import')}";
+ $sql .= " FROM {$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}";
$sql .= " WHERE ((import_status)=1)";
$sql .= " ORDER BY `import_id` ASC";
$counter = 0;
- if (!$users_import = $xoopsDB->queryF($sql)) {
+ if (!$users_import = $GLOBALS['xoopsDB']->queryF($sql)) {
die ('MySQL-Error: ' . mysql_error());
}
while ($user_import = mysql_fetch_assoc($users_import)) {
@@ -267,18 +267,20 @@
$cat_id = $user_import['import_cat_id'];
$subscr_id = $user_import['import_subscr_id'];
$catsubscr_id = $user_import['import_catsubscr_id'];
- $subscribe = 0;
+ $subscribe = false;
if ($cat_id == 0) {
- createProtocol(str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_SKIP), true, $submitter);
+// IN PROGRESS
+ $status = str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_SKIP);
+ $xnewsletter->getHandler('protocol')->protocol(0, 0, $status, _XNEWSLETTER_PROTOCOL_STATUS_SKIP_IMPORT, array('%subscr_email' => $subscr_email), true);
} else {
//register email
if ($subscr_id == 0) {
$subscr_uid = 0;
- $sql = "SELECT `uid`";
- $sql .= " FROM {$xoopsDB->prefix('users')}";
+ $sql = "SELECT `uid`";
+ $sql .= " FROM {$GLOBALS['xoopsDB']->prefix('users')}";
$sql .= " WHERE (`email`='{$subscr_email}') LIMIT 1";
- if ($user = $xoopsDB->queryF($sql)) {
+ if ($user = $GLOBALS['xoopsDB']->queryF($sql)) {
$row_user = mysql_fetch_array($user);
$subscr_uid = $row_user[0];
}
@@ -286,37 +288,41 @@
unset($user);
$sql = "INSERT";
- $sql .= " INTO `{$xoopsDB->prefix('xnewsletter_subscr')}`";
+ $sql .= " INTO `{$GLOBALS['xoopsDB']->prefix('xnewsletter_subscr')}`";
$sql .= " (`subscr_email`, `subscr_firstname`, `subscr_lastname`, `subscr_uid`, `subscr_sex`, `subscr_submitter`, `subscr_created`, `subscr_ip`, `subscr_activated`, `subscr_actoptions`)";
- $sql .= " VALUES ('{$subscr_email}', '{$subscr_firstname}', '{$subscr_lastname}', " . intval($subscr_uid) . ", '{$subscr_sex}', {$submitter}, " . time() . ",'{$ip}', 1, '')";
- if (!$xoopsDB->queryF($sql)) {
- createProtocol(str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), false, $submitter);
+ $sql .= " VALUES ('{$subscr_email}', '{$subscr_firstname}', '{$subscr_lastname}', " . (int) $subscr_uid . ", '{$subscr_sex}', {$submitter}, " . time() . ",'{$ip}', 1, '')";
+ if (!$GLOBALS['xoopsDB']->queryF($sql)) {
+// IN PROGRESS
+ $status = str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED);
+ $xnewsletter->getHandler('protocol')->protocol(0, 0, $status, _XNEWSLETTER_PROTOCOL_STATUS_ERROR_IMPORT, array('%subscr_email' => $subscr_email), false);
} else {
//register email successful
$resulttext = $subscr_email . ': ' . _AM_XNEWSLETTER_IMPORT_RESULT_REG_OK . ' | ';
- $subscr_id = $xoopsDB->getInsertId();
- $subscribe = 1;
+ $subscr_id = $GLOBALS['xoopsDB']->getInsertId();
+ $subscribe = true;
}
} else {
//email already registered
$resulttext = $subscr_email . ': ' . _AM_XNEWSLETTER_IMPORT_EMAIL_EXIST . ' | ';
- $subscribe = 1;
+ $subscribe = true;
}
- if ($subscribe == 1) {
+ if ($subscribe) {
if ($catsubscr_id == 0) {
//add subscription of this email
$sql = "INSERT";
- $sql .= " INTO `{$xoopsDB->prefix('xnewsletter_catsubscr')}`";
+ $sql .= " INTO `{$GLOBALS['xoopsDB']->prefix('xnewsletter_catsubscr')}`";
$sql .= " (`catsubscr_catid`, `catsubscr_subscrid`, `catsubscr_submitter`, `catsubscr_created`)";
$sql .= " VALUES ({$cat_id}, {$subscr_id}, {$submitter}," . time() . ")";
- if ($xoopsDB->queryF($sql)) {
- createProtocol($resulttext . _AM_XNEWSLETTER_IMPORT_RESULT_SUBSCR_OK, true, $submitter);
+ if ($GLOBALS['xoopsDB']->queryF($sql)) {
+// IN PROGRESS
+ $status = $resulttext . _AM_XNEWSLETTER_IMPORT_RESULT_SUBSCR_OK;
+ $xnewsletter->getHandler('protocol')->protocol(0, 0, $status, _XNEWSLETTER_PROTOCOL_STATUS_OK_IMPORT, array('%result_text' => $resulttext), true);
//handle mailinglists
$cat_mailinglist = 0;
- $sql = "SELECT `cat_mailinglist`";
- $sql .= " FROM {$xoopsDB->prefix("xnewsletter_cat")}";
+ $sql = "SELECT `cat_mailinglist`";
+ $sql .= " FROM {$GLOBALS['xoopsDB']->prefix("xnewsletter_cat")}";
$sql .= " WHERE (`cat_id`={$cat_id}) LIMIT 1";
- if ($cat_mls = $xoopsDB->queryF($sql)) {
+ if ($cat_mls = $GLOBALS['xoopsDB']->queryF($sql)) {
$cat_ml = mysql_fetch_array($cat_mls);
$cat_mailinglist = $cat_ml[0];
}
@@ -328,17 +334,23 @@
subscribingMLHandler(1, $subscr_id, $cat_mailinglist);
}
} else {
- createProtocol(str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), false, $submitter);
+// IN PROGRESS
+ $status = str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED);
+ $xnewsletter->getHandler('protocol')->protocol(0, 0, $status, _XNEWSLETTER_PROTOCOL_STATUS_ERROR_IMPORT, array('%subscr_email' => $subscr_email), false);
+
}
} else {
- createProtocol($resulttext . _AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST, true, $submitter);
+// IN PROGRESS
+ $status = $resulttext . _AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST;
+ $xnewsletter->getHandler('protocol')->protocol(0, 0, $status, _XNEWSLETTER_PROTOCOL_STATUS_EXIST_IMPORT, array('%result_text' => $resulttext), false);
+
}
}
}
$sql_del = "DELETE";
- $sql_del .= " FROM {$xoopsDB->prefix('xnewsletter_import')}";
+ $sql_del .= " FROM {$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}";
$sql_del .= " WHERE `import_id`={$import_id}";
- $result = $xoopsDB->queryF($sql_del);
+ $result = $GLOBALS['xoopsDB']->queryF($sql_del);
}
echo "<div style='margin-top:20px;margin-bottom:20px;color:#ff0000;font-weight:bold;font-size:14px'>";
@@ -357,8 +369,8 @@
$form_continue .= '<input id="op" type="hidden" value="show_formcheck" name="op">';
} else {
// set import_status = 1 for next package
- $sql_update = "UPDATE " . $xoopsDB->prefix("xnewsletter_import") . " SET `import_status`=1 ORDER BY import_id LIMIT " . $limitcheck;
- $xoopsDB->queryF($sql_update);
+ $sql_update = "UPDATE " . $GLOBALS['xoopsDB']->prefix("xnewsletter_import") . " SET `import_status`=1 ORDER BY import_id LIMIT " . $limitcheck;
+ $GLOBALS['xoopsDB']->queryF($sql_update);
//execute import for the next package
$form_continue .= '<input id="op" type="hidden" value="exec_import_final" name="op">';
}
@@ -394,8 +406,8 @@
}
//delete all existing data
- $sql = "TRUNCATE TABLE " . $xoopsDB->prefix('xnewsletter_import');
- $result = $xoopsDB->queryF($sql);
+ $sql = "TRUNCATE TABLE " . $GLOBALS['xoopsDB']->prefix('xnewsletter_import');
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
//import data into xnewsletter_import with plugin
if ($plugin == 'csv') {
@@ -459,19 +471,3 @@
break;
}
include_once __DIR__ . '/admin_footer.php';
-
-/**
- * @param $prot_text
- * @param $success
- * @param $submitter
- */
-function createProtocol($prot_text, $success, $submitter)
-{
- global $xoopsDB;
- $sql = "INSERT INTO `{$xoopsDB->prefix('xnewsletter_protocol')}`";
- $sql .= " (`protocol_letter_id`, `protocol_subscriber_id`, `protocol_status`, `protocol_success`, `protocol_submitter`, `protocol_created`)";
- $sql .= " VALUES (0,0,'{$prot_text}', {$success}, {$submitter}, " . time() . ")";
- if (!$xoopsDB->queryF($sql)) {
- die ('MySQL-Error: ' . mysql_error());
- }
-}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/index.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/index.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/index.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -31,7 +31,7 @@
include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
-// count "total"
+// count 'total'
$catCount = $xnewsletter->getHandler('cat')->getCount();
$accountsCount = $xnewsletter->getHandler('accounts')->getCount();
$subscrCount = $xnewsletter->getHandler('subscr')->getCount();
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -38,8 +38,6 @@
switch ($op) {
case 'show_preview':
case 'show_letter_preview':
- global $XoopsTpl;
-
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_LETTERLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
@@ -225,9 +223,11 @@
$protocolCriteria->setOrder('DESC');
$protocolCriteria->setLimit(1);
$protocolObjs = $xnewsletter->getHandler('protocol')->getAll($protocolCriteria);
+// IN PROGRESS
$protocol_status = '';
$protocol_letter_id = 0;
foreach ($protocolObjs as $protocolObj) {
+// IN PROGRESS
$protocol_status .= $protocolObj->getVar('protocol_status');
$protocol_letter_id = $protocolObj->getVar('protocol_letter_id');
}
@@ -382,7 +382,7 @@
$attachmentObj->setVar('attachment_letter_id', $letter_id);
$attachmentObj->setVar('attachment_name', $file['name']);
$attachmentObj->setVar('attachment_type', $file['type']);
- $attachmentObj->setVar('attachment_submitter', $xoopsUser->uid());
+ $attachmentObj->setVar('attachment_submitter', $GLOBALS['xoopsUser']->uid());
$attachmentObj->setVar('attachment_created', time());
$attachmentObj->setVar('attachment_size', $file['size']);
$attachmentObj->setVar('attachment_mode', $file['mode']);
@@ -412,7 +412,7 @@
$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_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
//
if ($xnewsletter->getHandler('protocol')->insert($protocolObj)) {
@@ -450,9 +450,9 @@
if ($xnewsletter->getHandler('letter')->delete($letterObj)) {
//delete protocols
$sql = "DELETE";
- $sql .= " FROM `{$xoopsDB->prefix('xnewsletter_protocol')}`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}`";
$sql .= " WHERE `protocol_letter_id`={$letter_id}";
- if (!$result = $xoopsDB->query($sql)) {
+ if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
die('MySQL-Error: ' . mysql_error());
}
// delete attachments
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -150,15 +150,17 @@
case 'del_import':
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
- $result = $xoopsDB->queryF("TRUNCATE TABLE `{$xoopsDB->prefix('xnewsletter_import')}`");
- $result = $xoopsDB->queryF("REPAIR TABLE `{$xoopsDB->prefix('xnewsletter_import')}`");
- $result = $xoopsDB->queryF("OPTIMIZE TABLE `{$xoopsDB->prefix('xnewsletter_import')}`");
- $result = $xoopsDB->queryF("ALTER TABLE `{$xoopsDB->prefix('xnewsletter_import')}` AUTO_INCREMENT =1");
+ $result = $GLOBALS['xoopsDB']->queryF("TRUNCATE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("REPAIR TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("OPTIMIZE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("ALTER TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}` AUTO_INCREMENT =1");
//
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' import] ' . _AM_XNEWSLETTER_MAINTENANCE_DELETE_IMPORT_OK);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' import] ' . _AM_XNEWSLETTER_MAINTENANCE_DELETE_IMPORT_OK;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -190,15 +192,15 @@
foreach ($subscrArrays as $subscrArray) {
$subscrObj = $xnewsletter->getHandler('subscr')->get((int)$subscrArray['subscr_id']);
$sql = "DELETE";
- $sql .= " FROM `{$xoopsDB->prefix('xnewsletter_subscr')}`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix('xnewsletter_subscr')}`";
$sql .= " WHERE subscr_id={$subscrArray['subscr_id']}";
- $result = $xoopsDB->queryF($sql);
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
if ($result) {
// Newsletterlist delete
$sql = "DELETE";
- $sql .= " FROM `{$xoopsDB->prefix('xnewsletter_catsubscr')}`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix('xnewsletter_catsubscr')}`";
$sql .= " WHERE catsubscr_subscrid={$subscrArray['subscr_id']}";
- $result = $xoopsDB->queryF($sql);
+ $result = $GLOBALS['xoopsDB']->queryF($sql);
if (!$result) {
$errors[] = 'Error CAT-Subscr-ID: ' . $subscrArray['subscr_id'] . ' / ' . $result->getHtmlErrors();
}
@@ -213,7 +215,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' reguser] ' . $error);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' reguser] ' . $error;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', false);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -225,7 +229,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' reguser] ' . sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETEUSEROK, $deleted));
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' reguser] ' . sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETEUSEROK, $deleted);
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -247,15 +253,17 @@
case 'del_oldprotocol':
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
- $result = $xoopsDB->queryF("TRUNCATE TABLE `{$xoopsDB->prefix('xnewsletter_protocol')}`");
- $result = $xoopsDB->queryF("REPAIR TABLE `{$xoopsDB->prefix('xnewsletter_protocol')}`");
- $result = $xoopsDB->queryF("OPTIMIZE TABLE `{$xoopsDB->prefix('xnewsletter_protocol')}`");
- $result = $xoopsDB->queryF("ALTER TABLE `{$xoopsDB->prefix('xnewsletter_protocol')}` AUTO_INCREMENT =1");
+ $result = $GLOBALS['xoopsDB']->queryF("TRUNCATE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("REPAIR TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("OPTIMIZE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}`");
+ $result = $GLOBALS['xoopsDB']->queryF("ALTER TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}` AUTO_INCREMENT =1");
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' prot] ' . _AM_XNEWSLETTER_MAINTENANCE_DELETEPROTOK);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' prot] ' . _AM_XNEWSLETTER_MAINTENANCE_DELETEPROTOK;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -276,18 +284,18 @@
$deleted = 0;
$errors = array();
$sql = "SELECT Count(`catsubscr_id`) AS `nb_ids`";
- $sql .= " FROM `{$xoopsDB->prefix("xnewsletter_catsubscr")}` LEFT JOIN `{$xoopsDB->prefix("xnewsletter_subscr")}` ON `catsubscr_subscrid` = `subscr_id`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix("xnewsletter_catsubscr")}` LEFT JOIN `{$GLOBALS['xoopsDB']->prefix("xnewsletter_subscr")}` ON `catsubscr_subscrid` = `subscr_id`";
$sql .= " WHERE (`subscr_id` Is Null)";
- if ($result = $xoopsDB->query($sql)) {
- $row_result = $xoopsDB->fetchRow($result);
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
+ $row_result = $GLOBALS['xoopsDB']->fetchRow($result);
$number_ids = $row_result[0];
}
if ($number_ids > 0) {
- $sql = "DELETE `{$xoopsDB->prefix("xnewsletter_catsubscr")}`";
- $sql .= " FROM `{$xoopsDB->prefix("xnewsletter_catsubscr")}` LEFT JOIN `{$xoopsDB->prefix("xnewsletter_subscr")}` ON `catsubscr_subscrid` = `subscr_id`";
+ $sql = "DELETE `{$GLOBALS['xoopsDB']->prefix("xnewsletter_catsubscr")}`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix("xnewsletter_catsubscr")}` LEFT JOIN `{$GLOBALS['xoopsDB']->prefix("xnewsletter_subscr")}` ON `catsubscr_subscrid` = `subscr_id`";
$sql .= " WHERE (`subscr_id` Is Null)";
- $result = $xoopsDB->query($sql);
- if ($result = $xoopsDB->query($sql)) {
+ $result = $GLOBALS['xoopsDB']->query($sql);
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
++$deleted;
} else {
$errors[] = 'Error delete catsubscr: ' . $result->getHtmlErrors();
@@ -299,7 +307,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' catsubscr] ' . $error);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' catsubscr] ' . $error;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', false);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -311,8 +321,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $status = $number_ids == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_SUBCR_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_SUBCR_OK, $number_ids);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' catsubscr] ' . $status);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' catsubscr] ' . $number_ids == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_SUBCR_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_SUBCR_OK, $number_ids);
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -336,15 +347,15 @@
if ($use_mailinglist == 0 || $use_mailinglist == '0') {
//set cat_mailinglist = 0, if use mailinglist = false (if someone changed module preferences later)
$sql = "SELECT Count(`cat_id`) AS `nb_ids`";
- $sql .= " FROM `{$xoopsDB->prefix("xnewsletter_cat")}`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix("xnewsletter_cat")}`";
$sql .= " WHERE (`cat_mailinglist` > 0)";
- if ($result = $xoopsDB->query($sql)) {
- $row_result = $xoopsDB->fetchRow($result);
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
+ $row_result = $GLOBALS['xoopsDB']->fetchRow($result);
$number_ids = $row_result[0];
}
if ($number_ids > 0) {
- $sql = "UPDATE `{$xoopsDB->prefix("xnewsletter_cat")}` SET `cat_mailinglist` = 0";
- if ($result = $xoopsDB->query($sql)) {
+ $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix("xnewsletter_cat")}` SET `cat_mailinglist` = 0";
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
++$update;
} else {
$errors[] = "Error update cat_mailinglist: " . $result->getHtmlErrors();
@@ -353,16 +364,16 @@
} else {
//set cat_mailinglist = 0, if mailinglist_id is no more existing in table mailinglist
$sql = "SELECT Count(`cat_mailinglist`) AS `nb_ids`";
- $sql .= " FROM `{$xoopsDB->prefix("xnewsletter_cat")}` LEFT JOIN `{$xoopsDB->prefix("xnewsletter_mailinglist")}` ON `cat_mailinglist` = `mailinglist_id`";
+ $sql .= " FROM `{$GLOBALS['xoopsDB']->prefix("xnewsletter_cat")}` LEFT JOIN `{$GLOBALS['xoopsDB']->prefix("xnewsletter_mailinglist")}` ON `cat_mailinglist` = `mailinglist_id`";
$sql .= " WHERE (((`mailinglist_id`) Is Null) AND ((`cat_mailinglist`)>0)) HAVING (((Count(`cat_mailinglist`))>0));";
- if ($result = $xoopsDB->query($sql)) {
- $row_result = $xoopsDB->fetchRow($result);
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
+ $row_result = $GLOBALS['xoopsDB']->fetchRow($result);
$number_ids = $row_result[0];
}
if ($number_ids > 0) {
- $sql = "UPDATE `{$xoopsDB->prefix("xnewsletter_cat")}` LEFT JOIN `{$xoopsDB->prefix("xnewsletter_mailinglist")}` ON `cat_mailinglist` = `mailinglist_id` SET `cat_mailinglist` = 0";
+ $sql = "UPDATE `{$GLOBALS['xoopsDB']->prefix("xnewsletter_cat")}` LEFT JOIN `{$GLOBALS['xoopsDB']->prefix("xnewsletter_mailinglist")}` ON `cat_mailinglist` = `mailinglist_id` SET `cat_mailinglist` = 0";
$sql .= " WHERE (((`cat_mailinglist`)>0) AND ((`mailinglist_id`) Is Null));";
- if ($result = $xoopsDB->query($sql)) {
+ if ($result = $GLOBALS['xoopsDB']->query($sql)) {
++$update;
} else {
$errors[] = "Error update cat_mailinglist: " . $result->getHtmlErrors();
@@ -375,7 +386,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' ml] ' . $error);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' ml] ' . $error;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', false);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -387,8 +400,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $status = $number_ids == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_OK, $number_ids);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' ml] ' . $status);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' ml] ' . $number_ids == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_ML_OK, $number_ids);
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -446,7 +460,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' cat] ' . $error);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' cat] ' . $error;
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', false);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
@@ -458,8 +474,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', 0);
$protocolObj->setVar('protocol_subscriber_id', 0);
- $status = $update == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_CATNL_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_CATNL_OK, $update);
- $protocolObj->setVar('protocol_status', '[' . _MI_XNEWSLETTER_ADMENU11 . ' cat] ' . $status);
+// IN PROGRESS
+ $status = '[' . _MI_XNEWSLETTER_ADMENU11 . ' cat] ' . $update == 0 ? _AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_CATNL_NODATA : sprintf(_AM_XNEWSLETTER_MAINTENANCE_DELETE_INVALID_CATNL_OK, $update);
+ $protocolObj->setVar('protocol_status', $status);
$protocolObj->setVar('protocol_success', true);
$protocolObj->setVar('protocol_submitter', $GLOBALS['xoopsUser']->uid());
$protocolObj->setVar('protocol_created', time());
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/menu.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/menu.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/menu.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -33,67 +33,67 @@
$adminmenu = array();
$i = 1;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU1;
-$adminmenu[$i]["link"] = "admin/index.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/home.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU1;
+$adminmenu[$i]['link'] = 'admin/index.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/home.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU3;
-$adminmenu[$i]["link"] = "admin/cat.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_category.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU3;
+$adminmenu[$i]['link'] = 'admin/cat.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_category.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU4;
-$adminmenu[$i]["link"] = "admin/subscr.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_subscribers.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU4;
+$adminmenu[$i]['link'] = 'admin/subscr.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_subscribers.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU5;
-$adminmenu[$i]["link"] = "admin/catsubscr.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_category_subscr.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU5;
+$adminmenu[$i]['link'] = 'admin/catsubscr.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_category_subscr.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU6;
-$adminmenu[$i]["link"] = "admin/letter.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_newsletter.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU6;
+$adminmenu[$i]['link'] = 'admin/letter.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_newsletter.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU_TEMPLATES;
-$adminmenu[$i]["link"] = "admin/template.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/tpls.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU_TEMPLATES;
+$adminmenu[$i]['link'] = 'admin/template.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/tpls.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU7;
-$adminmenu[$i]["link"] = "admin/attachment.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_attachment.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU7;
+$adminmenu[$i]['link'] = 'admin/attachment.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_attachment.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU8;
-$adminmenu[$i]["link"] = "admin/protocol.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_protocol.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU8;
+$adminmenu[$i]['link'] = 'admin/protocol.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_protocol.png';
if ($xnewsletter->getConfig('xn_use_mailinglist') == 1) {
++$i;
- $adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU9;
- $adminmenu[$i]["link"] = "admin/mailinglist.php";
- $adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_mailinglist.png";
+ $adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU9;
+ $adminmenu[$i]['link'] = 'admin/mailinglist.php';
+ $adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_mailinglist.png';
}
if ($xnewsletter->getConfig('xn_send_in_packages') > 0) {
++$i;
- $adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU13;
- $adminmenu[$i]["link"] = "admin/task.php";
- $adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_task.png";
+ $adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU13;
+ $adminmenu[$i]['link'] = 'admin/task.php';
+ $adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_task.png';
}
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU10;
-$adminmenu[$i]["link"] = "admin/bmh.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_bmh.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU10;
+$adminmenu[$i]['link'] = 'admin/bmh.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_bmh.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU2;
-$adminmenu[$i]["link"] = "admin/accounts.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_accounts.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU2;
+$adminmenu[$i]['link'] = 'admin/accounts.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_accounts.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU11;
-$adminmenu[$i]["link"] = "admin/maintenance.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_maintenance.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU11;
+$adminmenu[$i]['link'] = 'admin/maintenance.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_maintenance.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU12;
-$adminmenu[$i]["link"] = "admin/import.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/xn_import.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU12;
+$adminmenu[$i]['link'] = 'admin/import.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_import.png';
++$i;
-$adminmenu[$i]["title"] = _MI_XNEWSLETTER_ADMENU99;
-$adminmenu[$i]["link"] = "admin/about.php";
-$adminmenu[$i]["icon"] = $pathImageAdmin . "/about.png";
+$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU99;
+$adminmenu[$i]['link'] = 'admin/about.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/about.png';
unset($i);
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -84,6 +84,7 @@
$protocolCount = $xnewsletter->getHandler('protocol')->getCount($protocolCriteria);
$protocolCriteria->setLimit(2);
$protocolObjs = $xnewsletter->getHandler('protocol')->getAll($protocolCriteria);
+// IN PROGRESS
$protocol_status = '';
$protocol_created = '';
$protocol_created_formatted = '';
@@ -91,12 +92,15 @@
foreach ($protocolObjs as $protocol_id => $protocolObj) {
++$p;
if (count($protocolObjs) > 1) {
+// IN PROGRESS
$protocol_status .= "($p) ";
}
+// IN PROGRESS
$protocol_status .= $protocolObj->getVar('protocol_status') . "<br/>";
$protocol_created_formatted .= formatTimeStamp($protocolObj->getVar('protocol_created'), 'M') . "<br/>";
}
if ($protocolCount > 2) {
+// IN PROGRESS
$protocol_status .= "...";
}
echo "
@@ -118,6 +122,7 @@
if ($protocolCount > 0) {
$protocolCriteria->setLimit(2);
$protocolObjs = $xnewsletter->getHandler('protocol')->getAll($protocolCriteria);
+// IN PROGRESS
$protocol_status = '';
$protocol_created = '';
@@ -130,8 +135,10 @@
foreach ($protocolObjs as $protocol) {
++$p;
if (count($protocolObjs) > 1) {
+// IN PROGRESS
$protocol_status .= "($p) ";
}
+// IN PROGRESS
$protocol_status .= $protocol->getVar('protocol_status') . "<br/>";
$protocol_created .= formatTimeStamp($protocol->getVar('protocol_created'), 'M') . "<br/>";
}
@@ -158,7 +165,7 @@
break;
case 'list_letter':
- $letter_id = isset($_REQUEST["letter_id"]) ? $_REQUEST['letter_id'] : '0';
+ $letter_id = isset($_REQUEST['letter_id']) ? $_REQUEST['letter_id'] : '0';
echo $protocolAdmin->addNavigation($currentFile);
$protocolAdmin->addItemButton(_AM_XNEWSLETTER_PROTOCOLLIST, '?op=list', 'list');
//
@@ -187,7 +194,7 @@
// View Table
$letterObj = $xnewsletter->getHandler('letter')->get($letter_id);
- echo "<h2>" . $letterObj->getVar("letter_title") . "</h2>";
+ echo "<h2>" . $letterObj->getVar('letter_title') . "</h2>";
echo "
<table class='outer width100' cellspacing='1'>
<tr>
@@ -207,11 +214,12 @@
echo "<td>" . $protocol_id . "</td>";
$subscrObj = $xnewsletter->getHandler('subscr')->get($protocolObj->getVar('protocol_subscriber_id'));
$subscriber = ($subscrObj) ? $subscrObj->getVar('subscr_email') : _AM_XNEWSLETTER_PROTOCOL_NO_SUBSCREMAIL;
- if ($subscriber == "") {
- $subscriber = "-";
+ if ($subscriber == '') {
+ $subscriber = '-';
}
$success = ($protocolObj->getVar('protocol_success') == true) ? XNEWSLETTER_IMG_OK : XNEWSLETTER_IMG_FAILED;
echo "<td>" . $subscriber . "</td>";
+// IN PROGRESS
echo "<td>" . $protocolObj->getVar('protocol_status') . "</td>";
echo "<td>" . $success . "</td>";
echo "<td>" . XoopsUser::getUnameFromId($protocolObj->getVar('protocol_submitter'), 'S') . "</td>";
@@ -252,6 +260,7 @@
$protocolObj->setVar('protocol_letter_id', $_REQUEST['protocol_letter_id']);
$protocolObj->setVar('protocol_subscriber_id', $_REQUEST['protocol_subscriber_id']);
+// IN PROGRESS
$protocolObj->setVar('protocol_status', $_REQUEST['protocol_status']);
$protocolObj->setVar('protocol_success', $_REQUEST['protocol_success']);
$protocolObj->setVar('protocol_submitter', $_REQUEST['protocol_submitter']);
@@ -272,7 +281,7 @@
$protocolAdmin->addItemButton(_AM_XNEWSLETTER_PROTOCOLLIST, '?op=list', 'list');
echo $protocolAdmin->renderButton();
//
- $protocolObj = $xnewsletter->getHandler('protocol')->get($_REQUEST["protocol_id"]);
+ $protocolObj = $xnewsletter->getHandler('protocol')->get($_REQUEST['protocol_id']);
$form = $protocolObj->getForm();
$form->display();
break;
@@ -298,15 +307,15 @@
break;
case 'delete_protocol_list':
- $letter_id = isset($_REQUEST["letter_id"]) ? $_REQUEST["letter_id"] : 0;
+ $letter_id = isset($_REQUEST['letter_id']) ? $_REQUEST['letter_id'] : 0;
if ($letter_id > 0) {
- $letterObj = $xnewsletter->getHandler('letter')->get($_REQUEST["letter_id"]);
+ $letterObj = $xnewsletter->getHandler('letter')->get($_REQUEST['letter_id']);
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $sql = "DELETE FROM `{$xoopsDB->prefix("xnewsletter_protocol")}` WHERE `protocol_letter_id`={$letter_id}";
- $result = $xoopsDB->query($sql);
+ $sql = "DELETE FROM `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}` WHERE `protocol_letter_id`={$letter_id}";
+ $result = $GLOBALS['xoopsDB']->query($sql);
if ($result) {
redirect_header($currentFile, 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_catsubscr.php 2014-09-18 06:40:13 UTC (rev 12792)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/blocks/blocks_catsubscr.php 2014-09-18 21:15:31 UTC (rev 12793)
@@ -26,7 +26,7 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
-// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__DIR__) . '/include/common.php';
/**
@@ -36,7 +36,6 @@
*/
function b_xnewsletter_catsubscr($options)
{
- global $xoopsUser;
$xnewsletter = XnewsletterXnewsletter::getInstance();
$myts = MyTextSanitizer::getInstance();
@@ -52,39 +51,39 @@
$catsubscrCriteria = new CriteriaCompo();
switch ($type_block) {
// For the block: catsubscr recents
- case "recent":
- $catsubscrCriteria->setSort("catsubscr_created");
- $catsubscrCriteria->setOrder("DESC");
+ case 'recent':
+ $catsubscrCriteria->setSort('catsubscr_created');
+ $catsubscrCriteria->setOrder('DESC');
break;
// For the block: catsubscr of today
- case "day":
- $catsubscrCriteria->add(new Criteria("catsubscr_created", strtotime(date("Y/m/d")), ">="));
- $catsubscrCriteria->add(new Criteria("catsubscr_created", strtotime(date("Y/m/d")) + 86400, "<="));
- $catsubscrCriteria->setSort("catsubscr_created");
- $catsubscrCriteria->setOrder("ASC");
+ case 'day':
+ $catsubscrCriteria->add(new Criteria('catsubscr_created', strtotime(date('Y/m/d')), '>='));
+ $catsubscrCriteria->add(new Criteria('catsubscr_created', strtotime(date('Y/m/d')) + 86400, '<='));
+ $catsubscrCriteria->setSort('catsubscr_created');
+ $catsubscrCriteria->setOrder('ASC');
break;
}
$catsubscrCriteria->setLimit($nb_catsubscr);
$catsubscrObjs = $xnewsletter->getHandler('catsubscr')->getAll($catsubscrCriteria);
foreach ($catsubscrObjs as $catsubscr_id => $catsubscrObj) {
- $cat_id = $catsubscrObj->getVar("catsubscr_catid");
+ $cat_id = $catsubscrObj->getVar('catsubscr_catid');
if (in_array($cat_id, $options) || $options[0] == '0') {
- $subscr_id = $catsubscrObj->getVar("catsubscr_subscrid");
+ $subscr_id = $catsubscrObj->getVar('catsubscr_subscrid');
$subscrObj = $xnewsletter->getHandler('subscr')->get($subscr_id);
- $email = $subscrObj->getVar("subscr_email");
+ $email = $subscrObj->getVar('subscr_email');
if ($length_title > 0 && strlen($email) > $length_title) {
- $email = substr($email, 0, $length_title) . "...";
+ $email = substr($ema...
[truncated message content] |
|
From: <be...@us...> - 2014-09-18 06:40:25
|
Revision: 12792
http://sourceforge.net/p/xoops/svn/12792
Author: beckmi
Date: 2014-09-18 06:40:13 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
fixing a bug (wrong name of Criteria)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-17 20:27:17 UTC (rev 12791)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-18 06:40:13 UTC (rev 12792)
@@ -218,7 +218,7 @@
$limit = $xnewsletter->getConfig('adminperpage');
$bhmCriteria = new CriteriaCompo();
if ($filter > -1) {
- $criteria->add(new Criteria('bmh_measure', $filter));
+ $bhmCriteria->add(new Criteria('bmh_measure', $filter));
}
$bhmCriteria->setSort('bmh_id');
$bhmCriteria->setOrder('DESC');
|
|
From: <luc...@us...> - 2014-09-17 20:27:24
|
Revision: 12791
http://sourceforge.net/p/xoops/svn/12791
Author: luciorota
Date: 2014-09-17 20:27:17 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
Added Paths:
-----------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/
|
|
From: <luc...@us...> - 2014-09-17 20:26:50
|
Revision: 12790
http://sourceforge.net/p/xoops/svn/12790
Author: luciorota
Date: 2014-09-17 20:26:40 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
remove 'cause will branch from mamba work
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/
|
|
From: <luc...@us...> - 2014-09-17 20:13:31
|
Revision: 12789
http://sourceforge.net/p/xoops/svn/12789
Author: luciorota
Date: 2014-09-17 20:13:28 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
this is my latest version, start from here
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php 2014-09-17 13:55:08 UTC (rev 12788)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php 2014-09-17 20:13:28 UTC (rev 12789)
@@ -56,17 +56,17 @@
$categoryObjsTree = new XoopsObjectTree($categoryObjs, 'cid', 'pid');
$sform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_BMODIFY, $categoryObjsTree->makeSelBox('target', 'title')));
$create_tray = new XoopsFormElementTray('', '');
- $create_tray -> addElement(new XoopsFormHidden('source', $cid));
- $create_tray -> addElement(new XoopsFormHidden('ok', true));
- $create_tray -> addElement(new XoopsFormHidden('op', 'category.move'));
+ $create_tray->addElement(new XoopsFormHidden('source', $cid));
+ $create_tray->addElement(new XoopsFormHidden('ok', true));
+ $create_tray->addElement(new XoopsFormHidden('op', 'category.move'));
$butt_save = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BMOVE, 'submit');
- $butt_save -> setExtra('onclick="this.form.elements.op.value=\'category.move\'"');
- $create_tray -> addElement($butt_save);
+ $butt_save->setExtra('onclick="this.form.elements.op.value=\'category.move\'"');
+ $create_tray->addElement($butt_save);
$butt_cancel = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BCANCEL, 'submit');
- $butt_cancel -> setExtra('onclick="this.form.elements.op.value=\'cancel\'"');
+ $butt_cancel->setExtra('onclick="this.form.elements.op.value=\'cancel\'"');
$create_tray -> addElement($butt_cancel);
- $sform -> addElement($create_tray);
- $sform -> display();
+ $sform->addElement($create_tray);
+ $sform->display();
xoops_cp_footer();
} else {
$source = WfdownloadsRequest::getInt('source', 0, 'POST');
@@ -77,7 +77,7 @@
if (!$target) {
redirect_header($currentFile . "?op=category.move&ok=0&cid={$source}", 5, _AM_WFDOWNLOADS_CCATEGORY_MODIFY_FAILEDT);
}
- $result = $wfdownloads->getHandler('download')->updateAll("cid", $target, new Criteria("cid", $source), true);
+ $result = $wfdownloads->getHandler('download')->updateAll('cid', $target, new Criteria('cid', $source), true);
if (!$result) {
$error = _AM_WFDOWNLOADS_DBERROR;
trigger_error($error, E_USER_ERROR);
@@ -91,26 +91,26 @@
case 'addCat':
$cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$pid = WfdownloadsRequest::getInt('pid', 0, 'POST');
- $weight = (isset($_POST['weight']) && $_POST['weight'] > 0) ? (int) $_POST['weight'] : 0;
+ $weight = (isset($_POST['weight']) && $_POST['weight'] > 0) ? (int) $_POST["weight"] : 0;
$down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
$up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
$spotlighthis = (isset($_POST['lid'])) ? (int) $_POST['lid'] : 0;
$spotlighttop = (isset($_POST['spotlighttop']) && ($_POST['spotlighttop'] == 1)) ? 1 : 0;
- $imgurl = 'blank.png';
- include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ include_once XOOPS_ROOT_PATH . '/class/uploader.php';
$allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
+ $imgurl = 'blank.png';
$maxFileSize = $wfdownloads->getConfig('maxfilesize');
$maxImgWidth = $wfdownloads->getConfig('maximgwidth');
$maxImgHeight = $wfdownloads->getConfig('maximgheight');
- $uploadDirectory = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage');
+ $uploadDirectory = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage');
$uploader = new XoopsMediaUploader($uploadDirectory, $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$uploader->setTargetFileName('wfdownloads_' . uniqid(time()) . '--' . strtolower($_FILES['uploadfile']['name']));
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
- redirect_header('javascript:history.go(-1)', 3, $errors);
+ redirect_header('javascript:history.go(-1)',3, $errors);
} else {
$imgurl = $uploader->getSavedFileName();
}
@@ -152,15 +152,17 @@
echo $categoryObj->getHtmlErrors();
}
if (!$cid) {
- $newid = (int) $categoryObj->getVar('cid');
+ if ($cid == 0) {
+ $newid = (int) $categoryObj->getVar('cid');
+ }
wfdownloads_savePermissions($down_groups, $newid, 'WFDownCatPerm');
wfdownloads_savePermissions($up_groups, $newid, 'WFUpCatPerm');
// Notify of new category
$tags = array();
$tags['CATEGORY_NAME'] = $_POST['title'];
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $newid;
- $notification_handler = & xoops_gethandler('notification');
- $notification_handler -> triggerEvent('global', 0, 'new_category', $tags);
+ $notification_handler = xoops_gethandler('notification');
+ $notification_handler->triggerEvent('global', 0, 'new_category', $tags);
$database_mess = _AM_WFDOWNLOADS_CCATEGORY_CREATED;
} else {
$database_mess = _AM_WFDOWNLOADS_CCATEGORY_MODIFIED;
@@ -179,7 +181,6 @@
if ($ok == true) {
// get all subcategories under the specified category
$childCategoryObjs = $categoryObjsTree->getAllChild($cid);
- $cids = array();
foreach ($childCategoryObjs as $childCategoryObj) {
// get all category ids
$cids[] = $childCategoryObj->getVar('cid');
@@ -238,7 +239,7 @@
$form = $categoryObj->getForm();
$form -> display();
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
break;
case 'categories.list':
@@ -261,7 +262,7 @@
} else {
redirect_header("{$currentFile}?op=category.add", 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
}
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
break;
case 'categories.reorder':
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-17 13:55:08 UTC (rev 12788)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-17 20:13:28 UTC (rev 12789)
@@ -41,9 +41,9 @@
$op = WfdownloadsRequest::getString('op', 'downloads.list');
switch ($op) {
- case "download.edit" :
- case "download.add" :
- case "Download" :
+ case 'download.edit':
+ case 'download.add':
+ case 'Download':
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
@@ -59,8 +59,8 @@
// Allowed mimetypes list
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_FILE_ALLOWEDAMIME . "</legend>\n";
echo "<div style='padding: 8px;'>\n";
- $criteria = new Criteria("mime_admin", true);
- $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
+ $criteria = new Criteria("mime_admin", true);
+ $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
$allowMimetypes = implode(' | ', $mimetypes);
echo $allowMimetypes;
echo "</div>\n";
@@ -83,7 +83,7 @@
} else {
// create download
$downloadObj = $wfdownloads->getHandler('download')->create();
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$categoryObj = $wfdownloads->getHandler('category')->get($cid);
$downloadObj->setVar('cid', $cid);
$title = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FILE_CREATE);
@@ -97,15 +97,15 @@
$sform = $downloadObj->getAdminForm($title);
} elseif ((isset($_POST['submit_category']) && !empty($_POST['submit_category']))) {
// two steps form: 2nd step
- $fid = $categoryObj->getVar('formulize_fid');
+ $fid = $categoryObj->getVar('formulize_fid');
$customArray = array();
if ($fid) {
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $customArray['fid'] = $fid;
+ include_once XOOPS_ROOT_PATH . '/modules/formulize/include/formdisplay.php';
+ include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
+ $customArray['fid'] = $fid;
$customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
- $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues( // is a Formulize function
+ $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $customArray['prevEntry'] = getEntryValues( // is a Formulize function
$downloadObj->getVar('formulize_idreq'),
$customArray['formulize_mgr'],
$customArray['groups'],
@@ -117,14 +117,14 @@
null
);
$customArray['entry'] = $downloadObj->getVar('formulize_idreq');
- $customArray['go_back'] = "";
- $customArray['parentLinks'] = "";
+ $customArray['go_back'] = '';
+ $customArray['parentLinks'] = '';
if (wfdownloads_checkModule('formulize') < 300) {
$owner = getEntryOwner($customArray['entry']); // is a Formulize function
} else {
$owner = getEntryOwner($customArray['entry'], $fid); // is a Formulize function
}
- $ownerGroups = $member_handler->getGroupsByUser($owner, false);
+ $ownerGroups = $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $ownerGroups;
}
$sform = $downloadObj->getAdminForm($title22, $customArray);
@@ -141,29 +141,29 @@
// Vote data list/manager
if ($lid) {
- $votes_count = $wfdownloads->getHandler('rating')->getCount();
+ $ratingCount = $wfdownloads->getHandler('rating')->getCount();
- $registeredCriteria = new CriteriaCompo(new Criteria('lid', $lid));
- $registeredCriteria->add(new Criteria('ratinguser', 0, '>'));
- $votesreg = $wfdownloads->getHandler('rating')->getCount($registeredCriteria);
- $registeredCriteria->setSort('ratingtimestamp');
- $registeredCriteria->setOrder('DESC');
- $regvotes = $wfdownloads->getHandler('rating')->getObjects($registeredCriteria);
+ $regUserCriteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $regUserCriteria->add(new Criteria('ratinguser', 0, '>'));
+ $regUserRatingCount = $wfdownloads->getHandler('rating')->getCount($regUserCriteria);
+ $regUserCriteria->setSort('ratingtimestamp');
+ $regUserCriteria->setOrder('DESC');
+ $regUserRatingObjs = $wfdownloads->getHandler('rating')->getObjects($regUserCriteria);
- $anonymousCriteria = new CriteriaCompo(new Criteria('lid', $lid));
- $anonymousCriteria->add(new Criteria('ratinguser', 0, '='));
- $votesanon = $wfdownloads->getHandler('rating')->getCount($anonymousCriteria);
- $anonymousCriteria->setSort('ratingtimestamp');
- $anonymousCriteria->setOrder('DESC');
+ $anonUserCriteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $anonUserCriteria->add(new Criteria('ratinguser', 0, '='));
+ $anonUserRatingCount = $wfdownloads->getHandler('rating')->getCount($anonUserCriteria);
+ $anonUserCriteria->setSort('ratingtimestamp');
+ $anonUserCriteria->setOrder('DESC');
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_VOTE_RATINGINFOMATION . "</legend>\n";
- echo "<div style='padding: 8px;'><b>" . _AM_WFDOWNLOADS_VOTE_TOTALVOTES . "</b>{$votes_count}<br /><br />\n";
+ echo "<div style='padding: 8px;'><b>" . _AM_WFDOWNLOADS_VOTE_TOTALVOTES . "</b>{$ratingCount}<br /><br />\n";
- printf(_AM_WFDOWNLOADS_VOTE_REGUSERVOTES, $votesreg);
+ printf(_AM_WFDOWNLOADS_VOTE_REGUSERVOTES, $regUserRatingCount);
echo "<br />";
- printf(_AM_WFDOWNLOADS_VOTE_ANONUSERVOTES, $votesanon);
+ printf(_AM_WFDOWNLOADS_VOTE_ANONUSERVOTES, $anonUserRatingCount);
echo "
</div>\n
@@ -179,37 +179,32 @@
</tr>\n
";
- if ($votesreg == 0) {
+ if ($regUserRatingCount == 0) {
echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOREGVOTES . "</b></td></tr>";
} else {
- $uids = array();
- foreach (array_keys($regvotes) as $i) {
- $uids[] = $regvotes[$i]->getVar('ratinguser');
+ foreach ($regUserRatingObjs as $regUserRatingObj) {
+ $uids[] = $regUserRatingObj->getVar('ratinguser');
}
- $criteria = new Criteria("ratinguser", "(" . implode(',', $uids) . ")", "IN");
- $criteria->setGroupby("ratinguser");
+ $criteria = new Criteria('ratinguser', '(' . implode(',', $uids) . ')', 'IN');
+ $criteria->setGroupby('ratinguser');
$userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
- foreach (array_keys($regvotes) as $i) {
- $formatted_date = XoopsLocal::formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), 'l');
- $userAvgRating = isset($userRatings[$regvotes[$i]->getVar('ratinguser')]) ? $userRatings[$regvotes[$i]->getVar(
- 'ratinguser'
- )]["avg"] : 0;
- $userVotes = isset($userRatings[$regvotes[$i]->getVar('ratinguser')]) ? $userRatings[$regvotes[$i]->getVar(
- 'ratinguser'
- )]["count"] : 0;
- $ratingUserName = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
+ foreach ($regUserRatingObjs as $regUserRatingObj) {
+ $formatted_date = XoopsLocal::formatTimestamp($regUserRatingObj->getVar('ratingtimestamp'), 'l');
+ $userAvgRating = isset($userRatings[$regUserRatingObj->getVar('ratinguser')]) ? $userRatings[$regUserRatingObj->getVar('ratinguser')]['avg'] : 0;
+ $userVotes = isset($userRatings[$regUserRatingObj->getVar('ratinguser')]) ? $userRatings[$regUserRatingObj->getVar('ratinguser')]['count'] : 0;
+ $ratingUserName = XoopsUser :: getUnameFromId($regUserRatingObj->getVar('ratinguser'));
echo "
<tr><td class='head'>$ratingUserName</td>\n
- <td class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
- <td class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>" . $regUserRatingObj->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $regUserRatingObj->getVar('rating') . "</th>\n
<td class='even'>$userAvgRating</th>\n
<td class='even'>$userVotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>"
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regUserRatingObj->getVar('ratingid') . "'>"
. $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
@@ -229,29 +224,29 @@
<th>" . _AM_WFDOWNLOADS_MINDEX_ACTION . "</td>\n
</tr>\n
";
- if ($votesanon == 0) {
+ if ($anonUserRatingCount == 0) {
echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOUNREGVOTES . "</b></td></tr>";
} else {
- $criteria = new Criteria('ratinguser', 0);
- $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
- $anonymousVotes = $wfdownloads->getHandler('rating')->getObjects($anonymousCriteria);
+ $criteria = new Criteria('ratinguser', 0);
+ $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+ $anonUserRatingObjs = $wfdownloads->getHandler('rating')->getObjects($anonUserCriteria);
- foreach (array_keys($anonymousVotes) as $i) {
- $formatted_date = XoopsLocal::formatTimestamp($anonymousVotes[$i]->getVar('ratingtimestamp'), 'l');
- $userAvgRating = isset($userRatings['avg']) ? $userRatings["avg"] : 0;
- $userVotes = isset($userRatings['count']) ? $userRatings["count"] : 0;
+ foreach (array_keys($anonUserRatingObjs) as $anonUserRatingObj) {
+ $formatted_date = XoopsLocal::formatTimestamp($anonUserRatingObj->getVar('ratingtimestamp'), 'l');
+ $userAvgRating = isset($userRatings['avg']) ? $userRatings['avg'] : 0;
+ $userVotes = isset($userRatings['count']) ? $userRatings['count'] : 0;
$ratingUserName = $GLOBALS['xoopsConfig']['anonymous'];
echo "
<tr><td class='head'>$ratingUserName</td>\n
- <td class='even'>" . $anonymousVotes[$i]->getVar('ratinghostname') . "</th>\n
- <td class='even'>" . $anonymousVotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>" . $anonUserRatingObj->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $anonUserRatingObj->getVar('rating') . "</th>\n
<td class='even'>$userAvgRating</th>\n
<td class='even'>$userVotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonymousVotes[$i]->getVar('ratingid') . "'>"
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonUserRatingObj->getVar('ratingid') . "'>"
. $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
@@ -260,32 +255,32 @@
echo "</table>\n";
echo "</fieldset>\n";
}
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
break;
- case "download.save" :
- case "addDownload" :
- $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ case 'download.save':
+ case 'addDownload':
+ $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$status = WfdownloadsRequest::getInt('status', _WFDOWNLOADS_STATUS_UPDATED, 'POST');
if ($lid > 0) {
$thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
- $downloadObj = $wfdownloads->getHandler('download')->get($lid);
+ $downloadObj = $wfdownloads->getHandler('download')->get($lid);
} else {
$thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
- $downloadObj = $wfdownloads->getHandler('download')->create();
+ $downloadObj = $wfdownloads->getHandler('download')->create();
}
// Define URL
if (empty($_FILES['userfile']['name'])) {
- if ($_POST['url'] && $_POST['url'] != "" && $_POST['url'] != "http://") {
- $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
+ if ($_POST['url'] && $_POST['url'] != '' && $_POST['url'] != "http://") {
+ $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
$filename = '';
$filetype = '';
// Get size from form
$size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int) $_POST["size"];
} else {
- $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
+ $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
$filename = $_POST['filename'];
$filetype = $_POST['filetype'];
$filePath = $wfdownloads->getConfig('uploaddir') . '/' . $filename;
@@ -296,12 +291,12 @@
$downloadObj->setVar('filename', $filename);
$downloadObj->setVar('filetype', $filetype);
} else {
- $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
- $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
- $size = $down['size'];
+ $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
+ $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
+ $size = $down['size'];
$title = $_FILES['userfile']['name'];
- $ext = rtrim(strrchr($title, '.'), '.');
+ $ext = rtrim(strrchr($title, '.'), '.');
$title = str_replace($ext, '', $title);
$title = (isset($_POST['title_checkbox']) && $_POST['title_checkbox'] == 1) ? $title : trim($_POST['title']);
@@ -330,11 +325,11 @@
// If both conditions are true, then trigger all three notifications related to modified records.
if (!$thisIsANewRecord && ($downloadObj->getVar('version') != $version)) {
// Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $categoryObj = $wfdownloads->getHandler('category')->get($cid);
- $tags['FILE_VERSION'] = $version;
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $tags['FILE_VERSION'] = $version;
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid='{$cid}";
@@ -380,12 +375,12 @@
$versiontypes = (isset($_POST['versiontypes'])) ? $_POST['versiontypes'] : '';
$downloadObj->setVar('versiontypes', $versiontypes);
- $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
+ $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
$dhistoryhistory = (isset($_POST['dhistoryaddedd'])) ? $_POST['dhistoryaddedd'] : '';
if ($lid > 0 && !empty($dhistoryhistory)) {
$dhistory = $dhistory . "\n\n";
- $time = time();
+ $time = time();
$dhistory .= _AM_WFDOWNLOADS_FILE_HISTORYVERS . $version . _AM_WFDOWNLOADS_FILE_HISTORDATE . XoopsLocal::formatTimestamp($time, 'l') . "\n\n";
$dhistory .= $dhistoryhistory;
}
@@ -401,7 +396,7 @@
$offline = ($_POST['offline'] == true) ? true : false;
$downloadObj->setVar('offline', $offline);
- $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
+ $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
$notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == true);
$expiredate = 0;
@@ -409,7 +404,7 @@
$publishdate = time();
} else {
$publishdate = $_POST['was_published'];
- $expiredate = $_POST['was_expired'];
+ $expiredate = $_POST['was_expired'];
}
if ($approved == 1 && empty($publishdate)) {
$publishdate = time();
@@ -441,8 +436,8 @@
if (wfdownloads_checkModule('formulize')) {
$fid = $categoryObj->getVar('formulize_fid');
if ($fid) {
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formread.php";
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ include_once XOOPS_ROOT_PATH . '/modules/formulize/include/formread.php';
+ include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
$formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
if ($lid) {
$entries[$fid][0] = $downloadObj->getVar('formulize_idreq');
@@ -453,19 +448,19 @@
$owner = getEntryOwner($entries[$fid][0], $fid); // is a Formulize function
}
} else {
- print "no idreq";
- $entries[$fid][0] = "";
- $owner = "";
+ print 'no idreq';
+ $entries[$fid][0] = '';
+ $owner = '';
}
$cid = $downloadObj->getVar('cid');
} else {
- $entries[$fid][0] = "";
- $owner = "";
+ $entries[$fid][0] = '';
+ $owner = '';
}
- $ownerGroups =& $member_handler->getGroupsByUser($owner, false);
- $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
- $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $entries = handleSubmission(
+ $ownerGroups = $member_handler->getGroupsByUser($owner, false);
+ $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+ $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $entries = handleSubmission(
$formulize_mgr,
$entries,
$uid,
@@ -473,7 +468,7 @@
$fid,
$ownerGroups,
$groups,
- "new"
+ 'new'
); // "new" causes xoops token check to be skipped, since Wfdownloads should be doing that
if (!$owner) {
$id_req = $entries[$fid][0];
@@ -486,21 +481,21 @@
$newid = (int) $downloadObj->getVar('lid');
// Send notifications
if (!$lid) {
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
}
if ($lid && $approved && $notifypub) {
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
$notification_handler->triggerEvent('file', $lid, 'approve', $tags);
@@ -511,9 +506,9 @@
redirect_header($currentFile, 1, $message);
break;
- case "download.delete" :
+ case 'download.delete':
$lid = WfdownloadsRequest::getInt('lid', 0);
- $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
+ $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
if (!$downloadObj = $wfdownloads->getHandler('download')->get($lid)) {
redirect_header($currentFile, 4, _AM_WFDOWNLOADS_ERROR_DOWNLOADNOTFOUND);
exit();
@@ -545,17 +540,17 @@
}
break;
- case "vote.delete" :
- case "delVote" :
- $rating = $wfdownloads->getHandler('rating')->get($_GET['rid']);
- if ($wfdownloads->getHandler('rating')->delete($rating, true)) {
- wfdownloads_updateRating(intval($rating->getVar('lid')));
+ case 'vote.delete':
+ case 'delVote':
+ $ratingObj = $wfdownloads->getHandler('rating')->get($_GET['rid']);
+ if ($wfdownloads->getHandler('rating')->delete($ratingObj, true)) {
+ wfdownloads_updateRating((int) $ratingObj->getVar('lid'));
}
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_VOTE_VOTEDELETED);
break;
// Formulize module support (2006/05/04) jpc - start
- case "patch_formulize" :
+ case 'patch_formulize':
if (wfdownloads_checkModule('formulize')) {
if (!isset($_POST['patch_formulize'])) {
print "<form action=\"{$currentFile}?op=patch_formulize\" method=post>";
@@ -577,8 +572,8 @@
break;
// Formulize module support (2006/05/04) jpc - end
- case "newdownload.approve" :
- case "approve" :
+ case 'newdownload.approve':
+ case 'approve':
$lid = WfdownloadsRequest::getInt('lid', 0);
if (!$downloadObj = $wfdownloads->getHandler('download')->get($lid)) {
redirect_header($currentFile, 4, _AM_WFDOWNLOADS_ERROR_DOWNLOADNOTFOUND);
@@ -592,14 +587,14 @@
exit();
}
// Trigger notify
- $title = $downloadObj->getVar('title');
- $cid = $downloadObj->getVar('cid');
- $categoryObj = $wfdownloads->getHandler('category')->get($cid);
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $title = $downloadObj->getVar('title');
+ $cid = $downloadObj->getVar('cid');
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
if ($downloadObj->getVar('notifypub')) {
@@ -608,17 +603,18 @@
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_SUB_NEWFILECREATED);
break;
- case "downloads.list" :
- case "downloads.filter" :
+ case 'downloads.list':
+ case 'downloads.filter':
default :
- $filter_title_condition = WfdownloadsRequest::getString('filter_title_condition', '=');
- $filter_title = WfdownloadsRequest::getString('filter_title', '');
+ // get filter conditions
+ $filter_title_condition = WfdownloadsRequest::getString('filter_title_condition', '=');
+ $filter_title = WfdownloadsRequest::getString('filter_title', '');
$filter_category_title_condition = WfdownloadsRequest::getString('filter_category_title_condition', '=');
- $filter_category_title = WfdownloadsRequest::getString('filter_category_title', '');
- $filter_submitter = WfdownloadsRequest::getArray('filter_submitter', null);
- $filter_date = WfdownloadsRequest::getArray('filter_date', null);
- $filter_date_condition = WfdownloadsRequest::getString('filter_date_condition', '<');
-
+ $filter_category_title = WfdownloadsRequest::getString('filter_category_title', '');
+ $filter_submitter = WfdownloadsRequest::getArray('filter_submitter', null);
+ $filter_date = WfdownloadsRequest::getArray('filter_date', null);
+ $filter_date_condition = WfdownloadsRequest::getString('filter_date_condition', '<');
+ // check filter conditions
if ($op == 'downloads.filter') {
if ($filter_title == '' && $filter_category_title == '' && is_null($filter_submitter)) {
$op = 'downloads.list';
@@ -627,16 +623,16 @@
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $categories = $wfdownloads->getHandler('category')->getObjects();
+ $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
- $start_published = WfdownloadsRequest::getInt('start_published', 0);
- $start_new = WfdownloadsRequest::getInt('start_new', 0);
+ $start_published = WfdownloadsRequest::getInt('start_published', 0);
+ $start_new = WfdownloadsRequest::getInt('start_new', 0);
$start_autopublished = WfdownloadsRequest::getInt('start_autopublished', 0);
- $start_expired = WfdownloadsRequest::getInt('start_expired', 0);
- $start_offline = WfdownloadsRequest::getInt('start_offline', 0);
+ $start_expired = WfdownloadsRequest::getInt('start_expired', 0);
+ $start_offline = WfdownloadsRequest::getInt('start_offline', 0);
$totalCategoriesCount = wfdownloads_categoriesCount();
- $categories = $wfdownloads->getHandler('category')->getObjects(null, true, false);
+ $categoryObjs = $wfdownloads->getHandler('category')->getObjects(null, true, false);
$totalDownloadsCount = $wfdownloads->getHandler('download')->getCount();
@@ -684,13 +680,13 @@
$criteria->setOrder('DESC');
$criteria->setStart($start_published);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $publishedDownloads = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
- $publishedDownloadsCount = $wfdownloads->getHandler('download')->getActiveCount();
- $GLOBALS['xoopsTpl']->assign('published_downloads_count', $publishedDownloadsCount);
+ $publishedDownloadObjs = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
+ $publishedDownloadCount = $wfdownloads->getHandler('download')->getActiveCount();
+ $GLOBALS['xoopsTpl']->assign('published_downloads_count', $publishedDownloadCount);
- if ($publishedDownloadsCount > 0) {
- foreach ($publishedDownloads as $publishedDownload) {
- $publishedDownload_array = $publishedDownload->toArray();
+ if ($publishedDownloadCount > 0) {
+ foreach ($publishedDownloadObjs as $publishedDownloadObj) {
+ $publishedDownload_array = $publishedDownloadObj->toArray();
$publishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($publishedDownload_array['title']));
$publishedDownload_array['category_title'] = $categories[$publishedDownload_array['cid']]['title'];
$publishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($publishedDownload_array['submitter']);
@@ -724,12 +720,12 @@
$criteria->add(new Criteria('published', 0));
$criteria->setStart($start_new);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $newDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
- $newDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('new_downloads_count', $newDownloadsCount);
- if ($newDownloadsCount > 0) {
- foreach ($newDownloads as $newDownload) {
- $newDownload_array = $newDownload->toArray();
+ $newDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $newDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('new_downloads_count', $newDownloadCount);
+ if ($newDownloadCount > 0) {
+ foreach ($newDownloadObjs as $newDownloadObj) {
+ $newDownload_array = $newDownloadObj->toArray();
$newDownload_array['rating'] = number_format($newDownload_array['rating'], 2);
$newDownload_array['title_html'] = $myts->htmlSpecialChars($newDownload_array['title']);
$newDownload_array['category_title'] = $categories[$newDownload_array['cid']]['title'];
@@ -744,7 +740,7 @@
$GLOBALS['xoopsTpl']->append('new_downloads', $newDownload_array);
}
}
- $pagenav = new XoopsPageNav($newDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_new, 'start_new');
+ $pagenav = new XoopsPageNav($newDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_new, 'start_new');
$GLOBALS['xoopsTpl']->assign('new_downloads_pagenav', $pagenav->renderNav());
// Autopublished Downloads
@@ -754,12 +750,12 @@
$criteria->setOrder("ASC");
$criteria->setStart($start_autopublished);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $autopublishedDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
- $autopublishedDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('autopublished_downloads_count', $autopublishedDownloadsCount);
- if ($autopublishedDownloadsCount > 0) {
- foreach ($autopublishedDownloads as $autopublishedDownload) {
- $autopublishedDownload_array = $autopublishedDownload->toArray();
+ $autopublishedDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $autopublishedDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('autopublished_downloads_count', $autopublishedDownloadCount);
+ if ($autopublishedDownloadCount > 0) {
+ foreach ($autopublishedDownloadObjs as $autopublishedDownloadObj) {
+ $autopublishedDownload_array = $autopublishedDownloadObj->toArray();
$autopublishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($autopublishedDownload_array['title']));
$autopublishedDownload_array['category_title'] = $categories[$autopublishedDownload_array['cid']]['title'];
$autopublishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($autopublishedDownload_array['submitter']);
@@ -767,7 +763,7 @@
$GLOBALS['xoopsTpl']->append('autopublished_downloads', $autopublishedDownload_array);
}
}
- $pagenav = new XoopsPageNav($autopublishedDownloadsCount, $wfdownloads->getConfig(
+ $pagenav = new XoopsPageNav($autopublishedDownloadCount, $wfdownloads->getConfig(
'admin_perpage'
), $start_autopublished, 'start_autopublished');
$GLOBALS['xoopsTpl']->assign('autopublished_downloads_pagenav', $pagenav->renderNav());
@@ -780,12 +776,12 @@
$criteria->setOrder('ASC');
$criteria->setStart($start_expired);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $expired_downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
- $expiredDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expiredDownloadsCount);
- if ($expiredDownloadsCount > 0) {
- foreach ($expired_downloads as $expired_download) {
- $expired_download_array = $expired_download->toArray();
+ $expiredDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $expiredDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expiredDownloadCount);
+ if ($expiredDownloadCount > 0) {
+ foreach ($expiredDownloadObjs as $expiredDownloadObj) {
+ $expired_download_array = $expiredDownloadObj->toArray();
$expired_download_array['title_html'] = $myts->htmlSpecialChars(trim($expired_download_array['title']));
$expired_download_array['category_title'] = $categories[$expired_download_array['cid']]['title'];
$expired_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($expired_download_array['submitter']);
@@ -793,7 +789,7 @@
$GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
}
}
- $pagenav = new XoopsPageNav($expiredDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_expired, 'start_expired');
+ $pagenav = new XoopsPageNav($expiredDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_expired, 'start_expired');
$GLOBALS['xoopsTpl']->assign('expired_downloads_pagenav', $pagenav->renderNav());
// Offline downloads
@@ -802,13 +798,12 @@
$criteria->setOrder('ASC');
$criteria->setStart($start_offline);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $offlineDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $offlineDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
- $offlineDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('offline_downloads_count', $offlineDownloadsCount);
- if ($offlineDownloadsCount > 0) {
- foreach ($offlineDownloads as $offlineDownload) {
- $offlineDownload_array = $offlineDownload->toArray();
+ $offlineDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $offlineDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('offline_downloads_count', $offlineDownloadCount);
+ if ($offlineDownloadCount > 0) {
+ foreach ($offlineDownloadObjs as $offlineDownloadObj) {
+ $offlineDownload_array = $offlineDownloadObj->toArray();
$offlineDownload_array['title_html'] = $myts->htmlSpecialChars(trim($offlineDownload_array['title']));
$offlineDownload_array['category_title'] = $categories[$offlineDownload_array['cid']]['title'];
$offlineDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($offlineDownload_array['submitter']);
@@ -816,7 +811,7 @@
$GLOBALS['xoopsTpl']->append('offline_downloads', $offlineDownload_array);
}
}
- $pagenav = new XoopsPageNav($offlineDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_offline, 'start_offline');
+ $pagenav = new XoopsPageNav($offlineDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_offline, 'start_offline');
$GLOBALS['xoopsTpl']->assign('offline_downloads_pagenav', $pagenav->renderNav());
} else {
// NOP
@@ -844,10 +839,10 @@
$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_downloadslist.tpl");
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
break;
- case "batchfile.add" :
+ case 'batchfile.add':
$batchid = WfdownloadsRequest::getInt('batchid', 0);
$extensionToMime = include $GLOBALS['xoops']->path('include/mimetypes.inc.php');
@@ -874,7 +869,6 @@
$downloadObj->setVar('filename', $savedFileName);
$downloadObj->setVar('size', filesize($wfdownloads->getConfig('uploaddir') . '/' . $savedFileName));
$downloadObj->setVar('filetype', $extensionToMime[pathinfo($batchFile, PATHINFO_EXTENSION)]);
-
$downloadObj->setVar('version', 0);
$downloadObj->setVar('status', _WFDOWNLOADS_STATUS_APPROVED); // IN PROGRESS
$downloadObj->setVar('published', time());
@@ -893,7 +887,7 @@
redirect_header("{$currentFile}?op=download.edit&lid={$newid}", 3, _AM_WFDOWNLOADS_BATCHFILE_MOVEDEDITNOW);
break;
- case "batchfile.delete" :
+ case 'batchfile.delete':
$batchid = WfdownloadsRequest::getInt('batchid', 0);
$ok = WfdownloadsRequest::getBool('ok', false, 'POST');
@@ -923,7 +917,7 @@
}
break;
- case "ip_logs.list" :
+ case 'ip_logs.list':
$lid = WfdownloadsRequest::getInt('lid', 0);
if (!$lid) {
header('Location index.php');
@@ -944,15 +938,15 @@
}
$criteria->setSort('date');
$criteria->setOrder('DESC');
- $ip_logObjs = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
- $ip_logs_count = $wfdownloads->getHandler('ip_log')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('ip_logs_count', $ip_logs_count);
+ $ip_logObjs = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
+ $ip_logCount = $wfdownloads->getHandler('ip_log')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('ip_logs_count', $ip_logCount);
unset($criteria);
// Get download info
if ($lid != 0) {
- $downloadObj = $wfdownloads->getHandler('download')->get($lid);
- $download_array = $downloadObj->toArray();
+ $downloadObj = $wfdownloads->getHandler('download')->get($lid);
+ $download_array = $downloadObj->toArray();
$download_array['log_title'] = sprintf(_AM_WFDOWNLOADS_LOG_FOR_LID, $download_array['title']);
$GLOBALS['xoopsTpl']->assign('download', $download_array);
}
@@ -973,8 +967,8 @@
// NOP
} else {
foreach ($ip_logObjs as $ip_logObj) {
- $ip_log_array = $ip_logObj->toArray();
- $ip_log_array['uname'] = XoopsUserUtility::getUnameFromId(
+ $ip_log_array = $ip_logObj->toArray();
+ $ip_log_array['uname'] = XoopsUserUtility::getUnameFromId(
$ip_log_array['uid']
);
//($ip_log_array['uid'] != 0) ? $userList[$ip_log_array['uid']] : _AM_WFDOWNLOADS_ANONYMOUS;
@@ -985,6 +979,6 @@
$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_ip_logslist.tpl");
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
break;
}
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php 2014-09-17 13:55:08 UTC (rev 12788)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php 2014-09-17 20:13:28 UTC (rev 12789)
@@ -23,26 +23,26 @@
$op = WfdownloadsRequest::getString('op', 'reports.modifications.list');
switch ($op) {
- case "reports.update" :
- $lid = WfdownloadsRequest::getInt('lid', 0);
+ case 'reports.update':
+ $lid = WfdownloadsRequest::getInt('lid', 0);
$criteria = new Criteria('lid', $lid);
if (isset($_GET['ack'])) {
$acknowledged = (isset($_GET['ack']) && $_GET['ack'] == 0) ? 1 : 0;
- $wfdownloads->getHandler('report')->updateAll("acknowledged", $acknowledged, $criteria, true);
+ $wfdownloads->getHandler('report')->updateAll('acknowledged', $acknowledged, $criteria, true);
$update_mess = _AM_WFDOWNLOADS_BROKEN_NOWACK;
}
if (isset($_GET['con'])) {
$confirmed = (isset($_GET['con']) && $_GET['con'] == 0) ? 1 : 0;
- $wfdownloads->getHandler('report')->updateAll("confirmed", $confirmed, $criteria, true);
+ $wfdownloads->getHandler('report')->updateAll('confirmed', $confirmed, $criteria, true);
$update_mess = _AM_WFDOWNLOADS_BROKEN_NOWCON;
}
redirect_header($currentFile, 1, $update_mess);
break;
- case "report.delete" :
- $lid = WfdownloadsRequest::getInt('lid', 0);
+ case 'report.delete':
+ $lid = WfdownloadsRequest::getInt('lid', 0);
$criteria = new Criteria('lid', $lid);
- $reportObjs = $wfdownloads->getHandler('report')->getObjects($criteria);
+ $reportObjs = $wfdownloads->getHandler('report')->getObjects($criteria);
if (isset($reportObjs[0])) {
$wfdownloads->getHandler('report')->delete($reportObjs[0], true);
}
@@ -51,31 +51,31 @@
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_BROKENFILEDELETED);
break;
- case "report.ignore" :
- $lid = WfdownloadsRequest::getInt('lid', 0);
+ case 'report.ignore':
+ $lid = WfdownloadsRequest::getInt('lid', 0);
$criteria = new Criteria('lid', $lid);
- $reportObjs = $wfdownloads->getHandler('report')->getObjects($criteria);
+ $reportObjs = $wfdownloads->getHandler('report')->getObjects($criteria);
if (isset($reportObjs[0])) {
$wfdownloads->getHandler('report')->delete($reportObjs[0], true);
}
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_BROKEN_FILEIGNORED);
break;
- case "modification.show":
+ case 'modification.show':
$requestid = WfdownloadsRequest::getInt('requestid', 0);
- $modificationObj = $wfdownloads->getHandler('modification')->get($requestid);
- $modify_user = new XoopsUser($modificationObj->getVar('modifysubmitter'));
- $modifyname = XoopsUserUtility::getUnameFromId((int) $modify_user->getVar('uid'));
- $modifyemail = $modify_user->getVar('email');
+ $modificationObj = $wfdownloads->getHandler('modification')->get($requestid);
+ $modify_user = new XoopsUser($modificationObj->getVar('modifysubmitter'));
+ $modifyname = XoopsUserUtility::getUnameFromId((int) $modify_user->getVar('uid'));
+ $modifyemail = $modify_user->getVar('email');
- $downloadObj = $wfdownloads->getHandler('download')->get($modificationObj->getVar('lid'));
- $orig_user = new XoopsUser($downloadObj->getVar('submitter'));
+ $downloadObj = $wfdownloads->getHandler('download')->get($modificationObj->getVar('lid'));
+ $orig_user = new XoopsUser($downloadObj->getVar('submitter'));
$submittername = XoopsUserUtility::getUnameFromId($downloadObj->getVar('submitter')); // $orig_user->getvar("uname");
$submitteremail = $orig_user->getVar('email');
- $categories = $wfdownloads->getHandler('category')->getObjects();
- $categoryObjsTree = new XoopsObjectTree($categories, 'cid', 'pid');
+ $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
+ $categoryObjsTree = new XoopsObjectTree($categoryObjs, 'cid', 'pid');
wfdownloads_xoops_cp_header();
@@ -93,8 +93,8 @@
$downloadVars = $downloadObj->getVars();
$downloadKeys = array_keys($downloadVars);
// Get modification keys
- $modificationVars = $modificationObj->getVars();
- $modificationKeys = array_keys($modificationVars);
+ $modificationVars = $modificationObj->getVars();
+ $modificationKeys = array_keys($modificationVars);
// Get common keys
$commonKeys = array_intersect($downloadKeys, $modificationKeys);
// Set not allowed keys
@@ -108,61 +108,61 @@
if (in_array($key, $notAllowedKeys)) {
continue;
}
- $caption = constant("_AM_WFDOWNLOADS_MOD_" . strtoupper($key));
+ $caption = constant('_AM_WFDOWNLOADS_MOD_' . strtoupper($key));
$downloadContent = $downloadObj->getVar($key);
$modificationContent = $modificationObj->getVar($key);
// Extra jobs for some keys
switch ($key) {
- case "title" :
- case "url" :
+ case 'title':
+ case 'url':
// NOP
break;
- case "size" :
+ case 'size':
$downloadContent = wfdownloads_bytesToSize1024($downloadContent);
//
$modificationContent = wfdownloads_bytesToSize1024($modificationContent);
break;
- case "date" :
- case "published" :
- case "expired" :
- case "updated" :
+ case 'date':
+ case 'published':
+ case 'expired':
+ case 'updated':
$downloadContent = ($downloadContent != false) ? XoopsLocal::formatTimestamp($downloadContent, 'l') : _NO;
//
$modificationContent = ($modificationContent != false) ? XoopsLocal::formatTimestamp($modificationContent, 'l') : _NO;
break;
- case "platform":
- case "license":
- case "limitations":
- case "versiontypes":
+ case 'platform':
+ case 'license':
+ case 'limitations':
+ case 'versiontypes':
$tempArray = $wfdownloads->getConfig($key);
$downloadContent = isset($tempArray[$downloadObj->getVar($key)]) ? $tempArray[$downloadObj->getVar($key)] : '';
//
$modificationContent = isset($tempArray[$modificationObj->getVar($key)]) ? $tempArray[$modificationObj->getVar($key)] : '';
break;
- case "cid":
- $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria("cid", $downloadObj->getVar($key)));
+ case 'cid':
+ $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria('cid', $downloadObj->getVar($key)));
if (!isset($category_list[0])) continue;
$downloadContent = $category_list[0]->getVar('title', 'e');
//
- $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria("cid", $modificationObj->getVar($key)));
+ $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria('cid', $modificationObj->getVar($key)));
if (!isset($category_list[0])) continue;
$modificationContent = $category_list[0]->getVar('title', 'e');
break;
- case "screenshot":
- case "screenshot2":
- case "screenshot3":
- case "screenshot4":
+ case 'screenshot':
+ case 'screenshot2':
+ case 'screenshot3':
+ case 'screenshot4':
if ($downloadContent != '') $downloadContent = "<img src='" . XOOPS_URL . "/{$wfdownloads->getConfig('screenshots')}/{$downloadContent}' width='{$wfdownloads->getConfig('shotwidth')}' alt='' title='' />";
//
if ($modificationContent != '') $modificationContent = "<img src='" . XOOPS_URL . "/{$wfdownloads->getConfig('screenshots')}/{$modificationContent}' width='{$wfdownl...
[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->getVar("attachment_created");
- $form->addElement(new XoopsFormHidden("attachment_submitter", $GLOBALS['xoopsUser']->uid()));
- $form->addElement(new XoopsFormHidden("attachment_created", $time));
-
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ATTACHMENT_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ATTACHMENT_CREATED, formatTimestamp($time, 's')));
-
- //$form->addElement(new XoopsFormSelectUser(_AM_XNEWSLETTER_ATTACHMENT_SUBMITTER, "attachment_submitter", false, $this->getVar("attachment_submitter"), 1, false), true);
- //$form->addElement(new XoopsFormTextDateSelect(_AM_XNEWSLETTER_ATTACHMENT_CREATED, "attachment_created", "", $this->getVar("attachment_created")));
-
- $form->addElement(new XoopsFormHidden("op", "save_attachment"));
- $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
-
- return $form;
- }
-}
-
-/**
- * Class XnewsletterXnewsletter_attachmentHandler
- */
-class XnewsletterXnewsletter_attachmentHandler extends XoopsPersistableObjectHandler
-{
- /**
- * @param null|object $db
- */
- public function __construct(&$db)
- {
- parent::__construct($db, "xnewsletter_attachment", "xnewsletter_attachment", "attachment_id", "attachment_letter_id");
- }
-}
Deleted: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_bmh.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_bmh.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -1,126 +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_bmh
- */
-class xnewsletter_bmh extends XoopsObject
-{
- //Constructor
- /**
- *
- */
- public function __construct()
- {
- $this->initVar("bmh_id", XOBJ_DTYPE_INT, null, false, 8);
- $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, 10);
- $this->initVar("bmh_submitter", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("bmh_created", XOBJ_DTYPE_INT, null, false, 10);
- }
-
- /**
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
-
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_BMH_ADD) : sprintf(_AM_XNEWSLETTER_BMH_EDIT);
-
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, "form", $action, "post", true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $account_default = $this->getVar("bmh_accounts_id");
- $accountsHandler =& xoops_getModuleHandler("xNewsletter_accounts", "xNewsletter");
- $crit_accounts = new CriteriaCompo();
- $crit_accounts->setSort("accounts_id");
- $crit_accounts->setOrder("ASC");
- $opt_accounts = new XoopsFormSelect(_AM_XNEWSLETTER_BMH_ACCOUNTS_ID, "bmh_accounts_id", $account_default);
- $opt_accounts->addOptionArray($accountsHandler->getList($crit_accounts));
- $form->addElement($opt_accounts, false);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_RULE_NO, "bmh_rule_no", 50, 255, $this->getVar("bmh_rule_no")), true);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_RULE_CAT, "bmh_rule_cat", 50, 255, $this->getVar("bmh_rule_cat")), true);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_BOUNCETYPE, "bmh_bouncetype", 50, 255, $this->getVar("bmh_bouncetype")), true);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_REMOVE, "bmh_remove", 50, 255, $this->getVar("bmh_remove")), true);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_EMAIL, "bmh_email", 50, 255, $this->getVar("bmh_email")), true);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_BMH_SUBJECT, "bmh_subject", 50, 255, $this->getVar("bmh_subject")), false);
-
- $measure_select = new XoopsFormSelect(_AM_XNEWSLETTER_BMH_MEASURE, "bmh_measure", $this->getVar("bmh_measure"));
- $measure_select->addOption(_AM_XNEWSLETTER_BMH_MEASURE_VAL_PENDING, _AM_XNEWSLETTER_BMH_MEASURE_PENDING);
- $measure_select->addOption(_AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING, _AM_XNEWSLETTER_BMH_MEASURE_NOTHING);
- $measure_select->addOption(_AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT, _AM_XNEWSLETTER_BMH_MEASURE_QUIT);
- $form->addElement($measure_select, true);
-
- $time = ($this->isNew()) ? time() : $this->getVar("bmh_created");
- $form->addElement(new XoopsFormHidden("bmh_submitter", $GLOBALS['xoopsUser']->uid()));
- $form->addElement(new XoopsFormHidden("bmh_created", $time));
-
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_BMH_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_BMH_CREATED, formatTimestamp($time, 's')));
-
- //$form->addElement(new XoopsFormSelectUser(_AM_XNEWSLETTER_BMH_SUBMITTER, "bmh_submitter", false, $this->getVar("bmh_submitter"), 1, false), true);
- //$form->addElement(new XoopsFormTextDateSelect(_AM_XNEWSLETTER_BMH_CREATED, "bmh_created", "", $this->getVar("bmh_created")));
-
- $form->addElement(new XoopsFormHidden("op", "save_bmh"));
- $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
-
- return $form;
- }
-}
-
-/**
- * Class XnewsletterXnewsletter_bmhHandler
- */
-class XnewsletterXnewsletter_bmhHandler extends XoopsPersistableObjectHandler
-{
- /**
- * @param null|object $db
- */
- public function __construct(&$db)
- {
- parent::__construct($db, "xnewsletter_bmh", "xnewsletter_bmh", "bmh_id", "bmh_rule_no");
- }
-}
Deleted: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_cat.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_cat.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -1,213 +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 GPL 2.0
- * @package xNewsletter
- * @author Goffy ( web...@we... )
- *
- * Version : $Id $
- * ****************************************************************************
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
-/**
- * Class xnewsletter_cat
- */
-class xnewsletter_cat extends XoopsObject
-{
- //Constructor
- /**
- *
- */
- public function __construct()
- {
- $this->initVar("cat_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("cat_name", XOBJ_DTYPE_TXTBOX, null, false, 100);
- $this->initVar("cat_info", XOBJ_DTYPE_TXTBOX);
- $this->initVar("cat_mailinglist", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("cat_submitter", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("cat_created", XOBJ_DTYPE_INT, null, false, 10);
- }
-
- /**
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
-
- include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/class/xNewsletter_mailinglist.php";
- $mailinglistHandler =& xoops_getModuleHandler("xNewsletter_mailinglist", "xNewsletter");
- $gperm_handler = xoops_gethandler('groupperm');
- global $xoopsModule;
- $mid = $xoopsModule->mid();
-
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_CAT_ADD) : sprintf(_AM_XNEWSLETTER_CAT_EDIT);
-
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, "form", $action, "post", true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_CAT_NAME, "cat_name", 50, 255, $this->getVar("cat_name")), true);
- $form->addElement(new XoopsFormTextArea(_AM_XNEWSLETTER_CAT_INFO, "cat_info", $this->getVar("cat_info"), 4, 47), false);
-
- $member_handler = &xoops_gethandler('member');
- $userGroups = $member_handler->getGroupList();
-
- // create admin checkbox
- foreach ($userGroups as $group_id => $group_name) {
- if ($group_id == XOOPS_GROUP_ADMIN) {
- $group_id_admin = $group_id;
- $group_name_admin = $group_name;
- }
- }
- $select_perm_admin = new XoopsFormCheckBox("", "admin", XOOPS_GROUP_ADMIN);
- $select_perm_admin->addOption($group_id_admin, $group_name_admin);
- $select_perm_admin->setExtra("disabled='disabled'");
-
- // ********************************************************
- // permission read cat
- $cat_gperms_read = &$gperm_handler->getGroupIds('newsletter_read_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_read = $this->isNew() ? "0" : $cat_gperms_read;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_READ, '');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_read", $arr_cat_gperms_read);
- foreach ($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN) {
- $select_perm->addOption($group_id, $group_name);
- }
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- // ********************************************************
- // permission create cat
- $cat_gperms_create =& $gperm_handler->getGroupIds('newsletter_create_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_create = $this->isNew() ? "0" : $cat_gperms_create;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_CREATE . _AM_XNEWSLETTER_CAT_GPERMS_CREATE_DESC, '');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_create", $arr_cat_gperms_create);
- foreach ($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) {
- $select_perm->addOption($group_id, $group_name);
- }
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- // ********************************************************
- // permission admin cat
- $cat_gperms_admin =& $gperm_handler->getGroupIds('newsletter_admin_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_admin = $this->isNew() ? "0" : $cat_gperms_admin;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_ADMIN . _AM_XNEWSLETTER_CAT_GPERMS_ADMIN_DESC, '');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_admin", $arr_cat_gperms_admin);
- foreach ($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) {
- $select_perm->addOption($group_id, $group_name);
- }
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- // ********************************************************
- // permission list subscriber of this cat
- $cat_gperms_list =& $gperm_handler->getGroupIds('newsletter_list_cat', $this->getVar("cat_id"), $mid);
- $arr_cat_gperms_admin = $this->isNew() ? "0" : $cat_gperms_list;
-
- $perms_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CAT_GPERMS_LIST, '');
- // checkbox webmaster
- $perms_tray->addElement($select_perm_admin, false);
- // checkboxes other groups
- $select_perm = new XoopsFormCheckBox("", "cat_gperms_list", $arr_cat_gperms_admin);
- foreach ($userGroups as $group_id => $group_name) {
- if ($group_id != XOOPS_GROUP_ADMIN && $group_id != XOOPS_GROUP_ANONYMOUS) {
- $select_perm->addOption($group_id, $group_name);
- }
- }
- $perms_tray->addElement($select_perm, false);
- $form->addElement($perms_tray, false);
- unset($perms_tray);
- unset($select_perm);
-
- $cat_mailinglist = $this->isNew() ? "0" : $this->getVar("cat_mailinglist");
- $crit_mailinglist = new CriteriaCompo();
- $crit_mailinglist->setSort("mailinglist_id");
- $crit_mailinglist->setOrder("ASC");
- $numrows_mailinglist = $mailinglistHandler->getCount();
- if ($numrows_mailinglist > 0) {
- $opt_mailinglist = new XoopsFormRadio(_AM_XNEWSLETTER_LETTER_MAILINGLIST, "cat_mailinglist", $cat_mailinglist);
- $opt_mailinglist->addOption("0", _AM_XNEWSLETTER_LETTER_MAILINGLIST_NO);
- $mailinglist_arr = $mailinglistHandler->getall($crit_mailinglist);
- foreach (array_keys($mailinglist_arr) as $i) {
- $opt_mailinglist->addOption($i, $mailinglist_arr[$i]->getVar("mailinglist_name"));
- }
- $form->addElement($opt_mailinglist);
- }
-
- $time = ($this->isNew()) ? time() : $this->getVar("cat_created");
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ACCOUNTS_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_ACCOUNTS_CREATED, formatTimestamp($time, 's')));
-
- $form->addElement(new XoopsFormHidden("op", "save_cat"));
- $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
-
- return $form;
- }
-}
-
-/**
- * Class XnewsletterXnewsletter_catHandler
- */
-class XnewsletterXnewsletter_catHandler extends XoopsPersistableObjectHandler
-{
- /**
- * @param null|object $db
- */
- public function __construct(&$db)
- {
- parent::__construct($db, "xnewsletter_cat", "xnewsletter_cat", "cat_id", "cat_name");
- }
-}
Deleted: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_catsubscr.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_catsubscr.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -1,127 +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 GPL 2.0
- * @package xNewsletter
- * @author Goffy ( web...@we... )
- *
- * Version : $Id $
- * ****************************************************************************
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
-/**
- * Class xnewsletter_catsubscr
- */
-class xnewsletter_catsubscr extends XoopsObject
-{
- //Constructor
- /**
- *
- */
- public function __construct()
- {
- $this->initVar("catsubscr_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("catsubscr_catid", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("catsubscr_subscrid", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("catsubscr_quited", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("catsubscr_submitter", XOBJ_DTYPE_INT, null, false, 10);
- $this->initVar("catsubscr_created", XOBJ_DTYPE_INT, null, false, 10);
- }
-
- /**
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getForm($action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
-
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = $this->isNew() ? sprintf(_AM_XNEWSLETTER_CATSUBSCR_ADD) : sprintf(_AM_XNEWSLETTER_CATSUBSCR_EDIT);
-
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, "form", $action, "post", true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $catHandler =& xoops_getModuleHandler("xNewsletter_cat", "xNewsletter");
- $criteria = new CriteriaCompo();
- $criteria->setSort('cat_id ASC, cat_name');
- $criteria->setOrder('ASC');
- $cat_select = new XoopsFormSelect(_AM_XNEWSLETTER_CATSUBSCR_CATID, "catsubscr_catid", $this->getVar("catsubscr_catid"));
- $cat_select->addOptionArray($catHandler->getList());
- $form->addElement($cat_select, true);
-
- $subscrHandler =& xoops_getModuleHandler("xNewsletter_subscr", "xNewsletter");
- $criteria = new CriteriaCompo();
- $criteria->setSort('subscr_email ');
- $criteria->setOrder('ASC');
- $subscr_select = new XoopsFormSelect(_AM_XNEWSLETTER_CATSUBSCR_SUBSCRID, "catsubscr_subscrid", $this->getVar("catsubscr_subscrid"));
- $subscr_select->addOptionArray($subscrHandler->getList());
- $form->addElement($subscr_select, true);
-
- $quited_tray = new XoopsFormElementTray(_AM_XNEWSLETTER_CATSUBSCR_QUITED, " ");
-
- $quit_now = new XoopsFormRadio("", "catsubscr_quit_now", 0);
- $quit_now->addOption(0, _AM_XNEWSLETTER_CATSUBSCR_QUIT_NONE);
- $quit_now->addOption(1, _AM_XNEWSLETTER_CATSUBSCR_QUIT_NOW);
- $quit_now->addOption(2, _AM_XNEWSLETTER_CATSUBSCR_QUIT_REMOVE);
- $quited_tray->addElement($quit_now, false);
- $quited_tray->addElement(new XoopsFormLabel("", $this->getVar("catsubscr_quited")));
- $form->addElement($quited_tray, false);
-
- $time = ($this->isNew()) ? time() : $this->getVar("catsubscr_created");
- $form->addElement(new XoopsFormHidden("catsubscr_submitter", $GLOBALS['xoopsUser']->uid()));
- $form->addElement(new XoopsFormHidden("catsubscr_created", $time));
-
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_CATSUBSCR_SUBMITTER, $GLOBALS['xoopsUser']->uname()));
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_CATSUBSCR_CREATED, formatTimestamp($time, 's')));
-
- //$form->addElement(new XoopsFormSelectUser(_AM_XNEWSLETTER_CATSUBSCR_SUBMITTER, "catsubscr_submitter", false, $this->getVar("catsubscr_submitter"), 1, false), true);
- //$form->addElement(new XoopsFormTextDateSelect(_AM_XNEWSLETTER_CATSUBSCR_CREATED, "catsubscr_created", "", $this->getVar("catsubscr_created")));
-
- $form->addElement(new XoopsFormHidden("op", "save_catsubscr"));
- $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
-
- return $form;
- }
-}
-
-/**
- * Class XnewsletterXnewsletter_catsubscrHandler
- */
-class XnewsletterXnewsletter_catsubscrHandler extends XoopsPersistableObjectHandler
-{
- /**
- * @param null|object $db
- */
- public function __construct(&$db)
- {
- parent::__construct($db, "xnewsletter_catsubscr", "xnewsletter_catsubscr", "catsubscr_id", "catsubscr_catid");
- }
-}
Deleted: XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_import.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_import.php 2014-09-17 10:58:25 UTC (rev 12787)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/class/xNewsletter_import.php 2014-09-17 13:55:08 UTC (rev 12788)
@@ -1,203 +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 GPL 2.0
- * @package xNewsletter
- * @author Goffy ( web...@we... )
- *
- * Version : $Id $
- * ****************************************************************************
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
-/**
- * Class xnewsletter_import
- */
-class xnewsletter_import extends XoopsObject
-{
- //Constructor
- /**
- *
- */
- public function __construct()
- {
- $this->initVar("import_id", XOBJ_DTYPE_INT, null, false, 8);
- $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, 8);
- $this->initVar("import_subscr_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("import_catsubscr_id", XOBJ_DTYPE_INT, null, false, 8);
- $this->initVar("import_status", XOBJ_DTYPE_INT, null, false, 1);
- }
-
- /**
- * @param $plugin
- * @param int $action_after_read
- * @param int $limitcheck
- * @param bool $action
- *
- * @return XoopsThemeForm
- */
- public function getFormSearch($plugin, $action_after_read = 1, $limitcheck = 0, $action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
-
- if ($action === false) {
- $action = $_SERVER["REQUEST_URI"];
- }
-
- $title = _AM_XNEWSLETTER_IMPORT_SEARCH;
-
- include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $form = new XoopsThemeForm($title, "form_select_import", $action, "post", true);
- $form->setExtra('enctype="multipart/form-data"');
-
- $catHandler =& xoops_getModuleHandler("xNewsletter_cat", "xNewsletter");
- $criteria = new CriteriaCompo();
- $criteria->setSort('cat_id ASC, cat_name');
- $criteria->setOrder('ASC');
- $cat_select = new XoopsFormSelect(_AM_XNEWSLETTER_IMPORT_PRESELECT_CAT, "cat_id", "1");
- $cat_select->addOptionArray($catHandler->getList());
- $form->addElement($cat_select, false);
-
- $opt_import_type = new XoopsFormRadio(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, "plugin", $plugin);
- $opt_import_type->setextra('onclick="document.forms.form_select_import.submit()"');
- $aFiles = XoopsLists::getFileListAsArray(XNEWSLETTER_PATH . "/plugins/");
- $arrPlugin = array();
- $currpluginhasform = 0;
- foreach ($aFiles as $file) {
- if (substr($file, strlen($file) - 4, 4) == '.php') {
- $pluginName = str_replace('.php', '', $file);
- $pluginFile = XNEWSLETTER_PATH . "/plugins/" . $pluginName . '.php';
- if (file_exists($pluginFile)) {
- require_once($pluginFile);
- $function = 'xnewsletter_plugin_getinfo_' . $pluginName;
- $arrPlugin = $function();
- $show_plugin = $this->tableExists($arrPlugin['tables'][0]);
- if ($show_plugin === true && @is_array($arrPlugin['tables'][1])) {
- $show_plugin = $this->tableExists($arrPlugin['tables'][1]);
- }
-
- if ($show_plugin === true) {
- $label = "<img src='" . $arrPlugin['icon'] . "' title='" . $arrPlugin['descr'] . "' alt='" . $arrPlugin['descr'] . "' style='height:32px;margin-bottom:5px;margin-right:5px' />"
- . $arrPlugin['descr'] . "<br/>";
- $opt_import_type->addOption($arrPlugin['name'], $label);
- $form->addElement(new XoopsFormHidden("hasform_" . $pluginName, $arrPlugin['hasform']));
- if ($plugin == $pluginName && $arrPlugin['hasform'] == 1) {
- $currpluginhasform = 1;
- }
- }
- }
- }
- }
- $form->addElement($opt_import_type, false);
-
- //option, whether data should be shown for check or directly imported
- $check_after = new XoopsFormRadio(_AM_XNEWSLETTER_IMPORT_AFTER_READ, "action_after_read", $action_after_read);
- $check_after->addOption(0, _AM_XNEWSLETTER_IMPORT_READ_IMPORT);
- $check_after->addOption(1, _AM_XNEWSLETTER_IMPORT_READ_CHECK);
- $check_after->setextra('onclick="document.forms.form_select_import.submit()"');
- $form->addElement($check_after, false);
-
- //limit for import
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_IMPORT_CHECK_LIMIT, "100000"), false);
- if ($action_after_read == 0) {
- if ($limitcheck < 500 && $limitcheck > 0) {
- $limitcheck = 500;
- }
- } else {
- if ($limitcheck > 200) {
- $limitcheck = 200;
- }
- }
- $sel_limitcheck = new XoopsFormSelect(_AM_XNEWSLETTER_IMPORT_CHECK_LIMIT_PACKAGE, "limitcheck", $limitcheck);
- $sel_limitcheck->addOption(0, _AM_XNEWSLETTER_IMPORT_NOLIMIT);
- if ($action_after_read == 0) {
- $sel_limitcheck->addOption(500, 500);
- $sel_limitcheck->addOption(1000, 1000);
- $sel_limitcheck->ad...
[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_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', 3, _AM_XNEWSLETTER_FORMOK);
@@ -325,7 +339,7 @@
}
$form = $accountObj->getForm();
$form->display();
- break;
+ break;
case 'delete_account':
$accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
@@ -343,4 +357,4 @@
}
break;
}
-include_once dirname(__FILE__) . '/admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_footer.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_footer.php 2014-09-17 10:47:21 UTC (rev 12786)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_footer.php 2014-09-17 10:58:25 UTC (rev 12787)
@@ -17,11 +17,12 @@
* 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 $
* ****************************************************************************
*/
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_header.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_header.php 2014-09-17 10:47:21 UTC (rev 12786)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/admin_header.php 2014-09-17 10:58:25 UTC (rev 12787)
@@ -17,23 +17,24 @@
* 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(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+include_once dirname(__DIR__) . '/include/common.php';
// 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');
+$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';
@@ -42,7 +43,7 @@
xoops_loadLanguage('modinfo', $xnewsletter->getModule()->dirname());
xoops_loadLanguage('main', $xnewsletter->getModule()->dirname());
-define('XNEWSLETTER_IMG_OK', "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_ok.png' alt='" . _AM_XNEWSLETTER_OK . "' title='"._AM_XNEWSLETTER_OK . "' /> ");
+define('XNEWSLETTER_IMG_OK', "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_ok.png' alt='" . _AM_XNEWSLETTER_OK . "' title='" . _AM_XNEWSLETTER_OK . "' /> ");
define('XNEWSLETTER_IMG_FAILED', "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_failed.png' alt='" . _AM_XNEWSLETTER_FAILED . "' title='" . _AM_XNEWSLETTER_FAILED . "' /> ");
if (!xnewsletter_checkModuleAdmin()) {
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/attachment.php 2014-09-17 10:47:21 UTC (rev 12786)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/attachment.php 2014-09-17 10:58:25 UTC (rev 12787)
@@ -17,22 +17,23 @@
* 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... )
*
+ * @copyright Goffy ( wedega.com )
+ * @license GNU General Public License 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$
-$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':
@@ -40,12 +41,12 @@
echo $indexAdmin->addNavigation($currentFile);
echo $indexAdmin->renderButton();
//
- $limit = $xnewsletter->getConfig('adminperpage');
+ $limit = $xnewsletter->getConfig('adminperpage');
$attachmentCriteria = new CriteriaCompo();
$attachmentCriteria->setSort('attachment_letter_id DESC, attachment_id');
$attachmentCriteria->setOrder('DESC');
$attachmentCount = $xnewsletter->getHandler('attachment')->getCount();
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = xnewsletterRequest::getInt('start', 0);
$attachmentCriteria->setStart($start);
$attachmentCriteria->setLimit($limit);
$attachmentObjs = $xnewsletter->getHandler('attachment')->getObjects($attachmentCriteria, true);
@@ -83,7 +84,7 @@
echo "</td>";
echo "<td>" . XoopsUser::getUnameFromId($attachmentObj->getVar('attachment_submitter'), 'S') . "</td>";
echo "<td>" . formatTimeStamp($attachmentObj->getVar('attachment_created'), 'S') . "</td>";
- echo "<td>";
+ echo "<td class='center'>";
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>";
@@ -102,13 +103,13 @@
echo $indexAdmin->renderButton();
//
$attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
- $form = $attachmentObj->getForm();
+ $form = $attachmentObj->getForm();
$form->display();
break;
case 'save_attachment':
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
//
$attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
@@ -136,9 +137,13 @@
echo $attachmentObj->getHtmlErrors();
}
} else {
- xoops_confirm(array('ok' => true, 'attachment_id' => $attachment_id, 'op' => 'delete_attachment'), $_SERVER['REQUEST_URI'], sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $attachmentObj->getVar('attachment_letter_id')));
+ xoops_confirm(
+ array('ok' => true, 'attachment_id' => $attachment_id, 'op' => 'delete_attachment'),
+ $_SERVER['REQUEST_URI'],
+ sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $attachmentObj->getVar('attachment_letter_id'))
+ );
}
- break;
+ break;
}
-include_once dirname(__FILE__) . '/admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php 2014-09-17 10:47:21 UTC (rev 12786)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/bmh.php 2014-09-17 10:58:25 UTC (rev 12787)
@@ -17,52 +17,53 @@
* 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... )
*
+ * @copyright Goffy ( wedega.com )
+ * @license GNU General Public License 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$
-$op = xnewsletterRequest::getString('op', 'list');
-$bmh_id = xnewsletterRequest::getInt('bmh_id', 0);
+$op = xnewsletterRequest::getString('op', 'list');
+$bmh_id = xnewsletterRequest::getInt('bmh_id', 0);
$bmh_measure = xnewsletterRequest::getInt('bmh_measure', 0);
-$filter = xnewsletterRequest::getInt('bmh_measure_filter', _XNEWSLETTER_BMH_MEASURE_VAL_ALL);
+$filter = xnewsletterRequest::getInt('bmh_measure_filter', _XNEWSLETTER_BMH_MEASURE_VAL_ALL);
switch ($op) {
case 'bmh_delsubscr':
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
$count_err = 0;
- $bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
+ $bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
$bmh_email = $bmhObj->getVar('bmh_email');
$sql = "SELECT subscr_id FROM {$xoopsDB->prefix("xnewsletter_subscr")}";
$sql .= " WHERE (subscr_email='{$bmh_email}')";
$sql .= " LIMIT 1;";
- if ( $user = $xoopsDB->query($sql) ) {
- $row_user = $xoopsDB->fetchRow($user);
- $subscr_id = (int) $row_user[0];
+ if ($user = $xoopsDB->query($sql)) {
+ $row_user = $xoopsDB->fetchRow($user);
+ $subscr_id = (int)$row_user[0];
}
if ($subscr_id == 0) {
//set bmh_measure for all entries in bmh with this email
$sql_upd_measure = "UPDATE {$xoopsDB->prefix('xnewsletter_bmh')} SET `bmh_measure` = '" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "'";
- $sql_upd_measure .=" WHERE ((`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
+ $sql_upd_measure .= " WHERE ((`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
$xoopsDB->query($sql_upd_measure);
redirect_header('?op=list', 3, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
}
$subscrObj = $xnewsletter->getHandler('subscr')->get($subscr_id);
// delete subscriber
- if (!$xnewsletter->getHandler('subscr')->delete($subscrObj,true)) {
- $actionprot_err = $subscrObj->getHtmlErrors()."<br/><br/><br/>";
+ if (!$xnewsletter->getHandler('subscr')->delete($subscrObj, true)) {
+ $actionprot_err = $subscrObj->getHtmlErrors() . "<br/><br/><br/>";
++$count_err;
}
@@ -73,8 +74,8 @@
if ($catsubscrsCount > 0) {
$catsubscrObjs = $xnewsletter->getHandler('catsubscr')->getAll($catsubscrCriteria);
foreach ($catsubscrObjs as $catsubscr_id => $catsubscrObj) {
- $catsubscrObj = $xnewsletter->getHandler('catsubscr')->get($catsubscrObj->getVar('catsubscr_id'));
- $catObj = $xnewsletter->getHandler('cat')->get($catsubscrObj->getVar('catsubscr_catid'));
+ $catsubscrObj = $xnewsletter->getHandler('catsubscr')->get($catsubscrObj->getVar('catsubscr_id'));
+ $catObj = $xnewsletter->getHandler('cat')->get($catsubscrObj->getVar('catsubscr_catid'));
$cat_mailinglist = $catObj->getVar('cat_mailinglist');
if ($xnewsletter->getHandler('catsubscr')->delete($catsubscrObj, true)) {
@@ -101,12 +102,16 @@
break;
case 'handle_bmh':
- if ($bmh_id == 0) redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
- if ($bmh_measure == 0) redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+ if ($bmh_id == 0) {
+ redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+ }
+ if ($bmh_measure == 0) {
+ redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+ }
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
- if ($bmhObj->getVar('bmh_measure') == _XNEWSLETTER_BMH_MEASURE_VAL_DELETE ) {
+ if ($bmhObj->getVar('bmh_measure') == _XNEWSLETTER_BMH_MEASURE_VAL_DELETE) {
redirect_header("?op=list&filter={$filter}'", 3, _AM_XNEWSLETTER_BMH_MEASURE_ALREADY_DELETED);
}
@@ -116,13 +121,17 @@
$sql = "UPDATE `{$xoopsDB->prefix('xnewsletter_subscr')}` INNER JOIN `{$xoopsDB->prefix('xnewsletter_catsubscr')}` ON `subscr_id` = `catsubscr_subscrid`";
$sql .= " SET `catsubscr_quited` = " . time();
$sql .= " WHERE (((`subscr_email`)='{$bmh_email}'))";
- if(!$result = $xoopsDB->queryF($sql)) die ('MySQL-Error: ' . mysql_error());
+ if (!$result = $xoopsDB->queryF($sql)) {
+ die ('MySQL-Error: ' . mysql_error());
+ }
}
//set bmh_measure for all entries in bmh with this email
$sql_upd = "UPDATE {$xoopsDB->prefix('xnewsletter_bmh')}";
$sql_upd .= " SET `bmh_measure` = '{$bmh_measure}', `bmh_submitter` = '{$xoopsUser->uid()}', `bmh_created` = '" . time() . "'";
$sql_upd .= " WHERE ((`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
- if(!$result = $xoopsDB->queryF($sql_upd)) die ('MySQL-Error: ' . mysql_error());
+ if (!$result = $xoopsDB->queryF($sql_upd)) {
+ die ('MySQL-Error: ' . mysql_error());
+ }
redirect_header("?op=list&filter={$filter}", 3, _AM_XNEWSLETTER_FORMOK);
@@ -139,40 +148,40 @@
if ($accountsCount > 0) {
$accountObjs = $xnewsletter->getHandler('accounts')->getAll($accountCriteria);
- $result_bmh = _AM_XNEWSLETTER_BMH_SUCCESSFUL . "<br/>";
+ $result_bmh = _AM_XNEWSLETTER_BMH_SUCCESSFUL . "<br/>";
foreach ($accountObjs as $account_id => $accountObj) {
- $bmh = new BounceMailHandler();
- $bmh->verbose = VERBOSE_SIMPLE; //VERBOSE_REPORT; //VERBOSE_DEBUG; //VERBOSE_QUIET; // default is VERBOSE_SIMPLE
+ $bmh = new BounceMailHandler();
+ $bmh->verbose = VERBOSE_SIMPLE; //VERBOSE_REPORT; //VERBOSE_DEBUG; //VERBOSE_QUIET; // default is VERBOSE_SIMPLE
//$bmh->use_fetchstructure = true; // true is default, no need to speficy
//$bmh->testmode = true; // false is default, no need to specify
//$bmh->debug_body_rule = false; // false is default, no need to specify
//$bmh->debug_dsn_rule = false; // false is default, no need to specify
//$bmh->purge_unprocessed = false; // false is default, no need to specify
- $bmh->disable_delete = true; // detected mails will be not deleted, default is false
+ $bmh->disable_delete = true; // detected mails will be not deleted, default is false
// for local mailbox (to process .EML files)
//$bmh->openLocalDirectory('/home/email/temp/mailbox');
//$bmh->processMailbox();
// for remote mailbox
- $bmh->mailhost = $accountObj->getVar('accounts_server_in'); // your mail server
- $bmh->mailbox_username = $accountObj->getVar('accounts_username'); // your mailbox username
- $bmh->mailbox_password = $accountObj->getVar('accounts_password'); // your mailbox password
- $bmh->port = $accountObj->getVar('accounts_port_in'); // the port to access your mailbox, default is 143
+ $bmh->mailhost = $accountObj->getVar('accounts_server_in'); // your mail server
+ $bmh->mailbox_username = $accountObj->getVar('accounts_username'); // your mailbox username
+ $bmh->mailbox_password = $accountObj->getVar('accounts_password'); // your mailbox password
+ $bmh->port = $accountObj->getVar('accounts_port_in'); // the port to access your mailbox, default is 143
if ($accountObj->getVar('accounts_type') == _XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3) {
$bmh->service = 'pop3'; // the service to use (imap or pop3), default is 'imap'
} else {
$bmh->service = 'imap'; // the service to use (imap or pop3), default is 'imap'
}
- $bmh->service_option = $accountObj->getVar('accounts_securetype_in'); // the service options (none, tls, notls, ssl, etc.), default is 'notls'
- $bmh->boxname = $accountObj->getVar('accounts_inbox'); // the mailbox to access, default is 'INBOX'
- $verif_movehard = $accountObj->getVar('accounts_movehard') == '1' ? true : false;
- $bmh->moveHard = $verif_movehard; // default is false
- $bmh->hardMailbox = $accountObj->getVar('accounts_hardbox'); // default is 'INBOX.hard' - NOTE: must start with 'INBOX.'
- $verif_movesoft = $accountObj->getVar('accounts_movesoft') == '1' ? true : false;
- $bmh->moveSoft = $verif_movesoft; // default is false
- $bmh->softMailbox = $accountObj->getVar('accounts_softbox'); // default is 'INBOX.soft' - NOTE: must start with 'INBOX.'
+ $bmh->service_option = $accountObj->getVar('accounts_securetype_in'); // the service options (none, tls, notls, ssl, etc.), default is 'notls'
+ $bmh->boxname = $accountObj->getVar('accounts_inbox'); // the mailbox to access, default is 'INBOX'
+ $verif_movehard = $accountObj->getVar('accounts_movehard') == '1' ? true : false;
+ $bmh->moveHard = $verif_movehard; // default is false
+ $bmh->hardMailbox = $accountObj->getVar('accounts_hardbox'); // default is 'INBOX.hard' - NOTE: must start with 'INBOX.'
+ $verif_movesoft = $accountObj->getVar('accounts_movesoft') == '1' ? true : false;
+ $bmh->moveSoft = $verif_movesoft; // default is false
+ $bmh->softMailbox = $accountObj->getVar('accounts_softbox'); // default is 'INBOX.soft' - NOTE: must start with 'INBOX.'
//$bmh->deleteMsgDate = '2009-01-05'; // format must be as 'yyyy-mm-dd'
// rest used regardless what type of connection it is
@@ -199,19 +208,22 @@
echo $indexAdmin->renderButton();
//
$arr_measure_type = array(
- _XNEWSLETTER_BMH_MEASURE_VAL_ALL=>_AM_XNEWSLETTER_BMH_MEASURE_ALL,
- _XNEWSLETTER_BMH_MEASURE_VAL_PENDING=>_AM_XNEWSLETTER_BMH_MEASURE_PENDING,
- _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING=>_AM_XNEWSLETTER_BMH_MEASURE_NOTHING,
- _XNEWSLETTER_BMH_MEASURE_VAL_QUIT=>_AM_XNEWSLETTER_BMH_MEASURE_QUITED,
- _XNEWSLETTER_BMH_MEASURE_VAL_DELETE=>_AM_XNEWSLETTER_BMH_MEASURE_DELETED);
+ _XNEWSLETTER_BMH_MEASURE_VAL_ALL => _AM_XNEWSLETTER_BMH_MEASURE_ALL,
+ _XNEWSLETTER_BMH_MEASURE_VAL_PENDING => _AM_XNEWSLETTER_BMH_MEASURE_PENDING,
+ _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING => _AM_XNEWSLETTER_BMH_MEASURE_NOTHING,
+ _XNEWSLETTER_BMH_MEASURE_VAL_QUIT => _AM_XNEWSLETTER_BMH_MEASURE_QUITED,
+ _XNEWSLETTER_BMH_MEASURE_VAL_DELETE => _AM_XNEWSLETTER_BMH_MEASURE_DELETED
+ );
- $limit = $xnewsletter->getConfig('adminperpage');
+ $limit = $xnewsletter->getConfig('adminperpage');
$bhmCriteria = new CriteriaCompo();
- if ($filter > -1) $criteria->add(new Criteria('bmh_measure', $filter));
+ if ($filter > -1) {
+ $criteria->add(new Criteria('bmh_measure', $filter));
+ }
$bhmCriteria->setSort('bmh_id');
$bhmCriteria->setOrder('DESC');
$bhmCount = $xnewsletter->getHandler('bmh')->getCount($bhmCriteria);
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = xnewsletterRequest::getInt('start', 0);
$bhmCriteria->setStart($start);
$bhmCriteria->setLimit($limit);
$bhmObjs = $xnewsletter->getHandler('bmh')->getAll($bhmCriteria);
@@ -227,23 +239,23 @@
echo "<table class='outer width100' cellspacing='1'><tr class='odd'><td>";
echo "<form id='form_filter' enctype='multipart/form-data' method='post' action='{$currentFile}' name='form_filter'>";
- $checked = ($filter == -1) ? "checked='checked'" : '';
+ $checked = ($filter == -1) ? "checked='checked'" : '';
echo "<input id='bmh_measure_all' type='radio' {$checked} value='-1' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
<label for='bmh_measure_all' name='bmh_measure_all'>" . _AM_XNEWSLETTER_BMH_MEASURE_ALL . "</label>";
- $checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_PENDING) ? "checked='checked'" : "";
+ $checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_PENDING) ? "checked='checked'" : "";
echo "<input id='bmh_measure0' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_PENDING . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
<label for='bmh_measure0' name='bmh_measure0'>" . _AM_XNEWSLETTER_BMH_MEASURE_PENDING . "</label>";
- $checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING) ? "checked='checked'" : "";
+ $checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING) ? "checked='checked'" : "";
echo "<input id='bmh_measure1' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
<label for='bmh_measure1' name='bmh_measure1'>" . _AM_XNEWSLETTER_BMH_MEASURE_NOTHING . "</label>";
- $checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_QUIT) ? "checked='checked'" : "";
+ $checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_QUIT) ? "checked='checked'" : "";
echo "<input id='bmh_measure2' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_QUIT . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()'>
<label for='bmh_measure2' name='bmh_measure2'>" . _AM_XNEWSLETTER_BMH_MEASURE_QUITED . "</label>";
- $checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_DELETE) ? "checked='checked'" : "";
+ $checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_DELETE) ? "checked='checked'" : "";
echo "<input id='bmh_measure3' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_DELETE . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
<label for='bmh_measure3' name='bmh_measure3'>" . _AM_XNEWSLETTER_BMH_MEASURE_DELETED . "</label>";
echo "</form>";
@@ -278,14 +290,19 @@
echo "<td>" . $bhmObj->getVar('bmh_email') . "</td>";
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'>" . formatTimeStamp($bhmObj->getVar("bmh_created"), "S") . "</td>";
- 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 . "/xn_catsubscr_temp.png alt='" . _AM_XNEWSLETTER_BMH_MEASURE_QUIT . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE_QUIT . "' /></a>";
- echo " <a href='?op=bmh_delsubscr&bmh_id=" . $bhm_id . "&filter=" . $filter . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_quit.png alt='" . _AM_XNEWSLETTER_BMH_MEASURE_DELETE . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE_DELETE . "' /></a>";
- echo " <a href='?op=edit_bmh&bmh_id=" . $bhm_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _AM_XNEWSLETTER_BMH_EDIT . "' title='" . _AM_XNEWSLETTER_BMH_EDIT . "' width='16px' /></a>";
- echo " <a href='?op=delete_bmh&bmh_id=" . $bhm_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _AM_XNEWSLETTER_BMH_DELETE . "' title='" . _AM_XNEWSLETTER_BMH_DELETE . "' width='16px' /></a>";
+ echo "<td class='center'>";
+ 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
+ . "/xn_catsubscr_temp.png alt='" . _AM_XNEWSLETTER_BMH_MEASURE_QUIT . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE_QUIT . "' /></a>";
+ echo " <a href='?op=bmh_delsubscr&bmh_id=" . $bhm_id . "&filter=" . $filter . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_quit.png alt='" . _AM_XNEWSLETTER_BMH_MEASURE_DELETE
+ . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE_DELETE . "' /></a>";
+ echo " <a href='?op=edit_bmh&bmh_id=" . $bhm_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _AM_XNEWSLETTER_BMH_EDIT . "' title='" . _AM_XNEWSLETTER_BMH_EDIT
+ . "' width='16px' /></a>";
+ echo " <a href='?op=delete_bmh&bmh_id=" . $bhm_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _AM_XNEWSLETTER_BMH_DELETE . "' title='"
+ . _AM_XNEWSLETTER_BMH_DELETE . "' width='16px' /></a>";
echo "</td>";
echo "</tr>";
}
@@ -306,18 +323,18 @@
}
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
- $bmhObj->setVar('bmh_rule_no', xnewsletterRequest::getString('bmh_rule_no', ''));
- $bmhObj->setVar('bmh_rule_cat', xnewsletterRequest::getString('bmh_rule_cat', ''));
+ $bmhObj->setVar('bmh_rule_no', xnewsletterRequest::getString('bmh_rule_no', ''));
+ $bmhObj->setVar('bmh_rule_cat', xnewsletterRequest::getString('bmh_rule_cat', ''));
$bmhObj->setVar('bmh_bouncetype', xnewsletterRequest::getString('bmh_bouncetype', ''));
- $bmhObj->setVar('bmh_remove', xnewsletterRequest::getString('bmh_remove', ''));
+ $bmhObj->setVar('bmh_remove', xnewsletterRequest::getString('bmh_remove', ''));
$bmh_email = xnewsletterRequest::getString('bmh_email', '');
$bmh_email = filter_var($bmh_email, FILTER_SANITIZE_EMAIL);
$bmh_email = xnewsletter_checkEmail($bmh_email);
- $bmhObj->setVar('bmh_email', $bmh_email);
- $bmhObj->setVar('bmh_subject', xnewsletterRequest::getString('bmh_subject', ''));
- $bmhObj->setVar('bmh_measure', xnewsletterRequest::getInt('bmh_measure', 0));
- $bmhObj->setVar('bmh_submitter', xnewsletterRequest::getInt('bmh_submitter', 0));
- $bmhObj->setVar('bmh_created', xnewsletterRequest::getInt('bmh_created', 0));
+ $bmhObj->setVar('bmh_email', $bmh_email);
+ $bmhObj->setVar('bmh_subject', xnewsletterRequest::getString('bmh_subject', ''));
+ $bmhObj->setVar('bmh_measure', xnewsletterRequest::getInt('bmh_measure', 0));
+ $bmhObj->setVar('bmh_submitter', xnewsletterRequest::getInt('bmh_subm...
[truncated message content] |
|
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] |
|
From: <luc...@us...> - 2014-09-16 21:48:14
|
Revision: 12785
http://sourceforge.net/p/xoops/svn/12785
Author: luciorota
Date: 2014-09-16 21:48:09 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
fixed bugs
code standardization
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php 2014-09-16 20:57:03 UTC (rev 12784)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php 2014-09-16 21:48:09 UTC (rev 12785)
@@ -41,8 +41,8 @@
$op = WfdownloadsRequest::getString('op', 'categories.list');
switch ($op) {
- case "category.move":
- case "move":
+ case 'category.move':
+ case 'move':
$ok = WfdownloadsRequest::getBool('ok', false, 'POST');
if ($ok == false) {
$cid = WfdownloadsRequest::getInt('cid', 0);
@@ -50,11 +50,11 @@
wfdownloads_xoops_cp_header();
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $sform = new XoopsThemeForm(_AM_WFDOWNLOADS_CCATEGORY_MOVE, "move", xoops_getenv('PHP_SELF'));
+ $sform = new XoopsThemeForm(_AM_WFDOWNLOADS_CCATEGORY_MOVE, 'move', xoops_getenv('PHP_SELF'));
$categoryObjs = $wfdownloads->getHandler('category')->getObjects();
- $mytree = new XoopsObjectTree($categoryObjs, "cid", "pid");
- $sform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_BMODIFY, $mytree->makeSelBox('target', 'title')));
+ $categoryObjsTree = new XoopsObjectTree($categoryObjs, 'cid', 'pid');
+ $sform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_BMODIFY, $categoryObjsTree->makeSelBox('target', 'title')));
$create_tray = new XoopsFormElementTray('', '');
$create_tray -> addElement(new XoopsFormHidden('source', $cid));
$create_tray -> addElement(new XoopsFormHidden('ok', true));
@@ -87,21 +87,22 @@
}
break;
- case "category.save" :
- case "addCat" :
+ case 'category.save':
+ case 'addCat':
$cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$pid = WfdownloadsRequest::getInt('pid', 0, 'POST');
- $weight = (isset($_POST['weight']) && $_POST['weight'] > 0) ? (int) $_POST["weight"] : 0;
+ $weight = (isset($_POST['weight']) && $_POST['weight'] > 0) ? (int) $_POST['weight'] : 0;
$down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
$up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
$spotlighthis = (isset($_POST['lid'])) ? (int) $_POST['lid'] : 0;
$spotlighttop = (isset($_POST['spotlighttop']) && ($_POST['spotlighttop'] == 1)) ? 1 : 0;
+ $imgurl = 'blank.png';
- include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
$allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
- $maxFileSize = $wfdownloads->getConfig('maxfilesize');
- $maxImgWidth = $wfdownloads->getConfig('maximgwidth');
- $maxImgHeight = $wfdownloads->getConfig('maximgheight');
+ $maxFileSize = $wfdownloads->getConfig('maxfilesize');
+ $maxImgWidth = $wfdownloads->getConfig('maximgwidth');
+ $maxImgHeight = $wfdownloads->getConfig('maximgheight');
$uploadDirectory = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage');
$uploader = new XoopsMediaUploader($uploadDirectory, $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
@@ -109,7 +110,7 @@
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
- redirect_header('javascript:history.go(-1)',3, $errors);
+ redirect_header('javascript:history.go(-1)', 3, $errors);
} else {
$imgurl = $uploader->getSavedFileName();
}
@@ -151,9 +152,7 @@
echo $categoryObj->getHtmlErrors();
}
if (!$cid) {
- if ($cid == 0) {
- $newid = (int) $categoryObj->getVar('cid');
- }
+ $newid = (int) $categoryObj->getVar('cid');
wfdownloads_savePermissions($down_groups, $newid, 'WFDownCatPerm');
wfdownloads_savePermissions($up_groups, $newid, 'WFUpCatPerm');
// Notify of new category
@@ -171,27 +170,28 @@
redirect_header($currentFile, 1, $database_mess);
break;
- case "category.delete" :
- case "del" :
+ case 'category.delete':
+ case 'del':
$cid = WfdownloadsRequest::getInt('cid', 0);
$ok = WfdownloadsRequest::getBool('ok', false, 'POST');
$categoryObjs = $wfdownloads->getHandler('category')->getObjects();
- $mytree = new XoopsObjectTree($categoryObjs, "cid", "pid");
+ $categoryObjsTree = new XoopsObjectTree($categoryObjs, 'cid', 'pid');
if ($ok == true) {
// get all subcategories under the specified category
- $arr = $mytree -> getAllChild($cid);
- foreach ($arr as $child) {
+ $childCategoryObjs = $categoryObjsTree->getAllChild($cid);
+ $cids = array();
+ foreach ($childCategoryObjs as $childCategoryObj) {
// get all category ids
- $cids[] = $child->getVar('cid');
+ $cids[] = $childCategoryObj->getVar('cid');
}
$cids[] = $cid;
- $criteria = new Criteria("cid", "(" . implode(',', $cids) . ")", "IN");
+ $criteria = new Criteria('cid', '(' . implode(',', $cids) . ')', 'IN');
//get list of downloads in these subcategories
$downloads = $wfdownloads->getHandler('download')->getList($criteria);
- $download_criteria = new Criteria("lid", "(" . implode(',', array_keys($downloads)) . ")", "IN");
+ $download_criteria = new Criteria('lid', '(' . implode(',', array_keys($downloads)) . ')', 'IN');
// now for each download, delete the text data and vote data associated with the download
$wfdownloads->getHandler('rating')->deleteAll($download_criteria);
@@ -219,9 +219,9 @@
}
break;
- case "category.add" :
- case "category.edit" :
- case "modCat":
+ case 'category.add':
+ case 'category.edit':
+ case 'modCat':
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
@@ -238,12 +238,12 @@
$form = $categoryObj->getForm();
$form -> display();
- include_once dirname(__FILE__) . '/admin_footer.php';
+ include 'admin_footer.php';
break;
- case 'categories.list' :
- case 'main' :
- default :
+ case 'categories.list':
+ case 'main':
+ default:
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
@@ -261,10 +261,10 @@
} else {
redirect_header("{$currentFile}?op=category.add", 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
}
- include_once dirname(__FILE__) . '/admin_footer.php';
+ include 'admin_footer.php';
break;
- case 'categories.reorder' :
+ case 'categories.reorder':
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
}
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-16 20:57:03 UTC (rev 12784)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-16 21:48:09 UTC (rev 12785)
@@ -41,9 +41,9 @@
$op = WfdownloadsRequest::getString('op', 'downloads.list');
switch ($op) {
- case 'download.edit':
- case 'download.add':
- case 'Download':
+ case "download.edit" :
+ case "download.add" :
+ case "Download" :
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
@@ -59,8 +59,8 @@
// Allowed mimetypes list
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_FILE_ALLOWEDAMIME . "</legend>\n";
echo "<div style='padding: 8px;'>\n";
- $criteria = new Criteria("mime_admin", true);
- $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
+ $criteria = new Criteria("mime_admin", true);
+ $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
$allowMimetypes = implode(' | ', $mimetypes);
echo $allowMimetypes;
echo "</div>\n";
@@ -83,7 +83,7 @@
} else {
// create download
$downloadObj = $wfdownloads->getHandler('download')->create();
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$categoryObj = $wfdownloads->getHandler('category')->get($cid);
$downloadObj->setVar('cid', $cid);
$title = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FILE_CREATE);
@@ -97,15 +97,15 @@
$sform = $downloadObj->getAdminForm($title);
} elseif ((isset($_POST['submit_category']) && !empty($_POST['submit_category']))) {
// two steps form: 2nd step
- $fid = $categoryObj->getVar('formulize_fid');
+ $fid = $categoryObj->getVar('formulize_fid');
$customArray = array();
if ($fid) {
- include_once XOOPS_ROOT_PATH . '/modules/formulize/include/formdisplay.php';
- include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
- $customArray['fid'] = $fid;
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $customArray['fid'] = $fid;
$customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
- $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues( // is a Formulize function
+ $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $customArray['prevEntry'] = getEntryValues( // is a Formulize function
$downloadObj->getVar('formulize_idreq'),
$customArray['formulize_mgr'],
$customArray['groups'],
@@ -117,14 +117,14 @@
null
);
$customArray['entry'] = $downloadObj->getVar('formulize_idreq');
- $customArray['go_back'] = '';
- $customArray['parentLinks'] = '';
+ $customArray['go_back'] = "";
+ $customArray['parentLinks'] = "";
if (wfdownloads_checkModule('formulize') < 300) {
$owner = getEntryOwner($customArray['entry']); // is a Formulize function
} else {
$owner = getEntryOwner($customArray['entry'], $fid); // is a Formulize function
}
- $ownerGroups = $member_handler->getGroupsByUser($owner, false);
+ $ownerGroups = $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $ownerGroups;
}
$sform = $downloadObj->getAdminForm($title22, $customArray);
@@ -141,29 +141,29 @@
// Vote data list/manager
if ($lid) {
- $ratingCount = $wfdownloads->getHandler('rating')->getCount();
+ $votes_count = $wfdownloads->getHandler('rating')->getCount();
- $regUserCriteria = new CriteriaCompo(new Criteria('lid', $lid));
- $regUserCriteria->add(new Criteria('ratinguser', 0, '>'));
- $regUserRatingCount = $wfdownloads->getHandler('rating')->getCount($regUserCriteria);
- $regUserCriteria->setSort('ratingtimestamp');
- $regUserCriteria->setOrder('DESC');
- $regUserRatingObjs = $wfdownloads->getHandler('rating')->getObjects($regUserCriteria);
+ $registeredCriteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $registeredCriteria->add(new Criteria('ratinguser', 0, '>'));
+ $votesreg = $wfdownloads->getHandler('rating')->getCount($registeredCriteria);
+ $registeredCriteria->setSort('ratingtimestamp');
+ $registeredCriteria->setOrder('DESC');
+ $regvotes = $wfdownloads->getHandler('rating')->getObjects($registeredCriteria);
- $anonUserCriteria = new CriteriaCompo(new Criteria('lid', $lid));
- $anonUserCriteria->add(new Criteria('ratinguser', 0, '='));
- $anonUserRatingCount = $wfdownloads->getHandler('rating')->getCount($anonUserCriteria);
- $anonUserCriteria->setSort('ratingtimestamp');
- $anonUserCriteria->setOrder('DESC');
+ $anonymousCriteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $anonymousCriteria->add(new Criteria('ratinguser', 0, '='));
+ $votesanon = $wfdownloads->getHandler('rating')->getCount($anonymousCriteria);
+ $anonymousCriteria->setSort('ratingtimestamp');
+ $anonymousCriteria->setOrder('DESC');
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_VOTE_RATINGINFOMATION . "</legend>\n";
- echo "<div style='padding: 8px;'><b>" . _AM_WFDOWNLOADS_VOTE_TOTALVOTES . "</b>{$ratingCount}<br /><br />\n";
+ echo "<div style='padding: 8px;'><b>" . _AM_WFDOWNLOADS_VOTE_TOTALVOTES . "</b>{$votes_count}<br /><br />\n";
- printf(_AM_WFDOWNLOADS_VOTE_REGUSERVOTES, $regUserRatingCount);
+ printf(_AM_WFDOWNLOADS_VOTE_REGUSERVOTES, $votesreg);
echo "<br />";
- printf(_AM_WFDOWNLOADS_VOTE_ANONUSERVOTES, $anonUserRatingCount);
+ printf(_AM_WFDOWNLOADS_VOTE_ANONUSERVOTES, $votesanon);
echo "
</div>\n
@@ -179,32 +179,37 @@
</tr>\n
";
- if ($regUserRatingCount == 0) {
+ if ($votesreg == 0) {
echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOREGVOTES . "</b></td></tr>";
} else {
- foreach ($regUserRatingObjs as $regUserRatingObj) {
- $uids[] = $regUserRatingObj->getVar('ratinguser');
+ $uids = array();
+ foreach (array_keys($regvotes) as $i) {
+ $uids[] = $regvotes[$i]->getVar('ratinguser');
}
- $criteria = new Criteria('ratinguser', '(' . implode(',', $uids) . ')', 'IN');
- $criteria->setGroupby('ratinguser');
+ $criteria = new Criteria("ratinguser", "(" . implode(',', $uids) . ")", "IN");
+ $criteria->setGroupby("ratinguser");
$userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
- foreach ($regUserRatingObjs as $regUserRatingObj) {
- $formatted_date = XoopsLocal::formatTimestamp($regUserRatingObj->getVar('ratingtimestamp'), 'l');
- $userAvgRating = isset($userRatings[$regUserRatingObj->getVar('ratinguser')]) ? $userRatings[$regUserRatingObj->getVar('ratinguser')]['avg'] : 0;
- $userVotes = isset($userRatings[$regUserRatingObj->getVar('ratinguser')]) ? $userRatings[$regUserRatingObj->getVar('ratinguser')]['count'] : 0;
- $ratingUserName = XoopsUser :: getUnameFromId($regUserRatingObj->getVar('ratinguser'));
+ foreach (array_keys($regvotes) as $i) {
+ $formatted_date = XoopsLocal::formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), 'l');
+ $userAvgRating = isset($userRatings[$regvotes[$i]->getVar('ratinguser')]) ? $userRatings[$regvotes[$i]->getVar(
+ 'ratinguser'
+ )]["avg"] : 0;
+ $userVotes = isset($userRatings[$regvotes[$i]->getVar('ratinguser')]) ? $userRatings[$regvotes[$i]->getVar(
+ 'ratinguser'
+ )]["count"] : 0;
+ $ratingUserName = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
echo "
<tr><td class='head'>$ratingUserName</td>\n
- <td class='even'>" . $regUserRatingObj->getVar('ratinghostname') . "</th>\n
- <td class='even'>" . $regUserRatingObj->getVar('rating') . "</th>\n
+ <td class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
<td class='even'>$userAvgRating</th>\n
<td class='even'>$userVotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regUserRatingObj->getVar('ratingid') . "'>"
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>"
. $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
@@ -224,29 +229,29 @@
<th>" . _AM_WFDOWNLOADS_MINDEX_ACTION . "</td>\n
</tr>\n
";
- if ($anonUserRatingCount == 0) {
+ if ($votesanon == 0) {
echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOUNREGVOTES . "</b></td></tr>";
} else {
- $criteria = new Criteria('ratinguser', 0);
- $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
- $anonUserRatingObjs = $wfdownloads->getHandler('rating')->getObjects($anonUserCriteria);
+ $criteria = new Criteria('ratinguser', 0);
+ $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+ $anonymousVotes = $wfdownloads->getHandler('rating')->getObjects($anonymousCriteria);
- foreach (array_keys($anonUserRatingObjs) as $anonUserRatingObj) {
- $formatted_date = XoopsLocal::formatTimestamp($anonUserRatingObj->getVar('ratingtimestamp'), 'l');
- $userAvgRating = isset($userRatings['avg']) ? $userRatings['avg'] : 0;
- $userVotes = isset($userRatings['count']) ? $userRatings['count'] : 0;
+ foreach (array_keys($anonymousVotes) as $i) {
+ $formatted_date = XoopsLocal::formatTimestamp($anonymousVotes[$i]->getVar('ratingtimestamp'), 'l');
+ $userAvgRating = isset($userRatings['avg']) ? $userRatings["avg"] : 0;
+ $userVotes = isset($userRatings['count']) ? $userRatings["count"] : 0;
$ratingUserName = $GLOBALS['xoopsConfig']['anonymous'];
echo "
<tr><td class='head'>$ratingUserName</td>\n
- <td class='even'>" . $anonUserRatingObj->getVar('ratinghostname') . "</th>\n
- <td class='even'>" . $anonUserRatingObj->getVar('rating') . "</th>\n
+ <td class='even'>" . $anonymousVotes[$i]->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $anonymousVotes[$i]->getVar('rating') . "</th>\n
<td class='even'>$userAvgRating</th>\n
<td class='even'>$userVotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonUserRatingObj->getVar('ratingid') . "'>"
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonymousVotes[$i]->getVar('ratingid') . "'>"
. $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
@@ -255,32 +260,32 @@
echo "</table>\n";
echo "</fieldset>\n";
}
- include_once dirname(__FILE__) . '/admin_footer.php';
+ include 'admin_footer.php';
break;
- case 'download.save':
- case 'addDownload':
- $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ case "download.save" :
+ case "addDownload" :
+ $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$status = WfdownloadsRequest::getInt('status', _WFDOWNLOADS_STATUS_UPDATED, 'POST');
if ($lid > 0) {
$thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
- $downloadObj = $wfdownloads->getHandler('download')->get($lid);
+ $downloadObj = $wfdownloads->getHandler('download')->get($lid);
} else {
$thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
- $downloadObj = $wfdownloads->getHandler('download')->create();
+ $downloadObj = $wfdownloads->getHandler('download')->create();
}
// Define URL
if (empty($_FILES['userfile']['name'])) {
- if ($_POST['url'] && $_POST['url'] != '' && $_POST['url'] != "http://") {
- $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
+ if ($_POST['url'] && $_POST['url'] != "" && $_POST['url'] != "http://") {
+ $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
$filename = '';
$filetype = '';
// Get size from form
$size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int) $_POST["size"];
} else {
- $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
+ $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
$filename = $_POST['filename'];
$filetype = $_POST['filetype'];
$filePath = $wfdownloads->getConfig('uploaddir') . '/' . $filename;
@@ -291,12 +296,12 @@
$downloadObj->setVar('filename', $filename);
$downloadObj->setVar('filetype', $filetype);
} else {
- $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
- $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
- $size = $down['size'];
+ $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
+ $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
+ $size = $down['size'];
$title = $_FILES['userfile']['name'];
- $ext = rtrim(strrchr($title, '.'), '.');
+ $ext = rtrim(strrchr($title, '.'), '.');
$title = str_replace($ext, '', $title);
$title = (isset($_POST['title_checkbox']) && $_POST['title_checkbox'] == 1) ? $title : trim($_POST['title']);
@@ -325,11 +330,11 @@
// If both conditions are true, then trigger all three notifications related to modified records.
if (!$thisIsANewRecord && ($downloadObj->getVar('version') != $version)) {
// Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $categoryObj = $wfdownloads->getHandler('category')->get($cid);
- $tags['FILE_VERSION'] = $version;
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $tags['FILE_VERSION'] = $version;
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid='{$cid}";
@@ -375,12 +380,12 @@
$versiontypes = (isset($_POST['versiontypes'])) ? $_POST['versiontypes'] : '';
$downloadObj->setVar('versiontypes', $versiontypes);
- $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
+ $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
$dhistoryhistory = (isset($_POST['dhistoryaddedd'])) ? $_POST['dhistoryaddedd'] : '';
if ($lid > 0 && !empty($dhistoryhistory)) {
$dhistory = $dhistory . "\n\n";
- $time = time();
+ $time = time();
$dhistory .= _AM_WFDOWNLOADS_FILE_HISTORYVERS . $version . _AM_WFDOWNLOADS_FILE_HISTORDATE . XoopsLocal::formatTimestamp($time, 'l') . "\n\n";
$dhistory .= $dhistoryhistory;
}
@@ -396,7 +401,7 @@
$offline = ($_POST['offline'] == true) ? true : false;
$downloadObj->setVar('offline', $offline);
- $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
+ $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
$notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == true);
$expiredate = 0;
@@ -404,7 +409,7 @@
$publishdate = time();
} else {
$publishdate = $_POST['was_published'];
- $expiredate = $_POST['was_expired'];
+ $expiredate = $_POST['was_expired'];
}
if ($approved == 1 && empty($publishdate)) {
$publishdate = time();
@@ -436,8 +441,8 @@
if (wfdownloads_checkModule('formulize')) {
$fid = $categoryObj->getVar('formulize_fid');
if ($fid) {
- include_once XOOPS_ROOT_PATH . '/modules/formulize/include/formread.php';
- include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formread.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
$formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
if ($lid) {
$entries[$fid][0] = $downloadObj->getVar('formulize_idreq');
@@ -448,19 +453,19 @@
$owner = getEntryOwner($entries[$fid][0], $fid); // is a Formulize function
}
} else {
- print 'no idreq';
- $entries[$fid][0] = '';
- $owner = '';
+ print "no idreq";
+ $entries[$fid][0] = "";
+ $owner = "";
}
$cid = $downloadObj->getVar('cid');
} else {
- $entries[$fid][0] = '';
- $owner = '';
+ $entries[$fid][0] = "";
+ $owner = "";
}
- $ownerGroups = $member_handler->getGroupsByUser($owner, false);
- $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
- $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $entries = handleSubmission(
+ $ownerGroups =& $member_handler->getGroupsByUser($owner, false);
+ $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+ $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $entries = handleSubmission(
$formulize_mgr,
$entries,
$uid,
@@ -468,7 +473,7 @@
$fid,
$ownerGroups,
$groups,
- 'new'
+ "new"
); // "new" causes xoops token check to be skipped, since Wfdownloads should be doing that
if (!$owner) {
$id_req = $entries[$fid][0];
@@ -481,21 +486,21 @@
$newid = (int) $downloadObj->getVar('lid');
// Send notifications
if (!$lid) {
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
}
if ($lid && $approved && $notifypub) {
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
$notification_handler->triggerEvent('file', $lid, 'approve', $tags);
@@ -506,9 +511,9 @@
redirect_header($currentFile, 1, $message);
break;
- case 'download.delete':
+ case "download.delete" :
$lid = WfdownloadsRequest::getInt('lid', 0);
- $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
+ $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
if (!$downloadObj = $wfdownloads->getHandler('download')->get($lid)) {
redirect_header($currentFile, 4, _AM_WFDOWNLOADS_ERROR_DOWNLOADNOTFOUND);
exit();
@@ -540,17 +545,17 @@
}
break;
- case 'vote.delete':
- case 'delVote':
- $ratingObj = $wfdownloads->getHandler('rating')->get($_GET['rid']);
- if ($wfdownloads->getHandler('rating')->delete($ratingObj, true)) {
- wfdownloads_updateRating((int) $ratingObj->getVar('lid'));
+ case "vote.delete" :
+ case "delVote" :
+ $rating = $wfdownloads->getHandler('rating')->get($_GET['rid']);
+ if ($wfdownloads->getHandler('rating')->delete($rating, true)) {
+ wfdownloads_updateRating(intval($rating->getVar('lid')));
}
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_VOTE_VOTEDELETED);
break;
// Formulize module support (2006/05/04) jpc - start
- case 'patch_formulize':
+ case "patch_formulize" :
if (wfdownloads_checkModule('formulize')) {
if (!isset($_POST['patch_formulize'])) {
print "<form action=\"{$currentFile}?op=patch_formulize\" method=post>";
@@ -572,8 +577,8 @@
break;
// Formulize module support (2006/05/04) jpc - end
- case 'newdownload.approve':
- case 'approve':
+ case "newdownload.approve" :
+ case "approve" :
$lid = WfdownloadsRequest::getInt('lid', 0);
if (!$downloadObj = $wfdownloads->getHandler('download')->get($lid)) {
redirect_header($currentFile, 4, _AM_WFDOWNLOADS_ERROR_DOWNLOADNOTFOUND);
@@ -587,14 +592,14 @@
exit();
}
// Trigger notify
- $title = $downloadObj->getVar('title');
- $cid = $downloadObj->getVar('cid');
- $categoryObj = $wfdownloads->getHandler('category')->get($cid);
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $title = $downloadObj->getVar('title');
+ $cid = $downloadObj->getVar('cid');
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
if ($downloadObj->getVar('notifypub')) {
@@ -603,18 +608,17 @@
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_SUB_NEWFILECREATED);
break;
- case 'downloads.list':
- case 'downloads.filter':
+ case "downloads.list" :
+ case "downloads.filter" :
default :
- // get filter conditions
- $filter_title_condition = WfdownloadsRequest::getString('filter_title_condition', '=');
- $filter_title = WfdownloadsRequest::getString('filter_title', '');
+ $filter_title_condition = WfdownloadsRequest::getString('filter_title_condition', '=');
+ $filter_title = WfdownloadsRequest::getString('filter_title', '');
$filter_category_title_condition = WfdownloadsRequest::getString('filter_category_title_condition', '=');
- $filter_category_title = WfdownloadsRequest::getString('filter_category_title', '');
- $filter_submitter = WfdownloadsRequest::getArray('filter_submitter', null);
- $filter_date = WfdownloadsRequest::getArray('filter_date', null);
- $filter_date_condition = WfdownloadsRequest::getString('filter_date_condition', '<');
- // check filter conditions
+ $filter_category_title = WfdownloadsRequest::getString('filter_category_title', '');
+ $filter_submitter = WfdownloadsRequest::getArray('filter_submitter', null);
+ $filter_date = WfdownloadsRequest::getArray('filter_date', null);
+ $filter_date_condition = WfdownloadsRequest::getString('filter_date_condition', '<');
+
if ($op == 'downloads.filter') {
if ($filter_title == '' && $filter_category_title == '' && is_null($filter_submitter)) {
$op = 'downloads.list';
@@ -623,16 +627,16 @@
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
+ $categories = $wfdownloads->getHandler('category')->getObjects();
- $start_published = WfdownloadsRequest::getInt('start_published', 0);
- $start_new = WfdownloadsRequest::getInt('start_new', 0);
+ $start_published = WfdownloadsRequest::getInt('start_published', 0);
+ $start_new = WfdownloadsRequest::getInt('start_new', 0);
$start_autopublished = WfdownloadsRequest::getInt('start_autopublished', 0);
- $start_expired = WfdownloadsRequest::getInt('start_expired', 0);
- $start_offline = WfdownloadsRequest::getInt('start_offline', 0);
+ $start_expired = WfdownloadsRequest::getInt('start_expired', 0);
+ $start_offline = WfdownloadsRequest::getInt('start_offline', 0);
$totalCategoriesCount = wfdownloads_categoriesCount();
- $categoryObjs = $wfdownloads->getHandler('category')->getObjects(null, true, false);
+ $categories = $wfdownloads->getHandler('category')->getObjects(null, true, false);
$totalDownloadsCount = $wfdownloads->getHandler('download')->getCount();
@@ -680,13 +684,13 @@
$criteria->setOrder('DESC');
$criteria->setStart($start_published);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $publishedDownloadObjs = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
- $publishedDownloadCount = $wfdownloads->getHandler('download')->getActiveCount();
- $GLOBALS['xoopsTpl']->assign('published_downloads_count', $publishedDownloadCount);
+ $publishedDownloads = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
+ $publishedDownloadsCount = $wfdownloads->getHandler('download')->getActiveCount();
+ $GLOBALS['xoopsTpl']->assign('published_downloads_count', $publishedDownloadsCount);
- if ($publishedDownloadCount > 0) {
- foreach ($publishedDownloadObjs as $publishedDownloadObj) {
- $publishedDownload_array = $publishedDownloadObj->toArray();
+ if ($publishedDownloadsCount > 0) {
+ foreach ($publishedDownloads as $publishedDownload) {
+ $publishedDownload_array = $publishedDownload->toArray();
$publishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($publishedDownload_array['title']));
$publishedDownload_array['category_title'] = $categories[$publishedDownload_array['cid']]['title'];
$publishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($publishedDownload_array['submitter']);
@@ -720,12 +724,12 @@
$criteria->add(new Criteria('published', 0));
$criteria->setStart($start_new);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $newDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
- $newDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('new_downloads_count', $newDownloadCount);
- if ($newDownloadCount > 0) {
- foreach ($newDownloadObjs as $newDownloadObj) {
- $newDownload_array = $newDownloadObj->toArray();
+ $newDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $newDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('new_downloads_count', $newDownloadsCount);
+ if ($newDownloadsCount > 0) {
+ foreach ($newDownloads as $newDownload) {
+ $newDownload_array = $newDownload->toArray();
$newDownload_array['rating'] = number_format($newDownload_array['rating'], 2);
$newDownload_array['title_html'] = $myts->htmlSpecialChars($newDownload_array['title']);
$newDownload_array['category_title'] = $categories[$newDownload_array['cid']]['title'];
@@ -740,7 +744,7 @@
$GLOBALS['xoopsTpl']->append('new_downloads', $newDownload_array);
}
}
- $pagenav = new XoopsPageNav($newDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_new, 'start_new');
+ $pagenav = new XoopsPageNav($newDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_new, 'start_new');
$GLOBALS['xoopsTpl']->assign('new_downloads_pagenav', $pagenav->renderNav());
// Autopublished Downloads
@@ -750,12 +754,12 @@
$criteria->setOrder("ASC");
$criteria->setStart($start_autopublished);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $autopublishedDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
- $autopublishedDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('autopublished_downloads_count', $autopublishedDownloadCount);
- if ($autopublishedDownloadCount > 0) {
- foreach ($autopublishedDownloadObjs as $autopublishedDownloadObj) {
- $autopublishedDownload_array = $autopublishedDownloadObj->toArray();
+ $autopublishedDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $autopublishedDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('autopublished_downloads_count', $autopublishedDownloadsCount);
+ if ($autopublishedDownloadsCount > 0) {
+ foreach ($autopublishedDownloads as $autopublishedDownload) {
+ $autopublishedDownload_array = $autopublishedDownload->toArray();
$autopublishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($autopublishedDownload_array['title']));
$autopublishedDownload_array['category_title'] = $categories[$autopublishedDownload_array['cid']]['title'];
$autopublishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($autopublishedDownload_array['submitter']);
@@ -763,7 +767,7 @@
$GLOBALS['xoopsTpl']->append('autopublished_downloads', $autopublishedDownload_array);
}
}
- $pagenav = new XoopsPageNav($autopublishedDownloadCount, $wfdownloads->getConfig(
+ $pagenav = new XoopsPageNav($autopublishedDownloadsCount, $wfdownloads->getConfig(
'admin_perpage'
), $start_autopublished, 'start_autopublished');
$GLOBALS['xoopsTpl']->assign('autopublished_downloads_pagenav', $pagenav->renderNav());
@@ -776,12 +780,12 @@
$criteria->setOrder('ASC');
$criteria->setStart($start_expired);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $expiredDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
- $expiredDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expiredDownloadCount);
- if ($expiredDownloadCount > 0) {
- foreach ($expiredDownloadObjs as $expiredDownloadObj) {
- $expired_download_array = $expiredDownloadObj->toArray();
+ $expired_downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $expiredDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expiredDownloadsCount);
+ if ($expiredDownloadsCount > 0) {
+ foreach ($expired_downloads as $expired_download) {
+ $expired_download_array = $expired_download->toArray();
$expired_download_array['title_html'] = $myts->htmlSpecialChars(trim($expired_download_array['title']));
$expired_download_array['category_title'] = $categories[$expired_download_array['cid']]['title'];
$expired_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($expired_download_array['submitter']);
@@ -789,7 +793,7 @@
$GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
}
}
- $pagenav = new XoopsPageNav($expiredDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_expired, 'start_expired');
+ $pagenav = new XoopsPageNav($expiredDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_expired, 'start_expired');
$GLOBALS['xoopsTpl']->assign('expired_downloads_pagenav', $pagenav->renderNav());
// Offline downloads
@@ -798,12 +802,13 @@
$criteria->setOrder('ASC');
$criteria->setStart($start_offline);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $offlineDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
- $offlineDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('offline_downloads_count', $offlineDownloadCount);
- if ($offlineDownloadCount > 0) {
- foreach ($offlineDownloadObjs as $offlineDownloadObj) {
- $offlineDownload_array = $offlineDownloadObj->toArray();
+ $offlineDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $offlineDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $offlineDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('offline_downloads_count', $offlineDownloadsCount);
+ if ($offlineDownloadsCount > 0) {
+ foreach ($offlineDownloads as $offlineDownload) {
+ $offlineDownload_array = $offlineDownload->toArray();
$offlineDownload_array['title_html'] = $myts->htmlSpecialChars(trim($offlineDownload_array['title']));
$offlineDownload_array['category_title'] = $categories[$offlineDownload_array['cid']]['title'];
$offlineDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($offlineDownload_array['submitter']);
@@ -811,7 +816,7 @@
$GLOBALS['xoopsTpl']->append('offline_downloads', $offlineDownload_array);
}
}
- $pagenav = new XoopsPageNav($offlineDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_offline, 'start_offline');
+ $pagenav = new XoopsPageNav($offlineDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_offline, 'start_offline');
$GLOBALS['xoopsTpl']->assign('offline_downloads_pagenav', $pagenav->renderNav());
} else {
// NOP
@@ -839,10 +844,10 @@
$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_downloadslist.tpl");
- include_once dirname(__FILE__) . '/admin_footer.php';
+ include 'admin_footer.php';
break;
- case 'batchfile.add':
+ case "batchfile.add" :
$batchid = WfdownloadsRequest::getInt('batchid', 0);
$extensionToMime = include $GLOBALS['xoops']->path('include/mimetypes.inc.php');
@@ -869,6 +874,7 @@
$downloadObj->setVar('filename', $savedFileName);
$downloadObj->setVar('size', filesize($wfdownloads->getConfig('uploaddir') . '/' . $savedFileName));
$downloadObj->setVar('filetype', $extensionToMime[pathinfo($batchFile, PATHINFO_EXTENSION)]);
+
$downloadObj->setVar('version', 0);
$downloadObj->setVar('status', _WFDOWNLOADS_STATUS_APPROVED); // IN PROGRESS
$downloadObj->setVar('published', time());
@@ -887,7 +893,7 @@
redirect_header("{$currentFile}?op=download.edit&lid={$newid}", 3, _AM_WFDOWNLOADS_BATCHFILE_MOVEDEDITNOW);
break;
- case 'batchfile.delete':
+ case "batchfile.delete" :
$batchid = WfdownloadsRequest::getInt('batchid', 0);
$ok = WfdownloadsRequest::getBool('ok', false, 'POST');
@@ -917,7 +923,7 @@
}
break;
- case 'ip_logs.list':
+ case "ip_logs.list" :
$lid = WfdownloadsRequest::getInt('lid', 0);
if (!$lid) {
header('Location index.php');
@@ -938,15 +944,15 @@
}
$criteria->setSort('date');
$criteria->setOrder('DESC');
- $ip_logObjs = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
- $ip_logCount = $wfdownloads->getHandler('ip_log')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('ip_logs_count', $ip_logCount);
+ $ip_logObjs = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
+ $ip_logs_count = $wfdownloads->getHandler('ip_log')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('ip_logs_count', $ip_logs_count);
unset($criteria);
// Get download info
if ($lid != 0) {
- $downloadObj = $wfdownloads->getHandler('download')->get($lid);
- $download_array = $downloadObj->toArray();
+ $downloadObj = $wfdownloads->getHandler('download')->get($lid);
+ $download_array = $downloadObj->toArray();
$download_array['log_title'] = sprintf(_AM_WFDOWNLOADS_LOG_FOR_LID, $download_array['title']);
$GLOBALS['xoopsTpl']->assign('download', $download_array);
}
@@ -967,8 +973,8 @@
// NOP
} else {
foreach ($ip_logObjs as $ip_logObj) {
- $ip_log_array = $ip_logObj->toArray();
- $ip_log_array['uname'] = XoopsUserUtility::getUnameFromId(
+ $ip_log_array = $ip_logObj->toArray();
+ $ip_log_array['uname'] = XoopsUserUtility::getUnameFromId(
$ip_log_array['uid']
);
//($ip_log_array['uid'] != 0) ? $userList[$ip_log_array['uid']] : _AM_WFDOWNLOADS_ANONYMOUS;
@@ -979,6 +985,6 @@
$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_ip_logslist.tpl");
- include_once dirname(__FILE__) . '/admin_footer.php';
+ include 'admin_footer.php';
break;
}
|
|
From: <luc...@us...> - 2014-09-16 20:57:06
|
Revision: 12784
http://sourceforge.net/p/xoops/svn/12784
Author: luciorota
Date: 2014-09-16 20:57:03 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
fixed bug
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/search.inc.php
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/functions.php 2014-09-16 20:35:59 UTC (rev 12783)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/functions.php 2014-09-16 20:57:03 UTC (rev 12784)
@@ -904,7 +904,7 @@
}
$averageRating = $totalRating / $ratings_count;
$averageRating = number_format($averageRating, 4);
- $downloadOb = $wfdownloads->getHandler('download')->get($lid);
+ $downloadObj = $wfdownloads->getHandler('download')->get($lid);
$downloadObj->setVar('rating', $averageRating);
$downloadObj->setVar('votes', $ratings_count);
$wfdownloads->getHandler('download')->insert($downloadObj);
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/search.inc.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/search.inc.php 2014-09-16 20:35:59 UTC (rev 12783)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/search.inc.php 2014-09-16 20:57:03 UTC (rev 12784)
@@ -56,6 +56,8 @@
// because count() returns 1 even if a supplied variable
// is not an array, we must check if $querryarray is really an array
$queryArray_count = 0;
+ $downloadObjs = array();
+
if ((is_array($queryArray) && $queryArray_count = count($queryArray)) || $userId != 0) {
// $userId != 0 added August 13 2007 -- ACCOUNTS FOR CASES WHERE THERE ARE NO QUERY TERMS BUT A USER ID IS PASSED -- FREEFORM SOLUTIONS
if ($queryArray_count == 0) {
@@ -123,7 +125,6 @@
}
}
- $downloadObjs = array();
// Loop through all query terms
for ($i = 0; $i < $queryArray_count; ++$i) {
// Make a copy of the $criteria for use with this term only
|
|
From: <luc...@us...> - 2014-09-16 20:36:10
|
Revision: 12783
http://sourceforge.net/p/xoops/svn/12783
Author: luciorota
Date: 2014-09-16 20:35:59 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
standardize code
fixed bug in module update procedure
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/attachment.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/bmh.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/cat.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/task.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/template.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/changelog.txt
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/install.txt
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/constants.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/sql/mysql.sql
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php
Added Paths:
-----------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/update.txt
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -221,6 +221,7 @@
$protocolObjs = $xnewsletter->getHandler('protocol')->getAll($protocolCriteria);
$protocol_status = '';
$protocol_letter_id = 0;
+// why foreach?
foreach ($protocolObjs as $protocolObj) {
$protocol_status .= $protocolObj->getVar('protocol_status');
$protocol_letter_id = $protocolObj->getVar('protocol_letter_id');
@@ -396,7 +397,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/luciorota/xnewsletter/class/attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/attachment.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/attachment.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -83,7 +83,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/luciorota/xnewsletter/class/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/bmh.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/bmh.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -43,17 +43,17 @@
public function __construct()
{
$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->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);
}
/**
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/cat.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/cat.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -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/luciorota/xnewsletter/class/catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/catsubscr.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/catsubscr.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -43,7 +43,7 @@
public function __construct()
{
$this->xnewsletter = xnewsletterxnewsletter::getInstance();
- $this->db = XoopsDatabaseFactory::getDatabaseConnection();
+ $this->db = XoopsDatabaseFactory::getDatabaseConnection();
$this->initVar('catsubscr_id', XOBJ_DTYPE_INT, null, false);
$this->initVar('catsubscr_catid', XOBJ_DTYPE_INT, null, false);
$this->initVar('catsubscr_subscrid', XOBJ_DTYPE_INT, null, false);
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -43,16 +43,16 @@
public function __construct()
{
$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->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
}
/**
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/letter.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/letter.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -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
}
/**
@@ -166,7 +166,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');
@@ -183,7 +183,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/luciorota/xnewsletter/class/mailinglist.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/mailinglist.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/mailinglist.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -43,15 +43,15 @@
public function __construct()
{
$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->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);
}
/**
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -36,6 +36,14 @@
{
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
/**
*
@@ -43,14 +51,16 @@
public function __construct()
{
$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->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); // 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/luciorota/xnewsletter/class/subscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -43,19 +43,19 @@
public function __construct()
{
$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->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);
}
/**
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/task.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/task.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/task.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -37,14 +37,14 @@
public function __construct()
{
$this->xnewsletter = xnewsletterxnewsletter::getInstance();
- $this->db = XoopsDatabaseFactory::getDatabaseConnection();
+ $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/luciorota/xnewsletter/class/template.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/template.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/template.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -43,13 +43,13 @@
public function __construct()
{
$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->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);
}
/**
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/changelog.txt 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/changelog.txt 2014-09-16 20:35:59 UTC (rev 12783)
@@ -2,6 +2,7 @@
-------------------------------
- standardize code (mamba,luciorota)
- import procedure: check if limit options are compatible with php.ini 'max_input_vars' setting (luciorota)
+ - update procedure: rename module's directory name to lowercase (luciorota)
- templatize user side (luciorota)
- added: send attachment as email attachment or as link (luciorota)
- added: possibility to choose the maximum number of attachments (luciorota)
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/install.txt
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/install.txt 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/install.txt 2014-09-16 20:35:59 UTC (rev 12783)
@@ -1,3 +1,4 @@
Read Me First
=============
-Install this module usually in /modules
\ No newline at end of file
+1. Copy this module in /modules directory
+2. Install this module as usually
Added: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/update.txt
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/update.txt (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/docs/update.txt 2014-09-16 20:35:59 UTC (rev 12783)
@@ -0,0 +1,5 @@
+Read Me First
+=============
+1. Delete old /modules/xNewsletter directory
+2. Copy this module in /modules directory
+3. Update this module
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/constants.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/constants.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/constants.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -19,38 +19,46 @@
* @version svn:$id$
*/
// constants for accounts
-define("_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL", 1);
-define("_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL", 2);
-define("_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3", 3);
-define("_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP", 4);
-define("_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL", 5);
+define('_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL', 1);
+define('_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL', 2);
+define('_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3', 3);
+define('_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP', 4);
+define('_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL', 5);
-define("_XNEWSLETTER_ACCOUNTS_TYPE_INBOX", "INBOX");
-define("_XNEWSLETTER_ACCOUNTS_TYPE_HARDBOX", "INBOX.hard");
-define("_XNEWSLETTER_ACCOUNTS_TYPE_SOFTBOX", "INBOX.soft");
+define('_XNEWSLETTER_ACCOUNTS_TYPE_INBOX', 'INBOX');
+define('_XNEWSLETTER_ACCOUNTS_TYPE_HARDBOX', 'INBOX.hard');
+define('_XNEWSLETTER_ACCOUNTS_TYPE_SOFTBOX', 'INBOX.soft');
// constants for attachments
-define("_XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT", 0);
-define("_XNEWSLETTER_ATTACHMENTS_MODE_ASLINK", 1);
-define("_XNEWSLETTER_ATTACHMENTS_MODE_AUTO", 2); // IN PROGRESS
+define('_XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT', 0);
+define('_XNEWSLETTER_ATTACHMENTS_MODE_ASLINK', 1);
+define('_XNEWSLETTER_ATTACHMENTS_MODE_AUTO', 2); // for future features
// constants for actions letter
-define("_XNEWSLETTER_LETTER_ACTION_VAL_NO", 0);
-define("_XNEWSLETTER_LETTER_ACTION_VAL_PREVIEW", 1);
-define("_XNEWSLETTER_LETTER_ACTION_VAL_SEND", 2);
-define("_XNEWSLETTER_LETTER_ACTION_VAL_SENDTEST", 3);
+define('_XNEWSLETTER_LETTER_ACTION_VAL_NO', 0);
+define('_XNEWSLETTER_LETTER_ACTION_VAL_PREVIEW', 1);
+define('_XNEWSLETTER_LETTER_ACTION_VAL_SEND', 2);
+define('_XNEWSLETTER_LETTER_ACTION_VAL_SENDTEST', 3);
// constants for catsubscr_quit_now
-define("_XNEWSLETTER_CATSUBSCR_QUIT_NO_VAL_NONE", 0);
-define("_XNEWSLETTER_CATSUBSCR_QUIT_NO_VAL_NOW", 1);
-define("_XNEWSLETTER_CATSUBSCR_QUIT_NO_VAL_REMOVE", 2);
+define('_XNEWSLETTER_CATSUBSCR_QUIT_NO_VAL_NONE', 0);
+define('_XNEWSLETTER_CATSUBSCR_QUIT_NO_VAL_NOW', 1);
+define('_XNEWSLETTER_CATSUBSCR_QUIT_NO_VAL_REMOVE', 2);
// constants for bounced mail handler
-define("_XNEWSLETTER_BOUNCETYPE_HARD", "hard");
-define("_XNEWSLETTER_BOUNCETYPE_SOFT", "soft");
-define("_XNEWSLETTER_BMH_MEASURE_VAL_ALL", -1);
-define("_XNEWSLETTER_BMH_MEASURE_VAL_PENDING", 0);
-define("_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING", 1);
-define("_XNEWSLETTER_BMH_MEASURE_VAL_QUIT", 2);
-define("_XNEWSLETTER_BMH_MEASURE_VAL_DELETE", 3);
+define('_XNEWSLETTER_BOUNCETYPE_HARD', 'hard');
+define('_XNEWSLETTER_BOUNCETYPE_SOFT', 'soft');
+define('_XNEWSLETTER_BMH_MEASURE_VAL_ALL', -1);
+define('_XNEWSLETTER_BMH_MEASURE_VAL_PENDING', 0);
+define('_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING', 1);
+define('_XNEWSLETTER_BMH_MEASURE_VAL_QUIT', 2);
+define('_XNEWSLETTER_BMH_MEASURE_VAL_DELETE', 3);
+
+// constants for protocol_status_str
+define('_XNEWSLETTER_PROTOCOL_STATUS_SAVED', 1);
+define('_XNEWSLETTER_PROTOCOL_STATUS_ERROR_CREATE_TASK', 2);
+define('_XNEWSLETTER_PROTOCOL_STATUS_OK_SEND_TEST', 3);
+define('_XNEWSLETTER_PROTOCOL_STATUS_OK_SEND', 4);
+define('_XNEWSLETTER_PROTOCOL_STATUS_ERROR_SEND', 5);
+// IN PROGRESS
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -154,6 +154,22 @@
}
/**
+ * @param string $str
+ * @param array $vars associative array
+ *
+ * @return string
+ */
+function xnewsletter_sprintf($str = '', $vars = array(), $char = '') {
+ if (!$str) return '';
+ if (count($vars) > 0) {
+ foreach ($vars as $k => $v) {
+ $str = str_replace($char . $k, $v, $str);
+ }
+ }
+ return $str;
+}
+
+/**
* @param $contentObj
* @param $sets
*
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/onupdate.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -26,8 +26,7 @@
* ****************************************************************************
*/
-function xoops_module_update_xnewsletter(&$module, $oldversion = null) {
- $oldversion = $module->getVar('version');
+function xoops_module_update_xnewsletter(&$xoopsModule, $oldversion = null) {
if ($oldversion == 100) {
xoops_module_update_xnewsletter_101();
}
@@ -40,7 +39,6 @@
if ($oldversion < 130) {
xoops_module_update_xnewsletter_130();
}
-
return true;
}
@@ -48,28 +46,40 @@
* @return bool
*/
function xoops_module_update_xnewsletter_130() {
+ // change module dirname to lowercase
+ $path = dirname(dirname(__FILE__));
+ $dirname = basename($path);
+ rename($path, strtolower($dirname));
+ // update module dirname field in database to lowercase
+ global $xoopsDB;
+ $sql = "UPDATE `{$xoopsDB->prefix("modules")}` SET `dirname` = '" . strtolower($dirname) . "'";
+ $sql .= " WHERE LOWER(`dirname`) = '" . strtolower($dirname) . "';";
+ $result = $xoopsDB->queryF($sql);
+ if (!$result)
+ echo '<br />' . _MI_XNEWSLETTER_UPGRADEFAILED . ": UPDATE 'modules' SET `dirname` = '" . strtolower($dirname) . "'";
+
// reverse 'mod_' prefix on tables
- xoops_module_update_xnewsletter_rename_mod_table("xnewsletter_accounts");
- xoops_module_update_xnewsletter_rename_mod_table("xnewsletter_attachment");
- xoops_module_update_xnewsletter_rename_mod_table("xnewsletter_bmh");
- xoops_module_update_xnewsletter_rename_mod_table("xnewsletter_cat");
- xoops_module_update_xnewsletter_rename_mod_table("xnewsletter_catsubscr");
- xoops_module_update_xnewsletter_rename_mod_table("xnewsletter_import");
- xoops_module_update_xnewsletter_rename_mod_table("xnewsletter_letter");
- xoops_module_update_xnewsletter_rename_mod_table("xnewsletter_mailinglist");
- xoops_module_update_xnewsletter_rename_mod_table("xnewsletter_protocol");
- xoops_module_update_xnewsletter_rename_mod_table("xnewsletter_subscr");
- xoops_module_update_xnewsletter_rename_mod_table("xnewsletter_task");
+ xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_accounts');
+ xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_attachment');
+ xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_bmh');
+ xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_cat');
+ xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_catsubscr');
+ xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_import');
+ xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_letter');
+ xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_mailinglist');
+ xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_protocol');
+ xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_subscr');
+ xoops_module_update_xnewsletter_rename_mod_table('xnewsletter_task');
+ $sql = "DROP TABLE IF EXISTS `" . $xoopsDB->prefix('xnewsletter_template') . "`";
// create 'xnewsletter_template' table
global $xoopsDB;
- $sql = sprintf("DROP TABLE IF EXISTS `" . $xoopsDB->prefix('xnewsletter_template') . "`");
- $result = $xoopsDB->queryF($sql);
- if (!$result)
+ $sql = "DROP TABLE IF EXISTS `" . $xoopsDB->prefix('xnewsletter_template') . "`";
+ if (!$xoopsDB->queryF($sql))
echo '<br />' . _AM_XNEWSLETTER_UPGRADEFAILED . ": 'DROP TABLE 'xnewsletter_template'";
-
$sql = "
- CREATE TABLE `" . $xoopsDB->prefix('xnewsletter_template') . "` (
+ CREATE TABLE `" . $xoopsDB->prefix('xnewsletter_template') . "`
+ (
`template_id` int (8) NOT NULL auto_increment,
`template_title` varchar (100) NOT NULL default '',
`template_description` text NOT NULL default '',
@@ -78,8 +88,7 @@
`template_created` int (8) NOT NULL default '0',
PRIMARY KEY (`template_id`)
) ENGINE=MyISAM;";
- $result = $xoopsDB->queryF($sql);
- if (!$result)
+ if (!$xoopsDB->queryF($sql))
echo '<br />' . _MI_XNEWSLETTER_UPGRADEFAILED . ": CREATE TABLE 'xnewsletter_template'";
// add fields to 'xnewsletter_cat' table
@@ -90,8 +99,7 @@
$sql .= " ADD COLUMN `doxcode` tinyint(1) NOT NULL default '1',";
$sql .= " ADD COLUMN `doimage` tinyint(1) NOT NULL default '1',";
$sql .= " ADD COLUMN `dobr` tinyint(1) NOT NULL default '1';";
- $result = $xoopsDB->queryF($sql);
- if (!$result)
+ if (!$xoopsDB->queryF($sql))
echo '<br />' . _MI_XNEWSLETTER_UPGRADEFAILED . ": ALTER TABLE 'xnewsletter_cat' ADD";
// add fields to 'xnewsletter_letter' table
@@ -99,8 +107,7 @@
$sql = "ALTER TABLE `" . $xoopsDB->prefix('xnewsletter_letter') . "`";
$sql .= " ADD COLUMN `letter_sender` int(8) NOT NULL default '0',";
$sql .= " ADD COLUMN `letter_sent` int(10) NOT NULL default '0';";
- $result = $xoopsDB->queryF($sql);
- if (!$result)
+ if (!$xoopsDB->queryF($sql))
echo '<br />' . _MI_XNEWSLETTER_UPGRADEFAILED . ": ALTER TABLE 'xnewsletter_letter' ADD";
// add fields to 'xnewsletter_attachment' table
@@ -108,10 +115,17 @@
$sql = "ALTER TABLE `" . $xoopsDB->prefix('xnewsletter_attachment') . "`";
$sql .= " ADD COLUMN `attachment_size` int(8) NOT NULL default '0',";
$sql .= " ADD COLUMN `attachment_mode` int(8) NOT NULL default '0';";
- $result = $xoopsDB->queryF($sql);
- if (!$result)
+ if (!$xoopsDB->queryF($sql))
echo '<br />' . _MI_XNEWSLETTER_UPGRADEFAILED . ": ALTER TABLE 'xnewsletter_attachment' ADD";
+ // add fields to 'xnewsletter_protocol' table
+ global $xoopsDB;
+ $sql = "ALTER TABLE `" . $xoopsDB->prefix('xnewsletter_protocol') . "`";
+ $sql .= " ADD COLUMN `protocol_status_str_id` text NOT NULL default '',"; // for future features
+ $sql .= " ADD COLUMN `protocol_status_vars` text;"; // for future features
+ if (!$xoopsDB->queryF($sql))
+ echo '<br />' . _MI_XNEWSLETTER_UPGRADEFAILED . ": ALTER TABLE 'xnewsletter_protocol' ADD";
+
return true;
}
@@ -199,15 +213,15 @@
global $xoopsDB;
//rename tables to new xoops naming scheme
- xoops_module_update_xnewsletter_rename_table("xnewsletter_accounts");
- xoops_module_update_xnewsletter_rename_table("xnewsletter_cat");
- xoops_module_update_xnewsletter_rename_table("xnewsletter_subscr");
- xoops_module_update_xnewsletter_rename_table("xnewsletter_catsubscr");
- xoops_module_update_xnewsletter_rename_table("xnewsletter_letter");
- xoops_module_update_xnewsletter_rename_table("xnewsletter_protocol");
- xoops_module_update_xnewsletter_rename_table("xnewsletter_attachment");
- xoops_module_update_xnewsletter_rename_table("xnewsletter_mailinglist");
- xoops_module_update_xnewsletter_rename_table("xnewsletter_bmh");
+ xoops_module_update_xnewsletter_rename_table('xnewsletter_accounts');
+ xoops_module_update_xnewsletter_rename_table('xnewsletter_cat');
+ xoops_module_update_xnewsletter_rename_table('xnewsletter_subscr');
+ xoops_module_update_xnewsletter_rename_table('xnewsletter_catsubscr');
+ xoops_module_update_xnewsletter_rename_table('xnewsletter_letter');
+ xoops_module_update_xnewsletter_rename_table('xnewsletter_protocol');
+ xoops_module_update_xnewsletter_rename_table('xnewsletter_attachment');
+ xoops_module_update_xnewsletter_rename_table('xnewsletter_mailinglist');
+ xoops_module_update_xnewsletter_rename_table('xnewsletter_bmh');
return true;
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/task.inc.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -128,6 +128,8 @@
$protocolObj->setVar('protocol_letter_id', $letter_id);
$protocolObj->setVar('protocol_subscriber_id', $subscr_id);
$protocolObj->setVar('protocol_status', _AM_XNEWSLETTER_TASK_ERROR_CREATE);
+ $protocolObj->setVar('protocol_status_str_id', _XNEWSLETTER_PROTOCOL_STATUS_ERROR_CREATE_TASK);
+ $protocolObj->setVar('protocol_status_vars', array());
$protocolObj->setVar('protocol_success', false);
$protocolObj->setVar('protocol_submitter', $uid);
$protocolObj->setVar('protocol_created', time());
@@ -388,13 +390,20 @@
if ($mail->Send()) {
if ($subscr_id == 0) {
- $protocol_status = _AM_XNEWSLETTER_SEND_SUCCESS_TEST . " (" . $recipient['address'] . ")";
+ $protocol_status = _AM_XNEWSLETTER_SEND_SUCCESS_TEST . " (" . $recipient['address'] . ")"; // old style
+ $protocol_status_str_id = _XNEWSLETTER_PROTOCOL_STATUS_OK_SEND_TEST; // new from v1.3
+ $protocol_status_vars = array('%recipient' => $recipient['address']); // new from v1.3
} else {
- $protocol_status = _AM_XNEWSLETTER_SEND_SUCCESS;
+ $protocol_status = _AM_XNEWSLETTER_SEND_SUCCESS; // old style
+ $protocol_status_str_id = _XNEWSLETTER_PROTOCOL_STATUS_OK_SEND; // new from v1.3
+ $protocol_status_vars = array(); // new from v1.3
}
$protocol_success = true;
} else {
- $protocol_status = _AM_XNEWSLETTER_FAILED . "-> " . $mail->ErrorInfo;
+ $protocol_status = _AM_XNEWSLETTER_FAILED . "-> " . $mail->ErrorInfo; // old style
+ $protocol_status_str_id = _XNEWSLETTER_PROTOCOL_STATUS_ERROR_SEND; // new from v1.3
+ $protocol_status_vars = array('%error' => $mail->ErrorInfo); // new from v1.3
+
$protocol_success = false;
++$count_err;
}
@@ -412,7 +421,9 @@
$protocolObj = $xnewsletter->getHandler('protocol')->create();
$protocolObj->setVar('protocol_letter_id', $letter_id);
$protocolObj->setVar('protocol_subscriber_id', $subscr_id);
- $protocolObj->setVar('protocol_status', $protocol_status);
+ $protocolObj->setVar('protocol_status', $protocol_status); // old style
+ $protocolObj->setVar('protocol_status_str_id', $protocol_status_str_id); // new from v1.3
+ $protocolObj->setVar('protocol_status_vars', $protocol_status_vars); // new from v1.3
$protocolObj->setVar('protocol_success', $protocol_success);
$protocolObj->setVar('protocol_submitter', $uid);
$protocolObj->setVar('protocol_created', time());
@@ -427,10 +438,12 @@
unset($mail);
} catch (phpmailerException $e) {
+// IN PROGRESS
$protocol_status = _AM_XNEWSLETTER_SEND_ERROR_PHPMAILER . $e->errorMessage(); //error messages from PHPMailer
++$count_err;
$protocol_success = false;
} catch (Exception $e) {
+// IN PROGRESS
$protocol_status = _AM_XNEWSLETTER_SEND_ERROR_PHPMAILER . $e->getMessage(); //error messages from anything else!
++$count_err;
$protocol_success = false;
@@ -439,15 +452,16 @@
//create final protocol item
if ($count_err > 0) {
- $protocol_status = _AM_XNEWSLETTER_SEND_ERROR_NUMBER;
- $protocol_status = str_replace("%e", $count_err, $protocol_status);
- $protocol_status = str_replace("%t", $count_total, $protocol_status);
+// IN PROGRESS
+ $protocol_status = xnewsletter_sprintf(_AM_XNEWSLETTER_SEND_ERROR_NUMBER, array('%e' => $count_err, '%t' => $count_total));
$protocol_success = false;
} else {
$protocol_success = true;
if ($count_total > 0) {
- $protocol_status = str_replace("%t", $count_total, _AM_XNEWSLETTER_SEND_SUCCESS_NUMBER);
+// IN PROGRESS
+ $protocol_status = xnewsletter_sprintf(_AM_XNEWSLETTER_SEND_SUCCESS_NUMBER, array('%t' => $count_total));
} else {
+// IN PROGRESS
$protocol_status = '';
}
}
@@ -455,6 +469,7 @@
$protocolObj->setVar('protocol_letter_id', $letter_id);
$protocolObj->setVar('protocol_subscriber_id', 0);
$protocolObj->setVar('protocol_status', $protocol_status);
+// IN PROGRESS
$protocolObj->setVar('protocol_success', $protocol_success);
$protocolObj->setVar('protocol_submitter', $uid);
$protocolObj->setVar('protocol_created', time());
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -474,3 +474,11 @@
//Buttons
define('_AM_XNEWSLETTER_NEWTEMPLATE',"Add New Template");
define('_AM_XNEWSLETTER_TEMPLATELIST',"List Template");
+
+define('_AM_XNEWSLETTER_PROTOCOL_STATUS_SAVED','Saved');
+define('_AM_XNEWSLETTER_PROTOCOL_STATUS_ERROR_CREATE_TASK','Error creating item in task list');
+define('_AM_XNEWSLETTER_PROTOCOL_STATUS_OK_SEND_TEST','Newsletter sent for test (%recipient)');
+define('_AM_XNEWSLETTER_PROTOCOL_STATUS_OK_SEND','Newsletter sent');
+define('_AM_XNEWSLETTER_PROTOCOL_STATUS_ERROR_SEND','Newsletter send failed -> %error');
+// IN PROGRESS
+
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -523,6 +523,8 @@
break;
}
$protocolObj->setVar('protocol_status', _AM_XNEWSLETTER_LETTER_ACTION_SAVED);
+ $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/luciorota/xnewsletter/sql/mysql.sql
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/sql/mysql.sql 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/sql/mysql.sql 2014-09-16 20:35:59 UTC (rev 12783)
@@ -94,7 +94,7 @@
CREATE TABLE `xnewsletter_letter` (
`letter_id` int(8) NOT NULL auto_increment,
`letter_title` varchar(100) NOT NULL default '',
- `letter_content` text NOT NULL ,
+ `letter_content` text NOT NULL default '',
`letter_template` varchar(100) NOT NULL default '',
`letter_cats` varchar(100) NULL default '',
`letter_account` int(8) NOT NULL default '0',
@@ -119,6 +119,8 @@
`protocol_submitter` int(8) NOT NULL default '0',
`protocol_created` int(10) NOT NULL default '0',
`protocol_success` int(8) NOT NULL,
+ `protocol_status_str_id` text NOT NULL default '',
+ `protocol_status_vars` text,
PRIMARY KEY (`protocol_id`),
KEY `idx_protocol_letter_id` (`protocol_letter_id`)
) ENGINE=MyISAM;
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php 2014-09-16 20:31:50 UTC (rev 12782)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php 2014-09-16 20:35:59 UTC (rev 12783)
@@ -49,7 +49,7 @@
//About
$modversion['module_status'] = 'Beta 1';
-$modversion['release_date'] = '2014/09/03';
+$modversion['release_date'] = '2014/09/16';
//$modversion['release'] = "1.3";
$modversion['demo_site_url'] = '';
$modversion['demo_site_name'] = '';
@@ -119,6 +119,7 @@
$modversion['hasMain'] = true;
$subcount = 1;
+$modversion['sub'] = array();
// check user rights
$gperm_handler = xoops_gethandler('groupperm');
@@ -408,13 +409,10 @@
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = '60';
-
unset($i);
// Blocks
-$b = 0;
-
-$b++;
+$b = 1;
$modversion['blocks'][$b] = array(
'file' => 'blocks_subscrinfo.php',
'name' => _MI_XNEWSLETTER_SUBSCRINFO_BLOCK,
@@ -425,8 +423,7 @@
'can_clone' => true,
'options' => ''
);
-
-$b++;
+++$b;
$modversion['blocks'][$b] = array(
'file' => 'blocks_catsubscr.php',
'name' => _MI_XNEWSLETTER_CATSUBSCR_BLOCK_RECENT,
@@ -437,8 +434,7 @@
'can_clone' => true,
'options' => 'recent|5|0|0'
);
-
-$b++;
+++$b;
$modversion['blocks'][$b] = array(
'file' => 'blocks_catsubscr.php',
'name' => _MI_XNEWSLETTER_CATSUBSCR_BLOCK_DAY,
@@ -450,7 +446,7 @@
'options' => 'day|5|0|0'
);
-$b++;
+++$b;
$modversion['blocks'][$b] = array(
'file' => 'blocks_letter.php',
'name' => _MI_XNEWSLETTER_LETTER_BLOCK_RECENT,
@@ -461,8 +457,7 @@
'can_clone' => true,
'options' => 'recent|5|0|0'
);
-
-$b++;
+++$b;
$modversion['blocks'][$b] = array(
'file' => 'blocks_letter.php',
'name' => _MI_XNEWSLETTER_LETTER_BLOCK_DAY,
@@ -473,8 +468,7 @@
'can_clone' => true,
'options' => 'day|5|0|0'
);
-
-$b++;
+++$b;
$modversion['blocks'][$b] = array(
'file' => 'blocks_letter.php' ,
'name' => _MI_XNEWSLETTER_LETTER_BLOCK_RANDOM,
@@ -485,3 +479,7 @@
'can_clone' => true,
'options' => 'random|5|0|0'
);
+unset($b);
+
+// Notification
+$modversion['hasNotification'] = false;
|
|
From: <luc...@us...> - 2014-09-16 20:31:57
|
Revision: 12782
http://sourceforge.net/p/xoops/svn/12782
Author: luciorota
Date: 2014-09-16 20:31:50 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
standardize code
use absolute path/url where possible
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/about.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/clone.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/images.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/import.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/index.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/swishe.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/breadcrumb.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/rating.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/review.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/xoopstree.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/comment_delete.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/comment_edit.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/comment_new.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/comment_post.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/comment_reply.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/comment_functions.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/common.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/constants.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/directorychecker.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/filechecker.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/oninstall.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onuninstall.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/index.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/mirror.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/newlist.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/notification_update.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/ratefile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/review.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/rss.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/singlefile.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/wfdownloads_newlistindex.tpl
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/topten.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/viewcat.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/visit.php
XoopsModules/wfdownloads/branches/luciorota/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/about.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/about.php 2014-09-15 03:39:05 UTC (rev 12781)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/about.php 2014-09-16 20:31:50 UTC (rev 12782)
@@ -27,4 +27,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/admin_header.php 2014-09-15 03:39:05 UTC (rev 12781)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/admin_header.php 2014-09-16 20:31:50 UTC (rev 12782)
@@ -35,6 +35,6 @@
xoops_loadLanguage('main', $wfdownloads->getModule()->dirname());
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH . '/class/template.php');
+ include_once XOOPS_ROOT_PATH . '/class/template.php';
$xoopsTpl = new XoopsTpl();
}
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php 2014-09-15 03:39:05 UTC (rev 12781)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/categories.php 2014-09-16 20:31:50 UTC (rev 12782)
@@ -91,13 +91,13 @@
case "addCat" :
$cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$pid = WfdownloadsRequest::getInt('pid', 0, 'POST');
- $weight = (isset($_POST["weight"]) && $_POST["weight"] > 0) ? (int) $_POST["weight"] : 0;
+ $weight = (isset($_POST['weight']) && $_POST['weight'] > 0) ? (int) $_POST["weight"] : 0;
$down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
$up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
- $spotlighthis = (isset($_POST["lid"])) ? (int) $_POST["lid"] : 0;
- $spotlighttop = (isset($_POST["spotlighttop"]) && ($_POST["spotlighttop"] == 1)) ? 1 : 0;
+ $spotlighthis = (isset($_POST['lid'])) ? (int) $_POST['lid'] : 0;
+ $spotlighttop = (isset($_POST['spotlighttop']) && ($_POST['spotlighttop'] == 1)) ? 1 : 0;
- include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ include_once XOOPS_ROOT_PATH . '/class/uploader.php';
$allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
$maxFileSize = $wfdownloads->getConfig('maxfilesize');
$maxImgWidth = $wfdownloads->getConfig('maximgwidth');
@@ -109,12 +109,12 @@
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
- redirect_header("javascript:history.go(-1)",3, $errors);
+ redirect_header('javascript:history.go(-1)',3, $errors);
} else {
$imgurl = $uploader->getSavedFileName();
}
} else {
- $imgurl = (isset($_POST["imgurl"]) && $_POST["imgurl"] != "blank.png") ? $myts -> addslashes($_POST["imgurl"]) : "";
+ $imgurl = (isset($_POST['imgurl']) && $_POST['imgurl'] != 'blank.png') ? $myts -> addslashes($_POST['imgurl']) : '';
}
if (!$cid) {
@@ -127,12 +127,12 @@
}
}
- $categoryObj->setVar('title', $_POST["title"]);
+ $categoryObj->setVar('title', $_POST['title']);
$categoryObj->setVar('pid', $pid);
$categoryObj->setVar('weight', $weight);
$categoryObj->setVar('imgurl', $imgurl);
- $categoryObj->setVar('description', $_POST["description"]);
- $categoryObj->setVar('summary', $_POST["summary"]);
+ $categoryObj->setVar('description', $_POST['description']);
+ $categoryObj->setVar('summary', $_POST['summary']);
$categoryObj->setVar('dohtml', isset($_POST['dohtml']));
$categoryObj->setVar('dosmiley', isset($_POST['dosmiley']));
$categoryObj->setVar('doxcode', isset($_POST['doxcode']));
@@ -140,7 +140,7 @@
$categoryObj->setVar('dobr', isset($_POST['dobr']));
// Formulize module support (2006/05/04) jpc - start
if (wfdownloads_checkModule('formulize')) {
- $formulize_fid = (isset($_POST["formulize_fid"])) ? (int) $_POST["formulize_fid"] : 0;
+ $formulize_fid = (isset($_POST['formulize_fid'])) ? (int) $_POST['formulize_fid'] : 0;
$categoryObj->setVar('formulize_fid', $formulize_fid);
}
// Formulize module support (2006/05/04) jpc - end
@@ -238,7 +238,7 @@
$form = $categoryObj->getForm();
$form -> display();
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
break;
case 'categories.list' :
@@ -261,7 +261,7 @@
} else {
redirect_header("{$currentFile}?op=category.add", 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
}
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
break;
case 'categories.reorder' :
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/clone.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/clone.php 2014-09-15 03:39:05 UTC (rev 12781)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/clone.php 2014-09-16 20:31:50 UTC (rev 12782)
@@ -44,8 +44,8 @@
}
$patterns = array(
- strtolower(WFDOWNLOADS_DIRNAME) => strtolower($cloneDirname),
- strtoupper(WFDOWNLOADS_DIRNAME) => strtoupper($cloneDirname),
+ strtolower(WFDOWNLOADS_DIRNAME) => strtolower($cloneDirname),
+ strtoupper(WFDOWNLOADS_DIRNAME) => strtoupper($cloneDirname),
ucfirst(strtolower(WFDOWNLOADS_DIRNAME)) => ucfirst(strtolower($cloneDirname))
);
@@ -54,7 +54,7 @@
wfdownloads_cloneFileDir(WFDOWNLOADS_ROOT_PATH);
$logocreated = wfdownloads_createLogo(strtolower($cloneDirname));
- $message = "";
+ $message = '';
if (is_dir(XOOPS_ROOT_PATH . '/modules/' . strtolower($cloneDirname))) {
$message .= sprintf(
_AM_WFDOWNLOADS_CLONE_CONGRAT,
@@ -71,7 +71,7 @@
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
echo $message;
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
exit();
} else {
@@ -79,17 +79,14 @@
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $form = new XoopsThemeForm(sprintf(
- _AM_WFDOWNLOADS_CLONE_TITLE,
- $wfdownloads->getModule()->getVar('name', 'E')
- ), 'clone', $currentFile, 'post', true);
+ $form = new XoopsThemeForm(sprintf(_AM_WFDOWNLOADS_CLONE_TITLE, $wfdownloads->getModule()->getVar('name', 'E')), 'clone', $currentFile, 'post', true);
$cloneDirname_text = new XoopsFormText(_AM_WFDOWNLOADS_CLONE_NAME, 'clonedirname', 18, 18, '');
$cloneDirname_text->setDescription(_AM_WFDOWNLOADS_CLONE_NAME_DSC);
$form->addElement($cloneDirname_text, true);
$form->addElement(new XoopsFormHidden('op', 'submit'));
$form->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
$form->display();
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
exit();
}
@@ -138,16 +135,16 @@
{
$wfdownloads = WfdownloadsWfdownloads::getInstance();
// Check extension/functions
- if (!extension_loaded("gd")) {
+ if (!extension_loaded('gd')) {
return false;
} else {
$required_functions = array(
- "imagecreatetruecolor",
- "imagecolorallocate",
- "imagefilledrectangle",
- "imagejpeg",
- "imagedestroy",
- "imageftbbox"
+ 'imagecreatetruecolor',
+ 'imagecolorallocate',
+ 'imagefilledrectangle',
+ 'imagejpeg',
+ 'imagedestroy',
+ 'imageftbbox'
);
foreach ($required_functions as $func) {
if (!function_exists($func)) {
@@ -156,10 +153,10 @@
}
}
// Check original image/font
- if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo_blank.png")) {
+ if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/{$dirname}/assets/images/module_logo_blank.png")) {
return false;
}
- if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $wfdownloads->getModule()->dirname() . "/assets/images/VeraBd.ttf")) {
+ if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/{$wfdownloads->getModule()->dirname()}/assets/images/VeraBd.ttf")) {
return false;
}
// Create image
@@ -168,7 +165,7 @@
$greyColor = imagecolorallocate($imageModule, 237, 237, 237);
imagefilledrectangle($imageModule, 5, 35, 85, 46, $greyColor);
// Write text
- $textColor = imagecolorallocate($imageModule, 0, 0, 0);
+ $textColor = imagecolorallocate($imageModule, 0, 0, 0);
$space_to_border = (80 - strlen($dirname) * 6.5) / 2;
imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $textColor, $font, ucfirst($dirname), array());
// Set transparency color
@@ -176,7 +173,7 @@
imagefill($imageModule, 0, 0, $whiteColor);
imagecolortransparent($imageModule, $whiteColor);
// Save new image
- imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo.png");
+ imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/{$dirname}/assets/images/module_logo.png");
imagedestroy($imageModule);
return true;
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-15 03:39:05 UTC (rev 12781)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php 2014-09-16 20:31:50 UTC (rev 12782)
@@ -41,9 +41,9 @@
$op = WfdownloadsRequest::getString('op', 'downloads.list');
switch ($op) {
- case "download.edit" :
- case "download.add" :
- case "Download" :
+ case 'download.edit':
+ case 'download.add':
+ case 'Download':
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
@@ -59,8 +59,8 @@
// Allowed mimetypes list
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_FILE_ALLOWEDAMIME . "</legend>\n";
echo "<div style='padding: 8px;'>\n";
- $criteria = new Criteria("mime_admin", true);
- $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
+ $criteria = new Criteria("mime_admin", true);
+ $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
$allowMimetypes = implode(' | ', $mimetypes);
echo $allowMimetypes;
echo "</div>\n";
@@ -83,7 +83,7 @@
} else {
// create download
$downloadObj = $wfdownloads->getHandler('download')->create();
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$categoryObj = $wfdownloads->getHandler('category')->get($cid);
$downloadObj->setVar('cid', $cid);
$title = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FILE_CREATE);
@@ -97,15 +97,15 @@
$sform = $downloadObj->getAdminForm($title);
} elseif ((isset($_POST['submit_category']) && !empty($_POST['submit_category']))) {
// two steps form: 2nd step
- $fid = $categoryObj->getVar('formulize_fid');
+ $fid = $categoryObj->getVar('formulize_fid');
$customArray = array();
if ($fid) {
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $customArray['fid'] = $fid;
+ include_once XOOPS_ROOT_PATH . '/modules/formulize/include/formdisplay.php';
+ include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
+ $customArray['fid'] = $fid;
$customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
- $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues( // is a Formulize function
+ $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $customArray['prevEntry'] = getEntryValues( // is a Formulize function
$downloadObj->getVar('formulize_idreq'),
$customArray['formulize_mgr'],
$customArray['groups'],
@@ -117,14 +117,14 @@
null
);
$customArray['entry'] = $downloadObj->getVar('formulize_idreq');
- $customArray['go_back'] = "";
- $customArray['parentLinks'] = "";
+ $customArray['go_back'] = '';
+ $customArray['parentLinks'] = '';
if (wfdownloads_checkModule('formulize') < 300) {
$owner = getEntryOwner($customArray['entry']); // is a Formulize function
} else {
$owner = getEntryOwner($customArray['entry'], $fid); // is a Formulize function
}
- $ownerGroups = $member_handler->getGroupsByUser($owner, false);
+ $ownerGroups = $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $ownerGroups;
}
$sform = $downloadObj->getAdminForm($title22, $customArray);
@@ -141,29 +141,29 @@
// Vote data list/manager
if ($lid) {
- $votes_count = $wfdownloads->getHandler('rating')->getCount();
+ $ratingCount = $wfdownloads->getHandler('rating')->getCount();
- $registeredCriteria = new CriteriaCompo(new Criteria('lid', $lid));
- $registeredCriteria->add(new Criteria('ratinguser', 0, '>'));
- $votesreg = $wfdownloads->getHandler('rating')->getCount($registeredCriteria);
- $registeredCriteria->setSort('ratingtimestamp');
- $registeredCriteria->setOrder('DESC');
- $regvotes = $wfdownloads->getHandler('rating')->getObjects($registeredCriteria);
+ $regUserCriteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $regUserCriteria->add(new Criteria('ratinguser', 0, '>'));
+ $regUserRatingCount = $wfdownloads->getHandler('rating')->getCount($regUserCriteria);
+ $regUserCriteria->setSort('ratingtimestamp');
+ $regUserCriteria->setOrder('DESC');
+ $regUserRatingObjs = $wfdownloads->getHandler('rating')->getObjects($regUserCriteria);
- $anonymousCriteria = new CriteriaCompo(new Criteria('lid', $lid));
- $anonymousCriteria->add(new Criteria('ratinguser', 0, '='));
- $votesanon = $wfdownloads->getHandler('rating')->getCount($anonymousCriteria);
- $anonymousCriteria->setSort('ratingtimestamp');
- $anonymousCriteria->setOrder('DESC');
+ $anonUserCriteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $anonUserCriteria->add(new Criteria('ratinguser', 0, '='));
+ $anonUserRatingCount = $wfdownloads->getHandler('rating')->getCount($anonUserCriteria);
+ $anonUserCriteria->setSort('ratingtimestamp');
+ $anonUserCriteria->setOrder('DESC');
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_VOTE_RATINGINFOMATION . "</legend>\n";
- echo "<div style='padding: 8px;'><b>" . _AM_WFDOWNLOADS_VOTE_TOTALVOTES . "</b>{$votes_count}<br /><br />\n";
+ echo "<div style='padding: 8px;'><b>" . _AM_WFDOWNLOADS_VOTE_TOTALVOTES . "</b>{$ratingCount}<br /><br />\n";
- printf(_AM_WFDOWNLOADS_VOTE_REGUSERVOTES, $votesreg);
+ printf(_AM_WFDOWNLOADS_VOTE_REGUSERVOTES, $regUserRatingCount);
echo "<br />";
- printf(_AM_WFDOWNLOADS_VOTE_ANONUSERVOTES, $votesanon);
+ printf(_AM_WFDOWNLOADS_VOTE_ANONUSERVOTES, $anonUserRatingCount);
echo "
</div>\n
@@ -179,36 +179,32 @@
</tr>\n
";
- if ($votesreg == 0) {
+ if ($regUserRatingCount == 0) {
echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOREGVOTES . "</b></td></tr>";
} else {
- foreach (array_keys($regvotes) as $i) {
- $uids[] = $regvotes[$i]->getVar('ratinguser');
+ foreach ($regUserRatingObjs as $regUserRatingObj) {
+ $uids[] = $regUserRatingObj->getVar('ratinguser');
}
- $criteria = new Criteria("ratinguser", "(" . implode(',', $uids) . ")", "IN");
- $criteria->setGroupby("ratinguser");
+ $criteria = new Criteria('ratinguser', '(' . implode(',', $uids) . ')', 'IN');
+ $criteria->setGroupby('ratinguser');
$userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
- foreach (array_keys($regvotes) as $i) {
- $formatted_date = XoopsLocal::formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), 'l');
- $userAvgRating = isset($userRatings[$regvotes[$i]->getVar('ratinguser')]) ? $userRatings[$regvotes[$i]->getVar(
- 'ratinguser'
- )]["avg"] : 0;
- $userVotes = isset($userRatings[$regvotes[$i]->getVar('ratinguser')]) ? $userRatings[$regvotes[$i]->getVar(
- 'ratinguser'
- )]["count"] : 0;
- $ratingUserName = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
+ foreach ($regUserRatingObjs as $regUserRatingObj) {
+ $formatted_date = XoopsLocal::formatTimestamp($regUserRatingObj->getVar('ratingtimestamp'), 'l');
+ $userAvgRating = isset($userRatings[$regUserRatingObj->getVar('ratinguser')]) ? $userRatings[$regUserRatingObj->getVar('ratinguser')]['avg'] : 0;
+ $userVotes = isset($userRatings[$regUserRatingObj->getVar('ratinguser')]) ? $userRatings[$regUserRatingObj->getVar('ratinguser')]['count'] : 0;
+ $ratingUserName = XoopsUser :: getUnameFromId($regUserRatingObj->getVar('ratinguser'));
echo "
<tr><td class='head'>$ratingUserName</td>\n
- <td class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
- <td class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>" . $regUserRatingObj->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $regUserRatingObj->getVar('rating') . "</th>\n
<td class='even'>$userAvgRating</th>\n
<td class='even'>$userVotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>"
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regUserRatingObj->getVar('ratingid') . "'>"
. $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
@@ -228,29 +224,29 @@
<th>" . _AM_WFDOWNLOADS_MINDEX_ACTION . "</td>\n
</tr>\n
";
- if ($votesanon == 0) {
+ if ($anonUserRatingCount == 0) {
echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOUNREGVOTES . "</b></td></tr>";
} else {
- $criteria = new Criteria('ratinguser', 0);
- $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
- $anonymousVotes = $wfdownloads->getHandler('rating')->getObjects($anonymousCriteria);
+ $criteria = new Criteria('ratinguser', 0);
+ $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+ $anonUserRatingObjs = $wfdownloads->getHandler('rating')->getObjects($anonUserCriteria);
- foreach (array_keys($anonymousVotes) as $i) {
- $formatted_date = XoopsLocal::formatTimestamp($anonymousVotes[$i]->getVar('ratingtimestamp'), 'l');
- $userAvgRating = isset($userRatings['avg']) ? $userRatings["avg"] : 0;
- $userVotes = isset($userRatings['count']) ? $userRatings["count"] : 0;
+ foreach (array_keys($anonUserRatingObjs) as $anonUserRatingObj) {
+ $formatted_date = XoopsLocal::formatTimestamp($anonUserRatingObj->getVar('ratingtimestamp'), 'l');
+ $userAvgRating = isset($userRatings['avg']) ? $userRatings['avg'] : 0;
+ $userVotes = isset($userRatings['count']) ? $userRatings['count'] : 0;
$ratingUserName = $GLOBALS['xoopsConfig']['anonymous'];
echo "
<tr><td class='head'>$ratingUserName</td>\n
- <td class='even'>" . $anonymousVotes[$i]->getVar('ratinghostname') . "</th>\n
- <td class='even'>" . $anonymousVotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>" . $anonUserRatingObj->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $anonUserRatingObj->getVar('rating') . "</th>\n
<td class='even'>$userAvgRating</th>\n
<td class='even'>$userVotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonymousVotes[$i]->getVar('ratingid') . "'>"
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonUserRatingObj->getVar('ratingid') . "'>"
. $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
@@ -259,32 +255,32 @@
echo "</table>\n";
echo "</fieldset>\n";
}
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
break;
- case "download.save" :
- case "addDownload" :
- $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ case 'download.save':
+ case 'addDownload':
+ $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$status = WfdownloadsRequest::getInt('status', _WFDOWNLOADS_STATUS_UPDATED, 'POST');
if ($lid > 0) {
$thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
- $downloadObj = $wfdownloads->getHandler('download')->get($lid);
+ $downloadObj = $wfdownloads->getHandler('download')->get($lid);
} else {
$thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
- $downloadObj = $wfdownloads->getHandler('download')->create();
+ $downloadObj = $wfdownloads->getHandler('download')->create();
}
// Define URL
if (empty($_FILES['userfile']['name'])) {
- if ($_POST['url'] && $_POST['url'] != "" && $_POST['url'] != "http://") {
- $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
+ if ($_POST['url'] && $_POST['url'] != '' && $_POST['url'] != "http://") {
+ $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
$filename = '';
$filetype = '';
// Get size from form
$size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int) $_POST["size"];
} else {
- $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
+ $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
$filename = $_POST['filename'];
$filetype = $_POST['filetype'];
$filePath = $wfdownloads->getConfig('uploaddir') . '/' . $filename;
@@ -295,12 +291,12 @@
$downloadObj->setVar('filename', $filename);
$downloadObj->setVar('filetype', $filetype);
} else {
- $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
- $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
- $size = $down['size'];
+ $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
+ $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
+ $size = $down['size'];
$title = $_FILES['userfile']['name'];
- $ext = rtrim(strrchr($title, '.'), '.');
+ $ext = rtrim(strrchr($title, '.'), '.');
$title = str_replace($ext, '', $title);
$title = (isset($_POST['title_checkbox']) && $_POST['title_checkbox'] == 1) ? $title : trim($_POST['title']);
@@ -329,11 +325,11 @@
// If both conditions are true, then trigger all three notifications related to modified records.
if (!$thisIsANewRecord && ($downloadObj->getVar('version') != $version)) {
// Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $categoryObj = $wfdownloads->getHandler('category')->get($cid);
- $tags['FILE_VERSION'] = $version;
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $tags['FILE_VERSION'] = $version;
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid='{$cid}";
@@ -379,12 +375,12 @@
$versiontypes = (isset($_POST['versiontypes'])) ? $_POST['versiontypes'] : '';
$downloadObj->setVar('versiontypes', $versiontypes);
- $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
+ $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
$dhistoryhistory = (isset($_POST['dhistoryaddedd'])) ? $_POST['dhistoryaddedd'] : '';
if ($lid > 0 && !empty($dhistoryhistory)) {
$dhistory = $dhistory . "\n\n";
- $time = time();
+ $time = time();
$dhistory .= _AM_WFDOWNLOADS_FILE_HISTORYVERS . $version . _AM_WFDOWNLOADS_FILE_HISTORDATE . XoopsLocal::formatTimestamp($time, 'l') . "\n\n";
$dhistory .= $dhistoryhistory;
}
@@ -400,7 +396,7 @@
$offline = ($_POST['offline'] == true) ? true : false;
$downloadObj->setVar('offline', $offline);
- $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
+ $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
$notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == true);
$expiredate = 0;
@@ -408,7 +404,7 @@
$publishdate = time();
} else {
$publishdate = $_POST['was_published'];
- $expiredate = $_POST['was_expired'];
+ $expiredate = $_POST['was_expired'];
}
if ($approved == 1 && empty($publishdate)) {
$publishdate = time();
@@ -440,8 +436,8 @@
if (wfdownloads_checkModule('formulize')) {
$fid = $categoryObj->getVar('formulize_fid');
if ($fid) {
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formread.php";
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ include_once XOOPS_ROOT_PATH . '/modules/formulize/include/formread.php';
+ include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
$formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
if ($lid) {
$entries[$fid][0] = $downloadObj->getVar('formulize_idreq');
@@ -452,19 +448,19 @@
$owner = getEntryOwner($entries[$fid][0], $fid); // is a Formulize function
}
} else {
- print "no idreq";
- $entries[$fid][0] = "";
- $owner = "";
+ print 'no idreq';
+ $entries[$fid][0] = '';
+ $owner = '';
}
$cid = $downloadObj->getVar('cid');
} else {
- $entries[$fid][0] = "";
- $owner = "";
+ $entries[$fid][0] = '';
+ $owner = '';
}
- $ownerGroups =& $member_handler->getGroupsByUser($owner, false);
- $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
- $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $entries = handleSubmission(
+ $ownerGroups = $member_handler->getGroupsByUser($owner, false);
+ $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+ $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $entries = handleSubmission(
$formulize_mgr,
$entries,
$uid,
@@ -472,7 +468,7 @@
$fid,
$ownerGroups,
$groups,
- "new"
+ 'new'
); // "new" causes xoops token check to be skipped, since Wfdownloads should be doing that
if (!$owner) {
$id_req = $entries[$fid][0];
@@ -485,21 +481,21 @@
$newid = (int) $downloadObj->getVar('lid');
// Send notifications
if (!$lid) {
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
}
if ($lid && $approved && $notifypub) {
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
$notification_handler->triggerEvent('file', $lid, 'approve', $tags);
@@ -510,9 +506,9 @@
redirect_header($currentFile, 1, $message);
break;
- case "download.delete" :
+ case 'download.delete':
$lid = WfdownloadsRequest::getInt('lid', 0);
- $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
+ $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
if (!$downloadObj = $wfdownloads->getHandler('download')->get($lid)) {
redirect_header($currentFile, 4, _AM_WFDOWNLOADS_ERROR_DOWNLOADNOTFOUND);
exit();
@@ -544,17 +540,17 @@
}
break;
- case "vote.delete" :
- case "delVote" :
- $rating = $wfdownloads->getHandler('rating')->get($_GET['rid']);
- if ($wfdownloads->getHandler('rating')->delete($rating, true)) {
- wfdownloads_updateRating(intval($rating->getVar('lid')));
+ case 'vote.delete':
+ case 'delVote':
+ $ratingObj = $wfdownloads->getHandler('rating')->get($_GET['rid']);
+ if ($wfdownloads->getHandler('rating')->delete($ratingObj, true)) {
+ wfdownloads_updateRating((int) $ratingObj->getVar('lid'));
}
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_VOTE_VOTEDELETED);
break;
// Formulize module support (2006/05/04) jpc - start
- case "patch_formulize" :
+ case 'patch_formulize':
if (wfdownloads_checkModule('formulize')) {
if (!isset($_POST['patch_formulize'])) {
print "<form action=\"{$currentFile}?op=patch_formulize\" method=post>";
@@ -576,8 +572,8 @@
break;
// Formulize module support (2006/05/04) jpc - end
- case "newdownload.approve" :
- case "approve" :
+ case 'newdownload.approve':
+ case 'approve':
$lid = WfdownloadsRequest::getInt('lid', 0);
if (!$downloadObj = $wfdownloads->getHandler('download')->get($lid)) {
redirect_header($currentFile, 4, _AM_WFDOWNLOADS_ERROR_DOWNLOADNOTFOUND);
@@ -591,14 +587,14 @@
exit();
}
// Trigger notify
- $title = $downloadObj->getVar('title');
- $cid = $downloadObj->getVar('cid');
- $categoryObj = $wfdownloads->getHandler('category')->get($cid);
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $title = $downloadObj->getVar('title');
+ $cid = $downloadObj->getVar('cid');
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
$tags['CATEGORY_NAME'] = $categoryObj->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
if ($downloadObj->getVar('notifypub')) {
@@ -607,17 +603,18 @@
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_SUB_NEWFILECREATED);
break;
- case "downloads.list" :
- case "downloads.filter" :
+ case 'downloads.list':
+ case 'downloads.filter':
default :
- $filter_title_condition = WfdownloadsRequest::getString('filter_title_condition', '=');
- $filter_title = WfdownloadsRequest::getString('filter_title', '');
+ // get filter conditions
+ $filter_title_condition = WfdownloadsRequest::getString('filter_title_condition', '=');
+ $filter_title = WfdownloadsRequest::getString('filter_title', '');
$filter_category_title_condition = WfdownloadsRequest::getString('filter_category_title_condition', '=');
- $filter_category_title = WfdownloadsRequest::getString('filter_category_title', '');
- $filter_submitter = WfdownloadsRequest::getArray('filter_submitter', null);
- $filter_date = WfdownloadsRequest::getArray('filter_date', null);
- $filter_date_condition = WfdownloadsRequest::getString('filter_date_condition', '<');
-
+ $filter_category_title = WfdownloadsRequest::getString('filter_category_title', '');
+ $filter_submitter = WfdownloadsRequest::getArray('filter_submitter', null);
+ $filter_date = WfdownloadsRequest::getArray('filter_date', null);
+ $filter_date_condition = WfdownloadsRequest::getString('filter_date_condition', '<');
+ // check filter conditions
if ($op == 'downloads.filter') {
if ($filter_title == '' && $filter_category_title == '' && is_null($filter_submitter)) {
$op = 'downloads.list';
@@ -626,16 +623,16 @@
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $categories = $wfdownloads->getHandler('category')->getObjects();
+ $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
- $start_published = WfdownloadsRequest::getInt('start_published', 0);
- $start_new = WfdownloadsRequest::getInt('start_new', 0);
+ $start_published = WfdownloadsRequest::getInt('start_published', 0);
+ $start_new = WfdownloadsRequest::getInt('start_new', 0);
$start_autopublished = WfdownloadsRequest::getInt('start_autopublished', 0);
- $start_expired = WfdownloadsRequest::getInt('start_expired', 0);
- $start_offline = WfdownloadsRequest::getInt('start_offline', 0);
+ $start_expired = WfdownloadsRequest::getInt('start_expired', 0);
+ $start_offline = WfdownloadsRequest::getInt('start_offline', 0);
$totalCategoriesCount = wfdownloads_categoriesCount();
- $categories = $wfdownloads->getHandler('category')->getObjects(null, true, false);
+ $categoryObjs = $wfdownloads->getHandler('category')->getObjects(null, true, false);
$totalDownloadsCount = $wfdownloads->getHandler('download')->getCount();
@@ -683,13 +680,13 @@
$criteria->setOrder('DESC');
$criteria->setStart($start_published);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $publishedDownloads = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
- $publishedDownloadsCount = $wfdownloads->getHandler('download')->getActiveCount();
- $GLOBALS['xoopsTpl']->assign('published_downloads_count', $publishedDownloadsCount);
+ $publishedDownloadObjs = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
+ $publishedDownloadCount = $wfdownloads->getHandler('download')->getActiveCount();
+ $GLOBALS['xoopsTpl']->assign('published_downloads_count', $publishedDownloadCount);
- if ($publishedDownloadsCount > 0) {
- foreach ($publishedDownloads as $publishedDownload) {
- $publishedDownload_array = $publishedDownload->toArray();
+ if ($publishedDownloadCount > 0) {
+ foreach ($publishedDownloadObjs as $publishedDownloadObj) {
+ $publishedDownload_array = $publishedDownloadObj->toArray();
$publishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($publishedDownload_array['title']));
$publishedDownload_array['category_title'] = $categories[$publishedDownload_array['cid']]['title'];
$publishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($publishedDownload_array['submitter']);
@@ -723,12 +720,12 @@
$criteria->add(new Criteria('published', 0));
$criteria->setStart($start_new);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $newDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
- $newDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('new_downloads_count', $newDownloadsCount);
- if ($newDownloadsCount > 0) {
- foreach ($newDownloads as $newDownload) {
- $newDownload_array = $newDownload->toArray();
+ $newDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $newDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('new_downloads_count', $newDownloadCount);
+ if ($newDownloadCount > 0) {
+ foreach ($newDownloadObjs as $newDownloadObj) {
+ $newDownload_array = $newDownloadObj->toArray();
$newDownload_array['rating'] = number_format($newDownload_array['rating'], 2);
$newDownload_array['title_html'] = $myts->htmlSpecialChars($newDownload_array['title']);
$newDownload_array['category_title'] = $categories[$newDownload_array['cid']]['title'];
@@ -743,7 +740,7 @@
$GLOBALS['xoopsTpl']->append('new_downloads', $newDownload_array);
}
}
- $pagenav = new XoopsPageNav($newDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_new, 'start_new');
+ $pagenav = new XoopsPageNav($newDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_new, 'start_new');
$GLOBALS['xoopsTpl']->assign('new_downloads_pagenav', $pagenav->renderNav());
// Autopublished Downloads
@@ -753,12 +750,12 @@
$criteria->setOrder("ASC");
$criteria->setStart($start_autopublished);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $autopublishedDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
- $autopublishedDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('autopublished_downloads_count', $autopublishedDownloadsCount);
- if ($autopublishedDownloadsCount > 0) {
- foreach ($autopublishedDownloads as $autopublishedDownload) {
- $autopublishedDownload_array = $autopublishedDownload->toArray();
+ $autopublishedDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $autopublishedDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('autopublished_downloads_count', $autopublishedDownloadCount);
+ if ($autopublishedDownloadCount > 0) {
+ foreach ($autopublishedDownloadObjs as $autopublishedDownloadObj) {
+ $autopublishedDownload_array = $autopublishedDownloadObj->toArray();
$autopublishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($autopublishedDownload_array['title']));
$autopublishedDownload_array['category_title'] = $categories[$autopublishedDownload_array['cid']]['title'];
$autopublishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($autopublishedDownload_array['submitter']);
@@ -766,7 +763,7 @@
$GLOBALS['xoopsTpl']->append('autopublished_downloads', $autopublishedDownload_array);
}
}
- $pagenav = new XoopsPageNav($autopublishedDownloadsCount, $wfdownloads->getConfig(
+ $pagenav = new XoopsPageNav($autopublishedDownloadCount, $wfdownloads->getConfig(
'admin_perpage'
), $start_autopublished, 'start_autopublished');
$GLOBALS['xoopsTpl']->assign('autopublished_downloads_pagenav', $pagenav->renderNav());
@@ -779,12 +776,12 @@
$criteria->setOrder('ASC');
$criteria->setStart($start_expired);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $expired_downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
- $expiredDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expiredDownloadsCount);
- if ($expiredDownloadsCount > 0) {
- foreach ($expired_downloads as $expired_download) {
- $expired_download_array = $expired_download->toArray();
+ $expiredDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $expiredDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expiredDownloadCount);
+ if ($expiredDownloadCount > 0) {
+ foreach ($expiredDownloadObjs as $expiredDownloadObj) {
+ $expired_download_array = $expiredDownloadObj->toArray();
$expired_download_array['title_html'] = $myts->htmlSpecialChars(trim($expired_download_array['title']));
$expired_download_array['category_title'] = $categories[$expired_download_array['cid']]['title'];
$expired_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($expired_download_array['submitter']);
@@ -792,7 +789,7 @@
$GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
}
}
- $pagenav = new XoopsPageNav($expiredDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_expired, 'start_expired');
+ $pagenav = new XoopsPageNav($expiredDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_expired, 'start_expired');
$GLOBALS['xoopsTpl']->assign('expired_downloads_pagenav', $pagenav->renderNav());
// Offline downloads
@@ -801,13 +798,12 @@
$criteria->setOrder('ASC');
$criteria->setStart($start_offline);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $offlineDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $offlineDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
- $offlineDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('offline_downloads_count', $offlineDownloadsCount);
- if ($offlineDownloadsCount > 0) {
- foreach ($offlineDownloads as $offlineDownload) {
- $offlineDownload_array = $offlineDownload->toArray();
+ $offlineDownloadObjs = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $offlineDownloadCount = $wfdownloads->getHandler('download')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('offline_downloads_count', $offlineDownloadCount);
+ if ($offlineDownloadCount > 0) {
+ foreach ($offlineDownloadObjs as $offlineDownloadObj) {
+ $offlineDownload_array = $offlineDownloadObj->toArray();
$offlineDownload_array['title_html'] = $myts->htmlSpecialChars(trim($offlineDownload_array['title']));
$offlineDownload_array['category_title'] = $categories[$offlineDownload_array['cid']]['title'];
$offlineDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($offlineDownload_array['submitter']);
@@ -815,7 +811,7 @@
$GLOBALS['xoopsTpl']->append('offline_downloads', $offlineDownload_array);
}
}
- $pagenav = new XoopsPageNav($offlineDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_offline, 'start_offline');
+ $pagenav = new XoopsPageNav($offlineDownloadCount, $wfdownloads->getConfig('admin_perpage'), $start_offline, 'start_offline');
$GLOBALS['xoopsTpl']->assign('offline_downloads_pagenav', $pagenav->renderNav());
} else {
// NOP
@@ -843,10 +839,10 @@
$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_downloadslist.tpl");
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
break;
- case "batchfile.add" :
+ case 'batchfile.add':
$batchid = WfdownloadsRequest::getInt('batchid', 0);
$extensionToMime = include $GLOBALS['xoops']->path('include/mimetypes.inc.php');
@@ -873,7 +869,6 @@
$downloadObj->setVar('filename', $savedFileName);
$downloadObj->setVar('size', filesize($wfdownloads->getConfig('uploaddir') . '/' . $savedFileName));
$downloadObj->setVar('filetype', $extensionToMime[pathinfo($batchFile, PATHINFO_EXTENSION)]);
-
$downloadObj->setVar('version', 0);
$downloadObj->setVar('status', _WFDOWNLOADS_STATUS_APPROVED); // IN PROGRESS
$downloadObj->setVar('published', time());
@@ -892,7 +887,7 @@
redirect_header("{$currentFile}?op=download.edit&lid={$newid}", 3, _AM_WFDOWNLOADS_BATCHFILE_MOVEDEDITNOW);
break;
- case "batchfile.delete" :
+ case 'batchfile.delete':
$batchid = WfdownloadsRequest::getInt('batchid', 0);
$ok = WfdownloadsRequest::getBool('ok', false, 'POST');
@@ -922,7 +917,7 @@
}
break;
- case "ip_logs.list" :
+ case 'ip_logs.list':
$lid = WfdownloadsRequest::getInt('lid', 0);
if (!$lid) {
header('Location index.php');
@@ -943,15 +938,15 @@
}
$criteria->setSort('date');
$criteria->setOrder('DESC');
- $ip_logObjs = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
- $ip_logs_count = $wfdownloads->getHandler('ip_log')->getCount($criteria);
- $GLOBALS['xoopsTpl']->assign('ip_logs_count', $ip_logs_count);
+ $ip_logObjs = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
+ $ip_logCount = $wfdownloads->getHandler('ip_log')->getCount($criteria);
+ $GLOBALS['xoopsTpl']->assign('ip_logs_count', $ip_logCount);
unset($criteria);
// Get download info
if ($lid != 0) {
- $downloadObj = $wfdownloads->getHandler('download')->get($lid);
- $download_array = $downloadObj->toArray();
+ $downloadObj = $wfdownloads->getHandler('download')->get($lid);
+ $download_array = $downloadObj->toArray();
$download_array['log_title'] = sprintf(_AM_WFDOWNLOADS_LOG_FOR_LID, $download_array['title']);
$GLOBALS['xoopsTpl']->assign('download', $download_array);
}
@@ -972,8 +967,8 @@
// NOP
} else {
foreach ($ip_logObjs as $ip_logObj) {
- $ip_log_array = $ip_logObj->toArray();
- $ip_log_array['uname'] = XoopsUserUtility::getUnameFromId(
+ $ip_log_array = $ip_logObj->toArray();
+ $ip_log_array['uname'] = XoopsUserUtility::getUnameFromId(
$ip_log_array['uid']
);
//($ip_log_array['uid'] != 0) ? $userList[$ip_log_array['uid']] : _AM_WFDOWNLOADS_ANONYMOUS;
@@ -984,6 +979,6 @@
$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_ip_logslist.tpl");
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
break;
}
Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/images.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/images.php 2014-09-15 03:39:05 UTC (rev 12781)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/images.php 2014-09-16 20:31:50 UTC (rev 12782)
@@ -36,8 +36,8 @@
$op = WfdownloadsRequest::getString('op', 'images.list');
switch ($op) {
- case "image.upload" :
- if ($_FILES['uploadfile']['name'] != "") {
+ case 'image.upload':
+ if ($_FILES['uploadfile']['name'] != '') {
if (file_exists(XOOPS_ROOT_PATH . '/' . $_POST['uploadpath'] . '/' . $_FILES['uploadfile']['name'])) {
redirect_header($currentFile, 2, _AM_WFDOWNLOADS_DOWN_IMAGEEXIST);
}
@@ -60,7 +60,7 @@
}
break;
- case "image.delete" :
+ case 'image.delete':
$ok = WfdownloadsRequest::getBool('ok', false, 'POST');
if ($ok == true) {
@@ -86,11 +86,11 @@
_AM_WFDOWNLOADS_DOWN_DELETEFILE . "<br /><br />" . $_POST['downfile'],
_AM_WFDOWNLOADS_BDELETE
);
- include 'admin_footer.php';
+ include_once dirname(__FILE__) . '/admin_footer.php';
}
break;
- case "images.list" :
+ case 'images.list':
default:
include_once WFDOWNLOADS_ROOT_PATH . '/class/wfdownloads_lists.php';
@@ -140,24 +140,16 @@
$iform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_DOWN_FUPLOADPATH, XOOPS_R...
[truncated message content] |
|
From: <be...@us...> - 2014-09-15 03:39:10
|
Revision: 12781
http://sourceforge.net/p/xoops/svn/12781
Author: beckmi
Date: 2014-09-15 03:39:05 +0000 (Mon, 15 Sep 2014)
Log Message:
-----------
allowing for "https" URL in YouTube links in Textsanitizer
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php
Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-14 10:06:34 UTC (rev 12780)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-15 03:39:05 UTC (rev 12781)
@@ -8,6 +8,7 @@
- Fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages. (rgriffith)
- fix for Update setting Template import date to 0 (timgno/mamba)
- adding Adding language constants for Protector's Prefix Manager (slider84/mamba)
+- allowing for "https" URL in YouTube links in Textsanitizer (mamba)
===============================
2014-06-20: Version 2.5.7 Final (Patch)
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php 2014-09-14 10:06:34 UTC (rev 12780)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php 2014-09-15 03:39:05 UTC (rev 12781)
@@ -88,7 +88,7 @@
*/
static function decode($url, $width, $height)
{
- if (!preg_match("/^http:\/\/(www\.)?youtube\.com\/watch\?v=(.*)/i", $url, $matches)) {
+ if (!preg_match("/^http[s]?:\/\/(www\.)?youtube\.com\/watch\?v=(.*)/i", $url, $matches)) {
trigger_error("Not matched: {$url} {$width} {$height}", E_USER_WARNING);
return "";
|
|
From: <be...@us...> - 2014-09-14 10:06:41
|
Revision: 12780
http://sourceforge.net/p/xoops/svn/12780
Author: beckmi
Date: 2014-09-14 10:06:34 +0000 (Sun, 14 Sep 2014)
Log Message:
-----------
Fixing English typo
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/style.css
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/style.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/style.css 2014-09-14 10:05:54 UTC (rev 12779)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/style.css 2014-09-14 10:06:34 UTC (rev 12780)
@@ -10,7 +10,7 @@
*
* @version $Id
*/
- /* ==================== Import others style cheats ==================== */
+ /* ==================== Import other stylesheets ==================== */
@import url(reset.css);
@import url(dashboard.css);
@import url(buttonbar.css);
|
|
From: <be...@us...> - 2014-09-14 10:05:58
|
Revision: 12779
http://sourceforge.net/p/xoops/svn/12779
Author: beckmi
Date: 2014-09-14 10:05:54 +0000 (Sun, 14 Sep 2014)
Log Message:
-----------
replacing relative links with absolute links
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/header.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/user.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/index.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/admin_header.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groupperm.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -17,8 +17,8 @@
* @version $Id $
**/
-include_once __DIR__ . '/../../../include/cp_header.php';
-include_once __DIR__ . '/../../../class/xoopsformloader.php';
+include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+include_once dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php';
include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/header.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/header.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-require_once '../../../include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
include_once XOOPS_ROOT_PATH . '/class/template.php';
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -17,7 +17,7 @@
* @version $Id $
**/
-include_once __DIR__ . '/../../../include/cp_header.php';
+include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -51,14 +51,14 @@
break;
case "new":
- include_once '../include/forms.php';
+ include_once dirname(__DIR__) . '/include/forms.php';
$obj =& $handler->create();
$form = $obj->getForm();
$form->display();
break;
case "edit":
- include_once '../include/forms.php';
+ include_once dirname(__DIR__) . '/include/forms.php';
$obj = $handler->get($_REQUEST['id']);
$form = $obj->getForm();
$form->display();
@@ -79,7 +79,7 @@
if ( $handler->insert($obj) ) {
redirect_header('category.php', 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_CATEGORY) );
}
- include_once '../include/forms.php';
+ include_once dirname(__DIR__) . '/include/forms.php';
echo $obj->getHtmlErrors();
$form =& $obj->getForm();
$form->display();
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/field.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/field.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -100,7 +100,7 @@
break;
case "new":
- include_once '../include/forms.php';
+ include_once dirname(__DIR__) . '/include/forms.php';
$obj =& $profilefield_handler->create();
$form = profile_getFieldForm($obj);
$form->display();
@@ -111,7 +111,7 @@
if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
redirect_header('field.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
}
- include_once '../include/forms.php';
+ include_once dirname(__DIR__) . '/include/forms.php';
$form = profile_getFieldForm($obj);
$form->display();
break;
@@ -278,7 +278,7 @@
$url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
redirect_header($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD));
}
- include_once '../include/forms.php';
+ include_once dirname(__DIR__) . '/include/forms.php';
echo $obj->getHtmlErrors();
$form = profile_getFieldForm($obj);
$form->display();
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/step.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/step.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/step.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -36,14 +36,14 @@
case "new":
$obj =& $handler->create();
- include_once '../include/forms.php';
+ include_once dirname(__DIR__) . '/include/forms.php';
$form = profile_getStepForm($obj);;
$form->display();
break;
case "edit":
$obj =& $handler->get($_REQUEST['id']);
- include_once '../include/forms.php';
+ include_once dirname(__DIR__) . '/include/forms.php';
$form = profile_getStepForm($obj);;
$form->display();
break;
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/user.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/user.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/user.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -43,7 +43,7 @@
break;
case "new":
xoops_loadLanguage("main", $GLOBALS['xoopsModule']->getVar('dirname', 'n') );
- include_once '../include/forms.php';
+ include_once dirname(__DIR__) . '/include/forms.php';
$obj =& $handler->createUser();
$obj->setGroups(array(XOOPS_GROUP_USERS) );
$form = profile_getUserForm($obj);
@@ -57,7 +57,7 @@
// If not webmaster trying to edit a webmaster - disallow
redirect_header("user.php", 3, _US_NOEDITRIGHT);
}
- include_once '../include/forms.php';
+ include_once dirname(__DIR__) . '/include/forms.php';
$form = profile_getUserForm($obj);
$form->display();
break;
@@ -174,7 +174,7 @@
}
}
$user->setGroups($new_groups);
- include_once '../include/forms.php';
+ include_once dirname(__DIR__) . '/include/forms.php';
echo $user->getHtmlErrors();
$form = profile_getUserForm($user, $profile);
$form->display();
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/index.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/index.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/index.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -49,7 +49,7 @@
$GLOBALS['xoopsTpl']->assign('lang_youremail', _US_YOUREMAIL);
$GLOBALS['xoopsTpl']->assign('lang_sendpassword', _US_SENDPASSWORD);
$GLOBALS['xoopsTpl']->assign('mailpasswd_token', $GLOBALS['xoopsSecurity']->createToken());
- include 'footer.php';
+ include __DIR__ . '/footer.php';
exit();
}
if (!empty($_GET['xoops_redirect']) ) {
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/admin_header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/admin_header.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/admin_header.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -25,7 +25,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
-include '../../../../mainfile.php';
+include dirname(dirname(dirname(dirname(__DIR__)))) . '/mainfile.php';
include $GLOBALS['xoops']->path('/include/cp_functions.php');
if (is_object($xoopsUser)) {
$module_handler =& xoops_gethandler('module');
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groupperm.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groupperm.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groupperm.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -1,7 +1,7 @@
<?php
// $Id$
-include_once __DIR__ . '/../../../include/cp_header.php';
+include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
$modid = isset($_POST['modid']) ? intval($_POST['modid']) : 0;
// we don't want system module permissions to be changed here
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/jquery.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/jquery.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/jquery.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-require '../../../../mainfile.php';
+require dirname(dirname(dirname(dirname(__DIR__)))) . '/mainfile.php';
require(XOOPS_ROOT_PATH.'/header.php');
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -31,7 +31,7 @@
// Include header
-include 'header.php';
+include __DIR__ . '/header.php';
if ( isset($fct) && $fct == 'users' ) {
$xoopsOption['pagetype'] = 'user';
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php 2014-09-14 10:03:01 UTC (rev 12778)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php 2014-09-14 10:05:54 UTC (rev 12779)
@@ -16,7 +16,7 @@
*/
// Include header
-include 'header.php';
+include __DIR__ . '/header.php';
$page = system_CleanVars($_REQUEST, 'page', '', 'string');
$mid = system_CleanVars($_REQUEST, 'mid', 0, 'int');
|
|
From: <be...@us...> - 2014-09-14 10:03:12
|
Revision: 12778
http://sourceforge.net/p/xoops/svn/12778
Author: beckmi
Date: 2014-09-14 10:03:01 +0000 (Sun, 14 Sep 2014)
Log Message:
-----------
fixing links to module after its installation
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php
Modified: XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt 2014-09-08 06:08:43 UTC (rev 12777)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt 2014-09-14 10:03:01 UTC (rev 12778)
@@ -4,6 +4,15 @@
Below are language differences from a version to next version.
===============================
+NOT RELEASED: Version 2.5.8 Beta
+===============================
+ADDED/DELETED DEFINES
+
+/install/language/english/install.php
+/modules/system/language/english/admin/modulesadmin.php
+- added define('_AM_SYSTEM_MODULES_INSTALL_MORE',"Install more modules");
+
+===============================
2014/06/14: Version 2.5.7 Final
===============================
ADDED/DELETED DEFINES
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-09-08 06:08:43 UTC (rev 12777)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-09-14 10:03:01 UTC (rev 12778)
@@ -422,24 +422,26 @@
$msgs[] = '</div></div>';
$blocks = $module->getInfo('blocks');
- $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a> |
- <a href="admin.php?fct=modulesadmin&op=installlist">' . _AM_SYSTEM_MODULES_TOINSTALL . '</a> | ';
+ $redDevider = '<span class="red bold"> | </span>';
+ $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . $redDevider . '
+ </a> <a href="admin.php?fct=modulesadmin&op=installlist">' . _AM_SYSTEM_MODULES_INSTALL_MORE . '</a>';
$msgs[] = '<br /><span class="red bold">' . _AM_SYSTEM_MODULES_MODULE . ' ' . $module->getInfo('name') . ': </span></div>';
+ $msg0 = '<div class="center">';
+ $msgBlocks = $msgAdmin = $msgTestData = '';
if ($blocks != false) {
- $msgs[] = '<div class="center"><a href="admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $newmid . '&selmod=-2&selgrp=-1&selvis=-1&filsave=1">' . _AM_SYSTEM_BLOCKS . '</a></div>';
- }
- ;
- $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=preferences&op=showmod&mod=' . $newmid . '">' . _AM_SYSTEM_PREF . '</a>';
- $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a>';
+ $msgBlocks = '<a href="admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $newmid . '&selmod=-2&selgrp=-1&selvis=-1&filsave=1">' . _AM_SYSTEM_BLOCKS . '</a> ' . $redDevider;
+ };
+ $msgAdmin = '<a href="admin.php?fct=preferences&op=showmod&mod=' . $newmid . '">' . _AM_SYSTEM_PREF . '</a> ' . $redDevider . '
+ <a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a>';
$testdataDirectory = XOOPS_ROOT_PATH . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata';
if (file_exists($testdataDirectory)) {
- $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata/index.php' . '">' . _AM_SYSTEM_MODULES_INSTALL_TESTDATA . '</a></div>';
+ $msgTestData = $redDevider . ' <a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata/index.php' . '">' . _AM_SYSTEM_MODULES_INSTALL_TESTDATA . '</a></div>';
} else {
- $msgs[] = '</div>';
+ $msgTestData = '</div>';
}
+ $msgs[] = $msg0 . $msgBlocks . $msgAdmin . $msgTestData;
-
$ret = implode('<br />', $msgs);
unset($blocks);
unset($msgs);
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php 2014-09-08 06:08:43 UTC (rev 12777)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php 2014-09-14 10:03:01 UTC (rev 12778)
@@ -167,3 +167,5 @@
</ul>");
// 2.5.7
define('_AM_SYSTEM_MODULES_INSTALL_TESTDATA',"Add Test Data");
+// 2.5.8
+define('_AM_SYSTEM_MODULES_INSTALL_MORE',"Install more modules");
|
|
From: <be...@us...> - 2014-09-08 06:08:55
|
Revision: 12777
http://sourceforge.net/p/xoops/svn/12777
Author: beckmi
Date: 2014-09-08 06:08:43 +0000 (Mon, 08 Sep 2014)
Log Message:
-----------
fixing Help issues
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/admin_header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/help/help.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/help/helpheader.html
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/admin_header.php 2014-09-06 22:09:20 UTC (rev 12776)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/admin_header.php 2014-09-08 06:08:43 UTC (rev 12777)
@@ -32,7 +32,7 @@
require_once $pathModuleAdmin . '/moduleadmin/moduleadmin.php';
if ($xoopsUser) {
- $xoopsModule = XoopsModule::getByDirname("TDMDownloads");
+ $xoopsModule = XoopsModule::getByDirname($mydirname);
if (!$xoopsUser->isAdmin($xoopsModule->mid())) {
redirect_header(XOOPS_URL . "/", 3, _NOPERM);
exit();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/help/help.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/help/help.html 2014-09-06 22:09:20 UTC (rev 12776)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/help/help.html 2014-09-08 06:08:43 UTC (rev 12777)
@@ -1,12 +1,5 @@
<div id="help-template" class="outer">
- <h1 class="head">Help:
- <a class="ui-corner-all tooltip"
- href="<{$xoops_url}>/modules/<{$mydirname}>/admin/index.php"
- title="Back to the administration of TDMDownloads"> TDMDownloads <img
- src="<{xoAdminIcons home.png}>"
- alt="Back to the Administration of TDMDownloads"/>
- </a>
- </h1>
+ <{include file=$smarty.const._MI_TDMDOWNLOADS_HELP_HEADER}>
<!-- -----Help Content ---------- -->
<h4 class="odd">Description</h4>
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/help/helpheader.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/help/helpheader.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/help/helpheader.html 2014-09-08 06:08:43 UTC (rev 12777)
@@ -0,0 +1,8 @@
+<h1 class="head">Help:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/<{$smarty.const._MI_TDMDOWNLOADS_DIRNAME}>/admin/index.php"
+ title="Back to the administration of <{$smarty.const._MI_TDMDOWNLOADS_NAME}>"> <{$smarty.const._MI_TDMDOWNLOADS_NAME}>
+ <img src="<{xoAdminIcons home.png}>"
+ alt="Back to the Administration of <{$smarty.const._MI_TDMDOWNLOADS_NAME}>"/>
+ </a></h1>
+
+
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/modinfo.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/modinfo.php 2014-09-06 22:09:20 UTC (rev 12776)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/modinfo.php 2014-09-08 06:08:43 UTC (rev 12777)
@@ -15,6 +15,8 @@
*/
// Nom du module
define('_MI_TDMDOWNLOADS_NAME', "TDMDownloads");
+define('_MI_TDMDOWNLOADS_DIRNAME', basename(dirname(dirname(__DIR__))));
+define('_MI_TDMDOWNLOADS_HELP_HEADER', __DIR__.'/help/helpheader.html');
// Description du module
define('_MI_TDMDOWNLOADS_DESC', "Creates a downloads section where users can download/submit/rate various files.");
// Bloc
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/xoops_version.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/xoops_version.php 2014-09-06 22:09:20 UTC (rev 12776)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/xoops_version.php 2014-09-08 06:08:43 UTC (rev 12777)
@@ -31,7 +31,7 @@
'nickname' => 'Mage',
'module_website_url' => 'www.xoops.org',
'module_website_name' => 'Support site',
- 'help' => 'page=>help',
+ 'help' => 'page=help',
'license' => 'GNU GPL 2.0 or later',
'license_url' => "www.gnu.org/licenses/gpl-2.0.html",
'official' => 0,
|
|
From: <luc...@us...> - 2014-09-06 22:09:23
|
Revision: 12776
http://sourceforge.net/p/xoops/svn/12776
Author: luciorota
Date: 2014-09-06 22:09:20 +0000 (Sat, 06 Sep 2014)
Log Message:
-----------
added extgallery 1.11 (by Skyppyno)
Added Paths:
-----------
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/admin.php
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/blocks.php
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/extension.php
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/index.html
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/album_new_photo.tpl
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/ecard_html.tpl
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/ecard_text.tpl
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/global_new_photo.tpl
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/global_new_photo_pending.tpl
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/index.html
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/main.php
XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/modinfo.php
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/admin.php
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/admin.php (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/admin.php 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1,340 @@
+<?php
+
+define('_AM_EXTGALLERY_CATEGORY',"Categoria");
+define('_AM_EXTGALLERY_INFORMATION',"Informazione");
+define('_AM_EXTGALLERY_PARENT_CAT',"Directory Padre");
+define('_AM_EXTGALLERY_DESC',"Descrizione");
+define('_AM_EXTGALLERY_PHOTO',"Foto");
+define('_AM_EXTGALLERY_WEIGHT',"Peso");
+define('_AM_EXTGALLERY_TITLE',"Titolo");
+
+// Main administration menu
+define('_AM_EXTGALLERY_GO_TO_MODULE',"Vai al modulo");
+define('_AM_EXTGALLERY_PREFERENCES',"Preferenze");
+define('_AM_EXTGALLERY_ADMINISTRATION',"Amministrazione");
+
+// Index page
+define('_AM_EXTGALLERY_UPDATE',"Aggiorna");
+define('_AM_EXTGALLERY_UPDATE_INFO',"Informazioni aggiornamento");
+define('_AM_EXTGALLERY_UPDATE_UPGRADE',"Clicca qui per aggiornare il modulo alla nuova versione");
+define('_AM_EXTGALLERY_CHECK_UPDATE_ERROR',"Impossibile recuperare l'ultima versione di eXtGalley.");
+define('_AM_EXTGALLERY_UPDATE_KO',"");
+define('_AM_EXTGALLERY_UPDATE_OK',"Stai usando eXtGallery con gli ultimi aggiornamenti per la stabilità e la sicurezza.");
+define('_AM_EXTGALLERY_SERVER_CONF',"Configurazione server");
+define('_AM_EXTGALLERY_XOOPS_VERSION',"Versione XOOPS");
+define('_AM_EXTGALLERY_GRAPH_GD_LIB_VERSION',"Versione della libreria grafica <b>GD</b>");
+define('_AM_EXTGALLERY_GRAPH_IM_LIB_VERSION',"Versione della libreria grafica <b>ImageMagick</b>");
+define('_AM_EXTGALLERY_GIF_SUPPORT',"Supporto GIF");
+define('_AM_EXTGALLERY_JPEG_SUPPORT',"Supporto JPEG");
+define('_AM_EXTGALLERY_PNG_SUPPORT',"Supporto PNG");
+define('_AM_EXTGALLERY_PUBLIC_ORIG_PATH',"Percorso pubblico delle foto originali");
+define('_AM_EXTGALLERY_PUBLIC_LARGE_PATH',"Percorso pubblico delle foto grandi");
+define('_AM_EXTGALLERY_PUBLIC_MEDIUM_PATH',"Percorso pubblico delle foto medie");
+define('_AM_EXTGALLERY_PUBLIC_THUMB_PATH',"Percorso pubblico delle miniature");
+define('_AM_EXTGALLERY_NOT_CREATED',"Non creato");
+define('_AM_EXTGALLERY_NOT_WRITABLE',"Non Scrivibile");
+define('_AM_EXTGALLERY_CHANGELOG',"Elenco modifiche");
+define('_AM_EXTGALLERY_XOOPS_VERSION_NOT_SUPPORTED',"La tua versione di XOOPS non è supportata dalla nuova versione di eXtGallery. Prego aggiornala alla <b>%s</b> versione di XOOPS o ad una più recente.");
+define('_AM_EXTGALLERY_EXTGALLERY_VERSION',"Versione di eXtGallery");
+
+// Public category page
+define('_AM_EXTGALLERY_MODDELETE_PUBLICCAT',"Modifica o cancella categoria pubblica");
+define('_AM_EXTGALLERY_MODDELETE_PUBLICCAT_INFO',"Potresti trovare un alista di tutte le categorie/album disponibili sul tuo sito. Il numero fra parentesi alla fine del nome di categoria indica il peso della categoria.");
+define('_AM_EXTGALLERY_ADD_PUBLIC_CAT',"Aggiungi una categoria pubblica");
+define('_AM_EXTGALLERY_ADD_PUBLIC_CAT_INFO',"Puoi aggiungere una categoria solo sotto una categoria senza foto. Solo le categorie valide sono visualizzate on the select below.");
+define('_AM_EXTGALLERY_NAME',"Nome");
+define('_AM_EXTGALLERY_DELETE_CAT_CONFIRM',"Tutto il contenuto di questa categoria o album sarà cancellato...");
+define('_AM_EXTGALLERY_MOD_PUBLIC_CAT',"Modifica una categoria pubblica");
+define('_AM_EXTGALLERY_CAT_IMG',"Immagine di Categoria");
+define('_AM_EXTGALLERY_THUMB',"Miniature");
+define('_AM_EXTGALLERY_CAT_CREATED',"Categoria creata");
+define('_AM_EXTGALLERY_CAT_MODIFIED',"Categoria modificata");
+define('_AM_EXTGALLERY_CAT_DELETED',"Categoria cancellata");
+define('_AM_EXTGALLERY_NO_CATEGORY_SELECTED',"Nessuna categoria selezionata");
+
+// Photo page
+define('_AM_EXTGALLERY_ADD_BATCH',"Aggiungi foto in massa");
+define('_AM_EXTGALLERY_BATCH_PATH',"Percorso della cartella di massa");
+define('_AM_EXTGALLERY_ADD_BATCH_INFO',"Ci sono <b>%d</b> foto nella cartella di massa. Premendo il pulsante INVIA qui sotto, tutte le foto nella cartella di massa saranno carivate nel-negli album selezionato-i qui sotto.");
+define('_AM_EXTGALLERY_EDITDELETE_PHOTO',"Modifica/Cancella foto");
+define('_AM_EXTGALLERY_EDITDELETE_PHOTO_INFO',"Scegli la categoria dove vuoi modificare o cancellare foto.");
+define('_AM_EXTGALLERY_PENDING_PHOTO',"Foto in attesa di approvazione");
+define('_AM_EXTGALLERY_APPROVE_INFO',"<b>Approva</b> questa foto");
+define('_AM_EXTGALLERY_EDIT_INFO',"<b>Modifica</b> questa foto prima dell'approvazione");
+define('_AM_EXTGALLERY_DELETE_INFO',"<b>Cancella</b> questa foto");
+define('_AM_EXTGALLERY_ACTION',"Azione");
+define('_AM_EXTGALLERY_APPROVE',"Approva");
+define('_AM_EXTGALLERY_EDITDELETE_PHOTOTABLE_INFO',"Solo la foto dove il box è selezionato sarà modificata o cancellata.");
+define('_AM_EXTGALLERY_APPLY_CHANGE',"Applica i cambiamenti");
+define('_AM_EXTGALLERY_X_PHOTO_ADDED',"%d foto aggiunte");
+define('_AM_EXTGALLERY_X_PHOTO_APPROVED',"%d foto approvate");
+define('_AM_EXTGALLERY_X_PHOTO_DELETED',"%d foto cancellate");
+define('_AM_EXTGALLERY_X_PHOTO_MODIFIED',"%d foto modificate");
+define('_AM_EXTGALLERY_PHOTO_MODIFIED',"Foto modificata");
+define('_AM_EXTGALLERY_BATCH_CONTINUE_MESSAGE',"%d foto aggiunte, %d più. Clicca per continuare.");
+define('_AM_EXTGALLERY_NOT_AN_ALBUM',"Devi selezionare un album valido");
+define('_AM_EXTGALLERY_ALBUM',"Album");
+define('_AM_EXTGALLERY_NO_PHOTO_IN_BATCH_DIR',"Non ci sono foto nella cartella di massa");
+define('_AM_EXTGALLERY_NO_PHOTO_SELECTED',"Non sono foto selezionate");
+define('_AM_EXTGALLERY_NO_PHOTO_IN_THIS_ALBUM',"Nessuna foto in questo album");
+define('_AM_EXTGALLERY_THUMB_REBUILDED',"Miniatura ricostruita");
+define('_AM_EXTGALLERY_REBUILD_THUMB',"Ricostruisci Miniatura");
+define('_AM_EXTGALLERY_REBUILD_THUMB_INFO',"Selezionare la categoria in cui verrà ricostruita la miniatura. Questa funzione è utile se si desidera modificare le dimensioni o la qualità della miniatura");
+define('_AM_EXTGALLERY_ADD_PHOTO','Aggiungi foto');
+define('_AM_EXTGALLERY_UPLOAD','Aggiungi nuova foto');
+define('_AM_EXTGALLERY_ALBUMS','Seleziona Album');
+define('_AM_EXTGALLERY_PHOTO_TITLE','Titolo');
+define("_AM_EXTGALLERY_PHOTO_UPLOADED","Foto caricata. Grazie per il tuo contributo.");
+define("_AM_EXTGALLERY_PHOTO_PENDING","La tua foto deve essere approvata da un amministratore. Grazie per il tuo contributo.");
+define('_AM_EXTGALLERY_UPLOAD_ERROR',"Errore durante il caricamento");
+define('_AM_EXTGALLERY_EXTRA_INFO',"Ulteriori info");+
+
+// Permissions
+define('_AM_EXTGALLERY_PUBLIC_PERM_MASK',"Schema dei permessi pubblici");
+define('_AM_EXTGALLERY_PUBLIC_PERM_MASK_INFO',"Puoi impostare qui lo schema dei permessi di default che saranno applicati alle nuove categorie. Fai attenzione a non dare permessi eccessivi qui perchè saranno applicati a tutte le nuove categorie.");
+define('_AM_EXTGALLERY_GROUP_NAME',"Nome gruppo");
+define('_AM_EXTGALLERY_CAN_ACCESS',"Può accedere");
+define('_AM_EXTGALLERY_CAN_RATE',"Può votare le foto");
+define('_AM_EXTGALLERY_CAN_SEND_ECARD',"Può inviare ecards dalla galleria pubblica");
+define('_AM_EXTGALLERY_CAN_DOWNLOAD',"Può scaricare foto");
+define('_AM_EXTGALLERY_CAN_DOWNLOAD_ORIG',"Può scaricare foto originali");
+define('_AM_EXTGALLERY_CAN_UPLOAD',"Può caricare foto nell'album pubblico");
+define('_AM_EXTGALLERY_AUTOAPPROVE',"Le foto pubbliche non devono essere approvate dall'amministratore");
+define('_AM_EXTGALLERY_DISPLAYED',"Mostra questo album");
+
+define('_AM_EXTGALLERY_PERM_MASK_UPDATED',"Schema dei permessi aggiornata");
+
+define('_AM_EXTGALLERY_SELECT_PERM',"Seleziona Permesso");
+define('_AM_EXTGALLERY_SELECT_PERM_DESC',"Si prega di controllare tutte le parti e aggiornare il permesso. Se si desidera che gli utenti siano in grado di vedere i tuoi album e le foto, è necessario selezionare il permesso per tutto il gruppo");
+
+define('_AM_EXTGALLERY_ACCESS_PERM',"Permessi di accesso");
+define('_AM_EXTGALLERY_ACCESS_PERM_DESC',"Seleziona le categoria che vuoi che vengano viste");
+define('_AM_EXTGALLERY_ACCESS_PERM_INFO',"Questo permesso ti consente di restringere l'accesso alla categoria. Un utente non può vedere una categoria per la quale non gli è stato consentito l'acesso.");
+
+define('_AM_EXTGALLERY_RATE_PERM',"Permessi di votazione");
+define('_AM_EXTGALLERY_RATE_PERM_DESC',"Seleziona le categorie dove le foto possono essere votate");
+define('_AM_EXTGALLERY_RATE_PERM_INFO',"Questo permesso ti consente di restringere le funzioni di votazione. Un utente disabilitato non può votare nella categoria ma può vedere il punteggio delle foto.");
+
+define('_AM_EXTGALLERY_PUBLIC_ECARD',"Permessi pubblici eCard");
+define('_AM_EXTGALLERY_PUBLIC_ECARD_DESC',"Seleziona le categorie dove le foto possono essere inviate tramite eCard");
+define('_AM_EXTGALLERY_PUBLIC_ECARD_INFO',"Questo permesso ti consente di restringere la funzione di invio eCard. Tutti gli indirizzi IP dei mittenti di eCard sono registrati.");
+
+define('_AM_EXTGALLERY_PUBLIC_DOWNLOAD',"Permesso di download pubblico");
+define('_AM_EXTGALLERY_PUBLIC_DOWNLOAD_DESC',"Seleziona le categorie dove le foto possono essere scaricate");
+define('_AM_EXTGALLERY_PUBLIC_DOWNLOAD_INFO',"Questo permesso ti consente di restringere lo scaricamento delle immagini grandi. Se a un utente è permesso di scaricare, può accedere allo scaricamento delle immagini grandi se l'opzione \"Salva foto grande\" è abilitata nelle preferenze.");
+
+define('_AM_EXTGALLERY_PUBLIC_DOWNLOAD_ORIG',"Permessi di download degli originali");
+define('_AM_EXTGALLERY_PUBLIC_DOWNLOAD_ORIG_DESC',"Seleziona le categorie dove gli utenti possono scaricare le foto originali.<br />la funzione Salva foto originale deve essere abilitata nelle preferenze per scaricare gli originali e il gruppo deve avere i diritti per lo scaricamento.");
+define('_AM_EXTGALLERY_PUBLIC_DOWNLOAD_ORIG_INFO',"Questo permesso ti consente di restringere il download delle immagini originali. Se a un utente è consentito lo scaricamento degli originali, può accedere all'immagine originale (senza bordi e watermark, e non ridimensionata) se l'opzione \"Salva foto originale\" è abilitata nelle preferenze.");
+
+define('_AM_EXTGALLERY_PUBLIC_UPLOAD',"Permessi di upload pubblici");
+define('_AM_EXTGALLERY_PUBLIC_UPLOAD_DESC',"Seleziona le categorie dove gli utenti posson caricare foto");
+define('_AM_EXTGALLERY_PUBLIC_UPLOAD_INFO',"Questo permesso ti consente di restringere l'upload/invio di nuove immagini negli album pubblici.");
+
+define('_AM_EXTGALLERY_PUBLIC_AUTOAPROVE',"Permessi di auto-approvazione pubblici");
+define('_AM_EXTGALLERY_PUBLIC_AUTOAPROVE_DESC',"Seleziona le categorie dove le foto non hanno bisogno di approvazione degli amministratori");
+define('_AM_EXTGALLERY_PUBLIC_AUTOAPROVE_INFO',"Questo permesso ti consente di evitare la visualizzazione automatica di immagini pubbliche presentate finché non vengono approvate da un amministratore. Seleziona le categorie dove le foto inviate dagli utenti non necessitano approvazione. Gli utenti pubblici devono avere già abilitato il permessso di Invio Foto per usufruire di questo permesso.");
+
+define('_AM_EXTGALLERY_PUBLIC_DISPLAYED',"Mostra i permessi per l'Album");
+define('_AM_EXTGALLERY_PUBLIC_DISPLAYED_DESC',"Seleziona le Categorie che devono essere mostrate");
+define('_AM_EXTGALLERY_PUBLIC_DISPLAYED_INFO',"Consente di non visualizzare i nomi delle categorie, ma ancora permette l'accesso alle immagini. Ad esempio, è possibile utilizzare le foto in queste categorie per il contenuto del sito.");
+
+// Watermark and border page
+define('_AM_EXTGALLERY_AVAILABLE_FONT',"Font disponibili");
+define('_AM_EXTGALLERY_ADD_FONT',"Aggiungi font (TTF)");
+define('_AM_EXTGALLERY_FONT_FILE',"Font file");
+define('_AM_EXTGALLERY_FONT_MANAGMENT',"Gestione Font");
+define('_AM_EXTGALLERY_ADD_FONT_LINK',"Ci sono %s font disponibili. <a href=\"watermark-border.php?op=uploadfont\">Clicca qui</a> per aggiungerlo");
+define('_AM_EXTGALLERY_WATERMARK_FREETYPE_WARN',"<b>PHP deve essere compilato con il supporto FreeType per abilitare watermarking. Vedere <a href=\"http://www.freetype.org/\"> FreeType.org </a> per ulteriori informazioni.</b>");
+define('_AM_EXTGALLERY_WATERMARK_CONF',"Configurazione Watermarks");
+define('_AM_EXTGALLERY_FONT',"Font");
+define('_AM_EXTGALLERY_WATERMARK_TEXT',"Testo Watermark");
+define('_AM_EXTGALLERY_POSITION',"Posizione");
+define('_AM_EXTGALLERY_TOP_LEFT',"in Alto a Sinistra");
+define('_AM_EXTGALLERY_TOP_RIGHT',"in Alto a Destra");
+define('_AM_EXTGALLERY_BOTTOM_LEFT',"in Basso a Sinistra");
+define('_AM_EXTGALLERY_BOTTOM_RIGHT',"in Basso a Destra");
+define('_AM_EXTGALLERY_TOP_CENTER',"in Alto al Centro");
+define('_AM_EXTGALLERY_BOTTOM_CENTER',"in Basso al Centro");
+define('_AM_EXTGALLERY_LEFT_CENTER',"a Sinistra al Centro");
+define('_AM_EXTGALLERY_RIGHT_CENTER',"a Destra al Centro");
+define('_AM_EXTGALLERY_CENTER_CENTER',"al Centro assoluto");
+define('_AM_EXTGALLERY_WATERMARK_COLOR',"Colore Watermark");
+define('_AM_EXTGALLERY_WATERMARK_FONT_SIZE',"Dimensione font del Watermark (px)");
+define('_AM_EXTGALLERY_WATERMARK_PADDING',"Padding del Watermark (px)");
+define('_AM_EXTGALLERY_BORDER_CONF',"Configurazione bordi");
+define('_AM_EXTGALLERY_INNER_BORDER_COLOR',"Colore del bordo interno");
+define('_AM_EXTGALLERY_INNER_BORDER_SIZE',"Dimensione del bordo interno (px)");
+define('_AM_EXTGALLERY_OUTER_BORDER_COLOR',"Colore del bordo esterno");
+define('_AM_EXTGALLERY_OUTER_BORDER_SIZE',"Dimensione del bordo esterno (px)");
+define('_AM_EXTGALLERY_WATERMARK_BORDER_EXEMPLE',"Esempio di Watermark e bordo");
+define('_AM_EXTGALLERY_WATERMARK_BORDER_EXEMPLE_INFO',"Aggiorna il tuo browser per cancellare la cache se l'immagine aggiornata non appare.");
+define('_AM_EXTGALLERY_FONT_ADDED',"Font aggiunto");
+define('_AM_EXTGALLERY_CONFIGURATION_SAVED',"Configurazione salvata");
+define('_AM_EXTGALLERY_PRINT_SUBMITTER_UNAME',"Stampa lo username del mittente");
+
+// Slideshow
+define('_AM_EXTGALLERY_SLIDESHOW_CONF',"Configurazione Slideshow");
+define('_AM_EXTGALLERY_GVIEW_CONF',"Configurazione Galleryview");
+define('_AM_EXTGALLERY_GRIA_CONF',"Configurazione Galleria");
+define('_AM_EXTGALLERY_GFIC_CONF',"Configurazione Galleriffic");
+define('_AM_EXTGALLERY_SLIDESHOW_NOT_ENABLE',"SlideShow non abilitato . Puoi impostare qui le opzioni del slideshow ma per utilizzarlo nel lato utente devi abilitare lo slideshow dalle Preferenze del modulo");
+define('_AM_EXTGALLERY_SLIDESHOW_ENABLE',"SlideShow abilitato. È possibile selezionare quale script si desidera utilizzare ed impostarne le opzioni");
+define('_AM_EXTGALLERY_USE_SLIDESHOW_EFFECTS',"Tipo di SlideShow");
+define('_AM_EXTGALLERY_SLIDESHOW_GVIEW',"galleryview");
+define('_AM_EXTGALLERY_SLIDESHOW_GRIA',"galleria");
+define('_AM_EXTGALLERY_SLIDESHOW_MICRO',"microgallery");
+define('_AM_EXTGALLERY_SLIDESHOW_GFIC',"galleriffic");
+define('_AM_EXTGALLERY_GVIEW_PANELWIDE',"Larghezza Pannello");
+define('_AM_EXTGALLERY_GVIEW_PANELHEIGHT',"Altezza pannello");
+define('_AM_EXTGALLERY_GVIEW_FRAMEWIDTH',"Larghezza Frame");
+define('_AM_EXTGALLERY_GVIEW_FRAMEHEIGHT',"Altezza Frame");
+define('_AM_EXTGALLERY_GVIEW_TSPEED',"Velocità di transizione");
+define('_AM_EXTGALLERY_GVIEW_TTERVAL',"Intervallo di transizione");
+define('_AM_EXTGALLERY_GVIEW_OPACITY',"Opacità Overlay");
+define('_AM_EXTGALLERY_GVIEW_OVERLYAHEIGHT',"Altezza Overlay");
+define('_AM_EXTGALLERY_GVIEW_OVERLAYFS',"Dimensione caratteri Overlay");
+define('_AM_EXTGALLERY_GVIEW_BORDERWIDTH',"Larghezza Bordo");
+define('_AM_EXTGALLERY_GVIEW_BORDERCOLOR',"Colore Bordo");
+define('_AM_EXTGALLERY_GVIEW_BGCOLOR',"Colore Sfondo");
+define('_AM_EXTGALLERY_GVIEW_OVERLAYCOLOR',"Colore Overlay");
+define('_AM_EXTGALLERY_GVIEW_OVERLAYTC',"Colore testo Overlay");
+define('_AM_EXTGALLERY_GVIEW_CAPTIONTC',"Colore testo Caption");
+define('_AM_EXTGALLERY_GVIEW_NAVTHEME',"Tema Nav");
+define('_AM_EXTGALLERY_GVIEW_LIGHT',"Leggero");
+define('_AM_EXTGALLERY_GVIEW_DARK',"Scuro");
+define('_AM_EXTGALLERY_GVIEW_CUSTOM',"Custom");
+define('_AM_EXTGALLERY_GVIEW_POSITION',"Posizione");
+define('_AM_EXTGALLERY_GVIEW_BOTTOM',"Fondo");
+define('_AM_EXTGALLERY_GVIEW_TOP',"Cima");
+define('_AM_EXTGALLERY_GVIEW_EASING',"Facilitando");
+define('_AM_EXTGALLERY_GVIEW_EASING_OP1',"ritmo");
+define('_AM_EXTGALLERY_GVIEW_EASING_OP2',"lineare");
+define('_AM_EXTGALLERY_GVIEW_EASING_OP3',"easeInOutBack");
+define('_AM_EXTGALLERY_GVIEW_EASING_OP4',"easeInOutQuad");
+define('_AM_EXTGALLERY_GVIEW_EASING_OP5',"easeOutBounce");
+define('_AM_EXTGALLERY_GRIA_HEIGHT',"Altezza");
+define('_AM_EXTGALLERY_GRIA_PANELWIDTH',"Larghezza Pannello");
+define('_AM_EXTGALLERY_GRIA_BGCOLOR',"Colore di sfondo");
+define('_AM_EXTGALLERY_GRIA_BCOLOR',"Colore del bordo");
+define('_AM_EXTGALLERY_GRIA_BGIMG',"Immagine di sfondo");
+define('_AM_EXTGALLERY_GRIA_BGIMG_OP1',"bianco");
+define('_AM_EXTGALLERY_GRIA_BGIMG_OP2',"blocco");
+define('_AM_EXTGALLERY_GRIA_AUTOPLAY',"Attiva Autoplay");
+define('_AM_EXTGALLERY_GRIA_TRANS',"Tipo di transizione");
+define('_AM_EXTGALLERY_GRIA_TRANS_TYP1',"dissolvenza");
+define('_AM_EXTGALLERY_GRIA_TRANS_TYP2',"lampo");
+define('_AM_EXTGALLERY_GRIA_TRANS_TYP3',"impulso");
+define('_AM_EXTGALLERY_GRIA_TRANS_TYP4',"diapositiva");
+define('_AM_EXTGALLERY_GRIA_TRANS_TYP5',"dissolvenza diapositiva");
+define('_AM_EXTGALLERY_GRIA_TSPEED',"Velocità di transizione");
+define('_AM_EXTGALLERY_GFIC_HEIGHT',"Max altezza immagine");
+define('_AM_EXTGALLERY_GFIC_WIDTH',"Max larghezza immagine");
+define('_AM_EXTGALLERY_GFIC_BGCOLOR',"Colore di sfondo");
+define('_AM_EXTGALLERY_GFIC_BCOLOR',"Colore del bordo");
+define('_AM_EXTGALLERY_GFIC_FONTCOLOR',"Colore del carattere");
+define('_AM_EXTGALLERY_GFIC_AUTOPLAY',"Attiva Autoplay");
+define('_AM_EXTGALLERY_GFIC_NB_THUMBS',"Numero delle miniature nella navigazione tra le miniature");
+define('_AM_EXTGALLERY_GFIC_NB_COLTHUMBS',"Numero di colonne nella navigazione tra le miniature");
+define('_AM_EXTGALLERY_GFIC_NB_PRELOAD',"Numero delle immagini precaricate");
+define('_AM_EXTGALLERY_GFIC_TDELAY',"Ritardo di transizione");
+define('_AM_EXTGALLERY_GFIC_TSPEED',"Velocità di transizione");
+define('_AM_EXTGALLERY_GFIC_SHOW_DESCR',"Mostra la descrizione dell'immagine");
+define('_AM_EXTGALLERY_GFIC_DOWNLOAD',"Permetti il download delle immagini originali (se disponibile)");
+
+// Album
+define('_AM_EXTGALLERY_USE_AJAX_EFFECTS',"Effetti Ajax ");
+define('_AM_EXTGALLERY_USE_AJAX_EFFECTS_DESC',"Selezionando gli effetti cambierà la visualizzazione delle foto cloccando la miniatura. Possono essere selezionati Effetti Ajax o normali<br /> <br /> <b>Normale</b>:. Nessun effetto <br /> <b>Lightbox</b>: Usa effetto Lightbox <br /> <b>Overlay</ b>: usa effetto Overlay <br /> <b>Tooltip</b>: usa effetto Tooltip <br /> <b>Fancybox</b>: usa l'effetto Fancybox <br /> <b>prettyphoto</b>: usa effetto prettyphoto <br />");
+define('_AM_EXTGALLERY_ALBUM_CONF',"Configuratione Album");
+define('_AM_EXTGALLERY_OVERLAY_CONF',"Configuratione Overlay");
+define('_AM_EXTGALLERY_TOOLTIP_CONF',"Configuratione Tooltip");
+define('_AM_EXTGALLERY_FANCYBOX_CONF',"Configuratione Fancybox");
+define('_AM_EXTGALLERY_PRETTPHOTO_CONF',"Configuratione PrettyPhoto");
+define('_AM_EXTGALLERY_ALBUM_NOT_ENABLE',"Album non abilitato. è possibile impostare qui le opzioni Album, ma per l'utilizzo dell'Album nel lato utente è necessario abilitare l'Album dalle Preferenze del modulo");
+define('_AM_EXTGALLERY_ALBUM_ENABLE',"Album abilitato. Puoi selezionare quale script si desidera utilizzare e impostarne le opzioni");
+define('_AM_EXTGALLERY_AJAX_NONE',"Normalee");
+define('_AM_EXTGALLERY_AJAX_LIGHTBOX',"Lightbox");
+define('_AM_EXTGALLERY_AJAX_OVERLAY',"Overlay");
+define('_AM_EXTGALLERY_AJAX_TOOLTIP',"Tooltip");
+define('_AM_EXTGALLERY_AJAX_FANCYBOX',"Fancybox");
+define('_AM_EXTGALLERY_AJAX_PRETTPHOTO',"PrettyPhoto");
+define('_AM_EXTGALLERY_FANCYBOX_BGCOLOR',"Colore dello sfondo");
+define('_AM_EXTGALLERY_FANCYBOX_OPACITY',"Opacità");
+define('_AM_EXTGALLERY_FANCYBOX_TIN',"Transizione in ingresso");
+define('_AM_EXTGALLERY_FANCYBOX_TOUT',"Transizione in uscita");
+define('_AM_EXTGALLERY_FANCYBOX_NONE',"Nessuno");
+define('_AM_EXTGALLERY_FANCYBOX_ELASTIC',"Elastico");
+define('_AM_EXTGALLERY_FANCYBOX_TITLEPOSITION',"Posizione Titolo");
+define('_AM_EXTGALLERY_FANCYBOX_OVER',"Sopra");
+define('_AM_EXTGALLERY_FANCYBOX_INSIDE',"Dentro");
+define('_AM_EXTGALLERY_FANCYBOX_OUTSIDE',"Fuori");
+define('_AM_EXTGALLERY_FANCYBOX_SHOWTYPE',"Mostra tipo");
+define('_AM_EXTGALLERY_FANCYBOX_SINGLE',"Singolo");
+define('_AM_EXTGALLERY_FANCYBOX_GROUP',"Gruppo");
+define('_AM_EXTGALLERY_OVERLAY_BG',"Sfondo Overlay");
+define('_AM_EXTGALLERY_OVERLAY_WIDTH',"Larghezza Overlay");
+define('_AM_EXTGALLERY_OVERLAY_HEIGHT',"Altezza Overlay");
+define('_AM_EXTGALLERY_TOOLTIP_WIDTH',"Larghezza Tooltip");
+define('_AM_EXTGALLERY_TOOLTIP_BORDER_WIDTH',"Larghezza bordo Tooltip");
+define('_AM_EXTGALLERY_TOOLTIP_BORDERCOLOR',"Colore bordo Tooltip");
+define('_AM_EXTGALLERY_PRETTPHOTO_SPEED',"Velocità animazione");
+define('_AM_EXTGALLERY_PRETTPHOTO_FAST',"Veloce");
+define('_AM_EXTGALLERY_PRETTPHOTO_SLOW',"Lento");
+define('_AM_EXTGALLERY_PRETTPHOTO_THEME',"Tema");
+define('_AM_EXTGALLERY_PRETTPHOTO_THEME1',"scuro_arrotondato");
+define('_AM_EXTGALLERY_PRETTPHOTO_THEME2',"scuro_quadrato");
+define('_AM_EXTGALLERY_PRETTPHOTO_THEME3',"facebook");
+define('_AM_EXTGALLERY_PRETTPHOTO_THEME4',"chiaro_arrotondato");
+define('_AM_EXTGALLERY_PRETTPHOTO_THEME5',"chiaro_quadrato");
+define('_AM_EXTGALLERY_PRETTPHOTO_AUTOPLAY',"Autoplay Slideshow");
+define('_AM_EXTGALLERY_PRETTPHOTO_AUTOPLAY_T',"vero");
+define('_AM_EXTGALLERY_PRETTPHOTO_AUTOPLAY_F',"falso");
+define('_AM_EXTGALLERY_PRETTPHOTO_SLIDESPEED',"Velocità Slideshow");
+
+// Update
+define('_AM_EXTGALLERY_MD_FILE_DONT_EXIST',"I file del Modulo non esistono nella repository:<br /><b>Server:</b> %s<br /><b>File:</b> %s");
+define('_AM_EXTGALLERY_LG_FILE_DONT_EXIST',"I file Language non esistono nella repository:<br /><b>Server:</b> %s<br /><b>File:</b> %s");
+define('_AM_EXTGALLERY_DOWN_DONE',"Download effettuato. Clicca qui per installare i file");
+define('_AM_EXTGALLERY_INSTALL',"Installa i file");
+define('_AM_EXTGALLERY_MD_FILE_DONT_EXIST_SHORT',"I file del Modulo non esistono");
+define('_AM_EXTGALLERY_INSTALL_DONE',"Installazione effettuata. Clicca qui per aggiornare il tuo modulo");
+
+// Extension
+define('_AM_EXTGALLERY_EXTENSION_INFO',"Info Estensione");
+define('_AM_EXTGALLERY_EXTENSION_NOT_INSTALLED',"Estensione non installata");
+define('_AM_EXTGALLERY_INSTALL_EXTENSION',"Installa estensione");
+define('_AM_EXTGALLERY_EXTENSION_OK',"Estensione disponibile");
+define('_AM_EXTGALLERY_EXTENSION_NOTICE',"Questa estensione permette di usare foto in tutto il sito solamente aggiungendo una <b>gallery</b> tag al vostro testo. Un pulsante (<img src=\"../images/extgallery-posticon.gif\" />) è mostrato nell'editor Xoops.");
+define('_AM_EXTGALLERY_EXT_FILE_DONT_EXIST',"Il file dell'estensione Extension non sistono nella repository:<br /><b>Server:</b> %s<br /><b>File:</b> %s");
+define('_AM_EXTGALLERY_EXT_FILE_DONT_EXIST_SHORT',"Il file estensione non esiste");
+define('_AM_EXTGALLERY_EXTENSION_INSTALLED',"Estensione installata");
+define('_AM_EXTGALLERY_EXTENSION_HOWTO',"Come usare:");
+define('_AM_EXTGALLERY_EXTENSION_HOWTODESC',"Per installare ed usare questa estensione manualmente, devi eseguire questi passi: <br />
+<div class=\"marg10\">1- Aggiungi <b>gallery.php</b> a <b>XOOPS_ROOT_PATH/class/textsanitizer/gallery/gallery.php</b> (puoi trovare gallery.php nell'archivio del modulo)</div>
+<div class=\"marg10\">2- modifica <b>XOOPS_ROOT_PATH/class/textsanitizer/config.php</b> e aggiungi ((<b>\"gallery\" => 1</b>)) al array di configurazione estensione (puoi trovare il file editato nel archivio del modulo)</div>
+<div class=\"marg10\"><img src=\"../images/extensions.png\" /></div>
+<div class=\"marg10\">3- Puoi scaricare <b>gallery.php</b> e <b>config.php</b> da XOOPS SVN</div>
+<div class=\"marg10\">4- Se vuoi usare le funzioni del modulo di installazione, devi dare a <b>XOOPS_ROOT_PATH/class/textsanitizer</b> chmod 777 . dopo l'installazione devi modificarlo a 644.</div>
+");
+define('_AM_EXTGALLERY_EXTENSION_DOWNLOAD',"Scarica i file da XOOPS SVN");
+
+// About.php
+define("_AM_EXTGALLERY_ABOUT_RELEASEDATE","Data aggiornamento: ");
+define("_AM_EXTGALLERY_ABOUT_AUTHOR","Autore: ");
+define("_AM_EXTGALLERY_ABOUT_CREDITS","Crediti: ");
+define("_AM_EXTGALLERY_ABOUT_LICENSE","Licenza: ");
+define("_AM_EXTGALLERY_ABOUT_MODULE_STATUS","Stato: ");
+define("_AM_EXTGALLERY_ABOUT_WEBSITE","Sito web: ");
+define("_AM_EXTGALLERY_ABOUT_AUTHOR_NAME","Nome Autore: ");
+define("_AM_EXTGALLERY_ABOUT_CHANGELOG","Elenco Modifiche");
+define("_AM_EXTGALLERY_ABOUT_MODULE_INFO","Info Modulo");
+define("_AM_EXTGALLERY_ABOUT_AUTHOR_INFO","Info Autore");
+define("_AM_EXTGALLERY_ABOUT_DESCRIPTION","Descrizione: ");
+
+// text in admin footer
+define("_AM_EXTGALLERY_ADMIN_FOOTER","<div class='right smallsmall italic pad5'>La Tag XOOPS è mantenuta dalla <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
+define('_EXTGALLERY_ADMIN_'," "); //
+
+// Add File size define (Cesag)
+define('_AM_EXTGALLERY_UPLOAD_MAX_FILESIZE',"Dimensione massima del file da caricare: ");
+define('_AM_EXTGALLERY_POST_MAX_SIZE',"Dimensione massima per l'invio: ");
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/blocks.php
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/blocks.php (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/blocks.php 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1,116 @@
+<?php
+define('_MB_EXTGALLERY_PHOTO_NUMBER',"Numero di foto da mostrare");
+define('_MB_EXTGALLERY_DIRECTION',"Direzione della disposizione");
+define('_MB_EXTGALLERY_HORIZONTALLY',"Orizzontalmente");
+define('_MB_EXTGALLERY_VERTICALLY',"Verticalmente");
+define('_MB_EXTGALLERY_DISPLAY_TITLE',"Mostra il titolo della foto");
+define('_MB_EXTGALLERY_ALL_CATEGORIES',"Tutte le categorie");
+define('_MB_EXTGALLERY_USER_NUMBER',"Numero utenti da mostrare");
+define('_MB_EXTGALLERY_PANEL_WIDTH',"largezza pannello");
+define('_MB_EXTGALLERY_PANEL_HEIGHT',"altezza pannello");
+define('_MB_EXTGALLERY_FRAME_WIDTH',"larghezza del frame");
+define('_MB_EXTGALLERY_FRAME_HEIGHT',"altezza del frame");
+define('_MB_EXTGALLERY_BACKGROUND',"colore di sfondo");
+define('_MB_EXTGALLERY_MOREINFO',"Di più");
+define('_MB_EXTGALLERY_TRANSITION_SPEED',"velocità di transizione");
+define('_MB_EXTGALLERY_TRANSITION_INTERVAL',"intervallo di transizione");
+define('_MB_EXTGALLERY_OVERLAY_COLOR',"colore overlay");
+define('_MB_EXTGALLERY_OVERLAY_TEXT_COLOR',"colore testo overlay");
+define('_MB_EXTGALLERY_CAPTION_TEXT_COLOR',"colore testo caption");
+define('_MB_EXTGALLERY_BORDER',"bordo");
+define('_MB_EXTGALLERY_OVERLAY_OPACITY',"opacità overlay");
+define('_MB_EXTGALLERY_OVERLAY_FONT_SIZE',"dimensione del font overlay");
+define('_MB_EXTGALLERY_SELECT_THEME',"Seleziona tema");
+define('_MB_EXTGALLERY_LIGHT',"chiaro");
+define('_MB_EXTGALLERY_DARK',"scuro");
+define('_MB_EXTGALLERY_CUSTOM',"cliente");
+define('_MB_EXTGALLERY_POSITION',"Posizione");
+define('_MB_EXTGALLERY_BOTTOM',"Fondo");
+define('_MB_EXTGALLERY_TOP',"Cima");
+define('_MB_EXTGALLERY_EASING',"facilitazione");
+define('_MB_EXTGALLERY_EASING_OP1',"ritmo");
+define('_MB_EXTGALLERY_EASING_OP2',"lineare");
+define('_MB_EXTGALLERY_EASING_OP3',"easeInOutBack");
+define('_MB_EXTGALLERY_EASING_OP4',"easeInOutQuad");
+define('_MB_EXTGALLERY_EASING_OP5',"easeOutBounce");
+define('_MB_EXTGALLERY_SHOW_TYPE',"Seleziona ordine");
+define('_MB_EXTGALLERY_TYPE_OP1',"Foto casuali");
+define('_MB_EXTGALLERY_TYPE_OP2',"Ultima foto");
+define('_MB_EXTGALLERY_TYPE_OP3',"Foto più vista");
+define('_MB_EXTGALLERY_TYPE_OP4',"Foto più votata");
+define('_MB_EXTGALLERY_TYPE_OP5',"Foto più inviata");
+define('_MB_EXTGALLERY_USE_AJAX_EFFECTS',"Effetti Ajax ");
+define('_MB_EXTGALLERY_AJAX_NONE',"Normale");
+define('_MB_EXTGALLERY_AJAX_LIGHTBOX',"Lightbox");
+define('_MB_EXTGALLERY_AJAX_OVERLAY',"Overlay");
+define('_MB_EXTGALLERY_AJAX_TOOLTIP',"Tooltip");
+define('_MB_EXTGALLERY_AJAX_FANCYBOX',"Fancybox");
+define('_MB_EXTGALLERY_FANCYBOX_BGCOLOR',"Colore di sfondo");
+define('_MB_EXTGALLERY_FANCYBOX_OPACITY',"Opacità");
+define('_MB_EXTGALLERY_FANCYBOX_TIN',"Transizione in ingresso");
+define('_MB_EXTGALLERY_FANCYBOX_TOUT',"Transizione in uscita");
+define('_MB_EXTGALLERY_FANCYBOX_NONE',"Nessuno");
+define('_MB_EXTGALLERY_FANCYBOX_ELASTIC',"Elastico");
+define('_MB_EXTGALLERY_FANCYBOX_TITLEPOSITION',"Posizione titolo");
+define('_MB_EXTGALLERY_FANCYBOX_OVER',"Sopra");
+define('_MB_EXTGALLERY_FANCYBOX_INSIDE',"Dentro");
+define('_MB_EXTGALLERY_FANCYBOX_OUTSIDE',"Fuori");
+define('_MB_EXTGALLERY_FANCYBOX_SHOWTYPE',"Mostra tipo");
+define('_MB_EXTGALLERY_FANCYBOX_SINGLE',"Singolo");
+define('_MB_EXTGALLERY_FANCYBOX_GROUP',"Gruppo");
+define('_MB_EXTGALLERY_OVERLAY_BG',"Sfondo Overlay");
+define('_MB_EXTGALLERY_OVERLAY_WIDTH',"Larghezza Overlay");
+define('_MB_EXTGALLERY_OVERLAY_HEIGHT',"Altezza Overlay");
+define('_MB_EXTGALLERY_TOOLTIP_WIDTH',"Larghezza Tooltip");
+define('_MB_EXTGALLERY_TOOLTIP_BORDER_WIDTH',"Larghezza bordo Tooltip");
+define('_MB_EXTGALLERY_TOOLTIP_BORDERCOLOR',"Colore bordo Tooltip");
+define('_MB_EXTGALLERY_ALBUM_CONF',"Configurazione Album");
+define('_MB_EXTGALLERY_ALBUM_NOT_ENABLE',"Album non abilitato");
+define('_MB_EXTGALLERY_AJAX_PRETTPHOTO',"PrettyPhoto");
+define('_MB_EXTGALLERY_PRETTPHOTO_SPEED',"Velocità animazione");
+define('_MB_EXTGALLERY_PRETTPHOTO_FAST',"Veloce");
+define('_MB_EXTGALLERY_PRETTPHOTO_SLOW',"Lento");
+define('_MB_EXTGALLERY_PRETTPHOTO_THEME',"Tema");
+define('_MB_EXTGALLERY_PRETTPHOTO_THEME1',"scuro_arrotondato");
+define('_MB_EXTGALLERY_PRETTPHOTO_THEME2',"scuro_quadrato");
+define('_MB_EXTGALLERY_PRETTPHOTO_THEME3',"facebook");
+define('_MB_EXTGALLERY_PRETTPHOTO_THEME4',"chiaro_arrotondato");
+define('_MB_EXTGALLERY_PRETTPHOTO_THEME5',"chiaro_quadrato");
+define('_MB_EXTGALLERY_PRETTPHOTO_AUTOPLAY',"Autoavvio Slideshow");
+define('_MB_EXTGALLERY_PRETTPHOTO_SLIDESPEED',"Velocità Slideshow");
+define('_MB_EXTGALLERY_GVIEW',"Galleryview");
+define('_MB_EXTGALLERY_GRIA',"Galleria");
+define('_MB_EXTGALLERY_GRIA_WIDTH',"Larghezza pannello");
+define('_MB_EXTGALLERY_GRIA_HEIGHT',"Altezza");
+define('_MB_EXTGALLERY_GRIA_BGCOLOR',"Colore di sfondo");
+define('_MB_EXTGALLERY_GRIA_BCOLOR',"Colore del bordo");
+define('_MB_EXTGALLERY_GRIA_BGIMG',"Immagine di sfondo");
+define('_MB_EXTGALLERY_GRIA_BGIMG_OP1',"bianco");
+define('_MB_EXTGALLERY_GRIA_BGIMG_OP2',"bloccco");
+define('_MB_EXTGALLERY_GRIA_AUTOPLAY',"Attiva l'autoavvio");
+define('_MB_EXTGALLERY_GRIA_TRANS',"Tipo di Transizione");
+define('_MB_EXTGALLERY_GRIA_TRANS_TYP1',"dissolvenza");
+define('_MB_EXTGALLERY_GRIA_TRANS_TYP2',"lampo");
+define('_MB_EXTGALLERY_GRIA_TRANS_TYP3',"impulso");
+define('_MB_EXTGALLERY_GRIA_TRANS_TYP4',"diapositiva");
+define('_MB_EXTGALLERY_GRIA_TRANS_TYP5',"diapositiva in dissolvenza");
+define('_MB_EXTGALLERY_GRIA_TSPEED',"velocità di Transizione");
+define('_MB_EXTGALLERY_AJAX_JCAROUSEL',"jCarousel");
+define('_MB_EXTGALLERY_JCAROUSEL_HWIDTH',"Largezza orizzontale jCarousel");
+define('_MB_EXTGALLERY_JCAROUSEL_VWIDTH',"Larghezza verticale jCarousel");
+define('_MB_EXTGALLERY_JCAROUSEL_VHIGHT',"Altezza verticale jCarousel");
+define('_MB_EXTGALLERY_JQUERY',"Usa jquery");
+define('_MB_EXTGALLERY_MICRO',"microgallery");
+define('_MB_EXTGALLERY_MICRO_SIZE',"Dimensione Microgallery");
+define('_MB_EXTGALLERY_MICRO_SIZE_OP1',"piccolo");
+define('_MB_EXTGALLERY_MICRO_SIZE_OP2',"medio");
+define('_MB_EXTGALLERY_MICRO_SIZE_OP3',"grande");
+define('_MB_EXTGALLERY_TRUE',"vero");
+define('_MB_EXTGALLERY_FALSE',"falso");
+define('_MB_EXTGALLERY_PHOTO_NUMBER_TABLE',"Mostra il numero di colonne nella tabella");
+define('_MB_EXTGALLERY_TABLE',"Tabella");
+
+
+define('_MB_EXTGALLERY_DISPLAY_DATE',"Mostra la data della foto");
+define('_MB_EXTGALLERY_DISPLAY_HITS',"Mostra gli accessi alla foto");
+define('_MB_EXTGALLERY_DISPLAY_RATE',"Mostra i voti alla foto");
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/extension.php
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/extension.php (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/extension.php 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1,5 @@
+<?php
+
+define("_EXT_EXTGALLERY_ALTWMP","Aggiungi unafoto dal modulo eXtGallery");
+define("_EXT_EXTGALLERY_TEXTID","Id eXtGallery della foto che vuoi mostrare");
+define("_EXT_EXTGALLERY_TEXTTITLE","Inserisci il titolo della foto");
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/index.html
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/index.html (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/index.html 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/album_new_photo.tpl
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/album_new_photo.tpl (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/album_new_photo.tpl 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1,20 @@
+Ciao {X_UNAME},
+
+{X_ITEM_NBPHOTO} nuove foto sono state aggiunte in "{X_ITEM_CAT}" su {X_SITENAME}.
+
+Puoi visualizzarle qui: {X_ITEM_URL}
+
+-----------
+
+Stai ricevendo questo messaggio perché hai chiesto di essere avvisato quando nuove foto vengono aggiunte al nostro sito.
+
+Se questo è un errore o se non desideri più ricevere avvisi, aggiorna la tua sottoscrizione visitando il seguente link:
+{X_UNSUBSCRIBE_URL}
+
+Non rispondere a questo messaggio.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+webmaster
+{X_ADMINMAIL}
\ No newline at end of file
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/ecard_html.tpl
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/ecard_html.tpl (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/ecard_html.tpl 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1,24 @@
+<p style="text-align:center;">
+ <a href="{ECARD_LINK}">
+ Clicca qui se hai problemi nel visualizzare la tua eCard
+ </a>
+</p>
+<table style="border:1px solid black; padding:7px; margin:0px auto 0px auto;">
+ <tr>
+ <td>
+ <img src="{PHOTO_SRC}" /><br />
+ </td>
+ <td style="vertical-align:top; padding-left:7px;">
+ <div style="text-align:right;">
+ <img src="{STAMP_SRC}" />
+ </div>
+ <h2>{GREETINGS}</h2>
+ <p>{DESCRIPTION}</p>
+ <p>{EXP_NAME}<br />
+ (<a href="mailto:{EXP_EMAIL}">{EXP_EMAIL}</a>)</p>
+ </td>
+ </tr>
+</table>
+<p style="text-align:center;">
+ <a href="{MODULE_LINK}">Clicca qui per vedere più foto!</a>
+</p>
\ No newline at end of file
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/ecard_text.tpl
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/ecard_text.tpl (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/ecard_text.tpl 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1,8 @@
+Caro {REC_NAME},
+
+{EXP_NAME} ({EXP_EMAIL}) ti ha inviato una eCard.
+
+Puoi visualizzarla qui: {ECARD_LINK}
+
+Saluti
+{SITE_NAME} team ({SITE_URL})
\ No newline at end of file
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/global_new_photo.tpl
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/global_new_photo.tpl (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/global_new_photo.tpl 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1,20 @@
+Ciao {X_UNAME},
+
+{X_ITEM_NBPHOTO} nuove foto sono state aggiunte in "{X_ITEM_CAT}" su {X_SITENAME}.
+
+Puoi visualizzarle qui: {X_ITEM_URL}
+
+-----------
+
+Stai ricevendo questo messaggio perché hai chiesto di essere avvisato quando nuove foto vengono aggiunte al nostro sito.
+
+Se questo è un errore o se non desideri più ricevere avvisi, aggiorna la tua sottoscrizione visitando il seguente link:
+{X_UNSUBSCRIBE_URL}
+
+Non rispondere a questo messaggio.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+webmaster
+{X_ADMINMAIL}
\ No newline at end of file
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/global_new_photo_pending.tpl
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/global_new_photo_pending.tpl (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/global_new_photo_pending.tpl 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1,20 @@
+Ciao {X_UNAME},
+
+{X_ITEM_NBPHOTO} nuove foto so state aggiunte in "{X_ITEM_CAT}" su {X_SITENAME} e stanno attendendo approvazione.
+
+Puoi visualizzarle qui: {X_ITEM_URL}
+
+-----------
+
+Stai ricevendo questo messaggio perché hai chiesto di essere avvisato quando nuove foto vengono aggiunte al nostro sito.
+
+Se questo è un errore o se non desideri più ricevere avvisi, aggiorna la tua sottoscrizione visitando il seguente link:
+{X_UNSUBSCRIBE_URL}
+
+Non rispondere a questo messaggio.
+
+-----------
+
+{X_SITENAME} ({X_SITEURL})
+webmaster
+{X_ADMINMAIL}
\ No newline at end of file
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/index.html
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/index.html (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/mail_template/index.html 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/main.php
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/main.php (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/main.php 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1,142 @@
+<?php
+
+define("_MD_EXTGALLERY_CATEGORIESALBUMS","Categorie / Album");
+define("_MD_EXTGALLERY_ALBUMS","Album");
+define("_MD_EXTGALLERY_NBALBUMS","# album");
+define("_MD_EXTGALLERY_NBPHOTOS","# foto");
+define("_MD_EXTGALLERY_DESC","Descrizione");
+define("_MD_EXTGALLERY_SEND_ECARD","Invia una eCard");
+define("_MD_EXTGALLERY_EXTRA_INFO","Informazioni extra");
+define("_MD_EXTGALLERY_NOPERM","Spiacente, non hai il permesso per eseguire questa azione");
+define("_MD_EXTGALLERY_PHOTO_TITLE","Titolo");
+define("_MD_EXTGALLERY_PHOTO_WEIGHT","Peso");
+define("_MD_EXTGALLERY_RSS","Gallery RSS");
+define("_MD_EXTGALLERY_ALBUMRSS","Album RSS");
+
+// Album page
+define("_MD_EXTGALLERY_HITS","Accessi");
+define("_MD_EXTGALLERY_COMMENTS","Commenti");
+define("_MD_EXTGALLERY_RATING_SCORE","Punteggio della votazione");
+define("_MD_EXTGALLERY_INFODATE","Data:");
+
+// Photo page
+define("_MD_EXTGALLERY_PREVIEW","Anteprima");
+define("_MD_EXTGALLERY_NEXT","Prossima");
+define("_MD_EXTGALLERY_OF","di");
+define("_MD_EXTGALLERY_VOTE_FOR_THIS_PHOTO","Vota questa foto");
+define("_MD_EXTGALLERY_PHOTO_INFORMATION","Informazioni foto");
+define("_MD_EXTGALLERY_RESOLUTION","Risoluzione");
+define("_MD_EXTGALLERY_PIXELS","pixel");
+define("_MD_EXTGALLERY_VIEW","Vista");
+define("_MD_EXTGALLERY_FILE_SIZE","Dimensione File");
+define("_MD_EXTGALLERY_ADDED","Aggiunto");
+define("_MD_EXTGALLERY_SCORE","Punteggio");
+define("_MD_EXTGALLERY_VOTES","voti");
+define("_MD_EXTGALLERY_DOWNLOAD_ORIG","Scarica originale");
+define("_MD_EXTGALLERY_DOWNLOADS","downloads");
+define("_MD_EXTGALLERY_SENDS","invii");
+define("_MD_EXTGALLERY_ALL_PHOTO_BY","tutte le foto di");
+define("_MD_EXTGALLERY_SUBMITTER","Mittente");
+
+// Send eCard page
+define("_MD_EXTGALLERY_TO","A");
+define("_MD_EXTGALLERY_FROM","Da");
+define("_MD_EXTGALLERY_FROM_NAME","Nome mittente");
+define("_MD_EXTGALLERY_FROM_EMAIL","E-mail mittente");
+define("_MD_EXTGALLERY_TO_NAME","Nome destinatario");
+define("_MD_EXTGALLERY_TO_EMAIL","E-mail destinatario");
+define("_MD_EXTGALLERY_GREETINGS","Saluti");
+define("_MD_EXTGALLERY_SECURITY","Controllo sicurezza");
+
+// View eCard page and mail
+define("_MD_EXTGALLERY_CLICK_FOR_MORE","Clicca qui per vedere più foto !");
+define("_MD_EXTGALLERY_ECARD_TITLE","Una eCard da %s per te");
+
+// Public upload page
+define("_MD_EXTGALLERY_PUBLIC_UPLOAD","Carica un foto nella galleria pubblica");
+define("_MD_EXTGALLERY_PHOTO","Foto");
+define('_MD_EXTGALLERY_NOT_AN_ALBUM',"Devi selezionare un album valido");
+define('_MD_EXTGALLERY_UPLOAD_ERROR',"Errore durante l'upload");
+
+// Applet upload page
+// Lang for the photo upload applet. Available language value :
+// br, cz, de, dk, en, eo, es, fr, hr, hu, il, it, ja, nl, no, pl, pt, pt_BR, ru, se, si, sk, tr, us, zh, zh_TW
+define('_MD_EXTGALLERY_APPLET_LANG',"it");
+
+// Public modify page
+define("_MD_EXTGALLERY_MODIFY_PHOTO","Modifica foto");
+define("_MD_EXTGALLERY_CATEGORY","Categoria");
+define("_MD_EXTGALLERY_PHOTO_UPDATED","Foto aggiornata");
+
+// Public rating page
+define("_MD_EXTGALLERY_VOTE_THANKS","Grazie per il tuo voto");
+define("_MD_EXTGALLERY_ALREADY_VOTED","Grazie ma hai già votato per questa foto");
+
+// Public send eCard page
+define("_MD_EXTGALLERY_ECARD_SENT","La tua eCard è stata inviata");
+define("_MD_EXTGALLERY_CAPTCHA_ERROR","Il codice di sicurezza è sbagliato. Prova di nuovo.");
+
+// Public Upload photo page
+define("_MD_EXTGALLERY_PHOTO_UPLOADED","Foto caricata. Grazie per il tuo invio.");
+define("_MD_EXTGALLERY_PHOTO_PENDING","La tua foto deve essere approvata da un amministratore. Grazie per il tuo invio.");
+
+// Public user's album
+define("_MD_EXTGALLERY_USERS_SUB_PHOTO_ALBUM","ha inviato il suo Album Foto");
+
+// Public Slideshow
+define("_MD_EXTGALLERY_MOREINFO","Di più");
+define("_MD_EXTGALLERY_GFIC_DOWNLOAD","Carica immagine originale");
+define("_MD_EXTGALLERY_GFIC_PLAY","Avanza");
+define("_MD_EXTGALLERY_GFIC_PAUSE","Pausa");
+define("_MD_EXTGALLERY_GFIC_NEXT","Prossima");
+define("_MD_EXTGALLERY_GFIC_PREVIOUS","Precedente");
+define("_MD_EXTGALLERY_GFIC_NEXTP","Precedente ›");
+define("_MD_EXTGALLERY_GFIC_PREVIOUSP","‹ Prec");
+
+// Public bookmarks
+define("_MD_EXTGALLERY_BOOKMARK_ME","Segnalibro su di me");
+define("_MD_EXTGALLERY_BOOKMARK_TO_BLINKLIST","Segnalibro su Blinklist");
+define("_MD_EXTGALLERY_BOOKMARK_TO_DELICIOUS","Segnalibro su del.icio.us");
+define("_MD_EXTGALLERY_BOOKMARK_TO_DIGG","Segnalibro su Digg");
+define("_MD_EXTGALLERY_BOOKMARK_TO_FARK","Segnalibro su Fark");
+define("_MD_EXTGALLERY_BOOKMARK_TO_FURL","Segnalibro su Furl");
+define("_MD_EXTGALLERY_BOOKMARK_TO_NEWSVINE","Segnalibro su Newsvine");
+define("_MD_EXTGALLERY_BOOKMARK_TO_REDDIT","Segnalibro su Reddit");
+define("_MD_EXTGALLERY_BOOKMARK_TO_SIMPY","Segnalibro su Simpy");
+define("_MD_EXTGALLERY_BOOKMARK_TO_SPURL","Segnalibro su Spurl");
+define("_MD_EXTGALLERY_BOOKMARK_TO_YAHOO","Segnalibro su Yahoo");
+define("_MD_EXTGALLERY_BOOKMARK_TO_FACEBOOK","Segnalibro su Facebook");
+define("_MD_EXTGALLERY_BOOKMARK_TO_TWITTER","Segnalibro su Twitter");
+define("_MD_EXTGALLERY_BOOKMARK_TO_SCRIPSTYLE","Segnalibro su Scripstyle");
+define("_MD_EXTGALLERY_BOOKMARK_TO_STUMBLE","Segnalibro su Stumble");
+define("_MD_EXTGALLERY_BOOKMARK_TO_TECHNORATI","Segnalibro su Technorati");
+define("_MD_EXTGALLERY_BOOKMARK_TO_MIXX","Segnalibro su Mixx");
+define("_MD_EXTGALLERY_BOOKMARK_TO_MYSPACE","Segnalibro su Myspace");
+define("_MD_EXTGALLERY_BOOKMARK_TO_DESIGNFLOAT","Segnalibro su Designfloat");
+define("_MD_EXTGALLERY_BOOKMARK_TO_BALATARIN","Segnalibro su Balatarin");
+define("_MD_EXTGALLERY_BOOKMARK_TO_GOOGLEPLUS","Segnalibro su Google Plus");
+define("_MD_EXTGALLERY_BOOKMARK_TO_GOOGLEREADER","Segnalibro su Google Reader");
+define("_MD_EXTGALLERY_BOOKMARK_TO_GOOGLEBOOKMARKS","Segnalibro su Google Bookmarks");
+
+// Public order and sort
+define("_MD_EXTGALLERY_ORDERBY","Ordinato per: ");
+define("_MD_EXTGALLERY_ORDERBY_DATEASC","Data, Nuove immagini elencate prima");
+define("_MD_EXTGALLERY_ORDERBY_DATEDESC","Data, Vecchie immagini elencate prima");
+define("_MD_EXTGALLERY_ORDERBY_TITREASC","Nome, da A a Z");
+define("_MD_EXTGALLERY_ORDERBY_TITREDESC","Nome, da Z ad A");
+define("_MD_EXTGALLERY_ORDERBY_HITSASC","Visite, Immagini piu popolari elencate prima");
+define("_MD_EXTGALLERY_ORDERBY_HITSDESC","Visite, Immagini meno popolari elencate prima");
+define("_MD_EXTGALLERY_ORDERBY_NOTEASC","Voti, immagini piu votate elencate prima");
+define("_MD_EXTGALLERY_ORDERBY_NOTEDESC","Voti, immagini meno votate elencate prima");
+define("_MD_EXTGALLERY_SORTDATE","Data");
+define("_MD_EXTGALLERY_SORTDATEASC","Vecchie immagini elencate prima");
+define("_MD_EXTGALLERY_SORTDATEDESC","Nuove immagini elencate prima");
+define("_MD_EXTGALLERY_SORTNAME","Nome");
+define("_MD_EXTGALLERY_SORTNAMEASC","Nome, da A a Z");
+define("_MD_EXTGALLERY_SORTNAMEDESC","Nome, da Z ad A");
+define("_MD_EXTGALLERY_SORTHITS","Visite");
+define("_MD_EXTGALLERY_SORTHITSASC","Immagini meno popolari elencate prima");
+define("_MD_EXTGALLERY_SORTHITSDESC","Immagini più popolari elencate prima");
+define("_MD_EXTGALLERY_SORTNOTE","Note");
+define("_MD_EXTGALLERY_SORTNOTEASC","Meno votate elencate prima");
+define("_MD_EXTGALLERY_SORTNOTEDESC","Piu votate elencate prima");
Added: XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/modinfo.php
===================================================================
--- XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/modinfo.php (rev 0)
+++ XoopsLanguages/italian/modules/extgallery/extgallery 1.11/extgallery/language/italian/modinfo.php 2014-09-06 22:09:20 UTC (rev 12776)
@@ -0,0 +1,178 @@
+<?php
+
+define('_MI_EXTGAL_NAME',"eXtGallery");
+define('_MI_EXTGAL_DESC',"eXtGallery è un potente modulo XOOPS per creare gallerie fotografiche.");
+
+// Main menu
+define('_MI_EXTGALLERY_USERALBUM',"Il mio album");
+define('_MI_EXTGALLERY_PUBLIC_UPLOAD',"Upload publico");
+
+// Main administration menu
+define('_MI_EXTGALLERY_INDEX',"Indice");
+define('_MI_EXTGALLERY_PUBLIC_CAT',"Categorie/Album");
+define('_MI_EXTGALLERY_PHOTO',"Foto");
+define('_MI_EXTGALLERY_PERMISSIONS',"Permessi");
+define('_MI_EXTGALLERY_WATERMARK_BORDER',"Watermark & Bordi");
+define('_MI_EXTGALLERY_SLIDESHOW',"Slideshow");
+define('_MI_EXTGALLERY_EXTENSION',"Estensione");
+define('_MI_EXTGALLERY_ALBUM',"Album");
+define('_MI_EXTGALLERY_ABOUT',"Riguardo a");
+
+// Module options
+define('_MI_EXTGAL_DISP_TYPE',"Mostra tipo");
+define('_MI_EXTGAL_DISP_TYPE_DESC',"Selezionare il tipo di visualizzazione per la foto");
+define('_MI_EXTGAL_DISP_SET_ORDER',"Tipo di ordine di visualizzazione");
+define('_MI_EXTGAL_DISP_SET_ORDER_DESC',"Selezionare il tipo di ordine di visualizzazione per le foto, disc o asc, in base alla ora di caricamento della foto");
+define('_MI_EXTGALLERY_DESC',"Disc");
+define('_MI_EXTGALLERY_ASC',"Asc");
+define('_MI_EXTGAL_NB_COLUMN',"Numero di colonne nell'album");
+define('_MI_EXTGAL_NB_COLUMN_DESC',"Quante colonne verranno usate per visualizzare le miniature");
+define('_MI_EXTGAL_NB_LINE',"Numero di righe nell'album");
+define('_MI_EXTGAL_NB_LINE_DESC',"Quante righe verranno usate per visualizzare le miniature");
+define('_MI_EXTGAL_SAVE_L',"Salva foto larghe");
+define('_MI_EXTGAL_SAVE_L_DESC',"Desideri salvare le foto larghe se esse sono più grandi della configurazione media. Se salvi queste foto, il link di download punterà ad esse nella pagina delle foto");
+define('_MI_EXTGAL_M_WIDTH',"Larghezza per le foto medie");
+define('_MI_EXTGAL_M_WIDTH_DESC',"Le foto saranno ridimensionate per avere questo valore massima come larghezza");
+define('_MI_EXTGAL_M_HEIGTH',"Altezza per le foto medie");
+define('_MI_EXTGAL_M_HEIGTH_DESC',"Le foto saranno ridimensionate per avere questo valore massima come altezza");
+define('_MI_EXTGAL_T_WIDTH',"Larghezza delle miniature");
+define('_MI_EXTGAL_T_WIDTH_DESC',"Larghezza massima per le miniature delle foto");
+define('_MI_EXTGAL_T_HEIGTH',"Altezza delle miniature");
+define('_MI_EXTGAL_T_HEIGTH_DESC',"Altezza massima per le miniature delle foto");
+define('_MI_EXTGAL_M_WATERMARK',"Abilita il watermark per le foto medie");
+define('_MI_EXTGAL_M_WATERMARK_DESC',"Questa opzione abiliterà la funzione watermark per le nuove foto. Devi prima configurare le impostazioni del watermark.");
+define('_MI_EXTGAL_M_BORDER',"Abilita i bordi per le foto medie");
+define('_MI_EXTGAL_M_BORDER_DESC',"Questa opzione abiliterà i bordi per le nuove foto. Devi prima configurare le impostazioni dei bordi.");
+define('_MI_EXTGAL_L_WATERMARK',"Abilita il watermark per le foto grandi");
+define('_MI_EXTGAL_L_WATERMARK_DESC',"Questa opzione abiliterà la funzione watermark per le nuove foto. Devi prima configurare le impostazioni del watermark.");
+define('_MI_EXTGAL_L_BORDER',"Abilita i bordi per le foto grandi");
+define('_MI_EXTGAL_L_BORDER_DESC',"Questa opzione abiliterà i bordi per le nuove foto. Devi prima configurare le impostazioni dei bordi.");
+define('_MI_EXTGAL_NAME_PATTERN',"Auto photo description pattern");
+define('_MI_EXTGAL_NAME_PATTERN_DESC',"Se non provvedi ad inserie una descrizione per la tua foto nel lato pubblico o nell'upload di massa nel lato amministrazione, il nome del file della foto sarà usato per creare una descrizione automatica.<br />Se la foto si chiama \"Tournament-06-may-2006_1.jpg\", otterrai \"Tournament 06 may 2006\" come descrizione");
+define('_MI_EXTGAL_DISPLAY_EXTRA',"Visualizza campi extra");
+define('_MI_EXTGAL_DISPLAY_EXTRA_DESC',"Questa funzione ti permette di inserire più informazioni nel modulo in invio. Con questa funzione, per esempio, puoi aggiungere un bottone paypal per ogni foto.");
+define('_MI_EXTGAL_ALLOW_HTML',"Permetti HTML nel campo extra");
+define('_MI_EXTGAL_ALLOW_HTML_DESC',"Permetti o Vieta codice HTML nella descrizione o nel campo extra.");
+define('_MI_EXTGAL_HIDDEN_FIELD',"This constant is used just for remove PHP notice. This text isn't use in the module");
+define('_MI_EXTGAL_SAVE_ORIG',"Salva foto orgiginale");
+define('_MI_EXTGAL_SAVE_ORIG_DESC',"Questa opzione ti consente di salvare le foto caricate prima di applicare il watermark e i bordi se una di queste funzioni è abilitata. La funzione \"Salva foto grande\" <b>deve</b> essere abilitata per abilitare questa funzione.<br /><b>La versione originale delle foto può essere scaricata solo dagli utenti per i quali è stato abilitato il \"Permesso di download degli originali\"</b>.<br />Se un utente non ha il permesso di scaricare l'originale, sarà reinviato alla foto \"grande\".");
+define('_MI_EXTGAL_ADM_NBPHOTO',"Numero di foto per pagina nel lato amministrazione");
+define('_MI_EXTGAL_ADM_NBPHOTO_DESC',"Imposta il numero di foto che saranno visualizzate nella tabella di approvazione e modifica.");
+define('_MI_EXTGAL_GRAPHLIB',"Libreria grafica");
+define('_MI_EXTGAL_GRAPHLIB_DESC',"Seleziona la libreria grafica che desideri usare. Fai attenzione, questa è un opzione avanzata, non modificarla se non sai esattamente cosa vuoi fare.");
+define('_MI_EXTGAL_GRAPHLIB_PATH',"Percorso della libreria grafica");
+define('_MI_EXTGAL_GRAPHLIB_PATH_DESC',"Percorso della libreria grafica sul server <b>CON</b> trailing slash.");
+define('_MI_EXTGAL_ENABLE_RATING',"Abilita la votazione delle foto");
+define('_MI_EXTGAL_ENABLE_RATING_DESC',"Questa opzione ti consente di abilitare o disabilitare globalmente la funzione di votazione.");
+define('_MI_EXTGAL_DISP_PH_TITLE',"Titolo foto");
+define('_MI_EXTGAL_DISP_PH_TITLE_DESC',"Scegliere se visualizzare o no il titolo della fotografia all'interno dell'album.");
+define('_MI_EXTGAL_DISP_CAT_IMG',"Immagine di categoria");
+define('_MI_EXTGAL_DISP_CAT_IMG_DESC',"Scegliere se visualizzare o meno l'immagine per rappresentare la categoria.");
+define('_MI_EXTGAL_M_QUALITY',"Qualità foto media");
+define('_MI_EXTGAL_M_QUALITY_DESC',"Qualitè per foto media da 0 (cattiva) a 100 (buona)");
+define('_MI_EXTGAL_T_QUALITY',"Qualità della miniatura foto");
+define('_MI_EXTGAL_T_QUALITY_DESC',"Qualità della miniatura foto da 0 (cattiva) a 100 (buona)");
+//DNPROSSI - Double define to be removed
+//define('_MI_EXTGALLERY_ALBUM',"Album");
+define('_MI_EXTGAL_EXT_UPLOAD',"Tipo di pagina di caricamento");
+define('_MI_EXTGAL_EXT_UPLOAD_DESC',"Selezionare il tipo di caricamento che viene fornito all'utente. Esteso richiede il plugin Java.");
+define('_MI_EXTGALLERY_EXTENDED',"Esteso");
+define('_MI_EXTGALLERY_STANDARD',"Standard");
+
+// Bloc Name
+define('_MI_EXTGAL_B_PHOTO',"Vedi foto");
+define('_MI_EXTGAL_B_SUB',"Miglior contribuente");
+define('_MI_EXTGAL_B_AJAX',"Vedi foto Slideshow");
+define('_MI_EXTGAL_B_TOP_TAG',"eXtGallery Migliori Tags");
+define('_MI_EXTGAL_B_TAG_CLOUD',"eXtGallery Migliori Cloud");
+define('_MI_EXTGAL_B_LIST',"Elenco delle foto");
+
+// Notifications
+define('_MI_EXTGAL_GLOBAL_NOTIFY',"Notifiche globali");
+define('_MI_EXTGAL_GLOBAL_NOTIFYDSC',"GLOBAL_NOTIFYDSC");
+define('_MI_EXTGAL_ALBUM_NOTIFY',"Notifiche album");
+define('_MI_EXTGAL_ALBUM_NOTIFYDSC',"_MI_EXTGAL_CAT_NOTIFYDSC");
+define('_MI_EXTGAL_PHOTO_NOTIFY',"Notifiche foto");
+define('_MI_EXTGAL_PHOTO_NOTIFYDSC',"_MI_EXTGAL_PHOTO_NOTIFYDSC");
+define('_MI_EXTGAL_NEW_PHOTO_NOTIFY',"Nuova foto");
+define('_MI_EXTGAL_NEW_PHOTO_NOTIFYCAP',"Avvisami quando viene aggiunta una nuova foto");
+define('_MI_EXTGAL_NEW_PHOTO_NOTIFYDSC',"NEW_PHOTO_NOTIFYDSC");
+define('_MI_EXTGAL_NEW_PHOTO_NOTIFYSBJ',"Nuova foto inviata");
+define('_MI_EXTGAL_NEW_PHOTO_PENDING_NOTIFY',"Avvisami quando una nuova foto è in attesa di approvazione");
+define('_MI_EXTGAL_NEW_PHOTO_PENDING_NOTIFYCAP',"Avvisami quando una nuova foto è in attesa di approvazione");
+define('_MI_EXTGAL_NEW_PHOTO_PENDING_NOTIFYDSC',"_MI_EXTGAL_NEW_PHOTO_PENDING_NOTIFYDSC");
+define('_MI_EXTGAL_NEW_PHOTO_PENDING_NOTIFYSBJ',"Nuova foto in attesa di approvazione");
+define('_MI_EXTGAL_NEW_PHOTO_ALBUM_NOTIFY',"Avvisami quando una nuova foto viene aggiunta in questo album");
+define('_MI_EXTGAL_NEW_PHOTO_ALBUM_NOTIFYCAP',"Avvisami quando una nuova foto viene aggiunta in questo album");
+define('_MI_EXTGAL_NEW_PHOTO_ALBUM_NOTIFYDSC',"_MI_EXTGAL_NEW_PHOTO_ALBUM_NOTIFYDSC");
+define('_MI_EXTGAL_NEW_PHOTO_ALBUM_NOTIFYSBJ',"Nuova foto inviata");
+
+// DNPROSSI ADDED in ver 1.09
+define('_MI_EXTGAL_FORM_OPTIONS',"Opzione Form");
+define('_MI_EXTGAL_FORM_OPTIONS_DESC',"Selezionare l'editor da usare. Se si dispone di una 'semplice' installazione (ad esempio, si utilizza solo l'editor della classe Xoops core, fornita nel pacchetto standard di Xoops core), allora si può solo selezionare DHTML e Compact");
+define('_MI_EXTGAL_ENABLE_INFO',"Vedi delle info della foto");
+define('_MI_EXTGAL_ENABLE_INFO_DESC',"Se disattivato tutte le informazioni delle foto (mittente, risoluzione, data, ecc) non verranno visualizzate");
+define('_MI_EXTGAL_ENABLE_ECARDS',"Vedi E-cards");
+define('_MI_EXTGAL_ENABLE_ECARDS_DESC',"Abilita / disabilita Vedi icona e-card quando <b>Vedi Info foto</b> è abilitato");
+define('_MI_EXTGAL_ENABLE_PHOTO_HITS',"Vedi accessi foto");
+define('_MI_EXTGAL_ENABLE_PHOTO_HITS_DESC',"Abilita / disabilita Accessi foto quando <b>Vedi Info foto</b> è abilitato");
+define('_MI_EXTGAL_ENABLE_SUBMITTER_LNK',"Vedi Mittente");
+define('_MI_EXTGAL_ENABLE_SUBMITTER_LNK_DESC',"Abilita / disabilita Vedi Mittente foto quando <b>Vedi Info foto</b> è abilitato");
+define('_MI_EXTGAL_ENABLE_RESOLUTION',"Vedi Risoluzione");
+define('_MI_EXTGAL_ENABLE_RESOLUTION_DESC',"Abilita / disabilita Vedi Risoluzione foto quando <b>Vedi Info foto</b> è abilitato");
+define('_MI_EXTGAL_ENABLE_DATE',"Vedi data");
+define('_MI_EXTGAL_ENABLE_DATE_DESC',"Abilita / disabilita Vedi Data foto quando <b>Vedi Info foto</b> è abilitato");
+define('_MI_EXTGAL_ENABLE_DOWNLOAD',"Vedi Download");
+define('_MI_EXTGAL_ENABLE_DOWNLOAD_DESC',"Abilita / disabilita Download e Vedi Numero Downloads quando <b>Vedi Info foto</ b> è abilitato");
+define('_MI_EXTGAL_ENABLE_SHOW_COMMENTS',"Vedi Commenti");
+define('_MI_EXTGAL_ENABLE_SHOW_COMMENTS_DESC',"Abilita / disabilita Vedi Numero Commenti quando <b>Vedi Info foto</b> è abilitato");
+
+define('_MI_EXTGAL_INFO_VIEW',"Vedi info");
+define('_MI_EXTGAL_INFO_VIEW_DESC',"Mostra-nasconde le informazioni delle foto o delle miniatre Album")...
[truncated message content] |
|
From: <luc...@us...> - 2014-09-05 20:17:59
|
Revision: 12775
http://sourceforge.net/p/xoops/svn/12775
Author: luciorota
Date: 2014-09-05 20:17:53 +0000 (Fri, 05 Sep 2014)
Log Message:
-----------
standardize: use include_once dirname(__FILE__)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/about.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/attachment.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/index.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/sendletter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/subscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/task.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/template.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/attachment.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/accounts.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/attachment.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/bmh.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/breadcrumb.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/cat.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/class.xnewslettermailer.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/session.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/template.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/header.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/phpmailer/PHPMailerAutoload.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/index.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/print.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/sendletter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/subscription.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/about.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/about.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/about.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -26,11 +26,11 @@
* ****************************************************************************
*/
-include "admin_header.php";
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
//global $indexAdmin;
-echo $indexAdmin->addNavigation("about.php");
+echo $indexAdmin->addNavigation('about.php');
echo $indexAdmin->renderAbout('9P3B3FXKF868J', false);
-include "admin_footer.php";
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/accounts.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/accounts.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,7 +27,7 @@
*/
$currentFile = basename(__FILE__);
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
// We recovered the value of the argument op in the URL$
@@ -39,7 +39,7 @@
if ($post == '' && $op == 'save_accounts' && $save_and_check =='none') $op = "edit_account";
switch ($op) {
- case 'check_accoun':
+ case 'check_account':
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
@@ -204,7 +204,7 @@
$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 {
@@ -246,7 +246,7 @@
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) {
+ 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>";
@@ -284,24 +284,24 @@
$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';
+ $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 ) {
if ($xnewsletter->getHandler('accounts')->insert($accountObj)) {
if ($save_and_check == 'none') {
- redirect_header("?op=list", 3, _AM_XNEWSLETTER_FORMOK);
+ redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
} else {
- redirect_header("?op=check_account&accounts_id={$accountObj->getVar("accounts_id")}", 3, _AM_XNEWSLETTER_FORMOK);
+ redirect_header("?op=check_account&accounts_id={$accountObj->getVar('accounts_id')}", 3, _AM_XNEWSLETTER_FORMOK);
}
}
} else {
@@ -343,4 +343,4 @@
}
break;
}
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/attachment.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/attachment.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,7 +27,7 @@
*/
$currentFile = basename(__FILE__);
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
// We recovered the value of the argument op in the URL$
@@ -50,7 +50,7 @@
$attachmentCriteria->setLimit($limit);
$attachmentObjs = $xnewsletter->getHandler('attachment')->getObjects($attachmentCriteria, true);
if ($attachmentCount > $limit) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($attachmentCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
@@ -141,4 +141,4 @@
break;
}
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,36 +27,36 @@
*/
$currentFile = basename(__FILE__);
-include "admin_header.php";
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list');
-$bmh_id = xnewsletterRequest::getInt('bmh_id', 0);
-$bmh_measure = xnewsletterRequest::getInt('bmh_measure', 0);
-$filter = xnewsletterRequest::getInt('bmh_measure_filter', _XNEWSLETTER_BMH_MEASURE_VAL_ALL);
+$op = xnewsletterRequest::getString('op', 'list');
+$bmh_id = xnewsletterRequest::getInt('bmh_id', 0);
+$bmh_measure = xnewsletterRequest::getInt('bmh_measure', 0);
+$filter = xnewsletterRequest::getInt('bmh_measure_filter', _XNEWSLETTER_BMH_MEASURE_VAL_ALL);
switch ($op) {
- case "bmh_delsubscr":
+ case 'bmh_delsubscr':
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
$count_err = 0;
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
- $bmh_email = $bmhObj->getVar("bmh_email");
+ $bmh_email = $bmhObj->getVar('bmh_email');
- $sql = "SELECT subscr_id FROM " . $xoopsDB->prefix("xnewsletter_subscr") . " WHERE (";
- $sql .= "subscr_email='" . $bmh_email . "'";
- $sql .= ") LIMIT 1;";
+ $sql = "SELECT subscr_id FROM {$xoopsDB->prefix("xnewsletter_subscr")}";
+ $sql .= " WHERE (subscr_email='{$bmh_email}')";
+ $sql .= " LIMIT 1;";
if ( $user = $xoopsDB->query($sql) ) {
$row_user = $xoopsDB->fetchRow($user);
- $subscr_id = intval($row_user[0]);
+ $subscr_id = (int) $row_user[0];
}
if ($subscr_id == 0) {
//set bmh_measure for all entries in bmh with this email
- $sql_upd_measure = "UPDATE " . $xoopsDB->prefix("xnewsletter_bmh") . " SET `bmh_measure` = '" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "'";
- $sql_upd_measure .=" WHERE ((`" . $xoopsDB->prefix("xnewsletter_bmh") . "`.`bmh_email` ='" . $bmh_email . "') AND (`" . $xoopsDB->prefix("xnewsletter_bmh") . "`.`bmh_measure` ='0'))";
+ $sql_upd_measure = "UPDATE {$xoopsDB->prefix('xnewsletter_bmh')} SET `bmh_measure` = '" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "'";
+ $sql_upd_measure .=" WHERE ((`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
$xoopsDB->query($sql_upd_measure);
- redirect_header("?op=list", 3, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
+ redirect_header('?op=list', 3, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
}
$subscrObj = $xnewsletter->getHandler('subscr')->get($subscr_id);
@@ -73,14 +73,14 @@
if ($catsubscrsCount > 0) {
$catsubscrObjs = $xnewsletter->getHandler('catsubscr')->getAll($catsubscrCriteria);
foreach ($catsubscrObjs as $catsubscr_id => $catsubscrObj) {
- $catsubscrObj = $xnewsletter->getHandler('catsubscr')->get($catsubscrObj->getVar("catsubscr_id"));
- $catObj = $xnewsletter->getHandler('cat')->get($catsubscrObj->getVar("catsubscr_catid"));
- $cat_mailinglist = $catObj->getVar("cat_mailinglist");
+ $catsubscrObj = $xnewsletter->getHandler('catsubscr')->get($catsubscrObj->getVar('catsubscr_id'));
+ $catObj = $xnewsletter->getHandler('cat')->get($catsubscrObj->getVar('catsubscr_catid'));
+ $cat_mailinglist = $catObj->getVar('cat_mailinglist');
if ($xnewsletter->getHandler('catsubscr')->delete($catsubscrObj, true)) {
//handle mailinglists
if ($cat_mailinglist > 0) {
- require_once( XOOPS_ROOT_PATH . "/modules/xnewsletter/include/mailinglist.php" );
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(0, $subscr_id, $cat_mailinglist);
}
} else {
@@ -96,48 +96,45 @@
echo $actionprot_err;
}
} else {
- xoops_confirm(array("ok" => true, "bmh_id" => $bmh_id, "op" => "bmh_delsubscr", "filter" => $filter), $currentFile, sprintf(_AM_XNEWSLETTER_BMH_MEASURE_DELETE_SURE));
+ xoops_confirm(array('ok' => true, 'bmh_id' => $bmh_id, 'op' => 'bmh_delsubscr', 'filter' => $filter), $currentFile, sprintf(_AM_XNEWSLETTER_BMH_MEASURE_DELETE_SURE));
}
break;
- case "handle_bmh":
+ case 'handle_bmh':
if ($bmh_id == 0) redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
if ($bmh_measure == 0) redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
- if ($bmhObj->getVar("bmh_measure") == _XNEWSLETTER_BMH_MEASURE_VAL_DELETE ) {
+ if ($bmhObj->getVar('bmh_measure') == _XNEWSLETTER_BMH_MEASURE_VAL_DELETE ) {
redirect_header("?op=list&filter={$filter}'", 3, _AM_XNEWSLETTER_BMH_MEASURE_ALREADY_DELETED);
}
$bmh_email = $bmhObj->getVar("bmh_email");
if ($bmh_measure == _XNEWSLETTER_BMH_MEASURE_VAL_QUIT) {
- $sql = "UPDATE `" . $xoopsDB->prefix("xnewsletter_subscr")."` INNER JOIN `";
- $sql .= $xoopsDB->prefix("xnewsletter_catsubscr") . "` ON `subscr_id` = `catsubscr_subscrid` ";
- $sql .= "SET `catsubscr_quited` = " . time();
- $sql .= " WHERE (((`subscr_email`)='" . $bmh_email . "'))";
- if(!$result = $xoopsDB->queryF($sql)) die ("MySQL-Error: " . mysql_error());
+ $sql = "UPDATE `{$xoopsDB->prefix('xnewsletter_subscr')}` INNER JOIN `{$xoopsDB->prefix('xnewsletter_catsubscr')}` ON `subscr_id` = `catsubscr_subscrid`";
+ $sql .= " SET `catsubscr_quited` = " . time();
+ $sql .= " WHERE (((`subscr_email`)='{$bmh_email}'))";
+ if(!$result = $xoopsDB->queryF($sql)) die ('MySQL-Error: ' . mysql_error());
}
//set bmh_measure for all entries in bmh with this email
- $sql_upd = "UPDATE " . $xoopsDB->prefix("xnewsletter_bmh") . " SET ";
- $sql_upd .="`bmh_measure` = '" . $bmh_measure . "'";
- $sql_upd .=", `bmh_submitter` = '" . $xoopsUser->uid() . "'";
- $sql_upd .=", `bmh_created` = '" . time() . "'";
- $sql_upd .=" WHERE ((`" . $xoopsDB->prefix("xnewsletter_bmh") . "`.`bmh_email` ='" . $bmh_email . "') AND (`" . $xoopsDB->prefix("xnewsletter_bmh") . "`.`bmh_measure` ='0'))";
- if(!$result = $xoopsDB->queryF($sql_upd)) die ("MySQL-Error: " . mysql_error());
+ $sql_upd = "UPDATE {$xoopsDB->prefix('xnewsletter_bmh')}";
+ $sql_upd .= " SET `bmh_measure` = '{$bmh_measure}', `bmh_submitter` = '{$xoopsUser->uid()}', `bmh_created` = '" . time() . "'";
+ $sql_upd .= " WHERE ((`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
+ if(!$result = $xoopsDB->queryF($sql_upd)) die ('MySQL-Error: ' . mysql_error());
redirect_header("?op=list&filter={$filter}", 3, _AM_XNEWSLETTER_FORMOK);
echo $bmhObj->getHtmlErrors();
break;
- case "run_bmh":
+ case 'run_bmh':
require_once('bmh_callback_database.php');
require_once(XOOPS_ROOT_PATH . '/modules/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php');
$accountCriteria = new CriteriaCompo();
- $accountCriteria->add(new Criteria("accounts_use_bmh", "1"));
+ $accountCriteria->add(new Criteria('accounts_use_bmh', '1'));
$accountsCount = $xnewsletter->getHandler('accounts')->getCount($accountCriteria);
if ($accountsCount > 0) {
@@ -159,30 +156,30 @@
//$bmh->processMailbox();
// for remote mailbox
- $bmh->mailhost = $accountObj->getVar("accounts_server_in"); // your mail server
- $bmh->mailbox_username = $accountObj->getVar("accounts_username"); // your mailbox username
- $bmh->mailbox_password = $accountObj->getVar("accounts_password"); // your mailbox password
- $bmh->port = $accountObj->getVar("accounts_port_in"); // the port to access your mailbox, default is 143
- if ($accountObj->getVar("accounts_type") == _XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3) {
- $bmh->service = 'pop3'; // the service to use (imap or pop3), default is 'imap'
+ $bmh->mailhost = $accountObj->getVar('accounts_server_in'); // your mail server
+ $bmh->mailbox_username = $accountObj->getVar('accounts_username'); // your mailbox username
+ $bmh->mailbox_password = $accountObj->getVar('accounts_password'); // your mailbox password
+ $bmh->port = $accountObj->getVar('accounts_port_in'); // the port to access your mailbox, default is 143
+ if ($accountObj->getVar('accounts_type') == _XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3) {
+ $bmh->service = 'pop3'; // the service to use (imap or pop3), default is 'imap'
} else {
- $bmh->service = 'imap'; // the service to use (imap or pop3), default is 'imap'
+ $bmh->service = 'imap'; // the service to use (imap or pop3), default is 'imap'
}
- $bmh->service_option = $accountObj->getVar("accounts_securetype_in"); // the service options (none, tls, notls, ssl, etc.), default is 'notls'
- $bmh->boxname = $accountObj->getVar("accounts_inbox"); // the mailbox to access, default is 'INBOX'
- $verif_movehard = $accountObj->getVar("accounts_movehard") == '1' ? true : false;
+ $bmh->service_option = $accountObj->getVar('accounts_securetype_in'); // the service options (none, tls, notls, ssl, etc.), default is 'notls'
+ $bmh->boxname = $accountObj->getVar('accounts_inbox'); // the mailbox to access, default is 'INBOX'
+ $verif_movehard = $accountObj->getVar('accounts_movehard') == '1' ? true : false;
$bmh->moveHard = $verif_movehard; // default is false
- $bmh->hardMailbox = $accountObj->getVar("accounts_hardbox"); // default is 'INBOX.hard' - NOTE: must start with 'INBOX.'
- $verif_movesoft = $accountObj->getVar("accounts_movesoft") == '1' ? true : false;
+ $bmh->hardMailbox = $accountObj->getVar('accounts_hardbox'); // default is 'INBOX.hard' - NOTE: must start with 'INBOX.'
+ $verif_movesoft = $accountObj->getVar('accounts_movesoft') == '1' ? true : false;
$bmh->moveSoft = $verif_movesoft; // default is false
- $bmh->softMailbox = $accountObj->getVar("accounts_softbox"); // default is 'INBOX.soft' - NOTE: must start with 'INBOX.'
+ $bmh->softMailbox = $accountObj->getVar('accounts_softbox'); // default is 'INBOX.soft' - NOTE: must start with 'INBOX.'
//$bmh->deleteMsgDate = '2009-01-05'; // format must be as 'yyyy-mm-dd'
// rest used regardless what type of connection it is
$bmh->openMailbox();
$bmh->processMailbox();
- $result_bmh .= str_replace("%b", $accountObj->getVar("accounts_yourmail"), _AM_XNEWSLETTER_BMH_RSLT);
+ $result_bmh .= str_replace("%b", $accountObj->getVar('accounts_yourmail'), _AM_XNEWSLETTER_BMH_RSLT);
$result_bmh = str_replace("%r", $bmh->result_total, $result_bmh);
$result_bmh = str_replace("%a", $bmh->result_processed, $result_bmh);
$result_bmh = str_replace("%n", $bmh->result_unprocessed, $result_bmh);
@@ -195,7 +192,7 @@
}
break;
- case "list":
+ case 'list':
default:
echo $indexAdmin->addNavigation('bmh.php');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_RUNBMH, '?op=run_bmh', 'add');
@@ -210,16 +207,16 @@
$limit = $xnewsletter->getConfig('adminperpage');
$bhmCriteria = new CriteriaCompo();
- if ($filter > -1) $criteria->add(new Criteria("bmh_measure", $filter));
- $bhmCriteria->setSort("bmh_id");
- $bhmCriteria->setOrder("DESC");
+ if ($filter > -1) $criteria->add(new Criteria('bmh_measure', $filter));
+ $bhmCriteria->setSort('bmh_id');
+ $bhmCriteria->setOrder('DESC');
$bhmCount = $xnewsletter->getHandler('bmh')->getCount($bhmCriteria);
$start = xnewsletterRequest::getInt('start', 0);
$bhmCriteria->setStart($start);
$bhmCriteria->setLimit($limit);
$bhmObjs = $xnewsletter->getHandler('bmh')->getAll($bhmCriteria);
if ($bhmCount > $limit) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($bhmCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
@@ -230,55 +227,55 @@
echo "<table class='outer width100' cellspacing='1'><tr class='odd'><td>";
echo "<form id='form_filter' enctype='multipart/form-data' method='post' action='{$currentFile}' name='form_filter'>";
- $checked = ($filter == -1) ? "checked='checked'" : "";
- echo "<input id='bmh_measure_all' type='radio' $checked value='-1' title='"._AM_XNEWSLETTER_BMH_MEASURE."' name='bmh_measure_filter' onclick='submit()' />
- <label for='bmh_measure_all' name='bmh_measure_all'>"._AM_XNEWSLETTER_BMH_MEASURE_ALL."</label>";
+ $checked = ($filter == -1) ? "checked='checked'" : '';
+ echo "<input id='bmh_measure_all' type='radio' {$checked} value='-1' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
+ <label for='bmh_measure_all' name='bmh_measure_all'>" . _AM_XNEWSLETTER_BMH_MEASURE_ALL . "</label>";
$checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_PENDING) ? "checked='checked'" : "";
- echo "<input id='bmh_measure0' type='radio' $checked value='"._XNEWSLETTER_BMH_MEASURE_VAL_PENDING."' title='"._AM_XNEWSLETTER_BMH_MEASURE."' name='bmh_measure_filter' onclick='submit()' />
- <label for='bmh_measure0' name='bmh_measure0'>"._AM_XNEWSLETTER_BMH_MEASURE_PENDING."</label>";
+ echo "<input id='bmh_measure0' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_PENDING . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
+ <label for='bmh_measure0' name='bmh_measure0'>" . _AM_XNEWSLETTER_BMH_MEASURE_PENDING . "</label>";
$checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING) ? "checked='checked'" : "";
- echo "<input id='bmh_measure1' type='radio' $checked value='"._XNEWSLETTER_BMH_MEASURE_VAL_NOTHING."' title='"._AM_XNEWSLETTER_BMH_MEASURE."' name='bmh_measure_filter' onclick='submit()' />
- <label for='bmh_measure1' name='bmh_measure1'>"._AM_XNEWSLETTER_BMH_MEASURE_NOTHING."</label>";
+ echo "<input id='bmh_measure1' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
+ <label for='bmh_measure1' name='bmh_measure1'>" . _AM_XNEWSLETTER_BMH_MEASURE_NOTHING . "</label>";
$checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_QUIT) ? "checked='checked'" : "";
- echo "<input id='bmh_measure2' type='radio' $checked value='"._XNEWSLETTER_BMH_MEASURE_VAL_QUIT."' title='"._AM_XNEWSLETTER_BMH_MEASURE."' name='bmh_measure_filter' onclick='submit()'>
- <label for='bmh_measure2' name='bmh_measure2'>"._AM_XNEWSLETTER_BMH_MEASURE_QUITED."</label>";
+ echo "<input id='bmh_measure2' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_QUIT . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()'>
+ <label for='bmh_measure2' name='bmh_measure2'>" . _AM_XNEWSLETTER_BMH_MEASURE_QUITED . "</label>";
$checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_DELETE) ? "checked='checked'" : "";
- echo "<input id='bmh_measure3' type='radio' $checked value='"._XNEWSLETTER_BMH_MEASURE_VAL_DELETE."' title='"._AM_XNEWSLETTER_BMH_MEASURE."' name='bmh_measure_filter' onclick='submit()' />
- <label for='bmh_measure3' name='bmh_measure3'>"._AM_XNEWSLETTER_BMH_MEASURE_DELETED."</label>";
+ echo "<input id='bmh_measure3' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_DELETE . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
+ <label for='bmh_measure3' name='bmh_measure3'>" . _AM_XNEWSLETTER_BMH_MEASURE_DELETED . "</label>";
echo "</form>";
echo "</td></tr></table>";
// View Table
echo "<table class='outer width100' cellspacing='1'>
<tr>
- <th class='center width2'>" . _AM_XNEWSLETTER_BMH_ID . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_RULE_NO . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_RULE_CAT . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_BOUNCETYPE . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_REMOVE . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_EMAIL . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_MEASURE . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_CREATED . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_FORMACTION . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_ID . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_RULE_NO . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_RULE_CAT . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_BOUNCETYPE . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_REMOVE . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_EMAIL . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_MEASURE . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_CREATED . "</th>
+ <th>" . _AM_XNEWSLETTER_FORMACTION . "</th>
</tr>";
if ($bhmCount > 0) {
- $class = "odd";
+ $class = 'odd';
foreach ($bhmObjs as $bhm_id => $bhmObj) {
- echo "<tr class='".$class."'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>" . $bhm_id . "</td>";
- echo "<td class='center'>" . $bhmObj->getVar("bmh_rule_no")."</td>";
- echo "<td class='center'>" . $bhmObj->getVar("bmh_rule_cat")."</td>";
- echo "<td class='center'>" . $bhmObj->getVar("bmh_bouncetype")."</td>";
+ echo "<tr class='{$class}'>";
+ $class = ($class == 'even') ? 'odd' : 'even';
+ echo "<td>" . $bhm_id . "</td>";
+ echo "<td>" . $bhmObj->getVar('bmh_rule_no') . "</td>";
+ echo "<td>" . $bhmObj->getVar('bmh_rule_cat') . "</td>";
+ echo "<td>" . $bhmObj->getVar('bmh_bouncetype') . "</td>";
- $verif_bmh_remove = ($bhmObj->getVar("bmh_remove") == "0") ? ' ' : $bhmObj->getVar("bmh_remove");
- echo "<td class='center'>" . $verif_bmh_remove . "</td>";
- echo "<td class='center'>" . $bhmObj->getVar("bmh_email") . "</td>";
+ $verif_bmh_remove = ($bhmObj->getVar('bmh_remove') == '0') ? ' ' : $bhmObj->getVar('bmh_remove');
+ echo "<td>" . $verif_bmh_remove . "</td>";
+ echo "<td>" . $bhmObj->getVar('bmh_email') . "</td>";
echo "<td class='center'>" . $arr_measure_type[$bhmObj->getVar("bmh_measure")] . "</td>";
echo "<td class='center'>" . formatTimeStamp($bhmObj->getVar("bmh_created"),"S") . "</td>";
@@ -303,34 +300,34 @@
echo "<br />";
break;
- case "save_bmh":
- if (!$GLOBALS["xoopsSecurity"]->check()) {
- redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ case 'save_bmh':
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS["xoopsSecurity"]->getErrors()));
}
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
- $bmhObj->setVar("bmh_rule_no", xnewsletterRequest::getString('bmh_rule_no', ''));
- $bmhObj->setVar("bmh_rule_cat", xnewsletterRequest::getString('bmh_rule_cat', ''));
- $bmhObj->setVar("bmh_bouncetype", xnewsletterRequest::getString('bmh_bouncetype', ''));
- $bmhObj->setVar("bmh_remove", xnewsletterRequest::getString('bmh_remove', ''));
+ $bmhObj->setVar('bmh_rule_no', xnewsletterRequest::getString('bmh_rule_no', ''));
+ $bmhObj->setVar('bmh_rule_cat', xnewsletterRequest::getString('bmh_rule_cat', ''));
+ $bmhObj->setVar('bmh_bouncetype', xnewsletterRequest::getString('bmh_bouncetype', ''));
+ $bmhObj->setVar('bmh_remove', xnewsletterRequest::getString('bmh_remove', ''));
$bmh_email = xnewsletterRequest::getString('bmh_email', '');
$bmh_email = filter_var($bmh_email, FILTER_SANITIZE_EMAIL);
$bmh_email = xnewsletter_checkEmail($bmh_email);
- $bmhObj->setVar("bmh_email", $bmh_email);
- $bmhObj->setVar("bmh_subject", xnewsletterRequest::getString('bmh_subject', ''));
- $bmhObj->setVar("bmh_measure", xnewsletterRequest::getInt('bmh_measure', 0));
- $bmhObj->setVar("bmh_submitter", xnewsletterRequest::getInt('bmh_submitter', 0));
- $bmhObj->setVar("bmh_created", xnewsletterRequest::getInt('bmh_created', 0));
+ $bmhObj->setVar('bmh_email', $bmh_email);
+ $bmhObj->setVar('bmh_subject', xnewsletterRequest::getString('bmh_subject', ''));
+ $bmhObj->setVar('bmh_measure', xnewsletterRequest::getInt('bmh_measure', 0));
+ $bmhObj->setVar('bmh_submitter', xnewsletterRequest::getInt('bmh_submitter', 0));
+ $bmhObj->setVar('bmh_created', xnewsletterRequest::getInt('bmh_created', 0));
if ($xnewsletter->getHandler('bmh')->insert($bmhObj)) {
- redirect_header("?op=list", 3, _AM_XNEWSLETTER_FORMOK);
+ redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
}
echo $bmhObj->getHtmlErrors();
$form = $bmhObj->getForm();
$form->display();
break;
- case "edit_bmh":
+ case 'edit_bmh':
echo $indexAdmin->addNavigation('bmh.php');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_BMHLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
@@ -340,11 +337,11 @@
$form->display();
break;
- case "delete_bmh":
+ case 'delete_bmh':
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
- if (!$GLOBALS["xoopsSecurity"]->check()) {
- redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if ($xnewsletter->getHandler('bmh')->delete($bmhObj)) {
redirect_header($currentFile, 3, _AM_XNEWSLETTER_FORMDELOK);
@@ -352,17 +349,17 @@
echo $bmhObj->getHtmlErrors();
}
} else {
- xoops_confirm(array("ok" => true, "bmh_id" => $bmh_id, "op" => "delete_bmh"), $_SERVER["REQUEST_URI"], sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $bmhObj->getVar("bmh_rule_no")));
+ xoops_confirm(array('ok' => true, 'bmh_id' => $bmh_id, 'op' => 'delete_bmh'), $_SERVER['REQUEST_URI'], sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $bmhObj->getVar('bmh_rule_no')));
}
break;
}
-include "admin_footer.php";
+include_once dirname(__FILE__) . '/admin_footer.php';
/**
* @return float
*/
function microtime_float() {
- list($usec, $sec) = explode(" ", microtime());
+ list($usec, $sec) = explode(' ', microtime());
return ((float) $usec + (float) $sec);
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -18,7 +18,7 @@
* Version : $Id $
*/
-require_once "admin_header.php";
+include_once dirname(__FILE__) . 'admin_header.php';
/**
* @param $msgnum
@@ -37,28 +37,19 @@
global $xoopsUser;
$xnewsletter = xnewsletterxnewsletter::getInstance();
- if ($rule_no != "0000") {
+ if ($rule_no != '0000') {
$bmhObj = $xnewsletter->getHandler('bmh')->create();
- //Form bmh_rule_no
- $bmhObj->setVar("bmh_rule_no", $rule_no);
- //Form bmh_rule_cat
- $bmhObj->setVar("bmh_rule_cat", $rule_cat);
- //Form bmh_bouncetype
- $bmhObj->setVar("bmh_bouncetype", $bounce_type);
- //Form bmh_remove
- //$verif_bmh_remove = ($remove == true || $remove == '1') ? "1" : "0";
- $bmhObj->setVar("bmh_remove", $remove);
- //Form bmh_email
- $bmhObj->setVar("bmh_email", $email);
- //Form bmh_subject
- $bmhObj->setVar("bmh_subject", $subject);
- //Form bmh_measure
- $bmhObj->setVar("bmh_measure", "0");
- //Form bmh_submitter
- $bmhObj->setVar("bmh_submitter", $xoopsUser->uid());
- //Form bmh_created
- $bmhObj->setVar("bmh_created", time());
-
+ $bmhObj->setVar('bmh_rule_no', $rule_no);
+ $bmhObj->setVar('bmh_rule_cat', $rule_cat);
+ $bmhObj->setVar('bmh_bouncetype', $bounce_type);
+ //$verif_bmh_remove = ($remove == true || $remove == '1') ? '1' : '0';
+ $bmhObj->setVar('bmh_remove', $remove);
+ $bmhObj->setVar('bmh_email', $email);
+ $bmhObj->setVar('bmh_subject', $subject);
+ $bmhObj->setVar('bmh_measure', '0');
+ $bmhObj->setVar('bmh_submitter', $xoopsUser->uid());
+ $bmhObj->setVar('bmh_created', time());
+ //
if (!$xnewsletter->getHandler('bmh')->insert($bmhObj)) {
echo $bmhObj->getHtmlErrors();
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,15 +27,15 @@
*/
$currentFile = basename(__FILE__);
-include "admin_header.php";
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list');
+$op = xnewsletterRequest::getString('op', 'list');
$cat_id = xnewsletterRequest::getInt('cat_id', 0);
switch ($op) {
- case "list" :
+ case 'list':
default:
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCAT, '?op=new_cat', 'add');
@@ -51,7 +51,7 @@
$catCriteria->setLimit($limit);
$catObjs = $xnewsletter->getHandler('cat')->getAll($catCriteria);
if ($catsCount > $limit) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($catsCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
@@ -61,38 +61,38 @@
// View Table
echo "<table class='outer width100' cellspacing='1'>";
echo "<tr>";
- echo " <th class='center width2'>"._AM_XNEWSLETTER_CAT_ID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_NAME . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_INFO . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_ADMIN . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_CREATE . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_LIST . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_READ . "</th>";
+ echo " <th>"._AM_XNEWSLETTER_CAT_ID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_NAME . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_INFO . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_GPERMS_ADMIN . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_GPERMS_CREATE . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_GPERMS_LIST . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_GPERMS_READ . "</th>";
if ($xnewsletter->getConfig('xn_use_mailinglist') == true) {
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_MAILINGLIST . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_MAILINGLIST . "</th>";
}
- echo " <th class='center width5'>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
echo "</tr>";
if (count($catObjs) > 0) {
- $class = "odd";
+ $class = 'odd';
$groupNames = $member_handler->getGroupList();
$gperm_handler = xoops_gethandler('groupperm');
foreach ($catObjs as $cat_id => $catObj) {
echo "<tr class='{$class}'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>{$cat_id}</td>";
- echo "<td class='center'>{$catObj->getVar("cat_name")}</td>";
+ $class = ($class == 'even') ? 'odd' : 'even';
+ echo "<td>{$cat_id}</td>";
+ echo "<td>{$catObj->getVar("cat_name")}</td>";
echo "<td>{$catObj->getVar("cat_info")} </td>";
// cat_gperms_admin
$cat_gperms_admin_groupids = $gperm_handler->getGroupIds('newsletter_admin_cat', $cat_id, $xnewsletter->getModule()->mid());
sort ($cat_gperms_admin_groupids);
$cat_gperms_admin = '';
foreach ($cat_gperms_admin_groupids as $groupid) {
- $cat_gperms_admin .= $groupNames[$groupid] . " | ";
+ $cat_gperms_admin .= $groupNames[$groupid] . ' | ';
}
$cat_gperms_admin = substr($cat_gperms_admin, 0, -3);
- echo "<td class='center'>" . $cat_gperms_admin . "</td>";
+ echo "<td>" . $cat_gperms_admin . "</td>";
// cat_gperms_create
$cat_gperms_create_groupids = $gperm_handler->getGroupIds('newsletter_create_cat', $cat_id, $xnewsletter->getModule()->mid());
@@ -102,7 +102,7 @@
$cat_gperms_create .= $groupNames[$groupid]." | ";
}
$cat_gperms_create = substr($cat_gperms_create, 0, -3);
- echo "<td class='center'>" . $cat_gperms_create . "</td>";
+ echo "<td>" . $cat_gperms_create . "</td>";
// cat_gperms_list
$cat_gperms_list_groupids = $gperm_handler->getGroupIds('newsletter_list_cat', $cat_id, $xnewsletter->getModule()->mid());
@@ -112,7 +112,7 @@
$cat_gperms_list .= $groupNames[$groupid] . " | ";
}
$cat_gperms_list = substr($cat_gperms_list, 0, -3);
- echo "<td class='center'>" . $cat_gperms_list . "</td>";
+ echo "<td>" . $cat_gperms_list . "</td>";
// cat_gperms_read
$cat_gperms_read_groupids = $gperm_handler->getGroupIds('newsletter_read_cat', $cat_id, $xnewsletter->getModule()->mid());
@@ -122,26 +122,26 @@
$cat_gperms_read .= $groupNames[$groupid] . " | ";
}
$cat_gperms_read = substr($cat_gperms_read, 0, -3);
- echo "<td class='center'>" . $cat_gperms_read . "</td>";
+ echo "<td>" . $cat_gperms_read . "</td>";
if ($xnewsletter->getConfig('xn_use_mailinglist') == true) {
- echo "<td class='center'>" . $catObj->getVar("cat_mailinglist") . "</td>";
+ echo "<td>" . $catObj->getVar("cat_mailinglist") . "</td>";
}
- echo "<td class='center width5' nowrap='nowrap'>";
- echo "<a href='?op=edit_cat&cat_id=" . $cat_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>";
+ echo "<td nowrap='nowrap'>";
+ echo "<a href='?op=edit_cat&cat_id={$cat_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>";
echo " ";
- echo "<a href='?op=delete_cat&cat_id=" . $cat_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
+ echo "<a href='?op=delete_cat&cat_id={$cat_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
echo "</td>";
echo "</tr>";
}
}
echo "</table>";
echo "<br />";
- echo "<div class='center'>" . $pagenav . "</div>";
+ echo "<div>" . $pagenav . "</div>";
echo "<br />";
break;
- case "new_cat" :
+ case 'new_cat':
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
@@ -151,7 +151,7 @@
$form->display();
break;
- case "save_cat":
+ case 'save_cat':
if ( !$GLOBALS['xoopsSecurity']->check() ) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
@@ -199,7 +199,7 @@
$gperm_handler->addRight('newsletter_list_cat', $cat_id, $groupid, $xnewsletter->getModule()->mid());
}
//
- redirect_header("?op=list", 3, _AM_XNEWSLETTER_FORMOK);
+ redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
}
echo $catObj->getHtmlErrors();
@@ -207,7 +207,7 @@
$form->display();
break;
- case "edit_cat" :
+ case 'edit_cat':
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCAT, '?op=new_cat', 'add');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, '?op=list', 'list');
@@ -218,10 +218,10 @@
$form->display();
break;
- case "delete_cat" :
+ case 'delete_cat':
$catObj = $xnewsletter->getHandler('cat')->get($_REQUEST['cat_id']);
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
- if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if ($xnewsletter->getHandler('cat')->delete($catObj)) {
@@ -234,4 +234,4 @@
}
break;
}
-include "admin_footer.php";
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,14 +27,14 @@
*/
$currentFile = basename(__FILE__);
-include "admin_header.php";
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
// We recovered the value of the argument op in the URL$
$op = xnewsletterRequest::getString('op', 'list');
switch ($op) {
- case "list":
+ case 'list':
default:
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCATSUBSCR, '?op=new_catsubscr', 'add');
@@ -42,15 +42,15 @@
//
$limit = $xnewsletter->getConfig('adminperpage');
$catCriteria = new CriteriaCompo();
- $catCriteria->setSort("cat_id ASC, cat_name");
- $catCriteria->setOrder("ASC");
+ $catCriteria->setSort('cat_id ASC, cat_name');
+ $catCriteria->setOrder('ASC');
$catCount = $xnewsletter->getHandler('cat')->getCount();
$start = xnewsletterRequest::getInt('start', 0);
$catCriteria->setStart($start);
$catCriteria->setLimit($limit);
$catObjs = $xnewsletter->getHandler('cat')->getAll($catCriteria);
if ($catCount > $limit) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($catCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
@@ -59,23 +59,23 @@
// View Table
echo "<table class='outer' cellspacing='1'>";
echo "<tr>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_ID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_NAME . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_INFO . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_SUBSCRID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_ID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_NAME . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_INFO . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_SUBSCRID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
echo "</tr>";
if ($catCount > 0) {
- $class = "odd";
+ $class = 'odd';
foreach ($catObjs as $cat_id => $catObj) {
echo "<tr class='{$class}'>";
$class = ($class == 'even') ? 'odd' : 'even';
- echo "<td class='center'>{$cat_id}</td>";
- echo "<td class='center'><a href='?op=list_cat&cat_id={$cat_id}'>{$catObj->getVar('cat_name')}</a></td>";
- echo "<td>{$catObj->getVar("cat_info")}</td>";
+ echo "<td>{$cat_id}</td>";
+ echo "<td><a href='?op=list_cat&cat_id={$cat_id}'>{$catObj->getVar('cat_name')}</a></td>";
+ echo "<td>{$catObj->getVar('cat_info')}</td>";
$catCount = $xnewsletter->getHandler('catsubscr')->getCount(new Criteria('catsubscr_catid', $cat_id));
- echo "<td class='center'>{$catCount}</td>";
- echo "<td class='center'><a href='?op=list_cat&cat_id={$cat_id}'><img src='" . XNEWSLETTER_ICONS_URL . "/xn_details.png' alt='" . _AM_XNEWSLETTER_DETAILS . "' title='" . _AM_XNEWSLETTER_DETAILS . "'></a></td>";
+ echo "<td>{$catCount}</td>";
+ echo "<td><a href='?op=list_cat&cat_id={$cat_id}'><img src='" . XNEWSLETTER_ICONS_URL . "/xn_details.png' alt='" . _AM_XNEWSLETTER_DETAILS . "' title='" . _AM_XNEWSLETTER_DETAILS . "'></a></td>";
echo "</tr>";
}
}
@@ -85,8 +85,8 @@
echo "<br />";
break;
- case "list_cat":
- $cat_id = isset($_REQUEST["cat_id"]) ? $_REQUEST["cat_id"] : 0;
+ case 'list_cat':
+ $cat_id = xnewsletterRequest::getInt('cat_id', 0);
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, '?op=list', 'list');
@@ -95,9 +95,9 @@
//
$limit = $xnewsletter->getConfig('adminperpage');
$catsubscrCriteria = new CriteriaCompo();
- $catsubscrCriteria->add(new Criteria("catsubscr_catid", $cat_id));
- $catsubscrCriteria->setSort("catsubscr_id ASC, catsubscr_catid");
- $catsubscrCriteria->setOrder("ASC");
+ $catsubscrCriteria->add(new Criteria('catsubscr_catid', $cat_id));
+ $catsubscrCriteria->setSort('catsubscr_id ASC, catsubscr_catid');
+ $catsubscrCriteria->setOrder('ASC');
$catCount = $xnewsletter->getHandler('catsubscr')->getCount($catsubscrCriteria);
$start = xnewsletterRequest::getInt('start', 0);
$catsubscrCriteria->setStart($start);
@@ -114,47 +114,47 @@
// View Table
echo "<table class='outer' cellspacing='1'>";
echo "<tr>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_ID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_CATID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_SUBSCRID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_QUITED . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_SUBMITTER . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_CREATED . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_ID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_CATID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_SUBSCRID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_QUITED . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_SUBMITTER . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_CREATED . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
echo "</tr>";
if ($catCount > 0) {
- $class = "odd";
+ $class = 'odd';
foreach ($catsubscrObjs as $catsubscr_id => $catsubscrObj) {
- echo "<tr class='" . $class . "'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>" . $catsubscr_id . "</td>";
+ echo "<tr class='{$class}'>";
+ $class = ($class == 'even') ? 'odd' : 'even';
+ echo "<td>{$catsubscr_id}</td>";
$cat = $xnewsletter->getHandler('cat')->get($cat_id);
- $cat_name = $cat->getVar("cat_name");
- echo "<td class='center'>" . $cat_name . "</td>";
- $subscr_id = $catsubscrObj->getVar("catsubscr_subscrid");
+ $cat_name = $cat->getVar('cat_name');
+ echo "<td>" . $cat_name . "</td>";
+ $subscr_id = $catsubscrObj->getVar('catsubscr_subscrid');
$subscr = $xnewsletter->getHandler('subscr')->get($subscr_id);
$subscr_email = ($subscr) ? $subscr->getVar("subscr_email") : "";
- echo "<td class='center'>" . $subscr_email . "</td>";
- if ($catsubscrObj->getVar("catsubscr_quited") > 0) {
- $catsubscr_quited = _YES . " (" . formatTimeStamp($catsubscrObj->getVar("catsubscr_quited"), "M") . ")";
+ echo "<td>" . $subscr_email . "</td>";
+ if ($catsubscrObj->getVar('catsubscr_quited') > 0) {
+ $catsubscr_quited = _YES . ' (' . formatTimeStamp($catsubscrObj->getVar('catsubscr_quited'), 'M') . ')';
} else {
$catsubscr_quited = _NO;
}
- echo "<td class='center'>" . $catsubscr_quited . "</td>";
- echo "<td class='center'>" . XoopsUser::getUnameFromId($catsubscrObj->getVar("catsubscr_submitter"), "S") . "</td>";
- echo "<td class='center'>" . formatTimeStamp($catsubscrObj->getVar("catsubscr_created"), "S") . "</td>";
+ echo "<td>" . $catsubscr_quited . "</td>";
+ echo "<td>" . XoopsUser::getUnameFromId($catsubscrObj->getVar('catsubscr_submitter'), 'S') . "</td>";
+ echo "<td>" . formatTimeStamp($catsubscrObj->getVar('catsubscr_created'), 'S') . "</td>";
- echo "<td class='center width5' nowrap='nowrap'>
- <a href='?op=edit_catsubscr&catsubscr_id=" . $catsubscr_id . "&cat_id=" . $cat_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>
- <a href='?op=delete_catsubscr&catsubscr_id=" . $catsubscr_id . "&cat_id=" . $cat_id . "&cat_name=" . $cat_name . "&subscr_email=" . $subscr_email . "&subscr_id=" . $subscr_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "'></a>
+ echo "<td nowrap='nowrap'>
+ <a href='?op=edit_catsubscr&catsubscr_id={$catsubscr_id}&cat_id={$cat_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>
+ <a href='?op=delete_catsubscr&catsubscr_id={$catsubscr_id}&cat_id={$cat_id}&cat_name={$cat_name}&subscr_email={$subscr_email}&subscr_id={$subscr_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "'></a>
</td>";
echo "</tr>";
}
}
echo "</table>";
echo "<br />";
- echo "<div class='center'>" . $pagenav . "</div>";
+ echo "<div>" . $pagenav . "</div>";
echo "<br />";
break;
@@ -194,7 +194,7 @@
//add subscriber to mailinglist
$catsubscrObj_cat = $xnewsletter->getHandler('cat')->get($_REQUEST['catsubscr_catid']);
if ($catsubscrObj_cat->getVar('cat_mailinglist') > 0) {
- require_once( XOOPS_ROOT_PATH."/modules/xnewsletter/include/mailinglist.php" );
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(1, $catsubscr_subscrid, $catsubscrObj_cat->getVar('cat_mailinglist'));
}
redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
@@ -206,10 +206,10 @@
break;
case 'edit_catsubscr':
- $cat_id = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : 0;
+ $cat_id = xnewsletterRequest::getInt('cat_id', 0);
echo $indexAdmin->addNavigation($currentFile);
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_CATSUBSCRLIST, '?op=list_cat&cat_id=' . $cat_id, 'list');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_CATSUBSCRLIST, "?op=list_cat&cat_id={$cat_id}", 'list');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCATSUBSCR, '?op=new_catsubscr', 'add');
echo $indexAdmin->renderButton();
//
@@ -244,4 +244,4 @@
}
break;
}
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,7 +27,7 @@
*/
$currentFile = basename(__FILE__);
-include "admin_header.php";
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
define('XNEWSLETTER_BASIC_LIMIT_IMPORT_CHECKED', 100);
@@ -45,7 +45,7 @@
echo $indexAdmin->addNavigation($currentFile);
switch ($op) {
- case "show_formcheck":
+ case 'show_formcheck':
$indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
//
@@ -75,25 +75,25 @@
$showlimit = str_replace("%n", $importsCount, $showlimit);
$form .= "
- <table width=\"100%\" cellspacing=\"1\" class=\"outer\">
+ <table width='100%' cellspacing='1' class='outer'>
<tr>
- <td align=\"left\" colspan='8'>" . $showlimit . "</td>
+ <td align='left' colspan='8'>" . $showlimit . "</td>
</tr>";
$class = "odd";
$form .= "
<tr>
- <th align=\"center\"> </th>
- <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_EMAIL . "</th>
- <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_SEX . "</th>
- <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_FIRSTNAME . "</th>
- <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_LASTNAME . "</th>
- <th align=\"center\">" . _AM_XNEWSLETTER_IMPORT_EMAIL_EXIST . "</th>
- <th align=\"center\"...
[truncated message content] |
|
From: <be...@us...> - 2014-09-03 23:16:04
|
Revision: 12774
http://sourceforge.net/p/xoops/svn/12774
Author: beckmi
Date: 2014-09-03 23:15:49 +0000 (Wed, 03 Sep 2014)
Log Message:
-----------
replaced dirname(__FILE__) with __DIR__
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pagewrap.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/permissions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_delete_file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/backend.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/date_to_date.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_new.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_random_item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_recent.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_files.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/search.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/formdatetime.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/groupperm.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/metagen.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/permission.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/rating.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/session.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_delete.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_edit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_new.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_post.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_reply.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_upload.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo_functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/list.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/notification_update.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/pop.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/print.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/search.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/submit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_singleitem.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_submit.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/view.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/visit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/xoops_version.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: about.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,8 +19,8 @@
* @version $Id: admin_header.php 10661 2013-01-04 19:22:48Z trabis $
*/
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+include_once dirname(__DIR__) . '/include/common.php';
include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
//xoops_loadLanguage('admin', PUBLISHER_DIRNAME);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
* @version $Id: category.php 10661 2013-01-04 19:22:48Z trabis $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
$op = PublisherRequest::getString('op');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -18,7 +18,7 @@
* @version $Id: clone.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . "/admin_header.php";
+include_once __DIR__ . "/admin_header.php";
publisher_cpHeader();
//publisher_adminMenu(-1, _AM_PUBLISHER_CLONE);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
* @version $Id: file.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
$op = PublisherRequest::getString('op');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-include_once dirname(dirname(__FILE__)) . '/admin_header.php';
+include_once dirname(__DIR__) . '/admin_header.php';
$myts = MyTextSanitizer::getInstance();
$importFromModuleName = "xNews " . @$_POST['ams_version'];
@@ -173,7 +173,7 @@
if ($op == 'go') {
publisher_cpHeader();
//publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
- include_once (dirname(dirname(dirname(__FILE__)))) . '/include/common.php';
+ include_once (dirname(dirname(__DIR__))) . '/include/common.php';
publisher_openCollapsableBar('amsimportgo', 'amsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
$module_handler = xoops_gethandler('module');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-include_once dirname(dirname(__FILE__)) . '/admin_header.php';
+include_once dirname(__DIR__) . '/admin_header.php';
$myts = MyTextSanitizer::getInstance();
$importFromModuleName = "AMS " . @$_POST['ams_version'];
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-include_once dirname(dirname(__FILE__)) . '/admin_header.php';
+include_once dirname(__DIR__) . '/admin_header.php';
$myts = MyTextSanitizer::getInstance();
$importFromModuleName = "cjaycontent " . @$_POST['cjaycontent_version'];
@@ -98,7 +98,7 @@
if ($op == 'go') {
publisher_cpHeader();
//publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
- include_once (dirname(dirname(dirname(__FILE__)))) . '/include/common.php';
+ include_once (dirname(dirname(__DIR__))) . '/include/common.php';
publisher_openCollapsableBar(
'cjaycontentimportgo',
'cjaycontentimportgoicon',
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: news.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(dirname(__FILE__)) . '/admin_header.php';
+include_once dirname(__DIR__) . '/admin_header.php';
$myts = MyTextSanitizer::getInstance();
$importFromModuleName = "News " . @$_POST['news_version'];
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: smartsection.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(dirname(__FILE__)) . '/admin_header.php';
+include_once dirname(__DIR__) . '/admin_header.php';
$myts = MyTextSanitizer::getInstance();
$importFromModuleName = "Smartsection " . @$_POST['smartsection_version'];
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: wfsection.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(dirname(__FILE__)) . '/admin_header.php';
+include_once dirname(__DIR__) . '/admin_header.php';
$myts = MyTextSanitizer::getInstance();
$importFromModuleName = "WF-Section " . @$_POST['wfs_version'];
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: xfsection.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(dirname(__FILE__)) . '/admin_header.php';
+include_once dirname(__DIR__) . '/admin_header.php';
$myts = MyTextSanitizer::getInstance();
$importFromModuleName = "XF-Section " . @$_POST['xfs_version'];
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-include_once dirname(dirname(__FILE__)) . '/admin_header.php';
+include_once dirname(__DIR__) . '/admin_header.php';
$myts = MyTextSanitizer::getInstance();
$importFromModuleName = "xNews " . @$_POST['xnews_version'];
@@ -188,7 +188,7 @@
if ($op == 'go') {
publisher_cpHeader();
//publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
- include_once (dirname(dirname(dirname(__FILE__)))) . '/include/common.php';
+ include_once (dirname(dirname(__DIR__))) . '/include/common.php';
publisher_openCollapsableBar(
'xnewsimportgo',
'xnewsimportgoicon',
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
* @version $Id: import.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . "/admin_header.php";
+include_once __DIR__ . "/admin_header.php";
$op = 'none';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: index.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: item.php 10661 2013-01-04 19:22:48Z trabis $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
$itemid = PublisherRequest::getInt('itemid');
$op = ($itemid > 0 || isset($_POST['editor'])) ? 'mod' : '';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
* @version $Id:main.php 335 2011-12-05 20:24:01Z lus...@gm... $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -21,7 +21,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-$dirname = basename(dirname(dirname(__FILE__)));
+$dirname = basename(dirname(__DIR__));
$module_handler = xoops_gethandler('module');
$module = $module_handler->getByDirname($dirname);
$pathIcon32 = $module->getInfo('icons32');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: mimetypes.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_load('XoopsPagenav');
$start = $limit = 0;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pagewrap.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pagewrap.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pagewrap.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
* @version $Id: pagewrap.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
publisher_cpHeader();
//publisher_adminMenu(-1, _AM_PUBLISHER_ITEMS . " > " . _AM_PUBLISHER_PAGEWRAP);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/permissions.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/permissions.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/permissions.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
* @version $Id: permissions.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
$myts = MyTextSanitizer::getInstance();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
* @version $Id: preferences.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
$module = $publisher->getModule();
$mod = $module->mid();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_delete_file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_delete_file.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_delete_file.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
* @version $Id: pw_delete_file.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
if (isset($_POST["op"]) && ($_POST["op"] == "delfileok")) {
$dir = publisher_getUploadDir(true, 'content');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
* @version $Id: pw_upload_file.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
$errors = array();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -24,7 +24,7 @@
# [11-may-2001] Kenneth Lee - http://www.nexgear.com/
######################################################################
-include_once dirname(__FILE__) . '/header.php';
+include_once __DIR__ . '/header.php';
$xoopsOption['template_main'] = 'publisher_archive.tpl';
include_once XOOPS_ROOT_PATH . '/header.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
* @version $Id: author_items.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/header.php';
+include_once __DIR__ . '/header.php';
$uid = PublisherRequest::getInt('uid');
if (empty($uid)) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/backend.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/backend.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/backend.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: backend.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/header.php';
+include_once __DIR__ . '/header.php';
xoops_load('XoopsLocal');
error_reporting(0);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -21,7 +21,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
function publisher_category_items_sel_show($options)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/date_to_date.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/date_to_date.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/date_to_date.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -22,7 +22,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
function publisher_date_to_date_show($options)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -22,7 +22,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
/***
* Function To Show Publisher Items From Categories In Their Own Columns
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_menu.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_menu.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -22,7 +22,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
function publisher_items_menu_show($options)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_new.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_new.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_new.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -22,7 +22,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
function publisher_items_new_show($options)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_random_item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_random_item.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_random_item.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -22,7 +22,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
function publisher_items_random_item_show($options)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_recent.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_recent.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_recent.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -22,7 +22,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
function publisher_items_recent_show($options)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
function publisher_items_spot_show($options)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_files.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_files.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_files.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -22,7 +22,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
function publisher_latest_files_show($options)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -23,7 +23,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
function publisher_latest_news_show($options)
{
@@ -196,7 +196,7 @@
}
$item['pdf'] = '';
- if ($publisher->getConfig('display_pdf')) {
+ if ($this->publisher->getConfig('display_pdf')) {
if ($options[25] == 1) {
$item['pdf'] = "<a href='" . PUBLISHER_URL . "/makepdf.php?itemid=" . $itemObj->itemid() . "' rel='nofollow'><img src='" . PUBLISHER_URL . "/assets/images/links/pdf.gif' title='"
. _CO_PUBLISHER_PDF . "' alt='" . _CO_PUBLISHER_PDF . "' /></a> ";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/search.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/search.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/search.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -22,7 +22,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
function publisher_search_show($options)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: category.php 10746 2013-01-10 20:54:35Z trabis $
*/
-include_once dirname(__FILE__) . '/header.php';
+include_once __DIR__ . '/header.php';
$categoryid = PublisherRequest::getInt('categoryid');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
class PublisherCategory extends XoopsObject
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/file.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/file.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
// File status
define("_PUBLISHER_STATUS_FILE_NOTSET", -1);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -22,7 +22,7 @@
// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
-include_once dirname(dirname(dirname(__FILE__))) . '/include/common.php';
+include_once dirname(dirname(__DIR__)) . '/include/common.php';
xoops_load('XoopsFormLoader');
include_once XOOPS_ROOT_PATH . '/class/tree.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -22,7 +22,7 @@
// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
-include_once dirname(dirname(dirname(__FILE__))) . '/include/common.php';
+include_once dirname(dirname(__DIR__)) . '/include/common.php';
xoops_load('XoopsFormLoader');
//todo: move to admin?
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -23,7 +23,7 @@
// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
-include_once dirname(dirname(dirname(__FILE__))) . '/include/common.php';
+include_once dirname(dirname(__DIR__)) . '/include/common.php';
xoops_load('XoopsFormLoader');
xoops_load('XoopsLists');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/formdatetime.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/formdatetime.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/formdatetime.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
class PublisherFormDateTime extends XoopsFormElementTray
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/groupperm.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/groupperm.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/groupperm.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -24,7 +24,7 @@
include_once XOOPS_ROOT_PATH . '/kernel/groupperm.php';
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
class PublisherGroupPermHandler extends XoopsGroupPermHandler
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -18,7 +18,7 @@
* @version $Id: item.php 10728 2013-01-09 22:09:22Z trabis $
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
class PublisherItem extends XoopsObject
{
/**
@@ -580,7 +580,7 @@
return sprintf(_CO_PUBLISHER_POSTEDBY, $posterName, $postdate);
}
-
+
/**
* @return string
*/
@@ -589,7 +589,7 @@
$posterName = $this->linkedPosterName();
return $posterName;
}
-
+
/**
* @return string
*/
@@ -851,7 +851,7 @@
if (substr($color, 0, 1) != '#') {
$color = '#' . $color;
}
- include_once dirname(__FILE__) . '/highlighter.php';
+ include_once __DIR__ . '/highlighter.php';
$highlighter = new PublisherHighlighter();
$highlighter->setReplacementString('<span style="font-weight: bolder; background-color: ' . $color . ';">\1</span>');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/metagen.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/metagen.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/metagen.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
class PublisherMetagen
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -21,7 +21,7 @@
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
/**
* PublisherBaseObjectHandler class
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/permission.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/permission.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/permission.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -21,7 +21,7 @@
* @version $Id: permission.php 10661 2013-01-04 19:22:48Z trabis $
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
class PublisherPermissionHandler extends XoopsObjectHandler
{
/**
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -33,7 +33,7 @@
protected function __construct($debug)
{
$this->debug = $debug;
- $this->dirname = basename(dirname(dirname(__FILE__)));
+ $this->dirname = basename(dirname(__DIR__));
}
static function &getInstance($debug = false)
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/rating.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/rating.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/rating.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
class PublisherRating extends XoopsObject
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/session.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/session.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/session.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -21,7 +21,7 @@
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
class PublisherSession
{
@@ -92,7 +92,7 @@
session_destroy();
}
- static public function &getInstance()
+ public static function &getInstance()
{
static $_sess;
if (!isset($_sess)) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -21,7 +21,7 @@
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
/**
* XoopsThemeTabForm
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_delete.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_delete.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_delete.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,5 +19,5 @@
* @version $Id: comment_delete.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once '../../mainfile.php';
+include dirname(dirname(__DIR__)) . '/mainfile.php';
include_once XOOPS_ROOT_PATH . '/include/comment_delete.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_edit.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_edit.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_edit.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,5 +19,5 @@
* @version $Id: comment_edit.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once '../../mainfile.php';
+include dirname(dirname(__DIR__)) . '/mainfile.php';
include_once XOOPS_ROOT_PATH . '/include/comment_edit.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_new.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_new.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_new.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,8 +19,8 @@
* @version $Id: comment_new.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(dirname(dirname(__FILE__))) . '/mainfile.php';
-include_once dirname(__FILE__) . '/include/common.php';
+include_once dirname(dirname(__DIR__)) . '/mainfile.php';
+include_once __DIR__ . '/include/common.php';
$com_itemid = isset($_GET['com_itemid']) ? intval($_GET['com_itemid']) : 0;
if ($com_itemid > 0) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_post.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_post.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_post.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,5 +19,5 @@
* @version $Id: comment_post.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once '../../mainfile.php';
+include dirname(dirname(__DIR__)) . '/mainfile.php';
include_once XOOPS_ROOT_PATH . '/include/comment_post.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_reply.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_reply.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/comment_reply.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,5 +19,5 @@
* @version $Id: comment_reply.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once '../../mainfile.php';
+include dirname(dirname(__DIR__)) . '/mainfile.php';
include_once XOOPS_ROOT_PATH . '/include/comment_reply.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
* @version $Id: file.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/header.php';
+include_once __DIR__ . '/header.php';
xoops_loadLanguage('admin', PUBLISHER_DIRNAME);
$op = PublisherRequest::getString('op');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/header.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/header.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,8 +19,8 @@
* @version $Id: header.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(dirname(dirname(__FILE__))) . '/mainfile.php';
-include_once dirname(__FILE__) . '/include/common.php';
+include_once dirname(dirname(__DIR__)) . '/mainfile.php';
+include_once __DIR__ . '/include/common.php';
$myts = MyTextSanitizer::getInstance();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -17,7 +17,7 @@
// URL: http://www.xuups.com
// E-Mail: lus...@gm...
-include_once dirname(dirname(__FILE__)) . '/header.php';
+include_once dirname(__DIR__) . '/header.php';
error_reporting(0);
$xoopsLogger->activated = false;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_upload.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_upload.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_upload.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -26,11 +26,11 @@
// ------------------------------------------------------------------------ //
error_reporting(0);
-include dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once dirname(__FILE__) . '/common.php';
+include dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+include_once __DIR__ . '/common.php';
$GLOBALS['xoopsLogger']->activated = false;
-xoops_loadLanguage('common', basename(dirname(dirname(__FILE__))));
+xoops_loadLanguage('common', basename(dirname(__DIR__)));
if (!is_object($xoopsUser)) {
$group = array(XOOPS_GROUP_ANONYMOUS);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -21,7 +21,7 @@
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-define("PUBLISHER_DIRNAME", basename(dirname(dirname(__FILE__))));
+define("PUBLISHER_DIRNAME", basename(dirname(__DIR__)));
define("PUBLISHER_URL", XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME);
define("PUBLISHER_IMAGES_URL", PUBLISHER_URL . '/assets/images');
define("PUBLISHER_ADMIN_URL", PUBLISHER_URL . '/admin');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -21,7 +21,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(__FILE__) . '/common.php';
+include_once __DIR__ . '/common.php';
/**
* Includes scripts in HTML header
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -22,7 +22,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(__FILE__) . '/seo_functions.php';
+include_once __DIR__ . '/seo_functions.php';
function publisher_notify_iteminfo($category, $item_id)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -19,7 +19,7 @@
*/
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(__DIR__) . '/include/common.php';
function publisher_search($queryarray, $andor, $limit, $offset, $userid, $categories = array(), $sortby = 0, $searchin = "", $extra = "")
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo_functions.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo_functions.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo_functions.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -21,7 +21,7 @@
// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-include_once dirname(__FILE__) . '/common.php';
+include_once __DIR__ . '/common.php';
function publisher_seo_title($title = '', $withExt = true)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: index.php 10727 2013-01-09 22:03:19Z trabis $
*/
-include_once dirname(__FILE__) . '/header.php';
+include_once __DIR__ . '/header.php';
// At which record shall we start for the Categories
$catstart = PublisherRequest::getInt('catstart');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php 2014-09-03 11:33:58 UTC (rev 12773)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php 2014-09-03 23:15:49 UTC (rev 12774)
@@ -20,7 +20,7 @@
* @version $Id: item.php 10374 2012-12-12 23:39:48Z trabis $
*/
-include_once dirname(__FILE__) . '/header.php';
+include_once __DIR__ . '/header.php';
$itemid = PublisherRequest::getInt('itemid');
$item_page_id = PublisherRequest::getInt('page', -1);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publis...
[truncated message content] |
|
From: <be...@us...> - 2014-09-03 11:34:14
|
Revision: 12773
http://sourceforge.net/p/xoops/svn/12773
Author: beckmi
Date: 2014-09-03 11:33:58 +0000 (Wed, 03 Sep 2014)
Log Message:
-----------
Beta 3, work in progress. See changelog.txt
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/about.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/admin_header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/broken.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/downloads.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/field.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/import.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/modified.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/permissions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/blocks/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/blocks/tdmdownloads_search.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/blocks/tdmdownloads_top.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/brokenfile.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/class/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/class/tdmdownloads_broken.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/class/tdmdownloads_cat.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/class/tdmdownloads_downlimit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/class/tdmdownloads_downloads.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/class/tdmdownloads_field.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/class/tdmdownloads_fielddata.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/class/tdmdownloads_mod.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/class/tdmdownloads_modfielddata.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/class/tdmdownloads_votedata.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/class/tree.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/comment_delete.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/comment_edit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/comment_new.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/comment_post.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/comment_reply.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/docs/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/TDMDownloads/downloads/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/TDMDownloads/images/cats/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/TDMDownloads/images/field/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/TDMDownloads/images/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/TDMDownloads/images/shots/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/TDMDownloads/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/plugins/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/plugins/sitemap/TDMDownloads.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/plugins/sitemap/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/plugins/tag/TDMDownloads.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/plugins/waiting/TDMDownloads.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/plugins/whatsnew/TDMDownloads/data.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/plugins/whatsnew/TDMDownloads/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/plugins/whatsnew/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/include/comment_functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/include/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/include/install.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/include/notification.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/include/search.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/include/update.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/blocks.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/help/help.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/help/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/mail_template/category_filesubmit_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/mail_template/category_newfile_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/mail_template/file_approve_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/mail_template/global_filebroken_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/mail_template/global_filemodify_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/mail_template/global_filesubmit_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/mail_template/global_newcategory_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/mail_template/global_newfile_notify.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/mail_template/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/language/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/list.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/modfile.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/notification_update.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/ratefile.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/rss.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/search.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/singlefile.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/sql/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/submit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/blocks/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/view.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/viewcat.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/visit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/css/blocks.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/css/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/css/styles.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/about.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/add.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/bg_button.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/broken.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/category.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/downloads.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/field.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/home.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/import.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/list.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/modified.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/permissions.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/admin/xoopsmicrobutton.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/arrow.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/blank.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/balatarin.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/blinklist.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/delicious.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/designfloat.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/diggman.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/facebook_share_icon.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/fark.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/furl.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/google-icon.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/google_buzz_icon.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/google_plus_icon.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/mixx.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/myspace.jpg
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/newsvine.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/reddit.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/scriptandstyle.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/stumbleupon.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/technorati.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/twitter_share_icon.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/bookmarks/yahoomyweb.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/arrow.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/bg.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/date.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/dateout.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/favoris.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/favorisout.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/info.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/left_both.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/more.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/right_both.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/tableft4.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/tabright4.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/deco/tdmdownloads_search.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/down.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/download.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/editicon.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/author.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/comments.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/date.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/delete.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/download-now.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/download.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/edit.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/hits.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/homepage.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/ignore_mini.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/off.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/on.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/platform.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/rss.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/size.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/tomodify.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/torate.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/toreport.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/totell.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/version.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/view_mini.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/icon/votes.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/liste.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/logo-en.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/logo.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/rss.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/images/up.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/js/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/assets/js/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/docs/credits.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/docs/install.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/docs/lang_diff.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/docs/license.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/docs/readme.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/plugins/tag/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/extra/plugins/waiting/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/include/functions.folders.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/admin/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/blocks/tdmdownloads_block_new.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/blocks/tdmdownloads_block_random.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/blocks/tdmdownloads_block_rating.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/blocks/tdmdownloads_block_search.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/blocks/tdmdownloads_block_top.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_brokenfile.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_download.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_index.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_liste.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_modfile.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_ratefile.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_rss.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_singlefile.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_submit.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_viewcat.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/testdata/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/testdata/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/tests/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/tests/index.html
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/licence.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/blocks/tdmdownloads_block_new.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/blocks/tdmdownloads_block_random.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/blocks/tdmdownloads_block_rating.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/blocks/tdmdownloads_block_search.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/blocks/tdmdownloads_block_top.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_brokenfile.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_download.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_liste.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_modfile.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_ratefile.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_rss.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_singlefile.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_submit.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/templates/tdmdownloads_viewcat.html
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/about.php 2014-09-03 07:30:04 UTC (rev 12772)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/about.php 2014-09-03 11:33:58 UTC (rev 12773)
@@ -1,32 +1,33 @@
-<?php
-/**
- * TDMDownload
- *
- * 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.
- *
- * @copyright Gregory Mage (Aka Mage)
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Gregory Mage (Aka Mage)
- */
-
-include 'admin_header.php';
-xoops_cp_header();
-// pour file protection
-$xoops_url = parse_url(XOOPS_URL);
-$xoops_url = str_replace ('www.','', $xoops_url['host']);
-$file_protection = _AM_TDMDOWNLOADS_ABOUT_FILEPROTECTION_INFO1 . "<br /><br />" . XOOPS_ROOT_PATH . "/uploads/TDMDownloads/downloads/" . "<br /><br />" . _AM_TDMDOWNLOADS_ABOUT_FILEPROTECTION_INFO2 . "<br /><br />";
-$file_protection .= "RewriteEngine on" . "<br />" . "RewriteCond %{HTTP_REFERER} !" . $xoops_url . "/.*$ [NC]<br />ReWriteRule \.*$ - [F]";
-if (TDMDownloads_checkModuleAdmin()){
- $about_admin = new ModuleAdmin();
- $about_admin->addInfoBox(_AM_TDMDOWNLOADS_ABOUT_FILEPROTECTION);
- $about_admin->addInfoBoxLine(_AM_TDMDOWNLOADS_ABOUT_FILEPROTECTION, $file_protection, '', '', 'information');
- echo $about_admin->addNavigation('about.php');
- echo $about_admin->renderabout('9MYQB7GUK5MCS', true);
-}
-xoops_cp_footer();
-?>
\ No newline at end of file
+<?php
+/**
+ * TDMDownload
+ *
+ * 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.
+ *
+ * @copyright Gregory Mage (Aka Mage)
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Gregory Mage (Aka Mage)
+ */
+
+include_once __DIR__ . '/admin_header.php';
+xoops_cp_header();
+// pour file protection
+$mydirname = basename(dirname(__DIR__));
+$xoops_url = parse_url(XOOPS_URL);
+$xoops_url = str_replace('www.', '', $xoops_url['host']);
+$file_protection = _AM_TDMDOWNLOADS_ABOUT_FILEPROTECTION_INFO1 . "<br /><br />" . XOOPS_ROOT_PATH . "/uploads/$mydirname/downloads/" . "<br /><br />"
+ . _AM_TDMDOWNLOADS_ABOUT_FILEPROTECTION_INFO2 . "<br /><br />";
+$file_protection .= "RewriteEngine on" . "<br />" . "RewriteCond %{HTTP_REFERER} !" . $xoops_url . "/.*$ [NC]<br />ReWriteRule \.*$ - [F]";
+//if (TDMDownloads_checkModuleAdmin()) {
+ $about_admin = new ModuleAdmin();
+ $about_admin->addInfoBox(_AM_TDMDOWNLOADS_ABOUT_FILEPROTECTION);
+ $about_admin->addInfoBoxLine(_AM_TDMDOWNLOADS_ABOUT_FILEPROTECTION, $file_protection, '', '', 'information');
+ echo $about_admin->addNavigation('about.php');
+ echo $about_admin->renderabout('9MYQB7GUK5MCS', true);
+//}
+xoops_cp_footer();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/admin_header.php 2014-09-03 07:30:04 UTC (rev 12772)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/admin_header.php 2014-09-03 11:33:58 UTC (rev 12773)
@@ -15,55 +15,62 @@
*/
// Include xoops admin header
-include_once '../../../include/cp_header.php';
+include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-include_once(XOOPS_ROOT_PATH."/kernel/module.php");
-include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-include_once XOOPS_ROOT_PATH."/class/tree.php";
-include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
-include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-include_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
+include_once(XOOPS_ROOT_PATH . "/kernel/module.php");
+include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
+include_once XOOPS_ROOT_PATH . "/class/tree.php";
+include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
+include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-include_once("../include/functions.php");
+include_once dirname(__DIR__) . '/include/functions.php';
-if ( $xoopsUser ) {
+$mydirname = basename(dirname(__DIR__));
+
+$pathModuleAdmin = XOOPS_ROOT_PATH . '/' . $xoopsModule->getInfo('dirmoduleadmin');
+require_once $pathModuleAdmin . '/moduleadmin/moduleadmin.php';
+
+if ($xoopsUser) {
$xoopsModule = XoopsModule::getByDirname("TDMDownloads");
- if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
- redirect_header(XOOPS_URL."/",3,_NOPERM);
+ if (!$xoopsUser->isAdmin($xoopsModule->mid())) {
+ redirect_header(XOOPS_URL . "/", 3, _NOPERM);
exit();
}
} else {
- redirect_header(XOOPS_URL."/",3,_NOPERM);
+ redirect_header(XOOPS_URL . "/", 3, _NOPERM);
exit();
}
// Include language file
xoops_loadLanguage('admin', 'system');
-xoops_loadLanguage('admin', $xoopsModule->getVar('dirname', 'e'));
-xoops_loadLanguage('modinfo', $xoopsModule->getVar('dirname', 'e'));
+xoops_loadLanguage('admin', $mydirname);
+xoops_loadLanguage('modinfo', $mydirname);
-//param\xE8tres:
-// pour les images des cat\xE9gories:
-$uploaddir = XOOPS_ROOT_PATH . '/uploads/TDMDownloads/images/cats/';
-$uploadurl = XOOPS_URL . '/uploads/TDMDownloads/images/cats/';
+$pathIcon16 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons32');
+
+//param�tres:
+// pour les images des cat�gories:
+$uploaddir = XOOPS_ROOT_PATH . '/uploads/'.$mydirname.'/images/cats/';
+$uploadurl = XOOPS_URL . '/uploads/'.$mydirname.'/images/cats/';
// pour les fichiers
-$uploaddir_downloads = XOOPS_ROOT_PATH . '/uploads/TDMDownloads/downloads/';
-$uploadurl_downloads = XOOPS_URL . '/uploads/TDMDownloads/downloads/';
-// pour les captures d'\xE9cran fichiers
-$uploaddir_shots = XOOPS_ROOT_PATH . '/uploads/TDMDownloads/images/shots/';
-$uploadurl_shots = XOOPS_URL . '/uploads/TDMDownloads/images/shots/';
+$uploaddir_downloads = XOOPS_ROOT_PATH . '/uploads/'.$mydirname.'/downloads/';
+$uploadurl_downloads = XOOPS_URL . '/uploads/'.$mydirname.'/downloads/';
+// pour les captures d'�cran fichiers
+$uploaddir_shots = XOOPS_ROOT_PATH . '/uploads/'.$mydirname.'/images/shots/';
+$uploadurl_shots = XOOPS_URL . '/uploads/'.$mydirname.'/images/shots/';
// pour les images des champs:
-$uploaddir_field = XOOPS_ROOT_PATH . '/uploads/TDMDownloads/images/field/';
-$uploadurl_field = XOOPS_URL . '/uploads/TDMDownloads/images/field/';
+$uploaddir_field = XOOPS_ROOT_PATH . '/uploads/'.$mydirname.'/images/field/';
+$uploadurl_field = XOOPS_URL . '/uploads/'.$mydirname.'/images/field/';
/////////////
//appel des class
-$downloadscat_Handler =& xoops_getModuleHandler('tdmdownloads_cat', 'TDMDownloads');
-$downloads_Handler =& xoops_getModuleHandler('tdmdownloads_downloads', 'TDMDownloads');
-$downloadsvotedata_Handler =& xoops_getModuleHandler('tdmdownloads_votedata', 'TDMDownloads');
-$downloadsfield_Handler =& xoops_getModuleHandler('tdmdownloads_field', 'TDMDownloads');
-$downloadsfielddata_Handler =& xoops_getModuleHandler('tdmdownloads_fielddata', 'TDMDownloads');
-$downloadsbroken_Handler =& xoops_getModuleHandler('tdmdownloads_broken', 'TDMDownloads');
-$downloadsmod_Handler =& xoops_getModuleHandler('tdmdownloads_mod', 'TDMDownloads');
-$downloadsfieldmoddata_Handler =& xoops_getModuleHandler('tdmdownloads_modfielddata', 'TDMDownloads');
-?>
\ No newline at end of file
+$downloadscat_Handler =& xoops_getModuleHandler('tdmdownloads_cat', $mydirname );
+$downloads_Handler =& xoops_getModuleHandler('tdmdownloads_downloads', $mydirname );
+$downloadsvotedata_Handler =& xoops_getModuleHandler('tdmdownloads_votedata', $mydirname );
+$downloadsfield_Handler =& xoops_getModuleHandler('tdmdownloads_field', $mydirname );
+$downloadsfielddata_Handler =& xoops_getModuleHandler('tdmdownloads_fielddata', $mydirname );
+$downloadsbroken_Handler =& xoops_getModuleHandler('tdmdownloads_broken', $mydirname );
+$downloadsmod_Handler =& xoops_getModuleHandler('tdmdownloads_mod', $mydirname );
+$downloadsfieldmoddata_Handler =& xoops_getModuleHandler('tdmdownloads_modfielddata', $mydirname );
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/broken.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/broken.php 2014-09-03 07:30:04 UTC (rev 12772)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/broken.php 2014-09-03 11:33:58 UTC (rev 12773)
@@ -14,87 +14,90 @@
* @author Gregory Mage (Aka Mage)
*/
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
//On recupere la valeur de l'argument op dans l'URL$
$op = TDMDownloads_CleanVars($_REQUEST, 'op', 'list', 'string');
//Les valeurs de op qui vont permettre d'aller dans les differentes parties de la page
-switch ($op)
-{
+switch ($op) {
// Vue liste
case "list":
//Affichage de la partie haute de l'administration de Xoops
xoops_cp_header();
- if (TDMDownloads_checkModuleAdmin()){
$broken_admin = new ModuleAdmin();
echo $broken_admin->addNavigation('broken.php');
- }
$criteria = new CriteriaCompo();
if (isset($_REQUEST['limit'])) {
- $criteria->setLimit($_REQUEST['limit']);
- $limit = $_REQUEST['limit'];
- } else {
- $criteria->setLimit($xoopsModuleConfig['perpageadmin']);
- $limit = $xoopsModuleConfig['perpageadmin'];
- }
+ $criteria->setLimit($_REQUEST['limit']);
+ $limit = $_REQUEST['limit'];
+ } else {
+ $criteria->setLimit($xoopsModuleConfig['perpageadmin']);
+ $limit = $xoopsModuleConfig['perpageadmin'];
+ }
if (isset($_REQUEST['start'])) {
$criteria->setStart($_REQUEST['start']);
$start = $_REQUEST['start'];
} else {
$criteria->setStart(0);
- $start = 0;
- }
+ $start = 0;
+ }
$criteria->setSort('reportid');
$criteria->setOrder('ASC');
//pour faire une jointure de table
- $downloadsbroken_Handler->table_link = $downloadsbroken_Handler->db->prefix("tdmdownloads_downloads"); // Nom de la table en jointure
- $downloadsbroken_Handler->field_link = "lid"; // champ de la table en jointure
+ $downloadsbroken_Handler->table_link = $downloadsbroken_Handler->db->prefix("tdmdownloads_downloads"); // Nom de la table en jointure
+ $downloadsbroken_Handler->field_link = "lid"; // champ de la table en jointure
$downloadsbroken_Handler->field_object = "lid"; // champ de la table courante
- $downloadsbroken_arr = $downloadsbroken_Handler->getByLink($criteria);
- $numrows = $downloadsbroken_Handler->getCount($criteria);
- if ( $numrows > $limit ) {
+ $downloadsbroken_arr = $downloadsbroken_Handler->getByLink($criteria);
+ $numrows = $downloadsbroken_Handler->getCount($criteria);
+ if ($numrows > $limit) {
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $pagenav = $pagenav->renderNav(4);
- } else {
- $pagenav = '';
- }
+ $pagenav = $pagenav->renderNav(4);
+ } else {
+ $pagenav = '';
+ }
//Affichage du tableau des téléchargements brisés
if ($numrows > 0) {
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr>';
- echo '<th align="center" width="10%">'._AM_TDMDOWNLOADS_FORMFILE.'</th>';
+ echo '<th align="center" width="10%">' . _AM_TDMDOWNLOADS_FORMFILE . '</th>';
echo '<th align="center">' . _AM_TDMDOWNLOADS_FORMTITLE . '</th>';
echo '<th align="center" width="20%">' . _AM_TDMDOWNLOADS_BROKEN_SENDER . '</th>';
- echo '<th align="center" width="15%">'._AM_TDMDOWNLOADS_FORMACTION.'</th>';
+ echo '<th align="center" width="15%">' . _AM_TDMDOWNLOADS_FORMACTION . '</th>';
echo '</tr>';
$class = 'odd';
foreach (array_keys($downloadsbroken_arr) as $i) {
- $class = ($class == 'even') ? 'odd' : 'even';
- $downloads_lid = $downloadsbroken_arr[$i]->getVar('lid');
- $downloads_reportid = $downloadsbroken_arr[$i]->getVar('reportid');
- $downloads_title = $downloadsbroken_arr[$i]->getVar('title');
- $downloads_cid = $downloadsbroken_arr[$i]->getVar('cid');
- $downloads_poster = XoopsUser::getUnameFromId($downloadsbroken_arr[$i]->getVar('sender'));
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $downloads_lid = $downloadsbroken_arr[$i]->getVar('lid');
+ $downloads_reportid = $downloadsbroken_arr[$i]->getVar('reportid');
+ $downloads_title = $downloadsbroken_arr[$i]->getVar('title');
+ $downloads_cid = $downloadsbroken_arr[$i]->getVar('cid');
+ $downloads_poster = XoopsUser::getUnameFromId($downloadsbroken_arr[$i]->getVar('sender'));
$downloads_poster_ip = $downloadsbroken_arr[$i]->getVar('ip');
- echo '<tr class="'.$class.'">';
+ echo '<tr class="' . $class . '">';
echo '<td align="center">';
- echo '<a href="../visit.php?cid=' . $downloads_cid . '&lid=' . $downloads_lid . '" target="_blank"><img src="../images/icon/download.png" alt="Download ' . $downloads_title . '" title="Download ' . $downloads_title . '"></a>';
+ echo '<a href="../visit.php?cid=' . $downloads_cid . '&lid=' . $downloads_lid
+ . '" target="_blank"><img src="../assets/images/icon/download.png" alt="Download ' . $downloads_title . '" title="Download '
+ . $downloads_title . '"></a>';
echo '</td>';
echo '<td align="center">' . $downloads_title . '</td>';
echo '<td align="center"><b>' . $downloads_poster . '</b> (' . $downloads_poster_ip . ')</td>';
echo '<td align="center" width="15%">';
- echo '<a href="downloads.php?op=view_downloads&downloads_lid=' . $downloads_lid . '"><img src="../images/icon/view_mini.png" alt="' . _AM_TDMDOWNLOADS_FORMDISPLAY . '" title="' . _AM_TDMDOWNLOADS_FORMDISPLAY . '"></a> ';
- echo '<a href="downloads.php?op=edit_downloads&downloads_lid=' . $downloads_lid . '"><img src="../images/icon/edit.png" alt="' . _AM_TDMDOWNLOADS_FORMEDIT . '" title="' . _AM_TDMDOWNLOADS_FORMEDIT . '"></a> ';
- echo '<a href="broken.php?op=del_brokendownloads&broken_id=' . $downloads_reportid . '"><img src="../images/icon/ignore_mini.png" alt="' . _AM_TDMDOWNLOADS_FORMIGNORE . '" title="' . _AM_TDMDOWNLOADS_FORMIGNORE . '"></a>';
+ echo '<a href="downloads.php?op=view_downloads&downloads_lid=' . $downloads_lid . '"><img src="../assets/images/icon/view_mini.png" alt="'
+ . _AM_TDMDOWNLOADS_FORMDISPLAY . '" title="' . _AM_TDMDOWNLOADS_FORMDISPLAY . '"></a> ';
+ echo '<a href="downloads.php?op=edit_downloads&downloads_lid=' . $downloads_lid . '"><img src="../assets/images/icon/edit.png" alt="'
+ . _AM_TDMDOWNLOADS_FORMEDIT . '" title="' . _AM_TDMDOWNLOADS_FORMEDIT . '"></a> ';
+ echo '<a href="broken.php?op=del_brokendownloads&broken_id=' . $downloads_reportid
+ . '"><img src="../assets/images/icon/ignore_mini.png" alt="' . _AM_TDMDOWNLOADS_FORMIGNORE . '" title="' . _AM_TDMDOWNLOADS_FORMIGNORE
+ . '"></a>';
echo '</td>';
- }
- echo '</table><br />';
- echo '<br /><div align=right>' . $pagenav . '</div><br />';
- }else{
+ }
+ echo '</table><br />';
+ echo '<br /><div align=right>' . $pagenav . '</div><br />';
+ } else {
echo '<div class="errorMsg" style="text-align: center;">' . _AM_TDMDOWNLOADS_ERREUR_NOBROKENDOWNLOADS . '</div>';
}
- break;
+ break;
// permet de suprimmer le rapport de téléchargment brisé
case "del_brokendownloads":
@@ -110,15 +113,16 @@
} else {
//Affichage de la partie haute de l'administration de Xoops
xoops_cp_header();
- if (TDMDownloads_checkModuleAdmin()){
$broken_admin = new ModuleAdmin();
$broken_admin->addItemButton(_MI_TDMDOWNLOADS_ADMENU4, 'broken.php', 'list');
- echo $broken_admin->renderButton();
- }
- xoops_confirm(array('ok' => 1, 'broken_id' => $_REQUEST['broken_id'], 'op' => 'del_brokendownloads'), $_SERVER['REQUEST_URI'], _AM_TDMDOWNLOADS_BROKEN_SURDEL . '<br>');
+ echo $broken_admin->renderButton('left');
+ xoops_confirm(
+ array('ok' => 1, 'broken_id' => $_REQUEST['broken_id'], 'op' => 'del_brokendownloads'),
+ $_SERVER['REQUEST_URI'],
+ _AM_TDMDOWNLOADS_BROKEN_SURDEL . '<br>'
+ );
}
- break;
+ break;
}
//Affichage de la partie basse de l'administration de Xoops
xoops_cp_footer();
-?>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/category.php 2014-09-03 07:30:04 UTC (rev 12772)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/admin/category.php 2014-09-03 11:33:58 UTC (rev 12773)
@@ -14,29 +14,27 @@
* @author Gregory Mage (Aka Mage)
*/
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
//On recupere la valeur de l'argument op dans l'URL$
$op = TDMDownloads_CleanVars($_REQUEST, 'op', 'list', 'string');
//Les valeurs de op qui vont permettre d'aller dans les differentes parties de la page
-switch ($op)
-{
+switch ($op) {
// Vue liste
case "list":
//Affichage de la partie haute de l'administration de Xoops
xoops_cp_header();
- if (TDMDownloads_checkModuleAdmin()){
+ $mydirname = basename(dirname(__DIR__));
$category_admin = new ModuleAdmin();
echo $category_admin->addNavigation('category.php');
$category_admin->addItemButton(_AM_TDMDOWNLOADS_CAT_NEW, 'category.php?op=new_cat', 'add');
- echo $category_admin->renderButton();
- }
+ echo $category_admin->renderButton('left');
$criteria = new CriteriaCompo();
$criteria->setSort('cat_weight ASC, cat_title');
$criteria->setOrder('ASC');
$downloads_cat = $downloadscat_Handler->getall($criteria);
//Affichage du tableau
- if (count($downloads_cat)>0) {
+ if (count($downloads_cat) > 0) {
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr>';
echo '<th align="left" width="25%">' . _AM_TDMDOWNLOADS_FORMTITLE . '</th>';
@@ -46,67 +44,66 @@
echo '<th align="center" width="8%">' . _AM_TDMDOWNLOADS_FORMACTION . '</th>';
echo '</tr>';
$class = 'odd';
- include_once XOOPS_ROOT_PATH."/modules/TDMDownloads/class/tree.php";
- $mytree = new TDMObjectTree($downloads_cat, 'cat_cid', 'cat_pid');
- $category_ArrayTree = $mytree->makeArrayTree('cat_title','<img src="../images/deco/arrow.gif">');
+ include_once XOOPS_ROOT_PATH . "/modules/$mydirname/class/tree.php";
+ $mytree = new TDMObjectTree($downloads_cat, 'cat_cid', 'cat_pid');
+ $category_ArrayTree = $mytree->makeArrayTree('cat_title', '<img src="../assets/images/deco/arrow.gif">');
foreach (array_keys($category_ArrayTree) as $i) {
- echo '<tr class="'.$class.'">';
- echo '<td align="left" ><a href="' . XOOPS_URL . '/modules/TDMDownloads/viewcat.php?cid=' . $i . '">' . $category_ArrayTree[$i] . '</a></td>';
+ echo '<tr class="' . $class . '">';
+ echo '<td align="left" ><a href="' . XOOPS_URL . '/modules/'.$mydirname.'/viewcat.php?cid=' . $i . '">' . $category_ArrayTree[$i]
+ . '</a></td>';
echo '<td align="center">';
- echo '<img src="' . $uploadurl . $downloads_cat[$i]->getVar('cat_imgurl') . '" alt="" title="" height="60">';
+ echo '<img src="' . $uploadurl . $downloads_cat[$i]->getVar('cat_imgurl') . '" alt="" title="" style="max-height: 60px">';
echo '</td>';
echo '<td align="left">' . $downloads_cat[$i]->getVar('cat_description_main') . '</td>';
echo '<td align="center">' . $downloads_cat[$i]->getVar('cat_weight') . '</td>';
echo '<td align="center">';
- echo '<a href="category.php?op=edit_cat&downloadscat_cid=' . $i . '"><img src="../images/icon/edit.png" alt="'._AM_TDMDOWNLOADS_FORMEDIT.'" title="'._AM_TDMDOWNLOADS_FORMEDIT.'"></a> ';
- echo '<a href="category.php?op=del_cat&downloadscat_cid=' . $i . '"><img src="../images/icon/delete.png" alt="'._AM_TDMDOWNLOADS_FORMDEL.'" title="'._AM_TDMDOWNLOADS_FORMDEL.'"></a>';
+ echo '<a href="category.php?op=edit_cat&downloadscat_cid=' . $i . '"><img src="../assets/images/icon/edit.png" alt="'
+ . _AM_TDMDOWNLOADS_FORMEDIT . '" title="' . _AM_TDMDOWNLOADS_FORMEDIT . '"></a> ';
+ echo '<a href="category.php?op=del_cat&downloadscat_cid=' . $i . '"><img src="../assets/images/icon/delete.png" alt="'
+ . _AM_TDMDOWNLOADS_FORMDEL . '" title="' . _AM_TDMDOWNLOADS_FORMDEL . '"></a>';
echo '</td>';
echo '</tr>';
$class = ($class == 'even') ? 'odd' : 'even';
}
echo '</table>';
}
- break;
+ break;
// vue création
case "new_cat":
//Affichage de la partie haute de l'administration de Xoops
xoops_cp_header();
- if (TDMDownloads_checkModuleAdmin()){
$category_admin = new ModuleAdmin();
echo $category_admin->addNavigation('category.php');
$category_admin->addItemButton(_AM_TDMDOWNLOADS_CAT_LIST, 'category.php?op=list', 'list');
- echo $category_admin->renderButton();
- }
+ echo $category_admin->renderButton('left');
//Affichage du formulaire de création des catégories
- $obj =& $downloadscat_Handler->create();
+ $obj =& $downloadscat_Handler->create();
$form = $obj->getForm();
$form->display();
- break;
+ break;
// Pour éditer une catégorie
case "edit_cat":
//Affichage de la partie haute de l'administration de Xoops
xoops_cp_header();
- if (TDMDownloads_checkModuleAdmin()){
$category_admin = new ModuleAdmin();
echo $category_admin->addNavigation('category.php');
$category_admin->addItemButton(_AM_TDMDOWNLOADS_CAT_NEW, 'category.php?op=new_cat', 'add');
$category_admin->addItemButton(_AM_TDMDOWNLOADS_CAT_LIST, 'category.php?op=list', 'list');
- echo $category_admin->renderButton();
- }
+ echo $category_admin->renderButton('left');
//Affichage du formulaire de création des catégories
$downloadscat_cid = TDMDownloads_CleanVars($_REQUEST, 'downloadscat_cid', 0, 'int');
- $obj = $downloadscat_Handler->get($downloadscat_cid);
- $form = $obj->getForm();
+ $obj = $downloadscat_Handler->get($downloadscat_cid);
+ $form = $obj->getForm();
$form->display();
- break;
+ break;
// Pour supprimer une catégorie
case "del_cat":
global $xoopsModule;
$downloadscat_cid = TDMDownloads_CleanVars($_REQUEST, 'downloadscat_cid', 0, 'int');
- $obj =& $downloadscat_Handler->get($downloadscat_cid);
+ $obj =& $downloadscat_Handler->get($downloadscat_cid);
if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('category.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
@@ -122,7 +119,7 @@
$downloads_votedata = $downloadsvotedata_Handler->getall($criteria_1);
foreach (array_keys($downloads_votedata) as $j) {
$objvotedata =& $downloadsvotedata_Handler->get($downloads_votedata[$j]->getVar('ratingid'));
- $downloadsvotedata_Handler->delete($objvotedata) or $objvotedata->getHtmlErrors();
+ $downloadsvotedata_Handler->delete($objvotedata) || $objvotedata->getHtmlErrors();
}
// supression des rapports de fichier brisé
$criteria_2 = new CriteriaCompo();
@@ -130,112 +127,117 @@
$downloads_broken = $downloadsbroken_Handler->getall($criteria_2);
foreach (array_keys($downloads_broken) as $j) {
$objbroken =& $downloadsbroken_Handler->get($downloads_broken[$j]->getVar('reportid'));
- $downloadsbroken_Handler->delete($objbroken ) or $objbroken ->getHtmlErrors();
+ $downloadsbroken_Handler->delete($objbroken) || $objbroken->getHtmlErrors();
}
// supression des data des champs sup.
$criteria_3 = new CriteriaCompo();
$criteria_3->add(new Criteria('lid', $downloads_arr[$i]->getVar('lid')));
$downloads_fielddata = $downloadsfielddata_Handler->getall($criteria_3);
- if ($downloadsfielddata_Handler->getCount( $criteria_3 ) > 0){
+ if ($downloadsfielddata_Handler->getCount($criteria_3) > 0) {
foreach (array_keys($downloads_fielddata) as $j) {
$objfielddata =& $downloadsfielddata_Handler->get($downloads_fielddata[$j]->getVar('iddata'));
- $downloadsfielddata_Handler->delete($objfielddata) or $objvfielddata->getHtmlErrors();
+ $downloadsfielddata_Handler->delete($objfielddata) || $objvfielddata->getHtmlErrors();
}
}
// supression des commentaires
- if ($downloads_arr[$i]->getVar('comments') > 0){
+ if ($downloads_arr[$i]->getVar('comments') > 0) {
xoops_comment_delete($xoopsModule->getVar('mid'), $downloads_arr[$i]->getVar('lid'));
}
//supression des tags
- if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../../tag'))){
+ if (($xoopsModuleConfig['usetag'] == 1) and (is_dir(dirname(dirname(__DIR__)) . '/tag'))) {
$tag_handler = xoops_getmodulehandler('link', 'tag');
- $criteria = new CriteriaCompo();
+ $criteria = new CriteriaCompo();
$criteria->add(new Criteria('tag_itemid', $downloads_arr[$i]->getVar('lid')));
- $downloads_tags = $tag_handler->getall( $criteria );
- if (count($downloads_tags) > 0){
+ $downloads_tags = $tag_handler->getall($criteria);
+ if (count($downloads_tags) > 0) {
foreach (array_keys($downloads_tags) as $j) {
$objtags =& $tag_handler->get($downloads_tags[$j]->getVar('tl_id'));
- $tag_handler->delete($objtags) or $objtags->getHtmlErrors();
+ $tag_handler->delete($objtags) || $objtags->getHtmlErrors();
}
}
}
// supression du fichier
// pour extraire le nom du fichier
- $urlfile = substr_replace($downloads_arr[$i]->getVar('url'),'',0,strlen($uploadurl_downloads));
+ $urlfile = substr_replace($downloads_arr[$i]->getVar('url'), '', 0, strlen($uploadurl_downloads));
// chemin du fichier
$urlfile = $uploaddir_downloads . $urlfile;
- if (is_file($urlfile)){
+ if (is_file($urlfile)) {
chmod($urlfile, 0777);
unlink($urlfile);
}
// supression du téléchargment
$objdownloads =& $downloads_Handler->get($downloads_arr[$i]->getVar('lid'));
- $downloads_Handler->delete($objdownloads) or $objdownloads->getHtmlErrors();
+ $downloads_Handler->delete($objdownloads) || $objdownloads->getHtmlErrors();
}
// supression des sous catégories avec leurs téléchargements
- $downloadscat_arr = $downloadscat_Handler->getall();
- $mytree = new XoopsObjectTree($downloadscat_arr, 'cat_cid', 'cat_pid');
- $downloads_childcat=$mytree->getAllChild($downloadscat_cid);
+ $downloadscat_arr = $downloadscat_Handler->getall();
+ $mytree = new XoopsObjectTree($downloadscat_arr, 'cat_cid', 'cat_pid');
+ $downloads_childcat = $mytree->getAllChild($downloadscat_cid);
foreach (array_keys($downloads_childcat) as $i) {
// supression de la catégorie
$objchild =& $downloadscat_Handler->get($downloads_childcat[$i]->getVar('cat_cid'));
- $downloadscat_Handler->delete($objchild) or $objchild->getHtmlErrors();
+ $downloadscat_Handler->delete($objchild) || $objchild->getHtmlErrors();
// supression des téléchargements associés
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('cid', $downloads_childcat[$i]->getVar('cat_cid')));
- $downloads_arr = $downloads_Handler->getall( $criteria );
- foreach (array_keys($downloads_arr) as $i) {
+ $downloads_arr = $downloads_Handler->getall($criteria);
+ foreach (array_keys($downloads_arr) as $j) {
// supression des votes
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('lid', $downloads_arr[$i]->getVar('lid')));
- $downloads_votedata = $downloadsvotedata_Handler->getall( $criteria );
- foreach (array_keys($downloads_votedata) as $j) {
- $objvotedata =& $downloadsvotedata_Handler->get($downloads_votedata[$j]->getVar('ratingid'));
- $downloadsvotedata_Handler->delete($objvotedata) or $objvotedata->getHtmlErrors();
+ $criteria->add(new Criteria('lid', $downloads_arr[$j]->getVar('lid')));
+ $downloads_votedata = $downloadsvotedata_Handler->getall($criteria);
+ foreach (array_keys($downloads_votedata) as $k) {
+ $objvotedata =& $downloadsvotedata_Handler->get($downloads_votedata[$k]->getVar('ratingid'));
+ $downloadsvotedata_Handler->delete($objvotedata) || $objvotedata->getHtmlErrors();
}
// supression des rapports de fichier brisé
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('lid', $downloads_arr[$i]->getVar('lid')));
- $downloads_broken = $downloadsbroken_Handler->getall( $criteria );
- foreach (array_keys($downloads_broken) as $j) {
- $objbroken =& $downloadsbroken_Handler->get($downloads_broken[$j]->getVar('reportid'));
- $downloadsbroken_Handler->delete($objbroken ) or $objbroken ->getHtmlErrors();
+ $criteria->add(new Criteria('lid', $downloads_arr[$j]->getVar('lid')));
+ $downloads_broken = $downloadsbroken_Handler->getall($criteria);
+ foreach (array_keys($downloads_broken) as $k) {
+ $objbroken =& $downloadsbroken_Handler->get($downloads_broken[$k]->getVar('reportid'));
+ $downloadsbroken_Handler->delete($objbroken) || $objbroken->getHtmlErrors();
}
// supression des data des champs sup.
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('lid', $downloads_arr[$i]->getVar('lid')));
- $downloads_fielddata = $downloadsfielddata_Handler->getall( $criteria );
- foreach (array_keys($downloads_fielddata) as $j) {
- $objfielddata =& $downloadsfielddata_Handler->get($downloads_fielddata[$j]->getVar('iddata'));
- $downloadsfielddata_Handler->delete($objfielddata) or $objvfielddata->getHtmlErrors();
+ $criteria->add(new Criteria('lid', $downloads_arr[$j]->getVar('lid')));
+ $downloads_fielddata = $downloadsfielddata_Handler->getall($criteria);
+ foreach (array_keys($downloads_fielddata) as $k) {
+ $objfielddata =& $downloadsfielddata_Handler->get($downloads_fielddata[$k]->getVar('iddata'));
+ $downloadsfielddata_Handler->delete($objfielddata) || $objvfielddata->getHtmlErrors();
}
// supression des commentaires
- if ($downloads_arr[$i]->getVar('comments') > 0){
- xoops_comment_delete($xoopsModule->getVar('mid'), $downloads_arr[$i]->getVar('lid'));
+ if ($downloads_arr[$j]->getVar('comments') > 0) {
+ xoops_comment_delete($xoopsModule->getVar('mid'), $downloads_arr[$j]->getVar('lid'));
}
//supression des tags
- if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../../tag'))){
+ if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../../tag'))) {
$tag_handler = xoops_getmodulehandler('link', 'tag');
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('tag_itemid', $downloads_arr[$i]->getVar('lid')));
- $downloads_tags = $tag_handler->getall( $criteria );
- ...
[truncated message content] |
|
From: <be...@us...> - 2014-09-03 07:30:07
|
Revision: 12772
http://sourceforge.net/p/xoops/svn/12772
Author: beckmi
Date: 2014-09-03 07:30:04 +0000 (Wed, 03 Sep 2014)
Log Message:
-----------
deleting TCPDF library from /Frameworks
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/Frameworks/tcpdf/
|
|
From: <be...@us...> - 2014-09-03 05:11:08
|
Revision: 12771
http://sourceforge.net/p/xoops/svn/12771
Author: beckmi
Date: 2014-09-03 05:11:04 +0000 (Wed, 03 Sep 2014)
Log Message:
-----------
adding TDMDownloads
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/tdmdownloads/
|
8 messages has been excluded from this view by a project administrator.
