Menu
▾
▴
xoops-cvs2
|
From: <wis...@us...> - 2012-01-28 20:47:39
|
Revision: 8824
http://xoops.svn.sourceforge.net/xoops/?rev=8824&view=rev
Author: wishcraft
Date: 2012-01-28 20:47:26 +0000 (Sat, 28 Jan 2012)
Log Message:
-----------
VOD 1.17 Beta - Video on demand shopping cart, XPayment plugin inc, Tag plugin inc, Cron Inc, Code Tested - Unit Testing Required - see changelog.txt
Added Paths:
-----------
XoopsModules/vod/releases/1.17/
XoopsModules/vod/releases/1.17/docs/
XoopsModules/vod/releases/1.17/htdocs/
XoopsModules/vod/releases/1.17/htdocs/Frameworks/
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.cart.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.category.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.currency.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.log.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.mimetypes.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.useragents.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.video.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.cart.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.category.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.currency.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.log.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.mimetypes.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.useragents.png
XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.video.png
XoopsModules/vod/releases/1.17/htdocs/modules/
XoopsModules/vod/releases/1.17/htdocs/modules/tag/
XoopsModules/vod/releases/1.17/htdocs/modules/tag/plugin/
XoopsModules/vod/releases/1.17/htdocs/modules/tag/plugin/vod.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/header.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/index.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/menu.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/blocks/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/blocks/flowplayer_block_player.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/blocks/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/cart.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/category.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/currency.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/log.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/mimetypes.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/sessions.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/videos.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/cron/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/cron/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/cron/notify.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/changelog.txt
XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/credits.txt
XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/install.txt
XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/lang_diff.txt
XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/licence.txt
XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/readme.txt
XoopsModules/vod/releases/1.17/htdocs/modules/vod/dojson_videos.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/header.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/images/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/images/icons/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/images/icons/admin/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/images/icons/admin/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/images/icons/admin/video.png
XoopsModules/vod/releases/1.17/htdocs/modules/vod/images/icons/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/images/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/images/vod_slogo.png
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/JSON.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/formobjects.vod.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/forms.vod.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/formselectcategory.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/formselectcurrency.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/formselectmimetype.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/formselectpackageid.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/formselectsupport.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/formselectvideos.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/functions.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/update.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/uploader.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/index.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/js/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/js/core.js
XoopsModules/vod/releases/1.17/htdocs/modules/vod/js/flowplayer-3.2.6.min.js
XoopsModules/vod/releases/1.17/htdocs/modules/vod/js/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/js/json_functions.js
XoopsModules/vod/releases/1.17/htdocs/modules/vod/js/video.js
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/admin.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/blocks.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/email.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/enum.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/forms.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/log.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/mail_templates/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/mail_templates/vod_video_available_cart.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/mail_templates/vod_video_expired_cart.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/mail_templates/vod_video_expired_viewing_cart.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/main.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/mainfile.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/modinfo.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/style.css
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/video-js.css
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/plugins/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/plugins/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/plugins/log.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/preloads/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/preloads/core.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/preloads/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/sql/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/sql/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/sql/mysql.sql
XoopsModules/vod/releases/1.17/htdocs/modules/vod/swf/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/swf/flowplayer-3.2.7.swf
XoopsModules/vod/releases/1.17/htdocs/modules/vod/swf/flowplayer.controls-3.2.5.swf
XoopsModules/vod/releases/1.17/htdocs/modules/vod/swf/flowplayer.rtmp-3.2.3.swf
XoopsModules/vod/releases/1.17/htdocs/modules/vod/swf/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/blocks/
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/blocks/flowplayer_block_player.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/blocks/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_cart_edit.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_cart_list.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_category_edit.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_category_list.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_currency_edit.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_currency_list.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_log_list.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_mimetypes_edit.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_mimetypes_list.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_sessions_edit.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_sessions_list.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_useragents_list.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_videos_edit.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_cpanel_videos_list.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_cart_view.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_cart_xpayment_form.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_category_list.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_category_view.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_flash_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_html5_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_http_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_iframe.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_iframe_flash_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_iframe_html5_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_iframe_http_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_iframe_ios_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_iframe_other_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_iframe_rtmp_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_iframe_rtsp_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_iframe_silverlight_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_ios_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_other_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_rstp_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_rtmp_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_silverlight_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_videos_list.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_videos_view.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_block_flash_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_block_html5_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_block_http_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_block_ios_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_block_other_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_block_rtmp_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_block_rtsp_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_block_silverlight_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_flash_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_html5_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_http_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_ios_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_other_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_rtmp_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_rtsp_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_json_silverlight_videos.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/xoops_version.php
XoopsModules/vod/releases/1.17/htdocs/modules/xpayment/
XoopsModules/vod/releases/1.17/htdocs/modules/xpayment/plugin/
XoopsModules/vod/releases/1.17/htdocs/modules/xpayment/plugin/vod.php
XoopsModules/vod/trunk/
XoopsModules/vod/trunk/docs/
XoopsModules/vod/trunk/htdocs/
XoopsModules/vod/trunk/htdocs/Frameworks/
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/16/
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/16/vod.cart.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/16/vod.category.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/16/vod.currency.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/16/vod.log.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/16/vod.mimetypes.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/16/vod.useragents.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/16/vod.video.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/32/
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/32/vod.cart.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/32/vod.category.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/32/vod.currency.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/32/vod.log.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/32/vod.mimetypes.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/32/vod.useragents.png
XoopsModules/vod/trunk/htdocs/Frameworks/moduleclasses/icons/32/vod.video.png
XoopsModules/vod/trunk/htdocs/modules/
XoopsModules/vod/trunk/htdocs/modules/tag/
XoopsModules/vod/trunk/htdocs/modules/tag/plugin/
XoopsModules/vod/trunk/htdocs/modules/tag/plugin/vod.php
XoopsModules/vod/trunk/htdocs/modules/vod/
XoopsModules/vod/trunk/htdocs/modules/vod/admin/
XoopsModules/vod/trunk/htdocs/modules/vod/admin/header.php
XoopsModules/vod/trunk/htdocs/modules/vod/admin/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/admin/index.php
XoopsModules/vod/trunk/htdocs/modules/vod/admin/menu.php
XoopsModules/vod/trunk/htdocs/modules/vod/blocks/
XoopsModules/vod/trunk/htdocs/modules/vod/blocks/flowplayer_block_player.php
XoopsModules/vod/trunk/htdocs/modules/vod/blocks/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/class/
XoopsModules/vod/trunk/htdocs/modules/vod/class/cart.php
XoopsModules/vod/trunk/htdocs/modules/vod/class/category.php
XoopsModules/vod/trunk/htdocs/modules/vod/class/currency.php
XoopsModules/vod/trunk/htdocs/modules/vod/class/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/class/log.php
XoopsModules/vod/trunk/htdocs/modules/vod/class/mimetypes.php
XoopsModules/vod/trunk/htdocs/modules/vod/class/sessions.php
XoopsModules/vod/trunk/htdocs/modules/vod/class/videos.php
XoopsModules/vod/trunk/htdocs/modules/vod/cron/
XoopsModules/vod/trunk/htdocs/modules/vod/cron/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/cron/notify.php
XoopsModules/vod/trunk/htdocs/modules/vod/docs/
XoopsModules/vod/trunk/htdocs/modules/vod/docs/changelog.txt
XoopsModules/vod/trunk/htdocs/modules/vod/docs/credits.txt
XoopsModules/vod/trunk/htdocs/modules/vod/docs/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/docs/install.txt
XoopsModules/vod/trunk/htdocs/modules/vod/docs/lang_diff.txt
XoopsModules/vod/trunk/htdocs/modules/vod/docs/licence.txt
XoopsModules/vod/trunk/htdocs/modules/vod/docs/readme.txt
XoopsModules/vod/trunk/htdocs/modules/vod/dojson_videos.php
XoopsModules/vod/trunk/htdocs/modules/vod/header.php
XoopsModules/vod/trunk/htdocs/modules/vod/images/
XoopsModules/vod/trunk/htdocs/modules/vod/images/icons/
XoopsModules/vod/trunk/htdocs/modules/vod/images/icons/admin/
XoopsModules/vod/trunk/htdocs/modules/vod/images/icons/admin/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/images/icons/admin/video.png
XoopsModules/vod/trunk/htdocs/modules/vod/images/icons/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/images/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/images/vod_slogo.png
XoopsModules/vod/trunk/htdocs/modules/vod/include/
XoopsModules/vod/trunk/htdocs/modules/vod/include/JSON.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/formobjects.vod.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/forms.vod.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/formselectcategory.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/formselectcurrency.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/formselectmimetype.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/formselectpackageid.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/formselectsupport.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/formselectvideos.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/functions.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/include/update.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/uploader.php
XoopsModules/vod/trunk/htdocs/modules/vod/index.php
XoopsModules/vod/trunk/htdocs/modules/vod/js/
XoopsModules/vod/trunk/htdocs/modules/vod/js/core.js
XoopsModules/vod/trunk/htdocs/modules/vod/js/flowplayer-3.2.6.min.js
XoopsModules/vod/trunk/htdocs/modules/vod/js/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/js/json_functions.js
XoopsModules/vod/trunk/htdocs/modules/vod/js/video.js
XoopsModules/vod/trunk/htdocs/modules/vod/language/
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/admin.php
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/blocks.php
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/email.php
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/enum.php
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/forms.php
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/log.php
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/mail_templates/
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/mail_templates/vod_video_available_cart.html
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/mail_templates/vod_video_expired_cart.html
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/mail_templates/vod_video_expired_viewing_cart.html
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/main.php
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/mainfile.php
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/modinfo.php
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/style.css
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/video-js.css
XoopsModules/vod/trunk/htdocs/modules/vod/language/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/plugins/
XoopsModules/vod/trunk/htdocs/modules/vod/plugins/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/plugins/log.php
XoopsModules/vod/trunk/htdocs/modules/vod/preloads/
XoopsModules/vod/trunk/htdocs/modules/vod/preloads/core.php
XoopsModules/vod/trunk/htdocs/modules/vod/preloads/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/sql/
XoopsModules/vod/trunk/htdocs/modules/vod/sql/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/sql/mysql.sql
XoopsModules/vod/trunk/htdocs/modules/vod/swf/
XoopsModules/vod/trunk/htdocs/modules/vod/swf/flowplayer-3.2.7.swf
XoopsModules/vod/trunk/htdocs/modules/vod/swf/flowplayer.controls-3.2.5.swf
XoopsModules/vod/trunk/htdocs/modules/vod/swf/flowplayer.rtmp-3.2.3.swf
XoopsModules/vod/trunk/htdocs/modules/vod/swf/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/
XoopsModules/vod/trunk/htdocs/modules/vod/templates/blocks/
XoopsModules/vod/trunk/htdocs/modules/vod/templates/blocks/flowplayer_block_player.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/blocks/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/index.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_cart_edit.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_cart_list.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_category_edit.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_category_list.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_currency_edit.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_currency_list.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_log_list.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_mimetypes_edit.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_mimetypes_list.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_sessions_edit.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_sessions_list.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_useragents_list.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_videos_edit.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_cpanel_videos_list.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_cart_view.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_cart_xpayment_form.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_category_list.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_category_view.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_flash_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_html5_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_http_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_iframe.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_iframe_flash_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_iframe_html5_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_iframe_http_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_iframe_ios_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_iframe_other_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_iframe_rtmp_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_iframe_rtsp_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_iframe_silverlight_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_ios_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_other_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_rstp_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_rtmp_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_silverlight_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_videos_list.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_videos_view.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_block_flash_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_block_html5_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_block_http_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_block_ios_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_block_other_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_block_rtmp_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_block_rtsp_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_block_silverlight_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_flash_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_html5_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_http_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_ios_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_other_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_rtmp_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_rtsp_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_json_silverlight_videos.html
XoopsModules/vod/trunk/htdocs/modules/vod/xoops_version.php
XoopsModules/vod/trunk/htdocs/modules/xpayment/
XoopsModules/vod/trunk/htdocs/modules/xpayment/plugin/
XoopsModules/vod/trunk/htdocs/modules/xpayment/plugin/vod.php
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.cart.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.cart.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.category.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.category.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.currency.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.currency.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.log.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.log.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.mimetypes.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.mimetypes.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.useragents.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.useragents.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.video.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/16/vod.video.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.cart.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.cart.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.category.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.category.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.currency.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.currency.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.log.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.log.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.mimetypes.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.mimetypes.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.useragents.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.useragents.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.video.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/vod/releases/1.17/htdocs/Frameworks/moduleclasses/icons/32/vod.video.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/vod/releases/1.17/htdocs/modules/tag/plugin/vod.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/tag/plugin/vod.php (rev 0)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/tag/plugin/vod.php 2012-01-28 20:47:26 UTC (rev 8824)
@@ -0,0 +1,76 @@
+<?php
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
+
+function vod_tag_iteminfo(&$items)
+{
+ if (empty($items) || !is_array($items)) {
+ return false;
+ }
+
+ $items_id = array();
+ foreach (array_keys($items) as $cat_id) {
+ // Some handling here to build the link upon catid
+ // catid is not used in vod, so just skip it
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ // In vod, the item_id is "topic_id"
+ $items_id[] = intval($item_id);
+ }
+ }
+ $item_handler =& xoops_getmodulehandler('videos', 'vod');
+ $items_obj = $item_handler->getObjects(new Criteria("vid", "(" . implode(", ", $items_id) . ")", "IN"), true);
+ $myts =& MyTextSanitizer::getInstance();
+ foreach (array_keys($items) as $cat_id) {
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ $item_obj =& $items_obj[$item_id];
+ if (is_object($item_obj))
+ $items[$cat_id][$item_id] = array(
+ "title" => $item_obj->getVar("name"),
+ "uid" => $item_obj->getVar("uid"),
+ "link" => 'go.php?vid='.$item_id.'&cid='.$item_obj->getVar("cid"),
+ "time" => $item_obj->getVar("date"),
+ "tags" => tag_parse_tag($item_obj->getVar("tags", "n")),
+ "content" => $myts->displayTarea($item_obj->getVar("summary"),true,true,true,true,true,true)
+ );
+ }
+ }
+ unset($items_obj);
+}
+
+/**
+ * Remove orphan tag-item links
+ *
+ * @return boolean
+ *
+ */
+function vod_tag_synchronization($mid)
+{
+ $item_handler =& xoops_getmodulehandler('videos', 'vod');
+ $link_handler =& xoops_getmodulehandler("link", "tag");
+
+ /* clear tag-item links */
+ if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
+ $sql = " DELETE FROM {$link_handler->table}" .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( tag_itemid NOT IN " .
+ " ( SELECT DISTINCT {$item_handler->keyName} " .
+ " FROM {$item_handler->table} " .
+ " WHERE {$item_handler->table}.approved > 0" .
+ " ) " .
+ " )";
+ else:
+ $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" .
+ " LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( aa.{$item_handler->keyName} IS NULL" .
+ " OR aa.approved < 1" .
+ " )";
+ endif;
+ if (!$result = $link_handler->db->queryF($sql)) {
+ //xoops_error($link_handler->db->error());
+ }
+}
+?>
\ No newline at end of file
Added: XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/header.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/header.php (rev 0)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/header.php 2012-01-28 20:47:26 UTC (rev 8824)
@@ -0,0 +1,61 @@
+<?php
+ require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
+
+ if (!defined('_CHARSET'))
+ define ("_CHARSET","UTF-8");
+ if (!defined('_CHARSET_ISO'))
+ define ("_CHARSET_ISO","ISO-8859-1");
+
+ $GLOBALS['myts'] = MyTextSanitizer::getInstance();
+
+ $module_handler = xoops_gethandler('module');
+ $config_handler = xoops_gethandler('config');
+ $GLOBALS['vodModule'] = $module_handler->getByDirname('vod');
+ $GLOBALS['vodModuleConfig'] = $config_handler->getConfigList($GLOBALS['vodModule']->getVar('mid'));
+
+ xoops_load('pagenav');
+ xoops_load('xoopslists');
+ xoops_load('xoopsformloader');
+
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
+ include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php');
+
+ if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ //return true;
+ }else{
+ echo vod_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+ //return false;
+ }
+ $GLOBALS['vodImageIcon'] = XOOPS_URL .'/'. $GLOBALS['vodModule']->getInfo('icons16');
+ $GLOBALS['vodImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['vodModule']->getInfo('icons32');
+
+ if ($GLOBALS['xoopsUser']) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['vodModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+ } else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+ }
+
+ if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $GLOBALS['xoopsTpl'] = new XoopsTpl();
+ }
+
+ $GLOBALS['xoopsTpl']->assign('pathImageIcon', $GLOBALS['vodImageIcon']);
+ $GLOBALS['xoopsTpl']->assign('pathImageAdmin', $GLOBALS['vodImageAdmin']);
+
+
+ require_once('../include/functions.php');
+ require_once('../include/formobjects.vod.php');
+ require_once('../include/forms.vod.php');
+
+ include_once(dirname(dirname(__FILE__)).'/language/'.$GLOBALS['xoopsConfig']['language'].'/modinfo.php');
+ include_once(dirname(dirname(__FILE__)).'/language/'.$GLOBALS['xoopsConfig']['language'].'/forms.php');
+
+
+?>
\ No newline at end of file
Added: XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/index.html
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/index.html (rev 0)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/index.html 2012-01-28 20:47:26 UTC (rev 8824)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/index.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/index.php (rev 0)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/admin/index.php 2012-01-28 20:47:26 UTC (rev 8824)
@@ -0,0 +1,1005 @@
+<?php
+
+ include('header.php');
+
+ xoops_loadLanguage('admin', 'vod');
+
+ xoops_cp_header();
+
+ $op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard";
+ $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"";
+ $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
+ $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
+ $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
+ $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
+ $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
+
+ switch($op) {
+ case "dashboard":
+ default:
+ vod_adminMenu(0, 'index.php?op=dashboard');
+
+ $videos_handler = xoops_getmodulehandler('videos', 'vod');
+ $mimetypes_handler = xoops_getmodulehandler('mimetypes', 'vod');
+ $indexAdmin = new ModuleAdmin();
+ $indexAdmin->addInfoBox(_AM_VOD_ADMIN_COUNTS);
+ $indexAdmin->addInfoBoxLine(_AM_VOD_ADMIN_COUNTS, "<label>"._AM_VOD_ADMIN_THEREARE_FLATFILES."</label>", $videos_handler->getCount(new Criteria('stream', '0', '=')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_VOD_ADMIN_COUNTS, "<label>"._AM_VOD_ADMIN_THEREARE_RTMPSTREAMS."</label>", $videos_handler->getCount(new Criteria('LENGTH(`rtmp`)', '0', '>')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_VOD_ADMIN_COUNTS, "<label>"._AM_VOD_ADMIN_THEREARE_RTSPSTREAMS."</label>", $videos_handler->getCount(new Criteria('LENGTH(`rtsp`)', '0', '>')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_VOD_ADMIN_COUNTS, "<label>"._AM_VOD_ADMIN_THEREARE_FLASHSTREAMS."</label>", $videos_handler->getCount(new Criteria('LENGTH(`flash`)', '0', '>')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_VOD_ADMIN_COUNTS, "<label>"._AM_VOD_ADMIN_THEREARE_SILVERLIGHTSTREAMS."</label>", $videos_handler->getCount(new Criteria('LENGTH(`silverlight`)', '0', '>')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_VOD_ADMIN_COUNTS, "<label>"._AM_VOD_ADMIN_THEREARE_IOSSTREAMS."</label>", $videos_handler->getCount(new Criteria('LENGTH(`ios`)', '0', '>')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_VOD_ADMIN_COUNTS, "<label>"._AM_VOD_ADMIN_THEREARE_HTTPSTREAMS."</label>", $videos_handler->getCount(new Criteria('LENGTH(`http`)', '0', '>')), 'Green');
+ $indexAdmin->addInfoBoxLine(_AM_VOD_ADMIN_COUNTS, "<label>"._AM_VOD_ADMIN_THEREARE_MIMETYPES."</label>", $mimetypes_handler->getCount(), 'Purple');
+ $videos = $videos_handler->getObjects(new Criteria('`default`', '1'), false);
+ if (isset($videos[0])) {
+ $videos = $videos[0];
+ $_SESSION['vod'][$videos->getVar('vid')]['main'] = true;
+ $indexAdmin->addInfoBox(_AM_VOD_ADMIN_DEFAULT);
+ $indexAdmin->addInfoBoxLine(_AM_VOD_ADMIN_DEFAULT, "<iframe src='".XOOPS_URL.'/modules/vod/?&state=admin&preview=0&vid='.$videos->getVar('vid')."&iframe=1&width=320px&height=200px' style='width:320px;height:200px;'></iframe>", '', 'Green');
+ }
+ echo $indexAdmin->renderIndex();
+ break;
+ case "about":
+ echo vod_adminMenu(9, 'index.php?op=about');
+ $paypalitemno='VOD106';
+ $aboutAdmin = new ModuleAdmin();
+ $about = $aboutAdmin->renderabout($paypalitemno, false);
+ $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">',
+ 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_TWITTERBOMB_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>',
+ 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'',
+ 3 => '',
+ 4 => '<!-- Start Form Validation JavaScript //-->
+<script type="text/javascript">
+<!--//
+function xoopsFormValidate_donation() { var myform = window.document.donation;
+var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true;
+}
+//--></script>
+<!-- End Form Validation JavaScript //-->');
+ $paypalform = array( 0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">',
+ 1 => '<input name="cmd" value="_s-xclick" type="hidden">',
+ 2 => '<input name="hosted_button_id" value="%s" type="hidden">',
+ 3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">',
+ 4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="poster">',
+ 5 => '</form>');
+ for($key=0;$key<=4;$key++) {
+ switch ($key) {
+ case 2:
+ $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['vodModule']->getVar('dirname')), strtoupper($GLOBALS['vodModule']->getVar('dirname')). ' '.$GLOBALS['vodModule']->getVar('name'));
+ break;
+ }
+ }
+
+ $istart = strpos($about, ($paypalform[0]), 1);
+ $iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1;
+ echo (substr($about, 0, $istart-1));
+ echo implode("\n", $donationform);
+ echo (substr($about, $iend+1, strlen($about)-$iend-1));
+ break;
+ case "agents":
+ vod_adminMenu(6, 'index.php?op=agents');
+
+ include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
+ xoops_load('XoopsCache');
+ $ret = XoopsCache::read('vod_user_agents');
+ asort($ret, SORT_DESC);
+ $ttl = count($ret);
+ $pagenav = new XoopsPageNav($ttl, $limit, $start, 'start', 'limit='.$limit.'&sort='.$sort.'&order='.$order.'&op='.$op.'&fct='.$fct.'&filter='.$filter.'&fct='.$fct.'&filter='.$filter);
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+ foreach (array( 'time','videos','agents','user') as $id => $key) {
+ $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="#">'.(defined('_AM_VOD_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_VOD_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_VOD_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
+ }
+ $GLOBALS['xoopsTpl']->assign('limit', $limit);
+ $GLOBALS['xoopsTpl']->assign('start', $start);
+ $GLOBALS['xoopsTpl']->assign('order', $order);
+ $GLOBALS['xoopsTpl']->assign('sort', $sort);
+ $GLOBALS['xoopsTpl']->assign('filter', $filter);
+ $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['vodModuleConfig']);
+ $s=0;
+ $i=0;
+ foreach($ret as $time => $agent) {
+ if (is_array($agent)&&$s>=$start&&$i<=$limit) {
+ $GLOBALS['xoopsTpl']->append('useragents', array('time'=>date(_DATESTRING, $time), 'videos'=>$agent['videos'], 'user'=>$agent['user'], 'useragent'=>$agent['useragent']));
+ $i++;
+ }
+ $s++;
+ }
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+ $GLOBALS['xoopsTpl']->display('db:vod_cpanel_useragents_list.html');
+ break;
+
+ case "currency":
+ switch ($fct)
+ {
+ default:
+ case "list":
+ vod_adminMenu(5, 'index.php?op=currency&fct=list');
+
+ include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
+
+ $currency_handler =& xoops_getmodulehandler('currency', 'vod');
+
+ $criteria = $currency_handler->getFilterCriteria($GLOBALS['filter']);
+ $ttl = $currency_handler->getCount($criteria);
+ $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
+
+ $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']);
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+ foreach ($currency_handler->filterFields() as $id => $key) {
+ $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_VOD_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_VOD_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_VOD_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
+ $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $currency_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+ }
+
+ $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
+ $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
+ $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
+ $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
+ $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
+ $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['vodModuleConfig']);
+
+ $criteria->setStart($GLOBALS['start']);
+ $criteria->setLimit($GLOBALS['limit']);
+ $criteria->setSort('`'.$GLOBALS['sort'].'`');
+ $criteria->setOrder($GLOBALS['order']);
+
+ $currencys = $currency_handler->getObjects($criteria, true);
+ foreach($currencys as $cid => $currency) {
+ if (is_object($currency))
+ $GLOBALS['xoopsTpl']->append('currency', $currency->toArray());
+ }
+ $GLOBALS['xoopsTpl']->assign('form', vod_currency_get_form(false));
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+ $GLOBALS['xoopsTpl']->display('db:vod_cpanel_currency_list.html');
+ break;
+
+ case "new":
+ case "edit":
+
+ vod_adminMenu(5, 'index.php?op=currency&fct=list');
+
+ include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
+
+ $currency_handler =& xoops_getmodulehandler('currency', 'vod');
+ if (isset($_REQUEST['id'])) {
+ $currency = $currency_handler->get(intval($_REQUEST['id']));
+ } else {
+ $currency = $currency_handler->create();
+ }
+
+ $GLOBALS['xoopsTpl']->assign('form', $currency->getForm());
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+ $GLOBALS['xoopsTpl']->display('db:vod_cpanel_currency_edit.html');
+ break;
+ case "save":
+
+ $currency_handler =& xoops_getmodulehandler('currency', 'vod');
+ $id=0;
+ if ($id=intval($_REQUEST['id'])) {
+ $currency = $currency_handler->get($id);
+ } else {
+ $currency = $currency_handler->create();
+ }
+ $currency->setVars($_POST[$id]);
+ if (!$id=$currency_handler->insert($currency)) {
+ redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_VOD_MSG_CURRENCY_FAILEDTOSAVE);
+ exit(0);
+ } else {
+ if ($_REQUEST['state'][$_REQUEST['id']]=='new')
+ redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_VOD_MSG_CURRENCY_SAVEDOKEY);
+ else
+ redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_VOD_MSG_CURRENCY_SAVEDOKEY);
+ exit(0);
+ }
+ break;
+ case "savelist":
+
+ $currency_handler =& xoops_getmodulehandler('currency', 'vod');
+ foreach($_REQUEST['id'] as $id) {
+ $currency = $currency_handler->get($id);
+ $currency->setVars($_POST[$id]);
+ if (!$currency_handler->insert($currency)) {
+ redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_VOD_MSG_CURRENCY_FAILEDTOSAVE);
+ exit(0);
+ }
+ }
+ redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_VOD_MSG_CURRENCY_SAVEDOKEY);
+ exit(0);
+ break;
+ case "delete":
+
+ $currency_handler =& xoops_getmodulehandler('currency', 'vod');
+ $id=0;
+ if (isset($_POST['id'])&&$id=intval($_POST['id'])) {
+ $currency = $currency_handler->get($id);
+ if (!$currency_handler->delete($currency)) {
+ redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_VOD_MSG_CURRENCY_FAILEDTODELETE);
+ exit(0);
+ } else {
+ redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_VOD_MSG_CURRENCY_DELETED);
+ exit(0);
+ }
+ } else {
+ $currency = $currency_handler->get(intval($_REQUEST['id']));
+ xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_VOD_MSG_CURRENCY_DELETE, $currency->getVar('name')));
+ }
+ break;
+ }
+ break;
+ case "category":
+ switch ($fct)
+ {
+ default:
+ case "list":
+ vod_adminMenu(2, 'index.php?op=category&fct=list');
+
+ include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
+
+ $category_handler =& xoops_getmodulehandler('category', 'vod');
+
+ $criteria = $category_handler->getFilterCriteria($GLOBALS['filter']);
+ $ttl = $category_handler->getCount($criteria);
+ $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
+
+ $pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']);
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+ foreach ($category_handler->filterFields() as $id => $key) {
+ $GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_VOD_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_VOD_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_VOD_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
+ $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $category_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+ }
+
+ $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
+ $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
+ $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
+ $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
+ $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
+ $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['vodModuleConfig']);
+
+ $criteria->setStart($GLOBALS['start']);
+ $criteria->setLimit($GLOBALS['limit']);
+ $criteria->setSort('`'.$GLOBALS['sort'].'`');
+ $criteria->setOrder($GLOBALS['order']);
+
+ $categorys = $category_handler->getObjects($criteria, true);
+ foreach($categorys as $cid => $category) {
+ if (is_object($category))
+ $GLOBALS['xoopsTpl']->append('categories', $category->toArray());
+ }
+ $GLOBALS['xoopsTpl']->assign('form', vod_category_get_form(false));
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+ $GLOBALS['xoopsTpl']->display('db:vod_cpanel_category_list.html');
+ break;
+
+ case "new":
+ case "edit":
+
+ vod_adminMenu(2, 'index.php?op=category&fct=list');
+
+ include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
+
+ $category_handler =& xoops_getmodulehandler('category', 'vod');
+ if (isset($_REQUEST['id'])) {
+ $category = $category_handler->get(intval($_REQUEST['id']));
+ } else {
+ $category = $category_handler->create();
+ }
+
+ $GLOBALS['xoopsTpl']->assign('form', $category->getForm());
+ $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+ $GLOBALS['xoopsTpl']->display('db:vod_cpanel_category_edit.html');
+ break;
+ case "save":
+
+ $category_handler =& xoops_getmodulehandler('category', 'vod');
+ $id=0;
+ if ($id=intval($_REQUEST['id'])) {
+ $category = $category_handler->get($id);
+ } else {
+ $category = $category_handler->create();
+ }
+ $catego...
[truncated message content] |
![https://www.paypal.com/fr_FR/i/scr/pixel.gif"](https://www.paypal.com/fr_FR/i/scr/pixel.gif"){kind=link}
![https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"](https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"){kind=link}
|
From: <wis...@us...> - 2012-01-29 14:46:36
|
Revision: 8826
http://xoops.svn.sourceforge.net/xoops/?rev=8826&view=rev
Author: wishcraft
Date: 2012-01-29 14:46:28 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
VOD 1.17 Beta - Install Fix and Date Fixes - see changelog.txt
Modified Paths:
--------------
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/log.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/sessions.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/videos.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/cron/notify.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/changelog.txt
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/formobjects.vod.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/forms.vod.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/index.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/forms.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/modinfo.php
XoopsModules/vod/releases/1.17/htdocs/modules/vod/sql/mysql.sql
XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_videos_list.html
XoopsModules/vod/releases/1.17/htdocs/modules/vod/xoops_version.php
XoopsModules/vod/trunk/htdocs/modules/vod/class/log.php
XoopsModules/vod/trunk/htdocs/modules/vod/class/sessions.php
XoopsModules/vod/trunk/htdocs/modules/vod/class/videos.php
XoopsModules/vod/trunk/htdocs/modules/vod/cron/notify.php
XoopsModules/vod/trunk/htdocs/modules/vod/docs/changelog.txt
XoopsModules/vod/trunk/htdocs/modules/vod/include/formobjects.vod.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/forms.vod.php
XoopsModules/vod/trunk/htdocs/modules/vod/index.php
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/forms.php
XoopsModules/vod/trunk/htdocs/modules/vod/language/english/modinfo.php
XoopsModules/vod/trunk/htdocs/modules/vod/sql/mysql.sql
XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_videos_list.html
XoopsModules/vod/trunk/htdocs/modules/vod/xoops_version.php
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/log.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/log.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/log.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -21,7 +21,7 @@
function VodLog($fid = null)
{
$this->initVar('log_id', XOBJ_DTYPE_INT, null, false);
- $this->initVar('class', XOBJ_DTYPE_ENUM, 'unknown', false, false, false, array('cart','sessions','currency','category','mimetypes','video','external','unknown'));
+ $this->initVar('class', XOBJ_DTYPE_ENUM, 'unknown', false, false, false, array('cart','sessions','currency','category','mimetypes','videos','external','unknown'));
$this->initVar('file', XOBJ_DTYPE_TXTBOX, null, false, 64);
$this->initVar('path', XOBJ_DTYPE_TXTBOX, null, false, 128);
$this->initVar('line', XOBJ_DTYPE_INT, null, false);
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/sessions.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/sessions.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/sessions.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -228,7 +228,7 @@
unset($_COOKIE['cart']);
}
}
- if (is_object($GLOBALS['xoopsUser'])&&!is_object($session)) {
+ if (is_object($GLOBALS['xoopsUser'])&&!isset($session)) {
$criteria = new CriteriaCompo(new Criteria('uid', $GLOBALS['xoopsUser']->getVar('uid')));
$criteria->add(new Criteria('`mode`', '_VOD_ENUM_UNINVOICED'));
if ($this->getCount($criteria)>0) {
@@ -238,7 +238,7 @@
}
}
$user = vod_getIPData();
- if (!is_object($session)) {
+ if (!isset($session)) {
$criteria = new CriteriaCompo(new Criteria('`ip`', $user['ip']));
$criteria->add(new Criteria('netaddy', $user['network-addy']));
$criteria->add(new Criteria('`mode`', '_VOD_ENUM_UNINVOICED'));
@@ -249,7 +249,7 @@
}
}
- if (!is_object($session)) {
+ if (!isset($session)) {
unset($session);
unset($_SESSION['vod']['cart']);
unset($_COOKIE['cart']);
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/videos.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/videos.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/class/videos.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -130,14 +130,16 @@
function toArray($preview=false, $state='list') {
$ret = parent::toArray();
+
if ($this->getVar('mid')>0) {
$mimetypes_handler = xoops_getmodulehandler('mimetypes', 'vod');
$mimetype = $mimetypes_handler->get($this->getVar('mid'));
if (is_object($mimetype))
$ret['mimetype'] = $mimetype->toArray();
}
+
$fields = array('width', 'height', 'autoplay', 'control');
- switch ($this->getSpecialWithUserAgent("")) {
+ switch ($this->getSpecialWithUserAgent($_SERVER["HTTP_USER_AGENT"])) {
case "A":
foreach($fields as $field) {
$ret[$field] = $ret['speciala_'.$field];
@@ -151,6 +153,7 @@
default:
break;
}
+
$ele = vod_videos_get_form($this, true);
foreach($ele as $key => $field)
$ret['form'][$key] = $field->render();
@@ -179,22 +182,22 @@
$sessions_handler = xoops_getmodulehandler('sessions', 'vod');
static $_session = null;
- if (!is_array($_SESSION['vod']['cart'])||!isset($_SESSION['vod']['cart'])) {
- $ret['incart'] = false;
- } else {
- if (!is_object($_session))
+ if (isset($_SESSION['vod']['cart']['sessid'])) {
+ if (!is_object($_session))
$_session = $sessions_handler->get($_SESSION['vod']['cart']['sessid']);
$ret['incart'] = $_session->inCart($this);
- }
-
- if (strlen($this->getVar('avata'))>0&&file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar('avata')))) {
+ } else {
+ $ret['incart'] = false;
+ }
+
+ if (strlen($this->getVar('avata'))>0&&file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar('avata')))) {
$ret['avata_url'] = $this->getImage('avata');
$ret['hasavata'] = true;
} else
$ret['hasavata'] = false;
-
+
$mode = $this->getModeWithUserAgent($_SERVER['HTTP_USER_AGENT']);
- $prev = array('width' => $this->getVar('width'), 'height' => $this->getVar('height'), 'id' => $this->getReference(false, $preview), 'source' => '');
+ $prev = array('width' => $this->getVar('width'), 'height' => $this->getVar('height'), 'id' => $this->getReference(false, $preview), 'source' => $this->getSource($mode, $preview));
if (strlen($this->getSource($mode, $preview))>0) {
$ret['haspreview'] = true;
$prev['mode'] = $mode;
@@ -210,7 +213,7 @@
$prev['height'] = $GLOBALS['vodModuleConfig']['video_height_'.$state];
$prev['source'] = $this->getSource($mode, $preview);
$prev['id'] = $this->getReference(false, $preview);
- $html = $this->getHTML(false, $data['width'], $data['height'], '', '', $preview, $state);
+ $html = $this->getHTML(false, $prev['width'], $prev['height'], '', '', $preview, $state);
if ($GLOBALS['vodModuleConfig'][$mode.'_secure']==true) {
$prev['contents'] = '';
$GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), $this->getJS(false, $prev['width'], $prev['height'], $preview, $state));
@@ -224,7 +227,7 @@
$prev['height'] = $GLOBALS['vodModuleConfig']['video_height_'.$state];
$prev['source'] = $this->getSource($mode, $preview);
$prev['id'] = $this->getReference(true, $preview);
- $html = $this->getHTML(true, $data['width'], $data['height'], '', '', $preview, $state);
+ $html = $this->getHTML(true, $prev['width'], $prev['height'], '', '', $preview, $state);
if ($GLOBALS['vodModuleConfig'][$mode.'_secure']==true) {
$prev['contents'] = '';
$GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), $this->getJS(true, $prev['width'], $prev['height'], $preview, $state));
@@ -237,46 +240,50 @@
} else {
$ret['haspreview'] = false;
}
- foreach($prev as $key => $value) {
- $ret['preview_data_'.$key] = $value;
- }
+
if ($GLOBALS['vodModuleConfig']['tags']&&file_exists($GLOBALS['xoops']->path("/modules/tag/include/tagbar.php"))) {
include_once XOOPS_ROOT_PATH."/modules/tag/include/tagbar.php";
$ret['tagbar'] = tagBar($this->getVar('vid'), $this->getVar('cid'));
}
+
return $ret;
}
function getHTML($block = false, $width=0, $height=0, $agent = '', $ip = '', $preview = false, $state = 'list') {
+
if (empty($ip))
$ip = $this->getIP();
if (empty($agent))
$agent = $_SERVER['HTTP_USER_AGENT'];
+
$mode = $this->getModeWithUserAgent($agent);
include_once ($GLOBALS['xoops']->path('class/template.php'));
- if (!isset($GLOBALS['xoopsTpl']))
- $GLOBALS['xoopsTpl'] = new XoopsTpl();
+ $GLOBALS['vodTpl'] = new XoopsTpl();
+
$videos = array();
- $videos = $this->toArray($preview, $state);
+ $videos = parent::toArray();
$videos['mode'] = $mode;
$videos['source'] = $this->getSource($mode, $preview);
$videos['id'] = $this->getReference($block, $preview);
$videos['width'] = (!empty($height)&&!empty($width)&&$width&&$height?$width:($this->getSpecialWithUserAgent($agent)=='A'?$this->getVar('speciala_width'):($this->getSpecialWithUserAgent($agent)=='B'?$this->getVar('specialb_width'):($this->getVar('width')))));
$videos['height'] = (!empty($height)&&!empty($height)&&$height&&$height?$height:($this->getSpecialWithUserAgent($agent)=='A'?$this->getVar('speciala_height'):($this->getSpecialWithUserAgent($agent)=='B'?$this->getVar('specialb_height'):($this->getVar('height')))));
- $GLOBALS['xoopsTpl']->assign('videos', $videos);
+
+ $GLOBALS['vodTpl']->assign('videos', $videos);
if (isset($videos['mimetype']))
- $GLOBALS['xoopsTpl']->assign('mimetype', $videos['mimetype']);
- $GLOBALS['xoopsTpl']->assign('xoConfig', $this->_ModConfig);
- $GLOBALS['xoopsTpl']->assign('iframe', isset($_REQUEST['iframe']));
- $GLOBALS['xoopsTpl']->assign('preview', $preview);
- $GLOBALS['xoopsTpl']->assign('state', $state);
+ $GLOBALS['vodTpl']->assign('mimetype', $videos['mimetype']);
+ $GLOBALS['vodTpl']->assign('xoConfig', $this->_ModConfig);
+ $GLOBALS['vodTpl']->assign('iframe', isset($_REQUEST['iframe']));
+ $GLOBALS['vodTpl']->assign('preview', $preview);
+ $GLOBALS['vodTpl']->assign('state', $state);
+
ob_start();
if ($block == false)
- $GLOBALS['xoopsTpl']->display('db:vod_json_'.$mode.'_videos.html');
+ $GLOBALS['vodTpl']->display('db:vod_json_'.$mode.'_videos.html');
else
- $GLOBALS['xoopsTpl']->display('db:vod_json_block_'.$mode.'_videos.html');
+ $GLOBALS['vodTpl']->display('db:vod_json_block_'.$mode.'_videos.html');
$data = ob_get_contents();
ob_end_clean();
+
return $data;
}
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/cron/notify.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/cron/notify.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/cron/notify.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -36,7 +36,7 @@
$xoopsMailer->setHTML(true);
$xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/vod/language/'.$GLOBALS['xoopsConfig']['language'].'/mail_templates/'));
$xoopsMailer->setTemplate('vod_video_available_cart.html');
- $xoopsMailer->setSubject(sprintf(_VOD_EMAIL_VIDEO_AVAILABLE_SUBJECT, $videos[$cart->getVar('vid')]->getVar('name'), date(_DATESTRING, time().$GLOBALS['vodModuleConfig']['purchase_expires'])));
+ $xoopsMailer->setSubject(sprintf(_VOD_EMAIL_VIDEO_AVAILABLE_SUBJECT, $videos[$cart->getVar('vid')]->getVar('name'), date(_DATESTRING, time()+$GLOBALS['vodModuleConfig']['purchase_expires'])));
$xoopsMailer->setToEmails($sessions[$cart->getVar('sessid')]->getVar('email'));
@@ -51,7 +51,8 @@
$xoopsMailer->assign("SUMMARY", $videos[$cart->getVar('vid')]->getVar('summary'));
$xoopsMailer->assign("CATEGORY", $categories[$cart->getVar('cid')]->getVar('name'));
$xoopsMailer->assign("URL", $videos[$cart->getVar('vid')]->getViewingURL($sessions[$cart->getVar('sessid')], $cart));
- $xoopsMailer->assign("EXPIRES", date(_DATESTRING, time().$GLOBALS['vodModuleConfig']['purchase_expires']));
+ $xoopsMailer->assign("EXPIRES", date(_DATESTRING, time()+$GLOBALS['vodModuleConfig']['purchase_expires']));
+ $xoopsMailer->assign("EXPIRE", date(_DATESTRING, time()+$GLOBALS['vodModuleConfig']['purchase_expires']));
$xoopsMailer->assign("INVURL", $sessions[$cart->getVar('sessid')]->getVar('url'));
if ($GLOBALS['vodModuleConfig']['matrixstream']==true&&$sessions[$cart->getVar('sessid')]->getVar('uid')>0&&$cart->getVar('pid')>0) {
@@ -69,7 +70,7 @@
if ($subscribed_handler->insert($subscription, true)) {
if($xoopsMailer->send() ){
$cart->setVar('notified', time());
- $cart->setVar('expires', time().$GLOBALS['vodModuleConfig']['purchase_expires']);
+ $cart->setVar('expires', time()+$GLOBALS['vodModuleConfig']['purchase_expires']);
$cart_handler->insert($cart);
}
}
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/changelog.txt
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/changelog.txt 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/docs/changelog.txt 2012-01-29 14:46:28 UTC (rev 8826)
@@ -1,4 +1,15 @@
==========================================
+ 2011/01/30 01:26:01 Version 1.17 BETA
+==========================================
+ - Added /tag/plugin/vod.php Tag Module Plugin code added (wishcraft)
+ - Added /xpayment/plugin/vod.php XPayment Module Plugin code added (wishcraft)
+ - Changed /class/cart.php restructing and debugged code added for cart & cart session (wishcraft)
+ - Changed /class/sessions.php restructing and debugged code added for cart & cart session (wishcraft)
+ - Changed /class/log.php restructing and debugged code added for videos class (wishcraft)
+ - Changed /index.php restructing and debugged code added for cart & cart session (wishcraft)
+ - Changed /xoops_version.php Support for New Variables, Constants & Templates; version updated of Application (wishcraft)
+
+==========================================
2011/01/27 5:48:01 Version 1.16 ALPHA
==========================================
- Added /cron/notify.php Notification Cron Added & Matrixstream code added (wishcraft)
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/formobjects.vod.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/formobjects.vod.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/formobjects.vod.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -4,8 +4,9 @@
$config_handler = xoops_gethandler('config');
if (!isset($GLOBALS['vodModule']))
$GLOBALS['vodModule'] = $module_handler->getByDirname('vod');
- if (!isset($GLOBALS['vodModuleConfig']))
- $GLOBALS['vodModuleConfig'] = $config_handler->getConfigList($GLOBALS['vodModule']->getVar('mid'));
+ if (is_object($GLOBALS['vodModule']))
+ if (!isset($GLOBALS['vodModuleConfig']))
+ $GLOBALS['vodModuleConfig'] = $config_handler->getConfigList($GLOBALS['vodModule']->getVar('mid'));
require_once($GLOBALS['xoops']->path('class/xoopsformloader.php'));
require_once($GLOBALS['xoops']->path('class/pagenav.php'));
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/forms.vod.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/forms.vod.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/forms.vod.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -400,7 +400,7 @@
$ele['parent'] = new VodFormSelectCategory(($as_array==false?_FRM_VOD_FORM_CATEGORY_PARENT:''), $id.'[parent]', $object->getVar('parent'), 1, false, $object->getVar('cid'));
$ele['parent']->setDescription(($as_array==false?_FRM_VOD_FORM_CATEGORY_PARENT_DESC:''));
- $ele['prefix'] = new XoopsFormText(($as_array==false?_FRM_VOD_FORM_CATEGORY_PREFIX:''), $id.'[catno]', ($as_array==false?16:8),32, $object->getVar('prefix'));
+ $ele['prefix'] = new XoopsFormText(($as_array==false?_FRM_VOD_FORM_CATEGORY_PREFIX:''), $id.'[prefix]', ($as_array==false?16:8),32, $object->getVar('prefix'));
$ele['prefix']->setDescription(($as_array==false?_FRM_VOD_FORM_CATEGORY_PREFIX_DESC:''));
$ele['name'] = new XoopsFormText(($as_array==false?_FRM_VOD_FORM_CATEGORY_NAME:''), $id.'[name]', ($as_array==false?55:21),128, $object->getVar('name'));
$ele['name']->setDescription(($as_array==false?_FRM_VOD_FORM_CATEGORY_NAME_DESC:''));
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/index.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/index.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/index.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -27,8 +27,13 @@
$sessions_handler =& xoops_getmodulehandler('sessions', 'vod');
$sessions = $sessions_handler->intialiseCart();
- if (is_array($_SESSION['vod']['cart'])&&$_SESSION['vod']['cart']!=false) {
- setcookie('cart', serialize($_SESSION['vod']['cart']), 3600*24*30);
+ if (isset($_SESSION['vod']['cart'])) {
+ if (is_array($_SESSION['vod']['cart'])&&$_SESSION['vod']['cart']!=false) {
+ setcookie('cart', serialize($_SESSION['vod']['cart']), 3600*24*30);
+ } else {
+ $cart = false;
+ setcookie('cart', '', 3600*24*30);
+ }
} else {
$cart = false;
setcookie('cart', '', 3600*24*30);
@@ -36,11 +41,13 @@
$xoopsOption['template_main'] = 'vod_index.html';
include($GLOBALS['xoops']->path('/header.php'));
- $GLOBALS['xoopsTpl']->assign('numincart', $_SESSION['vod']['cart']['videos']);
+ if (isset($_SESSION['vod']['cart']))
+ $GLOBALS['xoopsTpl']->assign('numincart', $_SESSION['vod']['cart']['videos']);
$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
$GLOBALS['xoopsTpl']->assign('back_url', $uri);
$GLOBALS['xoopsTpl']->assign('uri', urlencode($_SERVER['REQUEST_URI']));
$cathits=false;
+
if ($vid>0) {
$video = $videos_handler->get($vid);
$video->setVar('hits', $video->getVar('hits')+1);
@@ -53,6 +60,7 @@
}
$GLOBALS['xoopsTpl']->assign('video', $video->toArray($preview, 'main'));
}
+
if ($cid>0) {
$category = $category_handler->get($cid);
if ($cathits==false) {
@@ -61,6 +69,7 @@
}
$GLOBALS['xoopsTpl']->assign('category', $category->toArray());
}
+
$categories = array();
$criteria = new Criteria('parent', $cid);
$i = 0;
@@ -86,6 +95,7 @@
$categories[$cidb]['trend'] = false;
}
}
+
if ($i<>0)
$GLOBALS['xoopsTpl']->assign('trcolspan', ($GLOBALS['vodModuleConfig']['cat_per_row']-$ie));
$GLOBALS['xoopsTpl']->assign('categories', $categories);
@@ -99,7 +109,7 @@
break;
default:
case "list":
-
+
include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
$criteria = $videos_handler->getFilterCriteria($filter);
@@ -130,12 +140,14 @@
$videos = $videos_handler->getObjects($criteria, true);
foreach($videos as $vid => $video) {
if (is_object($video))
- $GLOBALS['xoopsTpl']->append('videos', $video->toArray($preview, 'list'));
+ $GLOBALS['xoopsTpl']->append('pageofvideos', $video->toArray($preview, 'list'));
}
+
if ($GLOBALS['vodModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_VOD_JQUERY, array('type'=>'text/javascript'));
$GLOBALS['loaded_jquery']=true;
}
+
break;
}
case 'cart':
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/forms.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/forms.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/forms.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -1,5 +1,25 @@
<?php
+ // Currency Form
+ define('_FRM_VOD_FORM_CURRENCY_NAME', 'Currency Name');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_NAME', '');
+ define('_FRM_VOD_FORM_CURRENCY_ALIAS', 'Currency Alias');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_ALIAS', '');
+ define('_FRM_VOD_FORM_CURRENCY_CODE', 'Currency ISO Code');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_CODE', '3 Characters');
+ define('_FRM_VOD_FORM_CURRENCY_LEFT', 'Currency Symbol on Left');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_LEFT', '');
+ define('_FRM_VOD_FORM_CURRENCY_RIGHT', 'Currency Symbol on Right');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_RIGHT', '');
+ define('_FRM_VOD_FORM_CURRENCY_DECIMALS', 'Currency Decimal Places');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_DECIMALS', '');
+ define('_FRM_VOD_FORM_CURRENCY_RATE', 'Currency Exchange Rate');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_RATE', 'Based on Default Currency');
+ define('_FRM_VOD_FORM_CURRENCY_DEFAULT', 'Default Currency');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_DEFAULT', '');
+ define('_FRM_VOD_EDIT_CURRENCY', 'Edit this currency - %s');
+ define('_FRM_VOD_NEW_CURRENCY', 'New currency');
+
define('_FRM_VOD_FORM_ISNEW_VOD', 'New Videos');
define('_FRM_VOD_FORM_EDIT_VOD', 'Edit Existing Videos');
define('_FRM_VOD_FORM_VOD_NAME', 'Name of Video');
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/modinfo.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/modinfo.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/language/english/modinfo.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -112,16 +112,16 @@
define('_MI_VOD_HTML5_VIDEOS_DESC', 'This is the HTML5 videos selected when a useragent is specified');
define('_MI_VOD_OTHER_VIDEOS', 'Other Videos');
define('_MI_VOD_OTHER_VIDEOS_DESC', 'This is the Other videos selected when a useragent is specified');
- define('_MI_VOD_LOAD_VOD', 'Load Vod in these videos sessions');
+ define('_MI_VOD_LOAD_VOD', 'Load Flowplayer in these videos sessions');
define('_MI_VOD_LOAD_VOD_DESC', 'This is the intances that load vod (Do not change unless you know what you are doing)');
define('_MI_VOD_LOAD_VIDEOJS', 'Load Video-js in these videos sessions');
define('_MI_VOD_LOAD_VIDEOJS_DESC', 'This is the intances that load HTML5 Video-js (Do not change unless you know what you are doing)');
//Enumerators
- define('_MI_VOD_FLASH', 'Flash Videos (Vod)');
+ define('_MI_VOD_FLASH', 'Flash Videos (Flowplayer)');
define('_MI_VOD_HTML5', 'HTML5 Videos (Video-js)');
define('_MI_VOD_IOS', 'Apple OS Videos (Video-js)');
- define('_MI_VOD_RTMP', 'RTMP Stream Videos (Vod)');
+ define('_MI_VOD_RTMP', 'RTMP Stream Videos (Flowplayer)');
define('_MI_VOD_RTSP', 'RTSP Stream Videos (Video-js)');
define('_MI_VOD_OTHER', 'Other Videos');
define('_MI_VOD_SILVERLIGHT', 'Silverlight Videos');
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/sql/mysql.sql
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/sql/mysql.sql 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/sql/mysql.sql 2012-01-29 14:46:28 UTC (rev 8826)
@@ -198,7 +198,7 @@
CREATE TABLE `vod_log` (
`log_id` bigint(25) unsigned NOT NULL AUTO_INCREMENT,
- `class` enum('cart','sessions','currency','category','mimetypes','video','external','unknown') DEFAULT 'unknown',
+ `class` enum('cart','sessions','currency','category','mimetypes','videos','external','unknown') DEFAULT 'unknown',
`file` varchar(64) DEFAULT NULL,
`path` varchar(128) DEFAULT NULL,
`line` int(15) unsigned DEFAULT '0',
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_videos_list.html
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_videos_list.html 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/templates/vod_index_videos_list.html 2012-01-29 14:46:28 UTC (rev 8826)
@@ -52,7 +52,7 @@
<th> </th>
<th> </th>
</tr>
- <{foreach item=item from=$videos}>
+ <{foreach item=item from=$pageofvideos}>
<tr class="<{cycle values="even,odd"}>">
<td rowspan='2' align='center'><{if $item.hasavata}><img src='<{$item.avata_url}>' width='95px'><{else}> <{/if}></td>
<td><{$item.cid}></td>
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/xoops_version.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/xoops_version.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/xoops_version.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -92,11 +92,11 @@
// Tables created by sql file (without prefix!)
$i=0;
$modversion['tables'][$i++] = "vod_cart";
+$modversion['tables'][$i++] = "vod_cart_sessions";
$modversion['tables'][$i++] = "vod_category";
$modversion['tables'][$i++] = "vod_currency";
$modversion['tables'][$i++] = "vod_log";
$modversion['tables'][$i++] = "vod_mimetypes";
-$modversion['tables'][$i++] = "vod_sessions";
$modversion['tables'][$i++] = "vod_videos";
// Blocks
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/class/log.php
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/class/log.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/class/log.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -21,7 +21,7 @@
function VodLog($fid = null)
{
$this->initVar('log_id', XOBJ_DTYPE_INT, null, false);
- $this->initVar('class', XOBJ_DTYPE_ENUM, 'unknown', false, false, false, array('cart','sessions','currency','category','mimetypes','video','external','unknown'));
+ $this->initVar('class', XOBJ_DTYPE_ENUM, 'unknown', false, false, false, array('cart','sessions','currency','category','mimetypes','videos','external','unknown'));
$this->initVar('file', XOBJ_DTYPE_TXTBOX, null, false, 64);
$this->initVar('path', XOBJ_DTYPE_TXTBOX, null, false, 128);
$this->initVar('line', XOBJ_DTYPE_INT, null, false);
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/class/sessions.php
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/class/sessions.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/class/sessions.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -228,7 +228,7 @@
unset($_COOKIE['cart']);
}
}
- if (is_object($GLOBALS['xoopsUser'])&&!is_object($session)) {
+ if (is_object($GLOBALS['xoopsUser'])&&!isset($session)) {
$criteria = new CriteriaCompo(new Criteria('uid', $GLOBALS['xoopsUser']->getVar('uid')));
$criteria->add(new Criteria('`mode`', '_VOD_ENUM_UNINVOICED'));
if ($this->getCount($criteria)>0) {
@@ -238,7 +238,7 @@
}
}
$user = vod_getIPData();
- if (!is_object($session)) {
+ if (!isset($session)) {
$criteria = new CriteriaCompo(new Criteria('`ip`', $user['ip']));
$criteria->add(new Criteria('netaddy', $user['network-addy']));
$criteria->add(new Criteria('`mode`', '_VOD_ENUM_UNINVOICED'));
@@ -249,7 +249,7 @@
}
}
- if (!is_object($session)) {
+ if (!isset($session)) {
unset($session);
unset($_SESSION['vod']['cart']);
unset($_COOKIE['cart']);
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/class/videos.php
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/class/videos.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/class/videos.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -130,14 +130,16 @@
function toArray($preview=false, $state='list') {
$ret = parent::toArray();
+
if ($this->getVar('mid')>0) {
$mimetypes_handler = xoops_getmodulehandler('mimetypes', 'vod');
$mimetype = $mimetypes_handler->get($this->getVar('mid'));
if (is_object($mimetype))
$ret['mimetype'] = $mimetype->toArray();
}
+
$fields = array('width', 'height', 'autoplay', 'control');
- switch ($this->getSpecialWithUserAgent("")) {
+ switch ($this->getSpecialWithUserAgent($_SERVER["HTTP_USER_AGENT"])) {
case "A":
foreach($fields as $field) {
$ret[$field] = $ret['speciala_'.$field];
@@ -151,6 +153,7 @@
default:
break;
}
+
$ele = vod_videos_get_form($this, true);
foreach($ele as $key => $field)
$ret['form'][$key] = $field->render();
@@ -179,22 +182,22 @@
$sessions_handler = xoops_getmodulehandler('sessions', 'vod');
static $_session = null;
- if (!is_array($_SESSION['vod']['cart'])||!isset($_SESSION['vod']['cart'])) {
- $ret['incart'] = false;
- } else {
- if (!is_object($_session))
+ if (isset($_SESSION['vod']['cart']['sessid'])) {
+ if (!is_object($_session))
$_session = $sessions_handler->get($_SESSION['vod']['cart']['sessid']);
$ret['incart'] = $_session->inCart($this);
- }
-
- if (strlen($this->getVar('avata'))>0&&file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar('avata')))) {
+ } else {
+ $ret['incart'] = false;
+ }
+
+ if (strlen($this->getVar('avata'))>0&&file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar('avata')))) {
$ret['avata_url'] = $this->getImage('avata');
$ret['hasavata'] = true;
} else
$ret['hasavata'] = false;
-
+
$mode = $this->getModeWithUserAgent($_SERVER['HTTP_USER_AGENT']);
- $prev = array('width' => $this->getVar('width'), 'height' => $this->getVar('height'), 'id' => $this->getReference(false, $preview), 'source' => '');
+ $prev = array('width' => $this->getVar('width'), 'height' => $this->getVar('height'), 'id' => $this->getReference(false, $preview), 'source' => $this->getSource($mode, $preview));
if (strlen($this->getSource($mode, $preview))>0) {
$ret['haspreview'] = true;
$prev['mode'] = $mode;
@@ -210,7 +213,7 @@
$prev['height'] = $GLOBALS['vodModuleConfig']['video_height_'.$state];
$prev['source'] = $this->getSource($mode, $preview);
$prev['id'] = $this->getReference(false, $preview);
- $html = $this->getHTML(false, $data['width'], $data['height'], '', '', $preview, $state);
+ $html = $this->getHTML(false, $prev['width'], $prev['height'], '', '', $preview, $state);
if ($GLOBALS['vodModuleConfig'][$mode.'_secure']==true) {
$prev['contents'] = '';
$GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), $this->getJS(false, $prev['width'], $prev['height'], $preview, $state));
@@ -224,7 +227,7 @@
$prev['height'] = $GLOBALS['vodModuleConfig']['video_height_'.$state];
$prev['source'] = $this->getSource($mode, $preview);
$prev['id'] = $this->getReference(true, $preview);
- $html = $this->getHTML(true, $data['width'], $data['height'], '', '', $preview, $state);
+ $html = $this->getHTML(true, $prev['width'], $prev['height'], '', '', $preview, $state);
if ($GLOBALS['vodModuleConfig'][$mode.'_secure']==true) {
$prev['contents'] = '';
$GLOBALS['xoTheme']->addScript('', array('type'=>'text/javascript'), $this->getJS(true, $prev['width'], $prev['height'], $preview, $state));
@@ -237,46 +240,50 @@
} else {
$ret['haspreview'] = false;
}
- foreach($prev as $key => $value) {
- $ret['preview_data_'.$key] = $value;
- }
+
if ($GLOBALS['vodModuleConfig']['tags']&&file_exists($GLOBALS['xoops']->path("/modules/tag/include/tagbar.php"))) {
include_once XOOPS_ROOT_PATH."/modules/tag/include/tagbar.php";
$ret['tagbar'] = tagBar($this->getVar('vid'), $this->getVar('cid'));
}
+
return $ret;
}
function getHTML($block = false, $width=0, $height=0, $agent = '', $ip = '', $preview = false, $state = 'list') {
+
if (empty($ip))
$ip = $this->getIP();
if (empty($agent))
$agent = $_SERVER['HTTP_USER_AGENT'];
+
$mode = $this->getModeWithUserAgent($agent);
include_once ($GLOBALS['xoops']->path('class/template.php'));
- if (!isset($GLOBALS['xoopsTpl']))
- $GLOBALS['xoopsTpl'] = new XoopsTpl();
+ $GLOBALS['vodTpl'] = new XoopsTpl();
+
$videos = array();
- $videos = $this->toArray($preview, $state);
+ $videos = parent::toArray();
$videos['mode'] = $mode;
$videos['source'] = $this->getSource($mode, $preview);
$videos['id'] = $this->getReference($block, $preview);
$videos['width'] = (!empty($height)&&!empty($width)&&$width&&$height?$width:($this->getSpecialWithUserAgent($agent)=='A'?$this->getVar('speciala_width'):($this->getSpecialWithUserAgent($agent)=='B'?$this->getVar('specialb_width'):($this->getVar('width')))));
$videos['height'] = (!empty($height)&&!empty($height)&&$height&&$height?$height:($this->getSpecialWithUserAgent($agent)=='A'?$this->getVar('speciala_height'):($this->getSpecialWithUserAgent($agent)=='B'?$this->getVar('specialb_height'):($this->getVar('height')))));
- $GLOBALS['xoopsTpl']->assign('videos', $videos);
+
+ $GLOBALS['vodTpl']->assign('videos', $videos);
if (isset($videos['mimetype']))
- $GLOBALS['xoopsTpl']->assign('mimetype', $videos['mimetype']);
- $GLOBALS['xoopsTpl']->assign('xoConfig', $this->_ModConfig);
- $GLOBALS['xoopsTpl']->assign('iframe', isset($_REQUEST['iframe']));
- $GLOBALS['xoopsTpl']->assign('preview', $preview);
- $GLOBALS['xoopsTpl']->assign('state', $state);
+ $GLOBALS['vodTpl']->assign('mimetype', $videos['mimetype']);
+ $GLOBALS['vodTpl']->assign('xoConfig', $this->_ModConfig);
+ $GLOBALS['vodTpl']->assign('iframe', isset($_REQUEST['iframe']));
+ $GLOBALS['vodTpl']->assign('preview', $preview);
+ $GLOBALS['vodTpl']->assign('state', $state);
+
ob_start();
if ($block == false)
- $GLOBALS['xoopsTpl']->display('db:vod_json_'.$mode.'_videos.html');
+ $GLOBALS['vodTpl']->display('db:vod_json_'.$mode.'_videos.html');
else
- $GLOBALS['xoopsTpl']->display('db:vod_json_block_'.$mode.'_videos.html');
+ $GLOBALS['vodTpl']->display('db:vod_json_block_'.$mode.'_videos.html');
$data = ob_get_contents();
ob_end_clean();
+
return $data;
}
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/cron/notify.php
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/cron/notify.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/cron/notify.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -36,7 +36,7 @@
$xoopsMailer->setHTML(true);
$xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/vod/language/'.$GLOBALS['xoopsConfig']['language'].'/mail_templates/'));
$xoopsMailer->setTemplate('vod_video_available_cart.html');
- $xoopsMailer->setSubject(sprintf(_VOD_EMAIL_VIDEO_AVAILABLE_SUBJECT, $videos[$cart->getVar('vid')]->getVar('name'), date(_DATESTRING, time().$GLOBALS['vodModuleConfig']['purchase_expires'])));
+ $xoopsMailer->setSubject(sprintf(_VOD_EMAIL_VIDEO_AVAILABLE_SUBJECT, $videos[$cart->getVar('vid')]->getVar('name'), date(_DATESTRING, time()+$GLOBALS['vodModuleConfig']['purchase_expires'])));
$xoopsMailer->setToEmails($sessions[$cart->getVar('sessid')]->getVar('email'));
@@ -51,7 +51,8 @@
$xoopsMailer->assign("SUMMARY", $videos[$cart->getVar('vid')]->getVar('summary'));
$xoopsMailer->assign("CATEGORY", $categories[$cart->getVar('cid')]->getVar('name'));
$xoopsMailer->assign("URL", $videos[$cart->getVar('vid')]->getViewingURL($sessions[$cart->getVar('sessid')], $cart));
- $xoopsMailer->assign("EXPIRES", date(_DATESTRING, time().$GLOBALS['vodModuleConfig']['purchase_expires']));
+ $xoopsMailer->assign("EXPIRES", date(_DATESTRING, time()+$GLOBALS['vodModuleConfig']['purchase_expires']));
+ $xoopsMailer->assign("EXPIRE", date(_DATESTRING, time()+$GLOBALS['vodModuleConfig']['purchase_expires']));
$xoopsMailer->assign("INVURL", $sessions[$cart->getVar('sessid')]->getVar('url'));
if ($GLOBALS['vodModuleConfig']['matrixstream']==true&&$sessions[$cart->getVar('sessid')]->getVar('uid')>0&&$cart->getVar('pid')>0) {
@@ -69,7 +70,7 @@
if ($subscribed_handler->insert($subscription, true)) {
if($xoopsMailer->send() ){
$cart->setVar('notified', time());
- $cart->setVar('expires', time().$GLOBALS['vodModuleConfig']['purchase_expires']);
+ $cart->setVar('expires', time()+$GLOBALS['vodModuleConfig']['purchase_expires']);
$cart_handler->insert($cart);
}
}
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/docs/changelog.txt
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/docs/changelog.txt 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/docs/changelog.txt 2012-01-29 14:46:28 UTC (rev 8826)
@@ -1,4 +1,15 @@
==========================================
+ 2011/01/30 01:26:01 Version 1.17 BETA
+==========================================
+ - Added /tag/plugin/vod.php Tag Module Plugin code added (wishcraft)
+ - Added /xpayment/plugin/vod.php XPayment Module Plugin code added (wishcraft)
+ - Changed /class/cart.php restructing and debugged code added for cart & cart session (wishcraft)
+ - Changed /class/sessions.php restructing and debugged code added for cart & cart session (wishcraft)
+ - Changed /class/log.php restructing and debugged code added for videos class (wishcraft)
+ - Changed /index.php restructing and debugged code added for cart & cart session (wishcraft)
+ - Changed /xoops_version.php Support for New Variables, Constants & Templates; version updated of Application (wishcraft)
+
+==========================================
2011/01/27 5:48:01 Version 1.16 ALPHA
==========================================
- Added /cron/notify.php Notification Cron Added & Matrixstream code added (wishcraft)
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/include/formobjects.vod.php
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/include/formobjects.vod.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/include/formobjects.vod.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -4,8 +4,9 @@
$config_handler = xoops_gethandler('config');
if (!isset($GLOBALS['vodModule']))
$GLOBALS['vodModule'] = $module_handler->getByDirname('vod');
- if (!isset($GLOBALS['vodModuleConfig']))
- $GLOBALS['vodModuleConfig'] = $config_handler->getConfigList($GLOBALS['vodModule']->getVar('mid'));
+ if (is_object($GLOBALS['vodModule']))
+ if (!isset($GLOBALS['vodModuleConfig']))
+ $GLOBALS['vodModuleConfig'] = $config_handler->getConfigList($GLOBALS['vodModule']->getVar('mid'));
require_once($GLOBALS['xoops']->path('class/xoopsformloader.php'));
require_once($GLOBALS['xoops']->path('class/pagenav.php'));
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/include/forms.vod.php
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/include/forms.vod.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/include/forms.vod.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -400,7 +400,7 @@
$ele['parent'] = new VodFormSelectCategory(($as_array==false?_FRM_VOD_FORM_CATEGORY_PARENT:''), $id.'[parent]', $object->getVar('parent'), 1, false, $object->getVar('cid'));
$ele['parent']->setDescription(($as_array==false?_FRM_VOD_FORM_CATEGORY_PARENT_DESC:''));
- $ele['prefix'] = new XoopsFormText(($as_array==false?_FRM_VOD_FORM_CATEGORY_PREFIX:''), $id.'[catno]', ($as_array==false?16:8),32, $object->getVar('prefix'));
+ $ele['prefix'] = new XoopsFormText(($as_array==false?_FRM_VOD_FORM_CATEGORY_PREFIX:''), $id.'[prefix]', ($as_array==false?16:8),32, $object->getVar('prefix'));
$ele['prefix']->setDescription(($as_array==false?_FRM_VOD_FORM_CATEGORY_PREFIX_DESC:''));
$ele['name'] = new XoopsFormText(($as_array==false?_FRM_VOD_FORM_CATEGORY_NAME:''), $id.'[name]', ($as_array==false?55:21),128, $object->getVar('name'));
$ele['name']->setDescription(($as_array==false?_FRM_VOD_FORM_CATEGORY_NAME_DESC:''));
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/index.php
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/index.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/index.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -27,8 +27,13 @@
$sessions_handler =& xoops_getmodulehandler('sessions', 'vod');
$sessions = $sessions_handler->intialiseCart();
- if (is_array($_SESSION['vod']['cart'])&&$_SESSION['vod']['cart']!=false) {
- setcookie('cart', serialize($_SESSION['vod']['cart']), 3600*24*30);
+ if (isset($_SESSION['vod']['cart'])) {
+ if (is_array($_SESSION['vod']['cart'])&&$_SESSION['vod']['cart']!=false) {
+ setcookie('cart', serialize($_SESSION['vod']['cart']), 3600*24*30);
+ } else {
+ $cart = false;
+ setcookie('cart', '', 3600*24*30);
+ }
} else {
$cart = false;
setcookie('cart', '', 3600*24*30);
@@ -36,11 +41,13 @@
$xoopsOption['template_main'] = 'vod_index.html';
include($GLOBALS['xoops']->path('/header.php'));
- $GLOBALS['xoopsTpl']->assign('numincart', $_SESSION['vod']['cart']['videos']);
+ if (isset($_SESSION['vod']['cart']))
+ $GLOBALS['xoopsTpl']->assign('numincart', $_SESSION['vod']['cart']['videos']);
$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
$GLOBALS['xoopsTpl']->assign('back_url', $uri);
$GLOBALS['xoopsTpl']->assign('uri', urlencode($_SERVER['REQUEST_URI']));
$cathits=false;
+
if ($vid>0) {
$video = $videos_handler->get($vid);
$video->setVar('hits', $video->getVar('hits')+1);
@@ -53,6 +60,7 @@
}
$GLOBALS['xoopsTpl']->assign('video', $video->toArray($preview, 'main'));
}
+
if ($cid>0) {
$category = $category_handler->get($cid);
if ($cathits==false) {
@@ -61,6 +69,7 @@
}
$GLOBALS['xoopsTpl']->assign('category', $category->toArray());
}
+
$categories = array();
$criteria = new Criteria('parent', $cid);
$i = 0;
@@ -86,6 +95,7 @@
$categories[$cidb]['trend'] = false;
}
}
+
if ($i<>0)
$GLOBALS['xoopsTpl']->assign('trcolspan', ($GLOBALS['vodModuleConfig']['cat_per_row']-$ie));
$GLOBALS['xoopsTpl']->assign('categories', $categories);
@@ -99,7 +109,7 @@
break;
default:
case "list":
-
+
include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
$criteria = $videos_handler->getFilterCriteria($filter);
@@ -130,12 +140,14 @@
$videos = $videos_handler->getObjects($criteria, true);
foreach($videos as $vid => $video) {
if (is_object($video))
- $GLOBALS['xoopsTpl']->append('videos', $video->toArray($preview, 'list'));
+ $GLOBALS['xoopsTpl']->append('pageofvideos', $video->toArray($preview, 'list'));
}
+
if ($GLOBALS['vodModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_VOD_JQUERY, array('type'=>'text/javascript'));
$GLOBALS['loaded_jquery']=true;
}
+
break;
}
case 'cart':
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/language/english/forms.php
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/language/english/forms.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/language/english/forms.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -1,5 +1,25 @@
<?php
+ // Currency Form
+ define('_FRM_VOD_FORM_CURRENCY_NAME', 'Currency Name');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_NAME', '');
+ define('_FRM_VOD_FORM_CURRENCY_ALIAS', 'Currency Alias');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_ALIAS', '');
+ define('_FRM_VOD_FORM_CURRENCY_CODE', 'Currency ISO Code');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_CODE', '3 Characters');
+ define('_FRM_VOD_FORM_CURRENCY_LEFT', 'Currency Symbol on Left');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_LEFT', '');
+ define('_FRM_VOD_FORM_CURRENCY_RIGHT', 'Currency Symbol on Right');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_RIGHT', '');
+ define('_FRM_VOD_FORM_CURRENCY_DECIMALS', 'Currency Decimal Places');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_DECIMALS', '');
+ define('_FRM_VOD_FORM_CURRENCY_RATE', 'Currency Exchange Rate');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_RATE', 'Based on Default Currency');
+ define('_FRM_VOD_FORM_CURRENCY_DEFAULT', 'Default Currency');
+ define('_FRM_VOD_FORM_DESC_CURRENCY_DEFAULT', '');
+ define('_FRM_VOD_EDIT_CURRENCY', 'Edit this currency - %s');
+ define('_FRM_VOD_NEW_CURRENCY', 'New currency');
+
define('_FRM_VOD_FORM_ISNEW_VOD', 'New Videos');
define('_FRM_VOD_FORM_EDIT_VOD', 'Edit Existing Videos');
define('_FRM_VOD_FORM_VOD_NAME', 'Name of Video');
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/language/english/modinfo.php
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/language/english/modinfo.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/language/english/modinfo.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -112,16 +112,16 @@
define('_MI_VOD_HTML5_VIDEOS_DESC', 'This is the HTML5 videos selected when a useragent is specified');
define('_MI_VOD_OTHER_VIDEOS', 'Other Videos');
define('_MI_VOD_OTHER_VIDEOS_DESC', 'This is the Other videos selected when a useragent is specified');
- define('_MI_VOD_LOAD_VOD', 'Load Vod in these videos sessions');
+ define('_MI_VOD_LOAD_VOD', 'Load Flowplayer in these videos sessions');
define('_MI_VOD_LOAD_VOD_DESC', 'This is the intances that load vod (Do not change unless you know what you are doing)');
define('_MI_VOD_LOAD_VIDEOJS', 'Load Video-js in these videos sessions');
define('_MI_VOD_LOAD_VIDEOJS_DESC', 'This is the intances that load HTML5 Video-js (Do not change unless you know what you are doing)');
//Enumerators
- define('_MI_VOD_FLASH', 'Flash Videos (Vod)');
+ define('_MI_VOD_FLASH', 'Flash Videos (Flowplayer)');
define('_MI_VOD_HTML5', 'HTML5 Videos (Video-js)');
define('_MI_VOD_IOS', 'Apple OS Videos (Video-js)');
- define('_MI_VOD_RTMP', 'RTMP Stream Videos (Vod)');
+ define('_MI_VOD_RTMP', 'RTMP Stream Videos (Flowplayer)');
define('_MI_VOD_RTSP', 'RTSP Stream Videos (Video-js)');
define('_MI_VOD_OTHER', 'Other Videos');
define('_MI_VOD_SILVERLIGHT', 'Silverlight Videos');
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/sql/mysql.sql
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/sql/mysql.sql 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/sql/mysql.sql 2012-01-29 14:46:28 UTC (rev 8826)
@@ -198,7 +198,7 @@
CREATE TABLE `vod_log` (
`log_id` bigint(25) unsigned NOT NULL AUTO_INCREMENT,
- `class` enum('cart','sessions','currency','category','mimetypes','video','external','unknown') DEFAULT 'unknown',
+ `class` enum('cart','sessions','currency','category','mimetypes','videos','external','unknown') DEFAULT 'unknown',
`file` varchar(64) DEFAULT NULL,
`path` varchar(128) DEFAULT NULL,
`line` int(15) unsigned DEFAULT '0',
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_videos_list.html
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_videos_list.html 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/templates/vod_index_videos_list.html 2012-01-29 14:46:28 UTC (rev 8826)
@@ -52,7 +52,7 @@
<th> </th>
<th> </th>
</tr>
- <{foreach item=item from=$videos}>
+ <{foreach item=item from=$pageofvideos}>
<tr class="<{cycle values="even,odd"}>">
<td rowspan='2' align='center'><{if $item.hasavata}><img src='<{$item.avata_url}>' width='95px'><{else}> <{/if}></td>
<td><{$item.cid}></td>
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/xoops_version.php
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/xoops_version.php 2012-01-29 11:32:49 UTC (rev 8825)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/xoops_version.php 2012-01-29 14:46:28 UTC (rev 8826)
@@ -92,11 +92,11 @@
// Tables created by sql file (without prefix!)
$i=0;
$modversion['tables'][$i++] = "vod_cart";
+$modversion['tables'][$i++] = "vod_cart_sessions";
$modversion['tables'][$i++] = "vod_category";
$modversion['tables'][$i++] = "vod_currency";
$modversion['tables'][$i++] = "vod_log";
$modversion['tables'][$i++] = "vod_mimetypes";
-$modversion['tables'][$i++] = "vod_sessions";
$modversion['tables'][$i++] = "vod_videos";
// Blocks
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2012-01-29 17:36:18
|
Revision: 8828
http://xoops.svn.sourceforge.net/xoops/?rev=8828&view=rev
Author: wishcraft
Date: 2012-01-29 17:36:12 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
VOD 1.17 Beta - Install Fix and Date Fixes - Currency Form Fix - see changelog.txt
Modified Paths:
--------------
XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/forms.vod.php
XoopsModules/vod/trunk/htdocs/modules/vod/include/forms.vod.php
Modified: XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/forms.vod.php
===================================================================
--- XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/forms.vod.php 2012-01-29 16:59:08 UTC (rev 8827)
+++ XoopsModules/vod/releases/1.17/htdocs/modules/vod/include/forms.vod.php 2012-01-29 17:36:12 UTC (rev 8828)
@@ -323,22 +323,22 @@
$ele['state'] = new XoopsFormHidden('state['.$id.']', 'new' );
}
- $ele['name'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_NAME'):''), $id.'[name]', 35, 128, $object->getVar('name') );
- $ele['name']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_NAME'):''));
- $ele['alias'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_ALIAS'):''), $id.'[alias]', 35, 128, $object->getVar('alias') );
- $ele['alias']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_ALIAS'):''));
- $ele['code'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_CODE'):''), $id.'[code]', 5, 3, $object->getVar('code') );
- $ele['code']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_CODE'):''));
- $ele['left'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_LEFT'):''), $id.'[left]', 5, 2, $object->getVar('left') );
- $ele['left']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_LEFT'):''));
- $ele['right'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_RIGHT'):''), $id.'[right]', 5, 2, $object->getVar('right') );
- $ele['right']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_RIGHT'):''));
- $ele['decimals'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_DECIMALS'):''), $id.'[decimals]', 15, 15, $object->getVar('decimals') );
- $ele['decimals']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_DECIMALS'):''));
- $ele['rate'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_RATE'):''), $id.'[rate]', 20, 19, $object->getVar('rate') );
- $ele['rate']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_RATE'):''));
- $ele['default'] = new XoopsFormRadioYN(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_DEFAULT'):''), $id.'[default]', $object->getVar('default') );
- $ele['default']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_DEFAULT'):''));
+ $ele['name'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_NAME'):''), $id.'[name]', 35, 128, $object->getVar('name') );
+ $ele['name']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_NAME'):''));
+ $ele['alias'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_ALIAS'):''), $id.'[alias]', 35, 128, $object->getVar('alias') );
+ $ele['alias']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_ALIAS'):''));
+ $ele['code'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_CODE'):''), $id.'[code]', 5, 3, $object->getVar('code') );
+ $ele['code']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_CODE'):''));
+ $ele['left'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_LEFT'):''), $id.'[left]', 5, 2, $object->getVar('left') );
+ $ele['left']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_LEFT'):''));
+ $ele['right'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_RIGHT'):''), $id.'[right]', 5, 2, $object->getVar('right') );
+ $ele['right']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_RIGHT'):''));
+ $ele['decimals'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_DECIMALS'):''), $id.'[decimals]', 15, 15, $object->getVar('decimals') );
+ $ele['decimals']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_DECIMALS'):''));
+ $ele['rate'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_RATE'):''), $id.'[rate]', 20, 19, $object->getVar('rate') );
+ $ele['rate']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_RATE'):''));
+ $ele['default'] = new XoopsFormRadioYN(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_DEFAULT'):''), $id.'[default]', $object->getVar('default') );
+ $ele['default']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_DEFAULT'):''));
$ele['op'] = new XoopsFormHidden('op', 'currency' );
$ele['fct'] = new XoopsFormHidden('fct', 'save' );
Modified: XoopsModules/vod/trunk/htdocs/modules/vod/include/forms.vod.php
===================================================================
--- XoopsModules/vod/trunk/htdocs/modules/vod/include/forms.vod.php 2012-01-29 16:59:08 UTC (rev 8827)
+++ XoopsModules/vod/trunk/htdocs/modules/vod/include/forms.vod.php 2012-01-29 17:36:12 UTC (rev 8828)
@@ -323,22 +323,22 @@
$ele['state'] = new XoopsFormHidden('state['.$id.']', 'new' );
}
- $ele['name'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_NAME'):''), $id.'[name]', 35, 128, $object->getVar('name') );
- $ele['name']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_NAME'):''));
- $ele['alias'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_ALIAS'):''), $id.'[alias]', 35, 128, $object->getVar('alias') );
- $ele['alias']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_ALIAS'):''));
- $ele['code'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_CODE'):''), $id.'[code]', 5, 3, $object->getVar('code') );
- $ele['code']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_CODE'):''));
- $ele['left'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_LEFT'):''), $id.'[left]', 5, 2, $object->getVar('left') );
- $ele['left']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_LEFT'):''));
- $ele['right'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_RIGHT'):''), $id.'[right]', 5, 2, $object->getVar('right') );
- $ele['right']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_RIGHT'):''));
- $ele['decimals'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_DECIMALS'):''), $id.'[decimals]', 15, 15, $object->getVar('decimals') );
- $ele['decimals']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_DECIMALS'):''));
- $ele['rate'] = new XoopsFormText(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_RATE'):''), $id.'[rate]', 20, 19, $object->getVar('rate') );
- $ele['rate']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_RATE'):''));
- $ele['default'] = new XoopsFormRadioYN(($titles==true?constant('_FRM_VOD_FORM_CURRENCY_DEFAULT'):''), $id.'[default]', $object->getVar('default') );
- $ele['default']->setDescription(($titles==true?constant('_FRM_VOD_FORM_DESC_CURRENCY_DEFAULT'):''));
+ $ele['name'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_NAME'):''), $id.'[name]', 35, 128, $object->getVar('name') );
+ $ele['name']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_NAME'):''));
+ $ele['alias'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_ALIAS'):''), $id.'[alias]', 35, 128, $object->getVar('alias') );
+ $ele['alias']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_ALIAS'):''));
+ $ele['code'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_CODE'):''), $id.'[code]', 5, 3, $object->getVar('code') );
+ $ele['code']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_CODE'):''));
+ $ele['left'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_LEFT'):''), $id.'[left]', 5, 2, $object->getVar('left') );
+ $ele['left']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_LEFT'):''));
+ $ele['right'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_RIGHT'):''), $id.'[right]', 5, 2, $object->getVar('right') );
+ $ele['right']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_RIGHT'):''));
+ $ele['decimals'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_DECIMALS'):''), $id.'[decimals]', 15, 15, $object->getVar('decimals') );
+ $ele['decimals']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_DECIMALS'):''));
+ $ele['rate'] = new XoopsFormText(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_RATE'):''), $id.'[rate]', 20, 19, $object->getVar('rate') );
+ $ele['rate']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_RATE'):''));
+ $ele['default'] = new XoopsFormRadioYN(($as_array==false?constant('_FRM_VOD_FORM_CURRENCY_DEFAULT'):''), $id.'[default]', $object->getVar('default') );
+ $ele['default']->setDescription(($as_array==false?constant('_FRM_VOD_FORM_DESC_CURRENCY_DEFAULT'):''));
$ele['op'] = new XoopsFormHidden('op', 'currency' );
$ele['fct'] = new XoopsFormHidden('fct', 'save' );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
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