Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2014-04-25 11:53:51
|
Revision: 12479
http://sourceforge.net/p/xoops/svn/12479
Author: beckmi
Date: 2014-04-25 11:53:39 +0000 (Fri, 25 Apr 2014)
Log Message:
-----------
XOOPS 2.5.7 Module Pack update (work in progress): Publisher
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/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.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/blockform.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/request.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/class/uploader.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/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/credits.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/footer.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/comment_functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/constants.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/plugin.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo.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/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/blocks.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/common.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/help/help.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/list.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.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/sql/mysql.sql
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/submit.php
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
Added Paths:
-----------
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/xnews.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-bg_flat_0_aaaaaa_40x100.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-bg_flat_75_ffffff_40x100.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-bg_glass_55_fbf9ee_1x400.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-bg_glass_65_ffffff_1x400.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-bg_glass_75_dadada_1x400.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-bg_glass_75_e6e6e6_1x400.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-bg_glass_95_fef1ec_1x400.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-icons_222222_256x240.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-icons_2e83ff_256x240.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-icons_454545_256x240.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-icons_888888_256x240.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/images/ui-icons_cd0a0a_256x240.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/jquery-ui-1.7.1.custom.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/jquery.popeye.style.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/publisher.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/VeraBd.ttf
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/arrow-bg.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/bg.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/blank.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/bullet.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/button_delete.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/button_edit.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/dot-grey.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/count-2.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/enlarge-1.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/enlarge-2.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/loading.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/next-1.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/next-2.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/next.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/prev-1.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/prev-2.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/gfx/prev.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/grad-bg.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/approve.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/cat.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/clone.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/close12.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/delete.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/delete.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/doc.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/edit.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/edit.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/editcopy.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/file.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/friend.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/newanswer.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/open12.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/pdf.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/print.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon/subcat.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon32/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon32/editcopy.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon32/folder_txt.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/icon32/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/important-32.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/item_icon.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/left_both.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/approve.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/cat.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/clone.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/close12.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/delete.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/delete.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/doc.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/edit.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/edit.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/editcopy.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/file.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/friend.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/newanswer.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/next.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/open12.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/pdf.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/previous.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/print.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/links/subcat.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/loadingbar.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/module_logo.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/no.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/off.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/on.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/bg1.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/compact3.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/enlarge3.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/loading3.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/next3.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/prev3.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/right_both.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/rss.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/span-bg.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/starrating.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/transparent_bg.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/working.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/ajaxupload.3.9.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/behavior.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/cookies.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/funcs.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/jquery.easing.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/jquery.popeye-2.0.4.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/publisher.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/rating.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/script.easing.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/ui.core.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/ui.tabs.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/highlighter.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/ajaxrating.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/license.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/install.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/update.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/CHANGELOG.TXT
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/LICENSE.TXT
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/README.TXT
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg1027.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg1329.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg16CC.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg19DC.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg1E2.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg1E7E.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg1FA3.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg27AF.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg2813.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg2960.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg2F8D.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg334F.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg34E2.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg37E8.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg3834.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg3C29.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg42B4.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg4647.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg466D.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg4703.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg4B7C.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg4CD8.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg5276.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg561F.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg596B.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg5A31.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg5B93.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg5CD9.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg5DDA.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg604C.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg643F.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg65E0.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg678E.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg698E.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg6DE5.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg6EFC.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg7211.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg736F.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg73D8.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg7620.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg7786.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg7B4E.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg7CB6.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg7D12.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg7F74.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg8093.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg8252.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg85AC.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg8743.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg8813.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg8B19.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg8CFE.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg8EA8.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg8F5E.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg907D.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg90F5.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg9355.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg94FC.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg971E.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg972.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg9809.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg99D1.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg99FC.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg9C2F.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg9E17.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpg9FF9.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgA14D.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgA360.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgA370.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgA622.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgA999.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgAADF.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgADB1.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgB270.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgB30A.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgB3FB.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgB58F.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgB79D.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgB7C9.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgB91C.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgB986.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgBA9B.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgBD49.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgBEBC.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgC102.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgC125.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgC1FC.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgC97B.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgCD72.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgD284.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgD2B1.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgD679.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgDCD1.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgDEB4.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgE35A.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgE451.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgE605.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgE9C6.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgEDB4.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgEE31.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgF407.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgF43A.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgF59E.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/cache/jpgF6CA.tmp
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/config/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/config/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/ar.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/de.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/en.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/fa.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/fr.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/nl.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/config/tcpdf_config.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/fonts/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/fonts/almohanad.ctg.z
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/fonts/almohanad.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/fonts/almohanad.z
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/fonts/dejavusans.ctg.z
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/fonts/dejavusans.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/fonts/dejavusans.z
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/fonts/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/htmlcolors.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/images/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/tcpdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/unicode_data.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_category_items_sel.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_date_to_date.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_columns.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_menu.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_new.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_random_item.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_recent.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_spot.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_files.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_search_block.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_archive.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_author_items.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_categories_table.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_list.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_wfsection.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_footer.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_header.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_item.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_print.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_rss.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_search.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_singleitem.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_singleitem_block.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_submit.tpl
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/ajaxrating.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/registry.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/licence.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/js/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/french/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_category_items_sel.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_date_to_date.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_columns.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_menu.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_new.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_random_item.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_recent.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_spot.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_files.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_search_block.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_archive.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_author_items.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_categories_table.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_list.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_wfsection.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_footer.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_header.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_item.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_print.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_rss.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_search.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_singleitem.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_singleitem_block.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_submit.html
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php 2014-04-25 11:47:42 UTC (rev 12478)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php 2014-04-25 11:53:39 UTC (rev 12479)
@@ -1,32 +1,32 @@
-<?php
-/*
- 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.
-*/
-
-/**
- * Publisher
- *
- * @copyright The XOOPS Project (http://www.xoops.org)
- * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @package Publisher
- * @since 1.0
- * @author XOOPS Development Team
- * @version $Id: about.php 337 2011-12-06 20:08:50Z lus...@gm... $
- */
-
-include_once dirname(__FILE__) . '/admin_header.php';
-
-xoops_cp_header();
-
-$aboutAdmin = new ModuleAdmin();
-
-echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
-
-xoops_cp_footer();
\ No newline at end of file
+<?php
+/*
+ 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.
+*/
+
+/**
+ * Publisher
+ *
+ * @copyright The XOOPS Project (http://www.xoops.org)
+ * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
+ * @package Publisher
+ * @since 1.0
+ * @author Mage, Mamba
+ * @version $Id: about.php 10374 2012-12-12 23:39:48Z trabis $
+ */
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
+
+xoops_cp_footer();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php 2014-04-25 11:47:42 UTC (rev 12478)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php 2014-04-25 11:53:39 UTC (rev 12479)
@@ -1,46 +1,46 @@
-<?php
-/*
- 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 The XUUPS Project http://sourceforge.net/projects/xuups/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package Publisher
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @author The SmartFactory <www.smartfactory.ca>
- * @version $Id: admin_header.php 337 2011-12-06 20:08:50Z lus...@gm... $
- */
-
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
-
-//xoops_loadLanguage('admin', PUBLISHER_DIRNAME);
-xoops_loadLanguage('modinfo', PUBLISHER_DIRNAME);
-
-$imagearray = array(
- 'editimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_edit.png' alt='" . _AM_PUBLISHER_ICO_EDIT . "' align='middle' />",
- 'deleteimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_delete.png' alt='" . _AM_PUBLISHER_ICO_DELETE . "' align='middle' />",
- 'online' => "<img src='" . PUBLISHER_IMAGES_URL . "/on.png' alt='" . _AM_PUBLISHER_ICO_ONLINE . "' align='middle' />",
- 'offline' => "<img src='" . PUBLISHER_IMAGES_URL . "/off.png' alt='" . _AM_PUBLISHER_ICO_OFFLINE . "' align='middle' />",
-);
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
-}else{
- echo xoops_error('/Frameworks/moduleclasses/moduleadmin/ is required!!!');
-}
-/*
-$myts =& MyTextSanitizer::getInstance();
-
-if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH."/class/template.php");
- $xoopsTpl = new XoopsTpl();
-} */
\ No newline at end of file
+<?php
+/*
+ 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 The XUUPS Project http://sourceforge.net/projects/xuups/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package Publisher
+ * @since 1.0
+ * @author trabis <lus...@gm...>
+ * @author The SmartFactory <www.smartfactory.ca>
+ * @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 XOOPS_ROOT_PATH . '/include/cp_header.php';
+
+//xoops_loadLanguage('admin', PUBLISHER_DIRNAME);
+xoops_loadLanguage('modinfo', PUBLISHER_DIRNAME);
+
+$imagearray = array(
+ 'editimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_edit.png' alt='" . _AM_PUBLISHER_ICO_EDIT . "' align='middle' />",
+ 'deleteimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_delete.png' alt='" . _AM_PUBLISHER_ICO_DELETE . "' align='middle' />",
+ 'online' => "<img src='" . PUBLISHER_IMAGES_URL . "/on.png' alt='" . _AM_PUBLISHER_ICO_ONLINE . "' align='middle' />",
+ 'offline' => "<img src='" . PUBLISHER_IMAGES_URL . "/off.png' alt='" . _AM_PUBLISHER_ICO_OFFLINE . "' align='middle' />",
+);
+if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))) {
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+} else {
+ echo xoops_error('/Frameworks/moduleclasses/moduleadmin/ is required!!!');
+}
+/*
+$myts = MyTextSanitizer::getInstance();
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+} */
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-04-25 11:47:42 UTC (rev 12478)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-04-25 11:53:39 UTC (rev 12479)
@@ -1,430 +1,410 @@
-<?php
-/*
- 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 The XUUPS Project http://sourceforge.net/projects/xuups/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package Publisher
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @author The SmartFactory <www.smartfactory.ca>
- * @version $Id: category.php 339 2011-12-07 00:09:26Z lus...@gm... $
- */
-
-include_once dirname(__FILE__) . '/admin_header.php';
-
-$op = PublisherRequest::getString('op');
-
-$op = isset($_POST['editor']) ? 'mod' : $op;
-if (isset($_POST['addcategory'])) {
- $op = 'addcategory';
-}
-
-// Where do we start ?
-$startcategory = PublisherRequest::getInt('startcategory');
-$categoryid = PublisherRequest::getInt('categoryid');
-
-switch ($op) {
-
- case "del":
- $categoryObj = $publisher->getHandler('category')->get($categoryid);
- $confirm = (isset($_POST['confirm'])) ? $_POST['confirm'] : 0;
- $name = (isset($_POST['name'])) ? $_POST['name'] : '';
- if ($confirm) {
- if (!$publisher->getHandler('category')->delete($categoryObj)) {
- redirect_header("category.php", 1, _AM_PUBLISHER_DELETE_CAT_ERROR);
- exit();
- }
- redirect_header("category.php", 1, sprintf(_AM_PUBLISHER_COLISDELETED, $name));
- exit();
- } else {
- xoops_cp_header();
- xoops_confirm(array('op' => 'del', 'categoryid' => $categoryObj->categoryid(), 'confirm' => 1, 'name' => $categoryObj->name()), 'category.php', _AM_PUBLISHER_DELETECOL . " '" . $categoryObj->name() . "'. <br /> <br />" . _AM_PUBLISHER_DELETE_CAT_CONFIRM, _AM_PUBLISHER_DELETE);
- xoops_cp_footer();
- }
- break;
-
- case "mod":
- //Added by fx2024
- $nb_subcats = isset($_POST['nb_subcats']) ? intval($_POST['nb_subcats']) : 0;
- $nb_subcats = $nb_subcats + (isset($_POST['nb_sub_yet']) ? intval($_POST['nb_sub_yet']) : 4);
- //end of fx2024 code
-
- publisher_cpHeader();
- publisher_editCat(true, $categoryid, $nb_subcats);
- break;
-
- case "addcategory":
- global $modify;
-
- $parentid = PublisherRequest::getInt('parentid');
-
- if ($categoryid != 0) {
- $categoryObj = $publisher->getHandler('category')->get($categoryid);
- } else {
- $categoryObj = $publisher->getHandler('category')->create();
- }
-
- // Uploading the image, if any
- // Retreive the filename to be uploaded
- if (isset($_FILES['image_file']['name']) && $_FILES['image_file']['name'] != "") {
- $filename = $_POST["xoops_upload_file"][0];
- if (!empty($filename) || $filename != "") {
- // TODO : implement publisher mimetype management
- $max_size = $publisher->getConfig('maximum_filesize');
- $max_imgwidth = $publisher->getConfig('maximum_image_width');
- $max_imgheight = $publisher->getConfig('maximum_image_height');
- $allowed_mimetypes = publisher_getAllowedImagesTypes();
-
- if ($_FILES[$filename]['tmp_name'] == "" || !is_readable($_FILES[$filename]['tmp_name'])) {
- redirect_header('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR);
- exit();
- }
-
- xoops_load('XoopsMediaUploader');
- $uploader = new XoopsMediaUploader(publisher_getImageDir('category'), $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
- if ($uploader->fetchMedia($filename) && $uploader->upload()) {
- $categoryObj->setVar('image', $uploader->getSavedFileName());
- } else {
- redirect_header('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR . $uploader->getErrors());
- exit();
- }
- }
- } else {
- if (isset($_POST['image'])) {
- $categoryObj->setVar('image', $_POST['image']);
- }
- }
- $categoryObj->setVar('parentid', (isset($_POST['parentid'])) ? intval($_POST['parentid']) : 0);
-
- $applyall = isset($_POST['applyall']) ? intval($_POST['applyall']) : 0;
- $categoryObj->setVar('weight', isset($_POST['weight']) ? intval($_POST['weight']) : 1);
-
- // Groups and permissions
- if (isset($_POST['groups_read'])) {
- $categoryObj->setGroups_read($_POST['groups_read']);
- } else {
- $categoryObj->setGroups_read();
- }
- $grpread = isset($_POST['groups_read']) ? $_POST['groups_read'] : array();
-
- if (isset($_POST['groups_submit'])) {
- $categoryObj->setGroups_submit($_POST['groups_submit']);
- } else {
- $categoryObj->setGroups_submit();
- }
- $grpsubmit = isset($_POST['groups_submit']) ? $_POST['groups_submit'] : array();
-
- $categoryObj->setVar('name', $_POST['name']);
-
- //Added by skalpa: custom template support
- if (isset($_POST['template'])) {
- $categoryObj->setVar('template', $_POST['template']);
- }
-
- if (isset($_POST['meta_description'])) {
- $categoryObj->setVar('meta_description', $_POST['meta_description']);
- }
- if (isset($_POST['meta_keywords'])) {
- $categoryObj->setVar('meta_keywords', $_POST['meta_keywords']);
- }
- if (isset($_POST['short_url'])) {
- $categoryObj->setVar('short_url', $_POST['short_url']);
- }
- $categoryObj->setVar('moderator', intval($_POST['moderator']));
- $categoryObj->setVar('description', $_POST['description']);
-
- if (isset($_POST['header'])) {
- $categoryObj->setVar('header', $_POST['header']);
- }
-
- if ($categoryObj->isNew()) {
- $redirect_msg = _AM_PUBLISHER_CATCREATED;
- $redirect_to = 'category.php?op=mod';
- } else {
- $redirect_msg = _AM_PUBLISHER_COLMODIFIED;
- $redirect_to = 'category.php';
- }
-
- if (!$categoryObj->store()) {
- redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . publisher_formatErrors($categoryObj->getErrors()));
- exit;
- }
- // TODO : put this function in the category class
- publisher_saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
- publisher_saveCategoryPermissions($categoryObj->getGroups_submit(), $categoryObj->categoryid(), 'item_submit');
- //publisher_saveCategory_Permissions($groups_admin, $categoriesObj->categoryid(), 'category_admin');
- if ($applyall) {
- // TODO : put this function in the category class
- publisher_overrideItemsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
- }
- //Added by fx2024
- $parentCat = $categoryObj->categoryid();
- $sizeof = sizeof($_POST['scname']);
- for ($i = 0; $i < $sizeof; $i++) {
- if ($_POST['scname'][$i] != '') {
- $categoryObj = $publisher->getHandler('category')->create();
- $categoryObj->setVar('name', $_POST['scname'][$i]);
- $categoryObj->setVar('parentid', $parentCat);
- $categoryObj->setGroups_read($grpread);
- $categoryObj->setGroups_submit($grpsubmit);
-
- if (!$categoryObj->store()) {
- redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . publisher_formatErrors($categoryObj->getErrors()));
- exit;
- }
- // TODO : put this function in the category class
- publisher_saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
- publisher_saveCategoryPermissions($categoryObj->getGroups_submit(), $categoryObj->categoryid(), 'item_submit');
- //publisher_saveCategory_Permissions($groups_admin, $categoriesObj->categoryid(), 'category_admin');
- if ($applyall) {
- // TODO : put this function in the category class
- publisher_overrideItemsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
- }
- }
- }
- //end of fx2024 code
- redirect_header($redirect_to, 2, $redirect_msg);
- exit();
- break;
-
- //Added by fx2024
-
- case "addsubcats":
- $categoryid = 0;
- $nb_subcats = intval($_POST['nb_subcats']) + $_POST['nb_sub_yet'];
-
- $categoryObj = $publisher->getHandler('category')->create();
- $categoryObj->setVar('name', $_POST['name']);
- $categoryObj->setVar('description', $_POST['description']);
- $categoryObj->setVar('weight', $_POST['weight']);
- $categoryObj->setGroups_read(isset($_POST['groups_read']) ? $_POST['groups_read'] : array());
- if (isset($parentCat)) {
- $categoryObj->setVar('parentid', $parentCat);
- }
-
- publisher_cpHeader();
- publisher_editCat(true, $categoryid, $nb_subcats, $categoryObj);
- exit();
-
- break;
- //end of fx2024 code
-
- case "cancel":
- redirect_header("category.php", 1, sprintf(_AM_PUBLISHER_BACK2IDX, ''));
- exit();
-
- case "default":
- default:
- publisher_cpHeader();
- //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES);
-
- echo "<br />\n";...
[truncated message content] |
|
From: <be...@us...> - 2014-06-22 01:36:56
|
Revision: 12626
http://sourceforge.net/p/xoops/svn/12626
Author: beckmi
Date: 2014-06-22 01:36:49 +0000 (Sun, 22 Jun 2014)
Log Message:
-----------
- updated to XOOPS 2.5.7 version of jQuery UI Tabs (noo-b/mamba)
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/funcs.js
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/class/blockform.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/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/install.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/footer.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/plugin.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo_functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/submit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_spot.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_list.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_wfsection.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_header.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_item.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/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tests/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tests/index.html
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/jquery-ui-1.7.1.custom.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/ui.core.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/ui.tabs.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tcpdf/
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-06-21 18:15:34 UTC (rev 12625)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-06-22 01:36:49 UTC (rev 12626)
@@ -177,12 +177,12 @@
publisher_openCollapsableBar('amsimportgo', 'amsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
$module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('ams');
- $ams_module_id = $moduleObj->getVar('mid');
+ $moduleObj = $module_handler->getByDirname('ams');
+ $ams_module_id = $moduleObj->getVar('mid');
$gperm_handler = xoops_gethandler('groupperm');
- $cnt_imported_cat = 0;
+ $cnt_imported_cat = 0;
$cnt_imported_articles = 0;
$parentId = $_POST['parent_category'];
@@ -197,13 +197,13 @@
$imgcat_handler =& xoops_gethandler('imagecategory');
// $criteria = new criteriaCombo;
- //\xA0get\xA0the\xA0total\xA0number\xA0of\xA0subcats\xA0for\xA0this\xA0category
-// \xA0\xA0\xA0\xA0$criteria\xA0=\xA0new\xA0CriteriaCompo();
-// \xA0\xA0\xA0\xA0$criteria->add(new\xA0Criteria('imagecategory',\xA0$catObj->getVar('cid'),\xA0'='));
-// \xA0\xA0\xA0\xA0$childCount\xA0=\xA0intval($mylinksCatHandler->getCount($criteria));
+// get the total number of subcats for this category
+// $criteria = new CriteriaCompo();
+// $criteria->add(new Criteria('imagecategory', $catObj->getVar('cid'), '='));
+// $childCount = intval($mylinksCatHandler->getCount($criteria));
-$criteria = new Criteria('imgcat_name', PUBLISHER_DIRNAME);
-$imageCategoryId = $imgcat_handler->getObjects($criteria);
+ $criteria = new Criteria('imgcat_name', PUBLISHER_DIRNAME);
+ $imageCategoryId = $imgcat_handler->getObjects($criteria);
// $criteria = new CriteriaCompo();
// $criteria->add(new Criteria("imagecategory", PUBLISHER_DIRNAME, "="));
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-06-21 18:15:34 UTC (rev 12625)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-06-22 01:36:49 UTC (rev 12626)
@@ -217,10 +217,10 @@
$imgcat_handler =& xoops_gethandler('imagecategory');
// $criteria = new criteriaCombo;
- //\xA0get\xA0the\xA0total\xA0number\xA0of\xA0subcats\xA0for\xA0this\xA0category
-// \xA0\xA0\xA0\xA0$criteria\xA0=\xA0new\xA0CriteriaCompo();
-// \xA0\xA0\xA0\xA0$criteria->add(new\xA0Criteria('imagecategory',\xA0$catObj->getVar('cid'),\xA0'='));
-// \xA0\xA0\xA0\xA0$childCount\xA0=\xA0intval($mylinksCatHandler->getCount($criteria));
+// get the total number of subcats for this category
+// $criteria = new CriteriaCompo();
+// $criteria->add(new Criteria('imagecategory', $catObj->getVar('cid'), '='));
+// $childCount = intval($mylinksCatHandler->getCount($criteria));
$criteria = new Criteria('imgcat_name', PUBLISHER_DIRNAME);
$imageCategoryId = $imgcat_handler->getObjects($criteria);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php 2014-06-21 18:15:34 UTC (rev 12625)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php 2014-06-22 01:36:49 UTC (rev 12626)
@@ -19,7 +19,7 @@
* @version $Id: menu.php 10374 2012-12-12 23:39:48Z trabis $
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
$dirname = basename(dirname(dirname(__FILE__)));
$module_handler = xoops_gethandler('module');
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/jquery-ui-1.7.1.custom.css
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/jquery-ui-1.7.1.custom.css 2014-06-21 18:15:34 UTC (rev 12625)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/jquery-ui-1.7.1.custom.css 2014-06-22 01:36:49 UTC (rev 12626)
@@ -1,1574 +0,0 @@
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
- display: none;
-}
-
-.ui-helper-hidden-accessible {
- position: absolute;
- left: -99999999px;
-}
-
-.ui-helper-reset {
- margin: 0;
- padding: 0;
- border: 0;
- outline: 0;
- line-height: 1.3;
- text-decoration: none;
- font-size: 100%;
- list-style: none;
-}
-
-.ui-helper-clearfix:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
- visibility: hidden;
-}
-
-.ui-helper-clearfix {
- display: inline-block;
-}
-
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix {
- height: 1%;
-}
-
-.ui-helper-clearfix {
- display: block;
-}
-
-/* end clearfix */
-.ui-helper-zfix {
- width: 100%;
- height: 100%;
- top: 0;
- left: 0;
- position: absolute;
- opacity: 0;
- filter: Alpha(Opacity = 0);
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
- cursor: default !important;
-}
-
-/* Icons
-----------------------------------*/
-/* states and images */
-.ui-icon {
- display: block;
- text-indent: -99999px;
- overflow: hidden;
- background-repeat: no-repeat;
-}
-
-/* Misc visuals
-----------------------------------*/
-/* Overlays */
-.ui-widget-overlay {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
-}
-
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-*/
-/* Component containers
-----------------------------------*/
-.ui-widget {
- font-family: Verdana, Arial, sans-serif;
- font-size: 1.1em;
-}
-
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
- font-family: Verdana, Arial, sans-serif;
- font-size: 1em;
-}
-
-.ui-widget-content {
- border: 1px solid #aaaaaa;
- background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
- color: #222222;
-}
-
-.ui-widget-content a {
- color: #222222;
-}
-
-.ui-widget-header {
- border: 1px solid #aaaaaa;
- background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
- color: #222222;
- font-weight: bold;
-}
-
-.ui-widget-header a {
- color: #222222;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default {
- border: 1px solid #d3d3d3;
- background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
- font-weight: normal;
- color: #555555;
- outline: none;
-}
-
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited {
- color: #555555;
- text-decoration: none;
- outline: none;
-}
-
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus {
- border: 1px solid #999999;
- background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
- font-weight: normal;
- color: #212121;
- outline: none;
-}
-
-.ui-state-hover a, .ui-state-hover a:hover {
- color: #212121;
- text-decoration: none;
- outline: none;
-}
-
-.ui-state-active, .ui-widget-content .ui-state-active {
- border: 1px solid #aaaaaa;
- background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
- font-weight: normal;
- color: #212121;
- outline: none;
-}
-
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
- color: #212121;
- outline: none;
- text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {
- border: 1px solid #fcefa1;
- background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
- color: #363636;
-}
-
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a {
- color: #363636;
-}
-
-.ui-state-error, .ui-widget-content .ui-state-error {
- border: 1px solid #cd0a0a;
- background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
- color: #cd0a0a;
-}
-
-.ui-state-error a, .ui-widget-content .ui-state-error a {
- color: #cd0a0a;
-}
-
-.ui-state-error-text, .ui-widget-content .ui-state-error-text {
- color: #cd0a0a;
-}
-
-.ui-state-disabled, .ui-widget-content .ui-state-disabled {
- opacity: .35;
- filter: Alpha(Opacity = 35);
- background-image: none;
-}
-
-.ui-priority-primary, .ui-widget-content .ui-priority-primary {
- font-weight: bold;
-}
-
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary {
- opacity: .7;
- filter: Alpha(Opacity = 70);
- font-weight: normal;
-}
-
-/* Icons
-----------------------------------*/
-/* states and images */
-.ui-icon {
- width: 16px;
- height: 16px;
- background-image: url(images/ui-icons_222222_256x240.png);
-}
-
-.ui-widget-content .ui-icon {
- background-image: url(images/ui-icons_222222_256x240.png);
-}
-
-.ui-widget-header .ui-icon {
- background-image: url(images/ui-icons_222222_256x240.png);
-}
-
-.ui-state-default .ui-icon {
- background-image: url(images/ui-icons_888888_256x240.png);
-}
-
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {
- background-image: url(images/ui-icons_454545_256x240.png);
-}
-
-.ui-state-active .ui-icon {
- background-image: url(images/ui-icons_454545_256x240.png);
-}
-
-.ui-state-highlight .ui-icon {
- background-image: url(images/ui-icons_2e83ff_256x240.png);
-}
-
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {
- background-image: url(images/ui-icons_cd0a0a_256x240.png);
-}
-
-/* positioning */
-.ui-icon-carat-1-n {
- background-position: 0 0;
-}
-
-.ui-icon-carat-1-ne {
- background-position: -16px 0;
-}
-
-.ui-icon-carat-1-e {
- background-position: -32px 0;
-}
-
-.ui-icon-carat-1-se {
- background-position: -48px 0;
-}
-
-.ui-icon-carat-1-s {
- background-position: -64px 0;
-}
-
-.ui-icon-carat-1-sw {
- background-position: -80px 0;
-}
-
-.ui-icon-carat-1-w {
- background-position: -96px 0;
-}
-
-.ui-icon-carat-1-nw {
- background-position: -112px 0;
-}
-
-.ui-icon-carat-2-n-s {
- background-position: -128px 0;
-}
-
-.ui-icon-carat-2-e-w {
- background-position: -144px 0;
-}
-
-.ui-icon-triangle-1-n {
- background-position: 0 -16px;
-}
-
-.ui-icon-triangle-1-ne {
- background-position: -16px -16px;
-}
-
-.ui-icon-triangle-1-e {
- background-position: -32px -16px;
-}
-
-.ui-icon-triangle-1-se {
- background-position: -48px -16px;
-}
-
-.ui-icon-triangle-1-s {
- background-position: -64px -16px;
-}
-
-.ui-icon-triangle-1-sw {
- background-position: -80px -16px;
-}
-
-.ui-icon-triangle-1-w {
- background-position: -96px -16px;
-}
-
-.ui-icon-triangle-1-nw {
- background-position: -112px -16px;
-}
-
-.ui-icon-triangle-2-n-s {
- background-position: -128px -16px;
-}
-
-.ui-icon-triangle-2-e-w {
- background-position: -144px -16px;
-}
-
-.ui-icon-arrow-1-n {
- background-position: 0 -32px;
-}
-
-.ui-icon-arrow-1-ne {
- background-position: -16px -32px;
-}
-
-.ui-icon-arrow-1-e {
- background-position: -32px -32px;
-}
-
-.ui-icon-arrow-1-se {
- background-position: -48px -32px;
-}
-
-.ui-icon-arrow-1-s {
- background-position: -64px -32px;
-}
-
-.ui-icon-arrow-1-sw {
- background-position: -80px -32px;
-}
-
-.ui-icon-arrow-1-w {
- background-position: -96px -32px;
-}
-
-.ui-icon-arrow-1-nw {
- background-position: -112px -32px;
-}
-
-.ui-icon-arrow-2-n-s {
- background-position: -128px -32px;
-}
-
-.ui-icon-arrow-2-ne-sw {
- background-position: -144px -32px;
-}
-
-.ui-icon-arrow-2-e-w {
- background-position: -160px -32px;
-}
-
-.ui-icon-arrow-2-se-nw {
- background-position: -176px -32px;
-}
-
-.ui-icon-arrowstop-1-n {
- background-position: -192px -32px;
-}
-
-.ui-icon-arrowstop-1-e {
- background-position: -208px -32px;
-}
-
-.ui-icon-arrowstop-1-s {
- background-position: -224px -32px;
-}
-
-.ui-icon-arrowstop-1-w {
- background-position: -240px -32px;
-}
-
-.ui-icon-arrowthick-1-n {
- background-position: 0 -48px;
-}
-
-.ui-icon-arrowthick-1-ne {
- background-position: -16px -48px;
-}
-
-.ui-icon-arrowthick-1-e {
- background-position: -32px -48px;
-}
-
-.ui-icon-arrowthick-1-se {
- background-position: -48px -48px;
-}
-
-.ui-icon-arrowthick-1-s {
- background-position: -64px -48px;
-}
-
-.ui-icon-arrowthick-1-sw {
- background-position: -80px -48px;
-}
-
-.ui-icon-arrowthick-1-w {
- background-position: -96px -48px;
-}
-
-.ui-icon-arrowthick-1-nw {
- background-position: -112px -48px;
-}
-
-.ui-icon-arrowthick-2-n-s {
- background-position: -128px -48px;
-}
-
-.ui-icon-arrowthick-2-ne-sw {
- background-position: -144px -48px;
-}
-
-.ui-icon-arrowthick-2-e-w {
- background-position: -160px -48px;
-}
-
-.ui-icon-arrowthick-2-se-nw {
- background-position: -176px -48px;
-}
-
-.ui-icon-arrowthickstop-1-n {
- background-position: -192px -48px;
-}
-
-.ui-icon-arrowthickstop-1-e {
- background-position: -208px -48px;
-}
-
-.ui-icon-arrowthickstop-1-s {
- background-position: -224px -48px;
-}
-
-.ui-icon-arrowthickstop-1-w {
- background-position: -240px -48px;
-}
-
-.ui-icon-arrowreturnthick-1-w {
- background-position: 0 -64px;
-}
-
-.ui-icon-arrowreturnthick-1-n {
- background-position: -16px -64px;
-}
-
-.ui-icon-arrowreturnthick-1-e {
- background-position: -32px -64px;
-}
-
-.ui-icon-arrowreturnthick-1-s {
- background-position: -48px -64px;
-}
-
-.ui-icon-arrowreturn-1-w {
- background-position: -64px -64px;
-}
-
-.ui-icon-arrowreturn-1-n {
- background-position: -80px -64px;
-}
-
-.ui-icon-arrowreturn-1-e {
- background-position: -96px -64px;
-}
-
-.ui-icon-arrowreturn-1-s {
- background-position: -112px -64px;
-}
-
-.ui-icon-arrowrefresh-1-w {
- background-position: -128px -64px;
-}
-
-.ui-icon-arrowrefresh-1-n {
- background-position: -144px -64px;
-}
-
-.ui-icon-arrowrefresh-1-e {
- background-position: -160px -64px;
-}
-
-.ui-icon-arrowrefresh-1-s {
- background-position: -176px -64px;
-}
-
-.ui-icon-arrow-4 {
- background-position: 0 -80px;
-}
-
-.ui-icon-arrow-4-diag {
- background-position: -16px -80px;
-}
-
-.ui-icon-extlink {
- background-position: -32px -80px;
-}
-
-.ui-icon-newwin {
- background-position: -48px -80px;
-}
-
-.ui-icon-refresh {
- background-position: -64px -80px;
-}
-
-.ui-icon-shuffle {
- background-position: -80px -80px;
-}
-
-.ui-icon-transfer-e-w {
- background-position: -96px -80px;
-}
-
-.ui-icon-transferthick-e-w {
- background-position: -112px -80px;
-}
-
-.ui-icon-folder-collapsed {
- background-position: 0 -96px;
-}
-
-.ui-icon-folder-open {
- background-position: -16px -96px;
-}
-
-.ui-icon-document {
- background-position: -32px -96px;
-}
-
-.ui-icon-document-b {
- background-position: -48px -96px;
-}
-
-.ui-icon-note {
- background-position: -64px -96px;
-}
-
-.ui-icon-mail-closed {
- background-position: -80px -96px;
-}
-
-.ui-icon-mail-open {
- background-position: -96px -96px;
-}
-
-.ui-icon-suitcase {
- background-position: -112px -96px;
-}
-
-.ui-icon-comment {
- background-position: -128px -96px;
-}
-
-.ui-icon-person {
- background-position: -144px -96px;
-}
-
-.ui-icon-print {
- background-position: -160px -96px;
-}
-
-.ui-icon-trash {
- background-position: -176px -96px;
-}
-
-.ui-icon-locked {
- background-position: -192px -96px;
-}
-
-.ui-icon-unlocked {
- background-position: -208px -96px;
-}
-
-.ui-icon-bookmark {
- background-position: -224px -96px;
-}
-
-.ui-icon-tag {
- background-position: -240px -96px;
-}
-
-.ui-icon-home {
- background-position: 0 -112px;
-}
-
-.ui-icon-flag {
- background-position: -16px -112px;
-}
-
-.ui-icon-calendar {
- background-position: -32px -112px;
-}
-
-.ui-icon-cart {
- background-position: -48px -112px;
-}
-
-.ui-icon-pencil {
- background-position: -64px -112px;
-}
-
-.ui-icon-clock {
- background-position: -80px -112px;
-}
-
-.ui-icon-disk {
- background-position: -96px -112px;
-}
-
-.ui-icon-calculator {
- background-position: -112px -112px;
-}
-
-.ui-icon-zoomin {
- background-position: -128px -112px;
-}
-
-.ui-icon-zoomout {
- background-position: -144px -112px;
-}
-
-.ui-icon-search {
- background-position: -160px -112px;
-}
-
-.ui-icon-wrench {
- background-position: -176px -112px;
-}
-
-.ui-icon-gear {
- background-position: -192px -112px;
-}
-
-.ui-icon-heart {
- background-position: -208px -112px;
-}
-
-.ui-icon-star {
- background-position: -224px -112px;
-}
-
-.ui-icon-link {
- background-position: -240px -112px;
-}
-
-.ui-icon-cancel {
- background-position: 0 -128px;
-}
-
-.ui-icon-plus {
- background-position: -16px -128px;
-}
-
-.ui-icon-plusthick {
- background-position: -32px -128px;
-}
-
-.ui-icon-minus {
- background-position: -48px -128px;
-}
-
-.ui-icon-minusthick {
- background-position: -64px -128px;
-}
-
-.ui-icon-close {
- background-position: -80px -128px;
-}
-
-.ui-icon-closethick {
- background-position: -96px -128px;
-}
-
-.ui-icon-key {
- background-position: -112px -128px;
-}
-
-.ui-icon-lightbulb {
- background-position: -128px -128px;
-}
-
-.ui-icon-scissors {
- background-position: -144px -128px;
-}
-
-.ui-icon-clipboard {
- background-position: -160px -128px;
-}
-
-.ui-icon-copy {
- background-position: -176px -128px;
-}
-
-.ui-icon-contact {
- background-position: -192px -128px;
-}
-
-.ui-icon-image {
- background-position: -208px -128px;
-}
-
-.ui-icon-video {
- background-position: -224px -128px;
-}
-
-.ui-icon-script {
- background-position: -240px -128px;
-}
-
-.ui-icon-alert {
- background-position: 0 -144px;
-}
-
-.ui-icon-info {
- background-position: -16px -144px;
-}
-
-.ui-icon-notice {
- background-position: -32px -144px;
-}
-
-.ui-icon-help {
- background-position: -48px -144px;
-}
-
-.ui-icon-check {
- background-position: -64px -144px;
-}
-
-.ui-icon-bullet {
- background-position: -80px -144px;
-}
-
-.ui-icon-radio-off {
- background-position: -96px -144px;
-}
-
-.ui-icon-radio-on {
- background-position: -112px -144px;
-}
-
-.ui-icon-pin-w {
- background-position: -128px -144px;
-}
-
-.ui-icon-pin-s {
- background-position: -144px -144px;
-}
-
-.ui-icon-play {
- background-position: 0 -160px;
-}
-
-.ui-icon-pause {
- background-position: -16px -160px;
-}
-
-.ui-icon-seek-next {
- background-position: -32px -160px;
-}
-
-.ui-icon-seek-prev {
- background-position: -48px -160px;
-}
-
-.ui-icon-seek-end {
- background-position: -64px -160px;
-}
-
-.ui-icon-seek-first {
- background-position: -80px -160px;
-}
-
-.ui-icon-stop {
- background-position: -96px -160px;
-}
-
-.ui-icon-eject {
- background-position: -112px -160px;
-}
-
-.ui-icon-volume-off {
- background-position: -128px -160px;
-}
-
-.ui-icon-volume-on {
- background-position: -144px -160px;
-}
-
-.ui-icon-power {
- background-position: 0 -176px;
-}
-
-.ui-icon-signal-diag {
- background-position: -16px -176px;
-}
-
-.ui-icon-signal {
- background-position: -32px -176px;
-}
-
-.ui-icon-battery-0 {
- background-position: -48px -176px;
-}
-
-.ui-icon-battery-1 {
- background-position: -64px -176px;
-}
-
-.ui-icon-battery-2 {
- background-position: -80px -176px;
-}
-
-.ui-icon-battery-3 {
- background-position: -96px -176px;
-}
-
-.ui-icon-circle-plus {
- background-position: 0 -192px;
-}
-
-.ui-icon-circle-minus {
- background-position: -16px -192px;
-}
-
-.ui-icon-circle-close {
- background-position: -32px -192px;
-}
-
-.ui-icon-circle-triangle-e {
- background-position: -48px -192px;
-}
-
-.ui-icon-circle-triangle-s {
- background-position: -64px -192px;
-}
-
-.ui-icon-circle-triangle-w {
- background-position: -80px -192px;
-}
-
-.ui-icon-circle-triangle-n {
- background-position: -96px -192px;
-}
-
-.ui-icon-circle-arrow-e {
- background-position: -112px -192px;
-}
-
-.ui-icon-circle-arrow-s {
- background-position: -128px -192px;
-}
-
-.ui-icon-circle-arrow-w {
- background-position: -144px -192px;
-}
-
-.ui-icon-circle-arrow-n {
- background-position: -160px -192px;
-}
-
-.ui-icon-circle-zoomin {
- background-position: -176px -192px;
-}
-
-.ui-icon-circle-zoomout {
- background-position: -192px -192px;
-}
-
-.ui-icon-circle-check {
- background-position: -208px -192px;
-}
-
-.ui-icon-circlesmall-plus {
- background-position: 0 -208px;
-}
-
-.ui-icon-circlesmall-minus {
- background-position: -16px -208px;
-}
-
-.ui-icon-circlesmall-close {
- background-position: -32px -208px;
-}
-
-.ui-icon-squaresmall-plus {
- background-position: -48px -208px;
-}
-
-.ui-icon-squaresmall-minus {
- background-position: -64px -208px;
-}
-
-.ui-icon-squaresmall-close {
- background-position: -80px -208px;
-}
-
-.ui-icon-grip-dotted-vertical {
- background-position: 0 -224px;
-}
-
-.ui-icon-grip-dotted-horizontal {
- background-position: -16px -224px;
-}
-
-.ui-icon-grip-solid-vertical {
- background-position: -32px -224px;
-}
-
-.ui-icon-grip-solid-horizontal {
- background-position: -48px -224px;
-}
-
-.ui-icon-gripsmall-diagonal-se {
- background-position: -64px -224px;
-}
-
-.ui-icon-grip-diagonal-se {
- background-position: -80px -224px;
-}
-
-/* Misc visuals
-----------------------------------*/
-/* Corner radius */
-.ui-corner-tl {
- -moz-border-radius-topleft: 4px;
- -webkit-border-top-left-radius: 4px;
-}
-
-.ui-corner-tr {
- -moz-border-radius-topright: 4px;
- -webkit-border-top-right-radius: 4px;
-}
-
-.ui-corner-bl {
- -moz-border-radius-bottomleft: 4px;
- -webkit-border-bottom-left-radius: 4px;
-}
-
-.ui-corner-br {
- -moz-border-radius-bottomright: 4px;
- -webkit-border-bottom-right-radius: 4px;
-}
-
-.ui-corner-top {
- -moz-border-radius-topleft: 4px;
- -webkit-border-top-left-radius: 4px;
- -moz-border-radius-topright: 4px;
- -webkit-border-top-right-radius: 4px;
-}
-
-.ui-corner-bottom {
- -moz-border-radius-bottomleft: 4px;
- -webkit-border-bottom-left-radius: 4px;
- -moz-border-radius-bottomright: 4px;
- -webkit-border-bottom-right-radius: 4px;
-}
-
-.ui-corner-right {
- -moz-border-radius-topright: 4px;
- -webkit-border-top-right-radius: 4px;
- -moz-border-radius-bottomright: 4px;
- -webkit-border-bottom-right-radius: 4px;
-}
-
-.ui-corner-left {
- -moz-border-radius-topleft: 4px;
- -webkit-border-top-left-radius: 4px;
- -moz-border-radius-bottomleft: 4px;
- -webkit-border-bottom-left-radius: 4px;
-}
-
-.ui-corner-all {
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
- background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
- opacity: .30;
- filter: Alpha(Opacity = 30);
-}
-
-.ui-widget-shadow {
- margin: -8px 0 0 -8px;
- padding: 8px;
- background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
- opacity: .30;
- filter: Alpha(Opacity = 30);
- -moz-border-radius: 8px;
- -webkit-border-radius: 8px;
-}
-
-/* Accordion
-----------------------------------*/
-.ui-accordion .ui-accordion-header {
- cursor: pointer;
- position: relative;
- margin-top: 1px;
- zoom: 1;
-}
-
-.ui-accordion .ui-accordion-li-fix {
- display: inline;
-}
-
-.ui-accordion .ui-accordion-header-active {
- border-bottom: 0 !important;
-}
-
-.ui-accordion .ui-accordion-header a {
- display: block;
- font-size: 1em;
- padding: .5em .5em .5em 2.2em;
-}
-
-.ui-accordion .ui-accordion-header .ui-icon {
- position: absolute;
- left: .5em;
- top: 50%;
- margin-top: -8px;
-}
-
-.ui-accordion .ui-accordion-content {
- padding: 1em 2.2em;
- border-top: 0;
- margin-top: -2px;
- position: relative;
- top: 1px;
- margin-bottom: 2px;
- overflow: auto;
- display: none;
-}
-
-.ui-accordion .ui-accordion-content-active {
- display: block;
-}
-
-/* Datepicker
-----------------------------------*/
-.ui-datepicker {
- width: 17em;
- padding: .2em .2em 0;
-}
-
-.ui-datepicker .ui-datepicker-header {
- position: relative;
- padding: .2em 0;
-}
-
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
- position: absolute;
- top: 2px;
- width: 1.8em;
- height: 1.8em;
-}
-
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover {
- top: 1px;
-}
-
-.ui-datepicker .ui-datepicker-prev {
- left: 2px;
-}
-
-.ui-datepicker .ui-datepicker-next {
- right: 2px;
-}
-
-.ui-datepicker .ui-datepicker-prev-hover {
- left: 1px;
-}
-
-.ui-datepicker .ui-datepicker-next-hover {
- right: 1px;
-}
-
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span {
- display: block;
- position: absolute;
- left: 50%;
- margin-left: -8px;
- top: 50%;
- margin-top: -8px;
-}
-
-.ui-datepicker .ui-datepicker-title {
- margin: 0 2.3em;
- line-height: 1.8em;
- text-align: center;
-}
-
-.ui-datepicker .ui-datepicker-title select {
- float: left;
- font-size: 1em;
- margin: 1px 0;
-}
-
-.ui-datepicker select.ui-datepicker-month-year {
- width: 100%;
-}
-
-.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
- width: 49%;
-}
-
-.ui-datepicker .ui-datepicker-title select.ui-datepicker-year {
- float: right;
-}
-
-.ui-datepicker table {
- width: 100%;
- font-size: .9em;
- border-collapse: collapse;
- margin: 0 0 .4em;
-}
-
-.ui-datepicker th {
- padding: .7em .3em;
- text-align: center;
- font-weight: bold;
- border: 0;
-}
-
-.ui-datepicker td {
- border: 0;
- padding: 1px;
-}
-
-.ui-datepicker td span, .ui-datepicker td a {
- display: block;
- padding: .2em;
- text-align: right;
- text-decoration: none;
-}
-
-.ui-datepicker .ui-datepicker-buttonpane {
- background-image: none;
- margin: .7em 0 0 0;
- padding: 0 .2em;
- border-left: 0;
- border-right: 0;
- border-bottom: 0;
-}
-
-.ui-datepicker .ui-datepicker-buttonpane button {
- float: right;
- margin: .5em .2em .4em;
- cursor: pointer;
- padding: .2em .6em .3em .6em;
- width: auto;
- overflow: visible;
-}
-
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
- float: left;
-}
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi {
- width: auto;
-}
-
-.ui-datepicker-multi .ui-datepicker-group {
- float: left;
-}
-
-.ui-datepicker-multi .ui-datepicker-group table {
- width: 95%;
- margin: 0 auto .4em;
-}
-
-.ui-datepicker-multi-2 .ui-datepicker-group {
- width: 50%;
-}
-
-.ui-datepicker-multi-3 .ui-datepicker-group {
- width: 33.3%;
-}
-
-.ui-datepicker-multi-4 .ui-datepicker-group {
- width: 25%;
-}
-
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header {
- border-left-width: 0;
-}
-
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
- border-left-width: 0;
-}
-
-.ui-datepicker-multi .ui-datepicker-buttonpane {
- clear: left;
-}
-
-.ui-datepicker-row-break {
- clear: both;
- width: 100%;
-}
-
-/* RTL support */
-.ui-datepicker-rtl {
- direction: rtl;
-}
-
-.ui-datepicker-rtl .ui-datepicker-prev {
- right: 2px;
- left: auto;
-}
-
-.ui-datepicker-rtl .ui-datepicker-next {
- left: 2px;
- right: auto;
-}
-
-.ui-datepicker-rtl .ui-datepicker-prev:hover {
- right: 1px;
- left: auto;
-}
-
-.ui-datepicker-rtl .ui-datepicker-next:hover {
- left: 1px;
- right: auto;
-}
-
-.ui-datepicker-rtl .ui-datepicker-buttonpane {
- clear: right;
-}
-
-.ui-datepicker-rtl .ui-datepicker-buttonpane button {
- float: left;
-}
-
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current {
- float: right;
-}
-
-.ui-datepicker-rtl .ui-datepicker-group {
- float: right;
-}
-
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header {
- border-right-width: 0;
- border-left-width: 1px;
-}
-
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
- border-right-width: 0;
- border-left-width: 1px;
-}
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
- display: none; /*sorry for IE5*/
- display /**/: block; /*sorry for IE5*/
- position: absolute; /*must have*/
- z-index: -1; /*must have*/
- filter: mask(); /*must have*/
- top: -4px; /*must have*/
- left: -4px; /*must have*/
- width: 200px; /*must have*/
- height: 200px; /*must have*/
-}
-
-/* Dialog
-----------------------------------*/
-.ui-dialog {
- position: relative;
- padding: .2em;
- width: 300px;
-}
-
-.ui-dialog .ui-dialog-titlebar {
- padding: .5em .3em .3em 1em;
- position: relative;
-}
-
-.ui-dialog .ui-dialog-title {
- float: left;
- margin: .1em 0 .2em;
-}
-
-.ui-dialog .ui-dialog-titlebar-close {
- position: absolute;
- right: .3em;
- top: 50%;
- width: 19px;
- margin: -10px 0 0 0;
- padding: 1px;
- height: 18px;
-}
-
-.ui-dialog .ui-dialog-titlebar-close span {
- display: block;
- margin: 1px;
-}
-
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus {
- padding: 0;
-}
-
-.ui-dialog .ui-dialog-content {
- border: 0;
- padding: .5em 1em;
- background: none;
- overflow: auto;
- zoom: 1;
-}
-
-.ui-dialog .ui-dialog-buttonpane {
- text-align: left;
- border-width: 1px 0 0 0;
- background-image: none;
- margin: .5em 0 0 0;
- padding: .3em 1em .5em .4em;
-}
-
-.ui-dialog .ui-dialog-buttonpane button {
- float: right;
- margin: .5em .4em .5em 0;
- cursor: pointer;
- padding: .2em .6em .3em .6em;
- line-height: 1.4em;
- width: auto;
- overflow: visible;
-}
-
-.ui-dialog .ui-resizable-se {
- width: 14px;
- height: 14px;
- right: 3px;
- bottom: 3px;
-}
-
-.ui-draggable .ui-dialog-titlebar {
- cursor: move;
-}
-
-/* Progressbar
-----------------------------------*/
-.ui-progressbar {
- height: 2em;
- text-align: left;
-}
-
-.ui-progressbar .ui-progressbar-value {
- margin: -1px;
- height: 100%;
-}
-
-/* Resizable
-----------------------------------*/
-.ui-resizable {
- position: relative;
-}
-
-.ui-resizable-handle {
- position: absolute;
- font-size: 0.1px;
- z-index: 99999;
- display: block;
-}
-
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle {
- display: none;
-}
-
-.ui-resizable-n {
- cursor: n-resize;
- height: 7px;
- width: 100%;
- top: -5px;
- left: 0px;
-}
-
-.ui-resizable-s {
- cursor: s-resize;
- height: 7px;
- width: 100%;
- bottom: -5px;
- left: 0px;
-}
-
-.ui-resizable-e {
- cursor: e-resize;
- width: 7px;
- right: -5px;
- top: 0px;
- height: 100%;
-}
-
-.ui-resizable-w {
- cursor: w-resize;
- width: 7px;
- left: -5px;
- top: 0px;
- height: 100%;
-}
-
-.ui-resizable-se {
- cursor: se-resize;
- width: 12px;
- height: 12px;
- right: 1px;
- bottom: 1px;
-}
-
-.ui-resizable-sw {
- cursor: sw-resize;
- width: 9px;
- height: 9px;
- left: -5px;
- bottom: -5px;
-}
-
-.ui-resizable-nw {
- cursor: nw-resize;
- width: 9px;
- height: 9px;
- left: -5px;
- top: -5px;
-}
-
-.ui-resizable-ne {
- cursor: ne-resize;
- width: 9px;
- height: 9px;
- right: -5px;
- top: -5px;
-}
-
-/* Slider
-----------------------------------*/
-.ui-slider {
- position: relative;
- text-align: left;
-}
-
-.ui-slider .ui-slider-handle {
- position: absolute;
- z-index: 2;
- width: 1.2em;
- height: 1.2em;
- cursor: default;
-}
-
-.ui-slider .ui-slider-range {
- position: absolute;
- z-index: 1;
- font-size: .7em;
- display: block;
- border: 0;
-}
-
-.ui-slider-horizontal {
- height: .8em;
-}
-
-.ui-slider-horizontal .ui-slider-handle {
- top: -.3em;
- margin-left: -.6em;
-}
-
-.ui-slider-horizontal .ui-slider-range {
- top: 0;
- height: 100%;
-}
-
-.ui-slider-horizontal .ui-slider-range-min {
- left: 0;
-}
-
-.ui-slider-horizontal .ui-slider-range-max {
- right: 0;
-}
-
-.ui-slider-vertical {
- width: .8em;
- height: 100px;
-}
-
-.ui-slider-vertical .ui-slider-handle {
- left: -.3em;
- margin-left: 0;
- margin-bottom: -.6em;
-}
-
-.ui-slider-vertical .ui-slider-range {
- left: 0;
- width: 100%;
-}
-
-.ui-slider-vertical .ui-slider-range-min {
- bottom: 0;
-}
-
-.ui-slider-vertical .ui-slider-range-max {
- top: 0;
-}
-
-/* Tabs
-----------------------------------*/
-.ui-tabs {
- padding: .2em;
- zoom: 1;
-}
-
-.ui-tabs .ui-tabs-nav {
- list-style: none;
- position: relative;
- padding: .2em .2em 0;
-}
-
-.ui-tabs .ui-tabs-nav li {
- position: relative;
- float: left;
- border-bottom-width: 0 !important;
- margin: 0 .2em -1px 0;
- padding: 0;
- list-style: none;
-}
-
-.ui-tabs .ui-tabs-nav li a {
- float: left;
- text-decoration: none;
- padding: .5em 1em;
-}
-
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected {
- padding-bottom: 1px;
- border-bottom-width: 0;
-}
-
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a {
- cursor: text;
-}
-
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a {
- cursor: pointer;
-}
-
-/* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel {
- padding: 1em 1.4em;
- display: block;
- border-width: 0;
- background: none;
-}
-
-.ui-tabs .ui-tabs-hide {
- display: none !important;
-}
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/funcs.js
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/funcs.js 2014-06-21 18:15:34 UTC (rev 12625)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/funcs.js 2014-06-22 01:36:49 UTC (rev 12626)
@@ -153,9 +153,9 @@
}
var iconClose = new Image();
-iconClose.src = '../images/links/close12.gif';
+iconClose.src = '../assets/images/links/close12.gif';
var iconOpen = new Image();
-iconOpen.src = '../images/links/open12.gif';
+iconOpen.src = '../assets/images/links/open12.gif';
function toggleIcon ( iconName )
{
@@ -165,4 +165,4 @@
document.images[iconName].src = window.iconOpen.src;
}
return;
-}
\ No newline at end of file
+}
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/ui.core.js
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/ui.core.js 2014-06-21 18:15:34 UTC (rev 12625)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/ui.core.js 2014-06-22 01:36:49 UTC (rev 12626)
@@ -1,519 +0,0 @@
-/*
- * jQuery UI 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI
- */
-;jQuery.ui || (function($) {
-
-var _remove = $.fn.remove,
- isFF2 = $.browser.mozilla && (parseFloat($.browser.version) < 1.9);
-
-//Helper functions and ui object
-$.ui = {
- version: "1.7.1",
-
- // $.ui.plugin is deprecated. Use the proxy pattern instead.
- plugin: {
- add: function(module, option, set) {
- var proto = $.ui[module].prototype;
- for(var i in set) {
- proto.plugins[i] = proto.plugins[i] || [];
- proto.plugins[i].push([option, set[i]]);
- }
- },
- call: function(instance, name, args) {
- var set = instance.plugins[name];
- if(!set || !instance.element[0].parentNode) { return; }
-
- for (var i = 0; i < set.length; i++) {
- if (instance.options[set[i][0]]) {
- set[i][1].apply(instance.element, args);
- }
- }
- }
- },
-
- contains: function(a, b) {
- return document.compareDocumentPosition
- ? a.compareDocumentPosition(b) & 16
- : a !== b && a.contains(b);
- },
-
- hasScroll: function(el, a) {
-
- //If overflow is hidden, the element might have extra content, but the user wants to hide it
- if ($(el).css('overflow') == 'hidden') { return false; }
-
- var scroll = (a && a == 'left') ? 'scrollLeft' : 'scrollTop',
- has = false;
-
- if (el[scroll] > 0) { return true; }
-
- // TODO: determine which cases actually cause this to happen
- // if the element doesn't have the scroll set, see if it's possible to
- // set the scroll
- el[scroll] = 1;
- has = (el[scroll] > 0);
- el[scroll] = 0;
- return has;
- },
-
- isOverAxis: function(x, reference, size) {
- //Determines when x coordinate is over "b" element axis
- return (x > reference) && (x < (reference + size));
- },
-
- isOver: function(y, x, top, left, height, width) {
- //Determines when x, y coordinates is over "b" element
- return $.ui.isOverAxis(y, top, height) && $.ui.isOverAxis(x, left, width);
- },
-
- keyCode: {
- BACKSPACE: 8,
- CAPS_LOCK: 20,
- COMMA: 188,
- CONTROL: 17,
- DELETE: 46,
- DOWN: 40,
- END: 35,
- ENTER: 13,
- ESCAPE: 27,
- HOME: 36,
- INSERT: 45,
- LEFT: 37,
- NUMPAD_ADD: 107,
- NUMPAD_DECIMAL: 110,
- NUMPAD_DIVIDE: 111,
- NUMPAD_ENTER: 108,
- NUMPAD_MULTIPLY: 106,
- NUMPAD_SUBTRACT: 109,
- PAGE_DOWN: 34,
- PAGE_UP: 33,
- PERIOD: 190,
- RIGHT: 39,
- SHIFT: 16,
- SPACE: 32,
- TAB: 9,
- UP: 38
- }
-};
-
-// WAI-ARIA normalization
-if (isFF2) {
- var attr = $.attr,
- removeAttr = $.fn.removeAttr,
- ariaNS = "http://www.w3.org/2005/07/aaa",
- ariaState = /^aria-/,
- ariaRole = /^wairole:/;
-
- $.attr = function(elem, name, value) {
- var set = value !== undefined;
-
- return (name == 'role'
- ? (set
- ? attr.call(this, elem, name, "wairole:" + value)
- : (attr.apply(this, arguments) || "").replace(ariaRole, ""))
- : (ariaState.test(name)
- ? (set
- ? elem.setAttributeNS(ariaNS,
- name.replace(ariaState, "aaa:"), value)
- : attr.call(this, elem, name.replace(ariaState, "aaa:")))
- : attr.apply(this, arguments)));
- };
-
- $.fn.removeAttr = function(name) {
- return (ariaState.test(name)
- ? this.each(function() {
- this.removeAttributeNS(ariaNS, name.replace(ariaState, ""));
- }) : removeAttr.call(this, name));
- };
-}
-
-//jQuery plugins
-$.fn.extend({
- remove: function() {
- // Safari has a native remove event which actually removes DOM elements,
- // so we have to use triggerHandler instead of trigger (#3037).
- $("*", this).add(this).each(function() {
- $(this).triggerHandler("remove");
- });
- return _remove.apply(this, arguments );
- },
-
- enableSelection: function() {
- return this
- .attr('unselectable', 'off')
- .css('MozUserSelect', '')
- .unbind('selectstart.ui');
- },
-
- disableSelection: function() {
- return this
- .attr('unselectable', 'on')
- .css('MozUserSelect', 'none')
- .bind('selectstart.ui', function() { return false; });
- },
-
- scrollParent: function() {
- var scrollParent;
- if(($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
- scrollParent = this.parents().filter(function() {
- return (/(relative|absolute|fixed)/).test($.curCSS(this,'position',1)) && (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
- }).eq(0);
- } else {
- scrollParent = this.parents().filter(function() {
- return (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
- }).eq(0);
- }
-
- return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent;
- }
-});
-
-
-//Additional selectors
-$.extend($.expr[':'], {
- data: function(elem, i, match) {
- return !!$.data(elem, match[3]);
- },
-
- focusable: function(element) {
- var nodeName = element.nodeName.toLowerCase(),
- tabIndex = $.attr(element, 'tabindex');
- return (/input|select|textarea|button|object/.test(nodeName)
- ? !element.disabled
- : 'a' == nodeName || 'area' == nodeName
- ? element.href || !isNaN(tabIndex)
- : !isNaN(tabIndex))
- // the element and all of its ancestors must be visible
- // the browser may report that the area is hidden
- && !$(element)['area' == nodeName ? 'parents' : 'closest'](':hidden').length;
- },
-
- tabbable: function(element) {
- var tabIndex = $.attr(element, 'tabindex');
- return (isNaN(tabIndex) || tabIndex >= 0) && $(element).is(':focusable');
- }
-});
-
-
-// $.widget is a factory to create jQuery plugins
-// taking some boilerplate code out of the plugin code
-function getter(namespace, plugin, method, args) {
- function getMethods(type) {
- var methods = $[namespace][plugin][type] || [];
- return (typeof methods == 'string' ? methods.split(/,?\s+/) : methods);
- }
-
- var methods = getMethods('getter');
- if (args.length == 1 && typeof args[0] == 'string') {
- methods = methods.concat(getMethods('getterSetter'));
- }
- return ($.inArray(method, methods) != -1);
-}
-
-$.widget = function(name, prototype) {
- var namespace = name.split(".")[0];
- name = name.split(".")[1];
-
- // create plugin method
- $.fn[name] = function(options) {
- var isMethodCall = (typeof options == 'string'),
- args = Array.prototype.slice.call(arguments, 1);
-
- // prevent calls to internal methods
- if (isMethodCall && options.substring(0, 1) == '_') {
- return this;
- }
-
- // handle getter methods
- if (isMethodCall && getter(namespace, name, options, args)) {
- var instance = $.data(this[0], name);
- return (instance ? instance[options].apply(instance, args)
- : undefined);
- }
-
- // handle initialization and non-getter methods
- return this.each(function() {
- var instance = $.data(this, name);
-
- // constructor
- (!instance && !isMethodCall &&
- $.data(this, name, new $[namespace][name](this, options))._init());
-
- // method call
- (instance && isMethodCall && $.isFunction(instance[options]) &&
- instance[options].apply(instance, args));
- });
- };
-
- // create widget constructor
- $[namespace] = $[namespace] || {};
- $[namespace][name] = function(element, options) {
- var self = this;
-
- this.namespace = namespace;
- this.widgetName = name;
- this.widgetEventPrefix = $[namespace][name].eventPrefix || name;
- this.widgetBaseClass = namespace + '-' + name;
-
- this.options = $.extend({},
- $.widget.defaults,
- $[namespace][name].defaults,
- $.metadata && $.metadata.get(element)[name],
- options);
-
- this.element = $(element)
- .bind('setData.' + name, function(event, key, value) {
- if (event.target == element) {
- return self._setData(key, value);
- }
- })
- .bind('getData.' + name, function(event, key) {
- if (event.target == element) {
- return self._getData(key);
- }
- })
- .bind('remove', function() {
- return self.destroy();
- });
- };
-
- // add widget prototype
- $[namespace][name].prototype = $.extend({}, $.widget.prototype, prototype);
-
- // TODO: merge getter and getterSetter properties from widget prototype
- // and plugin prototype
- $[namespace][name].getterSetter = 'option';
-};
-
-$.widget.prototype = {
- _init: function() {},
- destroy: function() {
- this.element.removeData(this.widgetName)
- .removeClass(this.widgetBaseClass + '-disabled' + ' ' + this.namespace + '-state-disabled')
- .removeAttr('aria-disabled');
- },
-
- option: function(key, value) {
- var options = key,
- self = this;
-
- if (typeof key == "string") {
- if (value === undefined) {
- return this._getData(key);
- }
- options = {};
- options[key] = value;
- }
-
- $.each(options, function(key, value) {
- self._setData(key, value);
- });
- },
- _getData: function(key) {
- return this.options[key];
- },
- _setData: function(key, value) {
- this.options[key] = value;
-
- if (key == 'disabled') {
- this.element
- [value ? 'addClass' : 'removeClass'](
- this.widgetBaseClass + '-disabled' + ' ' +
- this.namespace + '-state-disabled')
- .attr("aria-disabled", value);
- }
- },
-
- enable: function() {
- this._setData('disabled', false);
- },
- disable: function() {
- this._setData('disabled', true);
- },
-
- _trigger: function(type, event, data) {
- var callback = this.options[type],
- eventName = (type == this.widgetEventPrefix
- ? type : this.widgetEventPrefix + type);
-
- event = $.Event(event);
- event.type = eventName;
-
- // copy original event properties over to the new event
- // this would happen if we could call $.event.fix instead of $.Event
- // but we don't have a way to force an event to be fixed multiple times
- if (event.originalEvent) {
- for (var i = $.event.props.length, prop; i;) {
- prop = $.event.props[--i];
- event[prop] = event.originalEvent[prop];
- }
- }
-
- this.element.trigger(event, data);
-
- return !($.isFunction(callback) && callback.call(this.element[0], event, data) === false
- || event.isDefaultPrevented());
- }
-};
-
-$.widget.defaults = {
- disabled: false
-};
-
-
-/** Mouse Interaction Plugin **/
-
-$.ui.mouse = {
- _mouseInit: function() {
- var self = this;
-
- this.element
- .bind('mousedown.'+this.widgetName, function(event) {
- return self._mouseDown(event);
- })
- .bind('click.'+this.widgetName, function(event) {
- if(self._preventClickEvent) {
- self._preventClickEvent = false;
- event.stopImmediatePropagation();
- return false;
- }
- });
-
- // Prevent text selection in IE
- if ($.browser.msie) {
- this._mouseUnselectable = this.element.attr('unselectable');
- this.element.attr('unselectable', 'on');
- }
-
- this.started = false;
- },
-
- // TODO: make sure destroying one instance of mouse doesn't mess with
- // other instances of mouse
- _mouseDestroy: function() {
- this.element.unbind('.'+this.widgetName);
-
- // Restore text selection in IE
- ($.browser.msie
- && this.element.attr('unselectable', this._mouseUnselectable));
- },
-
- _mouseDown: function(event) {
- // don't let more than one widget handle mouseStart
- // TODO: figure out why we have to use originalEvent
- event.originalEvent = event.originalEvent || {};
- if (event.originalEvent.mouseHandled) { return; }
-
- // we may have missed mouseup (out of window)
- (this._mouseStarted && this._mouseUp(event));
-
- this._mouseDownEvent = event;
-
- var self = this,
- btnIsLeft = (event.which == 1),
- elIsCancel = (typeof this.options.cancel == "string" ? $(event.target).parents().add(event.target).filter(this.options.cancel).length : false);
- if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
- return true;
- }
-
- this.mouseDelayMet = !this.options.delay;
- if (!this.mouseDelayMet) {
- this._mouseDelayTimer = setTimeout(function() {
- self.mouseDelayMet = true;
- }, this.options.delay);
- }
-
- if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
- this._mouseStarted = (this._mouseStart(event) !== false);
- if (!this._mouseStarted) {
- event.preventDefault();
- return true;
- }
- }
-
- // these delegates are required to keep context
- this._mouseMoveDelegate = function(event) {
- return self._mouseMove(event);
- };
- this._mouseUpDelegate = function(event) {
- return self._mouseUp(event);
- };
- $(document)
- .bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
- .bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
-
- // preventDefault() is used to prevent the selection of text here -
- // however, in Safari, this causes select boxes not to be selectable
- // anymore, so this fix is needed
- ($.browser.safari || event.preventDefault());
-
- event.originalEvent.mouseHandled = true;
- return true;
- },
-
- _mouseMove: function(event) {
- // IE mouseup check - mouseup happened when mouse was out of window
- if ($.browser.msie && !event.button) {
- return this._mouseUp(event);
- }
-
- if (this._mouseStarted) {
- this._mouseDrag(event);
- return event.preventDefault();
- }
-
- if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
- this._mouseStarted =
- (this._mouseStart(this._mouseDownEvent, event) !== false);
- (this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
- }
-
- return !this._mouseStarted;
- },
-
- _mouseUp: function(event) {
- $(document)
- .unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
- .unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
-
- if (this._mouseStarted) {
- this._mouseStarted = false;
- this._preventClickEvent = (event.target == this._mouseDownEvent.target);
- this._mouseStop(event);
- }
-
- return false;
- },
-
- _mouseDistanceMet: function(event) {
- return (Math.max(
- Math.abs(this._mouseDownEvent.pageX - event.pageX),
- Math.abs(this._mouseDownEvent.pageY - event.pageY)
- ) >= this.options.distance
- );
- },
-
- _mouseDelayMet: function(event) {
- return this.mouseDelayMet;
- },
-
- // These are placeholder methods, to be overriden by extending plugin
- _mouseStart: function(event) {},
- _mouseDrag: function(event) {},
- _mouseStop: function(event) {},
- _mouseCapture: function(event) { return true; }
-};
-
-$.ui.mouse.defaults = {
- cancel: null,
- distance: 1,
- delay: 0
-};
-
-})(jQuery);
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/ui.tabs.js
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/ui.tabs.js 2014-06-21 18:15:34 UTC (rev 12625)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/ui.tabs.js 2014-06-22 01:36:49 UTC (rev 12626)
@@ -1,685 +0,0 @@
-/*
- * jQuery UI Tabs 1.7.1
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Tabs
- *
- * Depends:
- * ui.core.js
- */
-(function($) {
-
-$.widget("ui.tabs", {
-
- _init: function() {
- if (this.options.deselectable !== undefined) {
- this.options.collapsible = this.options.deselectable;
- }
- this._tabify(true);
- },
-
- _setData: function(key, value) {
- if (key == 'selected') {
- if (this.options.collapsible && value == this.options.selected) {
- return;
- }
- this.select(value);
- }
- else {
- this.options[key] = value;
- if (key == 'deselectable') {
- this.options.collapsible = value;
- }
- this._tabify();
- }
- },
-
- _tabId: function(a) {
- return a.title && a.title.replace(/\s/g, '_').replace(/[^A-Za-z0-9\-_:\.]/g, '') ||
- this.options.idPrefix + $.data(a);
- },
-
- _sanitizeSelector: function(hash) {
- return hash.replace(/:/g, '\\:'); // we need this because an id may contain a ":"
- },
-
- _cookie: function() {
- var cookie = this.cookie || (this.cookie = this.options.cookie.name || 'ui-tabs-' + $.data(this.list[0]));
- return $.cookie.apply(null, [cookie].concat($.makeArray(arguments)));
- },
-
- _ui: function(tab, panel) {
- return {
- tab: tab,
- panel: panel,
- index: this.anchors.index(tab)
- };
- },
-
- _cleanup: function() {
- // restore all former loading tabs labels
- this.lis.filter('.ui-state-processing').removeClass('ui-state-processing')
- .find('span:data(label.tabs)')
- .each(function() {
- var el = $(this);
- el.html(el.data('label.tabs')).removeData('label.tabs');
- });
- },
-
- _tabify: function(init) {
-
- this.list =...
[truncated message content] |
|
From: <be...@us...> - 2014-06-22 09:30:03
|
Revision: 12630
http://sourceforge.net/p/xoops/svn/12630
Author: beckmi
Date: 2014-06-22 09:29:57 +0000 (Sun, 22 Jun 2014)
Log Message:
-----------
Fixing couple of bugs related to blocks, code cosmetics
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.tpl
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-06-22 02:42:25 UTC (rev 12629)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-06-22 09:29:57 UTC (rev 12630)
@@ -196,7 +196,7 @@
}
$item['pdf'] = '';
- if ($this->publisher->getConfig('display_pdf')) {
+ if ($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/templates/blocks/publisher_latest_news.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl 2014-06-22 02:42:25 UTC (rev 12629)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl 2014-06-22 09:29:57 UTC (rev 12630)
@@ -65,7 +65,7 @@
<{if $block.template == 'slider1'}>
-<{php}>global $xoTheme;$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');<{* xoTheme->addScript('browse.php?Frameworks/jquery/jquery-migrate-1.2.1.js');*}> $xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');<{/php}>
+<{php}>global $xoTheme;$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); $xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');<{/php}>
<script type="text/javascript">
jQuery(document).ready(function()
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.tpl 2014-06-22 02:42:25 UTC (rev 12629)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.tpl 2014-06-22 09:29:57 UTC (rev 12630)
@@ -1,30 +1,54 @@
<{include file='db:publisher_header.tpl'}>
-<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE), let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}>
+<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats
+ AND $display_category_summary is set to TRUE), let's display the summary table ! //-->
+<{if $indexpage || $category.subcats || ($category && $display_category_summary)}>
-<{if $collapsable_heading == 1}>
-<div class="publisher_collaps_title">
- <a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a> <{$lang_category_summary}>
-</div>
-<div id='toptable'>
- <span class="publisher_collaps_info""><{$lang_category_summary}></span> <!-- Content under the collapsable bar //--> <{/if}>
+ <{if $collapsable_heading == 1}>
+ <div class="publisher_collaps_title">
+ <a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')">
+ <img id='toptableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/>
+ </a>
+ <{$lang_category_summary}>
+ </div>
+ <div id='toptable'>
+ <span class="publisher_collaps_info">
+ <{$lang_category_summary}>
+ </span>
+ <!-- Content under the collapsable bar //-->
+ <{/if}>
<{include file='db:publisher_categories_table.tpl'}>
<{if $collapsable_heading == 1}>
-</div> <{/if}>
-<br/><!-- End of if !$category || $category.subcats || ($category && $display_category_summary) //--><{/if}><{if $items}> <{if $collapsable_heading == 1}>
-<div class="publisher_collaps_title">
- <a href='javascript:;' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')";><img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a> <{$lang_items_title}>
-</div>
-<div id='bottomtable'>
- <span class="publisher_collaps_info"><{$smarty.const._MD_PUBLISHER_ITEMS_INFO}></span> <{/if}>
+ </div>
+ <{/if}>
+ <br/>
+ <!-- End of if !$category || $category.subcats || ($category && $display_category_summary) //-->
+<{/if}>
+<{if $items}>
+ <{if $collapsable_heading == 1}>
+ <div class="publisher_collaps_title">
+ <a href='javascript:;' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')";>
+ <img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/>
+ </a>
+ <{$lang_items_title}>
+ </div>
+ <div id='bottomtable'>
+ <span class="publisher_collaps_info"><{$smarty.const._MD_PUBLISHER_ITEMS_INFO}></span>
+ <{/if}>
<div align="right"><{$navbar}></div>
- <!-- Start item loop --> <{foreach item=item from=$items}> <{include file="db:publisher_singleitem.tpl" item=$item}> <{/foreach}> <!-- End item loop -->
+ <!-- Start item loop -->
+ <{foreach item=item from=$items}>
+ <{include file="db:publisher_singleitem.tpl" item=$item}>
+ <{/foreach}> <!-- End item loop -->
<div align="right"><{$navbar}></div>
+
<{if $collapsable_heading == 1}>
-</div> <{/if}><!-- end of if $items --> <{/if}>
+ </div>
+ <{/if}><!-- end of if $items -->
+<{/if}>
<{include file='db:publisher_footer.tpl'}>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.tpl 2014-06-22 02:42:25 UTC (rev 12629)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.tpl 2014-06-22 09:29:57 UTC (rev 12630)
@@ -1,60 +1,85 @@
<{include file='db:publisher_header.tpl'}>
-<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE), let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}>
+<!-- if we are on the index page OR inside a category that has subcats OR
+ (inside a category with no subcats AND $display_category_summary is set to TRUE),
+ let's display the summary table ! //-->
+<{if $indexpage || $category.subcats || ($category && $display_category_summary)}>
-<!-- let's begin the display of the other display type --> <{if $collapsable_heading == 1}>
-<div class="publisher_collaps_title">
- <a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a> <{$lang_category_summary}>
-</div>
-<div id='toptable'>
- <span class="publisher_collaps_info""><{$lang_category_summary}></span> <!-- Content under the collapsable bar //--> <{/if}>
+ <!-- let's begin the display of the other display type -->
+ <{if $collapsable_heading == 1}>
+ <div class="publisher_collaps_title">
+ <a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a> <{$lang_category_summary}>
+ </div>
+ <div id='toptable'>
+ <span class="publisher_collaps_info"">
+ <{$lang_category_summary}>
+ </span>
+ <!-- Content under the collapsable bar //-->
+ <{/if}>
<{include file='db:publisher_categories_table.tpl'}>
<{if $collapsable_heading == 1}>
-</div> <{/if}>
-<br/><!-- End of if !$category || $category.subcats || ($category && $display_category_summary) //--><{/if}><{if $items}> <{if $collapsable_heading == 1}>
-<div class="publisher_collaps_title">
- <a href='javascript:;' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')";><img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a> <{$lang_items_title}>
-</div>
-<div id='bottomtable'>
- <span class="publisher_collaps_info"><{$smarty.const._MD_PUBLISHER_ITEMS_INFO}></span> <{/if}>
+ </div>
+ <{/if}>
+ <br/>
+ <!-- End of if !$category || $category.subcats || ($category && $display_category_summary) //-->
+<{/if}>
+<{if $items}>
+ <{if $collapsable_heading == 1}>
+ <div class="publisher_collaps_title">
+ <a href='javascript:;' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')";>
+ <img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/>
+ </a> <{$lang_items_title}>
+ </div>
+ <div id='bottomtable'>
+ <span class="publisher_collaps_info">
+ <{$smarty.const._MD_PUBLISHER_ITEMS_INFO}>
+ </span>
+ <{/if}>
<div align="right"><{$navbar}></div>
<table border="0" width="90%" cellspacing="1" cellpadding="3" align="center" class="outer">
<tr>
<td align="left" class="itemHead" width='60%'>
- <strong><{$smarty.const._CO_PUBLISHER_TITLE}></strong></td>
+ <strong><{$smarty.const._CO_PUBLISHER_TITLE}></strong>
+ </td>
<{if $display_date_col == 1}>
- <td align="center" class="itemHead" width="30%">
- <strong><{$smarty.const._MD_PUBLISHER_DATESUB}></strong></td>
+ <td align="center" class="itemHead" width="30%">
+ <strong><{$smarty.const._MD_PUBLISHER_DATESUB}></strong>
+ </td>
<{/if}> <{if $display_hits_col == 1}>
- <td align="center" class="itemHead" width="10%">
- <strong><{$smarty.const._MD_PUBLISHER_HITS}></strong></td>
+ <td align="center" class="itemHead" width="10%">
+ <strong><{$smarty.const._MD_PUBLISHER_HITS}></strong>
+ </td>
<{/if}>
</tr>
- <!-- Start item loop --> <{foreach item=item from=$items}>
- <tr>
- <td class="even" align="left">
- <strong><{$item.titlelink}></strong>
- <{if $show_subtitle && $item.subtitle}>
- <br /><em><{$item.subtitle}></em>
+ <!-- Start item loop -->
+ <{foreach item=item from=$items}>
+ <tr>
+ <td class="even" align="left">
+ <strong><{$item.titlelink}></strong>
+ <{if $show_subtitle && $item.subtitle}>
+ <br/>
+ <em><{$item.subtitle}></em>
+ <{/if}>
+ </td>
+ <{if $display_date_col == 1}>
+ <td class="odd" align="left">
+ <div align="center"><{$item.datesub}></div>
+ </td>
+ <{/if}> <{if $display_hits_col == 1}>
+ <td class="odd" align="left">
+ <div align="center"><{$item.counter}></div>
+ </td>
<{/if}>
- </td>
- <{if $display_date_col == 1}>
- <td class="odd" align="left">
- <div align="center"><{$item.datesub}></div>
- </td>
- <{/if}> <{if $display_hits_col == 1}>
- <td class="odd" align="left">
- <div align="center"><{$item.counter}></div>
- </td>
- <{/if}>
- </tr>
+ </tr>
<{/foreach}> <!-- End item loop -->
<tr></tr>
</table>
<div align="right"><{$navbar}></div>
<{if $collapsable_heading == 1}>
-</div> <{/if}><!-- end of if $items --> <{/if}>
+ </div>
+ <{/if}><!-- end of if $items -->
+<{/if}>
<{include file='db:publisher_footer.tpl'}>
|
|
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-10-02 22:59:08
|
Revision: 12803
http://sourceforge.net/p/xoops/svn/12803
Author: beckmi
Date: 2014-10-02 22:58:58 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
replaced $i++ with ++$i for consistency/performance
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.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/preferences.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -263,7 +263,7 @@
$delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETECOL . "' alt='" . _AM_PUBLISHER_DELETECOL . "' /></a>";
$spaces = '';
- for ($j = 0; $j < $level; $j++) {
+ for ($j = 0; $j < $level; ++$j) {
$spaces .= ' ';
}
@@ -275,7 +275,7 @@
echo "</tr>";
$subCategoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid());
if (count($subCategoriesObj) > 0) {
- $level++;
+ ++$level;
foreach ($subCategoriesObj as $key => $thiscat) {
publisher_displayCategory($thiscat, $level);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -296,7 +296,7 @@
$resultPictures = $xoopsDB->query($sql);
$newCat['newid'] = $categoryObj->categoryid();
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br/>";
@@ -389,7 +389,7 @@
$newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -146,7 +146,7 @@
}
$newCat['newid'] = $categoryObj->categoryid();
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
@@ -221,7 +221,7 @@
*/
$newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -167,7 +167,7 @@
$newArticleArray[$arrArticle['id']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -146,7 +146,7 @@
}
$newCat['newid'] = $categoryObj->categoryid();
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
@@ -221,7 +221,7 @@
*/
$newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -142,7 +142,7 @@
}
$newCat['newid'] = $categoryObj->categoryid();
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
@@ -200,7 +200,7 @@
$newArticleArray[$arrArticle['itemid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -150,7 +150,7 @@
publisher_saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
publisher_saveCategoryPermissions($categoryObj->getGroups_submit(), $categoryObj->categoryid(), 'item_submit');
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
@@ -219,7 +219,7 @@
$newArticleArray[$arrArticle['articleid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
$newCatArray[$newCat['oldid']] = $newCat;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -142,7 +142,7 @@
publisher_saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
publisher_saveCategoryPermissions($categoryObj->getGroups_submit(), $categoryObj->categoryid(), 'item_submit');
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br\>";
@@ -217,7 +217,7 @@
$newArticleArray[$arrArticle['articleid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
$newCatArray[$newCat['oldid']] = $newCat;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -320,7 +320,7 @@
$resultPictures = $xoopsDB->query($sql);
$newCat['newid'] = $categoryObj->categoryid();
- $cnt_imported_cat++;
+ ++$cnt_imported_cat;
echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br/>";
@@ -413,7 +413,7 @@
$newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
- $cnt_imported_articles++;
+ ++$cnt_imported_articles;
}
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -103,7 +103,7 @@
$ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
$options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
$opcount = count($options);
- for ($j = 0; $j < $opcount; $j++) {
+ for ($j = 0; $j < $opcount; ++$j) {
$optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
$optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
$ele->addOption($optval, $optkey);
@@ -113,7 +113,7 @@
$ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
$options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
$opcount = count($options);
- for ($j = 0; $j < $opcount; $j++) {
+ for ($j = 0; $j < $opcount; ++$j) {
$optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
$optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
$ele->addOption($optval, $optkey);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -115,7 +115,7 @@
$columns[$k][] = $mainitem;
unset($thisitem);
unset($mainitem);
- $k++;
+ ++$k;
if ($k == $opt_num_columns) {
$k = 0;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -233,7 +233,7 @@
$block['letters'] = $letters;
$columns[$k][] = $item;
- $k++;
+ ++$k;
if ($k == $column_count) {
$k = 0;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -322,7 +322,7 @@
public function getForm($subCatsCount = 4)
{
include_once XOOPS_ROOT_PATH . '/modules/' . PUBLISHER_DIRNAME . '/class/form/category.php';
- $form = new PublisherCategoryForm($this, $subCatsCount);
+ $form = new PublisherCategoryForm($this, $subCatsCount);
return $form;
}
@@ -498,7 +498,7 @@
{
global $theresult;
$spaces = '';
- for ($j = 0; $j < $level; $j++) {
+ for ($j = 0; $j < $level; ++$j) {
$spaces .= '--';
}
$theresult[$category['categoryid']] = $spaces . $category['name'];
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_rating.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -82,7 +82,7 @@
$publisher->getHandler('rating')->insert($newRatingObj);
$current_rating += $rating;
-$count++;
+++$count;
$publisher->getHandler('item')->updateAll('rating', number_format($current_rating / $count, 4), $criteria, true);
$publisher->getHandler('item')->updateAll('votes', $count, $criteria, true);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -548,7 +548,7 @@
$publisher = PublisherPublisher::getInstance();
$spaces = '';
- for ($j = 0; $j < $level; $j++) {
+ for ($j = 0; $j < $level; ++$j) {
$spaces .= '--';
}
@@ -562,7 +562,7 @@
$subCategoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid());
if (count($subCategoriesObj) > 0) {
- $level++;
+ ++$level;
foreach ($subCategoriesObj as $catID => $subCategoryObj) {
$ret .= publisher_addCategoryOption($subCategoryObj, $selectedid, $level);
}
@@ -915,7 +915,7 @@
$rater .= '<div id="unit_ul' . $itemid . '" class="publisher_unit-rating" style="width:' . $rating_unitwidth * $units . 'px;">';
$rater .= '<div class="publisher_current-rating" style="width:' . $rating_width . 'px;">' . _MD_PUBLISHER_VOTE_RATING . ' ' . $rating2 . '/' . $units . '</div>';
- for ($ncount = 1; $ncount <= $units; $ncount++) { // loop from 1 to the number of units
+ for ($ncount = 1; $ncount <= $units; ++$ncount) { // loop from 1 to the number of units
if (!$voted) { // if the user hasn't yet voted, draw the voting stars
$rater .= '<div><a href="' . PUBLISHER_URL . '/rate.php?itemid=' . $itemid . '&rating=' . $ncount . '" title="' . $ncount . ' ' . _MD_PUBLISHER_VOTE_OUTOF . ' ' . $units . '" class="publisher_r' . $ncount . '-unit rater" rel="nofollow">' . $ncount . '</a></div>';
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -71,7 +71,7 @@
$publisher->getHandler('rating')->insert($newRatingObj);
$current_rating += $rating;
-$count++;
+++$count;
$publisher->getHandler('item')->updateAll('rating', number_format($current_rating / $count, 4), $criteria, true);
$publisher->getHandler('item')->updateAll('votes', $count, $criteria, true);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php 2014-09-28 19:34:11 UTC (rev 12802)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php 2014-10-02 22:58:58 UTC (rev 12803)
@@ -753,7 +753,7 @@
$filterSettings = explode(',', $fl);
if (isset ($imageFilters[$filterSettings[0]])) {
- for ($i = 0; $i < 4; $i++) {
+ for ($i = 0; $i < 4; ++$i) {
if (!isset ($filterSettings[$i])) {
$filterSettings[$i] = null;
} else {
|
|
From: <be...@us...> - 2014-10-02 23:04:07
|
Revision: 12804
http://sourceforge.net/p/xoops/svn/12804
Author: beckmi
Date: 2014-10-02 23:04:01 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
replaced PublisherRequest with calls to XoopsRequest
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.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/visit.php
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/request.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -21,7 +21,7 @@
include_once __DIR__ . '/admin_header.php';
-$op = PublisherRequest::getString('op');
+$op = XoopsRequest::getString('op');
$op = isset($_POST['editor']) ? 'mod' : $op;
if (isset($_POST['addcategory'])) {
@@ -29,8 +29,8 @@
}
// Where do we start ?
-$startcategory = PublisherRequest::getInt('startcategory');
-$categoryid = PublisherRequest::getInt('categoryid');
+$startcategory = XoopsRequest::getInt('startcategory');
+$categoryid = XoopsRequest::getInt('categoryid');
switch ($op) {
@@ -65,7 +65,7 @@
case "addcategory":
global $modify;
- $parentid = PublisherRequest::getInt('parentid');
+ $parentid = XoopsRequest::getInt('parentid');
if ($categoryid != 0) {
$categoryObj = $publisher->getHandler('category')->get($categoryid);
@@ -362,7 +362,7 @@
publisher_closeCollapsableBar('subcatstable', 'subcatsicon');
publisher_openCollapsableBar('bottomtable', 'bottomtableicon', _AM_PUBLISHER_CAT_ITEMS, _AM_PUBLISHER_CAT_ITEMS_DSC);
- $startitem = PublisherRequest::getInt('startitem');
+ $startitem = XoopsRequest::getInt('startitem');
// Get the total number of published ITEMS
$totalitems = $publisher->getHandler('item')->getItemsCount($sel_cat, array(_PUBLISHER_STATUS_PUBLISHED));
// creating the items objects that are published
@@ -398,7 +398,7 @@
}
echo "</table>\n";
echo "<br />\n";
- $parentid = PublisherRequest::getInt('parentid');
+ $parentid = XoopsRequest::getInt('parentid');
$pagenav_extra_args = "op=mod&categoryid=$sel_cat&parentid=$parentid";
xoops_load('XoopsPageNav');
$pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $startitem, 'startitem', $pagenav_extra_args);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -21,7 +21,7 @@
include_once __DIR__ . '/admin_header.php';
-$op = PublisherRequest::getString('op');
+$op = XoopsRequest::getString('op');
function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -22,9 +22,9 @@
include_once __DIR__ . '/admin_header.php';
-$itemid = PublisherRequest::getInt('itemid');
+$itemid = XoopsRequest::getInt('itemid');
$op = ($itemid > 0 || isset($_POST['editor'])) ? 'mod' : '';
-$op = PublisherRequest::getString('op', $op);
+$op = XoopsRequest::getString('op', $op);
if (isset($_POST['additem'])) {
$op = 'additem';
@@ -33,10 +33,10 @@
}
// Where shall we start ?
-$submittedstartitem = PublisherRequest::getInt('submittedstartitem');
-$publishedstartitem = PublisherRequest::getInt('publishedstartitem');
-$offlinestartitem = PublisherRequest::getInt('offlinestartitem');
-$rejectedstartitem = PublisherRequest::getInt('rejectedstartitem');
+$submittedstartitem = XoopsRequest::getInt('submittedstartitem');
+$publishedstartitem = XoopsRequest::getInt('publishedstartitem');
+$offlinestartitem = XoopsRequest::getInt('offlinestartitem');
+$rejectedstartitem = XoopsRequest::getInt('rejectedstartitem');
switch ($op) {
case "clone":
@@ -75,7 +75,7 @@
$itemObj->setVarsFromRequest();
$old_status = $itemObj->status();
- $new_status = PublisherRequest::getInt('status', _PUBLISHER_STATUS_PUBLISHED); //_PUBLISHER_STATUS_NOTSET;
+ $new_status = XoopsRequest::getInt('status', _PUBLISHER_STATUS_PUBLISHED); //_PUBLISHER_STATUS_NOTSET;
switch ($new_status) {
case _PUBLISHER_STATUS_SUBMITTED:
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -35,8 +35,8 @@
$lastyear = 0;
$lastmonth = 0;
$months_arr = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER);
-$fromyear = PublisherRequest::getInt('year');
-$frommonth = PublisherRequest::getInt('month');
+$fromyear = XoopsRequest::getInt('year');
+$frommonth = XoopsRequest::getInt('month');
$pgtitle = '';
if ($fromyear && $frommonth) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -21,7 +21,7 @@
include_once __DIR__ . '/header.php';
-$uid = PublisherRequest::getInt('uid');
+$uid = XoopsRequest::getInt('uid');
if (empty($uid)) {
redirect_header('index.php', 2, _CO_PUBLISHER_ERROR);
exit();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -22,7 +22,7 @@
include_once __DIR__ . '/header.php';
-$categoryid = PublisherRequest::getInt('categoryid');
+$categoryid = XoopsRequest::getInt('categoryid');
// Creating the category object for the selected category
$categoryObj = $publisher->getHandler('category')->get($categoryid);
@@ -40,9 +40,9 @@
}
// At which record shall we start
-$start = PublisherRequest::getInt('start');
+$start = XoopsRequest::getInt('start');
-$item_page_id = PublisherRequest::getInt('page', -1);
+$item_page_id = XoopsRequest::getInt('page', -1);
$totalItems = $publisher->getHandler('category')->publishedItemsCount();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -581,7 +581,7 @@
return sprintf(_CO_PUBLISHER_POSTEDBY, $posterName, $postdate);
}
- /**
+ /**
* @return string
*/
public function getWho()
@@ -590,7 +590,7 @@
return $posterName;
}
- /**
+ /**
* @return string
*/
public function getWhen()
@@ -708,10 +708,10 @@
$item['subtitle'] = $this->subtitle();
$item['datesub'] = $this->datesub();
$item['counter'] = $this->counter();
- $item['who'] = $this->getWho();
- $item['when'] = $this->getWhen();
- $item['category'] = $this->getCategoryName();
- $item = $this->getMainImage($item);
+ $item['who'] = $this->getWho();
+ $item['when'] = $this->getWhen();
+ $item['category'] = $this->getCategoryName();
+ $item = $this->getMainImage($item);
switch ($display) {
case 'summary':
case 'list':
@@ -762,9 +762,9 @@
$item['adminlink'] = $this->getAdminLinks();
$item['categoryPath'] = $this->getCategoryPath($this->publisher->getConfig('format_linked_path'));
$item['who_when'] = $this->getWhoAndWhen();
- $item['who'] = $this->getWho();
- $item['when'] = $this->getWhen();
- $item['category'] = $this->getCategoryName();
+ $item['who'] = $this->getWho();
+ $item['when'] = $this->getWhen();
+ $item['category'] = $this->getCategoryName();
$item = $this->getMainImage($item);
return $item;
@@ -952,27 +952,27 @@
{
//Required fields
if (isset($_REQUEST['categoryid'])) {
- $this->setVar('categoryid', PublisherRequest::getInt('categoryid'));
+ $this->setVar('categoryid', XoopsRequest::getInt('categoryid'));
}
if (isset($_REQUEST['title'])) {
- $this->setVar('title', PublisherRequest::getString('title'));
+ $this->setVar('title', XoopsRequest::getString('title'));
}
if (isset($_REQUEST['body'])) {
- $this->setVar('body', PublisherRequest::getText('body'));
+ $this->setVar('body', XoopsRequest::getText('body'));
}
//Not required fields
if (isset($_REQUEST['summary'])) {
- $this->setVar('summary', PublisherRequest::getText('summary'));
+ $this->setVar('summary', XoopsRequest::getText('summary'));
}
if (isset($_REQUEST['subtitle'])) {
- $this->setVar('subtitle', PublisherRequest::getString('subtitle'));
+ $this->setVar('subtitle', XoopsRequest::getString('subtitle'));
}
if (isset($_REQUEST['item_tag'])) {
- $this->setVar('item_tag', PublisherRequest::getString('item_tag'));
+ $this->setVar('item_tag', XoopsRequest::getString('item_tag'));
}
if (isset($_REQUEST['image_featured'])) {
- $image_item = PublisherRequest::getArray('image_item');
- $image_featured = PublisherRequest::getString('image_featured');
+ $image_item = XoopsRequest::getArray('image_item');
+ $image_featured = XoopsRequest::getString('image_featured');
//Todo: get a better image class for xoops!
//Image hack
$image_item_ids = array();
@@ -992,12 +992,12 @@
$this->setVar('images', implode('|', $image_item_ids));
}
if (isset($_REQUEST['uid'])) {
- $this->setVar('uid', PublisherRequest::getInt('uid'));
+ $this->setVar('uid', XoopsRequest::getInt('uid'));
} elseif ($this->isnew()) {
$this->setVar('uid', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->uid() : 0);
}
if (isset($_REQUEST['author_alias'])) {
- $this->setVar('author_alias', PublisherRequest::getString('author_alias'));
+ $this->setVar('author_alias', XoopsRequest::getString('author_alias'));
if ($this->getVar('autor_alias') != '') {
$this->setVar('uid', 0);
}
@@ -1008,54 +1008,54 @@
$this->setVar('datesub', time());
}
if (isset($_REQUEST['item_short_url'])) {
- $this->setVar('short_url', PublisherRequest::getString('item_short_url'));
+ $this->setVar('short_url', XoopsRequest::getString('item_short_url'));
}
if (isset($_REQUEST['item_meta_keywords'])) {
- $this->setVar('meta_keywords', PublisherRequest::getString('item_meta_keywords'));
+ $this->setVar('meta_keywords', XoopsRequest::getString('item_meta_keywords'));
}
if (isset($_REQUEST['item_meta_description'])) {
- $this->setVar('meta_description', PublisherRequest::getString('item_meta_description'));
+ $this->setVar('meta_description', XoopsRequest::getString('item_meta_description'));
}
if (isset($_REQUEST['weight'])) {
- $this->setVar('weight', PublisherRequest::getInt('weight'));
+ $this->setVar('weight', XoopsRequest::getInt('weight'));
}
if (isset($_REQUEST['allowcomments'])) {
- $this->setVar('cancomment', PublisherRequest::getInt('allowcomments'));
+ $this->setVar('cancomment', XoopsRequest::getInt('allowcomments'));
} elseif ($this->isnew()) {
$this->setVar('cancoment', $this->publisher->getConfig('submit_allowcomments'));
}
if (isset($_REQUEST['status'])) {
- $this->setVar('status', PublisherRequest::getInt('status'));
+ $this->setVar('status', XoopsRequest::getInt('status'));
} elseif ($this->isnew()) {
$this->setVar('status', $this->publisher->getConfig('submit_status'));
}
if (isset($_REQUEST['dohtml'])) {
- $this->setVar('dohtml', PublisherRequest::getInt('dohtml'));
+ $this->setVar('dohtml', XoopsRequest::getInt('dohtml'));
} elseif ($this->isnew()) {
$this->setVar('dohtml', $this->publisher->getConfig('submit_dohtml'));
}
if (isset($_REQUEST['dosmiley'])) {
- $this->setVar('dosmiley', PublisherRequest::getInt('dosmiley'));
+ $this->setVar('dosmiley', XoopsRequest::getInt('dosmiley'));
} elseif ($this->isnew()) {
$this->setVar('dosmiley', $this->publisher->getConfig('submit_dosmiley'));
}
if (isset($_REQUEST['doxcode'])) {
- $this->setVar('doxcode', PublisherRequest::getInt('doxcode'));
+ $this->setVar('doxcode', XoopsRequest::getInt('doxcode'));
} elseif ($this->isnew()) {
$this->setVar('doxcode', $this->publisher->getConfig('submit_doxcode'));
}
if (isset($_REQUEST['doimage'])) {
- $this->setVar('doimage', PublisherRequest::getInt('doimage'));
+ $this->setVar('doimage', XoopsRequest::getInt('doimage'));
} elseif ($this->isnew()) {
$this->setVar('doimage', $this->publisher->getConfig('submit_doimage'));
}
if (isset($_REQUEST['dolinebreak'])) {
- $this->setVar('dobr', PublisherRequest::getInt('dolinebreak'));
+ $this->setVar('dobr', XoopsRequest::getInt('dolinebreak'));
} elseif ($this->isnew()) {
$this->setVar('dobr', $this->publisher->getConfig('submit_dobr'));
}
if (isset($_REQUEST['notify'])) {
- $this->setVar('notifypub', PublisherRequest::getInt('notify'));
+ $this->setVar('notifypub', XoopsRequest::getInt('notify'));
}
}
}
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/request.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/request.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/request.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -1,972 +0,0 @@
-<?php
-/*
- 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.
- */
-/**
- * Publisher class
- *
- * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
- * @license GNU/GPL, see LICENSE.php
- * Joomla! is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * See COPYRIGHT.php for copyright notices and details.
- * @package Publisher
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @version $Id: request.php 10374 2012-12-12 23:39:48Z trabis $
- */
-
-/**
- * Set the available masks for cleaning variables
- */
-define('PUBLISHER_REQUEST_NOTRIM', 1);
-define('PUBLISHER_REQUEST_ALLOWRAW', 2);
-define('PUBLISHER_REQUEST_ALLOWHTML', 4);
-
-/**
- * PublisherRequest Class
- * This class serves to provide a common interface to access
- * request variables. This includes $_POST, $_GET, and naturally $_REQUEST. Variables
- * can be passed through an input filter to avoid injection or returned raw.
- */
-class PublisherRequest
-{
-
- /**
- * Gets the request method
- *
- * @return string
- */
- static function getMethod()
- {
- $method = strtoupper($_SERVER['REQUEST_METHOD']);
-
- return $method;
- }
-
- /**
- * Fetches and returns a given variable.
- * The default behaviour is fetching variables depending on the
- * current request method: GET and HEAD will result in returning
- * an entry from $_GET, POST and PUT will result in returning an
- * entry from $_POST.
- * You can force the source by setting the $hash parameter:
- * post $_POST
- * get $_GET
- * files $_FILES
- * cookie $_COOKIE
- * env $_ENV
- * server $_SERVER
- * method via current $_SERVER['REQUEST_METHOD']
- * default $_REQUEST
- *
- * @static
- *
- * @param string $name Variable name
- * @param string $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- * @param string $type Return type for the variable, for valid values see {@link JFilterInput::clean()}
- * @param int $mask Filter mask for the variable
- *
- * @return mixed Requested variable
- */
- static function getVar($name, $default = null, $hash = 'default', $type = 'none', $mask = 0)
- {
- // Ensure hash and type are uppercase
- $hash = strtoupper($hash);
- if ($hash === 'METHOD') {
- $hash = strtoupper($_SERVER['REQUEST_METHOD']);
- }
- $type = strtoupper($type);
- // Get the input hash
- switch ($hash) {
- case 'GET' :
- $input = & $_GET;
- break;
- case 'POST' :
- $input = & $_POST;
- break;
- case 'FILES' :
- $input = & $_FILES;
- break;
- case 'COOKIE' :
- $input = & $_COOKIE;
- break;
- case 'ENV' :
- $input = & $_ENV;
- break;
- case 'SERVER' :
- $input = & $_SERVER;
- break;
- default:
- $input = & $_REQUEST;
- $hash = 'REQUEST';
- break;
- }
- if (isset($input[$name]) && $input[$name] !== null) {
- // Get the variable from the input hash and clean it
- $var = PublisherRequest::_cleanVar($input[$name], $mask, $type);
- // Handle magic quotes compatability
- if (get_magic_quotes_gpc() && ($var != $default) && ($hash != 'FILES')) {
- $var = PublisherRequest::_stripSlashesRecursive($var);
- }
- } elseif ($default !== null) {
- // Clean the default value
- $var = PublisherRequest::_cleanVar($default, $mask, $type);
- } else {
- $var = $default;
- }
-
- return $var;
- }
-
- /**
- * Fetches and returns a given filtered variable. The integer
- * filter will allow only digits to be returned. This is currently
- * only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param int $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- *
- * @return integer Requested variable
- */
- static function getInt($name, $default = 0, $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'int');
- }
-
- /**
- * Fetches and returns a given filtered variable. The float
- * filter only allows digits and periods. This is currently
- * only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param float $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- *
- * @return float Requested variable
- */
- static function getFloat($name, $default = 0.0, $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'float');
- }
-
- /**
- * Fetches and returns a given filtered variable. The bool
- * filter will only return true/false bool values. This is
- * currently only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param bool $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- *
- * @return bool Requested variable
- */
- static function getBool($name, $default = false, $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'bool');
- }
-
- /**
- * Fetches and returns a given filtered variable. The word
- * filter only allows the characters [A-Za-z_]. This is currently
- * only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param string $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- *
- * @return string Requested variable
- */
- static function getWord($name, $default = '', $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'word');
- }
-
- /**
- * Fetches and returns a given filtered variable. The cmd
- * filter only allows the characters [A-Za-z0-9.-_]. This is
- * currently only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param string $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- *
- * @return string Requested variable
- */
- static function getCmd($name, $default = '', $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'cmd');
- }
-
- /**
- * Fetches and returns a given filtered variable. The string
- * filter deletes 'bad' HTML code, if not overridden by the mask.
- * This is currently only a proxy function for getVar().
- * See getVar() for more in-depth documentation on the parameters.
- *
- * @static
- *
- * @param string $name Variable name
- * @param string $default Default value if the variable does not exist
- * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
- * @param int $mask Filter mask for the variable
- *
- * @return string Requested variable
- */
- static function getString($name, $default = '', $hash = 'default', $mask = 0)
- {
- // Cast to string, in case JREQUEST_ALLOWRAW was specified for mask
- return (string) PublisherRequest::getVar($name, $default, $hash, 'string', $mask);
- }
-
- static function getArray($name, $default = array(), $hash = 'default')
- {
- return PublisherRequest::getVar($name, $default, $hash, 'array');
- }
-
- static function getText($name, $default = '', $hash = 'default')
- {
- return (string) PublisherRequest::getVar($name, $default, $hash, 'string', PUBLISHER_REQUEST_ALLOWRAW);
- }
-
- /**
- * Set a variabe in on of the request variables
- *
- * @access public
- *
- * @param string $name Name
- * @param string $value Value
- * @param string $hash Hash
- * @param boolean $overwrite Boolean
- *
- * @return string Previous value
- */
- static function setVar($name, $value = null, $hash = 'method', $overwrite = true)
- {
- //If overwrite is true, makes sure the variable hasn't been set yet
- if (!$overwrite && array_key_exists($name, $_REQUEST)) {
- return $_REQUEST[$name];
- }
- // Get the request hash value
- $hash = strtoupper($hash);
- if ($hash === 'METHOD') {
- $hash = strtoupper($_SERVER['REQUEST_METHOD']);
- }
- $previous = array_key_exists($name, $_REQUEST) ? $_REQUEST[$name] : null;
- switch ($hash) {
- case 'GET' :
- $_GET[$name] = $value;
- $_REQUEST[$name] = $value;
- break;
- case 'POST' :
- $_POST[$name] = $value;
- $_REQUEST[$name] = $value;
- break;
- case 'COOKIE' :
- $_COOKIE[$name] = $value;
- $_REQUEST[$name] = $value;
- break;
- case 'FILES' :
- $_FILES[$name] = $value;
- break;
- case 'ENV' :
- $_ENV['name'] = $value;
- break;
- case 'SERVER' :
- $_SERVER['name'] = $value;
- break;
- }
-
- return $previous;
- }
-
- /**
- * Fetches and returns a request array.
- * The default behaviour is fetching variables depending on the
- * current request method: GET and HEAD will result in returning
- * $_GET, POST and PUT will result in returning $_POST.
- * You can force the source by setting the $hash parameter:
- * post $_POST
- * get $_GET
- * files $_FILES
- * cookie $_COOKIE
- * env $_ENV
- * server $_SERVER
- * method via current $_SERVER['REQUEST_METHOD']
- * default $_REQUEST
- *
- * @static
- *
- * @param string $hash to get (POST, GET, FILES, METHOD)
- * @param int $mask Filter mask for the variable
- *
- * @return mixed Request hash
- */
- static function get($hash = 'default', $mask = 0)
- {
- $hash = strtoupper($hash);
- if ($hash === 'METHOD') {
- $hash = strtoupper($_SERVER['REQUEST_METHOD']);
- }
- switch ($hash) {
- case 'GET' :
- $input = $_GET;
- break;
- case 'POST' :
- $input = $_POST;
- break;
- case 'FILES' :
- $input = $_FILES;
- break;
- case 'COOKIE' :
- $input = $_COOKIE;
- break;
- case 'ENV' :
- $input = & $_ENV;
- break;
- case 'SERVER' :
- $input = & $_SERVER;
- break;
- default:
- $input = $_REQUEST;
- break;
- }
- $result = PublisherRequest::_cleanVar($input, $mask);
- // Handle magic quotes compatability
- if (get_magic_quotes_gpc() && ($hash != 'FILES')) {
- $result = PublisherRequest::_stripSlashesRecursive($result);
- }
-
- return $result;
- }
-
- /**
- * Sets a request variable
- *
- * @param array $array An associative array of key-value pairs
- * @param string $hash The request variable to set (POST, GET, FILES, METHOD)
- * @param boolean $overwrite If true and an existing key is found, the value is overwritten, otherwise it is ingored
- */
- static function set($array, $hash = 'default', $overwrite = true)
- {
- foreach ($array as $key => $value) {
- PublisherRequest::setVar($key, $value, $hash, $overwrite);
- }
- }
-
- /**
- * Cleans the request from script injection.
- *
- * @static
- * @return void
- */
- static function clean()
- {
- PublisherRequest::_cleanArray($_FILES);
- PublisherRequest::_cleanArray($_ENV);
- PublisherRequest::_cleanArray($_GET);
- PublisherRequest::_cleanArray($_POST);
- PublisherRequest::_cleanArray($_COOKIE);
- PublisherRequest::_cleanArray($_SERVER);
- if (isset($_SESSION)) {
- PublisherRequest::_cleanArray($_SESSION);
- }
- $REQUEST = $_REQUEST;
- $GET = $_GET;
- $POST = $_POST;
- $COOKIE = $_COOKIE;
- $FILES = $_FILES;
- $ENV = $_ENV;
- $SERVER = $_SERVER;
- if (isset ($_SESSION)) {
- $SESSION = $_SESSION;
- }
- foreach ($GLOBALS as $key => $value) {
- if ($key != 'GLOBALS') {
- unset($GLOBALS[$key]);
- }
- }
- $_REQUEST = $REQUEST;
- $_GET = $GET;
- $_POST = $POST;
- $_COOKIE = $COOKIE;
- $_FILES = $FILES;
- $_ENV = $ENV;
- $_SERVER = $SERVER;
- if (isset($SESSION)) {
- $_SESSION = $SESSION;
- }
- }
-
- /**
- * Adds an array to the GLOBALS array and checks that the GLOBALS variable is not being attacked
- *
- * @access protected
- *
- * @param array $array Array to clean
- * @param boolean $globalise True if the array is to be added to the GLOBALS
- */
- static function _cleanArray(&$array, $globalise = false)
- {
- static $banned = array('_files', '_env', '_get', '_post', '_cookie', '_server', '_session', 'globals');
- foreach ($array as $key => $value) {
- // PHP GLOBALS injection bug
- $failed = in_array(strtolower($key), $banned);
- // PHP Zend_Hash_Del_Key_Or_Index bug
- $failed |= is_numeric($key);
- if ($failed) {
- exit('Illegal variable <strong>' . implode('</strong> or <strong>', $banned) . '</strong> passed to script.');
- }
- if ($globalise) {
- $GLOBALS[$key] = $value;
- }
- }
- }
-
- /**
- * Clean up an input variable.
- *
- * @param mixed $var The input variable.
- * @param int $mask Filter bit mask. 1=no trim: If this flag is cleared and the
- * input is a string, the string will have leading and trailing whitespace
- * trimmed. 2=allow_raw: If set, no more filtering is performed, higher bits
- * are ignored. 4=allow_html: HTML is allowed, but passed through a safe
- * HTML filter first. If set, no more filtering is performed. If no bits
- * other than the 1 bit is set, a strict filter is applied.
- * @param string $type The variable type {@see JFilterInput::clean()}.
- *
- * @return string
- */
- static function _cleanVar($var, $mask = 0, $type = null)
- {
- // Static input filters for specific settings
- static $noHtmlFilter = null;
- static $safeHtmlFilter = null;
- // If the no trim flag is not set, trim the variable
- if (!($mask & 1) && is_string($var)) {
- $var = trim($var);
- }
- // Now we handle input filtering
- if ($mask & 2) {
- // If the allow raw flag is set, do not modify the variable
- } elseif ($mask & 4) {
- // If the allow html flag is set, apply a safe html filter to the variable
- if (is_null($safeHtmlFilter)) {
- $safeHtmlFilter = PublisherFilterInput::getInstance(null, null, 1, 1);
- }
- $var = $safeHtmlFilter->clean($var, $type);
- } else {
- // Since no allow flags were set, we will apply the most strict filter to the variable
- if (is_null($noHtmlFilter)) {
- $noHtmlFilter = PublisherFilterInput::getInstance( /* $tags, $attr, $tag_method, $attr_method, $xss_auto */);
- }
- $var = $noHtmlFilter->clean($var, $type);
- }
-
- return $var;
- }
-
- /**
- * Strips slashes recursively on an array
- *
- * @access protected
- *
- * @param array $value Array of (nested arrays of) strings
- *
- * @return array|string The input array with stripshlashes applied to it
- */
- protected function _stripSlashesRecursive($value)
- {
- $value = is_array($value) ? array_map(array('PublisherRequest', '_stripSlashesRecursive'), $value) : stripslashes($value);
-
- return $value;
- }
-}
-
-/**
- * PublisherInput is a class for filtering input from any data source
- * Forked from the php input filter library by: Daniel Morris <da...@ro...>
- * Original Contributors: Gianpaolo Racca, Ghislain Picard, Marco Wandschneider, Chris Tobin and Andrew Eddie.
- *
- * @author Louis Landry <lou...@jo...>
- */
-class PublisherFilterInput
-{
- var $tagsArray; // default = empty array
- var $attrArray; // default = empty array
- var $tagsMethod; // default = 0
- var $attrMethod; // default = 0
- var $xssAuto; // default = 1
- var $tagBlacklist = array('applet', 'body', 'bgsound', 'base', 'basefont', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml');
- var $attrBlacklist = array('action', 'background', 'codebase', 'dynsrc', 'lowsrc'); // also will strip ALL event handlers
- /**
- * Constructor for inputFilter class. Only first parameter is required.
- *
- * @access protected
- *
- * @param array $tagsArray list of user-defined tags
- * @param array $attrArray list of user-defined attributes
- * @param int $tagsMethod WhiteList method = 0, BlackList method = 1
- * @param int $attrMethod WhiteList method = 0, BlackList method = 1
- * @param int $xssAuto Only auto clean essentials = 0, Allow clean blacklisted tags/attr = 1
- */
- public function __construct($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1)
- {
- // Make sure user defined arrays are in lowercase
- $tagsArray = array_map('strtolower', (array) $tagsArray);
- $attrArray = array_map('strtolower', (array) $attrArray);
- // Assign member variables
- $this->tagsArray = $tagsArray;
- $this->attrArray = $attrArray;
- $this->tagsMethod = $tagsMethod;
- $this->attrMethod = $attrMethod;
- $this->xssAuto = $xssAuto;
- }
-
- /**
- * Returns a reference to an input filter object, only creating it if it doesn't already exist.
- * This method must be invoked as:
- * <pre> $filter = & PublisherFilterInput::getInstance();</pre>
- *
- * @static
- *
- * @param array $tagsArray list of user-defined tags
- * @param array $attrArray list of user-defined attributes
- * @param int $tagsMethod WhiteList method = 0, BlackList method = 1
- * @param int $attrMethod WhiteList method = 0, BlackList method = 1
- * @param int $xssAuto Only auto clean essentials = 0, Allow clean blacklisted tags/attr = 1
- *
- * @return object The PublisherFilterInput object.
- * @since 1.5
- */
- public function & getInstance($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1)
- {
- static $instances;
- $sig = md5(serialize(array($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto)));
- if (!isset ($instances)) {
- $instances = array();
- }
- if (empty ($instances[$sig])) {
- $instances[$sig] = new PublisherFilterInput($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto);
- }
-
- return $instances[$sig];
- }
-
- /**
- * Method to be called by another php script. Processes for XSS and
- * specified bad code.
- *
- * @access public
- *
- * @param mixed $source Input string/array-of-string to be 'cleaned'
- * @param string $type Return type for the variable (INT, FLOAT, BOOLEAN, WORD, ALNUM, CMD, BASE64, STRING, ARRAY, PATH, NONE)
- *
- * @return mixed 'Cleaned' version of input parameter
- * @static
- */
- public function clean($source, $type = 'string')
- {
- // Handle the type constraint
- switch (strtoupper($type)) {
- case 'INT' :
- case 'INTEGER' :
- // Only use the first integer value
- preg_match('/-?[0-9]+/', (string) $source, $matches);
- $result = @ (int) $matches[0];
- break;
- case 'FLOAT' :
- case 'DOUBLE' :
- // Only use the first floating point value
- preg_match('/-?[0-9]+(\.[0-9]+)?/', (string) $source, $matches);
- $result = @ (float) $matches[0];
- break;
- case 'BOOL' :
- case 'BOOLEAN' :
- $result = (bool) $source;
- break;
- case 'WORD' :
- $result = (string) preg_replace('/[^A-Z_]/i', '', $source);
- break;
- case 'ALNUM' :
- $result = (string) preg_replace('/[^A-Z0-9]/i', '', $source);
- break;
- case 'CMD' :
- $result = (string) preg_replace('/[^A-Z0-9_\.-]/i', '', $source);
- $result = ltrim($result, '.');
- break;
- case 'BASE64' :
- $result = (string) preg_replace('/[^A-Z0-9\/+=]/i', '', $source);
- break;
- case 'STRING' :
- // Check for static usage and assign $filter the proper variable
- if (isset($this) && is_a($this, 'PublisherFilterInput')) {
- $filter =& $this;
- } else {
- $filter = PublisherFilterInput::getInstance();
- }
- $result = (string) $filter->_remove($filter->_decode((string) $source));
- break;
- case 'ARRAY' :
- $result = (array) $source;
- break;
- case 'PATH' :
- $pattern = '/^[A-Za-z0-9_-]+[A-Za-z0-9_\.-]*([\\\\\/][A-Za-z0-9_-]+[A-Za-z0-9_\.-]*)*$/';
- preg_match($pattern, (string) $source, $matches);
- $result = @ (string) $matches[0];
- break;
- case 'USERNAME' :
- $result = (string) preg_replace('/[\x00-\x1F\x7F<>"\'%&]/', '', $source);
- break;
- default :
- // Check for static usage and assign $filter the proper variable
- if (is_object($this) && get_class($this) == 'PublisherFilterInput') {
- $filter =& $this;
- } else {
- $filter = PublisherFilterInput::getInstance();
- }
- // Are we dealing with an array?
- if (is_array($source)) {
- foreach ($source as $key => $value) {
- // filter element for XSS and other 'bad' code etc.
- if (is_string($value)) {
- $source[$key] = $filter->_remove($filter->_decode($value));
- }
- }
- $result = $source;
- } else {
- // Or a string?
- if (is_string($source) && !empty ($source)) {
- // filter source for XSS and other 'bad' code etc.
- $result = $filter->_remove($filter->_decode($source));
- } else {
- // Not an array or string.. return the passed parameter
- $result = $source;
- }
- }
- break;
- }
-
- return $result;
- }
-
- /**
- * Function to determine if contents of an attribute is safe
- *
- * @static
- *
- * @param array $attrSubSet A 2 element array for attributes name,value
- *
- * @return boolean True if bad code is detected
- */
- public function checkAttribute($attrSubSet)
- {
- $attrSubSet[0] = strtolower($attrSubSet[0]);
- $attrSubSet[1] = strtolower($attrSubSet[1]);
-
- return (((strpos($attrSubSet[1], 'expression') !== false) && ($attrSubSet[0]) == 'style') || (strpos($attrSubSet[1], 'javascript:') !== false) || (strpos($attrSubSet[1], 'behaviour:') !== false) || (strpos($attrSubSet[1], 'vbscript:') !== false) || (strpos($attrSubSet[1], 'mocha:') !== false) || (strpos($attrSubSet[1], 'livescript:') !== false));
- }
-
- /**
- * Internal method to iteratively remove all unwanted tags and attributes
- *
- * @access protected
- *
- * @param string $source Input string to be 'cleaned'
- *
- * @return string 'Cleaned' version of input parameter
- */
- protected function _remove($source)
- {
- $loopCounter = 0;
- // Iteration provides nested tag protection
- while ($source != $this->_cleanTags($source)) {
- $source = $this->_cleanTags($source);
- $loopCounter++;
- }
-
- return $source;
- }
-
- /**
- * Internal method to strip a string of certain tags
- *
- * @access protected
- *
- * @param string $source Input string to be 'cleaned'
- *
- * @return string 'Cleaned' version of input parameter
- */
- protected function _cleanTags($source)
- {
- /*
- * In the beginning we don't really have a tag, so everything is
- * postTag
- */
- $preTag = null;
- $postTag = $source;
- // Is there a tag? If so it will certainly start with a '<'
- $tagOpen_start = strpos($source, '<');
- while ($tagOpen_start !== false) {
- // Get some information about the tag we are processing
- $preTag .= substr($postTag, 0, $tagOpen_start);
- $postTag = substr($postTag, $tagOpen_start);
- $fromTagOpen = substr($postTag, 1);
- $tagOpen_end = strpos($fromTagOpen, '>');
- // Let's catch any non-terminated tags and skip over them
- if ($tagOpen_end === false) {
- $postTag = substr($postTag, $tagOpen_start + 1);
- $tagOpen_start = strpos($postTag, '<');
- continue;
- }
- // Do we have a nested tag?
- $tagOpen_nested = strpos($fromTagOpen, '<');
- if (($tagOpen_nested !== false) && ($tagOpen_nested < $tagOpen_end)) {
- $preTag .= substr($postTag, 0, ($tagOpen_nested + 1));
- $postTag = substr($postTag, ($tagOpen_nested + 1));
- $tagOpen_start = strpos($postTag, '<');
- continue;
- }
- // Lets get some information about our tag and setup attribute pairs
- $currentTag = substr($fromTagOpen, 0, $tagOpen_end);
- $tagLength = strlen($currentTag);
- $tagLeft = $currentTag;
- $attrSet = array();
- $currentSpace = strpos($tagLeft, ' ');
- // Are we an open tag or a close tag?
- if (substr($currentTag, 0, 1) == '/') {
- // Close Tag
- $isCloseTag = true;
- list ($tagName) = explode(' ', $currentTag);
- $tagName = substr($tagName, 1);
- } else {
- // Open Tag
- $isCloseTag = false;
- list ($tagName) = explode(' ', $currentTag);
- }
- /*
- * Exclude all "non-regular" tagnames
- * OR no tagname
- * OR remove if xssauto is on and tag is blacklisted
- */
- if ((!preg_match("/^[a-z][a-z0-9]*$/i", $tagName)) || (!$tagName) || ((in_array(strtolower($tagName), $this->tagBlacklist)) && ($this->xssAuto))) {
- $postTag = substr($postTag, ($tagLength + 2));
- $tagOpen_start = strpos($postTag, '<');
- // Strip tag
- continue;
- }
- /*
- * Time to grab any attributes from the tag... need this section in
- * case attributes have spaces in the values.
- */
- while ($currentSpace !== false) {
- $attr = '';
- $fromSpace = substr($tagLeft, ($currentSpace + 1));
- $nextSpace = strpos($fromSpace, ' ');
- $openQuotes = strpos($fromSpace, '"');
- $closeQuotes = strpos(substr($fromSpace, ($openQuotes + 1)), '"') + $openQuotes + 1;
- // Do we have an attribute to process? [check for equal sign]
- if (strpos($fromSpace, '=') !== false) {
- /*
- * If the attribute value is wrapped in quotes we need to
- * grab the substring from the closing quote, otherwise grab
- * till the next space
- */
- if (($openQuotes !== false) && (strpos(substr($fromSpace, ($openQuotes + 1)), '"') !== false)) {
- $attr = substr($fromSpace, 0, ($closeQuotes + 1));
- } else {
- $attr = substr($fromSpace, 0, $nextSpace);
- }
- } else {
- /*
- * No more equal signs so add any extra text in the tag into
- * the attribute array [eg. checked]
- */
- if ($fromSpace != '/') {
- $attr = substr($fromSpace, 0, $nextSpace);
- }
- }
- // Last Attribute Pair
- if (!$attr && $fromSpace != '/') {
- $attr = $fromSpace;
- }
- // Add attribute pair to the attribute array
- $attrSet[] = $attr;
- // Move search point and continue iteration
- $tagLeft = substr($fromSpace, strlen($attr));
- $currentSpace = strpos($tagLeft, ' ');
- }
- // Is our tag in the user input array?
- $tagFound = in_array(strtolower($tagName), $this->tagsArray);
- // If the tag is allowed lets append it to the output string
- if ((!$tagFound && $this->tagsMethod) || ($tagFound && !$this->tagsMethod)) {
- // Reconstruct tag with allowed attributes
- if (!$isCloseTag) {
- // Open or Single tag
- $attrSet = $this->_cleanAttributes($attrSet);
- $preTag .= '<' . $tagName;
- for ($i = 0; $i < count($attrSet); ++$i) {
- $preTag .= ' ' . $attrSet[$i];
- }
- // Reformat single tags to XHTML
- if (strpos($fromTagOpen, '</' . $tagName)) {
- $preTag .= '>';
- } else {
- $preTag .= ' />';
- }
- } else {
- // Closing Tag
- $preTag .= '</' . $tagName . '>';
- }
- }
- // Find next tag's start and continue iteration
- $postTag = substr($postTag, ($tagLength + 2));
- $tagOpen_start = strpos($postTag, '<');
- }
- // Append any code after the end of tags and return
- if ($postTag != '<') {
- $preTag .= $postTag;
- }
-
- return $preTag;
- }
-
- /**
- * Internal method to strip a tag of certain attributes
- *
- * @access protected
- *
- * @param array $attrSet Array of attribute pairs to filter
- *
- * @return array Filtered array of attribute pairs
- */
- protected function _cleanAttributes($attrSet)
- {
- // Initialize variables
- $newSet = array();
- // Iterate through attribute pairs
- for ($i = 0; $i < count($attrSet); ++$i) {
- // Skip blank spaces
- if (!$attrSet[$i]) {
- continue;
- }
- // Split into name/value pairs
- $attrSubSet = explode('=', trim($attrSet[$i]), 2);
- list ($attrSubSet[0]) = explode(' ', $attrSubSet[0]);
- /*
- * Remove all "non-regular" attribute names
- * AND blacklisted attributes
- */
- if ((!preg_match('/[a-z]*$/i', $attrSubSet[0])) || (($this->xssAuto) && ((in_array(strtolower($attrSubSet[0]), $this->attrBlacklist)) || (substr($attrSubSet[0], 0, 2) == 'on')))) {
- continue;
- }
- // XSS attribute value filtering
- if ($attrSubSet[1]) {
- // strips unicode, hex, etc
- $attrSubSet[1] = str_replace('&#', '', $attrSubSet[1]);
- // strip normal newline within attr value
- $attrSubSet[1] = preg_replace('/[\n\r]/', '', $attrSubSet[1]);
- // strip double quotes
- $attrSubSet[1] = str_replace('"', '', $attrSubSet[1]);
- // convert single quotes from either side to doubles (Single quotes shouldn't be used to pad attr value)
- if ((substr($attrSubSet[1], 0, 1) == "'") && (substr($attrSubSet[1], (strlen($attrSubSet[1]) - 1), 1) == "'")) {
- $attrSubSet[1] = substr($attrSubSet[1], 1, (strlen($attrSubSet[1]) - 2));
- }
- // strip slashes
- $attrSubSet[1] = stripslashes($attrSubSet[1]);
- }
- // Autostrip script tags
- if (PublisherFilterInput::checkAttribute($attrSubSet)) {
- continue;
- }
- // Is our attribute in the user input array?
- $attrFound = in_array(strtolower($attrSubSet[0]), $this->attrArray);
- // If the tag is allowed lets keep it
- if ((!$attrFound && $this->attrMethod) || ($attrFound && !$this->attrMethod)) {
- // Does the attribute have a value?
- if ($attrSubSet[1]) {
- $newSet[] = $attrSubSet[0] . '="' . $attrSubSet[1] . '"';
- } elseif ($attrSubSet[1] == "0") {
- /*
- * Special Case
- * Is the value 0?
- */
- $newSet[] = $attrSubSet[0] . '="0"';
- } else {
- $newSet[] = $attrSubSet[0] . '="' . $attrSubSet[0] . '"';
- }
- }
- }
-
- return $newSet;
- }
-
- /**
- * Try to convert to plaintext
- *
- * @access protected
- *
- * @param string $source
- *
- * @return string Plaintext string
- */
- protected function _decode($source)
- {
-
- /*
- // entity decode
- $trans_tbl = get_html_translation_table(HTML_ENTITIES);
- foreach ($trans_tbl as $k => $v) {
- $ttr[$v] = utf8_encode($k);
- }
- $source = strtr($source, $ttr);
- // convert decimal
- $source = preg_replace('/&#(\d+);/me', "chr(\\1)", $source); // decimal notation
- // convert hex
- $source = preg_replace('/&#x([a-f0-9]+);/mei', "chr(0x\\1)", $source); // hex notation
-*/
-
- // url decode
- $charset = defined('_CHARSET') ? constant('_CHARSET') : 'utf-8';
- $source = html_entity_decode($source, ENT_QUOTES, $charset);
- // convert decimal
- $source = preg_replace_callback(
- '/&#(\d+);/m',
- create_function('$matches', "return chr(\$matches[1]);"),
- $source
- );
- // convert hex
- $source = preg_replace_callback(
- '/&#x([a-f0-9]+);/mi',
- create_function('$matches', "return chr('0x'.\$matches[1]);"),
- $source
- ); // hex notation
-
- return $source;
- }
-}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -22,8 +22,8 @@
include_once __DIR__ . '/header.php';
xoops_loadLanguage('admin', PUBLISHER_DIRNAME);
-$op = PublisherRequest::getString('op');
-$fileid = PublisherRequest::getInt('fileid');
+$op = XoopsRequest::getString('op');
+$fileid = XoopsRequest::getInt('fileid');
if ($fileid == 0) {
redirect_header("index.php", 2, _MD_PUBLISHER_NOITEMSELECTED);
@@ -71,9 +71,9 @@
}
// Putting the values in the file object
- $fileObj->setVar('name', PublisherRequest::getString('name'));
- $fileObj->setVar('description', PublisherRequest::getString('description'));
- $fileObj->setVar('status', PublisherRequest::getInt('file_status'));
+ $fileObj->setVar('name', XoopsRequest::getString('name'));
+ $fileObj->setVar('description', XoopsRequest::getString('description'));
+ $fileObj->setVar('status', XoopsRequest::getInt('file_status'));
// attach file if any
if (isset($_FILES['item_upload_file']) && $_FILES['item_upload_file']['name'] != "") {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -37,8 +37,11 @@
include_once PUBLISHER_ROOT_PATH . '/class/metagen.php';
include_once PUBLISHER_ROOT_PATH . '/class/session.php';
include_once PUBLISHER_ROOT_PATH . '/class/publisher.php';
-include_once PUBLISHER_ROOT_PATH . '/class/request.php';
+//include_once PUBLISHER_ROOT_PATH . '/class/request.php';
+xoops_load('XoopsRequest');
+xoops_load('XoopsFilterInput');
+
$debug = false;
$publisher = PublisherPublisher::getInstance($debug);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -23,10 +23,10 @@
include_once __DIR__ . '/header.php';
// At which record shall we start for the Categories
-$catstart = PublisherRequest::getInt('catstart');
+$catstart = XoopsRequest::getInt('catstart');
// At which record shall we start for the ITEM
-$start = PublisherRequest::getInt('start');
+$start = XoopsRequest::getInt('start');
// Number of categories at the top level
$totalCategories = $publisher->getHandler('category')->getCategoriesCount(0);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -22,8 +22,8 @@
include_once __DIR__ . '/header.php';
-$itemid = PublisherRequest::getInt('itemid');
-$item_page_id = PublisherRequest::getInt('page', -1);
+$itemid = XoopsRequest::getInt('itemid');
+$item_page_id = XoopsRequest::getInt('page', -1);
if ($itemid == 0) {
redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOITEMSELECTED);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/print.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/print.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/print.php 2014-10-02 23:04:01 UTC (rev 12804)
@@ -23,7 +23,7 @@
include_once __DIR__ . '/header.php';
require_once XOOPS_ROOT_PATH . '/class/template.php';
-$itemid = PublisherRequest::getInt('itemid');
+$itemid = XoopsRequest::getInt('itemid');
if ($itemid == 0) {
redirect_header("javascript:history.go(-1)", 1, _MD_PUBLISHER_NOITEMSELECTED);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php 2014-10-02 22:58:58 UTC (rev 12803)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php 2014-10-02 23:04:0...
[truncated message content] |
|
From: <be...@us...> - 2014-10-02 23:07:19
|
Revision: 12806
http://sourceforge.net/p/xoops/svn/12806
Author: beckmi
Date: 2014-10-02 23:07:10 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
started conversion to PSR-2 coding
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.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/mimetype.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -196,7 +196,7 @@
}
$item['pdf'] = '';
- if ($this->publisher->getConfig('display_pdf')) {
+ if ($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/class/form/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -33,15 +33,15 @@
* @var PublisherPublisher
* @access public
*/
- var $publisher = null;
+ public $publisher = null;
- var $targetObject = null;
+ public $targetObject = null;
- var $subCatsCount = 4;
+ public $subCatsCount = 4;
- var $userGroups = array();
+ public $userGroups = array();
- function __construct(&$target, $subCatsCount = 4)
+ public function __construct(&$target, $subCatsCount = 4)
{
$this->publisher = PublisherPublisher::getInstance();
@@ -58,7 +58,7 @@
$this->createButtons();
}
- function createElements()
+ public function createElements()
{
global $xoopsUser;
@@ -210,7 +210,7 @@
$this->addElement(new XoopsFormHidden('nb_sub_yet', $this->subCatsCount));
}
- function createButtons()
+ public function createButtons()
{
// Action buttons tray
$button_tray = new XoopsFormElementTray('', '');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -34,11 +34,11 @@
* @var PublisherPublisher
* @access public
*/
- var $publisher = null;
+ public $publisher = null;
- var $targetObject = null;
+ public $targetObject = null;
- function __construct(&$target)
+ public function __construct(&$target)
{
$this->publisher = PublisherPublisher::getInstance();
$this->targetObject = $target;
@@ -50,7 +50,7 @@
$this->createButtons();
}
- function createElements()
+ public function createElements()
{
global $xoopsDB, $xoopsUser;
// NAME
@@ -81,7 +81,7 @@
$this->addElement(new XoopsFormHidden('itemid', $this->targetObject->itemid()));
}
- function createButtons()
+ public function createButtons()
{
$files_button_tray = new XoopsFormElementTray('', '');
$files_hidden = new XoopsFormHidden('op', 'uploadfile');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -34,15 +34,15 @@
class PublisherItemForm extends PublisherThemeTabForm
{
- var $checkperm = true;
- var $tabs = array(
+ public $checkperm = true;
+ public $tabs = array(
_CO_PUBLISHER_TAB_MAIN => 'mainTab',
_CO_PUBLISHER_TAB_IMAGES => 'imagesTab',
_CO_PUBLISHER_TAB_FILES => 'filesTab',
_CO_PUBLISHER_TAB_OTHERS => 'othersTab'
);
- var $mainTab = array(
+ public $mainTab = array(
_PUBLISHER_SUBTITLE,
_PUBLISHER_ITEM_SHORT_URL,
_PUBLISHER_ITEM_TAG,
@@ -60,11 +60,11 @@
_PUBLISHER_UID
);
- var $imagesTab = array(
+ public $imagesTab = array(
_PUBLISHER_IMAGE_ITEM
);
- var $filesTab = array(
+ public $filesTab = array(
_PUBLISHER_ITEM_UPLOAD_FILE
);
@@ -75,12 +75,12 @@
_PUBLISHER_ALLOWCOMMENTS
);
- function setCheckPermissions($checkperm)
+ public function setCheckPermissions($checkperm)
{
$this->checkperm = (bool) $checkperm;
}
- function isGranted($item)
+ public function isGranted($item)
{
$publisher = PublisherPublisher::getInstance();
$ret = false;
@@ -91,7 +91,7 @@
return $ret;
}
- function hasTab($tab)
+ public function hasTab($tab)
{
if (!isset($tab) || !isset($this->tabs[$tab])) {
return false;
@@ -108,7 +108,7 @@
return false;
}
- function createElements($obj)
+ public function createElements($obj)
{
global $xoopsConfig, $xoopsUser;
@@ -366,13 +366,13 @@
$GLOBALS['xoTheme']->addScript(PUBLISHER_URL . '/assets/js/ajaxupload.3.9.js');
$js_data = new XoopsFormLabel('', '
<script type= "text/javascript">/*<![CDATA[*/
-$publisher(document).ready(function(){
+$publisher(document).ready(function () {
var button = $publisher("#publisher_upload_button"), interval;
new AjaxUpload(button,{
action: "' . PUBLISHER_URL . '/include/ajax_upload.php", // I disabled uploads in this example for security reasons
responseType: "text/html",
name: "publisher_upload_file",
- onSubmit : function(file, ext){
+ onSubmit : function (file, ext) {
// change button text, when user selects file
$publisher("#publisher_upload_message").html(" ");
button.html("<img src=\'' . PUBLISHER_URL . '/assets/images/loadingbar.gif\'/>"); this.setData({
@@ -382,10 +382,10 @@
// If you want to allow uploading only 1 file at time,
// you can disable upload button
this.disable();
- interval = window.setInterval(function(){
+ interval = window.setInterval(function () {
}, 200);
},
- onComplete: function(file, response){
+ onComplete: function (file, response) {
button.text("' . _CO_PUBLISHER_IMAGE_UPLOAD_NEW . '");
window.clearInterval(interval);
// enable upload button
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -365,7 +365,7 @@
$this->initVar('mime_id', XOBJ_DTYPE_INT, null, false);
$this->initVar('mime_ext', XOBJ_DTYPE_TXTBOX, null, true, 60);
$this->initVar('mime_types', XOBJ_DTYPE_TXTAREA, null, false, 1024);
- $this->initVar('mime_name', XOBJ_DTYPE_TXTBOX, NULL, true, 255);
+ $this->initVar('mime_name', XOBJ_DTYPE_TXTBOX, null, true, 255);
$this->initVar('mime_admin', XOBJ_DTYPE_INT, null, false);
$this->initVar('mime_user', XOBJ_DTYPE_INT, null, false);
if (isset($id)) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -23,12 +23,12 @@
class PublisherPublisher
{
- var $dirname;
- var $module;
- var $handler;
- var $config;
- var $debug;
- var $debugArray = array();
+ public $dirname;
+ public $module;
+ public $handler;
+ public $config;
+ public $debug;
+ public $debugArray = array();
protected function __construct($debug)
{
@@ -36,7 +36,7 @@
$this->dirname = basename(dirname(__DIR__));
}
- static function &getInstance($debug = false)
+ public static function &getInstance($debug = false)
{
static $instance = false;
if (!$instance) {
@@ -46,7 +46,7 @@
return $instance;
}
- function &getModule()
+ public function &getModule()
{
if ($this->module == null) {
$this->initModule();
@@ -55,7 +55,7 @@
return $this->module;
}
- function getConfig($name = null)
+ public function getConfig($name = null)
{
if ($this->config == null) {
$this->initConfig();
@@ -75,7 +75,7 @@
return $this->config[$name];
}
- function setConfig($name = null, $value = null)
+ public function setConfig($name = null, $value = null)
{
if ($this->config == null) {
$this->initConfig();
@@ -86,7 +86,7 @@
return $this->config[$name];
}
- function &getHandler($name)
+ public function &getHandler($name)
{
if (!isset($this->handler[$name . '_handler'])) {
$this->initHandler($name);
@@ -96,7 +96,7 @@
return $this->handler[$name . '_handler'];
}
- function initModule()
+ public function initModule()
{
global $xoopsModule;
if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $this->dirname) {
@@ -108,20 +108,20 @@
$this->addLog('INIT MODULE');
}
- function initConfig()
+ public function initConfig()
{
$this->addLog('INIT CONFIG');
$hModConfig = xoops_gethandler('config');
$this->config = $hModConfig->getConfigsByCat(0, $this->getModule()->getVar('mid'));
}
- function initHandler($name)
+ public function initHandler($name)
{
$this->addLog('INIT ' . $name . ' HANDLER');
$this->handler[$name . '_handler'] = xoops_getModuleHandler($name, $this->dirname);
}
- function addLog($log)
+ public function addLog($log)
{
if ($this->debug) {
if (is_object($GLOBALS['xoopsLogger'])) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -34,63 +34,63 @@
*/
class PublisherThemeTabForm extends XoopsForm
{
- var $_tabs;
+ public $_tabs;
/**
* "action" attribute for the html form
*
* @var string
*/
- var $_action;
+ public $_action;
/**
* "method" attribute for the form.
*
* @var string
*/
- var $_method;
+ public $_method;
/**
* "name" attribute of the form
*
* @var string
*/
- var $_name;
+ public $_name;
/**
* title for the form
*
* @var string
*/
- var $_title;
+ public $_title;
/**
* summary for the form (WGAC2 Requirement)
*
* @var string
*/
- var $_summary = '';
+ public $_summary = '';
/**
* array of {@link XoopsFormElement} objects
*
* @var array
*/
- var $_elements = array();
+ public $_elements = array();
/**
* extra information for the <form> tag
*
* @var array
*/
- var $_extra = array();
+ public $_extra = array();
/**
* required elements
*
* @var array
*/
- var $_required = array();
+ public $_required = array();
/**
* @param string $title
@@ -121,7 +121,7 @@
}
}
- //function render(){}
+ //function render() {}
public function assign(&$tpl)
{
$i = -1;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -80,27 +80,27 @@
mt_srand((double) microtime() * 1000000);
class XoopsMediaUploader
{
- var $mediaName;
- var $mediaType;
- var $mediaSize;
- var $mediaTmpName;
- var $mediaError;
- var $uploadDir = '';
- var $allowedMimeTypes = array();
- var $maxFileSize = 0;
- var $maxWidth;
- var $maxHeight;
- var $targetFileName;
- var $prefix;
- var $ext;
- var $dimension;
- var $errors = array();
- var $savedDestination;
- var $savedFileName;
+ public $mediaName;
+ public $mediaType;
+ public $mediaSize;
+ public $mediaTmpName;
+ public $mediaError;
+ public $uploadDir = '';
+ public $allowedMimeTypes = array();
+ public $maxFileSize = 0;
+ public $maxWidth;
+ public $maxHeight;
+ public $targetFileName;
+ public $prefix;
+ public $ext;
+ public $dimension;
+ public $errors = array();
+ public $savedDestination;
+ public $savedFileName;
/**
* No admin check for uploads
*/
- var $noadmin_sizecheck;
+ public $noadmin_sizecheck;
/**
* Constructor
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php 2014-10-02 23:04:57 UTC (rev 12805)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php 2014-10-02 23:07:10 UTC (rev 12806)
@@ -24,11 +24,11 @@
class MyTextSanitizerExtension
{
- function MyTextSanitizerExtension()
+ public function MyTextSanitizerExtension()
{
}
- function &getInstance()
+ public function &getInstance()
{
static $instance;
if (!isset($instance)) {
@@ -38,7 +38,7 @@
return $instance;
}
- function wmp(&$patterns, &$replacements)
+ public function wmp(&$patterns, &$replacements)
{
$patterns[] = "/\[wmp=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/wmp\]/sU";
$rp = "<object classid=\"clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6\" id=\"WindowsMediaPlayer\" width=\"\\2\" height=\"\\3\">\n";
@@ -49,7 +49,7 @@
$replacements[] = $rp;
}
- function _displayFlash($url, $width = false, $height = false)
+ public function _displayFlash($url, $width = false, $height = false)
{
if (!$width || !$height) {
if (!$dimension = @getimagesize($url)) {
@@ -75,13 +75,13 @@
return $rp;
}
- function flash(&$patterns, &$replacements)
+ public function flash(&$patterns, &$replacements)
{
$patterns[] = "/\[(swf|flash)=(['\"]?)([^\"']*),([^\"']*)\\2]([^\"]*)\[\/\\1\]/esU";
$replacements[] = "MyTextSanitizerExtension::_displayFlash( '\\5', '\\3', '\\4' )";
}
- function mms(&$patterns, &$replacements)
+ public function mms(&$patterns, &$replacements)
{
$patterns[] = "/\[mms=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/mms\]/sU";
$rp = "<OBJECT id=videowindow1 height='\\3' width='\\2' classid='CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6'>";
@@ -114,7 +114,7 @@
$replacements[] = $rp;
}
- function rtsp(&$patterns, &$replacements)
+ public function rtsp(&$patterns, &$replacements)
{
$patterns[] = "/\[rtsp=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/rtsp\]/sU";
$rp = "<object classid=\"clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA\" HEIGHT='\\3' ID=Player WIDTH='\\2' VIEWASTEXT>";
|
|
From: <be...@us...> - 2014-10-02 23:09:02
|
Revision: 12807
http://sourceforge.net/p/xoops/svn/12807
Author: beckmi
Date: 2014-10-02 23:08:57 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
redesigned archives section to have months horizontally, added count of articles
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_archive.tpl
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-10-02 23:07:10 UTC (rev 12806)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2014-10-02 23:08:57 UTC (rev 12807)
@@ -68,46 +68,70 @@
$criteria->setSort('datesub');
$criteria->setOrder('DESC');
//Get all articles dates as an array to save memory
-$items = $publisher->getHandler('item')->getAll($criteria, array('datesub'), false);
+$items = $publisher->getHandler('item')->getAll($criteria, array('datesub'), false);
$itemsCount = count($items);
if (!($itemsCount > 0)) {
redirect_header(XOOPS_URL, 2, _MD_PUBLISHER_NO_TOP_PERMISSIONS);
exit;
} else {
- $years = array();
+ $years = array();
$months = array();
- $i = 0;
+ $i = 0;
foreach ($items as $item) {
$time = XoopsLocal::formatTimestamp($item['datesub'], 'mysql', $useroffset);
if (preg_match("/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})/", $time, $datetime)) {
- $this_year = intval($datetime[1]);
+ $this_year = intval($datetime[1]);
$this_month = intval($datetime[2]);
+ //first year
if (empty($lastyear)) {
- $lastyear = $this_year;
+ $lastyear = $this_year;
+ $articlesThisYear = 0;
+ $articlesThisMonth = 0;
}
+ //first month of the year reset
if ($lastmonth == 0) {
- $lastmonth = $this_month;
+ $lastmonth = $this_month;
$months[$lastmonth]['string'] = $months_arr[$lastmonth];
$months[$lastmonth]['number'] = $lastmonth;
+// $months[$lastmonth]['articlesMonthCount'] = 1;
+ $articlesThisMonth = 0;
}
+ //new year
if ($lastyear != $this_year) {
$years[$i]['number'] = $lastyear;
$years[$i]['months'] = $months;
- $months = array();
- $lastmonth = 0;
- $lastyear = $this_year;
+
+ $years[$i]['articlesYearCount'] = $articlesThisYear;
+
+ $months = array();
+ $lastmonth = 0;
+ $lastyear = $this_year;
+ $articlesThisYear = 0;
+ $articlesThisMonth = 0;
++$i;
}
+ //new month
if ($lastmonth != $this_month) {
- $lastmonth = $this_month;
- $months[$lastmonth]['string'] = $months_arr[$lastmonth];
- $months[$lastmonth]['number'] = $lastmonth;
+ if ($articlesThisMonth > 0) {
+ $months[$lastmonth]['articlesMonthCount'] = $articlesThisMonth;
+ }
+ $lastmonth = $this_month;
+ $months[$lastmonth]['string'] = $months_arr[$lastmonth];
+ $months[$lastmonth]['number'] = $lastmonth;
+ $months[$lastmonth]['articlesMonthCount'] = 1;
+ $articlesThisMonth = 0;
}
+
+ ++$articlesThisMonth;
+ ++$articlesThisYear;
}
}
$years[$i]['number'] = $this_year;
$years[$i]['months'] = $months;
+
+ $years[$i]['articlesYearCount'] = $articlesThisYear;
+
$xoopsTpl->assign('years', $years);
}
unset($items);
@@ -124,19 +148,19 @@
// must adjust the selected time to server timestamp
$timeoffset = $useroffset - $xoopsConfig['server_TZ'];
$monthstart = mktime(0 - $timeoffset, 0, 0, $frommonth, 1, $fromyear);
- $monthend = mktime(23 - $timeoffset, 59, 59, $frommonth + 1, 0, $fromyear);
- $monthend = ($monthend > time()) ? time() : $monthend;
+ $monthend = mktime(23 - $timeoffset, 59, 59, $frommonth + 1, 0, $fromyear);
+ $monthend = ($monthend > time()) ? time() : $monthend;
$count = 0;
- $itemhandler = $publisher->getHandler('item');
- $itemhandler->table_link = $xoopsDB->prefix('publisher_categories');
- $itemhandler->field_link = 'categoryid';
+ $itemhandler = $publisher->getHandler('item');
+ $itemhandler->table_link = $xoopsDB->prefix('publisher_categories');
+ $itemhandler->field_link = 'categoryid';
$itemhandler->field_object = 'categoryid';
// Categories for which user has access
$categoriesGranted =& $publisher->getHandler('permission')->getGrantedItems('category_read');
$grantedCategories = new Criteria('l.categoryid', "(" . implode(',', $categoriesGranted) . ")", 'IN');
- $criteria = new CriteriaCompo();
+ $criteria = new CriteriaCompo();
$criteria->add($grantedCategories, 'AND');
$criteria->add(new Criteria('o.status', 2), 'AND');
$critdatesub = new CriteriaCompo();
@@ -151,20 +175,17 @@
$count = count($storyarray);
if (is_array($storyarray) && $count > 0) {
foreach ($storyarray as $item) {
- $story = array();
+ $story = array();
$htmltitle = '';
- $story['title'] = "<a href='" . XOOPS_URL . '/modules/publisher/category.php?categoryid='
- . $item->categoryid() . "'>"
- . $item->getCategoryName() . "</a>: <a href='"
- . $item->getItemUrl() . "'" . $htmltitle . ">"
- . $item->title() . "</a>";
- $story['counter'] = $item->counter();
- $story['date'] = $item->datesub();
+ $story['title']
+ =
+ "<a href='" . XOOPS_URL . '/modules/publisher/category.php?categoryid=' . $item->categoryid() . "'>" . $item->getCategoryName() . "</a>: <a href='" . $item->getItemUrl() . "'"
+ . $htmltitle . ">" . $item->title() . "</a>";
+ $story['counter'] = $item->counter();
+ $story['date'] = $item->datesub();
$story['print_link'] = XOOPS_URL . '/modules/publisher/print.php?itemid=' . $item->itemid();
- $story['mail_link'] = 'mailto:?subject='
- . sprintf(_CO_PUBLISHER_INTITEM, $xoopsConfig['sitename'])
- . '&body=' . sprintf(_CO_PUBLISHER_INTITEMFOUND, $xoopsConfig['sitename'])
- . ': ' . $item->getItemUrl();
+ $story['mail_link'] = 'mailto:?subject=' . sprintf(_CO_PUBLISHER_INTITEM, $xoopsConfig['sitename']) . '&body=' . sprintf(_CO_PUBLISHER_INTITEMFOUND, $xoopsConfig['sitename']) . ': '
+ . $item->getItemUrl();
$xoopsTpl->append('stories', $story);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_archive.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_archive.tpl 2014-10-02 23:07:10 UTC (rev 12806)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_archive.tpl 2014-10-02 23:08:57 UTC (rev 12807)
@@ -2,13 +2,19 @@
<tr>
<th><{$lang_newsarchives}></th>
</tr>
- <{foreach item=year from=$years}> <{foreach item=month from=$year.months}>
- <tr class="even">
- <td>
- <a href="<{$xoops_url}>/modules/publisher/archive.php?year=<{$year.number}>&month=<{$month.number}>"><{$month.string}> <{$year.number}></a>
- </td>
- </tr>
- <{/foreach}> <{/foreach}>
+ <{foreach item=year from=$years}>
+ <tr class="even">
+ <td><{$year.number}> (<{$year.articlesYearCount}>)</td>
+ </tr>
+ <tr class="odd">
+ <td>
+ <{foreach item=month from=$year.months}>
+ <a href="./archive.php?year=<{$year.number}>&month=<{$month.number}>"><{$month.string}> (<{$month.articlesMonthCount}>) </a>
+
+ <{/foreach}>
+ </td>
+ </tr>
+ <{/foreach}>
</table>
<{if $show_articles == true}>
|
|
From: <be...@us...> - 2014-10-02 23:10:26
|
Revision: 12808
http://sourceforge.net/p/xoops/svn/12808
Author: beckmi
Date: 2014-10-02 23:10:18 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
code formatting, updated changelog
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_recent.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.tpl
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt 2014-10-02 23:08:57 UTC (rev 12807)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt 2014-10-02 23:10:18 UTC (rev 12808)
@@ -1,6 +1,17 @@
<h5>1.02 Beta 3 (2014-xx-xx)</h5>
- updated to XOOPS 2.5.7 version of jQuery UI Tabs (noo-b/mamba)
+- replaced PublisherRequest with calls to XoopsRequest (mamba)
+- redesigned archives section to have months horizontally (mjoel/Mithrandir/mamba)
+- added count of articles in archive section (mamba)
+- moved TCPDF library to /xoops_lib (mamba)
+- updated makepdf.php file for the latest TCPDF (black_beard, mamba)
+- replaced $i++ with ++$i for consistency/performance (mamba)
+- started conversion to PSR-2 coding (mamba)
+TODO:
+- test with MySQL strict mode (STRICT_TRANS_TABLES)
+
+
<h5>1.02 Beta 2 (2014-xx-xx)</h5>
- added ID column in Admin's Category view (mamba)
- fixed preg_replace /e in request.php (mamba)
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt 2014-10-02 23:08:57 UTC (rev 12807)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt 2014-10-02 23:10:18 UTC (rev 12808)
@@ -1,12 +1,34 @@
-Read Me First
-=============
+READ ME FIRST
+_____________________________________________________________________
-The tag module is designed for site-wide tag management, handling tag input, display and stats for each module that enables tag plugin.
-This module provides a centralized toolkit including input, display, stats and substantial more comprehensive applications, so that each module does not need to develop its own tag handling scripts.
+Forked from SmartSection 2.14 as a starting base, but redone somewhat from the ground up to reduce the overall server load and deal with bugs and such.
- Requirements
+Features:
+
+- Categories and Subcategories
+- Pages
+- Four basic templates, custom templates
+- File Wrapping
+- Page/Category images
+- File attachments
+- Scheduled publishing and expiration
+- Order by date, ratings, sort order
+- Ratings
+- Comments
+- SEO
+- Permissions: Submissions, Submit/Edit fields, Categories, Pages, Moderation (global)
+- CK Editor and others using XOOPSeditors
+- Import from SmartSection and News modules
+- Easy cloning (change the directory name)
+
+
+ REQUIREMENTS
_____________________________________________________________________
-
-- PHP version >= 5.2.0
-- XOOPS version >= 2.5.0
-- ModuleClasses in /Frameworks (download it from here: http://goo.gl/Bmknt)
\ No newline at end of file
+
+- PHP version >= 5.3.7
+- XOOPS version >= 2.5.7
+
+INSTALLATION
+_____________________________________________________________________
+
+You will need to copy of the folder /xoops_lib from the the XOOPS 2.5.7 Basic Module Pack (includes TCPDF Library)
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_recent.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_recent.tpl 2014-10-02 23:08:57 UTC (rev 12807)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_recent.tpl 2014-10-02 23:10:18 UTC (rev 12808)
@@ -8,8 +8,7 @@
</tr>
<{foreach item=item from=$block.items}>
- <tr class="<{cycle values=" even
- ,odd"}>">
+ <tr class="<{cycle values=" even,odd"}>">
<td><{$item.itemlink}></td>
<td align="left"><{$item.categorylink}></td>
<td align="center"><{$item.poster}></td>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl 2014-10-02 23:08:57 UTC (rev 12807)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl 2014-10-02 23:10:18 UTC (rev 12808)
@@ -65,7 +65,8 @@
<{if $block.template == 'slider1'}>
-<{php}>global $xoTheme;$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); $xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');<{/php}>
+<{php}>global $xoTheme;$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+ $xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');<{/php}>
<script type="text/javascript">
jQuery(document).ready(function()
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.tpl
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.tpl 2014-10-02 23:08:57 UTC (rev 12807)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.tpl 2014-10-02 23:10:18 UTC (rev 12808)
@@ -14,8 +14,7 @@
<div style="font-weight: normal"><{$element.description}></div>
<{/if}>
</td>
- <td class="<{cycle values=" even
- ,odd"}>"><{$element.body}></td>
+ <td class="<{cycle values=" even,odd"}>"><{$element.body}></td>
</tr>
<{else}> <{$element.body}> <{/if}> <{/foreach}><!-- end of form elements loop -->
</table></form>
|
|
From: <be...@us...> - 2014-10-31 07:13:58
|
Revision: 12828
http://sourceforge.net/p/xoops/svn/12828
Author: beckmi
Date: 2014-10-31 07:13:53 +0000 (Fri, 31 Oct 2014)
Log Message:
-----------
added import from fmContent (zyspec)
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php 2014-10-31 07:13:53 UTC (rev 12828)
@@ -0,0 +1,347 @@
+<?php
+/*
+ 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 The XUUPS Project http://sourceforge.net/projects/xuups/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package Publisher
+ * @since 1.02 Beta 4
+ * @author trabis <lus...@gm...>
+ * @author The SmartFactory <www.smartfactory.ca>
+ * @author Marius Scurtescu <ma...@ro...>
+ * @author ZySpec <ow...@zy...>
+ * @version $Id$
+ */
+
+include_once dirname(__DIR__) . '/admin_header.php';
+$myts = MyTextSanitizer::getInstance();
+
+$importFromModuleName = "FmContent " . @$_POST['fmcontent_version'];
+
+$scriptname = "fmcontent.php";
+
+$op = 'start';
+
+if (isset($_POST['op']) && ($_POST['op'] == 'go')) {
+ $op = $_POST['op'];
+}
+
+if ('start' == $op) {
+ xoops_load('XoopsFormLoader');
+
+ publisher_cpHeader();
+ //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
+ publisher_openCollapsableBar('fmimport', 'fmimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
+
+ $module_handler = xoops_gethandler('module');
+ $moduleObj = $module_handler->getByDirname('fmcontent');
+ $fm_module_id = $moduleObj->getVar('mid');
+
+ $fmTopicHdlr =& xoops_getmodulehandler('topic', 'fmcontent');
+ $fmTopicCount = $fmTopicHdlr->getCount(new Criteria('topic_modid', $fm_module_id));
+
+ if (empty($fmTopicCount)) {
+ echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . "</span>";
+ } else {
+ include_once $GLOBALS['xoops']->path('www/class/xoopstree.php');
+ $fmContentHdlr =& xoops_getmodulehandler('page', 'fmcontent');
+ $fmContentCount = $fmContentHdlr->getCount(new Criteria('content_modid', $fm_module_id));
+
+ if (empty($fmContentCount)) {
+ echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $fmContentCount) . "</span>";
+ } else {
+/*
+ echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $fmContentCount, $fmTopicCount) . "</span>";
+ $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
+*/
+ // Categories to be imported
+ $sql = "SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.content_id) FROM " . $GLOBALS['xoopsDB']->prefix("fmcontent_topic") . " AS cat INNER JOIN " . $GLOBALS['xoopsDB']->prefix("fmcontent_content") . " AS art ON ((cat.topic_id=art.content_topic) AND (cat.topic_modid=art.content_modid)) WHERE cat.topic_modid={$fm_module_id} GROUP BY art.content_topic";
+
+ $result = $GLOBALS['xoopsDB']->query($sql);
+ $cat_cbox_options = array();
+
+ while (list ($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) {
+ $cat_title = $myts->displayTarea($cat_title);
+ $cat_cbox_options[$cid] = "{$cat_title} ($art_count)";
+ }
+ // now get articles in the top level category (content_topic=0)
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('content_modid', $fm_module_id));
+ $criteria->add(new Criteria('content_topic', 0));
+ $cnt_tla_contents = $fmContentHdlr->getCount($criteria);
+ if ($cnt_tla_contents) {
+ $cat_cbox_options[0] = _AM_PUBLISHER_IMPORT_FMCONTENT_NAME . " ({$cnt_tla_contents})";
+ }
+ natcasesort($cat_cbox_options); //put them in "alphabetical" order
+
+ echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $fmContentCount, count($cat_cbox_options)) . "</span>";
+ $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
+
+ $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode("<br />", $cat_cbox_options));
+ $cat_label->setDescription(_AM_PUBLISHER_IMPORT_CATEGORIES_DSC);
+ $form->addElement($cat_label);
+
+ // Publisher parent category
+ xoops_load('tree');
+ $categoryHdlr = $publisher->getHandler('category');
+ $catObjs = $categoryHdlr->getAll();
+ $myObjTree = new XoopsObjectTree($catObjs, 'categoryid', 'parentid');
+ $catSelBox = $myObjTree->makeSelBox('parent_category', 'name', '-', 0, true);
+ $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, $catSelBox);
+ $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
+ $form->addElement($parent_cat_sel);
+/*
+ $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix("publisher_categories"), "categoryid", "parentid");
+ ob_start();
+ $mytree->makeMySelBox("name", "weight", $preset_id = 0, $none = 1, $sel_name = "parent_category");
+
+ $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, ob_get_contents());
+ $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
+ $form->addElement($parent_cat_sel);
+ ob_end_clean();
+*/
+ $form->addElement(new XoopsFormHidden('op', 'go'));
+ $form->addElement(new XoopsFormButton ('', 'import', _AM_PUBLISHER_IMPORT, 'submit'));
+
+ $form->addElement(new XoopsFormHidden('from_module_version', $_POST['news_version']));
+
+ $form->display();
+ }
+ }
+
+ publisher_closeCollapsableBar('fmimport', 'fmimporticon');
+ xoops_cp_footer();
+}
+
+if ('go' == $op) {
+ publisher_cpHeader();
+ //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
+ publisher_openCollapsableBar('fmimportgo', 'fmimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
+
+ $module_handler = xoops_gethandler('module');
+ $moduleObj = $module_handler->getByDirname('fmcontent');
+ $fm_module_id = $moduleObj->getVar('mid');
+
+ $gperm_handler = xoops_gethandler('groupperm');
+
+ $cnt_imported_cat = 0;
+ $cnt_imported_articles = 0;
+
+ $parentId = (isset($_POST['parent_category'])) ? (int) $_POST['parent_category'] : 0;
+
+ // get all FmContent Content items without a category (content_topic=0)
+ $fmContentHdlr =& xoops_getmodulehandler('page', 'fmcontent');
+
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('content_modid', $fm_module_id));
+ $criteria->add(new Criteria('content_topic', 0));
+ $fmContentObjs = $fmContentHdlr->getAll($criteria);
+
+ if (is_array($fmContentObjs) && count($fmContentObjs)) {
+ ++$cnt_imported_cat; //count category if there was content to import
+
+ // create Publsher category to hold FmContent Content items with no Topic (content_topic=0)
+ $categoryObj = $publisher->getHandler('category')->create();
+ $categoryObj->setVars(array('parentid' => $parentId,
+ 'name' => _AM_PUBLISHER_IMPORT_FMCONTENT_NAME,
+ 'description' => _AM_PUBLISHER_IMPORT_FMCONTENT_TLT,
+ 'image' => '',
+ 'total' => 0,
+ 'weight' => 1,
+ 'created' => time(),
+ 'moderator', $GLOBALS['xoopsUser']->getVar('uid'))
+ );
+ $categoryObj->store();
+
+ $fmTopicHdlr =& xoops_getmodulehandler('topic', 'fmcontent');
+
+ // insert articles for this category
+ foreach($fmContentObjs as $thisFmContentObj) {
+ $itemObj = $publisher->getHandler('item')->create();
+ $itemObj->setVars(array('categoryid' => $categoryObj->categoryid(),
+ 'title' => $thisFmContentObj->getVar('content_title'),
+ 'uid' => $thisFmContentObj->getVar('content_uid'),
+ 'summary' => $thisFmContentObj->getVar('content_short'),
+ 'body' => $thisFmContentObj->getVar('content_text'),
+ 'datesub' => $thisFmContentObj->getVar('content_create'),
+ 'dohtml' => $thisFmContentObj->getVar('dohtml'),
+ 'dosmiley' => $thisFmContentObj->getVar('dosmiley'),
+ 'doxcode' => $thisFmContentObj->getVar('doxcode'),
+ 'doimage' => $thisFmContentObj->getVar('doimage'),
+ 'dobr' => $thisFmContentObj->getVar('dobr'),
+ 'weight' => $thisFmContentObj->getVar('content_order'),
+ 'status' => ($thisFmContentObj->getVar('content_status')) ? _PUBLISHER_STATUS_PUBLISHED : _PUBLISHER_STATUS_OFFLINE,
+ 'counter' => $thisFmContentObj->getVar('content_hits'),
+ 'rating' => 0,
+ 'votes' => 0,
+ 'comments' => $thisFmContentObj->getVar('content_comments'),
+ 'meta_keywords' => $thisFmContentObj->getVar('content_words'),
+ 'meta_description' => $thisFmContentObj->getVar('content_desc'))
+ );
+ $contentImg = $thisFmContentObj->getVar('content_img');
+ if (!empty($contentImg)) {
+ $itemObj->setVars(array('images' => 1,
+ 'image' => $thisFmContentObj->getVar('content_img'))
+ );
+ }
+
+ if (!$itemObj->store()) {
+ echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $thisFmContentObj->getVar('title')) . "<br />\n";
+ continue;
+ } else {
+ $newArticleArray[$thisFmContentObj->getVar('storyid')] = $itemObj->itemid();
+ echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />\n";
+ ++$cnt_imported_articles;
+ }
+ }
+
+ // Saving category permissions
+ $groupsIds = $gperm_handler->getGroupIds('fmcontent_view', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
+ publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
+ $groupsIds = $gperm_handler->getGroupIds('fmcontent_submit', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
+ publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
+
+ unset($fmContentObjs, $itemObj, $categoryObj);
+ echo "<br />\n";
+ }
+
+ // Process all "normal" Topics (categories) from FmContent
+ $newCatArray = array();
+ $newArticleArray = array();
+ $oldToNew = array();
+
+ $fmTopicObjs = $fmTopicHdlr->getAll(new Criteria('topic_modid', $fm_module_id));
+
+ // first create FmContent Topics as Publisher Categories
+ foreach($fmTopicObjs as $thisFmTopicObj) {
+ $CatIds = array('oldid' => $thisFmTopicObj->getVar('topic_id'),
+ 'oldpid' => $thisFmTopicObj->getVar('topic_pid')
+ );
+
+ $categoryObj = $publisher->getHandler('category')->create();
+
+ $categoryObj->setVars(array('parentid' => $thisFmTopicObj->getVar('topic_pid'),
+ 'weight' => $thisFmTopicObj->getVar('topic_weight'),
+ 'name' => $thisFmTopicObj->getVar('topic_title'),
+ 'description' => $thisFmTopicObj->getVar('topic_desc'))
+ );
+
+ // Category image
+ if (('blank.gif' != $thisFmTopicObj->getVar('topic_img')) && ('' != $thisFmTopicObj->getVar('topic_img'))) {
+ if (copy($GLOBALS['xoops']->path("www/uploads/fmcontent/img/" . $thisFmTopicObj->getVar('topic_img')), $GLOBALS['xoops']->path("www/uploads/publisher/images/category/" . $thisFmTopicObj->getVar('topic_img')))) {
+ $categoryObj->setVar('image', $thisFmTopicObj->getVar('topic_img'));
+ }
+ }
+ if (!$publisher->getHandler('category')->insert($categoryObj)) {
+ echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $thisFmTopicObj->getVar('topic_title')) . "<br />\n";
+ continue;
+ }
+
+ $CatIds['newid'] = $categoryObj->categoryid();
+ ++$cnt_imported_cat;
+
+ echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br />\n";
+
+ // retrieve all articles (content) for this category
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('content_modid', $fm_module_id)); //only for this instance of fmcontent
+ $criteria->add(new Criteria('content_topic', $thisFmTopicObj->getVar('topic_id'))); //for this category
+ $fmContentObjs = $fmContentHdlr->getAll($criteria);
+
+ // insert articles for this category
+ foreach($fmContentObjs as $thisFmContentObj) {
+ $itemObj = $publisher->getHandler('item')->create();
+ $itemObj->setVars(array('categoryid' => $CatIds['newid'],
+ 'title' => $thisFmContentObj->getVar('content_title'),
+ 'uid' => $thisFmContentObj->getVar('content_uid'),
+ 'summary' => $thisFmContentObj->getVar('content_short'),
+ 'body' => $thisFmContentObj->getVar('content_text'),
+ 'counter' => $thisFmContentObj->getVar('content_hits'),
+ 'datesub' => $thisFmContentObj->getVar('content_create'),
+ 'dohtml' => $thisFmContentObj->getVar('dohtml'),
+ 'dosmiley' => $thisFmContentObj->getVar('dosmiley'),
+ 'doxcode' => $thisFmContentObj->getVar('doxcode'),
+ 'doimage' => $thisFmContentObj->getVar('doimage'),
+ 'dobr' => $thisFmContentObj->getVar('dobr'),
+ 'weight' => $thisFmContentObj->getVar('content_order'),
+ 'status' => ($thisFmContentObj->getVar('content_status')) ? _PUBLISHER_STATUS_PUBLISHED : _PUBLISHER_STATUS_OFFLINE,
+ 'rating' => 0,
+ 'votes' => 0,
+ 'comments' => $thisFmContentObj->getVar('content_comments'),
+ 'meta_keywords' => $thisFmContentObj->getVar('content_words'),
+ 'meta_description' => $thisFmContentObj->getVar('content_desc'))
+ );
+ $contentImg = $thisFmContentObj->getVar('content_img');
+ if (!empty($contentImg)) {
+ $itemObj->setVar('images', 1);
+ $itemObj->setVar('image', $thisFmContentObj->getVar('content_img'));
+ }
+
+ if (!$itemObj->store()) {
+ echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $thisFmContentObj->getVar('title')) . "<br />\n";
+ continue;
+ } else {
+ $newArticleArray[$thisFmContentObj->getVar('storyid')] = $itemObj->itemid();
+ echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />\n";
+ ++$cnt_imported_articles;
+ }
+ }
+
+ // Saving category permissions
+ $groupsIds = $gperm_handler->getGroupIds('fmcontent_view', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
+ publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
+ $groupsIds = $gperm_handler->getGroupIds('fmcontent_submit', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
+ publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
+
+ $newCatArray[$CatIds['oldid']] = $CatIds;
+ unset($CatIds);
+ echo "<br />\n";
+ }
+
+ // Looping through cat to change the parentid to the new parentid
+ foreach ($newCatArray as $oldid => $CatIds) {
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('categoryid', $CatIds['newid']));
+ $oldpid = $CatIds['oldpid'];
+ $newpid = (0 == $oldpid) ? $parentId : $newCatArray[$oldpid]['newid'];
+ $publisher->getHandler('category')->updateAll('parentid', $newpid, $criteria);
+ unset($criteria);
+ }
+
+ // Looping through the comments to link them to the new articles and module
+ echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />\n";
+
+ $publisher_module_id = $publisher->getModule()->mid();
+
+ $comment_handler = xoops_gethandler('comment');
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('com_modid', $fm_module_id));
+ $comments = $comment_handler->getObjects($criteria);
+ foreach ($comments as $comment) {
+ $comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]);
+ $comment->setVar('com_modid', $publisher_module_id);
+ $comment->setNew();
+ if (!$comment_handler->insert($comment)) {
+ echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />\n";
+ } else {
+ echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />\n";
+ }
+
+ }
+
+ echo "<br /><br />" . _AM_PUBLISHER_IMPORT_DONE . "<br />\n"
+ . "" . sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br />\n"
+ . "" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br />\n"
+ . "<br/>\n<a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br />\n";
+
+ publisher_closeCollapsableBar('fmimportgo', 'fmimportgoicon');
+ xoops_cp_footer();
+}
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2014-10-31 06:34:08 UTC (rev 12827)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2014-10-31 07:13:53 UTC (rev 12828)
@@ -115,6 +115,17 @@
}
}
+ // FmContent
+ $fmcontent_version = 0;
+ $moduleObj = $module_handler->getByDirname('fmcontent');
+ if ($moduleObj) {
+ $from_module_version = round($moduleObj->getVar('version') / 100, 2);
+ if (($from_module_version >= 1.1)) {
+ $importfile_select_array["fmcontent"] = "FmContent " . $from_module_version;
+ $fmcontent_version = $from_module_version;
+ }
+ }
+
// XF-Section
/*$xfs_version = 0;
$moduleObj = $module_handler->getByDirname('xfsection');
@@ -163,7 +174,7 @@
$sform->display();
unset($hidden);
} else {
- echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_MODULE . "</span>";
+ echo "<span style='color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block;'>" . _AM_PUBLISHER_IMPORT_NO_MODULE . "</span>";
}
// End of collapsable bar
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt 2014-10-31 06:34:08 UTC (rev 12827)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt 2014-10-31 07:13:53 UTC (rev 12828)
@@ -1,4 +1,10 @@
<h5>1.02 Beta 3 (2014-xx-xx)</h5>
+- added import from fmContent (zyspec)
+
+TODO:
+- test with MySQL strict mode (STRICT_TRANS_TABLES)
+
+<h5>1.02 Beta 3 (2014-xx-xx)</h5>
- updated to XOOPS 2.5.7 version of jQuery UI Tabs (noo-b/mamba)
- replaced PublisherRequest with calls to XoopsRequest (mamba)
- redesigned archives section to have months horizontally (mjoel/Mithrandir/mamba)
@@ -8,10 +14,6 @@
- replaced $i++ with ++$i for consistency/performance (mamba)
- started conversion to PSR-2 coding (mamba)
-TODO:
-- test with MySQL strict mode (STRICT_TRANS_TABLES)
-
-
<h5>1.02 Beta 2 (2014-xx-xx)</h5>
- added ID column in Admin's Category view (mamba)
- fixed preg_replace /e in request.php (mamba)
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/admin.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/admin.php 2014-10-31 06:34:08 UTC (rev 12827)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/admin.php 2014-10-31 07:13:53 UTC (rev 12828)
@@ -147,7 +147,10 @@
define("_AM_PUBLISHER_IMPORT_CATEGORIES_DSC","Here are the categories that will be imported in Publisher");
define("_AM_PUBLISHER_IMPORT_CATEGORY_ERROR","Error while importing category <em>%s</em>.");
define("_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS","Category <em>%s</em> imported successfully.");
+define("_AM_PUBLISHER_IMPORT_DONE","Done.");
define("_AM_PUBLISHER_IMPORT_ERROR","An error occurred while importing the article.");
+define("_AM_PUBLISHER_IMPORT_FMCONTENT_NAME","FmContent Top Level");
+define("_AM_PUBLISHER_IMPORT_FMCONTENT_TLT","Imported Articles from FmContent without a category.");
define("_AM_PUBLISHER_IMPORT_FILE_NOT_FOUND","Import file not found at <strong>%s</strong>");
define("_AM_PUBLISHER_IMPORT_FROM","Importing from %s");
define("_AM_PUBLISHER_IMPORT_GOTOMODULE","Go Publisher's index page");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/xoops_version.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/xoops_version.php 2014-10-31 06:34:08 UTC (rev 12827)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/xoops_version.php 2014-10-31 07:13:53 UTC (rev 12828)
@@ -78,8 +78,8 @@
$modversion['author_word'] = "";
//about
-$modversion["module_status"] = "Beta 3";
-$modversion['release_date'] = "2014/06/21";
+$modversion["module_status"] = "Beta 4";
+$modversion['release_date'] = "2014/10/27";
$modversion['min_php'] = '5.3.7';
$modversion['min_xoops'] = '2.5.7';
$modversion['min_db'] = array('mysql' => '5.0.7', 'mysqli' => '5.0.7');
|
|
From: <be...@us...> - 2014-12-13 15:49:56
|
Revision: 12903
http://sourceforge.net/p/xoops/svn/12903
Author: beckmi
Date: 2014-12-13 15:49:41 +0000 (Sat, 13 Dec 2014)
Log Message:
-----------
Beta 4 (see changelog)
Modified Paths:
--------------
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/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/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/permissions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.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/class/blockform.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/class/uploader.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_upload.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/comment_functions.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/install.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/plugin.tag.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/include/update.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/admin.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/blocks/publisher_latest_news.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_item.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/visit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/constants.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tests/todo.txt
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/constants.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -249,6 +249,10 @@
xoops_cp_footer();
+/**
+ * @param $categoryObj
+ * @param int $level
+ */
function publisher_displayCategory($categoryObj, $level = 0)
{
$publisher = PublisherPublisher::getInstance();
@@ -283,6 +287,12 @@
unset($categoryObj);
}
+/**
+ * @param bool $showmenu
+ * @param int $categoryid
+ * @param int $nb_subcats
+ * @param null $categoryObj
+ */
function publisher_editCat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryObj = null)
{
$publisher = PublisherPublisher::getInstance();
@@ -364,7 +374,7 @@
publisher_openCollapsableBar('bottomtable', 'bottomtableicon', _AM_PUBLISHER_CAT_ITEMS, _AM_PUBLISHER_CAT_ITEMS_DSC);
$startitem = XoopsRequest::getInt('startitem');
// Get the total number of published ITEMS
- $totalitems = $publisher->getHandler('item')->getItemsCount($sel_cat, array(_PUBLISHER_STATUS_PUBLISHED));
+ $totalitems = $publisher->getHandler('item')->getItemsCount($sel_cat, array(PublisherConstants::_PUBLISHER_STATUS_PUBLISHED));
// creating the items objects that are published
$itemsObj = $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_perpage'), $startitem, $sel_cat);
$totalitemsOnPage = count($itemsObj);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -83,6 +83,11 @@
// work around for PHP < 5.0.x
if (!function_exists('file_put_contents')) {
+ /**
+ * @param $filename
+ * @param $data
+ * @param bool $file_append
+ */
function file_put_contents($filename, $data, $file_append = false)
{
if ($fp = fopen($filename, (!$file_append ? 'w+' : 'a+'))) {
@@ -93,6 +98,9 @@
}
// recursive clonning script
+/**
+ * @param $path
+ */
function publisher_cloneFileFolder($path)
{
global $patKeys;
@@ -127,6 +135,11 @@
}
}
+/**
+ * @param $dirname
+ *
+ * @return bool
+ */
function publisher_createLogo($dirname)
{
if (!extension_loaded("gd")) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -23,6 +23,11 @@
$op = XoopsRequest::getString('op');
+/**
+ * @param bool $showmenu
+ * @param int $fileid
+ * @param int $itemid
+ */
function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
{
$publisher = PublisherPublisher::getInstance();
@@ -44,7 +49,7 @@
}
echo "<br />\n";
- echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 06 0 0; '>" . _AM_PUBLISHER_FILE_EDITING . "</span>";
+ echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_EDITING . "</span>";
echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_EDITING_DSC . "</span>";
publisher_openCollapsableBar('editfile', 'editfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
} else {
@@ -54,7 +59,7 @@
if ($showmenu) {
//publisher_adminMenu(2, _AM_PUBLISHER_FILE . " > " . _AM_PUBLISHER_FILE_ADD);
}
- echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 06 0 0; '>" . _AM_PUBLISHER_FILE_ADDING . "</span>";
+ echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_ADDING . "</span>";
echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_ADDING_DSC . "</span>";
publisher_openCollapsableBar('addfile', 'addfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -33,6 +33,10 @@
$op = $_POST['op'];
}
+/**
+ * @param $src
+ * @param $dst
+ */
function recurse_copy($src,$dst)
{
$dir = opendir($src);
@@ -316,7 +320,7 @@
$itemObj->setVar('dohtml', !$arrArticle['nohtml']);
$itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('weight', 0);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
// $itemObj->setVar('dobr', !$arrArticle['dobr']);
// $itemObj->setVar('item_tag', $arrArticle['tags']);
@@ -369,7 +373,7 @@
$fileObj = $publisher->getHandler('file')->create();
$fileObj->setVar('name', $arrFile['filerealname']);
$fileObj->setVar('description', $arrFile['filerealname']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['mimetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -166,7 +166,7 @@
$itemObj->setVar('dohtml', !$arrArticle['nohtml']);
$itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('weight', 0);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
$itemObj->setVar('rating', $arrArticle['rating']);
$itemObj->setVar('votes', $arrArticle['votes']);
@@ -204,7 +204,7 @@
$fileObj = $publisher_file_handler->create();
$fileObj->setVar('name', $arrFile['fileshowname']);
$fileObj->setVar('description', $arrFile['filedescript']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['minetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -33,6 +33,10 @@
$op = $_POST['op'];
}
+/**
+ * @param $src
+ * @param $dst
+ */
function recurse_copy($src, $dst)
{
$dir = opendir($src);
@@ -134,7 +138,7 @@
// $itemObj->setVar('dohtml', !$arrArticle['nohtml']);
// $itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('weight', $arrArticle['weight']);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
// $itemObj->setVar('dobr', !$arrArticle['dobr']);
// $itemObj->setVar('item_tag', $arrArticle['tags']);
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -1,347 +0,0 @@
-<?php
-/*
- 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 The XUUPS Project http://sourceforge.net/projects/xuups/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @since 1.02 Beta 4
- * @author trabis <lus...@gm...>
- * @author The SmartFactory <www.smartfactory.ca>
- * @author Marius Scurtescu <ma...@ro...>
- * @author ZySpec <ow...@zy...>
- * @version $Id$
- */
-
-include_once dirname(__DIR__) . '/admin_header.php';
-$myts = MyTextSanitizer::getInstance();
-
-$importFromModuleName = "FmContent " . @$_POST['fmcontent_version'];
-
-$scriptname = "fmcontent.php";
-
-$op = 'start';
-
-if (isset($_POST['op']) && ($_POST['op'] == 'go')) {
- $op = $_POST['op'];
-}
-
-if ('start' == $op) {
- xoops_load('XoopsFormLoader');
-
- publisher_cpHeader();
- //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
- publisher_openCollapsableBar('fmimport', 'fmimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
-
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('fmcontent');
- $fm_module_id = $moduleObj->getVar('mid');
-
- $fmTopicHdlr =& xoops_getmodulehandler('topic', 'fmcontent');
- $fmTopicCount = $fmTopicHdlr->getCount(new Criteria('topic_modid', $fm_module_id));
-
- if (empty($fmTopicCount)) {
- echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . "</span>";
- } else {
- include_once $GLOBALS['xoops']->path('www/class/xoopstree.php');
- $fmContentHdlr =& xoops_getmodulehandler('page', 'fmcontent');
- $fmContentCount = $fmContentHdlr->getCount(new Criteria('content_modid', $fm_module_id));
-
- if (empty($fmContentCount)) {
- echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $fmContentCount) . "</span>";
- } else {
-/*
- echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $fmContentCount, $fmTopicCount) . "</span>";
- $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
-*/
- // Categories to be imported
- $sql = "SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.content_id) FROM " . $GLOBALS['xoopsDB']->prefix("fmcontent_topic") . " AS cat INNER JOIN " . $GLOBALS['xoopsDB']->prefix("fmcontent_content") . " AS art ON ((cat.topic_id=art.content_topic) AND (cat.topic_modid=art.content_modid)) WHERE cat.topic_modid={$fm_module_id} GROUP BY art.content_topic";
-
- $result = $GLOBALS['xoopsDB']->query($sql);
- $cat_cbox_options = array();
-
- while (list ($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) {
- $cat_title = $myts->displayTarea($cat_title);
- $cat_cbox_options[$cid] = "{$cat_title} ($art_count)";
- }
- // now get articles in the top level category (content_topic=0)
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('content_modid', $fm_module_id));
- $criteria->add(new Criteria('content_topic', 0));
- $cnt_tla_contents = $fmContentHdlr->getCount($criteria);
- if ($cnt_tla_contents) {
- $cat_cbox_options[0] = _AM_PUBLISHER_IMPORT_FMCONTENT_NAME . " ({$cnt_tla_contents})";
- }
- natcasesort($cat_cbox_options); //put them in "alphabetical" order
-
- echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $fmContentCount, count($cat_cbox_options)) . "</span>";
- $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
-
- $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode("<br />", $cat_cbox_options));
- $cat_label->setDescription(_AM_PUBLISHER_IMPORT_CATEGORIES_DSC);
- $form->addElement($cat_label);
-
- // Publisher parent category
- xoops_load('tree');
- $categoryHdlr = $publisher->getHandler('category');
- $catObjs = $categoryHdlr->getAll();
- $myObjTree = new XoopsObjectTree($catObjs, 'categoryid', 'parentid');
- $catSelBox = $myObjTree->makeSelBox('parent_category', 'name', '-', 0, true);
- $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, $catSelBox);
- $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
- $form->addElement($parent_cat_sel);
-/*
- $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix("publisher_categories"), "categoryid", "parentid");
- ob_start();
- $mytree->makeMySelBox("name", "weight", $preset_id = 0, $none = 1, $sel_name = "parent_category");
-
- $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, ob_get_contents());
- $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
- $form->addElement($parent_cat_sel);
- ob_end_clean();
-*/
- $form->addElement(new XoopsFormHidden('op', 'go'));
- $form->addElement(new XoopsFormButton ('', 'import', _AM_PUBLISHER_IMPORT, 'submit'));
-
- $form->addElement(new XoopsFormHidden('from_module_version', $_POST['news_version']));
-
- $form->display();
- }
- }
-
- publisher_closeCollapsableBar('fmimport', 'fmimporticon');
- xoops_cp_footer();
-}
-
-if ('go' == $op) {
- publisher_cpHeader();
- //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
- publisher_openCollapsableBar('fmimportgo', 'fmimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
-
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('fmcontent');
- $fm_module_id = $moduleObj->getVar('mid');
-
- $gperm_handler = xoops_gethandler('groupperm');
-
- $cnt_imported_cat = 0;
- $cnt_imported_articles = 0;
-
- $parentId = (isset($_POST['parent_category'])) ? (int) $_POST['parent_category'] : 0;
-
- // get all FmContent Content items without a category (content_topic=0)
- $fmContentHdlr =& xoops_getmodulehandler('page', 'fmcontent');
-
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('content_modid', $fm_module_id));
- $criteria->add(new Criteria('content_topic', 0));
- $fmContentObjs = $fmContentHdlr->getAll($criteria);
-
- if (is_array($fmContentObjs) && count($fmContentObjs)) {
- ++$cnt_imported_cat; //count category if there was content to import
-
- // create Publsher category to hold FmContent Content items with no Topic (content_topic=0)
- $categoryObj = $publisher->getHandler('category')->create();
- $categoryObj->setVars(array('parentid' => $parentId,
- 'name' => _AM_PUBLISHER_IMPORT_FMCONTENT_NAME,
- 'description' => _AM_PUBLISHER_IMPORT_FMCONTENT_TLT,
- 'image' => '',
- 'total' => 0,
- 'weight' => 1,
- 'created' => time(),
- 'moderator', $GLOBALS['xoopsUser']->getVar('uid'))
- );
- $categoryObj->store();
-
- $fmTopicHdlr =& xoops_getmodulehandler('topic', 'fmcontent');
-
- // insert articles for this category
- foreach($fmContentObjs as $thisFmContentObj) {
- $itemObj = $publisher->getHandler('item')->create();
- $itemObj->setVars(array('categoryid' => $categoryObj->categoryid(),
- 'title' => $thisFmContentObj->getVar('content_title'),
- 'uid' => $thisFmContentObj->getVar('content_uid'),
- 'summary' => $thisFmContentObj->getVar('content_short'),
- 'body' => $thisFmContentObj->getVar('content_text'),
- 'datesub' => $thisFmContentObj->getVar('content_create'),
- 'dohtml' => $thisFmContentObj->getVar('dohtml'),
- 'dosmiley' => $thisFmContentObj->getVar('dosmiley'),
- 'doxcode' => $thisFmContentObj->getVar('doxcode'),
- 'doimage' => $thisFmContentObj->getVar('doimage'),
- 'dobr' => $thisFmContentObj->getVar('dobr'),
- 'weight' => $thisFmContentObj->getVar('content_order'),
- 'status' => ($thisFmContentObj->getVar('content_status')) ? _PUBLISHER_STATUS_PUBLISHED : _PUBLISHER_STATUS_OFFLINE,
- 'counter' => $thisFmContentObj->getVar('content_hits'),
- 'rating' => 0,
- 'votes' => 0,
- 'comments' => $thisFmContentObj->getVar('content_comments'),
- 'meta_keywords' => $thisFmContentObj->getVar('content_words'),
- 'meta_description' => $thisFmContentObj->getVar('content_desc'))
- );
- $contentImg = $thisFmContentObj->getVar('content_img');
- if (!empty($contentImg)) {
- $itemObj->setVars(array('images' => 1,
- 'image' => $thisFmContentObj->getVar('content_img'))
- );
- }
-
- if (!$itemObj->store()) {
- echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $thisFmContentObj->getVar('title')) . "<br />\n";
- continue;
- } else {
- $newArticleArray[$thisFmContentObj->getVar('storyid')] = $itemObj->itemid();
- echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />\n";
- ++$cnt_imported_articles;
- }
- }
-
- // Saving category permissions
- $groupsIds = $gperm_handler->getGroupIds('fmcontent_view', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
- publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
- $groupsIds = $gperm_handler->getGroupIds('fmcontent_submit', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
- publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
-
- unset($fmContentObjs, $itemObj, $categoryObj);
- echo "<br />\n";
- }
-
- // Process all "normal" Topics (categories) from FmContent
- $newCatArray = array();
- $newArticleArray = array();
- $oldToNew = array();
-
- $fmTopicObjs = $fmTopicHdlr->getAll(new Criteria('topic_modid', $fm_module_id));
-
- // first create FmContent Topics as Publisher Categories
- foreach($fmTopicObjs as $thisFmTopicObj) {
- $CatIds = array('oldid' => $thisFmTopicObj->getVar('topic_id'),
- 'oldpid' => $thisFmTopicObj->getVar('topic_pid')
- );
-
- $categoryObj = $publisher->getHandler('category')->create();
-
- $categoryObj->setVars(array('parentid' => $thisFmTopicObj->getVar('topic_pid'),
- 'weight' => $thisFmTopicObj->getVar('topic_weight'),
- 'name' => $thisFmTopicObj->getVar('topic_title'),
- 'description' => $thisFmTopicObj->getVar('topic_desc'))
- );
-
- // Category image
- if (('blank.gif' != $thisFmTopicObj->getVar('topic_img')) && ('' != $thisFmTopicObj->getVar('topic_img'))) {
- if (copy($GLOBALS['xoops']->path("www/uploads/fmcontent/img/" . $thisFmTopicObj->getVar('topic_img')), $GLOBALS['xoops']->path("www/uploads/publisher/images/category/" . $thisFmTopicObj->getVar('topic_img')))) {
- $categoryObj->setVar('image', $thisFmTopicObj->getVar('topic_img'));
- }
- }
- if (!$publisher->getHandler('category')->insert($categoryObj)) {
- echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $thisFmTopicObj->getVar('topic_title')) . "<br />\n";
- continue;
- }
-
- $CatIds['newid'] = $categoryObj->categoryid();
- ++$cnt_imported_cat;
-
- echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br />\n";
-
- // retrieve all articles (content) for this category
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('content_modid', $fm_module_id)); //only for this instance of fmcontent
- $criteria->add(new Criteria('content_topic', $thisFmTopicObj->getVar('topic_id'))); //for this category
- $fmContentObjs = $fmContentHdlr->getAll($criteria);
-
- // insert articles for this category
- foreach($fmContentObjs as $thisFmContentObj) {
- $itemObj = $publisher->getHandler('item')->create();
- $itemObj->setVars(array('categoryid' => $CatIds['newid'],
- 'title' => $thisFmContentObj->getVar('content_title'),
- 'uid' => $thisFmContentObj->getVar('content_uid'),
- 'summary' => $thisFmContentObj->getVar('content_short'),
- 'body' => $thisFmContentObj->getVar('content_text'),
- 'counter' => $thisFmContentObj->getVar('content_hits'),
- 'datesub' => $thisFmContentObj->getVar('content_create'),
- 'dohtml' => $thisFmContentObj->getVar('dohtml'),
- 'dosmiley' => $thisFmContentObj->getVar('dosmiley'),
- 'doxcode' => $thisFmContentObj->getVar('doxcode'),
- 'doimage' => $thisFmContentObj->getVar('doimage'),
- 'dobr' => $thisFmContentObj->getVar('dobr'),
- 'weight' => $thisFmContentObj->getVar('content_order'),
- 'status' => ($thisFmContentObj->getVar('content_status')) ? _PUBLISHER_STATUS_PUBLISHED : _PUBLISHER_STATUS_OFFLINE,
- 'rating' => 0,
- 'votes' => 0,
- 'comments' => $thisFmContentObj->getVar('content_comments'),
- 'meta_keywords' => $thisFmContentObj->getVar('content_words'),
- 'meta_description' => $thisFmContentObj->getVar('content_desc'))
- );
- $contentImg = $thisFmContentObj->getVar('content_img');
- if (!empty($contentImg)) {
- $itemObj->setVar('images', 1);
- $itemObj->setVar('image', $thisFmContentObj->getVar('content_img'));
- }
-
- if (!$itemObj->store()) {
- echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $thisFmContentObj->getVar('title')) . "<br />\n";
- continue;
- } else {
- $newArticleArray[$thisFmContentObj->getVar('storyid')] = $itemObj->itemid();
- echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />\n";
- ++$cnt_imported_articles;
- }
- }
-
- // Saving category permissions
- $groupsIds = $gperm_handler->getGroupIds('fmcontent_view', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
- publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
- $groupsIds = $gperm_handler->getGroupIds('fmcontent_submit', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
- publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
-
- $newCatArray[$CatIds['oldid']] = $CatIds;
- unset($CatIds);
- echo "<br />\n";
- }
-
- // Looping through cat to change the parentid to the new parentid
- foreach ($newCatArray as $oldid => $CatIds) {
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('categoryid', $CatIds['newid']));
- $oldpid = $CatIds['oldpid'];
- $newpid = (0 == $oldpid) ? $parentId : $newCatArray[$oldpid]['newid'];
- $publisher->getHandler('category')->updateAll('parentid', $newpid, $criteria);
- unset($criteria);
- }
-
- // Looping through the comments to link them to the new articles and module
- echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />\n";
-
- $publisher_module_id = $publisher->getModule()->mid();
-
- $comment_handler = xoops_gethandler('comment');
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('com_modid', $fm_module_id));
- $comments = $comment_handler->getObjects($criteria);
- foreach ($comments as $comment) {
- $comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]);
- $comment->setVar('com_modid', $publisher_module_id);
- $comment->setNew();
- if (!$comment_handler->insert($comment)) {
- echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />\n";
- } else {
- echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />\n";
- }
-
- }
-
- echo "<br /><br />" . _AM_PUBLISHER_IMPORT_DONE . "<br />\n"
- . "" . sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br />\n"
- . "" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br />\n"
- . "<br/>\n<a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br />\n";
-
- publisher_closeCollapsableBar('fmimportgo', 'fmimportgoicon');
- xoops_cp_footer();
-}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -166,7 +166,7 @@
$itemObj->setVar('dohtml', !$arrArticle['nohtml']);
$itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('weight', 0);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
$itemObj->setVar('rating', $arrArticle['rating']);
$itemObj->setVar('votes', $arrArticle['votes']);
@@ -204,7 +204,7 @@
$fileObj = $publisher_file_handler->create();
$fileObj->setVar('name', $arrFile['fileshowname']);
$fileObj->setVar('description', $arrFile['filedescript']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['minetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -171,7 +171,7 @@
$itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('dobr', $arrArticle['nobreaks']);
$itemObj->setVar('weight', $arrArticle['weight']);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
$itemObj->setGroups_read(explode(" ", trim($arrArticle['groupid'])));
// HTML Wrap
@@ -202,7 +202,7 @@
$fileObj = $publisher->getHandler('file')->create();
$fileObj->setVar('name', $arrFile['fileshowname']);
$fileObj->setVar('description', $arrFile['filedescript']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['minetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -166,9 +166,9 @@
$itemObj->setGroups_read(explode(" ", trim($arrArticle['groupid'])));
// status
- $status = _PUBLISHER_STATUS_PUBLISHED;
+ $status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
if ($arrArticle['offline']) {
- $status = _PUBLISHER_STATUS_OFFLINE;
+ $status = PublisherConstants::_PUBLISHER_STATUS_OFFLINE;
}
$itemObj->setVar('status', $status);
@@ -200,7 +200,7 @@
$fileObj = $publisher->getHandler('file')->create();
$fileObj->setVar('name', $arrFile['fileshowname']);
$fileObj->setVar('description', $arrFile['filedescript']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['minetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -33,6 +33,10 @@
$op = $_POST['op'];
}
+/**
+ * @param $src
+ * @param $dst
+ */
function recurse_copy($src, $dst)
{
$dir = opendir($src);
@@ -173,7 +177,7 @@
ob_end_clean();
$form->addElement(new XoopsFormHidden('op', 'go'));
- $form->addElement(new XoopsFormButton ('', 'import', _AM_PUBLISHER_IMPORT, 'submit'));
+ $form->addElement(new XoopsFormButton('', 'import', _AM_PUBLISHER_IMPORT, 'submit'));
$form->addElement(new XoopsFormHidden('from_module_version', $_POST['xnews_version']));
@@ -340,7 +344,7 @@
$itemObj->setVar('dohtml', !$arrArticle['nohtml']);
$itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('weight', 0);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
$itemObj->setVar('dobr', !$arrArticle['dobr']);
$itemObj->setVar('item_tag', $arrArticle['tags']);
@@ -393,7 +397,7 @@
$fileObj = $publisher->getHandler('file')->create();
$fileObj->setVar('name', $arrFile['filerealname']);
$fileObj->setVar('description', $arrFile['filerealname']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['mimetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -115,17 +115,6 @@
}
}
- // FmContent
- $fmcontent_version = 0;
- $moduleObj = $module_handler->getByDirname('fmcontent');
- if ($moduleObj) {
- $from_module_version = round($moduleObj->getVar('version') / 100, 2);
- if (($from_module_version >= 1.1)) {
- $importfile_select_array["fmcontent"] = "FmContent " . $from_module_version;
- $fmcontent_version = $from_module_version;
- }
- }
-
// XF-Section
/*$xfs_version = 0;
$moduleObj = $module_handler->getByDirname('xfsection');
@@ -174,7 +163,7 @@
$sform->display();
unset($hidden);
} else {
- echo "<span style='color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block;'>" . _AM_PUBLISHER_IMPORT_NO_MODULE . "</span>";
+ echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_MODULE . "</span>";
}
// End of collapsable bar
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -75,11 +75,11 @@
$itemObj->setVarsFromRequest();
$old_status = $itemObj->status();
- $new_status = XoopsRequest::getInt('status', _PUBLISHER_STATUS_PUBLISHED); //_PUBLISHER_STATUS_NOTSET;
+ $new_status = XoopsRequest::getInt('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED); //_PUBLISHER_STATUS_NOTSET;
switch ($new_status) {
- case _PUBLISHER_STATUS_SUBMITTED:
- if (($old_status == _PUBLISHER_STATUS_NOTSET)) {
+ case PublisherConstants::_PUBLISHER_STATUS_SUBMITTED:
+ if (($old_status == PublisherConstants::_PUBLISHER_STATUS_NOTSET)) {
$error_msg = _AM_PUBLISHER_ITEMNOTUPDATED;
} else {
$error_msg = _AM_PUBLISHER_ITEMNOTCREATED;
@@ -87,18 +87,18 @@
$redirect_msg = _AM_PUBLISHER_ITEM_RECEIVED_NEED_APPROVAL;
break;
- case _PUBLISHER_STATUS_PUBLISHED:
- if (($old_status == _PUBLISHER_STATUS_NOTSET) || ($old_status == _PUBLISHER_STATUS_SUBMITTED)) {
+ case PublisherConstants::_PUBLISHER_STATUS_PUBLISHED:
+ if (($old_status == PublisherConstants::_PUBLISHER_STATUS_NOTSET) || ($old_status == PublisherConstants::_PUBLISHER_STATUS_SUBMITTED)) {
$redirect_msg = _AM_PUBLISHER_SUBMITTED_APPROVE_SUCCESS;
- $notifToDo = array(_PUBLISHER_NOT_ITEM_PUBLISHED);
+ $notifToDo = array(PublisherConstants::_PUBLISHER_NOT_ITEM_PUBLISHED);
} else {
$redirect_msg = _AM_PUBLISHER_PUBLISHED_MOD_SUCCESS;
}
$error_msg = _AM_PUBLISHER_ITEMNOTUPDATED;
break;
- case _PUBLISHER_STATUS_OFFLINE:
- if ($old_status == _PUBLISHER_STATUS_NOTSET) {
+ case PublisherConstants::_PUBLISHER_STATUS_OFFLINE:
+ if ($old_status == PublisherConstants::_PUBLISHER_STATUS_NOTSET) {
$redirect_msg = _AM_PUBLISHER_OFFLINE_CREATED_SUCCESS;
} else {
$redirect_msg = _AM_PUBLISHER_OFFLINE_MOD_SUCCESS;
@@ -106,8 +106,8 @@
$error_msg = _AM_PUBLISHER_ITEMNOTUPDATED;
break;
- case _PUBLISHER_STATUS_REJECTED:
- if ($old_status == _PUBLISHER_STATUS_NOTSET) {
+ case PublisherConstants::_PUBLISHER_STATUS_REJECTED:
+ if ($old_status == PublisherConstants::_PUBLISHER_STATUS_NOTSET) {
$error_msg = _AM_PUBLISHER_ITEMNOTUPDATED;
} else {
$error_msg = _AM_PUBLISHER_ITEMNOTCREATED;
@@ -178,7 +178,7 @@
publisher_openCollapsableBar('submiteditemstable', 'submiteditemsicon', _AM_PUBLISHER_SUBMISSIONSMNGMT, _AM_PUBLISHER_SUBMITTED_EXP);
// Get the total number of submitted ITEM
- $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_SUBMITTED));
+ $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_SUBMITTED));
$itemsObj = $publisher->getHandler('item')->getAllSubmitted($publisher->getConfig('idxcat_perpage'), $submittedstartitem, -1, $orderBy, $ascOrDesc);
@@ -227,7 +227,7 @@
publisher_openCollapsableBar('item_publisheditemstable', 'item_publisheditemsicon', _AM_PUBLISHER_PUBLISHEDITEMS, _AM_PUBLISHER_PUBLISHED_DSC);
// Get the total number of published ITEM
- $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_PUBLISHED));
+ $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_PUBLISHED));
$itemsObj = $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_perpage'), $publishedstartitem, -1, $orderBy, $ascOrDesc);
@@ -276,7 +276,7 @@
// Display Offline articles
publisher_openCollapsableBar('offlineitemstable', 'offlineitemsicon', _AM_PUBLISHER_ITEMS . " " . _CO_PUBLISHER_OFFLINE, _AM_PUBLISHER_OFFLINE_EXP);
- $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_OFFLINE));
+ $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_OFFLINE));
$itemsObj = $publisher->getHandler('item')->getAllOffline($publisher->getConfig('idxcat_perpage'), $offlinestartitem, -1, $orderBy, $ascOrDesc);
@@ -326,7 +326,7 @@
publisher_openCollapsableBar('Rejecteditemstable', 'rejecteditemsicon', _AM_PUBLISHER_REJECTED_ITEM, _AM_PUBLISHER_REJECTED_ITEM_EXP, _AM_PUBLISHER_SUBMITTED_EXP);
// Get the total number of Rejected ITEM
- $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_REJECTED));
+ $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_REJECTED));
$itemsObj = $publisher->getHandler('item')->getAllRejected($publisher->getConfig('idxcat_perpage'), $rejectedstartitem, -1, $orderBy, $ascOrDesc);
@@ -373,6 +373,11 @@
}
xoops_cp_footer();
+/**
+ * @param bool $showmenu
+ * @param int $itemid
+ * @param bool $clone
+ */
function publisher_editItem($showmenu = false, $itemid = 0, $clone = false)
{
$publisher = PublisherPublisher::getInstance();
@@ -398,53 +403,53 @@
if ($clone) {
$itemObj->setNew();
$itemObj->setVar('itemid', 0);
- $itemObj->setVar('status', _PUBLISHER_STATUS_NOTSET);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_NOTSET);
$itemObj->setVar('datesub', time());
}
switch ($itemObj->status()) {
- case _PUBLISHER_STATUS_SUBMITTED:
+ case PublisherConstants::_PUBLISHER_STATUS_SUBMITTED:
$breadcrumb_action1 = _CO_PUBLISHER_SUBMITTED;
$breadcrumb_action2 = _AM_PUBLISHER_APPROVING;
$page_title = _AM_PUBLISHER_SUBMITTED_TITLE;
$page_info = _AM_PUBLISHER_SUBMITTED_INFO;
$button_caption = _AM_PUBLISHER_APPROVE;
- $new_status = _PUBLISHER_STATUS_PUBLISHED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
break;
- case _PUBLISHER_STATUS_PUBLISHED:
+ case PublisherConstants::_PUBLISHER_STATUS_PUBLISHED:
$breadcrumb_action1 = _CO_PUBLISHER_PUBLISHED;
$breadcrumb_action2 = _AM_PUBLISHER_EDITING;
$page_title = _AM_PUBLISHER_PUBLISHEDEDITING;
$page_info = _AM_PUBLISHER_PUBLISHEDEDITING_INFO;
$button_caption = _AM_PUBLISHER_MODIFY;
- $new_status = _PUBLISHER_STATUS_PUBLISHED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
break;
- case _PUBLISHER_STATUS_OFFLINE:
+ case PublisherConstants::_PUBLISHER_STATUS_OFFLINE:
$breadcrumb_action1 = _CO_PUBLISHER_OFFLINE;
$breadcrumb_action2 = _AM_PUBLISHER_EDITING;
$page_title = _AM_PUBLISHER_OFFLINEEDITING;
$page_info = _AM_PUBLISHER_OFFLINEEDITING_INFO;
$button_caption = _AM_PUBLISHER_MODIFY;
- $new_status = _PUBLISHER_STATUS_OFFLINE;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_OFFLINE;
break;
- case _PUBLISHER_STATUS_REJECTED:
+ case PublisherConstants::_PUBLISHER_STATUS_REJECTED:
$breadcrumb_action1 = _CO_PUBLISHER_REJECTED;
$breadcrumb_action2 = _AM_PUBLISHER_REJECTED;
$page_title = _AM_PUBLISHER_REJECTED_EDIT;
$page_info = _AM_PUBLISHER_REJECTED_EDIT_INFO;
$button_caption = _AM_PUBLISHER_MODIFY;
- $new_status = _PUBLISHER_STATUS_REJECTED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_REJECTED;
break;
- case _PUBLISHER_STATUS_NOTSET: // Then it's a clone...
+ case PublisherConstants::_PUBLISHER_STATUS_NOTSET: // Then it's a clone...
$breadcrumb_action1 = _AM_PUBLISHER_ITEMS;
$breadcrumb_action2 = _AM_PUBLISHER_CLONE_NEW;
$button_caption = _AM_PUBLISHER_CREATE;
- $new_status = _PUBLISHER_STATUS_PUBLISHED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
$page_title = _AM_PUBLISHER_ITEM_DUPLICATING;
$page_info = _AM_PUBLISHER_ITEM_DUPLICATING_DSC;
break;
@@ -456,7 +461,7 @@
$page_title = _AM_PUBLISHER_PUBLISHEDEDITING;
$page_info = _AM_PUBLISHER_PUBLISHEDEDITING_INFO;
$button_caption = _AM_PUBLISHER_MODIFY;
- $new_status = _PUBLISHER_STATUS_PUBLISHED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
break;
}
@@ -485,7 +490,7 @@
$breadcrumb_action1 = _AM_PUBLISHER_ITEMS;
$breadcrumb_action2 = _AM_PUBLISHER_CREATINGNEW;
$button_caption = _AM_PUBLISHER_CREATE;
- $new_status = _PUBLISHER_STATUS_PUBLISHED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
if ($showmenu) {
//publisher_adminMenu(2, $breadcrumb_action1 . " > " . $breadcrumb_action2);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -55,16 +55,16 @@
$totalcategories = $publisher->getHandler('category')->getCategoriesCount(-1);
// Total submitted ITEMs
-$totalsubmitted = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_SUBMITTED));
+$totalsubmitted = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_SUBMITTED));
// Total published ITEMs
-$totalpublished = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_PUBLISHED));
+$totalpublished = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_PUBLISHED));
// Total offline ITEMs
-$totaloffline = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_OFFLINE));
+$totaloffline = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_OFFLINE));
// Total rejected
-$totalrejected = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_REJECTED));
+$totalrejected = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_REJECTED));
// Check Path Configuration
if ((publisher_getPathStatus('root', true) < 0) ||
@@ -142,38 +142,38 @@
}
switch ($statussel) {
- case _PUBLISHER_STATUS_ALL :
+ case PublisherConstants::_PUBLISHER_STATUS_ALL :
$selectedtxt0 = "selected='selected'";
$caption = _AM_PUBLISHER_ALL;
$cond = "";
$status_explaination = _AM_PUBLISHER_ALL_EXP;
break;
- case _PUBLISHER_STATUS_SUBMITTED :
+ case PublisherConstants::_PUBLISHER_STATUS_SUBMITTED :
$selectedtxt1 = "selected='selected'";
$caption = _CO_PUBLISHER_SUBMITTED;
- $cond = " WHERE status = " . _PUBLISHER_STATUS_SUBMITTED . " ";
+ $cond = " WHERE status = " . PublisherConstants::_PUBLISHER_STATUS_SUBMITTED . " ";
$status_explaination = _AM_PUBLISHER_SUBMITTED_EXP;
break;
- case _PUBLISHER_STATUS_PUBLISHED :
+ case PublisherConstants::_PUBLISHER_STATUS_PUBLISHED :
$selectedtxt2 = "selected='selected'";
$caption = _CO_PUBLISHER_PUBLISHED;
- $cond = " WHERE status = " . _PUBLISHER_STATUS_PUBLISHED . " ";
+ $cond = " WHERE status = " . PublisherConstants::_PUBLISHER_STATUS_PUBLISHED . " ";
$status_explaination = _AM_PUBLISHER_PUBLISHED_EXP;
break;
- case _PUBLISHER_STATUS_OFFLINE :
+ case PublisherConstants::_PUBLISHER_STATUS_OFFLINE :
$selectedtxt3 = "selected='selected'";
$caption = _CO_PUBLISHER_OFFLINE;
- $cond = " WHERE status = " . _PUBLISHER_STATUS_OFFLINE . " ";
+ $cond = " WHERE status = " . PublisherConstants::_PUBLISHER_STATUS_OFFLINE . " ";
$status_explaination = _AM_PUBLISHER_OFFLINE_EXP;
break;
- case _PUBLISHER_STATUS_REJECTED :
+ case PublisherConstants::_PUBLISHER_STATUS_REJECTED :
$selectedtxt4 = "selected='selected'";
$caption = _CO_PUBLISHER_REJECTED;
- $cond = " WHERE status = " . _PUBLISHER_STATUS_REJECTED . " ";
+ $cond = " WHERE status = " . PublisherConstants::_PUBLISHER_STATUS_REJECTED . " ";
$status_explaination = _AM_PUBLISHER_REJECTED_ITEM_EXP;
break;
}
@@ -230,7 +230,7 @@
switch ($itemsObj[$i]->status()) {
- case _PUBLISHER_STATUS_SUBMITTED :
+ case PublisherConstants::_PUBLISHER_STATUS_SUBMITTED :
$statustxt = _CO_PUBLISHER_SUBMITTED;
$approve = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/approve.gif' title='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' alt='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' /></a> ";
$clone = '';
@@ -238,7 +238,7 @@
$modify = "";
break;
- case _PUBLISHER_STATUS_PUBLISHED :
+ case PublisherConstants::_PUBLISHER_STATUS_PUBLISHED :
$statustxt = _CO_PUBLISHER_PUBLISHED;
$approve = "";
$clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a> ";
@@ -246,7 +246,7 @@
$delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
break;
- case _PUBLISHER_STATUS_OFFLINE :
+ case PublisherConstants::_PUBLISHER_STATUS_OFFLINE :
$statustxt = _CO_PUBLISHER_OFFLINE;
$approve = "";
$clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a> ";
@@ -254,7 +254,7 @@
$delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
break;
- case _PUBLISHER_STATUS_REJECTED :
+ case PublisherConstants::_PUBLISHER_STATUS_REJECTED :
$statustxt = _CO_PUBLISHER_REJECTED;
$approve = "";
$clone = "<a href='item.php?op=clone&itemid=" . $item...
[truncated message content] |
|
From: <be...@us...> - 2015-02-18 14:52:17
|
Revision: 12990
http://sourceforge.net/p/xoops/svn/12990
Author: beckmi
Date: 2015-02-18 14:52:02 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
1.02 RC1
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/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/assets/css/jquery.popeye.style.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/publisher.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/loading3.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/behavior.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/funcs.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/rating.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/script.easing.js
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/blockform.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/constants.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/highlighter.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/class/uploader.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/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/footer.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/comment_functions.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/media.textsanitizer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/plugin.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo.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/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/blocks.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/common.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/help/help.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/list.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.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/blocks/publisher_category_items_sel.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_columns.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_new.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_spot.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_search_block.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_archive.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_list.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_wfsection.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_header.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_item.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_print.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_rss.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_search.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
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/jquery.popeye.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/css/style.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/logo.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/compact1.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/compact2.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/compact4.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/enlarge1.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/enlarge2.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/enlarge4.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/loading1.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/loading2.gif
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/next1.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/pause3.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/play3.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/popeye/prev1.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/jquery.popeye-2.1.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/jquery.popeye-2.1.min.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/utilities.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/config/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/config/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/config.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/oninstall.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/onupdate.php
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/images/module_logo.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/assets/js/jquery.popeye-2.0.4.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/install.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/update.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php 2015-02-17 18:44:11 UTC (rev 12989)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/about.php 2015-02-18 14:52:02 UTC (rev 12990)
@@ -1,14 +1,14 @@
<?php
-/*
- 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.
+/**
+ * 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.
+ */
- 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.
-*/
-
/**
* Publisher
*
@@ -29,4 +29,11 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
+// if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+// echo 'I am at least PHP version 5.4.0, my version: ' . PHP_VERSION . "\n";
+// } else {
+// echo 'I am using PHP lower than 5.4, my version: ' . PHP_VERSION . "\n";
+// }
+
+
xoops_cp_footer();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php 2015-02-17 18:44:11 UTC (rev 12989)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/admin_header.php 2015-02-18 14:52:02 UTC (rev 12990)
@@ -1,12 +1,12 @@
<?php
-/*
- 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.
+/**
+ * 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.
*/
/**
@@ -21,22 +21,19 @@
include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
include_once dirname(__DIR__) . '/include/common.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+include_once $GLOBALS['xoops']->path('include/cp_header.php');
//xoops_loadLanguage('admin', PUBLISHER_DIRNAME);
xoops_loadLanguage('modinfo', PUBLISHER_DIRNAME);
$imagearray = array(
- 'editimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_edit.png' alt='" . _AM_PUBLISHER_ICO_EDIT . "' align='middle' />",
+ 'editimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_edit.png' alt='" . _AM_PUBLISHER_ICO_EDIT . "' align='middle' />",
'deleteimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_delete.png' alt='" . _AM_PUBLISHER_ICO_DELETE . "' align='middle' />",
- 'online' => "<img src='" . PUBLISHER_IMAGES_URL . "/on.png' alt='" . _AM_PUBLISHER_ICO_ONLINE . "' align='middle' />",
- 'offline' => "<img src='" . PUBLISHER_IMAGES_URL . "/off.png' alt='" . _AM_PUBLISHER_ICO_OFFLINE . "' align='middle' />",
+ 'online' => "<img src='" . PUBLISHER_IMAGES_URL . "/on.png' alt='" . _AM_PUBLISHER_ICO_ONLINE . "' align='middle' />",
+ 'offline' => "<img src='" . PUBLISHER_IMAGES_URL . "/off.png' alt='" . _AM_PUBLISHER_ICO_OFFLINE . "' align='middle' />",
);
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))) {
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
-} else {
- echo xoops_error('/Frameworks/moduleclasses/moduleadmin/ is required!!!');
-}
+include_once $GLOBALS['xoops']->path('Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+
/*
$myts = MyTextSanitizer::getInstance();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2015-02-17 18:44:11 UTC (rev 12989)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2015-02-18 14:52:02 UTC (rev 12990)
@@ -21,30 +21,28 @@
include_once __DIR__ . '/admin_header.php';
-$op = XoopsRequest::getString('op');
+$op = XoopsRequest::getString('op', '', 'GET');
-$op = isset($_POST['editor']) ? 'mod' : $op;
-if (isset($_POST['addcategory'])) {
- $op = 'addcategory';
-}
+$op = (XoopsRequest::getString('editor', '', 'POST')) ? 'mod' : $op;
+$op = (XoopsRequest::getString('addcategory', '', 'POST')) ? 'addcategory' : $op;
// Where do we start ?
-$startcategory = XoopsRequest::getInt('startcategory');
-$categoryid = XoopsRequest::getInt('categoryid');
+$startcategory = XoopsRequest::getInt('startcategory', 0, 'GET');
+$categoryid = XoopsRequest::getInt('categoryid');
switch ($op) {
case "del":
$categoryObj = $publisher->getHandler('category')->get($categoryid);
- $confirm = (isset($_POST['confirm'])) ? $_POST['confirm'] : 0;
- $name = (isset($_POST['name'])) ? $_POST['name'] : '';
+ $confirm = XoopsRequest::getInt('confirm', '', 'POST');
+ $name = XoopsRequest::getString('name', '', 'POST');
if ($confirm) {
if (!$publisher->getHandler('category')->delete($categoryObj)) {
redirect_header("category.php", 1, _AM_PUBLISHER_DELETE_CAT_ERROR);
- exit();
+// exit();
}
redirect_header("category.php", 1, sprintf(_AM_PUBLISHER_COLISDELETED, $name));
- exit();
+// exit();
} else {
xoops_cp_header();
xoops_confirm(array('op' => 'del', 'categoryid' => $categoryObj->categoryid(), 'confirm' => 1, 'name' => $categoryObj->name()), 'category.php', _AM_PUBLISHER_DELETECOL . " '" . $categoryObj->name() . "'. <br /> <br />" . _AM_PUBLISHER_DELETE_CAT_CONFIRM, _AM_PUBLISHER_DELETE);
@@ -54,12 +52,12 @@
case "mod":
//Added by fx2024
- $nb_subcats = isset($_POST['nb_subcats']) ? intval($_POST['nb_subcats']) : 0;
- $nb_subcats = $nb_subcats + (isset($_POST['nb_sub_yet']) ? intval($_POST['nb_sub_yet']) : 4);
+ $nb_subcats = XoopsRequest::getInt('nb_subcats', 0, 'POST');
+ $nb_subcats = $nb_subcats + (XoopsRequest::getInt('nb_sub_yet', 4, 'POST'));
//end of fx2024 code
- publisher_cpHeader();
- publisher_editCat(true, $categoryid, $nb_subcats);
+ publisherCpHeader();
+ PublisherUtilities::editCategory(true, $categoryid, $nb_subcats);
break;
case "addcategory":
@@ -75,136 +73,121 @@
// Uploading the image, if any
// Retreive the filename to be uploaded
- if (isset($_FILES['image_file']['name']) && $_FILES['image_file']['name'] != "") {
- $filename = $_POST["xoops_upload_file"][0];
- if (!empty($filename) || $filename != "") {
+ if (($image_file = XoopsRequest::getArray('image_file', '', 'FILES')['name'])) {
+// $filename = XoopsRequest::getArray('xoops_upload_file', array(), 'POST')[0];
+ if ($filename = XoopsRequest::getArray('xoops_upload_file', array(), 'POST')[0]) {
// TODO : implement publisher mimetype management
- $max_size = $publisher->getConfig('maximum_filesize');
- $max_imgwidth = $publisher->getConfig('maximum_image_width');
- $max_imgheight = $publisher->getConfig('maximum_image_height');
- $allowed_mimetypes = publisher_getAllowedImagesTypes();
+ $max_size = $publisher->getConfig('maximum_filesize');
+ $max_imgwidth = $publisher->getConfig('maximum_image_width');
+ $max_imgheight = $publisher->getConfig('maximum_image_height');
+ $allowed_mimetypes = publisherGetAllowedImagesTypes();
- if ($_FILES[$filename]['tmp_name'] == "" || !is_readable($_FILES[$filename]['tmp_name'])) {
+ if (!($tmp_name = (XoopsRequest::getArray('filename', array(), 'FILES')['tmp_name'])) || !is_readable($tmp_name)) {
redirect_header('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR);
- exit();
+// exit();
}
xoops_load('XoopsMediaUploader');
- $uploader = new XoopsMediaUploader(publisher_getImageDir('category'), $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
+ $uploader = new XoopsMediaUploader(publisherGetImageDir('category'), $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
if ($uploader->fetchMedia($filename) && $uploader->upload()) {
$categoryObj->setVar('image', $uploader->getSavedFileName());
} else {
redirect_header('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR . $uploader->getErrors());
- exit();
+// exit();
}
}
} else {
- if (isset($_POST['image'])) {
- $categoryObj->setVar('image', $_POST['image']);
- }
+ $categoryObj->setVar('image', XoopsRequest::getString('image', '', 'POST'));
}
- $categoryObj->setVar('parentid', (isset($_POST['parentid'])) ? intval($_POST['parentid']) : 0);
+ $categoryObj->setVar('parentid', (XoopsRequest::getInt('parentid', 0, 'POST')));
- $applyall = isset($_POST['applyall']) ? intval($_POST['applyall']) : 0;
- $categoryObj->setVar('weight', isset($_POST['weight']) ? intval($_POST['weight']) : 1);
+ $applyall = XoopsRequest::getInt('applyall', 0, 'POST');
+ $categoryObj->setVar('weight', XoopsRequest::getInt('weight', 1, 'POST'));
// Groups and permissions
- $grpread = isset($_POST['groups_read']) ? $_POST['groups_read'] : array();
- $grpsubmit = isset($_POST['groups_submit']) ? $_POST['groups_submit'] : array();
- $grpmoderation = isset($_POST['groups_moderation']) ? $_POST['groups_moderation'] : array();
+ $grpread = XoopsRequest::getArray('groupsRead', array(), 'POST');
+ $grpsubmit = XoopsRequest::getArray('groupsSubmit', array(), 'POST');
+ $grpmoderation = XoopsRequest::getArray('groupsModeration', array(), 'POST');
- $categoryObj->setVar('name', $_POST['name']);
+ $categoryObj->setVar('name', XoopsRequest::getString('name', '', 'POST'));
//Added by skalpa: custom template support
- if (isset($_POST['template'])) {
- $categoryObj->setVar('template', $_POST['template']);
- }
+ $categoryObj->setVar('template', XoopsRequest::getString('template', '', 'POST'));
+ $categoryObj->setVar('meta_description', XoopsRequest::getString('meta_description', '', 'POST'));
+ $categoryObj->setVar('meta_keywords', XoopsRequest::getString('meta_keywords', '', 'POST'));
+ $categoryObj->setVar('short_url', XoopsRequest::getString('short_url', '', 'POST'));
+ $categoryObj->setVar('moderator', XoopsRequest::getInt('moderator', 0, 'POST'));
+ $categoryObj->setVar('description', XoopsRequest::getString('description', '', 'POST'));
+ $categoryObj->setVar('header', XoopsRequest::getString('header', '', 'POST'));
- if (isset($_POST['meta_description'])) {
- $categoryObj->setVar('meta_description', $_POST['meta_description']);
- }
- if (isset($_POST['meta_keywords'])) {
- $categoryObj->setVar('meta_keywords', $_POST['meta_keywords']);
- }
- if (isset($_POST['short_url'])) {
- $categoryObj->setVar('short_url', $_POST['short_url']);
- }
- $categoryObj->setVar('moderator', intval($_POST['moderator']));
- $categoryObj->setVar('description', $_POST['description']);
-
- if (isset($_POST['header'])) {
- $categoryObj->setVar('header', $_POST['header']);
- }
-
if ($categoryObj->isNew()) {
$redirect_msg = _AM_PUBLISHER_CATCREATED;
- $redirect_to = 'category.php?op=mod';
+ $redirect_to = 'category.php?op=mod';
} else {
$redirect_msg = _AM_PUBLISHER_COLMODIFIED;
- $redirect_to = 'category.php';
+ $redirect_to = 'category.php';
}
if (!$categoryObj->store()) {
- redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . publisher_formatErrors($categoryObj->getErrors()));
- exit;
+ redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . publisherFormatErrors($categoryObj->getErrors()));
+// exit;
}
// TODO : put this function in the category class
- publisher_saveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read');
- publisher_saveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit');
- publisher_saveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation');
+ publisherSaveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read');
+ publisherSaveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit');
+ publisherSaveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation');
//Added by fx2024
$parentCat = $categoryObj->categoryid();
- $sizeof = sizeof($_POST['scname']);
+ $sizeof = sizeof(XoopsRequest::getString('scname', '', 'POST'));
for ($i = 0; $i < $sizeof; ++$i) {
- if ($_POST['scname'][$i] != '') {
+ if (XoopsRequest::getArray('scname', array(), 'POST')[$i] != '') {
$categoryObj = $publisher->getHandler('category')->create();
- $categoryObj->setVar('name', $_POST['scname'][$i]);
+ $categoryObj->setVar('name', XoopsRequest::getArray('scname', array(), 'POST')[$i]);
$categoryObj->setVar('parentid', $parentCat);
if (!$categoryObj->store()) {
- redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . publisher_formatErrors($categoryObj->getErrors()));
- exit;
+ redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . publisherFormatErrors($categoryObj->getErrors()));
+// exit;
}
// TODO : put this function in the category class
- publisher_saveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read');
- publisher_saveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit');
- publisher_saveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation');
+ publisherSaveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read');
+ publisherSaveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit');
+ publisherSaveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation');
}
}
//end of fx2024 code
redirect_header($redirect_to, 2, $redirect_msg);
- exit();
+// exit();
break;
//Added by fx2024
case "addsubcats":
$categoryid = 0;
- $nb_subcats = intval($_POST['nb_subcats']) + $_POST['nb_sub_yet'];
+ $nb_subcats = XoopsRequest::getInt('nb_subcats', 0, 'POST') + XoopsRequest::getInt('nb_sub_yet', 0, 'POST');
$categoryObj = $publisher->getHandler('category')->create();
- $categoryObj->setVar('name', $_POST['name']);
- $categoryObj->setVar('description', $_POST['description']);
- $categoryObj->setVar('weight', $_POST['weight']);
+ $categoryObj->setVar('name', XoopsRequest::getString('name', '', 'POST'));
+ $categoryObj->setVar('description', XoopsRequest::getString('description', '', 'POST'));
+ $categoryObj->setVar('weight', XoopsRequest::getInt('weight', 0, 'POST'));
if (isset($parentCat)) {
$categoryObj->setVar('parentid', $parentCat);
}
- publisher_cpHeader();
- publisher_editCat(true, $categoryid, $nb_subcats, $categoryObj);
+ publisherCpHeader();
+ PublisherUtilities::editCategory(true, $categoryid, $nb_subcats, $categoryObj);
exit();
-
break;
//end of fx2024 code
case "cancel":
redirect_header("category.php", 1, sprintf(_AM_PUBLISHER_BACK2IDX, ''));
- exit();
-
+// exit();
+ break;
case "default":
default:
- publisher_cpHeader();
+ publisherCpHeader();
//publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES);
echo "<br />\n";
@@ -216,7 +199,7 @@
// Creating the objects for top categories
$categoriesObj = $publisher->getHandler('category')->getCategories($publisher->getConfig('idxcat_perpage'), $startcategory, 0);
- publisher_openCollapsableBar('createdcategories', 'createdcategoriesicon', _AM_PUBLISHER_CATEGORIES_TITLE, _AM_PUBLISHER_CATEGORIES_DSC);
+ publisherOpenCollapsableBar('createdcategories', 'createdcategoriesicon', _AM_PUBLISHER_CATEGORIES_TITLE, _AM_PUBLISHER_CATEGORIES_DSC);
echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
echo "<tr>";
@@ -228,8 +211,9 @@
$totalCategories = $publisher->getHandler('category')->getCategoriesCount(0);
if (count($categoriesObj) > 0) {
foreach ($categoriesObj as $key => $thiscat) {
- publisher_displayCategory($thiscat);
+ PublisherUtilities::displayCategory($thiscat);
}
+ unset($key, $thiscat);
} else {
echo "<tr>";
echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOCAT . "</td>";
@@ -237,184 +221,14 @@
$categoryid = '0';
}
echo "</table>\n";
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ include_once $GLOBALS['xoops']->path('class/pagenav.php');
$pagenav = new XoopsPageNav($totalCategories, $publisher->getConfig('idxcat_perpage'), $startcategory, 'startcategory');
echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
echo "<br />";
- publisher_closeCollapsableBar('createdcategories', 'createdcategoriesicon');
+ publisherCloseCollapsableBar('createdcategories', 'createdcategoriesicon');
echo "<br>";
//editcat(false);
break;
}
xoops_cp_footer();
-
-/**
- * @param $categoryObj
- * @param int $level
- */
-function publisher_displayCategory($categoryObj, $level = 0)
-{
- $publisher = PublisherPublisher::getInstance();
-
- $description = $categoryObj->description();
- if (!XOOPS_USE_MULTIBYTES) {
- if (strlen($description) >= 100) {
- $description = substr($description, 0, (100 - 1)) . "...";
- }
- }
- $modify = "<a href='category.php?op=mod&categoryid=" . $categoryObj->categoryid() . "&parentid=" . $categoryObj->parentid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITCOL . "' alt='" . _AM_PUBLISHER_EDITCOL . "' /></a>";
- $delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETECOL . "' alt='" . _AM_PUBLISHER_DELETECOL . "' /></a>";
-
- $spaces = '';
- for ($j = 0; $j < $level; ++$j) {
- $spaces .= ' ';
- }
-
- echo "<tr>";
- echo "<td class='even' align='center'>" . $categoryObj->categoryid() . "</td>";
- echo "<td class='even' align='left'>" . $spaces . "<a href='" . PUBLISHER_URL . "/category.php?categoryid=" . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/subcat.gif' alt='' /> " . $categoryObj->name() . "</a></td>";
- echo "<td class='even' align='center'>" . $categoryObj->weight() . "</td>";
- echo "<td class='even' align='center'> $modify $delete </td>";
- echo "</tr>";
- $subCategoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid());
- if (count($subCategoriesObj) > 0) {
- ++$level;
- foreach ($subCategoriesObj as $key => $thiscat) {
- publisher_displayCategory($thiscat, $level);
- }
- }
- unset($categoryObj);
-}
-
-/**
- * @param bool $showmenu
- * @param int $categoryid
- * @param int $nb_subcats
- * @param null $categoryObj
- */
-function publisher_editCat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryObj = null)
-{
- $publisher = PublisherPublisher::getInstance();
-
- // if there is a parameter, and the id exists, retrieve data: we're editing a category
- if ($categoryid != 0) {
- // Creating the category object for the selected category
- $categoryObj = $publisher->getHandler('category')->get($categoryid);
- if ($categoryObj->notLoaded()) {
- redirect_header("category.php", 1, _AM_PUBLISHER_NOCOLTOEDIT);
- exit();
- }
- } else {
- if (!$categoryObj) {
- $categoryObj = $publisher->getHandler('category')->create();
- }
- }
-
- if ($categoryid != 0) {
- if ($showmenu) {
- //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES . " > " . _AM_PUBLISHER_EDITING);
- }
- echo "<br />\n";
- publisher_openCollapsableBar('edittable', 'edittableicon', _AM_PUBLISHER_EDITCOL, _AM_PUBLISHER_CATEGORY_EDIT_INFO);
- } else {
- if ($showmenu) {
- //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES . " > " . _AM_PUBLISHER_CREATINGNEW);
- }
- publisher_openCollapsableBar('createtable', 'createtableicon', _AM_PUBLISHER_CATEGORY_CREATE, _AM_PUBLISHER_CATEGORY_CREATE_INFO);
- }
-
- $sform = $categoryObj->getForm($nb_subcats);
- $sform->display();
-
- if (!$categoryid) {
- publisher_closeCollapsableBar('createtable', 'createtableicon');
- } else {
- publisher_closeCollapsableBar('edittable', 'edittableicon');
- }
-
- //Added by fx2024
- if ($categoryid) {
- $sel_cat = $categoryid;
-
- publisher_openCollapsableBar('subcatstable', 'subcatsicon', _AM_PUBLISHER_SUBCAT_CAT, _AM_PUBLISHER_SUBCAT_CAT_DSC);
- // Get the total number of sub-categories
- $categoriesObj = $publisher->getHandler('category')->get($sel_cat);
- $totalsubs = $publisher->getHandler('category')->getCategoriesCount($sel_cat);
- // creating the categories objects that are published
- $subcatsObj = $publisher->getHandler('category')->getCategories(0, 0, $categoriesObj->categoryid());
- $totalSCOnPage = count($subcatsObj);
- echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
- echo "<tr>";
- echo "<td width='60' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATID . "</strong></td>";
- echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATCOLNAME . "</strong></td>";
- echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_SUBDESCRIPT . "</strong></td>";
- echo "<td width='60' class='bg3' align='right'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
- echo "</tr>";
- if ($totalsubs > 0) {
- foreach ($subcatsObj as $subcat) {
- $modify = "<a href='category.php?op=mod&categoryid=" . $subcat->categoryid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_MODIFY . "' alt='" . _AM_PUBLISHER_MODIFY . "' /></a>";
- $delete = "<a href='category.php?op=del&categoryid=" . $subcat->categoryid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETE . "' alt='" . _AM_PUBLISHER_DELETE . "' /></a>";
- echo "<tr>";
- echo "<td class='head' align='left'>" . $subcat->categoryid() . "</td>";
- echo "<td class='even' align='left'><a href='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/category.php?categoryid=" . $subcat->categoryid() . "&parentid=" . $subcat->parentid() . "'>" . $subcat->name() . "</a></td>";
- echo "<td class='even' align='left'>" . $subcat->description() . "</td>";
- echo "<td class='even' align='right'> {$modify} {$delete} </td>";
- echo "</tr>";
- }
- } else {
- echo "<tr>";
- echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOSUBCAT . "</td>";
- echo "</tr>";
- }
- echo "</table>\n";
- echo "<br />\n";
- publisher_closeCollapsableBar('subcatstable', 'subcatsicon');
-
- publisher_openCollapsableBar('bottomtable', 'bottomtableicon', _AM_PUBLISHER_CAT_ITEMS, _AM_PUBLISHER_CAT_ITEMS_DSC);
- $startitem = XoopsRequest::getInt('startitem');
- // Get the total number of published ITEMS
- $totalitems = $publisher->getHandler('item')->getItemsCount($sel_cat, array(PublisherConstants::_PUBLISHER_STATUS_PUBLISHED));
- // creating the items objects that are published
- $itemsObj = $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_perpage'), $startitem, $sel_cat);
- $totalitemsOnPage = count($itemsObj);
- $allcats = $publisher->getHandler('category')->getObjects(null, true);
- echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
- echo "<tr>";
- echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>";
- echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCOLNAME . "</strong></td>";
- echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMDESC . "</strong></td>";
- echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>";
- echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>";
- echo "</tr>";
- if ($totalitems > 0) {
- for ($i = 0; $i < $totalitemsOnPage; ++$i) {
- $categoryObj = $allcats[$itemsObj[$i]->categoryid()];
- $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
- $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
- echo "<tr>";
- echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . "</td>";
- echo "<td class='even' align='left'>" . $categoryObj->name() . "</td>";
- echo "<td class='even' align='left'>" . $itemsObj[$i]->getitemLink() . "</td>";
- echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub('s') . "</td>";
- echo "<td class='even' align='center'> $modify $delete </td>";
- echo "</tr>";
- }
- } else {
- $itemid = -1;
- echo "<tr>";
- echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . "</td>";
- echo "</tr>";
- }
- echo "</table>\n";
- echo "<br />\n";
- $parentid = XoopsRequest::getInt('parentid');
- $pagenav_extra_args = "op=mod&categoryid=$sel_cat&parentid=$parentid";
- xoops_load('XoopsPageNav');
- $pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $startitem, 'startitem', $pagenav_extra_args);
- echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
- echo "<input type='button' name='button' onclick=\"location='item.php?op=mod&categoryid=" . $sel_cat . "'\" value='" . _AM_PUBLISHER_CREATEITEM . "'> ";
- echo "</div>";
- }
- //end of fx2024 code
-}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2015-02-17 18:44:11 UTC (rev 12989)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2015-02-18 14:52:02 UTC (rev 12990)
@@ -20,43 +20,43 @@
include_once __DIR__ . "/admin_header.php";
-publisher_cpHeader();
+publisherCpHeader();
//publisher_adminMenu(-1, _AM_PUBLISHER_CLONE);
-publisher_openCollapsableBar('clone', 'cloneicon', _AM_PUBLISHER_CLONE, _AM_PUBLISHER_CLONE_DSC);
+publisherOpenCollapsableBar('clone', 'cloneicon', _AM_PUBLISHER_CLONE, _AM_PUBLISHER_CLONE_DSC);
-if (@$_POST['op'] == 'submit') {
-
+if ('submit' == XoopsRequest::getString('op', '', 'POST')) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('clone.php', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- exit();
+// exit();
}
- $clone = $_POST['clone'];
+// $clone = $_POST['clone'];
+ $clone = XoopsRequest::getString('clone', '', 'POST');
//check if name is valid
if (empty($clone) || preg_match('/[^a-zA-Z0-9\_\-]/', $clone)) {
redirect_header('clone.php', 3, sprintf(_AM_PUBLISHER_CLONE_INVALIDNAME, $clone));
- exit();
+// exit();
}
// Check wether the cloned module exists or not
- if ($clone && is_dir(XOOPS_ROOT_PATH . '/modules/' . $clone)) {
+ if ($clone && is_dir($GLOBALS['xoops']->path('modules/' . $clone))) {
redirect_header('clone.php', 3, sprintf(_AM_PUBLISHER_CLONE_EXISTS, $clone));
}
$patterns = array(
- strtolower(PUBLISHER_DIRNAME) => strtolower($clone),
- strtoupper(PUBLISHER_DIRNAME) => strtoupper($clone),
+ strtolower(PUBLISHER_DIRNAME) => strtolower($clone),
+ strtoupper(PUBLISHER_DIRNAME) => strtoupper($clone),
ucfirst(strtolower(PUBLISHER_DIRNAME)) => ucfirst(strtolower($clone))
);
- $patKeys = array_keys($patterns);
+ $patKeys = array_keys($patterns);
$patValues = array_values($patterns);
- publisher_cloneFileFolder(PUBLISHER_ROOT_PATH);
- $logocreated = publisher_createLogo(strtolower($clone));
+ PublisherClone::cloneFileFolder(PUBLISHER_ROOT_PATH);
+ $logocreated = PublisherClone::createLogo(strtolower($clone));
$msg = "";
- if (is_dir(XOOPS_ROOT_PATH . '/modules/' . strtolower($clone))) {
+ if (is_dir($GLOBALS['xoops']->path('modules/' . strtolower($clone)))) {
$msg .= sprintf(_AM_PUBLISHER_CLONE_CONGRAT, "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin'>" . ucfirst(strtolower($clone)) . "</a>") . "<br />\n";
if (!$logocreated) {
$msg .= _AM_PUBLISHER_CLONE_IMAGEFAIL;
@@ -67,8 +67,8 @@
echo $msg;
} else {
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $form = new XoopsThemeForm(sprintf(_AM_PUBLISHER_CLONE_TITLE, $publisher->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
+ include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+ $form = new XoopsThemeForm(sprintf(_AM_PUBLISHER_CLONE_TITLE, $publisher->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
$clone = new XoopsFormText(_AM_PUBLISHER_CLONE_NAME, 'clone', 20, 20, '');
$clone->setDescription(_AM_PUBLISHER_CLONE_NAME_DSC);
$form->addElement($clone, true);
@@ -78,102 +78,106 @@
}
// End of collapsable bar
-publisher_closeCollapsableBar('clone', 'cloneicon');
+publisherCloseCollapsableBar('clone', 'cloneicon');
xoops_cp_footer();
// work around for PHP < 5.0.x
+/*
if (!function_exists('file_put_contents')) {
- /**
- * @param $filename
- * @param $data
- * @param bool $file_append
- */
function file_put_contents($filename, $data, $file_append = false)
{
- if ($fp = fopen($filename, (!$file_append ? 'w+' : 'a+'))) {
+ if ($fp == fopen($filename, (!$file_append ? 'w+' : 'a+'))) {
fputs($fp, $data);
fclose($fp);
}
}
}
+*/
-// recursive clonning script
/**
- * @param $path
+ * Class PublisherClone
*/
-function publisher_cloneFileFolder($path)
+class PublisherClone
{
+
+// recursive clonning script
+ /**
+ * @param $path
+ */
+ public static function cloneFileFolder($path)
+ {
global $patKeys;
global $patValues;
- $newPath = str_replace($patKeys[0], $patValues[0], $path);
+ $newPath = str_replace($patKeys[0], $patValues[0], $path);
- if (is_dir($path)) {
- // create new dir
- mkdir($newPath);
+ if (is_dir($path)) {
+ // create new dir
+ mkdir($newPath);
- // check all files in dir, and process it
- if ($handle = opendir($path)) {
- while ($file = readdir($handle)) {
- if ($file != '.' && $file != '..' && $file != '.svn') {
- publisher_cloneFileFolder("{$path}/{$file}");
+ // check all files in dir, and process it
+ if ($handle == opendir($path)) {
+ while (($file = readdir($handle)) !== false) {
+ if ($file != '.' && $file != '..' && $file != '.svn') {
+ self::cloneFileFolder("{$path}/{$file}");
+ }
}
+ closedir($handle);
}
- closedir($handle);
- }
- } else {
-
- if (preg_match('/(.jpg|.gif|.png|.zip)$/i', $path)) {
- // image
- copy($path, $newPath);
} else {
- // file, read it
- $content = file_get_contents($path);
- $content = str_replace($patKeys, $patValues, $content);
- file_put_contents($newPath, $content);
+ if (preg_match('/(.jpg|.gif|.png|.zip)$/i', $path)) {
+ // image
+ copy($path, $newPath);
+ } else {
+ // file, read it
+ $content = file_get_contents($path);
+ $content = str_replace($patKeys, $patValues, $content);
+ file_put_contents($newPath, $content);
+ }
}
}
-}
-/**
- * @param $dirname
- *
- * @return bool
- */
-function publisher_createLogo($dirname)
-{
- if (!extension_loaded("gd")) {
- return false;
- } else {
- $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
- foreach ($required_functions as $func) {
- if (!function_exists($func)) {
- return false;
+ /**
+ * @param $dirname
+ *
+ * @return bool
+ */
+ public static function createLogo($dirname)
+ {
+ if (!extension_loaded("gd")) {
+ return false;
+ } else {
+ $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
+ foreach ($required_functions as $func) {
+ if (!function_exists($func)) {
+ return false;
+ }
}
+ unset($func);
}
- }
- if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo.png") || !file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/VeraBd.ttf")) {
- return false;
- }
+ if (!file_exists($imageBase = $GLOBALS['xoops']->path("/modules/" . $dirname . "/assets/images/module_logo.png")) || !file_exists($font = $GLOBALS['xoops']->path("/modules/" . $dirname . "/assets/images/VeraBd.ttf"))) {
+ return false;
+ }
- $imageModule = imagecreatefrompng($imageBase);
+ $imageModule = imagecreatefrompng($imageBase);
- //Erase old text
- $grey_color = imagecolorallocate($imageModule, 237, 237, 237);
- imagefilledrectangle($imageModule, 5, 35, 85, 46, $grey_color);
+ //Erase old text
+ $grey_color = imagecolorallocate($imageModule, 237, 237, 237);
+ imagefilledrectangle($imageModule, 5, 35, 85, 46, $grey_color);
- // Write text
- $text_color = imagecolorallocate($imageModule, 0, 0, 0);
- $space_to_border = (80 - strlen($dirname) * 6.5) / 2;
- imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $text_color, $font, ucfirst($dirname), array());
+ // Write text
+ $text_color = imagecolorallocate($imageModule, 0, 0, 0);
+ $space_to_border = (80 - strlen($dirname) * 6.5) / 2;
+ imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $text_color, $font, ucfirst($dirname), array());
- // Set transparency color
- $white = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
- imagefill($imageModule, 0, 0, $white);
- imagecolortransparent($imageModule, $white);
- imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo.png");
- imagedestroy($imageModule);
+ // Set transparency color
+ $white = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
+ imagefill($imageModule, 0, 0, $white);
+ imagecolortransparent($imageModule, $white);
+ imagepng($imageModule, $GLOBALS['xoops']->path("/modules/" . $dirname . "/assets/images/module_logo.png"));
+ imagedestroy($imageModule);
- return true;
+ return true;
+ }
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2015-02-17 18:44:11 UTC (rev 12989)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2015-02-18 14:52:02 UTC (rev 12990)
@@ -25,23 +25,22 @@
/**
* @param bool $showmenu
- * @param int $fileid
- * @param int $itemid
+ * @param int $fileid
+ * @param int $itemid
*/
function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
{
$publisher = PublisherPublisher::getInstance();
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+ include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
// if there is a parameter, and the id exists, retrieve data: we're editing a file
if ($fileid != 0) {
-
// Creating the File object
$fileObj = $publisher->getHandler('file')->get($fileid);
if ($fileObj->notLoaded()) {
redirect_header("javascript:history.go(-1)", 1, _AM_PUBLISHER_NOFILESELECTED);
- exit();
+// exit();
}
if ($showmenu) {
@@ -51,7 +50,7 @@
echo "<br />\n";
echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_EDITING . "</span>";
echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_EDITING_DSC . "</span>";
- publisher_openCollapsableBar('editfile', 'editfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
+ publisherOpenCollapsableBar('editfile', 'editfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
} else {
// there's no parameter, so we're adding an item
$fileObj = $publisher->getHandler('file')->create();
@@ -61,7 +60,7 @@
}
echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_ADDING . "</span>";
echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_ADDING_DSC . "</span>";
- publisher_openCollapsableBar('addfile', 'addfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
+ publisherOpenCollapsableBar('addfile', 'addfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
}
// FILES UPLOAD FORM
@@ -69,9 +68,9 @@
$files_form->display();
if ($fileid != 0) {
- publisher_closeCollapsableBar('editfile', 'editfileicon');
+ publisherCloseCollapsableBar('editfile', 'editfileicon');
} else {
- publisher_closeCollapsableBar('addfile', 'addfileicon');
+ publisherCloseCollapsableBar('addfile', 'addfileicon');
}
}
@@ -80,31 +79,31 @@
/* -- Available operations -- */
switch ($op) {
case "uploadfile";
- publisher_uploadFile(false, true, $false);
+ publisherUploadFile(false, true, $false);
exit;
break;
case "uploadanother";
- publisher_uploadFile(true, true, $false);
+ publisherUploadFile(true, true, $false);
exit;
break;
case "mod":
- $fileid = isset($_GET['fileid']) ? $_GET['fileid'] : 0;
- $itemid = isset($_GET['itemid']) ? $_GET['itemid'] : 0;
+ $fileid = XoopsRequest::getInt('fileid', 0, 'GET');
+ $itemid = XoopsRequest::getInt('itemid', 0, 'GET');
if (($fileid == 0) && ($itemid == 0)) {
redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_NOITEMSELECTED);
- exit();
+// exit();
}
- publisher_cpHeader();
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+ publisherCpHeader();
+ include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
publisher_editFile(true, $fileid, $itemid);
break;
case "modify":
- $fileid = isset($_POST['fileid']) ? intval($_POST['fileid']) : 0;
+ $fileid = XoopsRequest::getInt('fileid', 0, 'POST');
// Creating the file object
if ($fileid != 0) {
@@ -114,43 +113,43 @@
}
// Putting the values in the file object
- $fileObj->setVar('name', $_POST['name']);
- $fileObj->setVar('description', $_POST['description']);
- $fileObj->setVar('status', intval($_POST['file_status']));
+ $fileObj->setVar('name', XoopsRequest::getString('name', '', 'POST'));
+ $fileObj->setVar('description', XoopsRequest::getString('description', '', 'POST'));
+ $fileObj->setVar('status', XoopsRequest::getInt('status', 0, 'POST'));
// Storing the file
if (!$fileObj->store()) {
- redirect_header('item.php?op=mod&itemid=' . $fileObj->itemid(), 3, _AM_PUBLISHER_FILE_EDITING_ERROR . publisher_formatErrors($fileObj->getErrors()));
- exit;
+ redirect_header('item.php?op=mod&itemid=' . $fileObj->itemid(), 3, _AM_PUBLISHER_FILE_EDITING_ERROR . publisherFormatErrors($fileObj->getErrors()));
+// exit;
}
redirect_header('item.php?op=mod&itemid=' . $fileObj->itemid(), 2, _AM_PUBLISHER_FILE_EDITING_SUCCESS);
- exit();
+// exit();
break;
case "del":
- $fileid = isset($_POST['fileid']) ? intval($_POST['fileid']) : 0;
- $fileid = isset($_GET['fileid']) ? intval($_GET['fileid']) : $fileid;
+ $fileid = XoopsRequest::getInt('fileid', 0, 'POST');
+ $fileid = XoopsRequest::getInt('fileid', $fileid, 'GET');
$fileObj = $publisher->getHandler('file')->get($fileid);
- $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
- $title = isset($_POST['title']) ? $_POST['title'] : '';
+ $confirm = XoopsRequest::getInt('confirm', 0, 'POST');
+ $title = XoopsRequest::getString('title', '', 'POST');
if ($confirm) {
if (!$publisher->getHandler('file')->delete($fileObj)) {
redirect_header('item.php', 2, _AM_PUBLISHER_FILE_DELETE_ERROR);
- exit;
+// exit;
}
redirect_header('item.php', 2, sprintf(_AM_PUBLISHER_FILEISDELETE...
[truncated message content] |
|
From: <be...@us...> - 2015-05-26 09:35:28
|
Revision: 13070
http://sourceforge.net/p/xoops/svn/13070
Author: beckmi
Date: 2015-05-26 09:35:26 +0000 (Tue, 26 May 2015)
Log Message:
-----------
1.02 RC-1 for XOOPS 2.5.7.1 (see changelog.txt)
Modified Paths:
--------------
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/import/ams.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.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/menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.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/blocks/category_items_sel.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.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/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/highlighter.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/session.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/utilities.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/config.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/oninstall.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/onupdate.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo.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/search.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/submit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_wfsection.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_header.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/plugins/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/plugins/plugin.tag.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -73,7 +73,7 @@
// Uploading the image, if any
// Retreive the filename to be uploaded
- if (($image_file = XoopsRequest::getArray('image_file', '', 'FILES')['name'])) {
+ if ($image_file = XoopsRequest::getArray('image_file', '', 'FILES')['name']) {
// $filename = XoopsRequest::getArray('xoops_upload_file', array(), 'POST')[0];
if ($filename = XoopsRequest::getArray('xoops_upload_file', array(), 'POST')[0]) {
// TODO : implement publisher mimetype management
@@ -139,7 +139,7 @@
//Added by fx2024
$parentCat = $categoryObj->categoryid();
- $sizeof = sizeof(XoopsRequest::getString('scname', '', 'POST'));
+ $sizeof = count(XoopsRequest::getString('scname', '', 'POST'));
for ($i = 0; $i < $sizeof; ++$i) {
if (XoopsRequest::getArray('scname', array(), 'POST')[$i] != '') {
$categoryObj = $publisher->getHandler('category')->create();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -156,7 +156,7 @@
unset($func);
}
- if (!file_exists($imageBase = $GLOBALS['xoops']->path("/modules/" . $dirname . "/assets/images/module_logo.png")) || !file_exists($font = $GLOBALS['xoops']->path("/modules/" . $dirname . "/assets/images/VeraBd.ttf"))) {
+ if (!file_exists($imageBase = $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/module_logo.png")) || !file_exists($font = $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/VeraBd.ttf"))) {
return false;
}
@@ -175,7 +175,7 @@
$white = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
imagefill($imageModule, 0, 0, $white);
imagecolortransparent($imageModule, $white);
- imagepng($imageModule, $GLOBALS['xoops']->path("/modules/" . $dirname . "/assets/images/module_logo.png"));
+ imagepng($imageModule, $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/module_logo.png"));
imagedestroy($imageModule);
return true;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -161,8 +161,8 @@
include_once (dirname(dirname(__DIR__))) . '/include/common.php';
publisherOpenCollapsableBar('amsimportgo', 'amsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('ams');
+ $moduleHandler = xoops_gethandler('module');
+ $moduleObj = $moduleHandler->getByDirname('ams');
$ams_module_id = $moduleObj->getVar('mid');
$gperm_handler = xoops_gethandler('groupperm');
@@ -185,7 +185,7 @@
// get the total number of subcats for this category
// $criteria = new CriteriaCompo();
// $criteria->add(new Criteria('imagecategory', $catObj->getVar('cid'), '='));
-// $childCount = intval($mylinksCatHandler->getCount($criteria));
+// $childCount = (int)($mylinksCatHandler->getCount($criteria));
$criteria = new Criteria('imgcat_name', PUBLISHER_DIRNAME);
$imageCategoryId = $imageCategoryHandler->getObjects($criteria);
@@ -224,7 +224,7 @@
// Category image: copying to Publisher category uploads
if (($arrCat['topic_imgurl'] != 'blank.gif') && ($arrCat['topic_imgurl'] != '')) {
- if (copy($GLOBALS['xoops']->path("/uploads/AMS/topics/" . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path("/uploads/" . PUBLISHER_DIRNAME . "/images/category/" . $arrCat['topic_imgurl']))) {
+ if (copy($GLOBALS['xoops']->path("uploads/AMS/topics/" . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path("uploads/" . PUBLISHER_DIRNAME . "/images/category/" . $arrCat['topic_imgurl']))) {
$categoryObj->setVar('image', $arrCat['topic_imgurl']);
//======== there is no need to add the category images to Image Manager, because they are handled directly from /images/category/ folder
@@ -259,8 +259,8 @@
//copy all images to Image Manager
- $src = $GLOBALS['xoops']->path("/uploads/AMS/topics/");
- $dst = $GLOBALS['xoops']->path("/uploads");
+ $src = $GLOBALS['xoops']->path("uploads/AMS/topics/");
+ $dst = $GLOBALS['xoops']->path("uploads");
PublisherUtilities::recurseCopy($src, $dst);
@@ -327,9 +327,9 @@
/*
// HTML Wrap
if ($arrArticle['htmlpage']) {
- $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" .$arrArticle['htmlpage']);
+ $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
if (file_exists($pagewrap_filename)) {
- if (copy($pagewrap_filename, $GLOBALS['xoops']->path("/uploads/publisher/content/" . $arrArticle['htmlpage']))) {
+ if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) {
$itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
}
@@ -347,9 +347,9 @@
$resultFiles = $GLOBALS['xoopsDB']->query($sql);
$allowed_mimetypes = '';
while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) {
- $filename = $GLOBALS['xoops']->path("/uploads/AMS/attached/" . $arrFile['downloadname']);
+ $filename = $GLOBALS['xoops']->path("uploads/AMS/attached/" . $arrFile['downloadname']);
if (file_exists($filename)) {
- if (copy($filename, $GLOBALS['xoops']->path("/uploads/publisher/" . $arrFile['filerealname']))) {
+ if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filerealname']))) {
$fileObj = $publisher->getHandler('file')->create();
$fileObj->setVar('name', $arrFile['filerealname']);
$fileObj->setVar('description', $arrFile['filerealname']);
@@ -411,15 +411,15 @@
$publisher_module_id = $publisher->getModule()->mid();
- $comment_handler = xoops_gethandler('comment');
+ $commentHandler = xoops_gethandler('comment');
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('com_modid', $ams_module_id));
- $comments = $comment_handler->getObjects($criteria);
+ $comments = $commentHandler->getObjects($criteria);
foreach ($comments as $comment) {
$comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]);
$comment->setVar('com_modid', $publisher_module_id);
$comment->setNew();
- if (!$comment_handler->insert($comment)) {
+ if (!$commentHandler->insert($comment)) {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
} else {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -107,8 +107,8 @@
_AM_PUBLISHER_IMPORT_RESULT
);
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('cjaycontent');
+ $moduleHandler = xoops_gethandler('module');
+ $moduleObj = $moduleHandler->getByDirname('cjaycontent');
$cjaycontent_module_id = $moduleObj->getVar('mid');
$gperm_handler = xoops_gethandler('groupperm');
@@ -151,9 +151,9 @@
/*
// HTML Wrap
if ($arrArticle['htmlpage']) {
- $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" .$arrArticle['htmlpage']);
+ $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
if (file_exists($pagewrap_filename)) {
- if (copy($pagewrap_filename, $GLOBALS['xoops']->path("/uploads/publisher/content/" . $arrArticle['htmlpage']))) {
+ if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) {
$itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
}
@@ -178,15 +178,15 @@
$publisher_module_id = $publisher->getModule()->mid();
- $comment_handler = xoops_gethandler('comment');
+ $commentHandler = xoops_gethandler('comment');
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('com_modid', $cjaycontent_module_id));
- $comments = $comment_handler->getObjects($criteria);
+ $comments = $commentHandler->getObjects($criteria);
foreach ($comments as $comment) {
$comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]);
$comment->setVar('com_modid', $publisher_module_id);
$comment->setNew();
- if (!$comment_handler->insert($comment)) {
+ if (!$commentHandler->insert($comment)) {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
} else {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -37,8 +37,8 @@
//publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
publisherOpenCollapsableBar('fmimport', 'fmimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('fmcontent');
+ $moduleHandler = xoops_gethandler('module');
+ $moduleObj = $moduleHandler->getByDirname('fmcontent');
$fm_module_id = $moduleObj->getVar('mid');
$fmTopicHdlr =& xoops_getmodulehandler('topic', 'fmcontent');
@@ -122,8 +122,8 @@
//publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
publisherOpenCollapsableBar('fmimportgo', 'fmimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('fmcontent');
+ $moduleHandler = xoops_gethandler('module');
+ $moduleObj = $moduleHandler->getByDirname('fmcontent');
$fm_module_id = $moduleObj->getVar('mid');
$gperm_handler = xoops_gethandler('groupperm');
@@ -319,15 +319,15 @@
$publisher_module_id = $publisher->getModule()->mid();
- $comment_handler = xoops_gethandler('comment');
+ $commentHandler = xoops_gethandler('comment');
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('com_modid', $fm_module_id));
- $comments = $comment_handler->getObjects($criteria);
+ $comments = $commentHandler->getObjects($criteria);
foreach ($comments as $comment) {
$comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]);
$comment->setVar('com_modid', $publisher_module_id);
$comment->setNew();
- if (!$comment_handler->insert($comment)) {
+ if (!$commentHandler->insert($comment)) {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />\n";
} else {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />\n";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -97,8 +97,8 @@
//publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
publisherOpenCollapsableBar('newsimportgo', 'newsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('news');
+ $moduleHandler = xoops_gethandler('module');
+ $moduleObj = $moduleHandler->getByDirname('news');
$news_module_id = $moduleObj->getVar('mid');
$gperm_handler = xoops_gethandler('groupperm');
@@ -131,7 +131,7 @@
// Category image
if (($arrCat['topic_imgurl'] != 'blank.gif') && ($arrCat['topic_imgurl'] != '')) {
- if (copy($GLOBALS['xoops']->path("/modules/news/assets/images/topics/" . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path("/uploads/publisher/images/category/" . $arrCat['topic_imgurl']))) {
+ if (copy($GLOBALS['xoops']->path("modules/news/assets/images/topics/" . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path("uploads/publisher/images/category/" . $arrCat['topic_imgurl']))) {
$categoryObj->setVar('image', $arrCat['topic_imgurl']);
}
}
@@ -173,9 +173,9 @@
/*
// HTML Wrap
if ($arrArticle['htmlpage']) {
- $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" .$arrArticle['htmlpage']);
+ $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
if (file_exists($pagewrap_filename)) {
- if (copy($pagewrap_filename, $GLOBALS['xoops']->path("/uploads/publisher/content/" . $arrArticle['htmlpage']))) {
+ if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) {
$itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
}
@@ -194,9 +194,9 @@
$allowed_mimetypes = '';
while ($arrFile = $GLOBALS['xoopsDB']->fetchArray ($resultFiles)) {
- $filename = $GLOBALS['xoops']->path("/modules/wfsection/cache/uploaded/" . $arrFile['filerealname']);
+ $filename = $GLOBALS['xoops']->path("modules/wfsection/cache/uploaded/" . $arrFile['filerealname']);
if (file_exists($filename)) {
- if (copy($filename, $GLOBALS['xoops']->path("/uploads/publisher/" . $arrFile['filerealname']))) {
+ if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filerealname']))) {
$fileObj = $publisher_file_handler->create();
$fileObj->setVar('name', $arrFile['fileshowname']);
$fileObj->setVar('description', $arrFile['filedescript']);
@@ -252,15 +252,15 @@
$publisher_module_id = $publisher->getModule()->mid();
- $comment_handler = xoops_gethandler('comment');
+ $commentHandler = xoops_gethandler('comment');
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('com_modid', $news_module_id));
- $comments = $comment_handler->getObjects($criteria);
+ $comments = $commentHandler->getObjects($criteria);
foreach ($comments as $comment) {
$comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]);
$comment->setVar('com_modid', $publisher_module_id);
$comment->setNew();
- if (!$comment_handler->insert($comment)) {
+ if (!$commentHandler->insert($comment)) {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
} else {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -97,8 +97,8 @@
//publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
publisherOpenCollapsableBar('newsimportgo', 'newsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('smartsection');
+ $moduleHandler = xoops_gethandler('module');
+ $moduleObj = $moduleHandler->getByDirname('smartsection');
$smartsection_module_id = $moduleObj->getVar('mid');
$gperm_handler = xoops_gethandler('groupperm');
@@ -128,7 +128,7 @@
// Copy category image
if (($arrCat['image'] != 'blank.gif') && ($arrCat['image'] != '')) {
- copy($GLOBALS['xoops']->path("/uploads/smartsection/images/category/" . $arrCat['image']), $GLOBALS['xoops']->path("/uploads/publisher/images/category/" . $arrCat['image']));
+ copy($GLOBALS['xoops']->path("uploads/smartsection/images/category/" . $arrCat['image']), $GLOBALS['xoops']->path("uploads/publisher/images/category/" . $arrCat['image']));
}
if (!$publisher->getHandler('category')->insert($categoryObj)) {
@@ -158,9 +158,9 @@
// TODO: copy contents folder
/*
if ($arrArticle['htmlpage']) {
- $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" .$arrArticle['htmlpage']);
+ $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
if (file_exists($pagewrap_filename)) {
- if (copy($pagewrap_filename, $GLOBALS['xoops']->path("/uploads/publisher/content/" . $arrArticle['htmlpage']))) {
+ if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) {
$itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
}
@@ -178,9 +178,9 @@
$resultFiles = $GLOBALS['xoopsDB']->query($sql);
$allowed_mimetypes = null;
while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) {
- $filename = $GLOBALS['xoops']->path("/uploads/smartsection/" . $arrFile['filename']);
+ $filename = $GLOBALS['xoops']->path("uploads/smartsection/" . $arrFile['filename']);
if (file_exists($filename)) {
- if (copy($filename, $GLOBALS['xoops']->path("/uploads/publisher/" . $arrFile['filename']))) {
+ if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filename']))) {
$fileObj = $publisher->getHandler('file')->create();
$fileObj->setVars($arrFile);
$fileObj->setVar('fileid', 0);
@@ -229,15 +229,15 @@
$publisher_module_id = $publisher->getModule()->mid();
- $comment_handler = xoops_gethandler('comment');
+ $commentHandler = xoops_gethandler('comment');
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('com_modid', $smartsection_module_id));
- $comments = $comment_handler->getObjects($criteria);
+ $comments = $commentHandler->getObjects($criteria);
foreach ($comments as $comment) {
$comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]);
$comment->setVar('com_modid', $publisher_module_id);
$comment->setNew();
- if (!$comment_handler->insert($comment)) {
+ if (!$commentHandler->insert($comment)) {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
} else {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -42,7 +42,7 @@
if ($totalCat == 0) {
echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NOCATSELECTED . "</span>";
} else {
- include_once $GLOBALS['xoops']->path("/class/xoopstree.php");
+ include_once $GLOBALS['xoops']->path("class/xoopstree.php");
$result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("wfs_article"));
list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result);
@@ -131,7 +131,7 @@
// Category image
if (($arrCat['imgurl'] != 'blank.gif') && ($arrCat['imgurl'])) {
- if (copy($GLOBALS['xoops']->path("/modules/wfsection/images/category/" . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . "/images/category/" . $arrCat['imgurl'])) {
+ if (copy($GLOBALS['xoops']->path("modules/wfsection/images/category/" . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . "/images/category/" . $arrCat['imgurl'])) {
$categoryObj->setVar('image', $arrCat['imgurl']);
}
}
@@ -172,7 +172,7 @@
// HTML Wrap
if ($arrArticle['htmlpage']) {
- $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" . $arrArticle['htmlpage']);
+ $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" . $arrArticle['htmlpage']);
if (file_exists($pagewrap_filename)) {
if (copy($pagewrap_filename, PUBLISHER_UPLOAD_PATH . "/content/" . $arrArticle['htmlpage'])) {
$itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
@@ -191,7 +191,7 @@
$resultFiles = $GLOBALS['xoopsDB']->query($sql);
$allowed_mimetypes = '';
while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) {
- $filename = $GLOBALS['xoops']->path("/modules/wfsection/cache/uploaded/" . $arrFile['filerealname']);
+ $filename = $GLOBALS['xoops']->path("modules/wfsection/cache/uploaded/" . $arrFile['filerealname']);
if (file_exists($filename)) {
if (copy($filename, PUBLISHER_UPLOAD_PATH . "/" . $arrFile['filerealname'])) {
$fileObj = $publisher->getHandler('file')->create();
@@ -239,21 +239,21 @@
// Looping through the comments to link them to the new articles and module
echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('wfsection');
+ $moduleHandler = xoops_gethandler('module');
+ $moduleObj = $moduleHandler->getByDirname('wfsection');
$news_module_id = $moduleObj->getVar('mid');
$publisher_module_id = $publisher->getModule()->mid();
- $comment_handler = xoops_gethandler('comment');
+ $commentHandler = xoops_gethandler('comment');
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('com_modid', $news_module_id));
- $comments = $comment_handler->getObjects($criteria);
+ $comments = $commentHandler->getObjects($criteria);
foreach ($comments as $comment) {
$comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]);
$comment->setVar('com_modid', $publisher_module_id);
$comment->setNew();
- if (!$comment_handler->insert($comment)) {
+ if (!$commentHandler->insert($comment)) {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
} else {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -123,7 +123,7 @@
// Category image
if (($arrCat['imgurl'] != 'blank.gif') && ($arrCat['imgurl'])) {
- if (copy($GLOBALS['xoops']->path("/modules/xfsection/images/category/" . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . "/images/category/" . $arrCat['imgurl'])) {
+ if (copy($GLOBALS['xoops']->path("modules/xfsection/images/category/" . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . "/images/category/" . $arrCat['imgurl'])) {
$categoryObj->setVar('image', $arrCat['imgurl']);
}
}
@@ -170,7 +170,7 @@
// HTML Wrap
if ($arrArticle['htmlpage']) {
- $pagewrap_filename = $GLOBALS['xoops']->path("/modules/xfsection/html/" . $arrArticle['htmlpage']);
+ $pagewrap_filename = $GLOBALS['xoops']->path("modules/xfsection/html/" . $arrArticle['htmlpage']);
if (file_exists($pagewrap_filename)) {
if (copy($pagewrap_filename, PUBLISHER_UPLOAD_PATH . "/content/" . $arrArticle['htmlpage'])) {
$itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
@@ -189,7 +189,7 @@
$resultFiles = $GLOBALS['xoopsDB']->query($sql);
$allowed_mimetypes = '';
while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) {
- $filename = $GLOBALS['xoops']->path("/modules/xfsection/cache/uploaded/" . $arrFile['filerealname']);
+ $filename = $GLOBALS['xoops']->path("modules/xfsection/cache/uploaded/" . $arrFile['filerealname']);
if (file_exists($filename)) {
if (copy($filename, PUBLISHER_UPLOAD_PATH . "/" . $arrFile['filerealname'])) {
$fileObj = $publisher->getHandler('file')->create();
@@ -237,21 +237,21 @@
// Looping through the comments to link them to the new articles and module
echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('xfsection');
+ $moduleHandler = xoops_gethandler('module');
+ $moduleObj = $moduleHandler->getByDirname('xfsection');
$news_module_id = $moduleObj->getVar('mid');
$publisher_module_id = $publisher->getModule()->mid();
- $comment_handler = xoops_gethandler('comment');
+ $commentHandler = xoops_gethandler('comment');
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('com_modid', $news_module_id));
- $comments = $comment_handler->getObjects($criteria);
+ $comments = $commentHandler->getObjects($criteria);
foreach ($comments as $comment) {
$comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]);
$comment->setVar('com_modid', $publisher_module_id);
$comment->setNew();
- if (!$comment_handler->insert($comment)) {
+ if (!$commentHandler->insert($comment)) {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
} else {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -56,33 +56,31 @@
echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(
_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS,
$importFromModuleName,
- $totalArticles
- ) . "</span>";
+ $totalArticles) . "</span>";
} else {
echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(
_AM_PUBLISHER_IMPORT_MODULE_FOUND,
$importFromModuleName,
$totalArticles,
- $totalCat
- ) . "</span>";
+ $totalCat) . "</span>";
$form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
-//---------- mb ------------------
-// add "publisher" category to "imagecategory" table
+ //---------- mb ------------------
+ // add "publisher" category to "imagecategory" table
-// if (!$GLOBALS['xoopsSecurity']->check()) {
-// redirect_header('admin.php?fct=images', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
-// }
+ // if (!$GLOBALS['xoopsSecurity']->check()) {
+ // redirect_header('admin.php?fct=images', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ // }
$imageCategoryHandler =& xoops_gethandler('imagecategory');
$imagecategory =& $imageCategoryHandler->create();
-// $imagecategory->setVar('imgcat_name', $imgcat_name);
+ // $imagecategory->setVar('imgcat_name', $imgcat_name);
$imagecategory->setVar('imgcat_name', PUBLISHER_DIRNAME); //$imgcat_name);
$imagecategory->setVar('imgcat_maxsize', $GLOBALS['xoopsModuleConfig']['maximum_filesize']); //$imgcat_maxsize);
$imagecategory->setVar('imgcat_maxwidth', $GLOBALS['xoopsModuleConfig']['maximum_image_width']); //$imgcat_maxwidth);
$imagecategory->setVar('imgcat_maxheight', $GLOBALS['xoopsModuleConfig']['maximum_image_height']); //$imgcat_maxheight);
-// $imgcat_display = empty($imgcat_display) ? 0 : 1;
+ // $imgcat_display = empty($imgcat_display) ? 0 : 1;
$imagecategory->setVar('imgcat_display', 1); //$imgcat_display);
$imagecategory->setVar('imgcat_weight', 0); //$imgcat_weight);
$imagecategory->setVar('imgcat_storetype', 'file'); //$imgcat_storetype);
@@ -130,7 +128,7 @@
}
unset($wgroup);
-//---------- mb ------------------
+ //---------- mb ------------------
// Categories to be imported
$sql = "SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.storyid) FROM " . $GLOBALS['xoopsDB']->prefix("nw_topics")
@@ -182,8 +180,8 @@
_AM_PUBLISHER_IMPORT_RESULT
);
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('xnews');
+ $moduleHandler = xoops_gethandler('module');
+ $moduleObj = $moduleHandler->getByDirname('xnews');
$xnews_module_id = $moduleObj->getVar('mid');
$gperm_handler = xoops_gethandler('groupperm');
@@ -201,32 +199,32 @@
$newArticleArray = array();
$imageCategoryHandler =& xoops_gethandler('imagecategory');
-// $criteria = new criteriaCombo;
+ // $criteria = new criteriaCombo;
-// get the total number of subcats for this category
-// $criteria = new CriteriaCompo();
-// $criteria->add(new Criteria('imagecategory', $catObj->getVar('cid'), '='));
-// $childCount = intval($mylinksCatHandler->getCount($criteria));
+ // get the total number of subcats for this category
+ // $criteria = new CriteriaCompo();
+ // $criteria->add(new Criteria('imagecategory', $catObj->getVar('cid'), '='));
+ // $childCount = (int)($mylinksCatHandler->getCount($criteria));
$criteria = new Criteria('imgcat_name', PUBLISHER_DIRNAME);
$imageCategoryId = $imageCategoryHandler->getObjects($criteria);
-// $criteria = new CriteriaCompo();
-// $criteria->add(new Criteria("imagecategory", PUBLISHER_DIRNAME, "="));
+ // $criteria = new CriteriaCompo();
+ // $criteria->add(new Criteria("imagecategory", PUBLISHER_DIRNAME, "="));
-// $newid = $imageCategoryId->getVar('imgcat_id');
+ // $newid = $imageCategoryId->getVar('imgcat_id');
$newid = $imageCategoryId[0]->vars['imgcat_id']['value'];
-// $newid = $imageCategoryId[0]->vars['imgcat_id'];
+ // $newid = $imageCategoryId[0]->vars['imgcat_id'];
-// $select_form = new XoopsFormSelect("", $name_current, array(), 1);
-// $select_form->addOption("", _SELECT);
-// $select_form->addOptionArray($writer_handler->getList($criteria));
+ // $select_form = new XoopsFormSelect("", $name_current, array(), 1);
+ // $select_form->addOption("", _SELECT);
+ // $select_form->addOptionArray($writer_handler->getList($criteria));
-// $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('imagecategory') . " WHERE imgcat_name=" . PUBLISHER_DIRNAME;
-// $resultImageCategory = $GLOBALS['xoopsDB']->query($sql);
-//
-//
-// $newid = $resultImageCategory->getVar('imgcat_id');
+ // $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('imagecategory') . " WHERE imgcat_name=" . PUBLISHER_DIRNAME;
+ // $resultImageCategory = $GLOBALS['xoopsDB']->query($sql);
+ //
+ //
+ // $newid = $resultImageCategory->getVar('imgcat_id');
$oldToNew = array();
while (($arrCat = $GLOBALS['xoopsDB']->fetchArray($resultCat)) !== false) {
@@ -246,13 +244,13 @@
// Category image: copying to Publisher category uploads
if (($arrCat['topic_imgurl'] != 'blank.gif') && ($arrCat['topic_imgurl'] != '')) {
if (copy(
- $GLOBALS['xoops']->path("/uploads/xnews/topics/" . $arrCat['topic_imgurl']),
- $GLOBALS['xoops']->path("/uploads/" . PUBLISHER_DIRNAME . "/images/category/" . $arrCat['topic_imgurl'])
+ $GLOBALS['xoops']->path("uploads/xnews/topics/" . $arrCat['topic_imgurl']),
+ $GLOBALS['xoops']->path("uploads/" . PUBLISHER_DIRNAME . "/images/category/" . $arrCat['topic_imgurl'])
)
) {
$categoryObj->setVar('image', $arrCat['topic_imgurl']);
-//======== there is no need to add the category images to Image Manager, because they are handled directly from /images/category/ folder
+ //======== there is no need to add the category images to Image Manager, because they are handled directly from /images/category/ folder
/*
@@ -272,7 +270,7 @@
*/
-//============================
+ //============================
}
}
@@ -283,8 +281,8 @@
}
//copy all images to Image Manager
- $src = $GLOBALS['xoops']->path("/uploads/xnews/topics/");
- $dst = $GLOBALS['xoops']->path("/uploads");
+ $src = $GLOBALS['xoops']->path("uploads/xnews/topics/");
+ $dst = $GLOBALS['xoops']->path("uploads");
PublisherUtilities::recurseCopy($src, $dst);
//populate the Image Manager with images from xNews articles (by Bleekk)
@@ -329,7 +327,7 @@
$itemObj->setVar('dobr', !$arrArticle['dobr']);
$itemObj->setVar('item_tag', $arrArticle['tags']);
$itemObj->setVar('notifypub', $arrArticle['notifypub']);
-//-------- image
+ //-------- image
$img_handler =& xoops_gethandler('image');
@@ -339,7 +337,7 @@
$itemObj->setVar('image', $newImageId);
$itemObj->setVar('images', $newImageId);
-//--------------
+ //--------------
$itemObj->setVar('rating', $arrArticle['rating']);
$itemObj->setVar('votes', $arrArticle['votes']);
@@ -350,9 +348,9 @@
/*
// HTML Wrap
if ($arrArticle['htmlpage']) {
- $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" .$arrArticle['htmlpage']);
+ $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']);
if (file_exists($pagewrap_filename)) {
- if (copy($pagewrap_filename, $GLOBALS['xoops']->path("/uploads/publisher/content/" . $arrArticle['htmlpage']))) {
+ if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) {
$itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
}
@@ -364,15 +362,15 @@
echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['storyid'] . ' ' . $arrArticle['title']) . "<br/>";
continue;
} else {
-//--------------------------------------------
+ //--------------------------------------------
// Linkes files
$sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix("nw_stories_files") . " WHERE storyid=" . $arrArticle['storyid'];
$resultFiles = $GLOBALS['xoopsDB']->query($sql);
$allowed_mimetypes = '';
while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) {
- $filename = $GLOBALS['xoops']->path("/uploads/xnews/attached/" . $arrFile['downloadname']);
+ $filename = $GLOBALS['xoops']->path("uploads/xnews/attached/" . $arrFile['downloadname']);
if (file_exists($filename)) {
- if (copy($filename, $GLOBALS['xoops']->path("/uploads/publisher/" . $arrFile['filerealname']))) {
+ if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filerealname']))) {
$fileObj = $publisher->getHandler('file')->create();
$fileObj->setVar('name', $arrFile['filerealname']);
$fileObj->setVar('description', $arrFile['filerealname']);
@@ -392,7 +390,7 @@
}
}
-//------------------------
+ //------------------------
$newArticleArray[$arrArticle['storyid']] = $itemObj->itemid();
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
@@ -434,15 +432,15 @@
$publisher_module_id = $publisher->getModule()->mid();
- $comment_handler = xoops_gethandler('comment');
+ $commentHandler = xoops_gethandler('comment');
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('com_modid', $xnews_module_id));
- $comments = $comment_handler->getObjects($criteria);
+ $comments = $commentHandler->getObjects($criteria);
foreach ($comments as $comment) {
$comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]);
$comment->setVar('com_modid', $publisher_module_id);
$comment->setNew();
- if (!$comment_handler->insert($comment)) {
+ if (!$commentHandler->insert($comment)) {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
} else {
echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -23,13 +23,12 @@
$op = XoopsRequest::getString('op', XoopsRequest::getString('op', 'none', 'GET'), 'POST');
-
switch ($op) {
case "importExecute":
$importfile = XoopsRequest::getString('importfile', 'nonselected', 'POST');
- $importfile_path = $GLOBALS['xoops']->path("/modules/" . $publisher->getModule()->dirname() . "/admin/import/" . $importfile . ".php");
+ $importfile_path = $GLOBALS['xoops']->path("modules/" . $publisher->getModule()->dirname() . "/admin/import/" . $importfile . ".php");
include_once $importfile_path;
break;
@@ -45,11 +44,11 @@
xoops_load('XoopsFormLoader');
- $module_handler = xoops_gethandler('module');
+ $moduleHandler = xoops_gethandler('module');
// WF-Section
/*$wfs_version = 0;
- $moduleObj = $module_handler->getByDirname('wfsection');
+ $moduleObj = $moduleHandler->getByDirname('wfsection');
if ($moduleObj) {
$from_module_version = round($moduleObj->getVar('version') / 100, 2);
if (($from_module_version == 1.5) || $from_module_version == 1.04 || $from_module_version == 1.01 || $from_module_version == 2.07 || $from_module_version == 2.06) {
@@ -60,7 +59,7 @@
// News
$news_version = 0;
- $moduleObj = $module_handler->getByDirname('news');
+ $moduleObj = $moduleHandler->getByDirname('news');
if ($moduleObj) {
$from_module_version = round($moduleObj->getVar('version') / 100, 2);
if (($from_module_version >= 1.1)) {
@@ -71,7 +70,7 @@
// xNews
$xnews_version = 0;
- $moduleObj = $module_handler->getByDirname('xnews');
+ $moduleObj = $moduleHandler->getByDirname('xnews');
if ($moduleObj) {
$from_module_version = round($moduleObj->getVar('version') / 100, 2);
if (($from_module_version >= 1.1)) {
@@ -82,7 +81,7 @@
// AMS
$ams_version = 0;
- $moduleObj = $module_handler->getByDirname('AMS');
+ $moduleObj = $moduleHandler->getByDirname('AMS');
if ($moduleObj) {
$from_module_version = round($moduleObj->getVar('version') / 100, 2);
if (($from_module_version >= 1.1)) {
@@ -93,7 +92,7 @@
// Smartsection
$smartsection_version = 0;
- $moduleObj = $module_handler->getByDirname('smartsection');
+ $moduleObj = $moduleHandler->getByDirname('smartsection');
if ($moduleObj) {
$from_module_version = round($moduleObj->getVar('version') / 100, 2);
if (($from_module_version >= 1.1)) {
@@ -104,7 +103,7 @@
// C-Jay Content
$cjaycontent_version = 0;
- $moduleObj = $module_handler->getByDirname('cjaycontent');
+ $moduleObj = $moduleHandler->getByDirname('cjaycontent');
if ($moduleObj) {
$from_module_version = round($moduleObj->getVar('version') / 100, 2);
if (($from_module_version >= 1.1)) {
@@ -115,7 +114,7 @@
// FmContent
$fmcontent_version = 0;
- $moduleObj = $module_handler->getByDirname('fmcontent');
+ $moduleObj = $moduleHandler->getByDirname('fmcontent');
if ($moduleObj) {
$from_module_version = round($moduleObj->getVar('version') / 100, 2);
if (($from_module_version >= 1.1)) {
@@ -126,7 +125,7 @@
// XF-Section
/*$xfs_version = 0;
- $moduleObj = $module_handler->getByDirname('xfsection');
+ $moduleObj = $moduleHandler->getByDirname('xfsection');
If ($moduleObj) {
$from_module_version = round($moduleObj->getVar('version') / 100, 2);
if ($from_module_version > 1.00) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -33,8 +33,6 @@
// $indexAdmin->addConfigBoxLine(array($folder[$i], '777'), 'chmod');
}
-
-
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -22,8 +22,8 @@
// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
$dirname = basename(dirname(__DIR__));
-$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname($dirname);
+$moduleHandler = xoops_gethandler('module');
+$module = $moduleHandler->getByDirname($dirname);
$pathIcon32 = $module->getInfo('icons32');
include_once dirname(__DIR__) . '/include/config.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -48,7 +48,6 @@
$op = XoopsRequest::getString('op', 'default', 'GET');
-
switch ($op) {
case "add":
PublisherMimetypesUtilities::add();
@@ -95,7 +94,7 @@
$publisher = PublisherPublisher::getInstance();
global $limit, $start;
$error = array();
- if (!(XoopsRequest::get('add_mime', '', 'POST'))) {
+ if (!(XoopsRequest::getString('add_mime', '', 'POST'))) {
publisherCpHeader();
//publisher_adminMenu(4, _AM_PUBLISHER_MIMETYPES);
@@ -554,7 +553,6 @@
$order = XoopsRequest::getString('order', 'ASC', 'POST');
$sort = XoopsRequest::getString('sort', 'mime_name', 'POST');
-
publisherCpHeader();
//publisher_adminMenu(4, _AM_PUBLISHER_MIMETYPES . " > " . _AM_PUBLISHER_BUTTON_SEARCH);
@@ -714,7 +712,6 @@
$limit = XoopsRequest::getInt('limit', 0, 'GET');
$start = XoopsRequest::getInt('start', 0, 'GET');
-
if (!(XoopsRequest::getString('id', '', 'GET'))) {
redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php", 3, _AM_PUBLISHER_MESSAGE_NO_ID);
} else {
@@ -774,7 +771,7 @@
*/
public static function clearEditSessionVars($id)
{
- $id = intval($id);
+ $id = (int)($id);
$session = PublisherSession::getInstance();
$session->del("publisher_editMime_$id");
$session->del("publisher_editMimeErr_$id");
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -40,7 +40,6 @@
$configcat = XoopsRequest::getString('configcat', '', 'GET');
-
if ($op == 'showmod') {
$config_handler = xoops_gethandler('config');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -24,11 +24,11 @@
$errors = array();
if (publisher_pagewrap_upload($errors)) {
- redirect_header(XoopsRequest::get('backto', '', 'POST'), 2, _AM_PUBLISHER_FILEUPLOAD_SUCCESS);
+ redirect_header(XoopsRequest::getString('backto', '', 'POST'), 2, _AM_PUBLISHER_FILEUPLOAD_SUCCESS);
} else {
$errorstxt = implode('<br />', $errors);
$message = sprintf(_CO_PUBLISHER_MESSAGE_FILE_ERROR, $errorstxt);
- redirect_header(XoopsRequest::get('backto', '', 'POST'), 5, $message);
+ redirect_header(XoopsRequest::getString('backto', '', 'POST'), 5, $message);
}
/**
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -81,8 +81,8 @@
foreach ($items as $item) {
$time = XoopsLocal::formatTimestamp($item['datesub'], 'mysql', $useroffset);
if (preg_match("/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})/", $time, $datetime)) {
- $this_year = intval($datetime[1]);
- $this_month = intval($datetime[2]);
+ $this_year = (int)($datetime[1]);
+ $this_month = (int)($datetime[2]);
//first year
if (empty($lastyear)) {
$lastyear = $this_year;
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -72,6 +72,7 @@
unset($items, $categories, $itemObj, $catID, $catObj);
if (count($block['categories']) == 0) return $block;
+
return $block;
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2015-05-26 09:32:35 UTC (rev 13069)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2015-05-26 09:35:26 UTC (rev 13070)
@@ -37,10 +37,10 @@
$publisher = PublisherPublisher::getInstance();
//Column Settings
- $opt_num_columns = isset($options[0]) ? intval($options[0]) : '2';
+ $opt_num_columns = isset($options[0]) ? (int)($options[0]) : '2';
$sel_categories = isset($options[1]) ? explode(',', $options[1]) : array();
- $opt_cat_items = intval($options[2]);
- $opt_cat_truncate = isset($options[3]) ? intval($options[3]) : '0';
+ $opt_cat_items = (int)($options[2]);
+ $opt_cat_truncate = isset($options[3]) ? (int)($options[3]) : '0';
$block = array();
$block['lang_reads'] = _MB_PUBLISHER_READS;
@@ -130,7 +130,7 @@
$block['template'] = $options[4];
$block['columns'] = $columns;
- $block['columnwidth'] = intval(100 / $opt_num_columns);
+ $block['columnwidth'] = (int)(100 / $opt_num_columns);
$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME . '/assets/css/publisher.css');
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php
===============================================...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X