Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2013-09-20 00:06:27
|
Revision: 12068
http://sourceforge.net/p/xoops/svn/12068
Author: beckmi
Date: 2013-09-20 00:06:19 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
Updating to CKEditor 4.21
Modified Paths:
--------------
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/ckeditor.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/config.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/contents.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/lang/en.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/about/dialogs/about.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/about/dialogs/logo_ckeditor.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/ambiance-mobile.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/ambiance.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/blackboard.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/cobalt.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/eclipse.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/erlang-dark.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/lesser-dark.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/monokai.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/night.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/rubyblue.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/twilight.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/vibrant-ink.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/xq-dark.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/confighelper/docs/install.html
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/docprops/dialogs/docprops.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/find/dialogs/find.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/button.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/form.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/select.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/icons.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/image/dialogs/image.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/insertpre/README.md
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/link/dialogs/link.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/link/images/anchor.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/onchange/docs/install.html
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/placeholder/dialogs/placeholder.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/table/dialogs/table.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/templates/templates/default.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/uicolor/dialogs/uicolor.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog_ie.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog_ie7.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog_ie8.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog_iequirks.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog_opera.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/editor.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/editor_ie.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/editor_ie7.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/editor_ie8.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/editor_iequirks.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/icons.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/readme.md
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog_ie.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog_ie7.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog_ie8.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog_opera.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor_gecko.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor_ie.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor_ie7.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor_ie8.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor_iequirks.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/icons.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/images/close.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/styles.js
Added Paths:
-----------
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/CHANGES.md
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/README.md
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/adapters/
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/adapters/jquery.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/about/dialogs/hidpi/
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/css/codemirror.min.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/beautify.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.addons.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.modes.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.search-addons.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/midnight.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/xq-light.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/icons_hidpi.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/link/images/hidpi/
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/magicline/images/hidpi/
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/wsc/dialogs/wsc_ie.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/icons_hidpi.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/icons_hidpi.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/images/hidpi/
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/images/hidpi/close.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/images/lock-open.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/images/lock.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/images/refresh.png
Removed Paths:
-------------
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
Added: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/CHANGES.md
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/CHANGES.md (rev 0)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/CHANGES.md 2013-09-20 00:06:19 UTC (rev 12068)
@@ -0,0 +1,233 @@
+CKEditor 4 Changelog
+====================
+
+## CKEditor 4.2.1
+
+Fixed Issues:
+
+* [#10301](http://dev.ckeditor.com/ticket/10301): [IE9-10] Undo fails after 3+ consecutive paste actions with a JavaScript error.
+* [#10689](http://dev.ckeditor.com/ticket/10689): Save toolbar button saves only the first editor instance.
+* [#10368](http://dev.ckeditor.com/ticket/10368): Move language reading direction definition (`dir`) from main language file to core.
+* [#9330](http://dev.ckeditor.com/ticket/9330): Fixed pasting anchors from MS Word.
+* [#8103](http://dev.ckeditor.com/ticket/8103): Fixed pasting nested lists from MS Word.
+* [#9958](http://dev.ckeditor.com/ticket/9958): [IE9] Pressing the "OK" button will trigger the `onbeforeunload` event in the popup dialog.
+* [#10662](http://dev.ckeditor.com/ticket/10662): Fixed styles from the Styles drop-down list not registering to the ACF in case when the [Shared Spaces plugin](http://ckeditor.com/addon/sharedspace) is used.
+* [#9654](http://dev.ckeditor.com/ticket/9654): Problems with Internet Explorer 10 Quirks Mode.
+* [#9816](http://dev.ckeditor.com/ticket/9816): Floating toolbar does not reposition vertically in several cases.
+* [#10646](http://dev.ckeditor.com/ticket/10646): Removing a selected sublist or nested table with *Backspace/Delete* removes the parent element.
+* [#10623](http://dev.ckeditor.com/ticket/10623): [WebKit] Page is scrolled when opening a drop-down list.
+* [#10004](http://dev.ckeditor.com/ticket/10004): [ChromeVox] Button names are not announced.
+* [#10731](http://dev.ckeditor.com/ticket/10731): [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin breaks cloning of editor configuration.
+* It is now possible to set per instance [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin configuration instead of setting the configuration globally.
+
+## CKEditor 4.2
+
+**Important Notes:**
+
+* Dropped compatibility support for Internet Explorer 7 and Firefox 3.6.
+
+* Both the Basic and the Standard distribution packages will not contain the new [Indent Block](http://ckeditor.com/addon/indentblock) plugin. Because of this the [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) might remove block indentations from existing contents. If you want to prevent this, either [add an appropriate ACF rule to your filter](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules) or create a custom build based on the Basic/Standard package and add the Indent Block plugin in [CKBuilder](http://ckeditor.com/builder).
+
+New Features:
+
+* [#10027](http://dev.ckeditor.com/ticket/10027): Separated list and block indentation into two plugins: [Indent List](http://ckeditor.com/addon/indentlist) and [Indent Block](http://ckeditor.com/addon/indentblock).
+* [#8244](http://dev.ckeditor.com/ticket/8244): Use *(Shift+)Tab* to indent and outdent lists.
+* [#10281](http://dev.ckeditor.com/ticket/10281): The [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) is now available. Several jQuery-related issues fixed: [#8261](http://dev.ckeditor.com/ticket/8261), [#9077](http://dev.ckeditor.com/ticket/9077), [#8710](http://dev.ckeditor.com/ticket/8710), [#8530](http://dev.ckeditor.com/ticket/8530), [#9019](http://dev.ckeditor.com/ticket/9019), [#6181](http://dev.ckeditor.com/ticket/6181), [#7876](http://dev.ckeditor.com/ticket/7876), [#6906](http://dev.ckeditor.com/ticket/6906).
+* [#10042](http://dev.ckeditor.com/ticket/10042): Introduced [`config.title`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title) setting to change the human-readable title of the editor.
+* [#9794](http://dev.ckeditor.com/ticket/9794): Added [`editor.onChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
+* [#9923](http://dev.ckeditor.com/ticket/9923): HiDPI support in the editor UI. HiDPI icons for [Moono skin](http://ckeditor.com/addon/moono) added.
+* [#8031](http://dev.ckeditor.com/ticket/8031): Handle `required` attributes on `<textarea>` elements — introduced [`editor.required`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-required) event.
+* [#10280](http://dev.ckeditor.com/ticket/10280): Ability to replace `<textarea>` elements with the inline editor.
+
+Fixed Issues:
+
+* [#10599](http://dev.ckeditor.com/ticket/10599): [Indent](http://ckeditor.com/addon/indent) plugin is no longer required by the [List](http://ckeditor.com/addon/list) plugin.
+* [#10370](http://dev.ckeditor.com/ticket/10370): Inconsistency in data events between framed and inline editors.
+* [#10438](http://dev.ckeditor.com/ticket/10438): [FF, IE] No selection is done on an editable element on executing [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData).
+
+## CKEditor 4.1.3
+
+New Features:
+
+* Added new translation: Indonesian.
+
+Fixed Issues:
+
+* [#10644](http://dev.ckeditor.com/ticket/10644): Fixed a critical bug when pasting plain text in Blink-based browsers.
+* [#5189](http://dev.ckeditor.com/ticket/5189): [Find/Replace](http://ckeditor.com/addon/find) dialog window: rename "Cancel" button to "Close".
+* [#10562](http://dev.ckeditor.com/ticket/10562): [Housekeeping] Unified CSS gradient filter formats in the [Moono](http://ckeditor.com/addon/moono) skin.
+* [#10537](http://dev.ckeditor.com/ticket/10537): Advanced Content Filter should register a default rule for [`config.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-shiftEnterMode).
+* [#10610](http://dev.ckeditor.com/ticket/10610): [`CKEDITOR.dialog.addIframe()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog-static-method-addIframe) incorrectly sets the iframe size in dialog windows.
+
+## CKEditor 4.1.2
+
+New Features:
+
+* Added new translation: Sinhala.
+
+Fixed Issues:
+
+* [#10339](http://dev.ckeditor.com/ticket/10339): Fixed: Error thrown when inserted data was totally stripped out after filtering and processing.
+* [#10298](http://dev.ckeditor.com/ticket/10298): Fixed: Data processor breaks attributes containing protected parts.
+* [#10367](http://dev.ckeditor.com/ticket/10367): Fixed: [`editable.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertText) loses characters when `RegExp` replace controls are being inserted.
+* [#10165](http://dev.ckeditor.com/ticket/10165): [IE] Access denied error when `document.domain` has been altered.
+* [#9761](http://dev.ckeditor.com/ticket/9761): Update the *Backspace* key state in [`keystrokeHandler.blockedKeystrokes`](http://docs.ckeditor.com/#!/api/CKEDITOR.keystrokeHandler-property-blockedKeystrokes) when calling [`editor.setReadOnly()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setReadOnly).
+* [#6504](http://dev.ckeditor.com/ticket/6504): Fixed: Race condition while loading several [`config.customConfig`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-customConfig) files.
+* [#10146](http://dev.ckeditor.com/ticket/10146): [Firefox] Empty lines are being removed while [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) is [`CKEDITOR.ENTER_BR`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-ENTER_BR).
+* [#10360](http://dev.ckeditor.com/ticket/10360): Fixed: ARIA `role="application"` should not be used for dialog windows.
+* [#10361](http://dev.ckeditor.com/ticket/10361): Fixed: ARIA `role="application"` should not be used for floating panels.
+* [#10510](http://dev.ckeditor.com/ticket/10510): Introduced unique voice labels to differentiate between different editor instances.
+* [#9945](http://dev.ckeditor.com/ticket/9945): [iOS] Scrolling not possible on iPad.
+* [#10389](http://dev.ckeditor.com/ticket/10389): Fixed: Invalid HTML in the "Text and Table" template.
+* [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin user interface was changed to match CKEditor 4 style.
+
+## CKEditor 4.1.1
+
+New Features:
+
+* Added new translation: Albanian.
+
+Fixed Issues:
+
+* [#10172](http://dev.ckeditor.com/ticket/10172): Pressing *Delete* or *Backspace* in an empty table cell moves the cursor to the next/previous cell.
+* [#10219](http://dev.ckeditor.com/ticket/10219): Error thrown when destroying an editor instance in parallel with a `mouseup` event.
+* [#10265](http://dev.ckeditor.com/ticket/10265): Wrong loop type in the [File Browser](http://ckeditor.com/addon/filebrowser) plugin.
+* [#10249](http://dev.ckeditor.com/ticket/10249): Wrong undo/redo states at start.
+* [#10268](http://dev.ckeditor.com/ticket/10268): [Show Blocks](http://ckeditor.com/addon/showblocks) does not recover after switching to Source view.
+* [#9995](http://dev.ckeditor.com/ticket/9995): HTML code in the `<textarea>` should not be modified by the [`htmlDataProcessor`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor).
+* [#10320](http://dev.ckeditor.com/ticket/10320): [Justify](http://ckeditor.com/addon/justify) plugin should add elements to Advanced Content Filter based on current [Enter mode](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode).
+* [#10260](http://dev.ckeditor.com/ticket/10260): Fixed: Advanced Content Filter blocks [`tabSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-tabSpaces). Unified `data-cke-*` attributes filtering.
+* [#10315](http://dev.ckeditor.com/ticket/10315): [WebKit] [Undo manager](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager) should not record snapshots after a filling character was added/removed.
+* [#10291](http://dev.ckeditor.com/ticket/10291): [WebKit] Space after a filling character should be secured.
+* [#10330](http://dev.ckeditor.com/ticket/10330): [WebKit] The filling character is not removed on `keydown` in specific cases.
+* [#10285](http://dev.ckeditor.com/ticket/10285): Fixed: Styled text pasted from MS Word causes an infinite loop.
+* [#10131](http://dev.ckeditor.com/ticket/10131): Fixed: [`undoManager.update()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager-method-update) does not refresh the command state.
+* [#10337](http://dev.ckeditor.com/ticket/10337): Fixed: Unable to remove `<s>` using [Remove Format](http://ckeditor.com/addon/removeformat).
+
+## CKEditor 4.1
+
+Fixed Issues:
+
+* [#10192](http://dev.ckeditor.com/ticket/10192): Closing lists with the *Enter* key does not work with [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) in several cases.
+* [#10191](http://dev.ckeditor.com/ticket/10191): Fixed allowed content rules unification, so the [`filter.allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-property-allowedContent) property always contains rules in the same format.
+* [#10224](http://dev.ckeditor.com/ticket/10224): Advanced Content Filter does not remove non-empty `<a>` elements anymore.
+* Minor issues in plugin integration with Advanced Content Filter:
+ * [#10166](http://dev.ckeditor.com/ticket/10166): Added transformation from the `align` attribute to `float` style to preserve backward compatibility after the introduction of Advanced Content Filter.
+ * [#10195](http://dev.ckeditor.com/ticket/10195): [Image](http://ckeditor.com/addon/image) plugin no longer registers rules for links to Advanced Content Filter.
+ * [#10213](http://dev.ckeditor.com/ticket/10213): [Justify](http://ckeditor.com/addon/justify) plugin is now correctly registering rules to Advanced Content Filter when [`config.justifyClasses`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-justifyClasses) is defined.
+
+## CKEditor 4.1 RC
+
+New Features:
+
+* [#9829](http://dev.ckeditor.com/ticket/9829): Advanced Content Filter - data and features activation based on editor configuration.
+
+ Brand new data filtering system that works in 2 modes:
+
+ * Based on loaded features (toolbar items, plugins) - the data will be filtered according to what the editor in its
+ current configuration can handle.
+ * Based on [`config.allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-allowedContent) rules - the data
+ will be filtered and the editor features (toolbar items, commands, keystrokes) will be enabled if they are allowed.
+
+ See the `datafiltering.html` sample, [guides](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) and [`CKEDITOR.filter` API documentation](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
+* [#9387](http://dev.ckeditor.com/ticket/9387): Reintroduced [Shared Spaces](http://ckeditor.com/addon/sharedspace) - the ability to display toolbar and bottom editor space in selected locations and to share them by different editor instances.
+* [#9907](http://dev.ckeditor.com/ticket/9907): Added the [`contentPreview`](http://docs.ckeditor.com/#!/api/CKEDITOR-event-contentPreview) event for preview data manipulation.
+* [#9713](http://dev.ckeditor.com/ticket/9713): Introduced the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin that brings raw HTML editing for inline editor instances.
+* Included in [#9829](http://dev.ckeditor.com/ticket/9829): Introduced new events, [`toHtml`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-toHtml) and [`toDataFormat`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-toDataFormat), allowing for better integration with data processing.
+* [#9981](http://dev.ckeditor.com/ticket/9981): Added ability to filter [`htmlParser.fragment`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.fragment), [`htmlParser.element`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.element) etc. by many [`htmlParser.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter)s before writing structure to an HTML string.
+* Included in [#10103](http://dev.ckeditor.com/ticket/10103):
+ * Introduced the [`editor.status`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-status) property to make it easier to check the current status of the editor.
+ * Default [`command`](http://docs.ckeditor.com/#!/api/CKEDITOR.command) state is now [`CKEDITOR.TRISTATE_DISABLE`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-TRISTATE_DISABLED). It will be activated on [`editor.instanceReady`](http://docs.ckeditor.com/#!/api/CKEDITOR-event-instanceReady) or immediately after being added if the editor is already initialized.
+* [#9796](http://dev.ckeditor.com/ticket/9796): Introduced `<s>` as a default tag for strikethrough, which replaces obsolete `<strike>` in HTML5.
+
+## CKEditor 4.0.3
+
+Fixed Issues:
+
+* [#10196](http://dev.ckeditor.com/ticket/10196): Fixed context menus not opening with keyboard shortcuts when [Autogrow](http://ckeditor.com/addon/autogrow) is enabled.
+* [#10212](http://dev.ckeditor.com/ticket/10212): [IE7-10] Undo command throws errors after multiple switches between Source and WYSIWYG view.
+* [#10219](http://dev.ckeditor.com/ticket/10219): [Inline editor] Error thrown after calling [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy).
+
+## CKEditor 4.0.2
+
+Fixed Issues:
+
+* [#9779](http://dev.ckeditor.com/ticket/9779): Fixed overriding [`CKEDITOR.getUrl()`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl) with `CKEDITOR_GETURL`.
+* [#9772](http://dev.ckeditor.com/ticket/9772): Custom buttons in the dialog window footer have different look and size ([Moono](http://ckeditor.com/addon/moono), [Kama](http://ckeditor.com/addon/kama) skins).
+* [#9029](http://dev.ckeditor.com/ticket/9029): Custom styles added with the [`stylesSet.add()`](http://docs.ckeditor.com/#!/api/CKEDITOR.stylesSet-method-add) are displayed in the wrong order.
+* [#9887](http://dev.ckeditor.com/ticket/9887): Disable [Magic Line](http://ckeditor.com/addon/magicline) when [`editor.readOnly`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) is set.
+* [#9882](http://dev.ckeditor.com/ticket/9882): Fixed empty document title on [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) if set via the Document Properties dialog window.
+* [#9773](http://dev.ckeditor.com/ticket/9773): Fixed rendering problems with selection fields in the Kama skin.
+* [#9851](http://dev.ckeditor.com/ticket/9851): The [`selectionChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-selectionChange) event is not fired when mouse selection ended outside editable.
+* [#9903](http://dev.ckeditor.com/ticket/9903): [Inline editor] Bad positioning of floating space with page horizontal scroll.
+* [#9872](http://dev.ckeditor.com/ticket/9872): [`editor.checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) returns `true` when called onload. Removed the obsolete `editor.mayBeDirty` flag.
+* [#9893](http://dev.ckeditor.com/ticket/9893): [IE] Fixed broken toolbar when editing mixed direction content in Quirks mode.
+* [#9845](http://dev.ckeditor.com/ticket/9845): Fixed TAB navigation in the [Link](http://ckeditor.com/addon/link) dialog window when the Anchor option is used and no anchors are available.
+* [#9883](http://dev.ckeditor.com/ticket/9883): Maximizing was making the entire page editable with [divarea](http://ckeditor.com/addon/divarea)-based editors.
+* [#9940](http://dev.ckeditor.com/ticket/9940): [Firefox] Navigating back to a page with the editor was making the entire page editable.
+* [#9966](http://dev.ckeditor.com/ticket/9966): Fixed: Unable to type square brackets with French keyboard layout. Changed [Magic Line](http://ckeditor.com/addon/magicline) keystrokes.
+* [#9507](http://dev.ckeditor.com/ticket/9507): [Firefox] Selection is moved before editable position when the editor is focused for the first time.
+* [#9947](http://dev.ckeditor.com/ticket/9947): [WebKit] Editor overflows parent container in some edge cases.
+* [#10105](http://dev.ckeditor.com/ticket/10105): Fixed: Broken [sourcearea](http://ckeditor.com/addon/sourcearea) view when an RTL language is set.
+* [#10123](http://dev.ckeditor.com/ticket/10123): [WebKit] Fixed: Several dialog windows have broken layout since the latest WebKit release.
+* [#10152](http://dev.ckeditor.com/ticket/10152): Fixed: Invalid ARIA property used on menu items.
+
+## CKEditor 4.0.1.1
+
+Fixed Issues:
+
+* Security update: Added protection against XSS attack and possible path disclosure in the PHP sample.
+
+## CKEditor 4.0.1
+
+Fixed Issues:
+
+* [#9655](http://dev.ckeditor.com/ticket/9655): Support for IE Quirks Mode in the new [Moono skin](http://ckeditor.com/addon/moono).
+* Accessibility issues (mainly in inline editor): [#9364](http://dev.ckeditor.com/ticket/9364), [#9368](http://dev.ckeditor.com/ticket/9368), [#9369](http://dev.ckeditor.com/ticket/9369), [#9370](http://dev.ckeditor.com/ticket/9370), [#9541](http://dev.ckeditor.com/ticket/9541), [#9543](http://dev.ckeditor.com/ticket/9543), [#9841](http://dev.ckeditor.com/ticket/9841), [#9844](http://dev.ckeditor.com/ticket/9844).
+* [Magic Line](http://ckeditor.com/addon/magicline) plugin:
+ * [#9481](http://dev.ckeditor.com/ticket/9481): Added accessibility support for Magic Line.
+ * [#9509](http://dev.ckeditor.com/ticket/9509): Added Magic Line support for forms.
+ * [#9573](http://dev.ckeditor.com/ticket/9573): Magic Line does not disappear on `mouseout` in a specific case.
+* [#9754](http://dev.ckeditor.com/ticket/9754): [WebKit] Cutting & pasting simple unformatted text generates an inline wrapper in WebKit browsers.
+* [#9456](http://dev.ckeditor.com/ticket/9456): [Chrome] Properly paste bullet list style from MS Word.
+* [#9699](http://dev.ckeditor.com/ticket/9699), [#9758](http://dev.ckeditor.com/ticket/9758): Improved selection locking when selecting by dragging.
+* Context menu:
+ * [#9712](http://dev.ckeditor.com/ticket/9712): Opening the context menu destroys editor focus.
+ * [#9366](http://dev.ckeditor.com/ticket/9366): Context menu should be displayed over the floating toolbar.
+ * [#9706](http://dev.ckeditor.com/ticket/9706): Context menu generates a JavaScript error in inline mode when the editor is attached to a header element.
+* [#9800](http://dev.ckeditor.com/ticket/9800): Hide float panel when resizing the window.
+* [#9721](http://dev.ckeditor.com/ticket/9721): Padding in content of div-based editor puts the editing area under the bottom UI space.
+* [#9528](http://dev.ckeditor.com/ticket/9528): Host page `box-sizing` style should not influence the editor UI elements.
+* [#9503](http://dev.ckeditor.com/ticket/9503): [Form Elements](http://ckeditor.com/addon/forms) plugin adds context menu listeners only on supported input types. Added support for `tel`, `email`, `search` and `url` input types.
+* [#9769](http://dev.ckeditor.com/ticket/9769): Improved floating toolbar positioning in a narrow window.
+* [#9875](http://dev.ckeditor.com/ticket/9875): Table dialog window does not populate width correctly.
+* [#8675](http://dev.ckeditor.com/ticket/8675): Deleting cells in a nested table removes the outer table cell.
+* [#9815](http://dev.ckeditor.com/ticket/9815): Cannot edit dialog window fields in an editor initialized in the jQuery UI modal dialog.
+* [#8888](http://dev.ckeditor.com/ticket/8888): CKEditor dialog windows do not show completely in a small window.
+* [#9360](http://dev.ckeditor.com/ticket/9360): [Inline editor] Blocks shown for a `<div>` element stay permanently even after the user exits editing the `<div>`.
+* [#9531](http://dev.ckeditor.com/ticket/9531): [Firefox & Inline editor] Toolbar is lost when closing the Format drop-down list by clicking its button.
+* [#9553](http://dev.ckeditor.com/ticket/9553): Table width incorrectly set when the `border-width` style is specified.
+* [#9594](http://dev.ckeditor.com/ticket/9594): Cannot tab past CKEditor when it is in read-only mode.
+* [#9658](http://dev.ckeditor.com/ticket/9658): [IE9] Justify not working on selected images.
+* [#9686](http://dev.ckeditor.com/ticket/9686): Added missing contents styles for `<pre>` elements.
+* [#9709](http://dev.ckeditor.com/ticket/9709): [Paste from Word](http://ckeditor.com/addon/pastefromword) should not depend on configuration from other styles.
+* [#9726](http://dev.ckeditor.com/ticket/9726): Removed [Color Dialog](http://ckeditor.com/addon/colordialog) plugin dependency from [Table Tools](http://ckeditor.com/addon/tabletools).
+* [#9765](http://dev.ckeditor.com/ticket/9765): Toolbar Collapse command documented incorrectly in the [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp) dialog window.
+* [#9771](http://dev.ckeditor.com/ticket/9771): [WebKit & Opera] Fixed scrolling issues when pasting.
+* [#9787](http://dev.ckeditor.com/ticket/9787): [IE9] `onChange` is not fired for checkboxes in dialogs.
+* [#9842](http://dev.ckeditor.com/ticket/9842): [Firefox 17] When opening a toolbar menu for the first time and pressing the *Down Arrow* key, focus goes to the next toolbar button instead of the menu options.
+* [#9847](http://dev.ckeditor.com/ticket/9847): [Elements Path](http://ckeditor.com/addon/elementspath) should not be initialized in the inline editor.
+* [#9853](http://dev.ckeditor.com/ticket/9853): [`editor.addRemoveFormatFilter()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-addRemoveFormatFilter) is exposed before it really works.
+* [#8893](http://dev.ckeditor.com/ticket/8893): Value of the [`pasteFromWordCleanupFile`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordCleanupFile) configuration option is now taken from the instance configuration.
+* [#9693](http://dev.ckeditor.com/ticket/9693): Removed "Live Preview" checkbox from UI color picker.
+
+
+## CKEditor 4.0
+
+The first stable release of the new CKEditor 4 code line.
+
+The CKEditor JavaScript API has been kept compatible with CKEditor 4, whenever
+possible. The list of relevant changes can be found in the [API Changes page of
+the CKEditor 4 documentation][1].
+
+[1]: http://docs.ckeditor.com/#!/guide/dev_api_changes "API Changes"
Added: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/README.md
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/README.md (rev 0)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/README.md 2013-09-20 00:06:19 UTC (rev 12068)
@@ -0,0 +1,39 @@
+CKEditor 4
+==========
+
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+http://ckeditor.com - See LICENSE.md for license information.
+
+CKEditor is a text editor to be used inside web pages. It's not a replacement
+for desktop text editors like Word or OpenOffice, but a component to be used as
+part of web applications and websites.
+
+## Documentation
+
+The full editor documentation is available online at the following address:
+http://docs.ckeditor.com
+
+## Installation
+
+Installing CKEditor is an easy task. Just follow these simple steps:
+
+ 1. **Download** the latest version from the CKEditor website:
+ http://ckeditor.com. You should have already completed this step, but be
+ sure you have the very latest version.
+ 2. **Extract** (decompress) the downloaded file into the root of your website.
+
+**Note:** CKEditor is by default installed in the `ckeditor` folder. You can
+place the files in whichever you want though.
+
+## Checking Your Installation
+
+The editor comes with a few sample pages that can be used to verify that
+installation proceeded properly. Take a look at the `samples` directory.
+
+To test your installation, just call the following page at your website:
+
+ http://<your site>/<CKEditor installation path>/samples/index.html
+
+For example:
+
+ http://www.example.com/ckeditor/samples/index.html
Added: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/adapters/jquery.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/adapters/jquery.js (rev 0)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/adapters/jquery.js 2013-09-20 00:06:19 UTC (rev 12068)
@@ -0,0 +1,10 @@
+/*
+ Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+(function(a){CKEDITOR.config.jqueryOverrideVal="undefined"==typeof CKEDITOR.config.jqueryOverrideVal?!0:CKEDITOR.config.jqueryOverrideVal;"undefined"!=typeof a&&(a.extend(a.fn,{ckeditorGet:function(){var a=this.eq(0).data("ckeditorInstance");if(!a)throw"CKEditor is not initialized yet, use ckeditor() with a callback.";return a},ckeditor:function(g,d){if(!CKEDITOR.env.isCompatible)throw Error("The environment is incompatible.");if(!a.isFunction(g))var k=d,d=g,g=k;var i=[],d=d||{};this.each(function(){var b=
+a(this),c=b.data("ckeditorInstance"),f=b.data("_ckeditorInstanceLock"),h=this,j=new a.Deferred;i.push(j.promise());if(c&&!f)g&&g.apply(c,[this]),j.resolve();else if(f)c.once("instanceReady",function(){setTimeout(function(){c.element?(c.element.$==h&&g&&g.apply(c,[h]),j.resolve()):setTimeout(arguments.callee,100)},0)},null,null,9999);else{if(d.autoUpdateElement||"undefined"==typeof d.autoUpdateElement&&CKEDITOR.config.autoUpdateElement)d.autoUpdateElementJquery=!0;d.autoUpdateElement=!1;b.data("_ckeditorInstanceLock",
+!0);c=a(this).is("textarea")?CKEDITOR.replace(h,d):CKEDITOR.inline(h,d);b.data("ckeditorInstance",c);c.on("instanceReady",function(d){var e=d.editor;setTimeout(function(){if(e.element){d.removeListener();e.on("dataReady",function(){b.trigger("dataReady.ckeditor",[e])});e.on("setData",function(a){b.trigger("setData.ckeditor",[e,a.data])});e.on("getData",function(a){b.trigger("getData.ckeditor",[e,a.data])},999);e.on("destroy",function(){b.trigger("destroy.ckeditor",[e])});e.on("save",function(){a(h.form).submit();
+return!1},null,null,20);if(e.config.autoUpdateElementJquery&&b.is("textarea")&&a(h.form).length){var c=function(){b.ckeditor(function(){e.updateElement()})};a(h.form).submit(c);a(h.form).bind("form-pre-serialize",c);b.bind("destroy.ckeditor",function(){a(h.form).unbind("submit",c);a(h.form).unbind("form-pre-serialize",c)})}e.on("destroy",function(){b.removeData("ckeditorInstance")});b.removeData("_ckeditorInstanceLock");b.trigger("instanceReady.ckeditor",[e]);g&&g.apply(e,[h]);j.resolve()}else setTimeout(arguments.callee,
+100)},0)},null,null,9999)}});var f=new a.Deferred;this.promise=f.promise();a.when.apply(this,i).then(function(){f.resolve()});this.editor=this.eq(0).data("ckeditorInstance");return this}}),CKEDITOR.config.jqueryOverrideVal&&(a.fn.val=CKEDITOR.tools.override(a.fn.val,function(g){return function(d){if(arguments.length){var k=this,i=[],f=this.each(function(){var b=a(this),c=b.data("ckeditorInstance");if(b.is("textarea")&&c){var f=new a.Deferred;c.setData(d,function(){f.resolve()});i.push(f.promise());
+return!0}return g.call(b,d)});if(i.length){var b=new a.Deferred;a.when.apply(this,i).done(function(){b.resolveWith(k)});return b.promise()}return f}var f=a(this).eq(0),c=f.data("ckeditorInstance");return f.is("textarea")&&c?c.getData():g.call(f)}})))})(window.jQuery);
\ No newline at end of file
Property changes on: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/adapters/jquery.js
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/ckeditor.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/ckeditor.js 2013-09-18 16:17:30 UTC (rev 12067)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/ckeditor.js 2013-09-20 00:06:19 UTC (rev 12068)
@@ -2,73 +2,74 @@
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;window.CKEDITOR||(window.CKEDITOR=function(){var b={timestamp:"D2LI",version:"4.1",revision:"80c139aa",rnd:Math.floor(900*Math.random())+100,_:{pending:[]},status:"unloaded",basePath:function(){var a=window.CKEDITOR_BASEPATH||"";if(!a)for(var b=document.getElementsByTagName("script"),d=0;d<b.length;d++){var c=b[d].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(c){a=c[1];break}}-1==a.indexOf(":/")&&(a=0===a.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+a:location.href.match(/^[^\?]*\/(?:)/)[0]+
+(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;window.CKEDITOR||(window.CKEDITOR=function(){var b={timestamp:"D8AD",version:"4.2.1",revision:"5010dd4",rnd:Math.floor(900*Math.random())+100,_:{pending:[]},status:"unloaded",basePath:function(){var a=window.CKEDITOR_BASEPATH||"";if(!a)for(var b=document.getElementsByTagName("script"),e=0;e<b.length;e++){var c=b[e].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(c){a=c[1];break}}-1==a.indexOf(":/")&&(a=0===a.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+a:location.href.match(/^[^\?]*\/(?:)/)[0]+
a);if(!a)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return a}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&("/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a))&&(a+=(0<=a.indexOf("?")?"&":"?")+"t="+this.timestamp);return a},domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",a,
-!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(d){}}function b(){for(var a;a=d.shift();)a()}var d=[];return function(b){d.push(b);"complete"===document.readyState&&setTimeout(a,1);if(1==d.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);b=!1;try{b=
-!window.frameElement}catch(e){}if(document.documentElement.doScroll&&b){var c=function(){try{document.documentElement.doScroll("left")}catch(b){setTimeout(c,1);return}a()};c()}}}}()},c=window.CKEDITOR_GETURL;if(c){var a=b.getUrl;b.getUrl=function(g){return c.call(b,g)||a.call(b,g)}}return b}());
-CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(b){var c=CKEDITOR.event.prototype,a;for(a in c)b[a]==void 0&&(b[a]=c[a])},CKEDITOR.event.prototype=function(){function b(g){var b=c(this);return b[g]||(b[g]=new a(g))}var c=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},a=function(a){this.name=a;this.listeners=[]};a.prototype={getListenerIndex:function(a){for(var b=0,d=this.listeners;b<d.length;b++)if(d[b].fn==a)return b;return-1}};
-return{define:function(a,e){var d=b.call(this,a);CKEDITOR.tools.extend(d,e,true)},on:function(a,e,d,c,i){function j(b,m,o,n){b={name:a,sender:this,editor:b,data:m,listenerData:c,stop:o,cancel:n,removeListener:l};return e.call(d,b)===false?false:b.data}function l(){m.removeListener(a,e)}var n=b.call(this,a);if(n.getListenerIndex(e)<0){n=n.listeners;d||(d=this);isNaN(i)&&(i=10);var m=this;j.fn=e;j.priority=i;for(var o=n.length-1;o>=0;o--)if(n[o].priority<=i){n.splice(o+1,0,j);return{removeListener:l}}n.unshift(j)}return{removeListener:l}},
-once:function(){var a=arguments[1];arguments[1]=function(b){b.removeListener();return a.apply(this,arguments)};return this.on.apply(this,arguments)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,b=function(){a=1},d=0,f=function(){d=1};return function(i,j,l){var n=c(this)[i],i=a,m=d;a=d=0;if(n){var o=n.listeners;if(o.length)for(var o=o.slice(0),k,h=0;h<o.length;h++){if(n.errorProof)try{k=o[h].call(this,
-l,j,b,f)}catch(s){}else k=o[h].call(this,l,j,b,f);k===false?d=1:typeof k!="undefined"&&(j=k);if(a||d)break}}j=d?false:typeof j=="undefined"?true:j;a=i;d=m;return j}}(),fireOnce:function(a,b,d){b=this.fire(a,b,d);delete c(this)[a];return b},removeListener:function(a,b){var d=c(this)[a];if(d){var f=d.getListenerIndex(b);f>=0&&d.listeners.splice(f,1)}},removeAllListeners:function(){var a=c(this),b;for(b in a)delete a[b]},hasListeners:function(a){return(a=c(this)[a])&&a.listeners.length>0}}}());
+!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(e){}}function b(){for(var a;a=e.shift();)a()}var e=[];return function(b){e.push(b);"complete"===document.readyState&&setTimeout(a,1);if(1==e.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);b=!1;try{b=
+!window.frameElement}catch(d){}if(document.documentElement.doScroll&&b){var c=function(){try{document.documentElement.doScroll("left")}catch(b){setTimeout(c,1);return}a()};c()}}}}()},c=window.CKEDITOR_GETURL;if(c){var a=b.getUrl;b.getUrl=function(f){return c.call(b,f)||a.call(b,f)}}return b}());
+CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(b){var c=CKEDITOR.event.prototype,a;for(a in c)b[a]==void 0&&(b[a]=c[a])},CKEDITOR.event.prototype=function(){function b(f){var b=c(this);return b[f]||(b[f]=new a(f))}var c=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},a=function(a){this.name=a;this.listeners=[]};a.prototype={getListenerIndex:function(a){for(var b=0,e=this.listeners;b<e.length;b++)if(e[b].fn==a)return b;return-1}};
+return{define:function(a,d){var e=b.call(this,a);CKEDITOR.tools.extend(e,d,true)},on:function(a,d,e,c,j){function i(b,g,m,q){b={name:a,sender:this,editor:b,data:g,listenerData:c,stop:m,cancel:q,removeListener:k};return d.call(e,b)===false?false:b.data}function k(){q.removeListener(a,d)}var m=b.call(this,a);if(m.getListenerIndex(d)<0){m=m.listeners;e||(e=this);isNaN(j)&&(j=10);var q=this;i.fn=d;i.priority=j;for(var r=m.length-1;r>=0;r--)if(m[r].priority<=j){m.splice(r+1,0,i);return{removeListener:k}}m.unshift(i)}return{removeListener:k}},
+once:function(){var a=arguments[1];arguments[1]=function(b){b.removeListener();return a.apply(this,arguments)};return this.on.apply(this,arguments)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,b=function(){a=1},e=0,h=function(){e=1};return function(j,i,k){var m=c(this)[j],j=a,q=e;a=e=0;if(m){var r=m.listeners;if(r.length)for(var r=r.slice(0),l,g=0;g<r.length;g++){if(m.errorProof)try{l=r[g].call(this,
+k,i,b,h)}catch(p){}else l=r[g].call(this,k,i,b,h);l===false?e=1:typeof l!="undefined"&&(i=l);if(a||e)break}}i=e?false:typeof i=="undefined"?true:i;a=j;e=q;return i}}(),fireOnce:function(a,b,e){b=this.fire(a,b,e);delete c(this)[a];return b},removeListener:function(a,b){var e=c(this)[a];if(e){var h=e.getListenerIndex(b);h>=0&&e.listeners.splice(h,1)}},removeAllListeners:function(){var a=c(this),b;for(b in a)delete a[b]},hasListeners:function(a){return(a=c(this)[a])&&a.listeners.length>0}}}());
CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=function(b,c){b in{instanceReady:1,loaded:1}&&(this[b]=true);return CKEDITOR.event.prototype.fire.call(this,b,c,this)},CKEDITOR.editor.prototype.fireOnce=function(b,c){b in{instanceReady:1,loaded:1}&&(this[b]=true);return CKEDITOR.event.prototype.fireOnce.call(this,b,c,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype));
-CKEDITOR.env||(CKEDITOR.env=function(){var b=navigator.userAgent.toLowerCase(),c=window.opera,a={ie:eval("/*@cc_on!@*/false"),opera:!!c&&c.version,webkit:b.indexOf(" applewebkit/")>-1,air:b.indexOf(" adobeair/")>-1,mac:b.indexOf("macintosh")>-1,quirks:document.compatMode=="BackCompat",mobile:b.indexOf("mobile")>-1,iOS:/(ipad|iphone|ipod)/.test(b),isCustomDomain:function(){if(!this.ie)return false;var a=document.domain,b=window.location.hostname;return a!=b&&a!="["+b+"]"},secure:location.protocol==
-"https:"};a.gecko=navigator.product=="Gecko"&&!a.webkit&&!a.opera;if(a.webkit)b.indexOf("chrome")>-1?a.chrome=true:a.safari=true;var g=0;if(a.ie){g=a.quirks||!document.documentMode?parseFloat(b.match(/msie (\d+)/)[1]):document.documentMode;a.ie9Compat=g==9;a.ie8Compat=g==8;a.ie7Compat=g==7;a.ie6Compat=g<7||a.quirks}if(a.gecko){var e=b.match(/rv:([\d\.]+)/);if(e){e=e[1].split(".");g=e[0]*1E4+(e[1]||0)*100+(e[2]||0)*1}}a.opera&&(g=parseFloat(c.version()));a.air&&(g=parseFloat(b.match(/ adobeair\/(\d+)/)[1]));
-a.webkit&&(g=parseFloat(b.match(/ applewebkit\/(\d+)/)[1]));a.version=g;a.isCompatible=a.iOS&&g>=534||!a.mobile&&(a.ie&&g>6||a.gecko&&g>=10801||a.opera&&g>=9.5||a.air&&g>=1||a.webkit&&g>=522||false);a.cssClass="cke_browser_"+(a.ie?"ie":a.gecko?"gecko":a.opera?"opera":a.webkit?"webkit":"unknown");if(a.quirks)a.cssClass=a.cssClass+" cke_browser_quirks";if(a.ie){a.cssClass=a.cssClass+(" cke_browser_ie"+(a.quirks||a.version<7?"6":a.version));if(a.quirks)a.cssClass=a.cssClass+" cke_browser_iequirks"}if(a.gecko)if(g<
-10900)a.cssClass=a.cssClass+" cke_browser_gecko18";else if(g<=11E3)a.cssClass=a.cssClass+" cke_browser_gecko19";if(a.air)a.cssClass=a.cssClass+" cke_browser_air";return a}());
+CKEDITOR.env||(CKEDITOR.env=function(){var b=navigator.userAgent.toLowerCase(),c=window.opera,a={ie:eval("/*@cc_on!@*/false"),opera:!!c&&c.version,webkit:b.indexOf(" applewebkit/")>-1,air:b.indexOf(" adobeair/")>-1,mac:b.indexOf("macintosh")>-1,quirks:document.compatMode=="BackCompat",mobile:b.indexOf("mobile")>-1,iOS:/(ipad|iphone|ipod)/.test(b),isCustomDomain:function(){if(!this.ie)return false;var a=document.domain,f=window.location.hostname;return a!=f&&a!="["+f+"]"},secure:location.protocol==
+"https:"};a.gecko=navigator.product=="Gecko"&&!a.webkit&&!a.opera;if(a.webkit)b.indexOf("chrome")>-1?a.chrome=true:a.safari=true;var f=0;if(a.ie){f=a.quirks||!document.documentMode?parseFloat(b.match(/msie (\d+)/)[1]):document.documentMode;a.ie9Compat=f==9;a.ie8Compat=f==8;a.ie7Compat=f==7;a.ie6Compat=f<7||a.quirks&&f<10}if(a.gecko){var d=b.match(/rv:([\d\.]+)/);if(d){d=d[1].split(".");f=d[0]*1E4+(d[1]||0)*100+(d[2]||0)*1}}a.opera&&(f=parseFloat(c.version()));a.air&&(f=parseFloat(b.match(/ adobeair\/(\d+)/)[1]));
+a.webkit&&(f=parseFloat(b.match(/ applewebkit\/(\d+)/)[1]));a.version=f;a.isCompatible=a.iOS&&f>=534||!a.mobile&&(a.ie&&f>6||a.gecko&&f>=10801||a.opera&&f>=9.5||a.air&&f>=1||a.webkit&&f>=522||false);a.hidpi=window.devicePixelRatio>=2;a.cssClass="cke_browser_"+(a.ie?"ie":a.gecko?"gecko":a.opera?"opera":a.webkit?"webkit":"unknown");if(a.quirks)a.cssClass=a.cssClass+" cke_browser_quirks";if(a.ie){a.cssClass=a.cssClass+(" cke_browser_ie"+(a.quirks||a.version<7?"6":a.version));if(a.quirks)a.cssClass=a.cssClass+
+" cke_browser_iequirks"}if(a.gecko)if(f<10900)a.cssClass=a.cssClass+" cke_browser_gecko18";else if(f<=11E3)a.cssClass=a.cssClass+" cke_browser_gecko19";if(a.air)a.cssClass=a.cssClass+" cke_browser_air";if(a.iOS)a.cssClass=a.cssClass+" cke_browser_ios";if(a.hidpi)a.cssClass=a.cssClass+" cke_hidpi";return a}());
"unloaded"==CKEDITOR.status&&function(){CKEDITOR.event.implementOn(CKEDITOR);CKEDITOR.loadFullCore=function(){if(CKEDITOR.status!="basic_ready")CKEDITOR.loadFullCore._load=1;else{delete CKEDITOR.loadFullCore;var b=document.createElement("script");b.type="text/javascript";b.src=CKEDITOR.basePath+"ckeditor.js";document.getElementsByTagName("head")[0].appendChild(b)}};CKEDITOR.loadFullCoreTimeout=0;CKEDITOR.add=function(b){(this._.pending||(this._.pending=[])).push(b)};(function(){CKEDITOR.domReady(function(){var b=
CKEDITOR.loadFullCore,c=CKEDITOR.loadFullCoreTimeout;if(b){CKEDITOR.status="basic_ready";b&&b._load?b():c&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},c*1E3)}})})();CKEDITOR.status="basic_loaded"}();CKEDITOR.dom={};
-(function(){var b=[],c=CKEDITOR.env.gecko?"-moz-":CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.opera?"-o-":CKEDITOR.env.ie?"-ms-":"";CKEDITOR.on("reset",function(){b=[]});CKEDITOR.tools={arrayCompare:function(a,b){if(!a&&!b)return true;if(!a||!b||a.length!=b.length)return false;for(var e=0;e<a.length;e++)if(a[e]!=b[e])return false;return true},clone:function(a){var b;if(a&&a instanceof Array){b=[];for(var e=0;e<a.length;e++)b[e]=CKEDITOR.tools.clone(a[e]);return b}if(a===null||typeof a!="object"||
-a instanceof String||a instanceof Number||a instanceof Boolean||a instanceof Date||a instanceof RegExp)return a;b=new a.constructor;for(e in a)b[e]=CKEDITOR.tools.clone(a[e]);return b},capitalize:function(a){return a.charAt(0).toUpperCase()+a.substring(1).toLowerCase()},extend:function(a){var b=arguments.length,e,d;if(typeof(e=arguments[b-1])=="boolean")b--;else if(typeof(e=arguments[b-2])=="boolean"){d=arguments[b-1];b=b-2}for(var c=1;c<b;c++){var i=arguments[c],j;for(j in i)if(e===true||a[j]==void 0)if(!d||
-j in d)a[j]=i[j]}return a},prototypedCopy:function(a){var b=function(){};b.prototype=a;return new b},copy:function(a){var b={},e;for(e in a)b[e]=a[e];return b},isArray:function(a){return!!a&&a instanceof Array},isEmpty:function(a){for(var b in a)if(a.hasOwnProperty(b))return false;return true},cssVendorPrefix:function(a,b,e){if(e)return c+a+":"+b+";"+a+":"+b;e={};e[a]=b;e[c+a]=b;return e},cssStyleToDomStyle:function(){var a=document.createElement("div").style,b=typeof a.cssFloat!="undefined"?"cssFloat":
-typeof a.styleFloat!="undefined"?"styleFloat":"float";return function(a){return a=="float"?b:a.replace(/-./g,function(a){return a.substr(1).toUpperCase()})}}(),buildStyleHtml:function(a){for(var a=[].concat(a),b,e=[],d=0;d<a.length;d++)if(b=a[d])/@import|[{}]/.test(b)?e.push("<style>"+b+"</style>"):e.push('<link type="text/css" rel=stylesheet href="'+b+'">');return e.join("")},htmlEncode:function(a){return(""+a).replace(/&/g,"&").replace(/>/g,">").replace(/</g,"<")},htmlEncodeAttr:function(a){return a.replace(/"/g,
-""").replace(/</g,"<").replace(/>/g,">")},getNextNumber:function(){var a=0;return function(){return++a}}(),getNextId:function(){return"cke_"+this.getNextNumber()},override:function(a,b){var e=b(a);e.prototype=a.prototype;return e},setTimeout:function(a,b,e,d,c){c||(c=window);e||(e=c);return c.setTimeout(function(){d?a.apply(e,[].concat(d)):a.apply(e)},b||0)},trim:function(){var a=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(b){return b.replace(a,"")}}(),ltrim:function(){var a=/^[ \t\n\r]+/g;
-return function(b){return b.replace(a,"")}}(),rtrim:function(){var a=/[ \t\n\r]+$/g;return function(b){return b.replace(a,"")}}(),indexOf:function(a,b){if(typeof b=="function")for(var e=0,d=a.length;e<d;e++){if(b(a[e]))return e}else{if(a.indexOf)return a.indexOf(b);e=0;for(d=a.length;e<d;e++)if(a[e]===b)return e}return-1},search:function(a,b){var e=CKEDITOR.tools.indexOf(a,b);return e>=0?a[e]:null},bind:function(a,b){return function(){return a.apply(b,arguments)}},createClass:function(a){var b=a.$,
-e=a.base,d=a.privates||a._,c=a.proto,a=a.statics;!b&&(b=function(){e&&this.base.apply(this,arguments)});if(d)var i=b,b=function(){var a=this._||(this._={}),b;for(b in d){var g=d[b];a[b]=typeof g=="function"?CKEDITOR.tools.bind(g,this):g}i.apply(this,arguments)};if(e){b.prototype=this.prototypedCopy(e.prototype);b.prototype.constructor=b;b.base=e;b.baseProto=e.prototype;b.prototype.base=function(){this.base=e.prototype.base;e.apply(this,arguments);this.base=arguments.callee}}c&&this.extend(b.prototype,
-c,true);a&&this.extend(b,a,true);return b},addFunction:function(a,g){return b.push(function(){return a.apply(g||this,arguments)})-1},removeFunction:function(a){b[a]=null},callFunction:function(a){var g=b[a];return g&&g.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var a=/^-?\d+\.?\d*px$/,b;return function(e){b=CKEDITOR.tools.trim(e+"")+"px";return a.test(b)?b:e||""}}(),convertToPx:function(){var a;return function(b){if(!a){a=CKEDITOR.dom.element.createFromHtml('<div style="position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"></div>',
-CKEDITOR.document);CKEDITOR.document.getBody().append(a)}if(!/%$/.test(b)){a.setStyle("width",b);return a.$.clientWidth}return b}}(),repeat:function(a,b){return Array(b+1).join(a)},tryThese:function(){for(var a,b=0,e=arguments.length;b<e;b++){var d=arguments[b];try{a=d();break}catch(c){}}return a},genKey:function(){return Array.prototype.slice.call(arguments).join("-")},defer:function(a){return function(){var b=arguments,e=this;window.setTimeout(function(){a.apply(e,b)},0)}},normalizeCssText:function(a,
-b){var e=[],d,c=CKEDITOR.tools.parseCssText(a,true,b);for(d in c)e.push(d+":"+c[d]);e.sort();return e.length?e.join(";")+";":""},convertRgbT...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-18 16:17:33
|
Revision: 12067
http://sourceforge.net/p/xoops/svn/12067
Author: luciorota
Date: 2013-09-18 16:17:30 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
fixed some errors in ip_logs page
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-18 10:19:12 UTC (rev 12066)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-18 16:17:30 UTC (rev 12067)
@@ -764,17 +764,19 @@
$criteria->setSort('date');
$criteria->setOrder('DESC');
$ip_logs = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
- $ip_logs_count = $wfdownloads->getHandler('ip_log')->count($criteria);
+ $ip_logs_count = $wfdownloads->getHandler('ip_log')->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('ip_logs_count', $ip_logs_count);
unset($criteria);
// Get download info
if ($lid != 0) {
$download = $wfdownloads->getHandler('download')->get($lid);
- $downloadArray = $download->toArray();
- $GLOBALS['xoopsTpl']->assign('download', $download->toArray());
+ $download_array = $download->toArray();
+ $download_array['log_title'] = sprintf(_AM_WFD_LOG_FOR_LID, $download_array['title']);
+ $GLOBALS['xoopsTpl']->assign('download', $download_array);
}
+
// Get all logged users
$uidArray = array();
foreach($ip_logs as $ip_log) {
@@ -792,11 +794,8 @@
} else {
foreach($ip_logs as $ip_log){
$ip_log_array = $ip_log->toArray();
- if($ip_log_array['uid'] != 0 ) {
- $ip_log_array['uname'] = $userList[$ip_log_array['uid']];
- } else {
- $ip_log_array['uname'] = _AM_WFD_ANONYMOUS;
- }
+ $ip_log_array['uname'] = XoopsUserUtility::getUnameFromId($ip_log_array['uid']);//($ip_log_array['uid'] != 0) ? $userList[$ip_log_array['uid']] : _AM_WFD_ANONYMOUS;
+ $ip_log_array['date_timestamp'] = formatTimestamp($ip_log_array['date']);
$GLOBALS['xoopsTpl']->append('ip_logs', $ip_log_array);
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-18 10:19:12 UTC (rev 12066)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-18 16:17:30 UTC (rev 12067)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta (2013-09-17)</u></b>
+<b><u>=> Version 3.23 Beta (2013-09-18)</u></b>
- module standardization: header.php, admin/admin_header.php, xoops_version.php
- module standardization: standardize directories/files names/structures
- module standardization: standardize code headers
@@ -19,7 +19,7 @@
- added: breadcrumb class (luciorota)
- added: html tags compatible autosummary generator (luciorota)
- added: sort subcategories by cid or title or weight (luciorota)
-- added: improved letters choice bar (luciorota)
+- added: improved by letters choice bar (luciorota)
- added: wfdownloads_submit.html template for submit.php (luciorota)
- added: folder checker (mamba + luciorota)
- added: file checker (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html 2013-09-18 10:19:12 UTC (rev 12066)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html 2013-09-18 16:17:30 UTC (rev 12067)
@@ -1,29 +1,24 @@
<input type='button' value='<{$smarty.const._AM_WFD_BACK}>' onclick='history.go(-1)'>
-// IN PROGRESS
<fieldset>
<legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_IP_LOGS}></legend>
<{if ($ip_logs_count == 0)}>
<{$smarty.const._AM_WFD_EMPTY_LOG}>
<{else}>
-
- <h2>sprintf(_AM_WFD_LOG_FOR_LID, $download->getVar('title'))</h2>
-
+ <h2><{$download.log_title}></h2>
<table class="outer">
<tr>
<th><{$smarty.const._AM_WFD_IP_ADDRESS}></th>
<th><{$smarty.const._AM_WFD_DATE}></th>
<th><{$smarty.const._AM_WFD_USER}></th>
</tr>
-
<{foreach item=ip_log from=$ip_logs}>
<tr class="<{cycle values='even, odd'}>">
<td><{$ip_log.ip_address}></td>
- <td align='center'>formatTimestamp($ip_log->getVar('date'))</td>
- <td align='center'><{$ip_logs.uname}></td>
+ <td align='center'><{$ip_log.date_timestamp}></td>
+ <td align='center'><{$ip_log.uname}></td>
</tr>
<{/foreach}>
</table>
<{/if}>
</fieldset>
-</form>
<input type='button' value='<{$smarty.const._AM_WFD_BACK}>' onclick='history.go(-1)'>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-09-18 10:19:12 UTC (rev 12066)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-09-18 16:17:30 UTC (rev 12067)
@@ -111,7 +111,7 @@
if (!wfdownloads_userIsAdmin()) {
$wfdownloads->getHandler('download')->incrementHits($lid);
}
-
+ // Create ip log
$ip_log = $wfdownloads->getHandler('ip_log')->create();
$ip_log->setVar('lid', $lid);
$ip_log->setVar('date', time());
@@ -119,8 +119,8 @@
$ip_log->setVar('uid', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0);
$wfdownloads->getHandler('ip_log')->insert($ip_log, true);
- $full_name = trim($download->getVar('filename'));
- if ((!$download->getVar('url') == '' && !$download->getVar('url') == 'http://') || $full_name == '') {
+ $fullFilename = trim($download->getVar('filename'));
+ if ((!$download->getVar('url') == '' && !$download->getVar('url') == 'http://') || $fullFilename == '') {
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
@@ -129,7 +129,6 @@
echo "<div align='center'>" . wfdownloads_headerImage() . "</div>";
$url = $myts->htmlSpecialChars(preg_replace('/javascript:/si' , 'javascript:', $download->getVar('url')), ENT_QUOTES);
-
echo "<h4><img src='" . WFDOWNLOADS_URL . "/images/icon/downloads.gif' align='middle' alt='' title='" . _MD_WFD_DOWNINPROGRESS . "' /> " . _MD_WFD_DOWNINPROGRESS . "</h4>\n";
echo "<div>" . _MD_WFD_DOWNSTARTINSEC . "</div><br />\n";
echo "<div>" . _MD_WFD_DOWNNOTSTART . "\n";
@@ -138,44 +137,31 @@
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
- // HTTP/1.0
- header("Pragma: no-cache");
- // Date in the past
- header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
- // always modified
- header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+ header("Pragma: no-cache"); // HTTP/1.0
+ header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
+ header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); // Always modified
header("Refresh: 3; url={$url}");
- } elseif (!empty($full_name)) {
+ } elseif (!empty($fullFilename)) {
$mimeType = $download->getVar('filetype');
-
- $file = strrev($full_name);
- $temp_name = strtolower(strrev(substr($file, 0, strpos($file, "--"))) );
- if ($temp_name == '') {
- $file_name = $full_name;
- } else {
- $file_name = $temp_name;
- }
- $filePath = $wfdownloads->getConfig('uploaddir') . '/' . stripslashes(trim($full_name));
-
+ $file = strrev($fullFilename);
+ $tempFilename = strtolower(strrev(substr($file, 0, strpos($file, '--'))) );
+ $filename = ($tempFilename == '') ? $fullFilename : $tempFilename;
+ $filePath = $wfdownloads->getConfig('uploaddir') . '/' . stripslashes(trim($fullFilename));
if(ini_get('zlib.output_compression')) {
ini_set('zlib.output_compression', 'Off');
}
-
// MSIE Bug fix.
- $header_file = (strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE')) ? preg_replace('/\./', '%2e', $file_name, substr_count($file_name, '.') - 1) : $file_name;
-
+ $headerFilename = (strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE')) ? preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1) : $filename;
header("Pragma: public");
header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
header("Cache-Control: private", false);
header("Content-Length: " . (string)(filesize($filePath)) );
header("Content-Transfer-Encoding: binary");
if(isset($mimeType)) {
- header("Content-Type: " . $mimeType);
+ header("Content-Type: {$mimeType}");
}
-
- header("Content-Disposition: attachment; filename=" . $header_file);
-
- if(isset($mimeType) && strstr($mimeType, "text/")) {
+ header("Content-Disposition: attachment; filename={$headerFilename}");
+ if(isset($mimeType) && strstr($mimeType, 'text/')) {
wfdownloads_download($filePath, false, true);
} else {
wfdownloads_download($filePath, true, true);
@@ -183,9 +169,9 @@
exit();
} else {
include XOOPS_ROOT_PATH . '/header.php';
- echo "<br /><div align='center'>" . wfdownloads_headerImage() . "</div>";
+ echo "<br />";
+ echo "<div align='center'>" . wfdownloads_headerImage() . "</div>";
reportBroken($lid);
}
-
include 'footer.php';
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-18 10:19:12 UTC (rev 12066)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-18 16:17:30 UTC (rev 12067)
@@ -47,9 +47,9 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-09-17';
-$modversion['release_date'] = '2013/09/17';
-$modversion['releasedate'] = '2013-09-17';
+$modversion['date'] = '2013-09-18';
+$modversion['release_date'] = '2013/09/18';
+$modversion['releasedate'] = '2013-09-18';
$modversion['status'] = 'BETA';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
|
|
From: <be...@us...> - 2013-09-18 10:19:16
|
Revision: 12066
http://sourceforge.net/p/xoops/svn/12066
Author: beckmi
Date: 2013-09-18 10:19:12 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
Updating to TinymCE 4.06
Modified Paths:
--------------
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/code/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/lists/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/paste/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/table/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/template/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/visualblocks/css/visualblocks.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/skin.ie7.min.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/skin.min.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/themes/modern/theme.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/tinymce.min.js
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt 2013-09-17 20:02:41 UTC (rev 12065)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt 2013-09-18 10:19:12 UTC (rev 12066)
@@ -1,3 +1,30 @@
+Version 4.0.6 (2013-09-12)
+ Added new compat3x plugin that makes it possible to load most 3.x plugins. Only available in the development package.
+ Added new skin_url option enables you to load local skins when using the CDN version.
+ Added new theme_url option enables you to load local themes when using the CDN version.
+ Added new importcss_file_filter option to importcss to enable users to specify what files to import from.
+ Added new template_preview_replace_values option to template plugin to add example data for variables.
+ Added image option support for addMenuItem calls. Enables you to provide a custom image for menu items.
+ Fixed bug where editor.insertContent wouldn't set format and selection type on events.
+ Fixed bug where inserting BR elements on IE 8 would thrown an exception when the range is at a empty text node.
+ Fixed bug where outdent of single LI element within another LI would produce an empty list element OL/UL.
+ Fixed bug where the bullist/numlist buttons wouldn't be deselected when deleting all contents.
+ Fixed bug where toggling an empty list item off wouldn't produce a new empty block element.
+ Fixed bug where it wasn't possible to apply lists to mixed text blocks and br lines.
+ Fixed bug where it wasn't possible to paste contents on iOS when the paste plugin was enabled.
+ Fixed bug where it wasn't possible to delete HR elements on Gecko.
+ Fixed bug where scrolling and refocusing using the mouse would place the caret incorrectly on IE.
+ Fixed bug where you needed to hit the empty paragraph to get editor focus in IE 11.
+ Fixed bug where activeEditor wasn't set to the correct editor when opening windows.
+ Fixed bug where dirty state wasn't set to false when undoing to the first undo level.
+ Fixed bug where pasting in inline mode on Safari on Mac wouldn't work properly.
+ Fixed bug where content_css wasn't loaded into the insert template dialog.
+ Fixed bug where setting the contents of the editor to non text contents would produce an incorrect selection range.
+ Fixed so code dialog height gets smaller that the viewport height if it doesn't fit.
+ Fixed so inline editable regions scroll when pressing enter/return.
+ Fixed so inline toolbar gets positioned correctly when inline element is within a scrollable container.
+ Fixed various memory leaks when removing editor instances dynamically.
+ Removed CSS for BR elements in visualblocks due to problems with Chrome and IE.
Version 4.0.5 (2013-08-27)
Added visuals for UL, LI and BR to visualblocks plugin. Patch contributed by Dan Ransom.
Added new autosave_restore_when_empty option to autosave plugin. Enabled by default.
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/code/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/code/plugin.min.js 2013-09-17 20:02:41 UTC (rev 12065)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/code/plugin.min.js 2013-09-18 10:19:12 UTC (rev 12066)
@@ -1 +1 @@
-tinymce.PluginManager.add("code",function(e){function t(){e.windowManager.open({title:"Source code",body:{type:"textbox",name:"code",multiline:!0,minWidth:e.getParam("code_dialog_width",600),minHeight:e.getParam("code_dialog_height",500),value:e.getContent({source_view:!0}),spellcheck:!1},onSubmit:function(t){e.undoManager.transact(function(){e.setContent(t.data.code)}),e.nodeChanged()}})}e.addCommand("mceCodeEditor",t),e.addButton("code",{icon:"code",tooltip:"Source code",onclick:t}),e.addMenuItem("code",{icon:"code",text:"Source code",context:"tools",onclick:t})});
\ No newline at end of file
+tinymce.PluginManager.add("code",function(e){function o(){e.windowManager.open({title:"Source code",body:{type:"textbox",name:"code",multiline:!0,minWidth:e.getParam("code_dialog_width",600),minHeight:e.getParam("code_dialog_height",Math.min(tinymce.DOM.getViewPort().h-200,500)),value:e.getContent({source_view:!0}),spellcheck:!1},onSubmit:function(o){e.undoManager.transact(function(){e.setContent(o.data.code)}),e.nodeChanged()}})}e.addCommand("mceCodeEditor",o),e.addButton("code",{icon:"code",tooltip:"Source code",onclick:o}),e.addMenuItem("code",{icon:"code",text:"Source code",context:"tools",onclick:o})});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/plugin.min.js 2013-09-17 20:02:41 UTC (rev 12065)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/plugin.min.js 2013-09-18 10:19:12 UTC (rev 12066)
@@ -1 +1 @@
-tinymce.PluginManager.add("example",function(e){e.addButton("example",{text:"My button",icon:!1,onclick:function(){e.windowManager.open({title:"Example plugin",body:[{type:"textbox",name:"title",label:"Title"}],onsubmit:function(t){e.insertContent("Title: "+t.data.title)}})}}),e.addMenuItem("example",{text:"Example plugin",context:"tools",onclick:function(){e.windowManager.open({title:"TinyMCE site",url:"http://www.tinymce.com",width:800,height:600,buttons:[{text:"Close",onclick:"close"}]})}})});
\ No newline at end of file
+tinymce.PluginManager.add("example",function(t){t.addButton("example",{text:"My button",icon:!1,onclick:function(){t.windowManager.open({title:"Example plugin",body:[{type:"textbox",name:"title",label:"Title"}],onsubmit:function(e){t.insertContent("Title: "+e.data.title)}})}}),t.addMenuItem("example",{text:"Example plugin",context:"tools",onclick:function(){t.windowManager.open({title:"TinyMCE site",url:"http://www.tinymce.com",width:800,height:600,buttons:[{text:"Close",onclick:"close"}]})}})});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js 2013-09-17 20:02:41 UTC (rev 12065)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js 2013-09-18 10:19:12 UTC (rev 12066)
@@ -1 +1 @@
-tinymce.PluginManager.add("image",function(e){function t(e,t){function n(e,n){i.parentNode.removeChild(i),t({width:e,height:n})}var i=document.createElement("img");i.onload=function(){n(i.clientWidth,i.clientHeight)},i.onerror=function(){n()},i.src=e;var a=i.style;a.visibility="hidden",a.position="fixed",a.bottom=a.left=0,a.width=a.height="auto",document.body.appendChild(i)}function n(t){return function(){var n=e.settings.image_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(n)}}function i(n){function i(){var e=[{text:"None",value:""}];return tinymce.each(n,function(t){e.push({text:t.text||t.title,value:t.value||t.url,menu:t.menu})}),e}function a(e){var t,n,i,a;t=c.find("#width")[0],n=c.find("#height")[0],i=t.value(),a=n.value(),c.find("#constrain")[0].checked()&&d&&m&&i&&a&&(e.control==t?(a=Math.round(i/d*a),n.value(a)):(i=Math.round(a/m*i),t.value(i))),d=i,m=a}function o(){function t(t){function i(){t.onload=t.onerror=null,e.selection.select(t),e.nodeChanged()}t.onload=function(){n.width||n.height||h.setAttribs(t,{width:t.clientWidth,height:t.clientHeight}),i()},t.onerror=i}var n=c.toJSON();""===n.width&&(n.width=null),""===n.height&&(n.height=null),""===n.style&&(n.style=null),n={src:n.src,alt:n.alt,width:n.width,height:n.height,style:n.style},e.undoManager.transact(function(){return n.src?(g?h.setAttribs(g,n):(n.id="__mcenew",e.selection.setContent(h.createHTML("img",n)),g=h.get("__mcenew"),h.setAttrib(g,"id",null)),t(g),void 0):(g&&(h.remove(g),e.nodeChanged()),void 0)})}function r(e){return e&&(e=e.replace(/px$/,"")),e}function s(){t(this.value(),function(e){e.width&&e.height&&(d=e.width,m=e.height,c.find("#width").value(d),c.find("#height").value(m))})}function l(){function e(e){return e.length>0&&/^[0-9]+$/.test(e)&&(e+="px"),e}var t=c.toJSON(),n=h.parseStyle(t.style);h.setAttrib(g,"style",""),delete n.margin,n["margin-top"]=n["margin-bottom"]=e(t.vspace),n["margin-left"]=n["margin-right"]=e(t.hspace),n["border-width"]=e(t.border),c.find("#style").value(h.serializeStyle(h.parseStyle(h.serializeStyle(n))))}var c,u,d,m,f,h=e.dom,g=e.selection.getNode();d=h.getAttrib(g,"width"),m=h.getAttrib(g,"height"),"IMG"!=g.nodeName||g.getAttribute("data-mce-object")?g=null:u={src:h.getAttrib(g,"src"),alt:h.getAttrib(g,"alt"),width:d,height:m},n&&(f={name:"target",type:"listbox",label:"Image list",values:i(),onselect:function(e){var t=c.find("#alt");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),c.find("#src").value(e.control.value())}});var p=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:s},f,{name:"alt",type:"textbox",label:"Image description"},{type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:3,size:3,onchange:a},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:3,size:3,onchange:a},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}];e.settings.image_advtab?(g&&(u.hspace=r(g.style.marginLeft||g.style.marginRight),u.vspace=r(g.style.marginTop||g.style.marginBottom),u.border=r(g.style.borderWidth),u.style=e.dom.serializeStyle(e.dom.parseStyle(e.dom.getAttrib(g,"style")))),c=e.windowManager.open({title:"Insert/edit image",data:u,bodyType:"tabpanel",body:[{title:"General",type:"form",items:p},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox"},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:l},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:o})):c=e.windowManager.open({title:"Edit image",data:u,body:p,onSubmit:o})}e.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:n(i),stateSelector:"img:not([data-mce-object])"}),e.addMenuItem("image",{icon:"image",text:"Insert image",onclick:n(i),context:"insert",prependToContext:!0})});
\ No newline at end of file
+tinymce.PluginManager.add("image",function(t){function e(t,e){function n(t,n){i.parentNode.removeChild(i),e({width:t,height:n})}var i=document.createElement("img");i.onload=function(){n(i.clientWidth,i.clientHeight)},i.onerror=function(){n()},i.src=t;var a=i.style;a.visibility="hidden",a.position="fixed",a.bottom=a.left=0,a.width=a.height="auto",document.body.appendChild(i)}function n(e){return function(){var n=t.settings.image_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(t){e(tinymce.util.JSON.parse(t))}}):e(n)}}function i(n){function i(){var t=[{text:"None",value:""}];return tinymce.each(n,function(e){t.push({text:e.text||e.title,value:e.value||e.url,menu:e.menu})}),t}function a(t){var e,n,i,a;e=s.find("#width")[0],n=s.find("#height")[0],i=e.value(),a=n.value(),s.find("#constrain")[0].checked()&&h&&u&&i&&a&&(t.control==e?(a=Math.round(i/h*a),n.value(a)):(i=Math.round(a/u*i),e.value(i))),h=i,u=a}function o(){function e(e){function i(){e.onload=e.onerror=null,t.selection.select(e),t.nodeChanged()}e.onload=function(){n.width||n.height||m.setAttribs(e,{width:e.clientWidth,height:e.clientHeight}),i()},e.onerror=i}var n=s.toJSON();""===n.width&&(n.width=null),""===n.height&&(n.height=null),""===n.style&&(n.style=null),n={src:n.src,alt:n.alt,width:n.width,height:n.height,style:n.style},t.undoManager.transact(function(){return n.src?(p?m.setAttribs(p,n):(n.id="__mcenew",t.selection.setContent(m.createHTML("img",n)),p=m.get("__mcenew"),m.setAttrib(p,"id",null)),e(p),void 0):(p&&(m.remove(p),t.nodeChanged()),void 0)})}function l(t){return t&&(t=t.replace(/px$/,"")),t}function r(){e(this.value(),function(t){t.width&&t.height&&(h=t.width,u=t.height,s.find("#width").value(h),s.find("#height").value(u))})}function c(){function t(t){return t.length>0&&/^[0-9]+$/.test(t)&&(t+="px"),t}var e=s.toJSON(),n=m.parseStyle(e.style);m.setAttrib(p,"style",""),delete n.margin,n["margin-top"]=n["margin-bottom"]=t(e.vspace),n["margin-left"]=n["margin-right"]=t(e.hspace),n["border-width"]=t(e.border),s.find("#style").value(m.serializeStyle(m.parseStyle(m.serializeStyle(n))))}var s,d,h,u,g,m=t.dom,p=t.selection.getNode();h=m.getAttrib(p,"width"),u=m.getAttrib(p,"height"),"IMG"!=p.nodeName||p.getAttribute("data-mce-object")?p=null:d={src:m.getAttrib(p,"src"),alt:m.getAttrib(p,"alt"),width:h,height:u},n&&(g={name:"target",type:"listbox",label:"Image list",values:i(),onselect:function(t){var e=s.find("#alt");(!e.value()||t.lastControl&&e.value()==t.lastControl.text())&&e.value(t.control.text()),s.find("#src").value(t.control.value())}});var y=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:r},g,{name:"alt",type:"textbox",label:"Image description"},{type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:3,size:3,onchange:a},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:3,size:3,onchange:a},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}];t.settings.image_advtab?(p&&(d.hspace=l(p.style.marginLeft||p.style.marginRight),d.vspace=l(p.style.marginTop||p.style.marginBottom),d.border=l(p.style.borderWidth),d.style=t.dom.serializeStyle(t.dom.parseStyle(t.dom.getAttrib(p,"style")))),s=t.windowManager.open({title:"Insert/edit image",data:d,bodyType:"tabpanel",body:[{title:"General",type:"form",items:y},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox"},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:c},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:o})):s=t.windowManager.open({title:"Insert/edit image",data:d,body:y,onSubmit:o})}t.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:n(i),stateSelector:"img:not([data-mce-object])"}),t.addMenuItem("image",{icon:"image",text:"Insert image",onclick:n(i),context:"insert",prependToContext:!0})});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js 2013-09-17 20:02:41 UTC (rev 12065)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js 2013-09-18 10:19:12 UTC (rev 12066)
@@ -1 +1 @@
-tinymce.PluginManager.add("importcss",function(e){function t(t){function n(e,t){(t||o[e.href])&&(i(e.imports,function(e){n(e,!0)}),i(e.cssRules||e.rules,function(e){e.styleSheet?n(e.styleSheet,!0):e.selectorText&&i(e.selectorText.split(","),function(e){a.push(tinymce.trim(e))})}))}var a=[],o={};i(e.contentCSS,function(e){o[e]=!0});try{i(t.styleSheets,n)}catch(r){}return a}function n(t){var n,i=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(t);if(i){var a=i[1],o=i[2].substr(1).split(".").join(" ");return i[1]?(n={title:t},e.schema.getTextBlockElements()[a]?n.block=a:e.schema.getBlockElements()[a]?n.selector=a:n.inline=a):i[2]&&(n={inline:"span",title:t.substr(1),classes:o}),e.settings.importcss_merge_classes!==!1?n.classes=o:n.attributes={"class":o},n}}var i=tinymce.each;e.settings.style_formats||e.on("renderFormatsMenu",function(a){var o=e.settings.importcss_selector_converter||n,r={};e.settings.importcss_append||a.control.items().remove(),i(t(e.getDoc()),function(t){if(-1===t.indexOf(".mce-")&&!r[t]){var n=o(t);if(n){var i=n.name||tinymce.DOM.uniqueId();e.formatter.register(i,n),a.control.append(tinymce.extend({},a.control.settings.itemDefaults,{text:n.title,format:i}))}r[t]=!0}})})});
\ No newline at end of file
+tinymce.PluginManager.add("importcss",function(t){function e(e,s){function i(t,e){var o=t.href;if(e||c[o]){if(s){if(s instanceof RegExp&&!s.test(o))return;if("string"==typeof s&&-1===o.indexOf(s))return}n(t.imports,function(t){i(t,!0)}),n(t.cssRules||t.rules,function(t){t.styleSheet?i(t.styleSheet,!0):t.selectorText&&n(t.selectorText.split(","),function(t){r.push(tinymce.trim(t))})})}}var r=[],c={};n(t.contentCSS,function(t){c[t]=!0});try{n(e.styleSheets,i)}catch(o){}return r}function s(e){var s,n=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(e);if(n){var i=n[1],r=n[2].substr(1).split(".").join(" ");return n[1]?(s={title:e},t.schema.getTextBlockElements()[i]?s.block=i:t.schema.getBlockElements()[i]?s.selector=i:s.inline=i):n[2]&&(s={inline:"span",title:e.substr(1),classes:r}),t.settings.importcss_merge_classes!==!1?s.classes=r:s.attributes={"class":r},s}}var n=tinymce.each;t.settings.style_formats||t.on("renderFormatsMenu",function(i){var r=t.settings.importcss_selector_converter||s,c={},o=t.settings.importcss_file_filter;t.settings.importcss_append||i.control.items().remove(),n(e(t.getDoc(),o),function(e){if(-1===e.indexOf(".mce-")&&!c[e]){var s=r(e);if(s){var n=s.name||tinymce.DOM.uniqueId();t.formatter.register(n,s),i.control.add(tinymce.extend({},i.control.settings.itemDefaults,{text:s.title,format:n}))}c[e]=!0}}),i.control.renderNew()})});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/lists/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/lists/plugin.min.js 2013-09-17 20:02:41 UTC (rev 12065)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/lists/plugin.min.js 2013-09-18 10:19:12 UTC (rev 12066)
@@ -1 +1 @@
-tinymce.PluginManager.add("lists",function(e){var t=this;e.on("init",function(){function n(e){function t(t){var i,r,a;r=e[t?"startContainer":"endContainer"],a=e[t?"startOffset":"endOffset"],1==r.nodeType&&(i=b.create("span",{"data-mce-type":"bookmark"}),r.hasChildNodes()?(a=Math.min(a,r.childNodes.length-1),r.insertBefore(i,r.childNodes[a])):r.appendChild(i),r=i,a=0),n[t?"startContainer":"endContainer"]=r,n[t?"startOffset":"endOffset"]=a}var n={};return t(!0),e.collapsed||t(),n}function i(t){function n(n){function i(e){for(var t=e.parentNode.firstChild,n=0;t;){if(t==e)return n;(1!=t.nodeType||"bookmark"!=t.getAttribute("data-mce-type"))&&n++,t=t.nextSibling}return-1}var r,a,o;if(r=o=t[n?"startContainer":"endContainer"],a=t[n?"startOffset":"endOffset"],r){if(1==r.nodeType){if(r.parentNode==e.getBody()){var s,l=e.settings.forced_root_block;l?(s=b.create(l),(!tinymce.Env.ie||tinymce.Env.ie>10)&&s.appendChild(b.create("br",{"data-mce-bogus":"true"})),r.parentNode.insertBefore(s,r),r=s,a=0):(s=b.create("br"),r.parentNode.insertBefore(s,r),r=r.parentNode,a=i(s))}else n?(a=i(r),r=r.parentNode):(a=i(r),r=r.parentNode);b.remove(o)}t[n?"startContainer":"endContainer"]=r,t[n?"startOffset":"endOffset"]=a}}n(!0),n();var i=b.createRng();i.setStart(t.startContainer,t.startOffset),t.endContainer&&i.setEnd(t.endContainer,t.endOffset),C.setRng(i)}function r(e){return e&&/^(OL|UL)$/.test(e.nodeName)}function a(e){return e.parentNode.firstChild==e}function o(e){return e.parentNode.lastChild==e}function s(t){return t&&!!e.schema.getTextBlockElements()[t.nodeName]}function l(t,n){var i,r;if(e.settings.forced_root_block&&(n=n||e.settings.forced_root_block),r=n?b.create(n):b.createFragment(),t)for(;i=t.firstChild;)r.appendChild(i);return e.settings.forced_root_block||r.appendChild(b.create("br")),r.hasChildNodes()||tinymce.Env.ie&&!(tinymce.Env.ie>10)||(r.innerHTML='<br data-mce-bogus="1">'),r}function c(){return tinymce.grep(C.getSelectedBlocks(),function(e){return"LI"==e.nodeName})}function d(){return tinymce.grep(C.getSelectedBlocks(),s)}function u(e,t,n){var i,r,a=b.select('span[data-mce-type="bookmark"]',e);n=n||l(t),i=b.createRng(),i.setStartAfter(t),i.setEndAfter(e),r=i.extractContents(),b.isEmpty(r)||b.insertAfter(r,e),b.isEmpty(n)||b.insertAfter(n,e),b.isEmpty(t.parentNode)&&(tinymce.each(a,function(e){t.parentNode.parentNode.insertBefore(e,t.parentNode)}),b.remove(t.parentNode)),b.remove(t)}function m(e){var t,n;if(t=e.nextSibling,t&&r(t)&&t.nodeName==e.nodeName){for(;n=t.firstChild;)e.appendChild(n);b.remove(t)}if(t=e.previousSibling,t&&r(t)&&t.nodeName==e.nodeName){for(;n=t.firstChild;)e.insertBefore(n,e.firstChild);b.remove(t)}}function f(e){tinymce.each(tinymce.grep(b.select("ol,ul",e)),function(e){var t,n=e.parentNode;"LI"==n.nodeName&&n.firstChild==e&&(t=n.previousSibling,t&&"LI"==t.nodeName&&(t.appendChild(e),b.isEmpty(n)&&b.remove(n))),r(n)&&(t=n.previousSibling,t&&"LI"==t.nodeName&&t.appendChild(e))})}function p(){var e,t=n(C.getRng(!0));return tinymce.each(c(),function(t){var n,i;return n=t.previousSibling,n&&"UL"==n.nodeName?(n.appendChild(t),void 0):n&&"LI"==n.nodeName&&r(n.lastChild)?(n.lastChild.appendChild(t),void 0):(n=t.nextSibling,n&&"UL"==n.nodeName?(n.insertBefore(t,n.firstChild),void 0):(n&&"LI"==n.nodeName&&r(t.lastChild)||(n=t.previousSibling,n&&"LI"==n.nodeName&&(i=b.create(t.parentNode.nodeName),n.appendChild(i),i.appendChild(t)),e=!0),void 0))}),i(t),e}function h(){function e(e){b.isEmpty(e)&&b.remove(e)}var t,s=n(C.getRng(!0));return tinymce.each(c(),function(n){var i,s=n.parentNode,c=s.parentNode;if(a(n)&&o(n))if("LI"==c.nodeName)b.insertAfter(n,c),e(c);else{if(!r(c))return;b.remove(s,!0)}else if(a(n))if("LI"==c.nodeName)b.insertAfter(n,c),i=b.create("LI"),i.appendChild(s),b.insertAfter(i,n),e(c);else{if(!r(c))return;c.insertBefore(n,s)}else if(o(n))if("LI"==c.nodeName)b.insertAfter(n,c);else{if(!r(c))return;b.insertAfter(n,s)}else{if("LI"==c.nodeName)s=c,i=l(n,"LI");else{if(!r(c))return;i=l(n,"LI")}u(s,n,i),f(s.parentNode)}t=!0}),i(s),t}function g(t){function a(){function t(t){var n,i,r=e.getBody();for(n=o[t?"startContainer":"endContainer"],i=o[t?"startOffset":"endOffset"],1==n.nodeType&&(n=n.childNodes[Math.min(i,n.childNodes.length-1)]||n);n.parentNode!=r;){if(s(n))return n;if(/^(TD|TH)$/.test(n.parentNode.nodeName))return n;n=n.parentNode}return n}function n(e,t){var n,i=[];if(!s(e)){for(;e&&(n=e[t?"previousSibling":"nextSibling"],!b.isBlock(n)&&n);)e=n;for(;e;)i.push(e),e=e[t?"nextSibling":"previousSibling"]}return i}var i,r,a=t(!0),l=t();r=n(a,!0),a!=l&&(r=r.concat(n(l).reverse())),tinymce.each(r,function(e){if(!b.isBlock(e)||"BR"==e.nodeName){if(!i||"BR"==e.nodeName){if("BR"==e.nodeName&&(!e.nextSibling||b.isBlock(e.nextSibling)&&"BR"!=e.nextSibling.nodeName))return b.remove(e),!1;i=b.create("p"),c.push(i),e.parentNode.insertBefore(i,e)}return"BR"!=e.nodeName?i.appendChild(e):b.remove(e),e==l?!1:void 0}})}var o=C.getRng(!0),l=n(o),c=d();a(),tinymce.each(c,function(e){var n,i;i=e.previousSibling,i&&r(i)&&i.nodeName==t?(n=i,e=b.rename(e,"LI"),i.appendChild(e)):(n=b.create(t),e.parentNode.insertBefore(n,e),n.appendChild(e),e=b.rename(e,"LI")),m(n)}),i(l)}function v(){var e=n(C.getRng(!0));tinymce.each(c(),function(e){var t,n;for(t=e;t;t=t.parentNode)r(t)&&(n=t);u(n,e)}),i(e)}function y(e){var t=b.getParent(C.getStart(),"OL,UL");if(t)if(t.nodeName==e)v(e);else{var r=n(C.getRng(!0));m(b.rename(t,e)),i(r)}else g(e)}var b=e.dom,C=e.selection;t.backspaceDelete=function(e){function t(e,t){var n=e.startContainer,i=e.startOffset;if(3==n.nodeType&&(t?i<n.data.length:i>0))return n;for(var r=new tinymce.dom.TreeWalker(e.startContainer);n=r[t?"next":"prev"]();)if(3==n.nodeType&&n.data.length>0)return n}function a(e,t){var n,i,a=e.parentNode;for(r(t.lastChild)&&(i=t.lastChild),n=t.lastChild,n&&"BR"==n.nodeName&&e.hasChildNodes()&&b.remove(n);n=e.firstChild;)t.appendChild(n);i&&t.appendChild(i),b.remove(e),b.isEmpty(a)&&b.remove(a)}if(C.isCollapsed()){var o=b.getParent(C.getStart(),"LI");if(o){var s=C.getRng(!0),l=b.getParent(t(s,e),"LI");if(l&&l!=o){var c=n(s);return e?a(l,o):a(o,l),i(c),!0}if(!l&&!e&&v(o.parentNode.nodeName))return!0}}},e.addCommand("Indent",function(){return p()?void 0:!0}),e.addCommand("Outdent",function(){return h()?void 0:!0}),e.addCommand("InsertUnorderedList",function(){y("UL")}),e.addCommand("InsertOrderedList",function(){y("OL")})}),e.on("keydown",function(e){e.keyCode==tinymce.util.VK.BACKSPACE?t.backspaceDelete()&&e.preventDefault():e.keyCode==tinymce.util.VK.DELETE&&t.backspaceDelete(!0)&&e.preventDefault()})});
\ No newline at end of file
+tinymce.PluginManager.add("lists",function(e){var n=this;e.on("init",function(){function t(e){function n(n){var r,i,o;i=e[n?"startContainer":"endContainer"],o=e[n?"startOffset":"endOffset"],1==i.nodeType&&(r=L.create("span",{"data-mce-type":"bookmark"}),i.hasChildNodes()?(o=Math.min(o,i.childNodes.length-1),n?i.insertBefore(r,i.childNodes[o]):L.insertAfter(r,i.childNodes[o])):i.appendChild(r),i=r,o=0),t[n?"startContainer":"endContainer"]=i,t[n?"startOffset":"endOffset"]=o}var t={};return n(!0),e.collapsed||n(),t}function r(e){function n(n){function t(e){for(var n=e.parentNode.firstChild,t=0;n;){if(n==e)return t;(1!=n.nodeType||"bookmark"!=n.getAttribute("data-mce-type"))&&t++,n=n.nextSibling}return-1}var r,i,o;r=o=e[n?"startContainer":"endContainer"],i=e[n?"startOffset":"endOffset"],r&&(1==r.nodeType&&(i=t(r),r=r.parentNode,L.remove(o)),e[n?"startContainer":"endContainer"]=r,e[n?"startOffset":"endOffset"]=i)}n(!0),n();var t=L.createRng();t.setStart(e.startContainer,e.startOffset),e.endContainer&&t.setEnd(e.endContainer,e.endOffset),b.setRng(t)}function i(e){return e&&/^(OL|UL)$/.test(e.nodeName)}function o(e){return e.parentNode.firstChild==e}function a(e){return e.parentNode.lastChild==e}function d(n){return n&&!!e.schema.getTextBlockElements()[n.nodeName]}function f(e){return e&&"SPAN"===e.nodeName&&"bookmark"===e.getAttribute("data-mce-type")}function s(n,t){var r,i,o;if(e.settings.forced_root_block&&(t=t||e.settings.forced_root_block),i=t?L.create(t):L.createFragment(),n)for(;r=n.firstChild;)o||"SPAN"==r.nodeName&&"bookmark"==r.getAttribute("data-mce-type")||(o=!0),i.appendChild(r);return e.settings.forced_root_block?o||tinymce.Env.ie&&!(tinymce.Env.ie>10)||i.appendChild(L.create("br",{"data-mce-bogus":"1"})):i.appendChild(L.create("br")),i}function c(){return tinymce.grep(b.getSelectedBlocks(),function(e){return"LI"==e.nodeName})}function l(e,n,t){var r,i,o=L.select('span[data-mce-type="bookmark"]',e);t=t||s(n),r=L.createRng(),r.setStartAfter(n),r.setEndAfter(e),i=r.extractContents(),L.isEmpty(i)||L.insertAfter(i,e),L.insertAfter(t,e),L.isEmpty(n.parentNode)&&(tinymce.each(o,function(e){n.parentNode.parentNode.insertBefore(e,n.parentNode)}),L.remove(n.parentNode)),L.remove(n)}function u(e){var n,t;if(n=e.nextSibling,n&&i(n)&&n.nodeName==e.nodeName){for(;t=n.firstChild;)e.appendChild(t);L.remove(n)}if(n=e.previousSibling,n&&i(n)&&n.nodeName==e.nodeName){for(;t=n.firstChild;)e.insertBefore(t,e.firstChild);L.remove(n)}}function p(e){tinymce.each(tinymce.grep(L.select("ol,ul",e)),function(e){var n,t=e.parentNode;"LI"==t.nodeName&&t.firstChild==e&&(n=t.previousSibling,n&&"LI"==n.nodeName&&(n.appendChild(e),L.isEmpty(t)&&L.remove(t))),i(t)&&(n=t.previousSibling,n&&"LI"==n.nodeName&&n.appendChild(e))})}function m(e){function n(e){L.isEmpty(e)&&L.remove(e)}var t,r=e.parentNode,d=r.parentNode;if(o(e)&&a(e))if("LI"==d.nodeName)L.insertAfter(e,d),n(d),L.remove(r);else{if(!i(d))return d.insertBefore(s(e),r),L.remove(r),void 0;L.remove(r,!0)}else if(o(e))if("LI"==d.nodeName)L.insertAfter(e,d),t=L.create("LI"),t.appendChild(r),L.insertAfter(t,e),n(d);else{if(!i(d))return d.insertBefore(s(e),r),L.remove(e),void 0;d.insertBefore(e,r)}else if(a(e))if("LI"==d.nodeName)L.insertAfter(e,d);else{if(!i(d))return L.insertAfter(s(e),r),L.remove(e),void 0;L.insertAfter(e,r)}else"LI"==d.nodeName?(r=d,t=s(e,"LI")):t=i(d)?s(e,"LI"):s(e),l(r,e,t),p(r.parentNode);return!0}function v(e){var n,t;return n=e.previousSibling,n&&"UL"==n.nodeName?(n.appendChild(e),void 0):n&&"LI"==n.nodeName&&i(n.lastChild)?(n.lastChild.appendChild(e),void 0):(n=e.nextSibling,n&&"UL"==n.nodeName?(n.insertBefore(e,n.firstChild),void 0):n&&"LI"==n.nodeName&&i(e.lastChild)?void 0:(n=e.previousSibling,n&&"LI"==n.nodeName&&(t=L.create(e.parentNode.nodeName),n.appendChild(t),t.appendChild(e)),!0))}function N(){var e,n=t(b.getRng(!0));return tinymce.each(c(),function(n){v(n)&&(e=!0)}),r(n),e}function h(){var e,n=t(b.getRng(!0));return tinymce.each(c(),function(n){m(n)&&(e=!0)}),r(n),e}function C(n){function o(){function n(e){var n,t;for(n=a[e?"startContainer":"endContainer"],t=a[e?"startOffset":"endOffset"],1==n.nodeType&&(n=n.childNodes[Math.min(t,n.childNodes.length-1)]||n);n.parentNode!=i;){if(d(n))return n;if(/^(TD|TH)$/.test(n.parentNode.nodeName))return n;n=n.parentNode}return n}for(var t,r=[],i=e.getBody(),o=n(!0),s=n(),c=[],l=o;l&&(c.push(l),l!=s);l=l.nextSibling);return tinymce.each(c,function(e){if(d(e))return r.push(e),t=null,void 0;if(L.isBlock(e)||"BR"==e.nodeName)return"BR"==e.nodeName&&L.remove(e),t=null,void 0;var n=e.nextSibling;return f(e)&&(d(n)||!n&&e.parentNode==i)?(t=null,void 0):(t||(t=L.create("p"),e.parentNode.insertBefore(t,e),r.push(t)),t.appendChild(e),void 0)}),r}var a=b.getRng(!0),s=t(a),c=o();tinymce.each(c,function(e){var t,r;r=e.previousSibling,r&&i(r)&&r.nodeName==n?(t=r,e=L.rename(e,"LI"),r.appendChild(e)):(t=L.create(n),e.parentNode.insertBefore(t,e),t.appendChild(e),e=L.rename(e,"LI")),u(t)}),r(s)}function g(){var e=t(b.getRng(!0));tinymce.each(c(),function(e){var n,t;if(L.isEmpty(e))return m(e),void 0;for(n=e;n;n=n.parentNode)i(n)&&(t=n);l(t,e)}),r(e)}function y(e){var n=L.getParent(b.getStart(),"OL,UL");if(n)if(n.nodeName==e)g(e);else{var i=t(b.getRng(!0));u(L.rename(n,e)),r(i)}else C(e)}var L=e.dom,b=e.selection;n.backspaceDelete=function(e){function n(e,n){var t=e.startContainer,r=e.startOffset;if(3==t.nodeType&&(n?r<t.data.length:r>0))return t;for(var i=new tinymce.dom.TreeWalker(e.startContainer);t=i[n?"next":"prev"]();)if(3==t.nodeType&&t.data.length>0)return t}function o(e,n){var t,r,o=e.parentNode;for(i(n.lastChild)&&(r=n.lastChild),t=n.lastChild,t&&"BR"==t.nodeName&&e.hasChildNodes()&&L.remove(t);t=e.firstChild;)n.appendChild(t);r&&n.appendChild(r),L.remove(e),L.isEmpty(o)&&L.remove(o)}if(b.isCollapsed()){var a=L.getParent(b.getStart(),"LI");if(a){var d=b.getRng(!0),f=L.getParent(n(d,e),"LI");if(f&&f!=a){var s=t(d);return e?o(f,a):o(a,f),r(s),!0}if(!f&&!e&&g(a.parentNode.nodeName))return!0}}},e.addCommand("Indent",function(){return N()?void 0:!0}),e.addCommand("Outdent",function(){return h()?void 0:!0}),e.addCommand("InsertUnorderedList",function(){y("UL")}),e.addCommand("InsertOrderedList",function(){y("OL")})}),e.on("keydown",function(e){e.keyCode==tinymce.util.VK.BACKSPACE?n.backspaceDelete()&&e.preventDefault():e.keyCode==tinymce.util.VK.DELETE&&n.backspaceDelete(!0)&&e.preventDefault()})});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/paste/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/paste/plugin.min.js 2013-09-17 20:02:41 UTC (rev 12065)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/paste/plugin.min.js 2013-09-18 10:19:12 UTC (rev 12066)
@@ -1 +1 @@
-!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/pasteplugin/Clipboard",c="tinymce/Env",u="tinymce/util/Tools",d="tinymce/util/VK",f="tinymce/pasteplugin/WordFilter",p="tinymce/html/DomParser",m="tinymce/html/Schema",h="tinymce/html/Serializer",g="tinymce/html/Node",v="tinymce/pasteplugin/Quirks",y="tinymce/pasteplugin/Plugin",b="tinymce/PluginManager";r(l,[c,u,d],function(e,t,n){function r(){return!e.gecko&&("ClipboardEvent"in window||e.webkit&&"FocusEvent"in window)}return function(i){function o(){return(new Date).getTime()}function a(e){return n.metaKeyPressed(e)&&86==e.keyCode||e.shiftKey&&45==e.keyCode}function s(e){return e.innerText||e.textContent}function l(){return o()-h<100||"text"==m.pasteFormat}function c(e,n){return t.each(n,function(t){e=t.constructor==RegExp?e.replace(t,""):e.replace(t[0],t[1])}),e}function u(t){var n=i.fire("PastePreProcess",{content:t});t=n.content,i.settings.paste_data_images||(t=t.replace(/<img src=\"data:image[^>]+>/g,"")),(i.settings.paste_remove_styles||i.settings.paste_remove_styles_if_webkit!==!1&&e.webkit)&&(t=t.replace(/ style=\"[^\"]+\"/g,"")),n.isDefaultPrevented()||i.insertContent(t)}function d(e){e=i.dom.encode(e).replace(/\r\n/g,"\n");var t=i.dom.getParent(i.selection.getStart(),i.dom.isBlock);e=t&&/^(PRE|DIV)$/.test(t.nodeName)||!i.settings.forced_root_block?c(e,[[/\n/g,"<br>"]]):c(e,[[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]]);var n=i.fire("PastePreProcess",{content:e});n.isDefaultPrevented()||i.insertContent(n.content)}function f(){var e=i.dom.getViewPort().y,t=i.dom.add(i.getBody(),"div",{contentEditable:!1,"data-mce-bogus":"1",style:"position: absolute; top: "+e+"px; left: 0; width: 1px; height: 1px; overflow: hidden"},'<div contentEditable="true" data-mce-bogus="1">X</div>');return i.dom.bind(t,"beforedeactivate focusin focusout",function(e){e.stopPropagation()}),t}function p(e){i.dom.unbind(e),i.dom.remove(e)}var m=this,h;if(i.on("keydown",function(e){n.metaKeyPressed(e)&&e.shiftKey&&86==e.keyCode&&(h=o())}),r())i.on("paste",function(e){function t(e,t){for(var r=0;r<n.types.length;r++)if(n.types[r]==e)return t(n.getData(e)),!0}var n=e.clipboardData;n&&(e.preventDefault(),l()?t("text/plain",d)||t("text/html",u):t("text/html",u)||t("text/plain",d))});else{if(e.ie){var g=0;i.on("keydown",function(e){if(a(e)&&!e.isDefaultPrevented()){e.stopImmediatePropagation();var t=f();g=o(),i.dom.bind(t,"paste",function(){setTimeout(function(){i.selection.setRng(n),p(t),l()?d(s(t.firstChild)):u(t.firstChild.innerHTML)},0)});var n=i.selection.getRng();t.firstChild.focus(),t.firstChild.innerText=""}}),i.on("init",function(){var e=i.dom;i.dom.bind(i.getBody(),"paste",function(t){if(o()-g>100){var n,r=f();t.preventDefault(),e.bind(r,"paste",function(e){e.stopPropagation(),n=!0});var a=i.selection.getRng(),c=e.doc.body.createTextRange();if(c.moveToElementText(r.firstChild),c.execCommand("Paste"),p(r),!n)return i.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents."),void 0;i.selection.setRng(a),l()?d(s(r.firstChild)):u(r.firstChild.innerHTML)}})})}else i.on("init",function(){i.dom.bind(i.getBody(),"paste",function(e){e.preventDefault(),i.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents.")})}),i.on("keydown",function(e){if(a(e)&&!e.isDefaultPrevented()){e.stopImmediatePropagation();var t=f(),n=i.selection.getRng();i.selection.select(t,!0),i.dom.bind(t,"paste",function(e){e.stopPropagation(),setTimeout(function(){p(t),i.lastRng=n,i.selection.setRng(n);var e=t.firstChild;e.lastChild&&"BR"==e.lastChild.nodeName&&e.removeChild(e.lastChild),l()?d(s(e)):u(e.innerHTML)},0)})}});i.settings.paste_data_images||i.on("drop",function(e){var t=e.dataTransfer;t&&t.files&&t.files.length>0&&e.preventDefault()})}i.paste_block_drop&&i.on("dragend dragover draggesture dragdrop drop drag",function(e){e.preventDefault(),e.stopPropagation()}),this.paste=u,this.pasteText=d}}),r(f,[u,p,m,h,g],function(e,t,n,r,i){return function(o){var a=e.each;o.on("PastePreProcess",function(s){function l(e){a(e,function(e){d=e.constructor==RegExp?d.replace(e,""):d.replace(e[0],e[1])})}function c(e){function t(e,t,a,s){var l=e._listLevel||o;l!=o&&(o>l?n&&(n=n.parent.parent):(r=n,n=null)),n&&n.name==a?n.append(e):(r=r||n,n=new i(a,1),s>1&&n.attr("start",""+s),e.wrap(n)),e.name="li",t.value="";var c=t.next;c&&3==c.type&&(c.value=c.value.replace(/^\u00a0+/,"")),l>o&&r&&r.lastChild.append(n),o=l}for(var n,r,o=1,a=e.getAll("p"),s=0;s<a.length;s++)if(e=a[s],"p"==e.name&&e.firstChild){for(var l="",c=e.firstChild;c&&!(l=c.value);)c=c.firstChild;if(/^\s*[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*$/.test(l)){t(e,c,"ul");continue}if(/^\s*\w+\./.test(l)){var u=/([0-9])\./.exec(l),d=1;u&&(d=parseInt(u[1],10)),t(e,c,"ol",d);continue}n=null}}function u(t,n){if("p"===t.name){var r=/mso-list:\w+ \w+([0-9]+)/.exec(n);r&&(t._listLevel=parseInt(r[1],10))}if(o.getParam("paste_retain_style_properties","none")){var i="";if(e.each(o.dom.parseStyle(n),function(e,t){switch(t){case"horiz-align":return t="text-align",void 0;case"vert-align":return t="vertical-align",void 0;case"font-color":case"mso-foreground":return t="color",void 0;case"mso-background":case"mso-highlight":t="background"}("all"==f||p&&p[t])&&(i+=t+":"+e+";")}),i)return i}return null}var d=s.content,f,p;if(f=o.settings.paste_retain_style_properties,f&&(p=e.makeMap(f)),o.settings.paste_enable_default_filters!==!1&&/class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i.test(s.content)){s.wordContent=!0,l([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/ /gi,"\xa0"],[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(e,t){return t.length>0?t.replace(/./," ").slice(Math.floor(t.length/2)).split("").join("\xa0"):""}]]);var m=new n({valid_elements:"@[style],-strong/b,-em/i,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,-table,-tr,-td[colspan|rowspan],-th,-thead,-tfoot,-tbody,-a[!href],sub,sup,strike"}),h=new t({},m);h.addAttributeFilter("style",function(e){for(var t=e.length,n;t--;)n=e[t],n.attr("style",u(n,n.attr("style"))),"span"!=n.name||n.attributes.length||n.unwrap()});var g=h.parse(d);c(g),s.content=new r({},m).serialize(g)}})}}),r(v,[c,u],function(e,t){return function(n){function r(e){n.on("PastePreProcess",function(t){t.content=e(t.content)})}function i(e,n){return t.each(n,function(t){e=t.constructor==RegExp?e.replace(t,""):e.replace(t[0],t[1])}),e}function o(e){return e=i(e,[/^[\s\S]*<!--StartFragment-->|<!--EndFragment-->[\s\S]*$/g,[/<span class="Apple-converted-space">\u00a0<\/span>/g,"\xa0"],/<br>$/])}function a(e){if(!s){var r=[];t.each(n.schema.getBlockElements(),function(e,t){r.push(t)}),s=new RegExp("(?:<br> [\\s\\r\\n]+|<br>)*(<\\/?("+r.join("|")+")[^>]*>)(?:<br> [\\s\\r\\n]+|<br>)*","g")}return e=i(e,[[s,"$1"]]),e=i(e,[[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}var s;e.webkit&&r(o),e.ie&&r(a)}}),r(y,[b,l,f,v],function(e,t,n,r){var i;e.add("paste",function(e){function o(){"text"==s.pasteFormat?(this.active(!1),s.pasteFormat="html"):(s.pasteFormat="text",this.active(!0),i||(e.windowManager.alert("Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off."),i=!0))}var a=this,s;a.clipboard=s=new t(e),a.quirks=new r(e),a.wordFilter=new n(e),e.settings.paste_as_text&&(a.clipboard.pasteFormat="text"),e.addCommand("mceInsertClipboardContent",function(e,t){t.content&&a.clipboard.paste(t.content),t.text&&a.clipboard.pasteText(t.text)}),e.addButton("pastetext",{icon:"pastetext",tooltip:"Paste as text",onclick:o,active:"text"==a.clipboard.pasteFormat}),e.addMenuItem("pastetext",{text:"Paste as text",selectable:!0,active:s.pasteFormat,onclick:o})})}),a([l,f,v,y])}(this);
\ No newline at end of file
+!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/pasteplugin/Clipboard",c="tinymce/Env",u="tinymce/util/Tools",d="tinymce/util/VK",f="tinymce/pasteplugin/WordFilter",p="tinymce/html/DomParser",m="tinymce/html/Schema",h="tinymce/html/Serializer",g="tinymce/html/Node",v="tinymce/pasteplugin/Quirks",y="tinymce/pasteplugin/Plugin",b="tinymce/PluginManager";r(l,[c,u,d],function(e,t,n){function r(){return!e.gecko&&("ClipboardEvent"in window||e.webkit&&"FocusEvent"in window)}return function(i){function o(){return(new Date).getTime()}function a(e){return n.metaKeyPressed(e)&&86==e.keyCode||e.shiftKey&&45==e.keyCode}function s(e){return e.innerText||e.textContent}function l(){return o()-h<100||"text"==m.pasteFormat}function c(e,n){return t.each(n,function(t){e=t.constructor==RegExp?e.replace(t,""):e.replace(t[0],t[1])}),e}function u(t){var n=i.fire("PastePreProcess",{content:t});t=n.content,i.settings.paste_data_images||(t=t.replace(/<img src=\"data:image[^>]+>/g,"")),(i.settings.paste_remove_styles||i.settings.paste_remove_styles_if_webkit!==!1&&e.webkit)&&(t=t.replace(/ style=\"[^\"]+\"/g,"")),n.isDefaultPrevented()||i.insertContent(t)}function d(e){e=i.dom.encode(e).replace(/\r\n/g,"\n");var t=i.dom.getParent(i.selection.getStart(),i.dom.isBlock);e=t&&/^(PRE|DIV)$/.test(t.nodeName)||!i.settings.forced_root_block?c(e,[[/\n/g,"<br>"]]):c(e,[[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]]);var n=i.fire("PastePreProcess",{content:e});n.isDefaultPrevented()||i.insertContent(n.content)}function f(){var e=i.dom.getViewPort().y,t=i.dom.add(i.getBody(),"div",{contentEditable:!1,"data-mce-bogus":"1",style:"position: absolute; top: "+e+"px; left: 0; width: 1px; height: 1px; overflow: hidden"},'<div contentEditable="true" data-mce-bogus="1">X</div>');return i.dom.bind(t,"beforedeactivate focusin focusout",function(e){e.stopPropagation()}),t}function p(e){i.dom.unbind(e),i.dom.remove(e)}var m=this,h;if(i.on("keydown",function(e){n.metaKeyPressed(e)&&e.shiftKey&&86==e.keyCode&&(h=o())}),r())i.on("paste",function(e){function t(e,t){for(var r=0;r<n.types.length;r++)if(n.types[r]==e)return t(n.getData(e)),!0}var n=e.clipboardData;n&&(e.preventDefault(),l()?t("text/plain",d)||t("text/html",u):t("text/html",u)||t("text/plain",d))});else{if(e.ie){var g=0;i.on("keydown",function(e){if(a(e)&&!e.isDefaultPrevented()){e.stopImmediatePropagation();var t=f();g=o(),i.dom.bind(t,"paste",function(){setTimeout(function(){i.selection.setRng(n),p(t),l()?d(s(t.firstChild)):u(t.firstChild.innerHTML)},0)});var n=i.selection.getRng();t.firstChild.focus(),t.firstChild.innerText=""}}),i.on("init",function(){var e=i.dom;i.dom.bind(i.getBody(),"paste",function(t){if(o()-g>100){var n,r=f();t.preventDefault(),e.bind(r,"paste",function(e){e.stopPropagation(),n=!0});var a=i.selection.getRng(),c=e.doc.body.createTextRange();if(c.moveToElementText(r.firstChild),c.execCommand("Paste"),p(r),!n)return i.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents."),void 0;i.selection.setRng(a),l()?d(s(r.firstChild)):u(r.firstChild.innerHTML)}})})}else i.on("init",function(){i.dom.bind(i.getBody(),"paste",function(e){var t=i.getDoc();return e.preventDefault(),e.clipboardData||t.dataTransfer?(d((e.clipboardData||t.dataTransfer).getData("Text")),void 0):(e.preventDefault(),i.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents."),void 0)})}),i.on("keydown",function(t){if(a(t)&&!t.isDefaultPrevented()){t.stopImmediatePropagation();var n=f(),r=i.selection.getRng();e.webkit&&i.inline&&(n.contentEditable=!0),i.selection.select(n,!0),i.dom.bind(n,"paste",function(e){e.stopPropagation(),setTimeout(function(){p(n),i.lastRng=r,i.selection.setRng(r);var e=n.firstChild;e.lastChild&&"BR"==e.lastChild.nodeName&&e.removeChild(e.lastChild),l()?d(s(e)):u(e.innerHTML)},0)})}});i.settings.paste_data_images||i.on("drop",function(e){var t=e.dataTransfer;t&&t.files&&t.files.length>0&&e.preventDefault()})}i.paste_block_drop&&i.on("dragend dragover draggesture dragdrop drop drag",function(e){e.preventDefault(),e.stopPropagation()}),this.paste=u,this.pasteText=d}}),r(f,[u,p,m,h,g],function(e,t,n,r,i){return function(o){var a=e.each;o.on("PastePreProcess",function(s){function l(e){a(e,function(e){d=e.constructor==RegExp?d.replace(e,""):d.replace(e[0],e[1])})}function c(e){function t(e,t,a,s){var l=e._listLevel||o;l!=o&&(o>l?n&&(n=n.parent.parent):(r=n,n=null)),n&&n.name==a?n.append(e):(r=r||n,n=new i(a,1),s>1&&n.attr("start",""+s),e.wrap(n)),e.name="li",t.value="";var c=t.next;c&&3==c.type&&(c.value=c.value.replace(/^\u00a0+/,"")),l>o&&r&&r.lastChild.append(n),o=l}for(var n,r,o=1,a=e.getAll("p"),s=0;s<a.length;s++)if(e=a[s],"p"==e.name&&e.firstChild){for(var l="",c=e.firstChild;c&&!(l=c.value);)c=c.firstChild;if(/^\s*[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*$/.test(l)){t(e,c,"ul");continue}if(/^\s*\w+\./.test(l)){var u=/([0-9])\./.exec(l),d=1;u&&(d=parseInt(u[1],10)),t(e,c,"ol",d);continue}n=null}}function u(t,n){if("p"===t.name){var r=/mso-list:\w+ \w+([0-9]+)/.exec(n);r&&(t._listLevel=parseInt(r[1],10))}if(o.getParam("paste_retain_style_properties","none")){var i="";if(e.each(o.dom.parseStyle(n),function(e,t){switch(t){case"horiz-align":return t="text-align",void 0;case"vert-align":return t="vertical-align",void 0;case"font-color":case"mso-foreground":return t="color",void 0;case"mso-background":case"mso-highlight":t="background"}("all"==f||p&&p[t])&&(i+=t+":"+e+";")}),i)return i}return null}var d=s.content,f,p;if(f=o.settings.paste_retain_style_properties,f&&(p=e.makeMap(f)),o.settings.paste_enable_default_filters!==!1&&/class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i.test(s.content)){s.wordContent=!0,l([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/ /gi,"\xa0"],[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(e,t){return t.length>0?t.replace(/./," ").slice(Math.floor(t.length/2)).split("").join("\xa0"):""}]]);var m=new n({valid_elements:"@[style],-strong/b,-em/i,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,-table,-tr,-td[colspan|rowspan],-th,-thead,-tfoot,-tbody,-a[!href],sub,sup,strike"}),h=new t({},m);h.addAttributeFilter("style",function(e){for(var t=e.length,n;t--;)n=e[t],n.attr("style",u(n,n.attr("style"))),"span"!=n.name||n.attributes.length||n.unwrap()});var g=h.parse(d);c(g),s.content=new r({},m).serialize(g)}})}}),r(v,[c,u],function(e,t){return function(n){function r(e){n.on("PastePreProcess",function(t){t.content=e(t.content)})}function i(e,n){return t.each(n,function(t){e=t.constructor==RegExp?e.replace(t,""):e.replace(t[0],t[1])}),e}function o(e){return e=i(e,[/^[\s\S]*<!--StartFragment-->|<!--EndFragment-->[\s\S]*$/g,[/<span class="Apple-converted-space">\u00a0<\/span>/g,"\xa0"],/<br>$/])}function a(e){if(!s){var r=[];t.each(n.schema.getBlockElements(),function(e,t){r.push(t)}),s=new RegExp("(?:<br> [\\s\\r\\n]+|<br>)*(<\\/?("+r.join("|")+")[^>]*>)(?:<br> [\\s\\r\\n]+|<br>)*","g")}return e=i(e,[[s,"$1"]]),e=i(e,[[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}var s;e.webkit&&r(o),e.ie&&r(a)}}),r(y,[b,l,f,v],function(e,t,n,r){var i;e.add("paste",function(e){function o(){"text"==s.pasteFormat?(this.active(!1),s.pasteFormat="html"):(s.pasteFormat="text",this.active(!0),i||(e.windowManager.alert("Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off."),i=!0))}var a=this,s;a.clipboard=s=new t(e),a.quirks=new r(e),a.wordFilter=new n(e),e.settings.paste_as_text&&(a.clipboard.pasteFormat="text"),e.addCommand("mceInsertClipboardContent",function(e,t){t.content&&a.clipboard.paste(t.content),t.text&&a.clipboard.pasteText(t.text)}),e.addButton("pastetext",{icon:"pastetext",tooltip:"Paste as text",onclick:o,active:"text"==a.clipboard.pasteFormat}),e.addMenuItem("pastetext",{text:"Paste as text",selectable:!0,active:s.pasteFormat,onclick:o})})}),a([l,f,v,y])}(this);
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/table/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/table/plugin.min.js 2013-09-17 20:02:41 UTC (rev 12065)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/table/plugin.min.js 2013-09-18 10:19:12 UTC (rev 12066)
@@ -1 +1 @@
-!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/tableplugin/TableGrid",c="tinymce/util/Tools",d="tinymce/Env",u="tinymce/tableplugin/Quirks",f="tinymce/util/VK",p="tinymce/tableplugin/CellSelection",m="tinymce/dom/TreeWalker",h="tinymce/tableplugin/Plugin",g="tinymce/PluginManager";r(l,[c,d],function(e,t){function n(e,t){return parseInt(e.getAttribute(t)||1,10)}var r=e.each;return function(i,o){function a(){var e=0;R=[],r(["thead","tbody","tfoot"],function(t){var i=H.select("> "+t+" tr",o);r(i,function(i,o){o+=e,r(H.select("> td, > th",i),function(e,r){var i,a,s,l;if(R[o])for(;R[o][r];)r++;for(s=n(e,"rowspan"),l=n(e,"colspan"),a=o;o+s>a;a++)for(R[a]||(R[a]=[]),i=r;r+l>i;i++)R[a][i]={part:t,real:a==o&&i==r,elm:e,rowspan:s,colspan:l}})}),e+=i.length})}function s(e,t){return e=e.cloneNode(t),e.removeAttribute("id"),e}function l(e,t){var n;return n=R[t],n?n[e]:void 0}function c(e,t,n){e&&(n=parseInt(n,10),1===n?e.removeAttribute(t,1):e.setAttribute(t,n,1))}function d(e){return e&&(H.hasClass(e.elm,"mce-item-selected")||e==P)}function u(){var e=[];return r(o.rows,function(t){r(t.cells,function(n){return H.hasClass(n,"mce-item-selected")||n==P.elm?(e.push(t),!1):void 0})}),e}function f(){var e=H.createRng();e.setStartAfter(o),e.setEndAfter(o),M.setRng(e),H.remove(o)}function p(n){var o,a={};return i.settings.table_clone_elements!==!1&&(a=e.makeMap((i.settings.table_clone_elements||"strong em b i span font h1 h2 h3 h4 h5 h6 p div").toUpperCase(),/[ ,]/)),e.walk(n,function(e){var i;return 3==e.nodeType?(r(H.getParents(e.parentNode,null,n).reverse(),function(e){a[e.nodeName]&&(e=s(e,!1),o?i&&i.appendChild(e):o=i=e,i=e)}),i&&(i.innerHTML=t.ie?" ":'<br data-mce-bogus="1" />'),!1):void 0},"childNodes"),n=s(n,!1),c(n,"rowSpan",1),c(n,"colSpan",1),o?n.appendChild(o):t.ie||(n.innerHTML='<br data-mce-bogus="1" />'),n}function m(){var e=H.createRng(),t;return r(H.select("tr",o),function(e){0===e.cells.length&&H.remove(e)}),0===H.select("tr",o).length?(e.setStartBefore(o),e.setEndBefore(o),M.setRng(e),H.remove(o),void 0):(r(H.select("thead,tbody,tfoot",o),function(e){0===e.rows.length&&H.remove(e)}),a(),t=R[Math.min(R.length-1,A.y)],t&&(M.select(t[Math.min(t.length-1,A.x)].elm,!0),M.collapse(!0)),void 0)}function h(e,t,n,r){var i,o,a,s,l;for(i=R[t][e].elm.parentNode,a=1;n>=a;a++)if(i=H.getNext(i,"tr")){for(o=e;o>=0;o--)if(l=R[t+a][o].elm,l.parentNode==i){for(s=1;r>=s;s++)H.insertAfter(p(l),l);break}if(-1==o)for(s=1;r>=s;s++)i.insertBefore(p(i.cells[0]),i.cells[0])}}function g(){r(R,function(e,t){r(e,function(e,r){var i,o,a;if(d(e)&&(e=e.elm,i=n(e,"colspan"),o=n(e,"rowspan"),i>1||o>1)){for(c(e,"rowSpan",1),c(e,"colSpan",1),a=0;i-1>a;a++)H.insertAfter(p(e),e);h(r,t,o-1,i)}})})}function v(t,n,i){var o,s,u,f,p,h,v,y,b,C,x;if(t?(o=S(t),s=o.x,u=o.y,f=s+(n-1),p=u+(i-1)):(A=B=null,r(R,function(e,t){r(e,function(e,n){d(e)&&(A||(A={x:n,y:t}),B={x:n,y:t})})}),s=A.x,u=A.y,f=B.x,p=B.y),y=l(s,u),b=l(f,p),y&&b&&y.part==b.part){for(g(),a(),y=l(s,u).elm,c(y,"colSpan",f-s+1),c(y,"rowSpan",p-u+1),v=u;p>=v;v++)for(h=s;f>=h;h++)R[v]&&R[v][h]&&(t=R[v][h].elm,t!=y&&(C=e.grep(t.childNodes),r(C,function(e){y.appendChild(e)}),C.length&&(C=e.grep(y.childNodes),x=0,r(C,function(e){"BR"==e.nodeName&&H.getAttrib(e,"data-mce-bogus")&&x++<C.length-1&&y.removeChild(e)})),H.remove(t)));m()}}function y(e){var t,i,o,a,l,u,f,m,h;for(r(R,function(n,i){return r(n,function(n){return d(n)&&(n=n.elm,l=n.parentNode,u=s(l,!1),t=i,e)?!1:void 0}),e?!t:void 0}),a=0;a<R[0].length;a++)if(R[t][a]&&(i=R[t][a].elm,i!=o)){if(e){if(t>0&&R[t-1][a]&&(m=R[t-1][a].elm,h=n(m,"rowSpan"),h>1)){c(m,"rowSpan",h+1);continue}}else if(h=n(i,"rowspan"),h>1){c(i,"rowSpan",h+1);continue}f=p(i),c(f,"colSpan",i.colSpan),u.appendChild(f),o=i}u.hasChildNodes()&&(e?l.parentNode.insertBefore(u,l):H.insertAfter(u,l))}function b(e){var t,i;r(R,function(n){return r(n,function(n,r){return d(n)&&(t=r,e)?!1:void 0}),e?!t:void 0}),r(R,function(r,o){var a,s,l;r[t]&&(a=r[t].elm,a!=i&&(l=n(a,"colspan"),s=n(a,"rowspan"),1==l?e?(a.parentNode.insertBefore(p(a),a),h(t,o,s-1,l)):(H.insertAfter(p(a),a),h(t,o,s-1,l)):c(a,"colSpan",a.colSpan+1),i=a))})}function C(){var t=[];r(R,function(i){r(i,function(i,o){d(i)&&-1===e.inArray(t,o)&&(r(R,function(e){var t=e[o].elm,r;r=n(t,"colSpan"),r>1?c(t,"colSpan",r-1):H.remove(t)}),t.push(o))})}),m()}function x(){function e(e){var t,i,o;t=H.getNext(e,"tr"),r(e.cells,function(e){var t=n(e,"rowSpan");t>1&&(c(e,"rowSpan",t-1),i=S(e),h(i.x,i.y,1,1))}),i=S(e.cells[0]),r(R[i.y],function(e){var t;e=e.elm,e!=o&&(t=n(e,"rowSpan"),1>=t?H.remove(e):c(e,"rowSpan",t-1),o=e)})}var t;t=u(),r(t.reverse(),function(t){e(t)}),m()}function w(){var e=u();return H.remove(e),m(),e}function _(){var e=u();return r(e,function(t,n){e[n]=s(t,!0)}),e}function N(e,t){var n=u(),i=n[t?0:n.length-1],o=i.cells.length;e&&(r(R,function(e){var t;return o=0,r(e,function(e){e.real&&(o+=e.colspan),e.elm.parentNode==i&&(t=1)}),t?!1:void 0}),t||e.reverse(),r(e,function(e){var n,r=e.cells.length,a;for(n=0;r>n;n++)a=e.cells[n],c(a,"colSpan",1),c(a,"rowSpan",1);for(n=r;o>n;n++)e.appendChild(p(e.cells[r-1]));for(n=o;r>n;n++)H.remove(e.cells[n]);t?i.parentNode.insertBefore(e,i):H.insertAfter(e,i)}),H.removeClass(H.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"))}function S(e){var t;return r(R,function(n,i){return r(n,function(n,r){return n.elm==e?(t={x:r,y:i},!1):void 0}),!t}),t}function E(e){A=S(e)}function k(){var e,t;return e=t=0,r(R,function(n,i){r(n,function(n,r){var o,a;d(n)&&(n=R[i][r],r>e&&(e=r),i>t&&(t=i),n.real&&(o=n.colspan-1,a=n.rowspan-1,o&&r+o>e&&(e=r+o),a&&i+a>t&&(t=i+a)))})}),{x:e,y:t}}function T(e){var t,n,r,i,o,a,s,l,c,d;if(B=S(e),A&&B){for(t=Math.min(A.x,B.x),n=Math.min(A.y,B.y),r=Math.max(A.x,B.x),i=Math.max(A.y,B.y),o=r,a=i,d=n;a>=d;d++)e=R[d][t],e.real||t-(e.colspan-1)<t&&(t-=e.colspan-1);for(c=t;o>=c;c++)e=R[n][c],e.real||n-(e.rowspan-1)<n&&(n-=e.rowspan-1);for(d=n;i>=d;d++)for(c=t;r>=c;c++)e=R[d][c],e.real&&(s=e.colspan-1,l=e.rowspan-1,s&&c+s>o&&(o=c+s),l&&d+l>a&&(a=d+l));for(H.removeClass(H.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"),d=n;a>=d;d++)for(c=t;o>=c;c++)R[d][c]&&H.addClass(R[d][c].elm,"mce-item-selected")}}var R,A,B,P,M=i.selection,H=M.dom;o=o||H.getParent(M.getStart(),"table"),a(),P=H.getParent(M.getStart(),"th,td"),P&&(A=S(P),B=k(),P=l(A.x,A.y)),e.extend(this,{deleteTable:f,split:g,merge:v,insertRow:y,insertCol:b,deleteCols:C,deleteRows:x,cutRows:w,copyRows:_,pasteRows:N,getPos:S,setStartCell:E,setEndCell:T})}}),r(u,[f,d,c],function(e,t,n){function r(e,t){return parseInt(e.getAttribute(t)||1,10)}var i=n.each;return function(n){function o(){function t(t){function o(e,r){var i=e?"previousSibling":"nextSibling",o=n.dom.getParent(r,"tr"),s=o[i];if(s)return g(n,r,s,e),t.preventDefault(),!0;var d=n.dom.getParent(o,"table"),u=o.parentNode,f=u.nodeName.toLowerCase();if("tbody"===f||f===(e?"tfoot":"thead")){var p=a(e,d,u,"tbody");if(null!==p)return l(e,p,r)}return c(e,o,i,d)}function a(e,t,r,i){var o=n.dom.select(">"+i,t),a=o.indexOf(r);if(e&&0===a||!e&&a===o.length-1)return s(e,t);if(-1===a){var l="thead"===r.tagName.toLowerCase()?0:o.length-1;return o[l]}return o[a+(e?-1:1)]}function s(e,t){var r=e?"thead":"tfoot",i=n.dom.select(">"+r,t);return 0!==i.length?i[0]:null}function l(e,r,i){var o=d(r,e);return o&&g(n,i,o,e),t.preventDefault(),!0}function c(e,r,i,a){var s=a[i];if(s)return u(s),!0;var l=n.dom.getParent(a,"td,th");if(l)return o(e,l,t);var c=d(r,!e);return u(c),t.preventDefault(),!1}function d(e,t){var r=e&&e[t?"lastChild":"firstChild"];return r&&"BR"===r.nodeName?n.dom.getParent(r,"td,th"):r}function u(e){n.selection.setCursorLocation(e,0)}function f(){return b==e.UP||b==e.DOWN}function p(e){var t=e.selection.getNode(),n=e.dom.getParent(t,"tr");return null!==n}function m(e){for(var t=0,n=e;n.previousSibling;...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-17 20:02:44
|
Revision: 12065
http://sourceforge.net/p/xoops/svn/12065
Author: luciorota
Date: 2013-09-17 20:02:41 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
- added: ip_logs page uses templates (in progress)
- bugfix: admin/mimetypes.php shows all mimetypes/extensions
- removed old help admin link
- bugfix: file doesn't downloads after disclaimer confirmation
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-17 20:02:41 UTC (rev 12065)
@@ -740,18 +740,69 @@
include 'admin_footer.php';
break;
-}
+ case "ip_logs.list" :
+ $lid = WfdownloadsRequest::getInt('lid', 0);
+ if(!$lid) {
+ header('Location index.php');
+ }
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
-function addDownload()
-{
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, $currentFile . "?op=downloads.list", 'list');
+ $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=download.add", 'add');
+ echo $adminMenu->renderButton();
-}
+ // Get ip logs
+ $criteria = new CriteriaCompo();
+ if ($lid != 0) {
+ $criteria->add(new Criteria('lid', $lid));
+ }
+ $criteria->setSort('date');
+ $criteria->setOrder('DESC');
+ $ip_logs = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
+ $ip_logs_count = $wfdownloads->getHandler('ip_log')->count($criteria);
+ $GLOBALS['xoopsTpl']->assign('ip_logs_count', $ip_logs_count);
+ unset($criteria);
+ // Get download info
+ if ($lid != 0) {
+ $download = $wfdownloads->getHandler('download')->get($lid);
+ $downloadArray = $download->toArray();
+ $GLOBALS['xoopsTpl']->assign('download', $download->toArray());
+ }
+
+ // Get all logged users
+ $uidArray = array();
+ foreach($ip_logs as $ip_log) {
+ if($ip_log->getVar('uid')!= 0 && $ip_log->getVar('uid') != '') {
+ $uidArray[] = $ip_log->getVar('uid');
+ }
+ }
+ $criteria = new CriteriaCompo();
+ if(!empty($uidArray)) {
+ $criteria->add(new Criteria('uid', '(' . implode(', ', $uidArray) . ')', 'IN'));
+ }
+ $userList = $member_handler->getUserList($criteria);
+ if(empty($ip_logs)){
+ // NOP
+ } else {
+ foreach($ip_logs as $ip_log){
+ $ip_log_array = $ip_log->toArray();
+ if($ip_log_array['uid'] != 0 ) {
+ $ip_log_array['uname'] = $userList[$ip_log_array['uid']];
+ } else {
+ $ip_log_array['uname'] = _AM_WFD_ANONYMOUS;
+ }
+ $GLOBALS['xoopsTpl']->append('ip_logs', $ip_log_array);
+ }
+ }
+ $GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_ip_logslist.html");
-function saveDownload()
-{
-
+ include 'admin_footer.php';
+ break;
}
Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php 2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php 2013-09-17 20:02:41 UTC (rev 12065)
@@ -1,75 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-/**
- * WF-Downloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-$currentFile = basename(__FILE__);
-include_once dirname(__FILE__) . '/admin_header.php';
-
-$lid = isset($_GET['lid']) && $_GET['lid'] != '' ? $_GET['lid'] : 0;
-if(!$lid) {
- header('Location index.php');
-}
-
-wfdownloads_xoops_cp_header();
-$indexAdmin = new ModuleAdmin();
-echo $indexAdmin->addNavigation($currentFile);
-
-$download = $wfdownloads->getHandler('download')->get($lid);
-$criteria = new CriteriaCompo();
-$criteria->add(new Criteria('lid', $lid));
-$criteria->setSort('date');
-$criteria->setOrder('DESC');
-
-$ip_logsObj = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
-unset($criteria);
-$uidArray = array();
-foreach($ip_logsObj as $ip_logObj) {
- if($ip_logObj->getVar('uid')!= 0 && $ip_logObj->getVar('uid') != '') {
- $uidArray[] = $ip_logObj->getVar('uid');
- }
-}
-$criteria = new CriteriaCompo();
-if(!empty($uidArray)) {
- $criteria->add(new Criteria('uid', '(' . implode(', ', $uidArray) . ')', 'IN'));
-}
-$userList = $member_handler->getUserList($criteria);
-echo "<a href='index.php'>" . _AM_WFD_BACK . "</a>";
-if(empty($ip_logsObj)){
- echo "<h2>" . _AM_WFD_EMPTY_LOG . "</h2>";
-} else {
- echo "<h2>" . sprintf(_AM_WFD_LOG_FOR_LID, $download->getVar('title')) . "</h2>";
- echo "<br/><table><tr><td width='20%'><b>" . _AM_WFD_IP_ADDRESS . "</b></td><td width='20%'><b>" . _AM_WFD_DATE . "</b></td><td width='20%'><b>" . _AM_WFD_USER . "</b></td></tr>";
- foreach($ip_logsObj as $ip_logObj){
- echo "<tr><td>";
- echo $ip_logObj->getVar('ip_address');
- echo "</td><td>";
- echo formatTimestamp($ip_logObj->getVar('date'));
- echo "</td><td>";
- if($ip_logObj->getVar('uid') != 0 ) {
- $uname = $userList[$ip_logObj->getVar('uid')];
- } else {
- $uname = _AM_WFD_ANONYMOUS;
- }
- echo $uname;
- echo "</td></tr>";
- }
- echo "</table>";
-}
-
-include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-09-17 20:02:41 UTC (rev 12065)
@@ -75,10 +75,6 @@
$adminmenu[$i]['link'] = "admin/import.php";
$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/add.png';
$i++;
-$adminmenu[$i]['title'] = _MI_WFD_MENU_HELP_OLD;
-$adminmenu[$i]['link'] = "docs/english/readme.html";
-$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/help.png';
-$i++;
$adminmenu[$i]['title'] = _MI_WFD_MENU_ABOUT;
$adminmenu[$i]['link'] = "admin/about.php";
$adminmenu[$i]["icon"] = '../../' . $module->getInfo('icons32') . '/about.png';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-09-17 20:02:41 UTC (rev 12065)
@@ -34,8 +34,8 @@
}
break;
*/
- case "mimetype.edit":
- case "mimetype.add":
+ case "mimetype.edit" :
+ case "mimetype.add" :
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
@@ -59,7 +59,7 @@
$form = $mimetype->getForm();
$form->display();
- $extform = new XoopsThemeForm(_AM_WFD_MIME_FINDMIMETYPE, "op", $_SERVER['REQUEST_URI']);
+ $extform = new XoopsThemeForm(_AM_WFD_MIME_FINDMIMETYPE, 'op', $_SERVER['REQUEST_URI']);
$fileext_text = new XoopsFormText(_AM_WFD_MIME_EXTFIND, 'fileext', 5, 60, $mimetype->getVar('mime_ext'));
$fileext_text->setDescription(_AM_WFD_MIME_EXTFIND_DESC);
@@ -75,7 +75,7 @@
xoops_cp_footer();
break;
- case "mimetype.save":
+ case "mimetype.save" :
$mime_id = WfdownloadsRequest::getInt('mime_id', 0, 'POST');
if (!$mimetype = $wfdownloads->getHandler('mimetype')->get($mime_id)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_MIMETYPENOTFOUND);
@@ -95,7 +95,7 @@
redirect_header($currentFile, 1, $dbupted);
break;
- case "mimetype.update":
+ case "mimetype.update" :
$mime_id = WfdownloadsRequest::getInt('mime_id', 0);
if (!$mimetype = $wfdownloads->getHandler('mimetype')->get($mime_id)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_MIMETYPENOTFOUND);
@@ -119,18 +119,18 @@
if (!$wfdownloads->getHandler('mimetype')->insert($mimetype, true)) {
trigger_error($error, E_USER_ERROR);
}
- redirect_header("{$currentFile}?start=" . intval($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
+ redirect_header("{$currentFile}?start=" . (int)($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
break;
- case "mimetypes.update":
- $mime_admin = (isset($_GET['admin']) && $_GET['admin'] == true ) ? $_GET['admin'] : false;
- $mime_user = (isset($_GET['user']) && $_GET['user'] == true) ? $_GET['user'] : false;
- $type_all = intval($_GET['type_all']);
+ case "mimetypes.update" :
+ $mime_admin = WfdownloadsRequest::getBool('admin', false);
+ $mime_user = WfdownloadsRequest::getBool('user', false);
+ $type_all = (int)($_GET['type_all']);
if ($mime_admin == true) {
- $field = "mime_admin";
+ $field = 'mime_admin';
} else {
- $field = "mime_user";
+ $field = 'mime_user';
}
$criteria = new CriteriaCompo();
$criteria->setStart($start);
@@ -139,10 +139,10 @@
$error = "Could not update mimetype information";
trigger_error($error, E_USER_ERROR);
}
- redirect_header("{$currentFile}?start=" . intval($_GET['start']) . "", 1, _AM_WFD_MIME_MODIFIED);
+ redirect_header("{$currentFile}?start=" . (int)($_GET['start']) . "", 1, _AM_WFD_MIME_MODIFIED);
break;
- case "mimetype.delete":
+ case "mimetype.delete" :
$mime_id = WfdownloadsRequest::getInt('mime_id', 0);
$ok = WfdownloadsRequest::getBool('ok', false, 'POST');
if (!$mimetype = $wfdownloads->getHandler('mimetype')->get($mime_id)) {
@@ -167,16 +167,17 @@
}
break;
- case "mimetypes.list":
- default:
+ case "mimetypes.list" :
+ default :
$start = WfdownloadsRequest::getInt('start', 0);
+ // Get mimetypes (20 per page)
$criteria = new CriteriaCompo();
- $criteria->setSort("mime_name");
+ $criteria->setSort('mime_name');
$criteria->setStart($start);
$criteria->setLimit(20);
$mimetypes = $wfdownloads->getHandler('mimetype')->getObjects($criteria);
- $mime_num = $wfdownloads->getHandler('mimetype')->getCount();
+ $mimetypes_count = $wfdownloads->getHandler('mimetype')->getCount();
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
@@ -187,30 +188,28 @@
$adminMenu->addItemButton(_AM_WFD_MIME_CREATEF, "{$currentFile}?op=mimetype.add", 'add');
echo $adminMenu->renderButton();
- $GLOBALS['xoopsTpl']->assign('mimetypes_count', $mime_num);
+ $GLOBALS['xoopsTpl']->assign('mimetypes_count', $mimetypes_count);
$GLOBALS['xoopsTpl']->assign('start', $start);
- if ($mime_num > 0) {
+ if ($mimetypes_count > 0) {
$allowAdminMimetypes = array();
$allowUserMimetypes = array();
foreach ($mimetypes as $mimetype) {
- if ($mimetype->getVar('mime_admin') == true) {
- $allowAdminMimetypes[] = $mimetype->getVar('mime_ext');
- }
- if ($mimetype->getVar('mime_user') == true) {
- $allowUserMimetypes[] = $mimetype->getVar('mime_ext');
- }
$mimetype_array = $mimetype->toArray();
$GLOBALS['xoopsTpl']->append('mimetypes', $mimetype_array);
}
- $GLOBALS['xoopsTpl']->assign('allowAdminMimetypes', $allowAdminMimetypes);
- $GLOBALS['xoopsTpl']->assign('allowUserMimetypes', $allowUserMimetypes);
//Include page navigation
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($mime_num, 20, $start, 'start');
+ $pagenav = new XoopsPageNav($mimetypes_count, 20, $start, 'start');
$GLOBALS['xoopsTpl']->assign('mimetypes_pagenav', $pagenav -> renderNav());
}
-
+
+ // Get allowed mimetypes/estensione
+ $allowAdminMimetypes = $wfdownloads->getHandler('mimetype')->getList(new Criteria('mime_admin', true));
+ $allowUserMimetypes = $wfdownloads->getHandler('mimetype')->getList(new Criteria('mime_user', true));
+ $GLOBALS['xoopsTpl']->assign('allowAdminMimetypes', $allowAdminMimetypes);
+ $GLOBALS['xoopsTpl']->assign('allowUserMimetypes', $allowUserMimetypes);
+
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_mimetypeslist.html");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-17 20:02:41 UTC (rev 12065)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta (2013-09-16)</u></b>
+<b><u>=> Version 3.23 Beta (2013-09-17)</u></b>
- module standardization: header.php, admin/admin_header.php, xoops_version.php
- module standardization: standardize directories/files names/structures
- module standardization: standardize code headers
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-17 20:02:41 UTC (rev 12065)
@@ -196,10 +196,10 @@
define("_AM_WFD_MIME_EXTF","File extension");
define("_AM_WFD_MIME_NAMEF","Application type/name");
define("_AM_WFD_MIME_TYPEF","Mimetypes");
-define("_AM_WFD_MIME_ADMINF","Allowed admin mimetype");
-define("_AM_WFD_MIME_ADMINFINFO","<b>Mimetypes that are available for admin uploads</b>");
-define("_AM_WFD_MIME_USERF","Allowed user mimetype");
-define("_AM_WFD_MIME_USERFINFO","<b>Mimetypes that are available for user uploads</b>");
+define("_AM_WFD_MIME_ADMINF","Allowed admin mimetypes/extesions");
+define("_AM_WFD_MIME_ADMINFINFO","<b>Mimetypes/extesions that are available for admin uploads</b>");
+define("_AM_WFD_MIME_USERF","Allowed user mimetypes/extensions");
+define("_AM_WFD_MIME_USERFINFO","<b>Mimetypes/extesions that are available for user uploads</b>");
define("_AM_WFD_MIME_NOMIMEINFO","No mimetypes selected");
define("_AM_WFD_MIME_FINDMIMETYPE","Find mimetype informations");
define("_AM_WFD_MIME_EXTFIND","Search file extension");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-17 20:02:41 UTC (rev 12065)
@@ -21,8 +21,6 @@
$currentFile = basename(__FILE__);
include 'header.php';
-$categoriesTree = new WfdownloadsXoopsTree($xoopsDB->prefix('wfdownloads_cat'), 'cid', 'pid');
-
// Check if submissions are allowed
$submissionsAllowed = false;
if (is_object($xoopsUser) && ($wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_DOWNLOAD || $wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_BOTH)) {
@@ -51,7 +49,7 @@
// Check posts if user is not an ADMIN
if (is_object($xoopsUser) && !$xoopsUser->isAdmin()) {
if ($xoopsUser->getVar('posts') < $wfdownloads->getConfig('upload_minposts')) {
- redirect_header("index.php", 5, _MD_WFD_UPLOADMINPOSTS);
+ redirect_header('index.php', 5, _MD_WFD_UPLOADMINPOSTS);
}
}
@@ -63,7 +61,6 @@
$op = WfdownloadsRequest::getString('op', 'download.form');
$notify = WfdownloadsRequest::getBool('notify', false);
-
if ($wfdownloads->getConfig('showdisclaimer') && ($op == 'download.form') && $agreed == false) {
$op = 'download.disclaimer';
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-09-17 20:02:41 UTC (rev 12065)
@@ -81,7 +81,7 @@
<{/if}>
</td>
<td>
- <a href='ip_logs.php?lid=<{$download.lid}>' title="<{$smarty.const._AM_WFD_IP_LOGS}>"><{$smarty.const._AM_WFD_IP_LOGS}></a>
+ <a href='?op=ip_logs.list&lid=<{$download.lid}>' title="<{$smarty.const._AM_WFD_IP_LOGS}>"><{$smarty.const._AM_WFD_IP_LOGS}></a>
</td>
<td align='center'>
<a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
@@ -287,8 +287,4 @@
<{$offline_downloads_pagenav}>
<{/if}>
</fieldset>
-
-
-
-
</form>
\ No newline at end of file
Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html 2013-09-17 20:02:41 UTC (rev 12065)
@@ -0,0 +1,29 @@
+<input type='button' value='<{$smarty.const._AM_WFD_BACK}>' onclick='history.go(-1)'>
+// IN PROGRESS
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_IP_LOGS}></legend>
+<{if ($ip_logs_count == 0)}>
+ <{$smarty.const._AM_WFD_EMPTY_LOG}>
+<{else}>
+
+ <h2>sprintf(_AM_WFD_LOG_FOR_LID, $download->getVar('title'))</h2>
+
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFD_IP_ADDRESS}></th>
+ <th><{$smarty.const._AM_WFD_DATE}></th>
+ <th><{$smarty.const._AM_WFD_USER}></th>
+ </tr>
+
+ <{foreach item=ip_log from=$ip_logs}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$ip_log.ip_address}></td>
+ <td align='center'>formatTimestamp($ip_log->getVar('date'))</td>
+ <td align='center'><{$ip_logs.uname}></td>
+ </tr>
+ <{/foreach}>
+ </table>
+<{/if}>
+</fieldset>
+</form>
+<input type='button' value='<{$smarty.const._AM_WFD_BACK}>' onclick='history.go(-1)'>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-09-17 20:02:41 UTC (rev 12065)
@@ -30,19 +30,21 @@
redirect_header(XOOPS_URL . '/user.php', 1, _MD_WFD_MUSTREGFIRST);
}
-$agreed = WfdownloadsRequest::getInt('agreed', 0);
+
+
$lid = WfdownloadsRequest::getInt('lid', 0);
-
-// Get download
$download = $wfdownloads->getHandler('download')->get($lid);
+// Check if download exists
if ($download->isNew()) {
redirect_header('index.php', 1, _MD_WFD_NODOWNLOAD);
}
+$cid = WfdownloadsRequest::getInt('cid', $download->getVar('cid'));
+$agreed = WfdownloadsRequest::getBool('agreed', false, 'POST');
+
//Download not published, expired or taken offline - redirect
if ($download->getVar('published') == 0 || $download->getVar('published') > time() || $download->getVar('offline') == true || ($download->getVar('expired') != 0 && $download->getVar('expired') < time()) || $download->getVar('status') == 0) {
redirect_header('index.php', 3, _MD_WFD_NODOWNLOAD);
}
-$cid = $download->getVar('cid');
// Check permissions
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
@@ -75,45 +77,47 @@
}
if ($wfdownloads->getConfig('showDowndisclaimer') && $agreed == false) {
- $xoopsOption['template_main'] = 'wfdownloads_disclaimer.html';
- include XOOPS_ROOT_PATH . '/header.php';
+ $xoopsOption['template_main'] = 'wfdownloads_disclaimer.html';
+ include XOOPS_ROOT_PATH . '/header.php';
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
- $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
+ $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
+ $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
+ $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
- $catarray['imageheader'] = wfdownloads_headerImage();
- $xoopsTpl->assign('catarray', $catarray);
+ $catarray['imageheader'] = wfdownloads_headerImage();
+ $xoopsTpl->assign('catarray', $catarray);
- // Breadcrumb
- $breadcrumb = new WfdownloadsBreadcrumb();
- $breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
- $breadcrumb->addLink(_MD_WFD_DOWNLOADNOW, '');
- $xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
+ // Breadcrumb
+ $breadcrumb = new WfdownloadsBreadcrumb();
+ $breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
+ $breadcrumb->addLink(_MD_WFD_DOWNLOADNOW, '');
+ $xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
- $xoopsTpl->assign('image_header', wfdownloads_headerImage());
+ $xoopsTpl->assign('lid', $lid);
+ $xoopsTpl->assign('cid', $cid);
- $xoopsTpl->assign('submission_disclaimer', false);
- $xoopsTpl->assign('download_disclaimer', truee);
- $xoopsTpl->assign('download_disclaimer_content', $myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true));
+ $xoopsTpl->assign('image_header', wfdownloads_headerImage());
- $xoopsTpl->assign('down_disclaimer', true); // this definition is not removed for compatibility issues
- $xoopsTpl->assign('downdisclaimer', $myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true)); // this definition is not removed for compatibility issues
- $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for compatibility issues
- $xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agree=1&lid={$lid}&cid={$cid}");
+ $xoopsTpl->assign('submission_disclaimer', false);
+ $xoopsTpl->assign('download_disclaimer', truee);
+ $xoopsTpl->assign('download_disclaimer_content', $myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true));
+ $xoopsTpl->assign('down_disclaimer', true); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('downdisclaimer', $myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true)); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agree=1&lid={$lid}&cid={$cid}");
include 'footer.php';
} else {
- if (!$wfdownloads_isAdmin) {
+ if (!wfdownloads_userIsAdmin()) {
$wfdownloads->getHandler('download')->incrementHits($lid);
}
- $ip_logObj = $wfdownloads->getHandler('ip_log')->create();
- $ip_logObj->setVar('lid', $lid);
- $ip_logObj->setVar('date', time());
- $ip_logObj->setVar('ip_address', getenv('REMOTE_ADDR'));
- $ip_logObj->setVar('uid', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0);
- $wfdownloads->getHandler('ip_log')->insert($ip_logObj, true);
+ $ip_log = $wfdownloads->getHandler('ip_log')->create();
+ $ip_log->setVar('lid', $lid);
+ $ip_log->setVar('date', time());
+ $ip_log->setVar('ip_address', getenv('REMOTE_ADDR'));
+ $ip_log->setVar('uid', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0);
+ $wfdownloads->getHandler('ip_log')->insert($ip_log, true);
$full_name = trim($download->getVar('filename'));
if ((!$download->getVar('url') == '' && !$download->getVar('url') == 'http://') || $full_name == '') {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-17 20:02:41 UTC (rev 12065)
@@ -47,9 +47,9 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-09-16';
-$modversion['release_date'] = '2013/09/16';
-$modversion['releasedate'] = '2013-09-16';
+$modversion['date'] = '2013-09-17';
+$modversion['release_date'] = '2013/09/17';
+$modversion['releasedate'] = '2013-09-17';
$modversion['status'] = 'BETA';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
@@ -286,6 +286,10 @@
$modversion['templates'][$i]['type'] = 'admin';
$modversion['templates'][$i]['description'] = '';
$i++;
+$modversion['templates'][$i]['file'] = $modversion['dirname'] . '_admin_ip_logslist.html';
+$modversion['templates'][$i]['type'] = 'admin';
+$modversion['templates'][$i]['description'] = '';
+$i++;
$modversion['templates'][$i]['file'] = $modversion['dirname'] . '_admin_reportsmodificationslist.html';
$modversion['templates'][$i]['type'] = 'admin';
$modversion['templates'][$i]['description'] = '';
|
|
From: <be...@us...> - 2013-09-17 12:12:05
|
Revision: 12064
http://sourceforge.net/p/xoops/svn/12064
Author: beckmi
Date: 2013-09-17 12:12:00 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
re-added link to individual module's Admin after "Update" (was accidentally overwritten in previous commit)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/xoops_version.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2013-09-16 18:46:15 UTC (rev 12063)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2013-09-17 12:12:00 UTC (rev 12064)
@@ -239,7 +239,7 @@
$modifs_mods = array();
$module = empty($_POST['module']) ? array() : $_POST['module'];
foreach ($module as $mid) {
- $mid = (int)$mid;
+ $mid = (int) $mid;
$modifs_mods[$i]['mid'] = $mid;
$modifs_mods[$i]['oldname'] = $myts->htmlspecialchars($myts->stripSlashesGPC($oldname[$mid]));
$modifs_mods[$i]['newname'] = $myts->htmlspecialchars(trim($myts->stripslashesGPC($newname[$mid])));
@@ -544,13 +544,13 @@
$tplfile_handler =& xoops_gethandler('tplfile');
// irmtfan bug fix: remove codes for delete templates
/*
- $deltpl = $tplfile_handler->find('default', 'module', $module->getVar('mid'));
- $delng = array();
+ $deltpl = $tplfile_handler->find('default', 'module', $module->getVar('mid'));
+ $delng = array();
if (is_array($deltpl)) {
// delete template file entry in db
$dcount = count($deltpl);
for ($i = 0; $i < $dcount; $i++) {
- if ( !$tplfile_handler->delete( $deltpl[$i] ) ) {
+ if (!$tplfile_handler->delete($deltpl[$i])) {
$delng[] = $deltpl[$i]->getVar('tpl_file');
}
}
@@ -564,7 +564,7 @@
$tpl['file'] = trim($tpl['file']);
// START irmtfan solve templates duplicate issue
// if (!in_array($tpl['file'], $delng)) { // irmtfan bug fix: remove codes for delete templates
- $type = (isset($tpl['type']) ? $tpl['type'] : 'module');
+ $type = (isset($tpl['type']) ? $tpl['type'] : 'module');
if (preg_match("/\.css$/i", $tpl['file'])) {
$type = 'css';
}
@@ -576,44 +576,44 @@
$criteria->add(new Criteria("tpl_type", $type), "AND");
$tplfiles = $tplfile_handler->getObjects($criteria);
- $tpldata =& xoops_module_gettemplate($dirname, $tpl['file'], $type);
+ $tpldata =& xoops_module_gettemplate($dirname, $tpl['file'], $type);
$tplfile = empty($tplfiles) ? $tplfile_handler->create() : $tplfiles[0];
// END irmtfan solve templates duplicate issue
- $tplfile->setVar('tpl_refid', $newmid);
- $tplfile->setVar('tpl_lastimported', 0);
- $tplfile->setVar('tpl_lastmodified', time());
- $tplfile->setVar('tpl_type', $type);
- $tplfile->setVar('tpl_source', $tpldata, true);
- $tplfile->setVar('tpl_module', $dirname);
- $tplfile->setVar('tpl_tplset', 'default');
- $tplfile->setVar('tpl_file', $tpl['file'], true);
- $tplfile->setVar('tpl_desc', $tpl['description'], true);
- if (!$tplfile_handler->insert($tplfile)) {
- $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
- _AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR,
- "<strong>" . $tpl['file'] . "</strong>"
- ) . '</span>';
- } else {
- $newid = $tplfile->getVar('tpl_id');
- $msgs[] = ' ' . sprintf(
- _AM_SYSTEM_MODULES_TEMPLATE_INSERT_DATA,
- "<strong>" . $tpl['file'] . "</strong>"
- );
- if ($xoopsConfig['template_set'] == 'default') {
- if (!xoops_template_touch($newid)) {
- $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
- _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR,
- "<strong>" . $tpl['file'] . "</strong>"
- ) . '</span>';
- } else {
- $msgs[] = ' <span>' . sprintf(
- _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE,
- "<strong>" . $tpl['file'] . "</strong>"
- ) . '</span>';
+ $tplfile->setVar('tpl_refid', $newmid);
+ $tplfile->setVar('tpl_lastimported', 0);
+ $tplfile->setVar('tpl_lastmodified', time());
+ $tplfile->setVar('tpl_type', $type);
+ $tplfile->setVar('tpl_source', $tpldata, true);
+ $tplfile->setVar('tpl_module', $dirname);
+ $tplfile->setVar('tpl_tplset', 'default');
+ $tplfile->setVar('tpl_file', $tpl['file'], true);
+ $tplfile->setVar('tpl_desc', $tpl['description'], true);
+ if (!$tplfile_handler->insert($tplfile)) {
+ $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR,
+ "<strong>" . $tpl['file'] . "</strong>"
+ ) . '</span>';
+ } else {
+ $newid = $tplfile->getVar('tpl_id');
+ $msgs[] = ' ' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_INSERT_DATA,
+ "<strong>" . $tpl['file'] . "</strong>"
+ );
+ if ($xoopsConfig['template_set'] == 'default') {
+ if (!xoops_template_touch($newid)) {
+ $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR,
+ "<strong>" . $tpl['file'] . "</strong>"
+ ) . '</span>';
+ } else {
+ $msgs[] = ' <span>' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE,
+ "<strong>" . $tpl['file'] . "</strong>"
+ ) . '</span>';
+ }
}
}
- }
- unset($tpldata);
+ unset($tpldata);
// irmtfan bug fix: remove codes for delete templates
/*
} else {
@@ -1101,6 +1101,7 @@
$msgs[] = sprintf(_AM_SYSTEM_MODULES_OKUPD, '<strong>' . $module->getVar('name', 's') . '</strong>');
$msgs[] = '</div></div>';
$msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN
+ . '</a> | <a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN
. '</a></div>';
foreach ($msgs as $msg) {
echo $msg . '<br />';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/xoops_version.php 2013-09-16 18:46:15 UTC (rev 12063)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/xoops_version.php 2013-09-17 12:12:00 UTC (rev 12064)
@@ -452,5 +452,3 @@
$modversion['config'][$i]['formtype'] = 'hidden';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 0;
-
-?>
\ No newline at end of file
|
|
From: <luc...@us...> - 2013-09-16 18:46:20
|
Revision: 12063
http://sourceforge.net/p/xoops/svn/12063
Author: luciorota
Date: 2013-09-16 18:46:15 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
added: enable/disable brokens reports system (luciorota)
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_footer.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -28,90 +28,129 @@
$indexAdmin = new ModuleAdmin();
//--------------------------
-$totalcats = wfdownloads_categoriesCount();
-$totalbrokendownloads = $wfdownloads->getHandler('report')->getCount();
-$totalmodrequests = $wfdownloads->getHandler('modification')->getCount();
-$newreviews = $wfdownloads->getHandler('review')->getCount();
-$newmirrors = $wfdownloads->getHandler('mirror')->getCount();
-$totalnewdownloads = $wfdownloads->getHandler('download')->getCount(new Criteria('published', 0));
-$totaldownloads = $wfdownloads->getHandler('download')->getCount(new Criteria('published', 0, ">"));
+$categories_count = wfdownloads_categoriesCount();
+$brokenDownloads_count = $wfdownloads->getHandler('report')->getCount();
+$modificationRequests_count = $wfdownloads->getHandler('modification')->getCount();
+$newReviews_count = $wfdownloads->getHandler('review')->getCount();
+$newMirrors_count = $wfdownloads->getHandler('mirror')->getCount();
+$newDownloads_count = $wfdownloads->getHandler('download')->getCount(new Criteria('published', 0));
+$downloads_count = $wfdownloads->getHandler('download')->getCount(new Criteria('published', 0, '>'));
$indexAdmin->addInfoBox(_AM_WFD_MINDEX_DOWNSUMMARY);
// Categories
-if ($totalcats > 0) {
+if ($categories_count > 0) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="categories.php">' . _AM_WFD_SCATEGORY . '</a><b>'
- . "</infolabel>", $totalcats, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="categories.php">' . _AM_WFD_SCATEGORY . '</a></infolabel>',
+ $categories_count,
+ 'green'
);
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SCATEGORY . "</infolabel>", $totalcats, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SCATEGORY . '</infolabel>',
+ $categories_count,
+ 'green'
);
}
// Downloads
-if ($totaldownloads > 0) {
+if ($downloads_count > 0) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="downloads.php">' . _AM_WFD_SFILES . '</a><b>'
- . "</infolabel>", $totaldownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="downloads.php">' . _AM_WFD_SFILES . '</a><b></infolabel>',
+ $downloads_count,
+ 'green'
);
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SFILES . "</infolabel>", $totaldownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SFILES . '</infolabel>',
+ $downloads_count,
+ 'green'
);
}
// New/waiting downloads
-if ($totalnewdownloads > 0) {
+if ($newDownloads_count > 0) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="downloads.php">' . _AM_WFD_SNEWFILESVAL . '</a><b>'
- . "</infolabel>", $totalnewdownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="downloads.php">' . _AM_WFD_SNEWFILESVAL . '</a></infolabel>',
+ $newDownloads_count,
+ 'green'
);
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SNEWFILESVAL . "</infolabel>", $totalnewdownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SNEWFILESVAL . '</infolabel>',
+ $newDownloads_count,
+ 'green'
);
}
// Reviews
-if ($newreviews > 0) {
+if ($wfdownloads->getConfig('enable_reviews') == false) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reviews.php">' . _AM_WFD_SREVIEWS . '</a><b>'
- . "</infolabel>", $newreviews, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SREVIEWS . '</infolabel>',
+ _CO_WFD_DISABLED,
+ 'red'
);
+} elseif ($newReviews_count > 0) {
+ $indexAdmin->addInfoBoxLine(
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="reviews.php">' . _AM_WFD_SREVIEWS . '</a></infolabel>',
+ $newReviews_count,
+ 'green'
+ );
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SREVIEWS . "</infolabel>", $newreviews, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SREVIEWS . '</infolabel>',
+ $newReviews_count,
+ 'green'
);
}
// Modifications
-if ($totalmodrequests > 0) {
+if ($modificationRequests_count > 0) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reportsmodifications.php">' . _AM_WFD_SMODREQUEST . '</a><b>'
- . "</infolabel>", $totalmodrequests, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="reportsmodifications.php">' . _AM_WFD_SMODREQUEST . '</a></infolabel>',
+ $modificationRequests_count,
+ 'green'
);
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SMODREQUEST . "</infolabel>", $totalmodrequests, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SMODREQUEST . '</infolabel>',
+ $modificationRequests_count,
+ 'green'
);
}
// Brokens reports
-if ($totalbrokendownloads > 0) {
+if ($wfdownloads->getConfig('enable_brokenreports') == false) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="reportsmodifications.php">' . _AM_WFD_SBROKENSUBMIT . '</a><b>'
- . "</infolabel>", $totalbrokendownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SBROKENSUBMIT . '</infolabel>',
+ _CO_WFD_DISABLED,
+ 'red'
);
+} elseif ($brokenDownloads_count > 0) {
+ $indexAdmin->addInfoBoxLine(
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="reportsmodifications.php">' . _AM_WFD_SBROKENSUBMIT . '</a></infolabel>',
+ $brokenDownloads_count,
+ 'green'
+ );
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SBROKENSUBMIT . "</infolabel>", $totalbrokendownloads, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SBROKENSUBMIT . '</infolabel>',
+ $brokenDownloads_count,
+ 'green'
);
}
// Mirrors
-if ($newmirrors > 0) {
+if ($wfdownloads->getConfig('enable_mirrors') == false) {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . '<a href="mirrors.php">' . _AM_WFD_SMIRRORS . '</a><b>'
- . "</infolabel>", $newmirrors, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SMIRRORS . '</infolabel>',
+ _CO_WFD_DISABLED,
+ 'red'
);
+} elseif ($newMirrors_count > 0) {
+ $indexAdmin->addInfoBoxLine(
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel><a href="mirrors.php">' . _AM_WFD_SMIRRORS . '</a></infolabel>',
+ $newMirrors_count,
+ 'green'
+ );
} else {
$indexAdmin->addInfoBoxLine(
- _AM_WFD_MINDEX_DOWNSUMMARY, "<infolabel>" . _AM_WFD_SMIRRORS . "</infolabel>", $newmirrors, 'Green'
+ _AM_WFD_MINDEX_DOWNSUMMARY, '<infolabel>' . _AM_WFD_SMIRRORS . '</infolabel>',
+ $newMirrors_count,
+ 'green'
);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -164,6 +164,11 @@
$GLOBALS['xoopsTpl']->assign('mirrors_published_pagenav', $pagenav_published->renderNav());
}
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
+ $xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+ $xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
+
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_mirrorslist.html");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -74,6 +74,11 @@
$ratings_pagenav = new XoopsPageNav($ratings_count, $wfdownloads->getConfig('admin_perpage'), $start, 'start');
$GLOBALS['xoopsTpl']->assign('ratings_pagenav', $ratings_pagenav->renderNav());
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
+ $xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+ $xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
+
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_ratingslist.html");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -23,7 +23,7 @@
$op = WfdownloadsRequest::getString('op', 'reports.modifications.list');
switch ($op) {
- case "reports.update":
+ case "reports.update" :
$lid = WfdownloadsRequest::getInt('lid', 0);
$criteria = new Criteria('lid', $lid);
if (isset($_GET['ack'])) {
@@ -39,7 +39,7 @@
redirect_header($currentFile, 1, $update_mess);
break;
- case "report.delete":
+ case "report.delete" :
$lid = WfdownloadsRequest::getInt('lid', 0);
$criteria = new Criteria('lid', $lid);
$report = $wfdownloads->getHandler('report')->getObjects($criteria);
@@ -51,7 +51,7 @@
redirect_header($currentFile, 1, _AM_WFD_BROKENFILEDELETED);
break;
- case "report.ignore":
+ case "report.ignore" :
$lid = WfdownloadsRequest::getInt('lid', 0);
$criteria = new Criteria('lid', $lid);
$report = $wfdownloads->getHandler('report')->getObjects($criteria);
@@ -61,7 +61,7 @@
redirect_header($currentFile, 1, _AM_WFD_BROKEN_FILEIGNORED);
break;
- case "modification.show":
+ case "modification.show" :
wfdownloads_xoops_cp_header();
$requestid = intval($_GET['requestid']);
@@ -71,12 +71,12 @@
$orig_user = new XoopsUser($download->getVar('submitter'));
$submittername = XoopsUserUtility::getUnameFromId($download->getVar('submitter')); // $orig_user->getvar("uname");
- $submitteremail = $orig_user->getVar("email");
+ $submitteremail = $orig_user->getVar('email');
echo "<div><b>" . _AM_WFD_MOD_MODPOSTER . "</b> $submittername</div>";
- $not_allowed = array("lid", "submitter", "requestid", "modifysubmitter");
+ $not_allowed = array('lid', 'submitter', 'requestid', 'modifysubmitter');
- $sform = new XoopsThemeForm(_AM_WFD_MOD_ORIGINAL, "storyform", "index.php");
+ $sform = new XoopsThemeForm(_AM_WFD_MOD_ORIGINAL, 'storyform', 'index.php');
$keys = $download->getVars();
foreach (array_keys($keys) as $key) {
@@ -87,42 +87,42 @@
$content = $download->getVar($key, 'e');
switch ($key) {
- case "platform":
- case "license":
- case "limitations":
- case "versiontypes":
+ case "platform" :
+ case "license" :
+ case "limitations" :
+ case "versiontypes" :
$tempArray = $wfdownloads->getConfig($key);
$content = $tempArray[$download->getVar($key)];
break;
- case "cid":
+ case "cid" :
$category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria("cid", $download->getVar($key)));
if (!isset($category_list[0])) {
continue;
}
$content = $category_list[0]->getVar('title', 'e');
break;
- case "screenshot":
- if ($content != "") {
+ case "screenshot" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot2":
- if ($content != "") {
+ case "screenshot2" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot3":
- if ($content != "") {
+ case "screenshot3" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot4":
- if ($content != "") {
+ case "screenshot4" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "features":
- case "requirements":
+ case "features" :
+ case "requirements" :
if ($content != '') {
$downrequirements = explode('|', trim($content));
foreach ($downrequirements as $bi) {
@@ -130,7 +130,7 @@
}
}
break;
- case "dhistory":
+ case "dhistory" :
$content = $myts->displayTarea($content, true, false, false, false, true);
break;
}
@@ -139,11 +139,11 @@
$sform->display();
$modify_user = new XoopsUser($modification->getVar('modifysubmitter'));
- $modifyname = XoopsUserUtility::getUnameFromId(intval($modify_user->getVar('uid')));
- $modifyemail = $modify_user->getVar("email");
+ $modifyname = XoopsUserUtility::getUnameFromId((int)$modify_user->getVar('uid'));
+ $modifyemail = $modify_user->getVar('email');
echo "<div><b>" . _AM_WFD_MOD_MODIFYSUBMITTER . "</b> $modifyname</div>";
- $sform = new XoopsThemeForm(_AM_WFD_MOD_PROPOSED, "storyform", "reportsmodifications.php");
+ $sform = new XoopsThemeForm(_AM_WFD_MOD_PROPOSED, 'storyform', 'reportsmodifications.php');
$keys = $modification->getVars();
foreach (array_keys($keys) as $key) {
if (in_array($key , $not_allowed)) {
@@ -153,42 +153,42 @@
$content = $modification->getVar($key, 'e');
switch ($key) {
- case "platform":
- case "license":
- case "limitations":
- case "versiontypes":
+ case "platform" :
+ case "license" :
+ case "limitations" :
+ case "versiontypes" :
$tempArray = $wfdownloads->getConfig($key);
$content = $tempArray[$modification->getVar($key)];
break;
- case "cid":
- $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria("cid", $modification->getVar($key)));
+ case "cid" :
+ $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria('cid', $modification->getVar($key)));
if (!isset($category_list[0])) {
continue;
}
$content = $category_list[0]->getVar('title', 'e');
break;
- case "screenshot":
- if ($content != "") {
+ case "screenshot" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot2":
- if ($content != "") {
+ case "screenshot2" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot3":
- if ($content != "") {
+ case "screenshot3" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "screenshot4":
- if ($content != "") {
+ case "screenshot4" :
+ if ($content != '') {
$content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
- case "features":
- case "requirements":
+ case "features" :
+ case "requirements" :
if ($content != '') {
$downrequirements = explode('|', trim($content));
foreach ($downrequirements as $bi) {
@@ -196,7 +196,7 @@
}
}
break;
- case "dhistory":
+ case "dhistory" :
$content = $myts->displayTarea($content, true, false, false, false, true);
break;
}
@@ -205,17 +205,17 @@
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('requestid', $requestid));
- $button_tray->addElement(new XoopsFormHidden('lid', intval($modification->getVar('lid'))));
+ $button_tray->addElement(new XoopsFormHidden('lid', (int)$modification->getVar('lid')));
$hidden = new XoopsFormHidden('op', 'modification.change');
$button_tray->addElement($hidden);
if (!$modification->isNew()) {
- $butt_dup = new XoopsFormButton('', '', _AM_WFD_BAPPROVE, 'submit');
- $butt_dup->setExtra('onclick="this.form.elements.op.value=\'modification.change\'"');
- $button_tray->addElement($butt_dup);
+ $approve_button = new XoopsFormButton('', '', _AM_WFD_BAPPROVE, 'submit');
+ $approve_button->setExtra('onclick="this.form.elements.op.value=\'modification.change\'"');
+ $button_tray->addElement($approve_button);
}
- $butt_dupct2 = new XoopsFormButton('', '', _AM_WFD_BIGNORE, 'submit');
- $butt_dupct2->setExtra('onclick="this.form.elements.op.value=\'modification.ignore\'"');
- $button_tray->addElement($butt_dupct2);
+ $ignore_button = new XoopsFormButton('', '', _AM_WFD_BIGNORE, 'submit');
+ $ignore_button->setExtra('onclick="this.form.elements.op.value=\'modification.ignore\'"');
+ $button_tray->addElement($ignore_button);
$sform->addElement($button_tray);
$sform->display();
@@ -266,19 +266,19 @@
redirect_header(WFDOWNLOADS_URL . '/admin/index.php', 1, _AM_WFD_MOD_REQUPDATED);
break;
- case "modification.ignore":
+ case "modification.ignore" :
$criteria = new Criteria('requestid', intval($_POST['requestid']));
$wfdownloads->getHandler('modification')->deleteAll($criteria, true);
redirect_header(WFDOWNLOADS_URL . '/admin/index.php', 1, _AM_WFD_MOD_REQDELETED);
break;
- case "reports.modifications.list":
+ case "reports.modifications.list" :
default:
$start_report = WfdownloadsRequest::getInt('start_report', 0);
$criteria = new CriteriaCompo();
$reports_count = $wfdownloads->getHandler('report')->getCount();
- $criteria->setSort("date");
+ $criteria->setSort('date');
$criteria->setOrder('DESC');
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria->setStart($start_report);
@@ -295,11 +295,11 @@
$lids[] = $reports[$i]->getVar('lid');
$uids[] = $reports[$i]->getVar('sender');
}
- $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria('lid', "(".implode(',', array_unique($lids)).")", "IN"), true);
+ $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria('lid', '(' . implode(',', array_unique($lids)) . ')', 'IN'), true);
foreach (array_keys($downloads) as $i) {
$uids[] = $downloads[$i]->getVar('submitter');
}
- $users = $member_handler->getUsers(new Criteria("uid", "(" . implode(',', array_unique($uids)) . ")", "IN"), true);
+ $users = $member_handler->getUsers(new Criteria('uid', '(' . implode(',', array_unique($uids)) . ')', 'IN'), true);
foreach ($reports as $report) {
$report_array = $report->toArray();
@@ -318,8 +318,8 @@
$report_array['submitter_email'] = '';
$report_array['submitter_uname'] = $xoopsConfig['anonymous'];
}
- $sender = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')] : "";
- $report_array['reporter_email'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('email') : "";
+ $sender = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')] : '';
+ $report_array['reporter_email'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('email') : '';
$report_array['reporter_uname'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
$report_array['formatted_date'] = formatTimestamp($report->getVar('date'), _DATESTRING);
$GLOBALS['xoopsTpl']->append('reports', $report_array);
@@ -354,6 +354,11 @@
$GLOBALS['xoopsTpl']->assign('modifications_pagenav', $pagenav_modification -> renderNav());
}
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
+ $xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+ $xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
+
$GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_reportsmodificationslist.html");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -176,6 +176,11 @@
$GLOBALS['xoopsTpl']->assign('reviews_published_pagenav', $pagenav_published -> renderNav());
}
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
+ $xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
+ $xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+ $xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
+
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_reviewslist.html");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -31,6 +31,11 @@
redirect_header('index.php', 3, _MD_WFD_NODOWNLOAD);
}
+// Check permissions
+if ($wfdownloads->getConfig('enable_brokenreports') == false && !wfdownloads_userIsAdmin()) {
+ redirect_header('index.php', 3, _NOPERM);
+}
+
// Breadcrumb
include_once XOOPS_ROOT_PATH . "/class/tree.php";
$categoriesTree = new XoopsObjectTree($wfdownloads->getHandler('category')->getObjects(), 'cid', 'pid');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta (2013-09-15)</u></b>
+<b><u>=> Version 3.23 Beta (2013-09-16)</u></b>
- module standardization: header.php, admin/admin_header.php, xoops_version.php
- module standardization: standardize directories/files names/structures
- module standardization: standardize code headers
@@ -11,8 +11,10 @@
- fixed: deprecated "XoopsTree" (luciorota)
- fixed: html errors in templates (luciorota)
- fixed: deprecated XoopsTree (mamba)
+- added: updating to XOOPS 2.5.7 Multi-page help (mamba)
- added: enable/disable reviews system (luciorota)
- added: enable/disable ratings system (luciorota)
+- added: enable/disable brokens reports system (luciorota)
- added: admin side downloads filter (luciorota)
- added: breadcrumb class (luciorota)
- added: html tags compatible autosummary generator (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -641,3 +641,9 @@
define('_AM_WFD_SEARCH_GREATERTHAN','>');
define('_AM_WFD_SEARCH_LESSTHAN','<');
define('_AM_WFD_SEARCH_CONTAINS','contains');
+
+
+define('_AM_WFD_MIRROR_DISABLED','Warning: mirrors system is disabled in module preferences.');
+define('_AM_WFD_REVIEW_DISABLED','Warning: reviews system is disabled in module preferences.');
+define('_AM_WFD_RATING_DISABLED','Warning: ratings system is disabled in module preferences.');
+define('_AM_WFD_BROKENREPORT_DISABLED','Warning: bokens reports system is disabled in module preferences.');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,4 +1,7 @@
<?php
+define("_CO_WFD_ENABLED","Enabled");
+define("_CO_WFD_DISABLED","Disabled");
+
define("_CO_WFD_MIRROR","Mirror");
define("_CO_WFD_MIRRORS","Mirrors");
define("_CO_WFD_MIRRORS_LIST","Mirrors list");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -110,7 +110,7 @@
define('_MI_WFD_UPLOADDIR','[upload files] Upload directory');
define('_MI_WFD_UPLOADDIRDSC','Upload directory *MUST* be an absolute path!<br />No trailing slash.');
-define('_MI_WFD_ENABLERSS','Enable RSS Feeds');
+define('_MI_WFD_ENABLERSS','[RSS feeds] Enable RSS Feeds');
define('_MI_WFD_ENABLERSSDSC','Select "' . _YES . '" to enable rss feeds.');
define('_MI_WFD_DOWNLOADMINPOSTS',"Minimum posts required to download");
@@ -355,4 +355,7 @@
define("_MI_WFD_REVIEW_ENABLEDSC","If enabled, reviews system (submit and show reviews) is enabled in backend.");
define("_MI_WFD_RATING_ENABLE","[ratings] Enable ratings system");
-define("_MI_WFD_RATING_ENABLEDSC","If enabled, ratings system (vote and show ratings) is enabled in backend.");
\ No newline at end of file
+define("_MI_WFD_RATING_ENABLEDSC","If enabled, ratings system (vote and show ratings) is enabled in backend.");
+
+define("_MI_WFD_BROKENREPORT_ENABLE","[brokens reports] Enable brokens reports system");
+define("_MI_WFD_BROKENREPORT_ENABLEDSC","If enabled, brokens reports system is enabled in backend.");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -234,6 +234,7 @@
$xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
$xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
$xoopsTpl->assign('use_rss', $wfdownloads->getConfig('enablerss'));
// Copyright
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,3 +1,6 @@
+<{if $use_mirrors == false}>
+ <div class="errorMsg"><{$smarty.const._AM_WFD_MIRROR_DISABLED}></div>
+<{/if}>
<fieldset>
<legend style='font-weight: bold;'><{$smarty.const._AM_WFD_AMIRRORS_INFO}></legend>
<p>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,3 +1,6 @@
+<{if $use_ratings == false}>
+ <div class="errorMsg"><{$smarty.const._AM_WFD_RATING_DISABLED}></div>
+<{/if}>
<fieldset>
<legend style='font-weight: bold;'><{$smarty.const._AM_WFD_VOTE_DISPLAYVOTES}></legend>
<p>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,3 +1,6 @@
+<{if $use_brokenreports == false}>
+ <div class="errorMsg"><{$smarty.const._AM_WFD_BROKENREPORT_DISABLED}></div>
+<{/if}>
<fieldset>
<legend style='font-weight: bold;'><{$smarty.const._AM_WFD_BROKEN_REPORTINFO}></legend>
<p>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -1,3 +1,6 @@
+<{if $use_reviews == false}>
+ <div class="errorMsg"><{$smarty.const._AM_WFD_REVIEW_DISABLED}></div>
+<{/if}>
<fieldset>
<legend style='font-weight: bold;'><{$smarty.const._AM_WFD_AREVIEWS_INFO}></legend>
<p>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_footer.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_footer.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_footer.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -3,6 +3,7 @@
<{/if}>
<{if $com_rule <> 0}>
+<a name="comments"></a>
<div class="wfd_foot_commentnav">
<{$commentsnav}>
<{$lang_notice}>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html 2013-09-16 18:46:15 UTC (rev 12063)
@@ -221,11 +221,15 @@
<a href="submit.php?cid=<{$download.cid}>&lid=<{$download.id}>"><{$smarty.const._MD_WFD_MODIFY}></a>
|
<{/if}>
+ <{if $download.use_brokenreports == 1}>
<a href="brokenfile.php?cid=<{$download.cid}>&lid=<{$download.id}>"><{$smarty.const._MD_WFD_REPORTBROKEN}></a>
|
+ <{/if}>
<a target="_top" href="mailto:?subject=<{$download.mail_subject}>&body=<{$download.mail_body}>"><{$smarty.const._MD_WFD_TELLAFRIEND}></a>
+ <{if $com_rule <> 0}>
|
- <a href="singlefile.php?cid=<{$download.cid}>&lid=<{$download.id}>"><{$smarty.const._COMMENTS}> (<{$download.comments}>)</a>
+ <a href="#comments"><{$smarty.const._COMMENTS}> (<{$download.comments}>)</a>
+ <{/if}>
</small>
</div>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-16 16:51:09 UTC (rev 12062)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-16 18:46:15 UTC (rev 12063)
@@ -47,9 +47,9 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-09-15';
-$modversion['release_date'] = '2013/09/15';
-$modversion['releasedate'] = '2013-09-15';
+$modversion['date'] = '2013-09-16';
+$modversion['release_date'] = '2013/09/16';
+$modversion['releasedate'] = '2013-09-16';
$modversion['status'] = 'BETA';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
@@ -317,14 +317,6 @@
//Module config setting
-$modversion['config'][] = array(
- 'name' => 'enablerss',
- 'title' => '_MI_WFD_ENABLERSS',
- 'description' => '_MI_WFD_ENABLERSSDSC',
- 'formtype' => 'yesno',
- 'valuetype' => 'int',
- 'default' => false);
-
xoops_load('XoopsEditorHandler');
$editor_handler = XoopsEditorHandler::getInstance();
$editorList = array_flip($editor_handler->getList());
@@ -608,6 +600,14 @@
'default' => 'uploads/' . $modversion['dirname'] . '/images');
$modversion['config'][] = array(
+ 'name' => 'extrasystems_configs',
+ 'title' => '',
+ 'description' => '',
+ 'formtype' => 'line_break',
+ 'valuetype' => 'textbox',
+ 'default' => 'head');
+
+$modversion['config'][] = array(
'name' => 'enable_reviews',
'title' => '_MI_WFD_REVIEW_ENABLE',
'description' => '_MI_WFD_REVIEW_ENABLEDSC',
@@ -640,6 +640,22 @@
'default' => true);
$modversion['config'][] = array(
+ 'name' => 'enable_brokenreports',
+ 'title' => '_MI_WFD_BROKENREPORT_ENABLE',
+ 'description' => '_MI_WFD_BROKENREPORT_ENABLEDSC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => true);
+
+$modversion['config'][] = array(
+ 'name' => 'enablerss',
+ 'title' => '_MI_WFD_ENABLERSS',
+ 'description' => '_MI_WFD_ENABLERSSDSC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => false);
+
+$modversion['config'][] = array(
'name' => 'enable_mirrors',
'title' => '_MI_WFD_MIRROR_ENABLE',
'description' => '_MI_WFD_MIRROR_ENABLEDSC',
@@ -656,6 +672,14 @@
'default' => true);
$modversion['config'][] = array(
+ 'name' => 'permissions_configs',
+ 'title' => '',
+ 'description' => '',
+ 'formtype' => 'line_break',
+ 'valuetype' => 'textbox',
+ 'default' => 'head');
+
+$modversion['config'][] = array(
'name' => 'download_minposts',
'title' => '_MI_WFD_DOWNLOADMINPOSTS',
'description' => '_MI_WFD_DOWNLOADMINPOSTSDSC',
|
|
From: <be...@us...> - 2013-09-16 16:51:12
|
Revision: 12062
http://sourceforge.net/p/xoops/svn/12062
Author: beckmi
Date: 2013-09-16 16:51:09 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
Updating to XOOPS 2.5.7 Multi-page help
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help.html
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/docs/history.txt
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help2.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help3.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help4.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help5.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help6.html
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/docs/english/
Added: XoopsModules/wfdownloads/trunk/wfdownloads/docs/history.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/history.txt (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/history.txt 2013-09-16 16:51:09 UTC (rev 12062)
@@ -0,0 +1,115 @@
+WF-Downloads History
+====================
+This page will describe important feature changes based on versions.
+For a complete list of all bugs squashed and every single change please click on changelog.
+
+------------------------
+Version 3.20
+------------------------
+New Disclaimer Template Added
+
+The disclaimer text in the submission & visit/download pages is now templated for easier customisation..
+
+Extended Screenshot Submissions
+------------------------
+
+It is now possible via a select function in the modules preferences to select from 1 - 4 screenshots. This allows webmasters to select how many screenshots can be uploaded per download..
+
+Formulize 2.2 Integration
+------------------------
+
+It is now possible to create custom forms providing that you have the latest version (2.2) of Formulize module installed..
+
+With this new integration with Formulize, there are some UI changes in WFDownloads:
+
+Admin side:
+------------------------
+
+1. On the Categories Tab, the add/modify category form includes an option at the bottom to select a form to use instead of the standard form (the standard form can still be selected).
+Only forms which the user has view_form permission on are included in the list.
+2. On the Files Tab...instead of the form appearing immediately when you click this tab, you must first choose the category you want to submit a file to.
+Then the form appears, either the standard one or a customized one depending on the settings for the category you chose.
+3. Import scripts added to import data from pd-downloads and wmpdownloads aswell as mydownloads.
+
+User side:
+1. When submitting a file, instead of the form appearing immediately when you click Submit, you must first choose the category you want to submit a file to.
+Then the form appears, either the standard one or a customized one depending on the settings for the category you chose.
+2. When viewing a category that has a custom form, the "Price: Free | Platform: None | License: None | Limitations: None" line is turned off.
+3. When viewing all details for a file that has a custom form, the "Price: Free | Platform: None | License: None | Limitations: None" line is turned off, plus all fields from the custom form are displayed.
+4. When using the built in XOOPS search feature, all fields in the custom form are cross-referenced with the search term(s) to determine matches.
+
+RSS Feeds Added
+------------------------
+
+It is now possible to get RSS feeds for latest submissions or category based (depending on permissions)
+
+Usage:
+
+1. For feeds of all latest downloads (if allowed) call wfdownloads/rss.php
+2. For Category based feeds (if allowed) call wfdownloads/rss.php?cid=xx (where xx is the category id)
+
+------------------------
+Version 3.00rc1 & 3.10
+------------------------
+
+Performance and server utilisation improvements
+------------------------
+
+By rewriting a lot of those querries accessing the database the module should now perform significantly faster and cause much less load on your server.
+
+New mirror system
+------------------------
+
+A new way for mirror handling was introduced. Now you can have more than one mirror for every file. The mirrors are listed on a separate page and will if activated show if the server is up.
+It does also allow you to enter additional information for the mirror server like a title and location.
+
+Improved file security
+------------------------
+
+In the past your options to protect your files from being linked to were limited to the referrer check which caused problems for users that disabled referrers in their browser.
+With version 3.10 we introduce a new way of protection against other sites stealing your files. (actually two ways)
+
+1) Files are now stored under a different name internally if you upload them with the module. When sent back to the user the original name will be restored.
+
+The real link is not displayed to the user anywhere.
+
+2) Files can now be stored outside of your website root. So there is no way of pointing to that file from the outside even if anyone would know the filename.
+
+To explain this a bit: Assume this is your server structure:
+- ..
+- example directory
+- htmdocs (containing your Xoops installation)
+ -- uploads (containing your uploads)
+
+Now lets assume your domain www.sitexy.com is pointing to htmdocs. Now the first directory level accessible from the outside is htmdocs where your xoops installation is placed.
+No one is able to access the lower directories which are on the same or lower level as htmdocs. Beginning with version 3.10 you are now able to put WF-Downloads uploads directory anywhere on your server outside of htmdocs.
+Therefore it can only be accessed by the server now. Your folder structure could now look like this:
+- ..
+- example directory
+- htmdocs (containing your Xoops installation)
+- uploads (now outside of your Xoops installation)
+
+Please note that both features (if you are updating from a previous version) will only affect all new files from that moment in time forward. All currently existing files will still remain in the old uploads folder and be handled accordingly.
+
+Change in update routine
+------------------------
+
+Updating the module should now be aesier than in previous versions. Now you just upload the new module version and update the module in the Xoops module management and everything is done. If you want to convert from MyDownloads to WF-Downloads you install the module as usual and then click on Import data in the WF-Downloads admin area.
+
+Removal of some features
+------------------------
+
+In the process of the rewrite some features were removed from the module. This was done either to improve performance or because the features were relying on specific other module versions installed.
+
+Namely removed were: Add Discuss in this Forum? , Create News Story From Download and also file based permissions
+
+Change to only category based permissions
+------------------------
+
+In the past you could set group permissions for categories and then also for files. Now this has been reduced to only category permissions. If you used the file permissions in the past you will have to review your files and make sure the category permissions are set correct to determine access to the people you want. This decision was made mainly for performance reasons but also the fact that file permissions within an existing category based on permissions is somewhat overkill anyway and becomes rather confusing after some time.
+
+Bread crumb system added
+------------------------
+
+Similiar to the other Smart modules the bread crumb system was now added to WF-Downloads. For example if you browse through WF-Downloads you can now see your current path at the top. Example: WF-Downloads > Category 1 > Subcategory 3
+This will allow easier navigation within the module.
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt 2013-09-16 11:46:32 UTC (rev 12061)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt 2013-09-16 16:51:09 UTC (rev 12062)
@@ -16,3 +16,358 @@
__modinfo.php__
+ _MI_WFD_DB_IMPORT
+ _MI_WFD_HELP
+
+WF-Downloads Language Changes
+=================================================================
+v. 3.2.0 RC2 23/04/2007
+=================================================================
+FILE: \wfdownloads\language\english\main.php
+
+Added:
+
+define("_MD_WFD_FILENOTEXIST", "ERROR: File Does Not Exist or File Not Found!");
+define("_MD_WFD__MD_WFD_FILENOTOPEN", "ERROR: Unable To Open File!");
+define("_MD_WFD_VERSIONTYPES", "Release Status:");
+
+FILE: \wfdownloads\language\english\admin.php
+
+Added:
+define("_AM_WFD_MOD_VERSIONTYPES", "Release Status: ");
+define("_AM_WFD_FILE_VERSIONTYPES", "Release Status: ");
+
+=================================================================
+v. 3.2.0 RC1 23/04/2007
+=================================================================
+FILE: \wfdownloads\language\english\modinfo.php
+
+Added:
+define('_MI_WFD_MAXSHOTS', 'Select Max Number of screenshots:');
+define('_MI_WFD_MAXSHOTSDSC', 'Sets the maximum number of allowed screenshot uploads.');
+define('_MI_WFD_ALLOWUPLOADSGROUP','Uploads Submit:');
+define('_MI_WFD_ALLOWUPLOADSGROUPDSC','Select groups that can upload files.<br />This includes both files & screenshots!');
+define('_MI_WFD_ENABLERSS','Enable RSS Feeds:');
+define('_MI_WFD_ENABLERSSDSC','Select yes to enable rss feeds');
+define('_MI_WFD_CAT_IMGWIDTH', 'Category Image Display Width');
+define('_MI_WFD_CAT_IMGWIDTHDSC', 'Display width for category image');
+define('_MI_WFD_CAT_IMGHEIGHT', 'Category Image Display Height');
+define('_MI_WFD_CAT_IMGHEIGHTDSC', 'Display height for category image');
+define('_MI_WFD_FILE_FILEMODIFIED_NOTIFY', 'File Modified');
+define('_MI_WFD_FILE_FILEMODIFIED_NOTIFYCAP', 'Notify me when this file is modified.');
+define('_MI_WFD_FILE_FILEMODIFIED_NOTIFYDSC', 'Receive notification when this file is modified.');
+define('_MI_WFD_FILE_FILEMODIFIED_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : File Modified');
+define('_MI_WFD_CATEGORY_FILEMODIFIED_NOTIFY', 'File Modified');
+define('_MI_WFD_CATEGORY_FILEMODIFIED_NOTIFYCAP', 'Notify me when a file in this category is modified.');
+define('_MI_WFD_CATEGORY_FILEMODIFIED_NOTIFYDSC', 'Receive notification when a file in this category is modified.');
+define('_MI_WFD_CATEGORY_FILEMODIFIED_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : File Modified');
+define('_MI_WFD_GLOBAL_FILEMODIFIED_NOTIFY', 'File Modified');
+define('_MI_WFD_GLOBAL_FILEMODIFIED_NOTIFYCAP', 'Notify me when any file is modified.');
+define('_MI_WFD_GLOBAL_FILEMODIFIED_NOTIFYDSC', 'Receive notification when any file is modified.');
+define('_MI_WFD_GLOBAL_FILEMODIFIED_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : File Modified');
+
+Changed:
+define("_MI_WFD_SUBMITARTDSC", "Select groups that can submit new downloads.");
+To: define("_MI_WFD_SUBMITARTDSC", "Select groups that can submit new downloads.<br />Webmasters are automatically selected!");
+define('_MI_WFD_ALLOWUPLOADSDSC','Allow Users to upload files directly to your website');
+To: define('_MI_WFD_ALLOWUPLOADSDSC','Allow Users to upload files directly to your website.<br />This includes both files & screenshots!');
+define("_MI_WFD_USETHUMBSDSC", "Supported file types: JPG, GIF, PNG.
+WF-Downloads will use thumb nails for images. Set to 'No' to use orginal image if the server does not support this option.
+");
+To: define("_MI_WFD_USETHUMBSDSC", "Supported file types: JPG, GIF, PNG.
+WF-Downloads will use thumb nails for images (category & screenshots). Set to 'No' to use orginal image if the server does not support this option.
+");
+
+FILE: \wfdownloads\language\english\main.php
+
+Added:
+define("_MD_WFD_FFS_SUBMITCATEGORYHEAD", "Which Category of file do you want to submit?");
+define("_MD_WFD_FFS_DOWNLOADDETAILS", "Download details:");
+define("_MD_WFD_FFS_DOWNLOADCUSTOMDETAILS", "Custom details:");
+define("_MD_WFD_FFS_BACK", "Back");
+define("_MD_WFD_FFS_DOWNLOADTITLE", "Submitting a '{category}' file.");
+define("_MD_WFD_SCREENSHOT2", "Screenshot 2:");
+define("_MD_WFD_SCREENSHOT3", "Screenshot 3:");
+define("_MD_WFD_SCREENSHOT4", "Screenshot 4:");
+define("_MD_WFD_LEGENDTEXTRSS", "RSS Feeds");
+define("_MD_WFD_LEGENDTEXTCATRSS", "RSS Category Feed");
+define("_MD_WFD_NEEDLOGINVIEW", "You Need To Login First!");
+define("_MD_WFD_BYTES", " B");
+define("_MD_WFD_KILOBYTES", " Kb");
+define("_MD_WFD_MEGABYTES", " Mb");
+define("_MD_WFD_GIGABYTES", " Gb");
+define("_MD_WFD_TERRABYTES", " Tb");
+
+Changed:
+define("_MD_WFD_SCREENSHOT", "Screenshot:");
+To: define("_MD_WFD_SCREENSHOT", "Screenshot 1:");
+
+FILE: \wfdownloads\language\english\admin.php
+
+Added:
+define("_AM_WFD_FFS_SUBMITBROKEN", "Submit");
+define("_AM_WFD_FFS_STANDARD_FORM", "No, use the standard form");
+define("_AM_WFD_FFS_CUSTOM_FORM", "Use a custom form for this category?");
+define("_AM_WFD_FFS_DOWNLOADTITLE", "Submitting a '{category}' file.");
+define("_AM_WFD_FFS_EDITDOWNLOADTITLE", "Editing a '{category}' file.");
+define("_AM_WFD_FFS_BACK", "Back");
+define("_AM_WFD_FFS_RELOAD", "Reload");
+define("_MD_WFD_CATEGORYC", "Category: "); // _MD to reuse the category form
+define("_MD_WFD_FFS_SUBMITCATEGORYHEAD", "Which Category of file do you want to submit?");
+define("_MD_WFD_FFS_DOWNLOADDETAILS", "Download details:");
+define("_MD_WFD_FFS_DOWNLOADCUSTOMDETAILS", "Custom details:");
+define("_MD_WFD_FILETITLE", "Download Title: ");
+define("_MD_WFD_DLURL", "Download URL: ");
+define("_MD_WFD_UPLOAD_FILEC", "Upload File: ");
+define("_MD_WFD_DESCRIPTION", "Description");
+define("_AM_WFD_DOWN_METAVERSION", "<b>WF-Downloads Meta Version:<b> ");
+
+=================================================================
+v. 3.1.0 FINAL 25/05/2006
+=================================================================
+FILE: \wfdownloads\language\english\admin.php
+
+Added:
+define("_AM_WFD_MOD_FILENAME", "Local Filename: ");
+define("_AM_WFD_MOD_FILETYPE", "Local Filetype: ");
+define("_AM_WFD_MOD_STATUS", "Status: ");
+define("_AM_WFD_MOD_RATING", "Rating: ");
+define("_AM_WFD_MOD_HITS", "Hits: ");
+define("_AM_WFD_MOD_VOTES", "Votes: ");
+define("_AM_WFD_MOD_COMMENTS", "Comments: ");
+define("_AM_WFD_MOD_PUBLISHED", "Published: ");
+define("_AM_WFD_MOD_EXPIRED", "Expired: ");
+define("_AM_WFD_MOD_UPDATED", "Updated: ");
+define("_AM_WFD_MOD_OFFLINE", "Offline: ");
+define("_AM_WFD_MOD_REQUESTDATE", "Request Date: ");
+define("_AM_WFD_MOD_IPADDRESS", "IP Address: ");
+define("_AM_WFD_MOD_NOTIFYPUB", "Notify: ");
+define("_AM_WFD_MOD_PAYPALEMAIL", "PayPal Email: ");
+define("_AM_WFD_MOD_SUMMARY", "Summary: ");
+
+Changed:
+define("_AM_WFD_MOD_DESCRIPTION", "Software limitations: ");
+To: define("_AM_WFD_MOD_DESCRIPTION", "Description: ");
+define("_AM_WFD_MOD_URL", "Download Url: ");
+To: define("_AM_WFD_MOD_URL", "Remote Url: ");
+define("_AM_WFD_DBERROR", "Database Access Error: Please report this error to the WFSection Website");
+To: define("_AM_WFD_DBERROR", "Database Access Error: Please report this error to the SmartFactory Website");
+
+FILE: \wfdownloads\language\english\main.php
+
+Added:
+define("_MD_WFD_NOTALLOWEDTOMOD","You are not allowed to modify this download");
+
+=================================================================
+v. 3.1.0 RC2 01/05/2006
+=================================================================
+FILE: \wfdownloads\language\english\admin.php
+
+Added:
+define("_AM_WFD_CCATEGORY_CHILDASPARENT", "You cannot set a child category as the category's parent");
+define("_AM_WFD_FILE_SUBMITTERID", "Submitter User Id:<br /><br />Leave this as it is, Unless you want to change who submitted the download");
+
+Changed:
+define("_AM_WFD_FILE_FILENAME", "Local Filename: ");
+To: define("_AM_WFD_FILE_FILENAME", "Local Filename:<br /><br /><span style='font-weight: normal;'>Note: If using local file as download, then you must also enter the correct filetype below!</span>");
+
+=================================================================
+v. 3.1.0 RC1 08/04/2006
+=================================================================
+FILE: \wfdownloads\language\english\admin.php
+
+Added:
+define("_AM_WFD_SMIRRORS", "Mirrors: ");
+define("_AM_WFD_AREVIEWS_APPROVED", "Review has been approved.");
+define("_AM_WFD_DOWN_NOTSET", "Upload Path Not Set");
+define("_AM_WFD_DOWN_SERVERPATH", "Server Path to XOOPS Root: ");
+define("_AM_WFD_DOWN_UPLOADPATH", "Current Upload Path: ");
+define("_AM_WFD_DOWN_UPLOADPATHDSC", "Note. Upload Path *MUST* contain the full server path of your upload folder.");
+define("_AM_WFD_REV_REVIEWTITLE", "Review Title");
+define("_AM_WFD_REVIEW_APPROVETHIS", "Approve Review");
+define("_AM_WFD_REV_NOPUBLISHEDREVIEWS", "No Published Reviews Found");
+define("_AM_WFD_REV_REVIEW_TOTAL", "Total Reviews:");
+define("_AM_WFD_REV_REVIEW_WAITING", "Waiting Reviews");
+define("_AM_WFD_REV_REVIEW_PUBLISHED", "Published Reviews");
+define("_AM_WFD_FILE_FILENAME", "Local Filename: ");
+define("_AM_WFD_FILE_FILETYPE", "File Type: ");
+define("_AM_WFD_AMIRRORS", "Mirrors Management");
+define("_AM_WFD_AMIRRORS_WAITING", "Mirrors Waiting Validation:");
+define("_AM_WFD_AMIRRORS_INFO", "Mirrors Management Information");
+define("_AM_WFD_AMIRRORS_APPROVE", "<b>Approve</b> new mirror without validation.");
+define("_AM_WFD_AMIRRORS_EDIT", "<b>Edit</b> new mirror and then approve.");
+define("_AM_WFD_AMIRRORS_DELETE", "<b>Delete</b> the new mirror information.");
+define("_AM_WFD_MIRROR_MIRRORTITLE", "Mirror Host");
+define("_AM_WFD_MIRROR_NOPUBLISHEDMIRRORS", "No Published Mirrors Found");
+define("_AM_WFD_MIRROR_MIRROR_TOTAL", "Total Mirrors:");
+define("_AM_WFD_MIRROR_MIRROR_WAITING", "Waiting Mirrors");
+define("_AM_WFD_MIRROR_MIRROR_PUBLISHED", "Published Mirrors");
+define("_AM_WFD_MIRROR_SNEWMNAMEDESC", "Approve Mirror: ");
+define("_AM_WFD_MIRROR_ID", "ID");
+define("_AM_WFD_MIRROR_TITLE", "Title");
+define("_AM_WFD_MIRROR_MUSTBEVALID", "Home page logo must be a valid image file under %s directory (ex. shot.gif). Leave it blank if there is no image file.");
+define("_AM_WFD_MIRROR_POSTER", "Submitter");
+define("_AM_WFD_MIRROR_SUBMITDATE", "Submitted");
+define("_AM_WFD_MIRROR_FHOMEURLTITLE", "Home Page Title: ");
+define("_AM_WFD_MIRROR_FHOMEURL", "Home Page URL: ");
+define("_AM_WFD_MIRROR_UPLOADIMAGE", "Upload Site Logo:<br /><br />A small logo representing your website.");
+define("_AM_WFD_MIRROR_MIRRORIMAGE", "Site Logo:");
+define("_AM_WFD_MIRROR_CONTINENT", "Continent:");
+define("_AM_WFD_MIRROR_LOCATION", "Location:<br /><br />Example: London, UK");
+define("_AM_WFD_MIRROR_DOWNURL", "Download URL:<br /><br />Enter the url to the file.");
+define("_AM_WFD_MIRROR_FAPPROVE", "Mirror Approve: ");
+define("_AM_WFD_MIRROR_ACTION", "Action");
+define("_AM_WFD_MIRROR_NOWAITINGMIRRORS", "No Waiting Mirrors Found");
+define("_AM_WFD_MIRROR_MIRROR_UPDATED", "Selected Mirror Modified and Database Updated Successfully");
+define("_AM_WFD_MIRROR_APPROVETHIS", "Approve Mirror");
+define("_AM_WFD_CONT1","Africa");
+define("_AM_WFD_CONT2","Antarctica");
+define("_AM_WFD_CONT3","Asia");
+define("_AM_WFD_CONT4","Europe");
+define("_AM_WFD_CONT5","North America");
+define("_AM_WFD_CONT6","South America");
+define("_AM_WFD_CONT7","Oceania");
+define("_AM_WFD_HELP","Help");
+
+Changed:
+define("_AM_WFD_FILE_DLURL", "File URL: ");
+To: define("_AM_WFD_FILE_DLURL", "Remote URL: ");
+define("_AM_WFD_DB_CHECKTABLES", "Check tables");
+To: define("_AM_WFD_DB_IMPORT", "Import");
+
+FILE: \wfdownloads\language\english\main.php
+
+Added:
+define("_MD_WFD_UPLOADMINPOSTS", "You need to increase you Post Count<br />Before you can Upload Files");
+define("_MD_WFD_UPLOAD_FILENAME", "Local Filename: ");
+define("_MD_WFD_UPLOAD_FILETYPE", "File Type: ");
+define("_MD_WFD_ERROR_CREATEREVIEW", "Error when creating a review");
+define("_MD_WFD_REVIEW_CATPATH", "Category Path:");
+define("_MD_WFD_ADDREVIEW", "Add Review");
+define("_MD_WFD_MIRROR_AVAILABLE", "Mirrors Available:");
+define("_MD_WFD_MIRROR_CATPATH", "Category Path:");
+define("_MD_WFD_MIRROR_FILENAME", "Filename:");
+define("_MD_WFD_DOWNLOADMIRRORS", "Download Mirrors");
+define("_MD_WFD_MIRROR_NOTALLOWESTOSUBMIT", "You are not allowed to submit mirrors");
+define("_MD_WFD_MIRRORS", "Download Mirrors:");
+define("_MD_WFD_USERMIRRORSTITLE", "Available Download Mirrors");
+define("_MD_WFD_USERMIRRORS", "View Available Download Mirrors on %s");
+define("_MD_WFD_NOUSERMIRRORS", "Add a new Download Mirror on %s.");
+define("_MD_WFD_TOTALMIRRORS", "Total Mirrors:");
+define("_MD_WFD_ADDMIRROR", "Add Mirror");
+define("_MD_WFD_MIRROR_TOTAL", "<b>Total Mirrors:</b> %s");
+define("_MD_WFD_MIRROR_HOMEURLTITLE", "Homepage Title:");
+define("_MD_WFD_MIRROR_HOMEURL", "Homepage URL:<br /><br />Enter your Homepage url.");
+define("_MD_WFD_MIRROR_UPLOADMIRRORIMAGE", "Upload Site Logo:<br /><br />A small logo representing your website.");
+define("_MD_WFD_MIRROR_MIRRORIMAGE", "Site Logo:");
+define("_MD_WFD_MIRROR_CONTINENT", "Continent:");
+define("_MD_WFD_MIRROR_LOCATION", "Location:<br /><br />Example: London, UK");
+define("_MD_WFD_MIRROR_DOWNURL", "Download URL:<br /><br />Enter the url to the file.");
+define("_MD_WFD_MIRROR_SUBMITMIRROR", "Submit Mirror");
+define("_MD_WFD_ERROR_CREATEMIRROR", "Error when creating mirror");
+define("_MD_WFD_MIRROR_SNEWMNAMEDESC", "Please completely fill out the form below, and we'll add your mirror as soon as possible.<br /><br /> Thank you for your assistance in providing another location to download these files. We want to give our users a possibility to find quality software faster.<br /><br /> All mirror submissions will be reviewed by one of our webmasters before they are put up on the web site.");
+define("_MD_WFD_MIRROR_HHOST", "Host");
+define("_MD_WFD_MIRROR_HLOCATION", "Location");
+define("_MD_WFD_MIRROR_HCONTINENT", "Continent");
+define("_MD_WFD_MIRROR_HDOWNLOAD", "Download");
+define("_MD_WFD_MIRROR_OFFLINE", "Server Host Is Offline.");
+define("_MD_WFD_MIRROR_ONLINE", "Server Host Is Online.");
+define("_MD_WFD_MIRROR_DISABLED", "Server Host Check Disabled.");
+define("_MD_WFD_CONT1","Africa");
+define("_MD_WFD_CONT2","Antarctica");
+define("_MD_WFD_CONT3","Asia");
+define("_MD_WFD_CONT4","Europe");
+define("_MD_WFD_CONT5","North America");
+define("_MD_WFD_CONT6","South America");
+define("_MD_WFD_CONT7","Oceania");
+
+Changed:
+define("_MD_WFD_MINPOSTS", "You need to increase you Post Count<br />Before you can Upload/Download Files");
+To: define("_MD_WFD_DOWNLOADMINPOSTS", "You need to increase you Post Count<br />Before you can Download Files");
+define("_MD_WFD_FILESIZE", "File Size (bytes)");
+To: define("_MD_WFD_FILESIZE", "File Size");
+define("_MD_WFD_DLURL", "Download URL: ");
+To: define("_MD_WFD_DLURL", "Remote URL: ");
+define("_MD_WFD_FILESIZEC", "File Size (bytes): ");
+To: define("_MD_WFD_FILESIZEC", "File Size: ");
+
+FILE: \wfdownloads\language\english\modinfo.php
+
+Added:
+define("_MI_WFD_REVIEWANONPOST","Anonymous User Reviews:");
+define("_MI_WFD_REVIEWANONPOSTDSC","Allow Anonymous users to submit new Reviews to your website?");
+define("_MI_WFD_MMIRRORS","Mirrors");
+define("_MI_WFD_ANONPOST1","None");
+define("_MI_WFD_ANONPOST2","Download Only");
+define("_MI_WFD_ANONPOST3","Mirror Only");
+define("_MI_WFD_ANONPOST4","Both");
+define('_MI_WFD_AUTOAPPROVE1','None');
+define('_MI_WFD_AUTOAPPROVE2','Download Only');
+define('_MI_WFD_AUTOAPPROVE3','Mirror Only');
+define('_MI_WFD_AUTOAPPROVE4','Both');
+define('_MI_WFD_REVIEWAPPROVE','Auto Approve Submitted Reviews');
+define('_MI_WFD_REVIEWAPPROVEDSC','Select to approve submitted reviews without moderation.');
+define('_MI_WFD_UPLOADDIRDSC','Upload Directory *MUST* be an absolute path!');
+define('_MI_WFD_ALLOWSUBMISS1','None');
+define('_MI_WFD_ALLOWSUBMISS2','Download Only');
+define('_MI_WFD_ALLOWSUBMISS3','Mirror Only');
+define('_MI_WFD_ALLOWSUBMISS4','Both');
+define('_MI_WFD_MIRROR_USEIMAGES', 'Display Mirror Logos?'); // not implemented yet
+define('_MI_WFD_MIRROR_USEIMAGESDSC', 'Select yes to display logo for each mirror'); // not implemented yet
+define('_MI_WFD_MIRROR_IMGWIDTH', 'Logo Display Width'); // not implemented yet
+define('_MI_WFD_MIRROR_IMGWIDTHDSC', 'Display width for mirror logo'); // not implemented yet
+define('_MI_WFD_MIRROR_IMGHEIGHT', 'Logo Display Height'); // not implemented yet
+define('_MI_WFD_MIRROR_IMGHEIGHTDSC', 'Display height for mirror logo'); // not implemented yet
+define('_MI_WFD_MIRROR_AUTOAPPROVE','Auto Approve Submitted Mirrors');
+define('_MI_WFD_MIRROR_AUTOAPPROVEDSC','Select to approve submitted mirrors without moderation.');
+define('_MI_WFD_MIRROR_MAXIMGWIDTH','Upload Logo width'); // not implemented yet
+define('_MI_WFD_MIRROR_MAXIMGWIDTHDSC','Maximum logo width permitted when uploading logo files'); // not implemented yet
+define('_MI_WFD_MIRROR_MAXIMGHEIGHT','Upload logo height'); // not implemented yet
+define('_MI_WFD_MIRROR_MAXIMGHEIGHTDSC','Maximum logo height permitted when uploading logo files'); // not implemented yet
+define('_MI_WFD_MIRROR_ENABLE','Enable Mirror System');
+define('_MI_WFD_MIRROR_ENABLEDSC','');
+define('_MI_WFD_MIRROR_ENABLEONCHK','Enable Server Online Check');
+define('_MI_WFD_MIRROR_ENABLEONCHKDSC','Enables the host server check for the Mirrors<br />This can slow your page load down if<br />you have many mirrors');
+define('_MI_WFD_MIRROR_ALLOWSUBMISS','User Mirror Submissions:');
+define('_MI_WFD_MIRROR_ALLOWSUBMISSDSC','Allow Users to Submit new mirrors');
+define('_MI_WFD_MIRROR_MIRRORIMAGES','Mirror Logo Upload Directory'); // not implemented yet
+define('_MI_WFD_MIRROR_MIRRORIMAGESDSC','Mirror Logo Upload Directory'); // not implemented yet
+
+Changed:
+define("_MI_WFD_ANONPOSTDSC","Allow Anonymous users to submit or upload to your website?");
+To: define("_MI_WFD_ANONPOSTDSC","Allow Anonymous users to submit new Downloads/Mirrors to your website?");
+define('_MI_WFD_AUTOAPPROVE','Auto Approve Submitted Downloads');
+To: define('_MI_WFD_AUTOAPPROVE','Auto Approve Submitted Downloads/Mirrors');
+define('_MI_WFD_AUTOAPPROVEDSC','Select to approve submitted downloads without moderation.');
+To: define('_MI_WFD_AUTOAPPROVEDSC','Select to approve submitted downloads/mirrors without moderation.');
+define('_MI_WFD_DOWNLOADMINPOSTS', "Minimum posts required");
+To: define('_MI_WFD_DOWNLOADMINPOSTS', "Minimum posts required to download");
+define('_MI_WFD_DOWNLOADMINPOSTS_DESC', "Enter the minimum number of posts required to upload/download a file");
+To: define('_MI_WFD_DOWNLOADMINPOSTSDSC', "Enter the minimum number of posts required to download a file");
+define('_MI_WFD_ALLOWSUBMISSDSC','Allow Users to Submit new downloads');
+To: define('_MI_WFD_ALLOWSUBMISSDSC','Allow Users to Submit new Downloads/Mirrors');
+define("_MI_WFD_USETHUMBSDSC", "Supported file types: JPG, GIF, PNG.<div style='padding-top: 8px;'>WF-Section will use thumb nails for images. Set to 'No' to use orginal image if the server does not support this option.</div>");
+To: define("_MI_WFD_USETHUMBSDSC", "Supported file types: JPG, GIF, PNG.lt;div style='padding-top: 8px;'>WF-Downloads will use thumb nails for images. Set to 'No' to use orginal image if the server does not support this option.</div>");
+define("_MI_WFD_BINDEX","Main Index");
+To: define("_MI_WFD_BINDEX","Index");
+define("_MI_WFD_INDEXPAGE","Index Page Management");
+To: define("_MI_WFD_INDEXPAGE","Index Management");
+define("_MI_WFD_MCATEGORY","Category Management");
+To: define("_MI_WFD_MCATEGORY","Categories");
+define("_MI_WFD_MDOWNLOADS","File Management");
+To: define("_MI_WFD_MDOWNLOADS","Files");
+define("_MI_WFD_MMIMETYPES","Mimetypes Management");
+To: define("_MI_WFD_MMIMETYPES","Mimetypes");
+define("_MI_WFD_PERMISSIONS","Permission Settings");
+To: define("_MI_WFD_PERMISSIONS","Permissions");
+define('_MI_WFD_MODULE_MAILLIST', "WF-Section Mailing Lists");
+To: define('_MI_WFD_MODULE_MAILLIST', "SmartFactory Mailing Lists");
+define('_MI_WFD_MODULE_MAILANNOUNCEMENTSDSC', "Get the latest announcements from WF-Section.");
+To: define('_MI_WFD_MODULE_MAILANNOUNCEMENTSDSC', "Get the latest announcements from SmartFactory.");
+define('_MI_WFD_WARNINGTEXT', "THE SOFTWARE IS PROVIDED BY WF-SECTIONS \"AS IS\" AND \"WITH ALL FAULTS.\" WF-SECTIONS MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE QUALITY, SAFETY OR SUITABILITY OF THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. FURTHER, ABLEMEDIA MAKES NO REPRESENTATIONS OR WARRANTIES AS TO THE TRUTH, ACCURACY OR COMPLETENESS OF ANY STATEMENTS, INFORMATION OR MATERIALS CONCERNING THE SOFTWARE THAT IS CONTAINED IN WF-SECTIONS WEBSITE. IN NO EVENT WILL ABLEMEDIA BE LIABLE FOR ANY INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES HOWEVER THEY MAY ARISE AND EVEN IF WF-SECTIONS HAS BEEN PREVIOUSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES..");
+To: define('_MI_WFD_WARNINGTEXT', "THE SOFTWARE IS PROVIDED BY SMARTFACTORY \"AS IS\" AND \"WITH ALL FAULTS.\" SMARTFACTORY MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE QUALITY, SAFETY OR SUITABILITY OF THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. FURTHER, SMARTFACTORY MAKES NO REPRESENTATIONS OR WARRANTIES AS TO THE TRUTH, ACCURACY OR COMPLETENESS OF ANY STATEMENTS, INFORMATION OR MATERIALS CONCERNING THE SOFTWARE THAT IS CONTAINED IN SMARTFACTORY WEBSITE. IN NO EVENT WILL SMARTFACTORY BE LIABLE FOR ANY INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES HOWEVER THEY MAY ARISE AND EVEN IF SMARTFACTORY HAS BEEN PREVIOUSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES..");
+define('_MI_WFD_AUTHOR_CREDITSTEXT',"The WF-Sections Team would like to thank the following people for their help and support during the development phase of this module:<br /><br />tom, mking, paco1969, mharoun, Talis, m0nty, steenlnielsen, Clubby, Geronimo, bd_csmc, herko, LANG, Stewdio, tedsmith, veggieryan, carnuke, MadFish.<br /><br />And on a personal note, I would like to thank the special girl in my life who I love dearly and who gives me the strength and support to do all of this.");
+To: define('_MI_WFD_AUTHOR_CREDITSTEXT',"The SmartFactory Team would like to thank the following people for their help and support during the development phase of this module:<br /><br />tom, mking, paco1969, mharoun, Talis, m0nty, steenlnielsen, Clubby, Geronimo, bd_csmc, herko, LANG, Stewdio, tedsmith, veggieryan, carnuke, MadFish, Kiang<br />and anyone else who has contributed to either directly or indirectly.");
+define('_MI_WFD_COPYRIGHTIMAGE', "Images copyright WF-Project and may only be used with permission");
+To: define('_MI_WFD_COPYRIGHTIMAGE', "Images copyright WF-Project/SmartFactory and may only be used with permission");
+
+Removed:
+define("_MI_WFD_BLOCKADMIN","Block Settings");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help.html 2013-09-16 11:46:32 UTC (rev 12061)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help.html 2013-09-16 16:51:09 UTC (rev 12062)
@@ -8,6 +8,28 @@
<h4 class="odd">Description</h4>
<p class="even">
WF-Downloads is a download module for XOOPS. You can create a download section with multiple categories and subcategories. You decide which groups are allowed to upload which type of files separately. <br /> <br />
+
+
+ Here is a short selection of features offered: <br /> <br />
+
+
+ - create multiple categories and subcategories for your downloads <br />
+ - decide which groups are allowed to download and submit files <br />
+ - choose to validate uploads first or have them automaticly accepted <br />
+ - edit/delete existing mimetypes and add your own ones <br />
+ - define which groups are allowed to upload which filetypes (mimetypes) <br />
+ - add thumbnails and screenshots to your downloads <br />
+ - disallow direct download linking (leeching) with a whitelist for sites allowed to link to your files <br />
+ - add extensive informations to your downloads like version, platform, license <br />
+ - define disclaimers for file up- and download <br />
+ - set downloads offline without deleting them <br />
+ - define publishing and expiration times for downloads <br />
+ - protect downloads outside of your webroot <br />
+ - support for multiple mirror <br />
+ - comments support <br />
+ - review system for files <br />
+
+
</p>
<h4 class="odd">Install/uninstall</h4>
@@ -18,7 +40,7 @@
Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i">XOOPS Operations Manual</a>
</p>
-
+
<h4 class="odd">Operating instructions</h4>
<p class="even">
This module and its operations are very simple.
Added: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help2.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help2.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help2.html 2013-09-16 16:51:09 UTC (rev 12062)
@@ -0,0 +1,28 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Help:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/wfdownloads/admin/index.php" title="Back to the administration of WF-Downloads"> WF-Downloads
+ <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of WF-Downloads"/>
+ </a>
+ </h1>
+
+ <h4 class="odd">Fresh Install</h4>
+ <p class="even">
+ These instructions are for a fresh install. <br /> <br />
+
+These instructions are for a fresh install. <br />
+If you want to update an older WF-Downloads please select 'Update'. <br />
+If you want to import from Xoops myDownloads please select 'Import'.<br /> <br />
+ We STRONGLY recommends you take a full backup before INSTALLING or UPDATING any module. .<br /> <br />
+ </p>
+
+ <h4 class="odd">Fresh installation of WF-Downloads</h4>
+ <p class="even">
+ <ol>
+ <li><U><B>Upload the module to your website</B></U><P>Upload the '<I>wfdownloads</I>' folder to <I>{xoops-rootdirectory}/modules</I> folder</li><p><br />
+ <li><U><B>Change and verify folder permissions</B></U><P>CHMOD the following folders to 777:<p><i>wfdownloads/images<br>wfdownloads/images/category<BR>wfdownloads/images/category/thumbs<BR>wfdownloads/images/screenshots<BR>wfdownloads/images/screenshots/thumbs</i><P>Also make sure that the <i>{xoops-rootdirectory}/uploads</i> folder is set to 777.</li><p><br />
+ <li><U><B>Install the module</B></U><P>Login as administrator and enter Xoops Administration page. Select <I>System --> modules</I> and install wfdownloads from there</li><p><br />
+ <li><U><B>Configure the module</B></U><P>Most importent steps now will be to setup the group permissions for the module and its blocks via <I>System --> groups</I><BR>and than within wfdownloads administration <I>Mimetype management</I> to decide which files are allowed to be uploaded<BR> by users and administrators.<BR></li><br />
+ </ol>
+ </p>
+
+</div>
Added: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help3.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help3.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help3.html 2013-09-16 16:51:09 UTC (rev 12062)
@@ -0,0 +1,32 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Help:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/wfdownloads/admin/index.php" title="Back to the administration of WF-Downloads"> WF-Downloads
+ <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of WF-Downloads"/>
+ </a>
+ </h1>
+
+ <h4 class="odd">Import</h4>
+ <p class="even">
+ Instructions for importing from myDownloads, pd-downloads and wmpdownloads to WF-Downloads. <br /> <br />
+ We STRONGLY recommends you take a full backup before INSTALLING or UPDATING any module.<br /> <br />
+ </p>
+
+ <h4 class="odd">Import from Xoops MyDownloads into WF-Downloads</h4>
+ <p class="even">
+ <B>Note:</B> When you do the import the update script will copy the data from the mydownloads, pd-downloads or wmpdownloads tables into the database of wf-downloads. After this is done you will still be able to use each module as before. It is possible to have all 3 modules running at the same time.
+ <span>
+ <ol>
+ <li><U><B>Upload the module to your website</B></U><P>Upload the '<I>wfdownloads</I>' folder to <I>{xoops-rootdirectory}/modules</I> folder</li><p> <br />
+ <li><U><B>Change and verify folder permissions</B></U><P>CHMOD the following folders to 777:<p><i>wfdownloads/images<br>wfdownloads/images/category<BR>wfdownloads/images/category/thumbs<BR>wfdownloads/images/screenshots<BR>wfdownloads/images/screenshots/thumbs</i><P>Also make sure that the <i>{xoops-rootdirectory}/uploads</i> folder is set to 777.</li><p> <br />
+ <li><U><B>Install the module</B></U><P>Login as webmaster and enter Xoops Administration page. Select <I>System --> modules</I> and install wfdownloads</li><p> <br />
+ <li><U><B>Start the Import</B></U><P>Go into the WF-Downloads admin area. At the top you will find a link <I>Import data</I>. Click on this one and you can choose to import your mydownloads data. Once you did so go into the permissions tab to set the permissions for the imported categories. <u>Until you changed the category permissions you will not be able to see the imported categories/files.</u><P> <br /> <br />
+ <li><U><B>Configure the module</B></U><P>Most important steps now will be to setup the group permissions for the module and its blocks via <I>System --> groups</I><BR>and than within wfdownloads administration <I>Mimetype management</I> to decide which files are allowed to be uploaded<BR> by users and administrators.<BR></li><P> <br />
+ <li><U><B>Optional: Remove myDownloads</B></U><P>If you want to use only WF-Downloads you can now disable and uninstall the MyDownloads module.</li> <br />
+ <li><U><B>Optional: Remove PD-Downloads</B></U><P>If you want to use only WF-Downloads you can now disable and uninstall the PD-Downloads module.</li> <br />
+ <li><U><B>Optional: Remove wmpdownloads</B></U><P>If you want to use only WF-Downloads you can now disable and uninstall the wmpdownloads module.</li> <br />
+ </ol>
+ </span><p>
+
+ </p>
+
+</div>
Added: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help4.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help4.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help4.html 2013-09-16 16:51:09 UTC (rev 12062)
@@ -0,0 +1,52 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Help:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/wfdownloads/admin/index.php" title="Back to the administration of WF-Downloads"> WF-Downloads
+ <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of WF-Downloads"/>
+ </a>
+ </h1>
+
+ <h4 class="odd">Updating from Version 2.x</h4>
+ <p>
+ If you are updating from WF-Downloads 2.x then please make sure you read and understand the following information. There were some severe changes introduced in version 3. <br /> <br />
+ </p>
+
+ <b>Change to absolute pathinfo in the upload path:</b>
+ <p >
+ You *MUST* make sure to edit the upload directory in module preferences to include the servers absolute path instead of a relative path.<br /><br />
+
+ For example:<br />
+ If your servers absolute path to the root xoops folder is /home/domain/public_html to keep the files in the normal uploads folder you would now set the path in preferences to /home/domain/public_html/uploads (no trailing slash)<br /><br />
+
+ If you want to have the files stored outside of the web root for security then you would change the path to /home/domain/uploads (no trailing slash) for example.<br /><br />
+
+ You see above, the uploads folder is now outside of public_html which prevents anyone from gaining access to those files directly. Only files submitted after this upgrade will utilise the new system, existing downloads will still use the URL method and therefore the path will not be hidden.
+ </p>
+
+
+ <b>File based permissions were removed:</b>
+ <p>
+ WF-Downloads no longer has any per file permissions. From now on there will be only category permissions. This means all files within an existing category will be accessible by the groups defined for that category. Please make sure the permissions for all existing categories are properly set after updating the module.
+ <br />
+ <br />
+ </p>
+
+ <b>Changes in module preferences due to feature changes:</b>
+ <p>
+ In WF-Downloads preferences check that the submission and autoapprove settings are correct. Due to the new features (mirror system, review system reworked) those have changed a bit. Make sure you set those to fullfill your needs now.
+ <br />
+ <br />
+ </p>
+
+ <h4 class="odd">Important information related to WF-Downloads 3.2</h4>
+ <p class="even">
+ If users upload files with multiple periods (.) in the filename, Protector 3.x will disallow the upload for security reasons, however the script does sanitize,
+ If you trust your users (and don't allow anonymous uploads), you can turn of the multiple dot protection of protector module by following the below instructions. <br /> <br />
+
+ 1. Open wfdownloads/header.php in your editor.<br />
+ 2. uncomment line 13: //define('PROTECTOR_SKIP_FILESCHECKER', true);<br />
+ 3. save & close.<br /><br />
+
+ Be cautious when disabling the protector fileschecker, and only use it if absolutely necessary or if you fully trust your users.<br /><br />
+
+ </p>
+</div>
Added: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help5.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help5.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help5.html 2013-09-16 16:51:09 UTC (rev 12062)
@@ -0,0 +1,39 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Help:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/wfdownloads/admin/index.php" title="Back to the administration of WF-Downloads"> WF-Downloads
+ <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of WF-Downloads"/>
+ </a>
+ </h1>
+
+ <h4 class="odd">Instructions to update WF-Downloads 2.0x/3.00rc1 to 3.20</h4>
+ <p class="even">
+ If you want to import from MyDownloads please select 'Import'.<br />
+ If you want to do a fresh install of WF-Downloads please select 'Install'. <br /> <br />
+ We STRONGLY recommends you take a full backup before INSTALLING or UPDATING any module.<br /> <br />
+ </p>
+
+ <h4 class="odd">Update from WF-Downloads 2.0x/3.00rc1 to 3.20</h4>
+ <p><br />
+ <B>Note:</B> When you do the import the update script will copy the data from the mydownloads, pd-downloads or wmpdownloads tables into the database of wf-downloads. After this is done you will still be able to use each module as before. It is possible to have all 3 modules running at the same time.<br />
+ <span>
+ <ol><br />
+ <li><U><B>Did you read the important notes?</B></U><P>A lot of important changes in WF-Downloads were introduced with version 3. Before you start updating please make sure that you read and understand the <a href="__important_notes_v3.html" target="content">Important notes</a>.</li><p><br />
+ <li><U><B>(Optional)<FONT COLOR="#707070"> Before you start uploading ...</FONT></B></U><br />
+ <P>We made a lot of changes to WF-Downloads. There are a lot of obselete files now that will no longer be used. <br /><B>If you feel comfortable with this </B>you could delete most of the old files in the <I>'modules/wfdownloads'</I> directory - <B>if not skip to the next step.</B><br /><br />
+ If you want to do this:<ul><br />
+ <LI>you are advised to backup your files first ... just in case</LI><br />
+ <LI>Basicly you can delete every file and folder within the 'modules/wfdownloads' folder <U><B><FONT COLOR="#FF0000">except for</FONT></B></U></LI><br />
+ - the <FONT COLOR="#FF0000">'images'</FONT> subfolder and its contents<br />
+ - the <FONT COLOR="#FF0000">'uploads'</FONT> subfolder and its contents if there are more files in it then just index.php<br />
+ - any file or folder you might have created yourself that came not from the original WF-Downloads installation</UL><br />
+ Please note that we are only talking about deleting files. DO NOT uninstall WF-Downloads.<br /><B>If you feel uncomfortable with this than don´t do it. It will create no problems to skip this step - just some unused files will remain on your server. ;)</B></li><p>
+ <li><U><B>Upload the module to your website</B></U><P>Upload the '<I>wfdownloads</I>' folder to <I>{xoops-rootdirectory}/modules</I> folder</li><p><br />
+ <li><U><B>Update the module</B></U><P>Login as administrator and enter Xoops Administration page. Select <I>System --> modules</I> and update wfdownloads</li><p><br />
+ <li><U><B>Change your uploads path from relative to absolute</B></U><UL><P><LI>Enter the WF-Downloads administration section and click on preferences</LI><LI>Locate the field for the <I>'Uploads Directory'</I> and change the path to the absolute path of your server</LI><br />If you don´t know the path you can find it on the WF-Downloads admin section main<I>(index)</I>page <I>'Server Path to XOOPS Root:'</I> and just add the path to the uploads folder.<br /><B>One example:</B> <br />if your current setting would be <I><U>'/uploads'</U></I> <br />and your server path would be <U><I>'/xampp/xampp/htdocs/xoops'</I></U> <br />then the new entry for that field would be <U>'/xampp/htdocs/xoops/uploads'</U>.</UL></li><P><br />
+ <li><U><B>Check your category permissions</B></U><P>Since we removed 'per file' permissions in WF-Downloads you should check if your category permissions are properly setup to allow access to files only to those who are supposed to have it. (see history menu for a better explanation of this change)</li><p><br />
+ </ol>
+ </span><p>
+
+ </p>
+
+</div>
Added: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help6.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help6.html (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help6.html 2013-09-16 16:51:09 UTC (rev 12062)
@@ -0,0 +1,28 @@
+<div id="help-template" class="outer">
+ <h1 class="head">Help:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/wfdownloads/admin/index.php" title="Back to the administration of WF-Downloads"> WF-Downloads
+ <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of WF-Downloads"/>
+ </a>
+ </h1>
+
+ <h4 class="odd">Instructions to update WF-Downloads 3.10 RC1/RC2/Final to 3.20</h4>
+ <p class="even">
+ If you want to import from MyDownloads please select 'Import'.<br />
+ If you want to do a fresh install of WF-Downloads please select 'Install'. <br /> <br />
+ We STRONGLY recommends you take a full backup before INSTALLING or UPDATING any module.<br /> <br />
+ </p>
+
+ <h4 class="odd">Update from WF-Downloads 3.10 RC1/RC2/Final to 3.20</h4>
+ <p class="even">
+ <B>Note:</B> When you do the import the update script will copy the data from the mydownloads, pd-downloads or wmpdownloads tables into the database of wf-downloads. After this is done you will still be able to use each module as before. It is possible to have all 3 modules running at the same time. <br />
+ <span>
+ <ol><br />
+ <li><U><B>Upload the module</B></U><P>Just upload the module as usual overwriting the current files.</li><p> <br />
+ <li><U><B>Update the module</B></U><P>Login as administrator and enter Xoops Administration page. Select <I>System --> modules</I> and update wfdownloads</li><p> <br />
+ </ol>
+
+ </span><p>
+
+ </p>
+
+</div>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-16 11:46:32 UTC (rev 12061)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-16 16:51:09 UTC (rev 12062)
@@ -68,6 +68,28 @@
$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
+
+//help files
+$i=0;
+$modversion['helpsection'][$i]['name'] = "Overview";
+$modversion['helpsection'][$i]['link'] = "page=help";
+$i++;
+$modversion['helpsection'][$i]['name'] = "Fresh Install";
+$modversion['helpsection'][$i]['link'] = "page=help2";
+$i++;
+$modversion['helpsection'][$i]['name'] = "Import";
+$modversion['helpsection'][$i]['link'] = "page=help3";
+$i++;
+$modversion['helpsection'][$i]['name'] = "Updates Notes";
+$modversion['helpsection'][$i]['link'] = "page=help4";
+$i++;
+$modversion['helpsection'][$i]['name'] = "Updates from 2.0 - 3.10";
+$modversion['helpsection'][$i]['link'] = "page=help5";
+$i++;
+$modversion['helpsection'][$i]['name'] = "Updates from 3.10+";
+$modversion['helpsection'][$i]['link'] = "page=help6";
+
+
/*
* added by Liquid. Based on code by Marcan
*/
|
|
From: <des...@us...> - 2013-09-16 11:46:33
|
Revision: 12061
http://sourceforge.net/p/xoops/svn/12061
Author: designburo
Date: 2013-09-16 11:46:32 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
zip of the folder. Not necessary
Removed Paths:
-------------
XoopsModules/qrcode/releases/1.2/qrcode.zip
Deleted: XoopsModules/qrcode/releases/1.2/qrcode.zip
===================================================================
(Binary files differ)
|
|
From: <des...@us...> - 2013-09-16 11:44:52
|
Revision: 12060
http://sourceforge.net/p/xoops/svn/12060
Author: designburo
Date: 2013-09-16 11:44:47 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
Support for four new protocols.
Added Paths:
-----------
XoopsModules/qrcode/releases/1.2/
XoopsModules/qrcode/releases/1.2/qrcode/
XoopsModules/qrcode/releases/1.2/qrcode/admin/
XoopsModules/qrcode/releases/1.2/qrcode/admin/about.php
XoopsModules/qrcode/releases/1.2/qrcode/admin/footer.php
XoopsModules/qrcode/releases/1.2/qrcode/admin/header.php
XoopsModules/qrcode/releases/1.2/qrcode/admin/help.php
XoopsModules/qrcode/releases/1.2/qrcode/admin/index.php
XoopsModules/qrcode/releases/1.2/qrcode/admin/main.php
XoopsModules/qrcode/releases/1.2/qrcode/admin/menu.php
XoopsModules/qrcode/releases/1.2/qrcode/blocks/
XoopsModules/qrcode/releases/1.2/qrcode/blocks/blocks.php
XoopsModules/qrcode/releases/1.2/qrcode/blocks/index.html
XoopsModules/qrcode/releases/1.2/qrcode/class/
XoopsModules/qrcode/releases/1.2/qrcode/class/admin.php
XoopsModules/qrcode/releases/1.2/qrcode/class/index.html
XoopsModules/qrcode/releases/1.2/qrcode/css/
XoopsModules/qrcode/releases/1.2/qrcode/css/admin.css
XoopsModules/qrcode/releases/1.2/qrcode/css/index.html
XoopsModules/qrcode/releases/1.2/qrcode/docs/
XoopsModules/qrcode/releases/1.2/qrcode/docs/changelog.txt
XoopsModules/qrcode/releases/1.2/qrcode/docs/credits.txt
XoopsModules/qrcode/releases/1.2/qrcode/docs/index.html
XoopsModules/qrcode/releases/1.2/qrcode/docs/install.txt
XoopsModules/qrcode/releases/1.2/qrcode/docs/lang_diff.txt
XoopsModules/qrcode/releases/1.2/qrcode/docs/licence.txt
XoopsModules/qrcode/releases/1.2/qrcode/docs/readme.txt
XoopsModules/qrcode/releases/1.2/qrcode/getimage.php
XoopsModules/qrcode/releases/1.2/qrcode/images/
XoopsModules/qrcode/releases/1.2/qrcode/images/admin/
XoopsModules/qrcode/releases/1.2/qrcode/images/admin/about.png
XoopsModules/qrcode/releases/1.2/qrcode/images/admin/help.png
XoopsModules/qrcode/releases/1.2/qrcode/images/admin/home.png
XoopsModules/qrcode/releases/1.2/qrcode/images/admin/index.html
XoopsModules/qrcode/releases/1.2/qrcode/images/admin/qrcode.png
XoopsModules/qrcode/releases/1.2/qrcode/images/admin/xoopsmicrobutton.gif
XoopsModules/qrcode/releases/1.2/qrcode/images/create_bookmark.png
XoopsModules/qrcode/releases/1.2/qrcode/images/create_contact.png
XoopsModules/qrcode/releases/1.2/qrcode/images/create_email.png
XoopsModules/qrcode/releases/1.2/qrcode/images/create_geo.png
XoopsModules/qrcode/releases/1.2/qrcode/images/create_phone.png
XoopsModules/qrcode/releases/1.2/qrcode/images/create_skype.png
XoopsModules/qrcode/releases/1.2/qrcode/images/create_sms.png
XoopsModules/qrcode/releases/1.2/qrcode/images/create_text2speech.png
XoopsModules/qrcode/releases/1.2/qrcode/images/create_txt.png
XoopsModules/qrcode/releases/1.2/qrcode/images/create_url.png
XoopsModules/qrcode/releases/1.2/qrcode/images/icons/
XoopsModules/qrcode/releases/1.2/qrcode/images/icons/index.html
XoopsModules/qrcode/releases/1.2/qrcode/images/icons/off.png
XoopsModules/qrcode/releases/1.2/qrcode/images/icons/on.png
XoopsModules/qrcode/releases/1.2/qrcode/images/logo.png
XoopsModules/qrcode/releases/1.2/qrcode/images/xoops_module_qrcode.png
XoopsModules/qrcode/releases/1.2/qrcode/index.html
XoopsModules/qrcode/releases/1.2/qrcode/language/
XoopsModules/qrcode/releases/1.2/qrcode/language/english/
XoopsModules/qrcode/releases/1.2/qrcode/language/english/admin.php
XoopsModules/qrcode/releases/1.2/qrcode/language/english/blocks.php
XoopsModules/qrcode/releases/1.2/qrcode/language/english/help/
XoopsModules/qrcode/releases/1.2/qrcode/language/english/help/help.html
XoopsModules/qrcode/releases/1.2/qrcode/language/english/help/index.html
XoopsModules/qrcode/releases/1.2/qrcode/language/english/main.php
XoopsModules/qrcode/releases/1.2/qrcode/language/english/modinfo.php
XoopsModules/qrcode/releases/1.2/qrcode/qrcode.php
XoopsModules/qrcode/releases/1.2/qrcode/templates/
XoopsModules/qrcode/releases/1.2/qrcode/templates/blocks/
XoopsModules/qrcode/releases/1.2/qrcode/templates/blocks/qrocde_block.html
XoopsModules/qrcode/releases/1.2/qrcode/templates/help.html
XoopsModules/qrcode/releases/1.2/qrcode/xoops_version.php
XoopsModules/qrcode/releases/1.2/qrcode.zip
Added: XoopsModules/qrcode/releases/1.2/qrcode/admin/about.php
===================================================================
--- XoopsModules/qrcode/releases/1.2/qrcode/admin/about.php (rev 0)
+++ XoopsModules/qrcode/releases/1.2/qrcode/admin/about.php 2013-09-16 11:44:47 UTC (rev 12060)
@@ -0,0 +1,46 @@
+<?php
+/**
+ * MyModule module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package MyModule
+ * @since 2.5.0
+ * @author Mage, Mamba
+ * @version $Id $
+ **/
+
+include '../../../include/cp_header.php';
+include '../../../class/xoopsformloader.php';
+xoops_cp_header();
+include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar("dirname") . "/class/admin.php";
+
+$module_info =& $module_handler->get($xoopsModule->getVar("mid"));
+
+$module_info = '<div id="about">
+ <label>' . _AM_QRCODE_ABOUT_DESCRIPTION . '</label><text>' . $module_info->getInfo("description") . '</text><br />
+ <label>' . _AM_QRCODE_ABOUT_RELEASEDATE . '</label><text class="bold">' . $module_info->getInfo("release_date") . '</text><br />
+ <label>' . _AM_QRCODE_ABOUT_UPDATEDATE . '</label><text class="bold">' . formatTimestamp($xoopsModule->getVar("last_update"), "m") . '</text><br />
+ <label>' . _AM_QRCODE_ABOUT_MODULE_STATUS . '</label><text>' . $module_info->getInfo("module_status") . '</text><br />
+ <label>' . _AM_QRCODE_ABOUT_WEBSITE . '</label><text><a class="tooltip" href="' . $module_info->getInfo("module_website_url") . '" rel="external" title="' . $module_info->getInfo("module_website_name") . ' - ' . $module_info->getInfo("module_website_url") . '">
+ ' . $module_info->getInfo("module_website_name") . '</a></text></div>';
+
+$about_admin = new ModuleAdmin();
+$about_admin->addLabel($xoopsModule->getVar("name"));
+$about_admin->addLabel(_AM_QRCODE_ABOUT_MODULE_INFO);
+$about_admin->addLineLabel($xoopsModule->getVar("name"), '', 'VNXNVZZQP5FZJ', '', 'module');
+$about_admin->addLineLabel(_AM_QRCODE_ABOUT_MODULE_INFO, $module_info, '', '', 'information');
+$about_admin->addChangelogLabel(_AM_QRCODE_ABOUT_CHANGELOG);
+
+echo $about_admin->addNavigation('about.php');
+echo $about_admin->renderabout();
+
+include 'footer.php' ;
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.2/qrcode/admin/footer.php
===================================================================
--- XoopsModules/qrcode/releases/1.2/qrcode/admin/footer.php (rev 0)
+++ XoopsModules/qrcode/releases/1.2/qrcode/admin/footer.php 2013-09-16 11:44:47 UTC (rev 12060)
@@ -0,0 +1,25 @@
+<?php
+/**
+ * MyLinks module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package:: mylinks
+ * @subpackage:: admin
+ * @since: 2.5.0
+ * @author:: Magic.Shao <mag...@gm...> - Susheng Yang <ezs...@gm...>
+ * @version:: $Id $
+**/
+
+echo "<div align=\"center\"><a href=\"http://www.designburo.nl\" target=\"_blank\"><img src=\"http://designburo.nl/images/dsgnbro.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
+echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://designburo.nl' title='Visit Designburo.nl'>Designburo.nl</a></div>";
+
+xoops_cp_footer();
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.2/qrcode/admin/header.php
===================================================================
--- XoopsModules/qrcode/releases/1.2/qrcode/admin/header.php (rev 0)
+++ XoopsModules/qrcode/releases/1.2/qrcode/admin/header.php 2013-09-16 11:44:47 UTC (rev 12060)
@@ -0,0 +1,57 @@
+<?php
+/**
+ * MyLinks module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package:: mylinks
+ * @subpackage:: admin
+ * @since:: 2.5.0
+ * @author:: Magic.Shao <mag...@gm...> - Susheng Yang <ezs...@gm...>
+ * @version:: $Id $
+**/
+
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+include("../../../include/cp_header.php");
+include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar("dirname") . "/class/admin.php";
+
+//defined("FRAMEWORKS_ART_FUNCTIONS_INI") || include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.ini.php';
+//load_functions("admin");
+
+$myts =& MyTextSanitizer::getInstance();
+
+if ($xoopsUser) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+} else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+}
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+
+xoops_cp_header();
+
+// Define Stylesheet and JScript
+$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/css/admin.css" );
+//$xoTheme->addJavaScript( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/admin/switcher.js" );
+
+//Load languages
+xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.2/qrcode/admin/help.php
===================================================================
--- XoopsModules/qrcode/releases/1.2/qrcode/admin/help.php (rev 0)
+++ XoopsModules/qrcode/releases/1.2/qrcode/admin/help.php 2013-09-16 11:44:47 UTC (rev 12060)
@@ -0,0 +1,16 @@
+<?php
+// ------------------------------------------------------------------------ //
+// Author: Designburo.nl (in...@de...) //
+// http://www.designburo.nl //
+// Project: QRcode v1.0 //
+// ------------------------------------------------------------------------ //
+include '../../../include/cp_header.php';
+// if the site has no language defined, turn to English default
+if ( file_exists("../language/".$xoopsConfig['language']."/main.php") ) {
+include "../language/".$xoopsConfig['language']."/main.php"; } else { include "../language/english/main.php"; }
+$xoopsOption['template_main'] = 'help.html';
+include(XOOPS_ROOT_PATH.'/mainfile.php');
+xoops_cp_header();
+
+xoops_cp_footer();
+?>
Added: XoopsModules/qrcode/releases/1.2/qrcode/admin/index.php
===================================================================
--- XoopsModules/qrcode/releases/1.2/qrcode/admin/index.php (rev 0)
+++ XoopsModules/qrcode/releases/1.2/qrcode/admin/index.php 2013-09-16 11:44:47 UTC (rev 12060)
@@ -0,0 +1,39 @@
+<?php
+/**
+ * ****************************************************************************
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright XOOPS Project
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package
+ * @author
+ *
+ * Version : $Id:
+ * ****************************************************************************
+ */
+
+require_once '../../../include/cp_header.php';
+include 'header.php';
+
+
+include_once XOOPS_ROOT_PATH."/modules/" . $xoopsModule->getVar("dirname") . "/class/admin.php";
+
+ $index_admin = new ModuleAdmin();
+
+$index_admin->addConfigLabel(_AM_QRCODE_CONFIG_CHECK) ;
+$index_admin->addLineConfigLabel(_AM_QRCODE_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php') ;
+$index_admin->addLineConfigLabel(_AM_QRCODE_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops') ;
+
+ echo $index_admin->addNavigation('index.php') ;
+ echo $index_admin->renderIndex();
+
+
+include "footer.php";
+xoops_cp_footer();
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.2/qrcode/admin/main.php
===================================================================
--- XoopsModules/qrcode/releases/1.2/qrcode/admin/main.php (rev 0)
+++ XoopsModules/qrcode/releases/1.2/qrcode/admin/main.php 2013-09-16 11:44:47 UTC (rev 12060)
@@ -0,0 +1,556 @@
+<?php
+// ------------------------------------------------------------------------ //
+// Author: Designburo.nl (in...@de...) //
+// http://www.designburo.nl //
+// Project: QRcode v1.2 //
+// ------------------------------------------------------------------------ //
+include '../../../include/cp_header.php';
+// if the site has no language defined, turn to English default
+if ( file_exists("../language/".$xoopsConfig['language']."/main.php") ) {
+include "../language/".$xoopsConfig['language']."/main.php"; } else { include "../language/english/main.php"; }
+include(XOOPS_ROOT_PATH.'/mainfile.php');
+include_once XOOPS_ROOT_PATH."/modules/qrcode/qrcode.php";
+xoops_cp_header();
+if(isset($_POST['type']))
+{
+ switch ($_POST['type'])
+ {
+
+
+ case "phone":
+ if (!$_POST['qr_phone'])
+ {
+ $res= _QRCODE_PHONE_F_ERROR_NR;
+ }
+ else
+ {
+ $data=array();
+ $type="phone";
+ $data['phonenr'] = $_POST['qr_phone'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ }
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+ case "url":
+ if (!$_POST['qr_url'])
+ {
+ $res= _QRCODE_URL_F_ERROR_URL;
+ }
+ else
+ {
+ $data=array();
+ $type="url";
+ $data['url'] = $_POST['qr_url'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ }
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+ case "bookmark":
+ if (!$_POST['qr_bm_url'])
+ {
+ $res= _QRCODE_BM_F_ERROR_URL;
+ }
+ else
+ {
+ $data=array();
+ $type="bookmark";
+ $data['url']=$_POST['qr_bm_url'];
+ $data['name']=$_POST['qr_bm_name'];
+ $res= qrcode($type,$data);
+
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ }
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+
+ case "voice":
+ if (!$_POST['qr_voice_txt'])
+ {
+ $res= _QRCODE_VOICE_F_ERROR_TXT;
+ }
+ else
+ {
+ $data=array();
+ $type="voice";
+ $data['txt']=$_POST['qr_voice_txt'];
+ $data['lang']=$_POST['qr_voice_lang'];
+ $res= qrcode($type,$data);
+
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ }
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+ case "skype":
+ if (!$_POST['qr_skype_to'])
+ {
+ $res= _QRCODE_SKYPE_F_ERROR_TO;
+ }
+ else
+ {
+ $data=array();
+ $type="skype";
+ $data['to']=$_POST['qr_skype_to'];
+ if(isset($_POST['qr_skype_topic'])){
+ $data['topic']=$_POST['qr_skype_topic'];
+ }
+ else {
+ $data['topic']="";
+ }
+ $data['type']=$_POST['qr_skype_option'];
+ $res= qrcode($type,$data);
+
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ }
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+ case "email":
+ if (!$_POST['qr_email_to'])
+ {
+ $res= _QRCODE_EMAIL_F_ERROR_EMAIL;
+ }
+ else
+ {
+ $data=array();
+ $type="email";
+ $data['email']=$_POST['qr_email_to']; // Send email to ?
+ $data['subject']=$_POST['qr_email_sub']; // Subject of the email
+ $data['txt']=$_POST['qr_email_txt']; // Body of the email
+ $res= qrcode($type,$data);
+
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ }
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+ case "sms":
+ if (!$_POST['qr_sms_to'])
+ {
+ $res= _QRCODE_SMS_F_ERROR_NR;
+ }
+ else
+ {
+ $data=array();
+ $type="sms";
+ $data['phonenr']=$_POST['qr_sms_to'];
+ $data['txt']=$_POST['qr_sms_txt'];
+ $res= qrcode($type,$data);
+
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ }
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+ case "txt":
+ if (!$_POST['qr_txt'])
+ {
+ $res= _QRCODE_TXT_F_ERROR_TXT;
+ }
+ else
+ {
+ $data=array();
+ $type="txt";
+ $data['txt'] = $_POST['qr_txt'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ }
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+
+ break;
+
+ case "geo":
+
+ $data=array();
+ $type="geo";
+ $data['lat'] = $_POST['qr_latitude'];
+ $data['long'] = $_POST['qr_longtitude'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+ case "bus":
+
+ $data=array();
+ if($_POST['qr_c_select']=="memcard")
+ {
+ $type="contact";
+ if (isset($_POST['qr_c_anaam'])){ $data['surname']=$_POST['qr_c_anaam']; } else { $data['surname']=""; }
+ if (isset($_POST['qr_c_vnaam'])){ $data['name']=$_POST['qr_c_vnaam']; } else { $data['name']=""; }
+ if (isset($_POST['qr_c_gsm'])){ $data['mobile']=$_POST['qr_c_gsm']; } else { $data['mobile']=""; }
+ if (isset($_POST['qr_c_phone'])){ $data['phonenr']=$_POST['qr_c_phone']; } else { $data['phonenr']=""; }
+ if (isset($_POST['qr_c_adres'])){ $data['adres']=$_POST['qr_c_adres']; } else { $data['adres']=""; }
+ if (isset($_POST['qr_c_state'])){ $data['state']=$_POST['qr_c_state']; } else { $data['state']=""; }
+ if (isset($_POST['qr_c_city'])){ $data['city']=$_POST['qr_c_city']; } else { $data['city']=""; }
+ if (isset($_POST['qr_c_zip'])){ $data['zipcode']=$_POST['qr_c_zip']; } else { $data['zipcode']=""; }
+ if (isset($_POST['qr_c_land'])){ $data['country']=$_POST['qr_c_land']; } else { $data['country']=""; }
+ if (isset($_POST['qr_c_email'])){ $data['email']=$_POST['qr_c_email']; } else { $data['email']=""; }
+ if (isset($_POST['qr_c_web'])){ $data['url']=$_POST['qr_c_web']; } else { $data['url']=""; }
+ if (isset($_POST['qr_c_functie'])){ $data['title']=$_POST['qr_c_functie']; } else { $data['title']=""; }
+ if (isset($_POST['qr_c_bedrijf'])){ $data['company']=$_POST['qr_c_bedrijf']; } else { $data['company']=""; }
+ if (isset($_POST['qr_c_gjaar'])){ $data['b_year']=$_POST['qr_c_gjaar']; } else { $data['b_year']=""; }
+ if (isset($_POST['qr_c_gmaand'])){ $data['b_month']=$_POST['qr_c_gmaand']; } else { $data['b_month']=""; }
+ if (isset($_POST['qr_c_gdag'])){ $data['b_day']=$_POST['qr_c_gdag']; } else { $data['b_day']=""; }
+ $res= qrcode($type,$data);
+ }
+ if($_POST['qr_c_select']=="vcard")
+ {
+ $type="vcontact";
+ if (isset($_POST['qr_c_anaam'])){ $data['surname']=$_POST['qr_c_anaam']; } else { $data['surname']=""; }
+ if (isset($_POST['qr_c_vnaam'])){ $data['name']=$_POST['qr_c_vnaam']; } else { $data['name']=""; }
+ if (isset($_POST['qr_c_gsm'])){ $data['mobile']=$_POST['qr_c_gsm']; } else { $data['mobile']=""; }
+ if (isset($_POST['qr_c_phone'])){ $data['phonenr']=$_POST['qr_c_phone']; } else { $data['phonenr']=""; }
+ if (isset($_POST['qr_c_adres'])){ $data['adres']=$_POST['qr_c_adres']; } else { $data['adres']=""; }
+ if (isset($_POST['qr_c_state'])){ $data['state']=$_POST['qr_c_state']; } else { $data['state']=""; }
+ if (isset($_POST['qr_c_city'])){ $data['city']=$_POST['qr_c_city']; } else { $data['city']=""; }
+ if (isset($_POST['qr_c_zip'])){ $data['zipcode']=$_POST['qr_c_zip']; } else { $data['zipcode']=""; }
+ if (isset($_POST['qr_c_land'])){ $data['country']=$_POST['qr_c_land']; } else { $data['country']=""; }
+ if (isset($_POST['qr_c_email'])){ $data['email']=$_POST['qr_c_email']; } else { $data['email']=""; }
+ if (isset($_POST['qr_c_web'])){ $data['url']=$_POST['qr_c_web']; } else { $data['url']=""; }
+ if (isset($_POST['qr_c_functie'])){ $data['title']=$_POST['qr_c_functie']; } else { $data['title']=""; }
+ if (isset($_POST['qr_c_bedrijf'])){ $data['company']=$_POST['qr_c_bedrijf']; } else { $data['company']=""; }
+ if (isset($_POST['qr_c_gjaar'])){ $data['b_year']=$_POST['qr_c_gjaar']; } else { $data['b_year']=""; }
+ if (isset($_POST['qr_c_gmaand'])){ $data['b_month']=$_POST['qr_c_gmaand']; } else { $data['b_month']=""; }
+ if (isset($_POST['qr_c_gdag'])){ $data['b_day']=$_POST['qr_c_gdag']; } else { $data['b_day']=""; }
+ //vcard additions
+ if (isset($_POST['qr_c_afdeling'])){ $data['dept']=$_POST['qr_c_afdeling']; } else { $data['dept']=""; }
+ if (isset($_POST['qr_c_phoneh'])){ $data['phoneh']=$_POST['qr_c_phoneh']; } else { $data['phoneh']=""; }
+ if (isset($_POST['qr_c_phonew'])){ $data['phonew']=$_POST['qr_c_phonew']; } else { $data['phonew']=""; }
+ if (isset($_POST['qr_c_faxh'])){ $data['faxh']=$_POST['qr_c_faxh']; } else { $data['faxh']=""; }
+ if (isset($_POST['qr_c_faxw'])){ $data['faxw']=$_POST['qr_c_faxw']; } else { $data['faxw']=""; }
+ if (isset($_POST['qr_c_im'])){ $data['im']=$_POST['qr_c_im']; } else { $data['im']=""; }
+ if (isset($_POST['qr_c_note'])){ $data['note']=$_POST['qr_c_note']; } else { $data['note']=""; }
+ $res= qrcode($type,$data);
+ }
+
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+
+ }
+
+
+ break;
+
+}
+
+if(isset($_GET['a']))
+{
+
+ switch ($_GET['a'])
+ {
+ case "bookmark":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_BM_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_bookmark.png" border="0" title="'._QRCODE_BM_D.'"></td><td>';
+ echo '<h2>'._QRCODE_BM_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<div id="url_div"><table class="tabel">';
+ echo '<tr><td>'._QRCODE_BM_F_NAME.'</td><td><input name="qr_bm_name" id="qr_bm_name" type="text" size="30" value="" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BM_F_URL.'</td><td><input name="qr_bm_url" id="qr_bm_url" type="text" size="30" value="" /></td>';
+
+ echo '<td align=right><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td></tr>';
+ echo '</table></td></tr></table></div><input type="hidden" name="type" value="bookmark"></form></div></div></td></tr></table>';
+ break;
+
+ case "skype":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_SKYPE_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_skype.png" border="0" title="'._QRCODE_SKYPE_D.'"></td><td>';
+ echo '<h2>'._QRCODE_SKYPE_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<div id="url_div"><table class="tabel">';
+ echo '<tr><td>'._QRCODE_SKYPE_F_TO.'</td><td><input name="qr_skype_to" id="qr_skype_to" type="text" size="30" value="" /></td></tr>';
+ echo '<tr><td>'._QRCODE_SKYPE_F_TOPIC.'</td><td><input name="qr_skype_topic" id="qr_skype_topic" type="text" size="30" value="" /></td></tr>';
+ echo '<tr><td>'._QRCODE_SKYPE_F_AUDIO.'</td><td><input name="qr_skype_option" id="qr_skype_option" type="radio" value="audio" checked="checked" /></td></tr>';
+ echo '<tr><td>'._QRCODE_SKYPE_F_VIDEO.'</td><td><input name="qr_skype_option" id="qr_skype_option" type="radio" value="video" /></td></tr>';
+ echo '<tr><td>'._QRCODE_SKYPE_F_IM.'</td><td><input name="qr_skype_option" id="qr_skype_option" type="radio" value="im" /></td></tr><tr><td></td><td></td>';
+ echo '<td align=right><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td></tr>';
+ echo '</table></td></tr></table></div><input type="hidden" name="type" value="skype"></form></div></div></td></tr></table>';
+ break;
+
+ case "voice":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_VOICE_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_text2speech.png" border="0" title="'._QRCODE_VOICE_D.'"></td><td>';
+ echo '<h2>'._QRCODE_VOICE_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<div id="url_div"><table class="tabel">';
+ echo '<tr><td>'._QRCODE_VOICE_F_TXT.'</td><td><input name="qr_voice_txt" id="qr_voice_txt" type="text" size="30" value="" /></td></tr>';
+ echo '<tr><td>'._QRCODE_VOICE_F_LANG.'</td><td><select name="qr_voice_lang" id="qr_voice_lang"/><option value="en" selected>English</option>';
+ echo '<option value="nl">Dutch</option><option value="es">Spanish</option><option value="fr">French</option><option value="de">German</option>';
+ echo '<option value="pl">Polish</option><option value="ru">Russian</option><option value="it">Italian</option><option value="sw">Swedish</option>';
+ echo '<option value="fi">Finnish</option></select>';
+ echo '</td>';
+ echo '<td align=right><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td></tr>';
+ echo '</table></td></tr></table></div><input type="hidden" name="type" value="voice"></form></div></div></td></tr></table>';
+ break;
+
+ case "url":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_URL_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_url.png" border="0" title="'._QRCODE_URL_D.'"></td><td>';
+ echo '<h2>'._QRCODE_URL_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_URL_F_URL.'</td><td><input name="qr_url" id="qr_url" type="text" size="50" value="http://" /></td><td align=right><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr></table></td></tr></table>
+ </div><input type="hidden" name="type" value="url"></form></div></div></td></tr></table>';
+ break;
+
+ case "email":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_EMAIL_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_email.png" border="0" title="'._QRCODE_EMAIL_D.'"></td><td>';
+ echo '<h2>'._QRCODE_EMAIL_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_EMAIL_F_TO.'</td><td><input name="qr_email_to" type="text" size="50" /></td><td rowspan="3" align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+ echo '<tr>
+ <td valign="middle">'._QRCODE_EMAIL_F_SUBJECT.'</td><td valign="top"><input name="qr_email_sub" type="text" size="50" /></td>
+ </tr><tr>
+ <td>'._QRCODE_EMAIL_F_TXT.'</td><td><input name="qr_email_txt" type="text" size="50" /></td>
+ </tr>
+
+ ';
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="email"></form></div></div></td></tr></table>';
+ break;
+
+ case "phone":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_PHONE_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_phone.png" border="0" title="'._QRCODE_PHONE_D.'"></td><td>';
+ echo '<h2>'._QRCODE_PHONE_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_PHONE_F_NR.'</td><td><input name="qr_phone" type="text" size="50" /></td><td align=right><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr></table></td></tr></table>
+ </div><input type="hidden" name="type" value="phone"></form></div></div></td></tr></table>';
+ break;
+
+ case "sms":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_SMS_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_sms.png" border="0" title="'._QRCODE_SMS_D.'"></td><td>';
+ echo '<h2>'._QRCODE_SMS_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_SMS_F_NR.'</td><td><input name="qr_sms_to" type="text" size="50" maxsize="140" /></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+ echo '<tr>
+ <td>'._QRCODE_SMS_F_TXT.'</td><td><input name="qr_sms_txt" type="text" size="50" /></td>
+ </tr>
+
+ ';
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="sms"></form></div></div></td></tr></table>';
+ break;
+
+ case "txt":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_TXT_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_txt.png" border="0" title="'._QRCODE_TXT_D.'"></td><td>';
+ echo '<h2>'._QRCODE_TXT_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_TXT_F_TXT.'</td><td><textarea name="qr_txt" cols="45" rows="3" /></textarea></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="txt"></form></div></div></td></tr></table>';
+ break;
+
+ case "geo":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_GEO_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_geo.png" border="0" title="'._QRCODE_GEO_D.'"></td><td>';
+ echo '<h2>'._QRCODE_GEO_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_GEO_F_LA.'</td><td><input name="qr_latitude" type="text" size="50" /></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+ echo '<tr>
+ <td>'._QRCODE_GEO_F_LO.'</td><td><input name="qr_longtitude" type="text" size="50" /></td>
+ </tr>
+
+ ';
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="geo"></form></div></div></td></tr></table>';
+ break;
+
+
+ case "bus":
+ echo '<table width="400"><tr><td width="800">';
+ echo '<div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;">';
+ echo '<div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_BUS_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div>';
+ echo '<div style="padding:10px;">';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<table>';
+ echo '<tr><td width="150" align="left"><img src="../images/create_contact.png" border="0" title="'._QRCODE_BUS_D.'"></td><td>';
+ echo '<h2>'._QRCODE_BUS_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<div id="url_div">';
+ echo '<select name="qr_c_select" id="qr_c_select"/><option value="memcard" selected>MEMCARD</option><option value="vcard">VCARD</option></select><BR>';
+ echo '<div id="memcard">';
+ echo '<table class="tabel">';
+ echo '<tr><td>'._QRCODE_BUS_F_SNAME.'</td><td><input name="qr_c_anaam" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_FNAME.'</td><td><input name="qr_c_vnaam" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_COMPANY.'</td><td><input name="qr_c_bedrijf" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_TITLE.'</td><td><input name="qr_c_functie" type="text" size="50" /></td></tr>';
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_PHONE.'</td><td><input name="qr_c_phone" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_MOB.'</td><td><input name="qr_c_gsm" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_EMAIL.'</td><td><input name="qr_c_email" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_WEB.'</td><td><input name="qr_c_web" type="text" size="50" /></td></tr>';
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_ADRES.'</td><td><input name="qr_c_adres" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_ZIP.'</td><td><input name="qr_c_zip" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_CITY.'</td><td><input name="qr_c_city" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_STATE.'</td><td><input name="qr_c_state" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_COUNTRY.'</td><td><input name="qr_c_land" type="text" size="50" /></td></tr>';
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_BDAY.'</td><td><select name="qr_c_gdag">';
+ for($rt=1;$rt<=31;$rt++){
+ echo "<option value=\"".sprintf('%02d',$rt)."\">".sprintf('%02d',$rt)."</option>\n";
+ }
+ echo '</select> / <select name="qr_c_gmaand">';
+ for($rt=1;$rt<=12;$rt++){
+ echo "<option value=\"".sprintf('%02d',$rt)."\">".sprintf('%02d',$rt)."</option>\n";
+ }
+ echo '</select> / <select name="qr_c_gjaar">';
+ for($rt=2011;$rt>=1920;$rt--){
+ echo "<option value=\"".$rt."\">".$rt."</option>\n";
+ }
+ echo '</select></td></tr><tr><td></td><td></td><td align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td></tr>';
+ echo '</table></div>';
+ echo '<div id="vcard" style="display:none;">';
+ echo '<p style="color:#f00;">'._QRCODE_BUS_F_WARN.'</p>';
+ echo '<table class="tabel">';
+ echo '<tr><td>'._QRCODE_BUS_F_SNAME.'</td><td><input name="qr_c_anaam" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_FNAME.'</td><td><input name="qr_c_vnaam" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_TITLE.'</td><td><input name="qr_c_functie" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_COMPANY.'</td><td><input name="qr_c_bedrijf" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_DEPT.'</td><td><input name="qr_c_afdeling" type="text" size="50" /></td></tr>'; //vcard
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_PHONEH.'</td><td><input name="qr_c_phoneh" type="text" size="50" /></td></tr>'; //vcard
+ echo '<tr><td>'._QRCODE_BUS_F_PHONEW.'</td><td><input name="qr_c_phonew" type="text" size="50" /></td></tr>'; //vcard
+ echo '<tr><td>'._QRCODE_BUS_F_MOB.'</td><td><input name="qr_c_gsm" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_FAXH.'</td><td><input name="qr_c_faxh" type="text" size="50" /></td></tr>'; //vcard
+ echo '<tr><td>'._QRCODE_BUS_F_FAXW.'</td><td><input name="qr_c_faxw" type="text" size="50" /></td></tr>'; //vcard
+ echo '<tr><td>'._QRCODE_BUS_F_EMAIL.'</td><td><input name="qr_c_email" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_IM.'</td><td><input name="qr_c_im" type="text" size="50" /></td></tr>'; //vcard
+ echo '<tr><td>'._QRCODE_BUS_F_WEB.'</td><td><input name="qr_c_web" type="text" size="50" /></td></tr>';
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_ADRES.'</td><td><input name="qr_c_adres" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_ZIP.'</td><td><input name="qr_c_zip" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_CITY.'</td><td><input name="qr_c_city" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_STATE.'</td><td><input name="qr_c_state" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_COUNTRY.'</td><td><input name="qr_c_land" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_NOTE.'</td><td><input name="qr_c_note" type="text" size="50" /></td></tr>'; //vcard
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_BDAY.'</td><td><select name="qr_c_gdag">';
+ for($rt=1;$rt<=31;$rt++){
+ echo "<option value=\"".sprintf('%02d',$rt)."\">".sprintf('%02d',$rt)."</option>\n";
+ }
+ echo '</select> / <select name="qr_c_gmaand">';
+ for($rt=1;$rt<=12;$rt++){
+ echo "<option value=\"".sprintf('%02d',$rt)."\">".sprintf('%02d',$rt)."</option>\n";
+ }
+ echo '</select> / <select name="qr_c_gjaar">';
+ for($rt=2011;$rt>=1920;$rt--){
+ echo "<option value=\"".$rt."\">".$rt."</option>\n";
+ }
+ echo '</select></td></tr><tr><td></td><td></td><td align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td></tr>';
+ echo '</table></div>';
+ echo '</div></td></tr></table><input type="hidden" name="type" value="bus"></form></div></div></td></tr></table>';
+ ?>
+ <script language="javascript">
+ $(document).ready(function()
+ {
+ $('#qr_c_select').change(function()
+ {
+ $('#memcard').hide();
+ $('#vcard').hide();
+ $('#' + $(this).val()).show();
+ })
+ });
+ </script>
+ <?php
+ break;
+
+ }
+
+
+
+
+}
+else {
+
+
+
+
+$module_handler =& xoops_gethandler('module');
+$versioninfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$version=$versioninfo->getInfo('version');
+$description=$versioninfo->getInfo('description');
+$author=$versioninfo->getInfo('author');
+$license=$versioninfo->getInfo('license');
+$licensefile=$versioninfo->getInfo('help');
+$status=$versioninfo->getInfo('status');
+$released=$versioninfo->getInfo('releasedate');
+echo '<div style="margin:30px;padding:10px;border:1px solid #aaa;">';
+echo '<table><tr>';
+echo '<td align="center" style="border-right:0px solid #aaa;"><img src="../images/logo.png"></td>';
+echo '<td><div style="margin-bottom:5px;border-bottom:0px solid #aaa;"><h3>'._QRCODE_DESCRIPTION.'</h3><BR><BR></div></td></tr>';
+echo '<tr><td colspan="2"><div style="margin:30px;padding:10px;border:1px solid #aaa;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">'._QRCODE_CHOOSE.'<BR><BR>';
+echo '<table style="text-align:center;"><tr><td><a href="main.php?a=url"><img src="../images/create_url.png" border="0" title="'._QRCODE_URL_D.'"></a><BR>'._QRCODE_URL_H.'</td>';
+echo '<td><a href="main.php?a=email"><img src="../images/create_email.png" border="0" title="'._QRCODE_EMAIL_D.'"></a><BR>'._QRCODE_EMAIL_H.'</td>';
+echo '<td><a href="main.php?a=phone"><img src="../images/create_phone.png" border="0" title="'._QRCODE_PHONE_D.'"></a><BR>'._QRCODE_PHONE_H.'</td>';
+echo '<td><a href="main.php?a=sms"><img src="../images/create_sms.png" border="0" title="'._QRCODE_SMS_D.'"></a><BR>'._QRCODE_SMS_H.'</td>';
+echo '<td><a href="main.php?a=txt"><img src="../images/create_txt.png" border="0" title="'._QRCODE_TXT_D.'"></a><BR>'._QRCODE_TXT_H.'</td>';
+echo '<td><a href="main.php?a=geo"><img src="../images/create_geo.png" border="0" title="'._QRCODE_GEO_D.'"></a><BR>'._QRCODE_GEO_H.'</td></tr>';
+echo '<tr><td><a href="main.php?a=bus"><img src="../images/create_contact.png" border="0" title="'._QRCODE_BUS_D.'" style="margin-top:15px;"></a><BR>'._QRCODE_BUS_H.'</td>';
+echo '<td><a href="main.php?a=skype"><img src="../images/create_skype.png" border="0" title="'._QRCODE_SKYPE_D.'" style="margin-top:15px;"></a><BR>'._QRCODE_SKYPE_H.'</td>';
+echo '<td><a href="main.php?a=voice"><img src="../images/create_text2speech.png" border="0" title="'._QRCODE_VOICE_D.'" style="margin-top:15px;"></a><BR>'._QRCODE_VOICE_H.'</td>';
+echo '<td><a href="main.php?a=bookmark"><img src="../images/create_bookmark.png" border="0" title="'._QRCODE_BM_D.'" style="margin-top:15px;"></a><BR>'._QRCODE_BM_H.'</td>';
+echo '</tr></table>';
+
+echo '</div></td></tr></table></div>';
+}
+xoops_cp_footer();
+?>
+<table cellpadding="50"
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.2/qrcode/admin/menu.php
===================================================================
--- XoopsModules/qrcode/releases/1.2/qrcode/admin/menu.php (rev 0)
+++ XoopsModules/qrcode/releases/1.2/qrcode/admin/menu.php 2013-09-16 11:44:47 UTC (rev 12060)
@@ -0,0 +1,28 @@
+<?php
+// ------------------------------------------------------------------------ //
+// Author: Designburo.nl (in...@de...) //
+// http://www.designburo.nl //
+// Project: QRcode v1.0 //
+// ------------------------------------------------------------------------ //
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]["title"] = _MI_QRCODE_HOME;
+$adminmenu[$i]["link"] = "admin/index.php";
+$adminmenu[$i]["icon"] = "images/admin/home.png";
+$i++;
+$adminmenu[$i]['title'] = _MI_QRCODE_NAME;
+$adminmenu[$i]['link'] = "admin/main.php";
+$adminmenu[$i]['desc'] = 'QRCodes 4 XOOPS';
+$adminmenu[$i]['icon'] = "images/admin/qrcode.png";
+$i++;
+$adminmenu[$i]["title"] = _MI_QRCODE_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["icon"] = "images/admin/about.png";
+
+// $adminmenu[2]['title'] = _MI_QRCODE_HELP;
+// $adminmenu[2]['link'] = "admin/help.php";
+// $adminmenu[2]['desc'] = 'Help on QRCode';
+// $adminmenu[2]['icon'] = "images/admin/help.png";
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.2/qrcode/blocks/blocks.php
===================================================================
--- XoopsModules/qrcode/releases/1.2/qrcode/blocks/blocks.php (rev 0)
+++ XoopsModules/qrcode/releases/1.2/qrcode/blocks/blocks.php 2013-09-16 11:44:47 UTC (rev 12060)
@@ -0,0 +1,41 @@
+<?php
+// ------------------------------------------------------------------------ //
+// Author: Designburo.nl (in...@de...) //
+// http://www.designburo.nl //
+// Project: QRcode v1.1 //
+// ------------------------------------------------------------------------ //
+function xurl_page()
+{
+ $pURL = 'http';
+ if ($_SERVER["HTTPS"]) {$pURL .= "s";}
+ $pURL .= "://";
+ if ($_SERVER["SERVER_PORT"] != "80")
+ {
+ $pURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
+ }
+ else
+ {
+ $pURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+ }
+ return $pURL;
+}
+
+function qrcode_edit_block($options)
+{
+ $form = _QRCODE_BLOCK_SIZE.": <input type='text' value='".$options[0]."'id='options[0]' name='options[0]' /><br /><br />";
+ return $form;
+}
+function qrcode_show($options)
+{
+ if(is_null($options[0])) $options[0]=175;
+ $dir = basename( dirname (dirname( __FILE__ ) ) ) ;
+ include_once (XOOPS_ROOT_PATH.'/modules/'.$dir.'/qrcode.php');
+ $uri = xurl_page();
+ $data=array();
+ $type="url";
+ $data['url'] = $uri;
+ $res= qrcode($type,$data,$options[0]);
+ $block['qr']=$res;
+ return $block;
+}
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.2/qrcode/blocks/index.html
===================================================================
--- XoopsModules/qrcode/releases/1.2/qrcode/blocks/index.html (rev 0)
+++ XoopsModules/qrcode/releases/1.2/qrcode/blocks/index.html 2013-09-16 11:44:47 UTC (rev 12060)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.2/qrcode/class/admin.php
===================================================================
--- XoopsModules/qrcode/releases/1.2/qrcode/class/admin.php (rev 0)
+++ XoopsModules/qrcode/releases/1.2/qrcode/class/admin.php 2013-09-16 11:44:47 UTC (rev 12060)
@@ -0,0 +1,337 @@
+<?php
+/**
+ * Class for admin V1.02 (20.03.2011)
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright Gregory Mage (Aka Mage)
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Gregory Mage (Aka Mage)
+ */
+
+class ModuleAdmin
+{
+
+ var $_itemButton = array();
+ var $_itemLabel = array();
+ var $_itemLineLabel = array();
+ var $_itemConfigLabel = '';
+ var $_itemLineConfigLabel = array();
+ var $_itemChangelogLabel = '';
+ var $_obj = array();
+
+ /**
+ * Constructor
+ */
+ function __construct()
+ {
+ global $xoopsModule;
+ $this->_obj =& $xoopsModule;
+ echo "<style type=\"text/css\" media=\"screen\">@import \"" . XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname', 'e') . "/css/admin.css\";</style>";
+
+ }
+
+ function addItemButton($title, $link, $icon = 'add', $extra = '')
+ {
+ $ret['title'] = $title;
+ $ret['link'] = $link;
+ $ret['icon'] = $icon . '.png';
+ $ret['extra'] = $extra;
+ $this -> _itemButton[] = $ret;
+ return true;
+
+ }
+
+ function renderButton($position = "right", $delimeter = " ")
+ {
+ $path = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/images/icons/";
+ switch ($position)
+ {
+ default:
+ case "right":
+ $ret = "<div class=\"floatright\">\n";
+ break;
+
+ case "left":
+ $ret = "<div class=\"floatleft\">\n";
+ break;
+
+ case "center":
+ $ret = "<div class=\"aligncenter\">\n";
+ }
+ $ret .= "<div class=\"xo-buttons\">\n";
+ foreach (array_keys( $this -> _itemButton) as $i) {
+ $ret .= "<a class='ui-corner-all tooltip' href='" . $this -> _itemButton[$i]['link'] . "' title='" . $this -> _itemButton[$i]['title'] . "'>";
+ $ret .= "<img src='" . $path . $this -> _itemButton[$i]['icon'] . "' title='" . $this -> _itemButton[$i]['title'] . "' />" . $this -> _itemButton[$i]['title'] . $this -> _itemButton[$i]['extra'];
+ $ret .= "</a>\n";
+ $ret .= $delimeter;
+ }
+ $ret .= "</div>\n</div>\n";
+ $ret .= "<br /> <br /><br />";
+ return $ret;
+ }
+
+ function addLabel($title)
+ {
+ $ret['title'] = $title;
+ $this -> _itemLabel[] = $ret;
+ return true;
+ }
+
+ function addLineLabel($label, $text, $value = '', $color = 'none', $type = 'default')
+ {
+ $ret['label'] = $label;
+ $line = "";
+ switch ($type)
+ {
+ default:
+ case "default":
+ $line .= sprintf($text, "<span style='color : " . $color . "; font-weight : bold;'>" . $value . "</span>");
+ break;
+
+ case "module":
+ $date = explode('/',$this->_obj->getInfo('release_date'));
+ $release_date = formatTimestamp(mktime(0, 0, 0, $date[1], $date[2], $date[0]), 's');
+ $line .= "<table>\n<tr>\n<td width=\"100px\">\n";
+ $line .= "<img src='" . XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/" . $this->_obj->getInfo('image') . "' alt='" . $this->_obj->getVar('name') . "' style='float: left; margin-right: 10px;' />\n";
+ $line .= "</td><td>\n";
+ $line .= "<div style='margin-top: 1px; margin-bottom: 4px; font-size: 18px; line-height: 18px; color: #2F5376; font-weight: bold;'>\n";
+ $line .= $this->_obj->getInfo('name') . " " . $this->_obj->getInfo('version') . " " . $this->_obj->getInfo('module_status') ;
+ $line .= "<br />\n";
+ $line .= "</div>\n";
+ $line .= "<div style='line-height: 16px; font-weight: bold;'>\n";
+ $line .= "by " . $this->_obj->getInfo('author') ;
+ if ($this->_obj->getInfo('nickname') != ''){
+ $line .= " (" . $this->_obj->getInfo('nickname') . ")\n";
+ }
+ $line .= "</div>\n";
+ $line .= "<div style='line-height: 16px;'>\n";
+
+ if ($this->_obj->getInfo('credits') != ''){
+ $line .= "Credits: " . $this->_obj->getInfo('credits') ;
+ }
+ $line .= "<br />\n";
+
+ $line .= "<a href=\"http://" . $this->_obj->getInfo('license_url') . "\" target=\"_blank\" >" . $this->_obj->getInfo('license') . "</a>\n";
+ $line .= "<br />\n";
+
+ $line .= "<a href=\"http://" . $this->_obj->getInfo('website') . "\" target=\"_blank\" >" . $this->_obj->getInfo('website') . "</a>\n";
+ $line .= "<br />\n";
+ if ($value != ''){
+ $line .= '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input type="hidden" name="cmd" value="_s-xclick">
+ <input type="hidden" name="hosted_button_id" value="' . $value . '">
+ <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" style="border-width: 0px;" name="submit" alt="PayPal - The safer, easier way to pay online!">
+ <img alt="" style="border-width: 0px; height: 1px; width: 1px;" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" />
+ </form>';
+ }
+ $line .= "</div>\n";
+ $line .= "</td>\n</tr>\n</table>\n";
+ break;
+
+ case "information":
+ $line .= $text;
+ break;
+ }
+ $ret['line'] = $line;
+ $this -> _itemLineLabel[] = $ret;
+ return true;
+ }
+
+ function renderLabel()
+ {
+ $ret = "";
+ foreach (array_keys( $this -> _itemLabel) as $i) {
+ $ret .= "<fieldset><legend class=\"label\">";
+ $ret .= $this -> _itemLabel[$i]['title'];
+ $ret .= "</legend>\n";
+ foreach (array_keys( $this -> _itemLineLabel) as $k) {
+ if ($this -> _itemLineLabel[$k]['label'] == $this -> _itemLabel[$i]['title']){
+ $ret .= $this -> _itemLineLabel[$k]['line'];
+ $ret .= "<br />";
+ }
+ }
+ $ret .= "</fieldset>\n";
+ $ret .= "<br/>\n";
+ }
+ return $ret;
+ }
+
+ function addConfigLabel($title)
+ {
+ $this -> _itemConfigLabel = $title;
+ return true;
+ }
+
+ function addLineConfigLabel($text, $value = '', $type = 'default')
+ {
+ $line = "";
+ $path = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/images/icons/";
+ switch ($type)
+ {
+ default:
+ case "default":
+ $line .= sprintf($text, "<span>" . $value . "</span>");
+ break;
+
+ case "php":
+ if (phpversion() < $value){
+ $line .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf($text, $value, phpversion()) . "</span>\n";
+ }else{
+ $line .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf($text, $value, phpversion()) . "</span>\n";
+ }
+ break;
+
+ case "xoops":
+ if (substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6) < $value){
+ $line .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf($text, $value, substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n";
+ }else{
+ $line .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf($text, $value, substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n"; }
+ break;
+
+ case "folder":
+ if (!is_dir($value)){
+ $line .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf($text[1], $value) . "</span>\n";
+ }else{
+ ...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-15 21:50:20
|
Revision: 12059
http://sourceforge.net/p/xoops/svn/12059
Author: luciorota
Date: 2013-09-15 21:50:16 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
added: enable/disable reviews system
added: enable/disable ratings system
removed some query (performances)
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-15 21:50:16 UTC (rev 12059)
@@ -135,16 +135,21 @@
$add_mirror = false;
if (!is_object($xoopsUser) && ($this->wfdownloads->getConfig('anonpost') == _WFD_ANONPOST_MIRROR || $this->wfdownloads->getConfig('anonpost') == _WFD_ANONPOST_BOTH) && ($this->wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_MIRROR || $this->wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_BOTH) && $use_mirrors == true) {
$add_mirror = true;
- } elseif (is_object($xoopsUser) && ($this->wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_MIRROR || $this->wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_BOTH || $xoopsUser->isAdmin()) && $use_mirrors == true) {
+ } elseif (is_object($xoopsUser) && ($this->wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_MIRROR || $this->wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_BOTH || wfdownloads_userIsAdmin()) && $use_mirrors == true) {
$add_mirror = true;
}
$download['add_mirror'] = $add_mirror;
$download['use_mirrors'] = $use_mirrors;
+ $use_reviews = $this->wfdownloads->getConfig('enable_reviews');
+ $download['use_reviews'] = $use_reviews;
+
+ $use_ratings = $this->wfdownloads->getConfig('enable_ratings');
$download['rateimg'] = "rate" . round(number_format($this->getVar('rating'), 0) / 2) . ".gif"; // this definition is not removed for compatibility issues
$download['average_rating'] = $this->getVar('rating'); // new
$download['votes'] = ($this->getVar('votes') == 1) ? _MD_WFD_ONEVOTE : sprintf(_MD_WFD_NUMVOTES, $this->getVar('votes'));
$download['hits'] = $this->getVar('hits');
+ $download['use_ratings'] = $use_ratings;
$download['path'] = $this->wfdownloads->getHandler('category')->getNicePath($download['cid']);
@@ -283,7 +288,7 @@
$download['mail_subject'] = rawurlencode(sprintf(_MD_WFD_INTFILEFOUND, $xoopsConfig['sitename']));
$download['mail_body'] = rawurlencode(sprintf(_MD_WFD_INTFILEFOUND, $xoopsConfig['sitename']) . ': ' . WFDOWNLOADS_URL . '/singlefile.php?cid=' . $download['cid'] . '&lid=' . $download['id']);
- $download['isadmin'] = (!empty($xoopsUser) && $xoopsUser->isAdmin($this->wfdownloads->getModule()->mid())) ? true : false;
+ $download['isadmin'] = (wfdownloads_userIsAdmin()) ? true : false;
$download['adminlink'] = '';
if ($download['isadmin'] == true) {
@@ -343,10 +348,10 @@
$sform->addElement(new XoopsFormHidden('filename', $this->getVar('filename', 'e')));
$sform->addElement(new XoopsFormHidden('filetype', $this->getVar('filetype', 'e')));
}
- if (($this->wfdownloads->getConfig('useruploads') && array_intersect($this->wfdownloads->getConfig('useruploadsgroup'), $groups)) || (is_object($xoopsUser) && $xoopsUser->isAdmin()) ) {
+ if (($this->wfdownloads->getConfig('useruploads') && array_intersect($this->wfdownloads->getConfig('useruploadsgroup'), $groups)) || (wfdownloads_userIsAdmin()) ) {
$userfile_file = new XoopsFormFile(_MD_WFD_UPLOAD_FILEC, 'userfile', 0);
$maxFileSize = wfdownloads_bytesToSize1024($this->wfdownloads->getConfig('maxfilesize'));
- if (is_object($xoopsUser) && $xoopsUser->isAdmin()) {
+ if (wfdownloads_userIsAdmin()) {
$criteria = new Criteria('mime_admin', true);
} else {
$criteria = new Criteria('mime_user', true);
@@ -434,7 +439,7 @@
$dhistoryaddedd_textarea->setDescription(_MD_WFD_HISTORYD_DESC);
$sform->addElement($dhistoryaddedd_textarea, false);
}
- if (($this->wfdownloads->getConfig('useruploads') && array_intersect($this->wfdownloads->getConfig('useruploadsgroup'), $groups)) || (is_object($xoopsUser) && $xoopsUser->isAdmin()) ) {
+ if (($this->wfdownloads->getConfig('useruploads') && array_intersect($this->wfdownloads->getConfig('useruploadsgroup'), $groups)) || wfdownloads_userIsAdmin() ) {
$sform->addElement(new XoopsFormFile(_MD_WFD_DUPLOADSCRSHOT, 'screenshot', 0), false);
if ($this->wfdownloads->getConfig('max_screenshot') >= 2) {
$sform->addElement(new XoopsFormFile(_MD_WFD_DUPLOADSCRSHOT, 'screenshot2', 0), false);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-15 21:50:16 UTC (rev 12059)
@@ -11,6 +11,8 @@
- fixed: deprecated "XoopsTree" (luciorota)
- fixed: html errors in templates (luciorota)
- fixed: deprecated XoopsTree (mamba)
+- added: enable/disable reviews system (luciorota)
+- added: enable/disable ratings system (luciorota)
- added: admin side downloads filter (luciorota)
- added: breadcrumb class (luciorota)
- added: html tags compatible autosummary generator (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-09-15 21:50:16 UTC (rev 12059)
@@ -653,7 +653,14 @@
$category_suffix = !empty($_GET['cid']) ? "?cid=" . (int)$_GET['cid']: ""; //Added by Lankford
$toolbar .= "<a href='submit.php$category_suffix'>" . _MD_WFD_SUBMITDOWNLOAD . "</a> | ";
}
- $toolbar .= "<a href='newlist.php'>" . _MD_WFD_LATESTLIST . "</a> | <a href='topten.php?list=hit'>" . _MD_WFD_POPULARITY . "</a> | <a href='topten.php?list=rate'>" . _MD_WFD_TOPRATED . "</a> ]";
+ $toolbar .= "<a href='newlist.php'>" . _MD_WFD_LATESTLIST . "</a>";
+ $toolbar.= " | ";
+ $toolbar.= "<a href='topten.php?list=hit'>" . _MD_WFD_POPULARITY . "</a>";
+ if ($wfdownloads->getConfig('enable_ratings')) {
+ $toolbar.= " | ";
+ $toolbar.= "<a href='topten.php?list=rate'>" . _MD_WFD_TOPRATED . "</a>";
+ }
+ $toolbar.= " ]";
return $toolbar;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-09-15 21:50:16 UTC (rev 12059)
@@ -102,9 +102,9 @@
define('_MI_WFD_IMGHEIGHT','[upload files] Max upload image height (pixels)');
define('_MI_WFD_IMGHEIGHTDSC','Maximum image height permitted when uploading image files.');
-define('_MI_WFD_AUTOSUMMARY','[auto summary] Enable download autosummary');
+define('_MI_WFD_AUTOSUMMARY','[autosummary] Enable download autosummary');
define('_MI_WFD_AUTOSUMMARYDESC','Automatically create download summary based on x amount of characters defined.');
-define('_MI_WFD_AUTOSUMMARYLENGTH','[auto summary] Summary length');
+define('_MI_WFD_AUTOSUMMARYLENGTH','[autosummary] Summary length');
define('_MI_WFD_AUTOSUMMARYLENGTHDESC','The maximum amount of characters displayed for the summary.');
define('_MI_WFD_UPLOADDIR','[upload files] Upload directory');
@@ -297,8 +297,8 @@
define('_MI_WFD_MIRROR_MAXIMGHEIGHT','Upload logo height'); // not implemented yet
define('_MI_WFD_MIRROR_MAXIMGHEIGHTDSC','Maximum logo height permitted when uploading logo files.'); // not implemented yet
-define('_MI_WFD_MIRROR_ENABLE','[mirrors] Enable mirror system');
-define('_MI_WFD_MIRROR_ENABLEDSC','');
+define('_MI_WFD_MIRROR_ENABLE','[mirrors] Enable mirrors system');
+define('_MI_WFD_MIRROR_ENABLEDSC','If enabled, morrors system (submit and use mirrors) is enabled in backend.');
define('_MI_WFD_MIRROR_ENABLEONCHK','[mirrors] Enable server online check');
define('_MI_WFD_MIRROR_ENABLEONCHKDSC','Enables the host server check for the mirrors.<br />This can slow your page load down if you have many mirrors.');
define('_MI_WFD_MIRROR_ALLOWSUBMISS','[mirrors] User mirror submissions');
@@ -350,3 +350,9 @@
define("_MI_WFD_LIMITSDSC","// in progress");
define("_MI_WFD_VERSIONTYPESDSC","// in progress");
+
+define("_MI_WFD_REVIEW_ENABLE","[reviews] Enable reviews system");
+define("_MI_WFD_REVIEW_ENABLEDSC","If enabled, reviews system (submit and show reviews) is enabled in backend.");
+
+define("_MI_WFD_RATING_ENABLE","[ratings] Enable ratings system");
+define("_MI_WFD_RATING_ENABLEDSC","If enabled, ratings system (vote and show ratings) is enabled in backend.");
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-09-15 21:50:16 UTC (rev 12059)
@@ -32,7 +32,7 @@
}
// Check permissions
-if ($wfdownloads->getConfig('enable_mirrors') == false && ((is_object($xoopsUser) && !$xoopsUser->isAdmin()) || !is_object($xoopsUser))) {
+if ($wfdownloads->getConfig('enable_mirrors') == false && !wfdownloads_userIsAdmin()) {
redirect_header('index.php', 3, _NOPERM);
}
$userGroups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php 2013-09-15 21:50:16 UTC (rev 12059)
@@ -31,6 +31,10 @@
redirect_header("index.php", 3, _MD_WFD_NODOWNLOAD);
}
+// Check permissions
+if ($wfdownloads->getConfig('enable_ratings') == false && !wfdownloads_userIsAdmin()) {
+ redirect_header('index.php', 3, _NOPERM);
+}
// Breadcrumb
include_once XOOPS_ROOT_PATH . "/class/tree.php";
$categoriesTree = new XoopsObjectTree($wfdownloads->getHandler('category')->getObjects(), 'cid', 'pid');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/review.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-09-15 21:50:16 UTC (rev 12059)
@@ -32,6 +32,9 @@
}
// Check permissions
+if ($wfdownloads->getConfig('enable_reviews') == false && !wfdownloads_userIsAdmin()) {
+ redirect_header('index.php', 3, _NOPERM);
+}
$userGroups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
if (!$gperm_handler->checkRight('WFDownCatPerm', $cid, $userGroups, $wfdownloads->getModule()->mid())) {
redirect_header('index.php',3, _NOPERM);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-09-15 21:50:16 UTC (rev 12059)
@@ -153,7 +153,7 @@
$add_mirror = false;
if (!is_object($xoopsUser) && $use_mirrors == true && ($wfdownloads->getConfig('anonpost') == _WFD_ANONPOST_MIRROR || $wfdownloads->getConfig('anonpost') == _WFD_ANONPOST_BOTH) && ($wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_MIRROR || $wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_BOTH)) {
$add_mirror = true;
-} elseif (is_object($xoopsUser) && $use_mirrors == true && ($wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_MIRROR || $wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_BOTH || $xoopsUser->isAdmin())) {
+} elseif (is_object($xoopsUser) && $use_mirrors == true && ($wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_MIRROR || $wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_BOTH || wfdownloads_userIsAdmin())) {
$add_mirror = true;
}
@@ -213,27 +213,32 @@
} else {
$user_reviews = "cid={$cid}&lid={$lid}\">" . _MD_WFD_NOUSERREVIEWS;
}
-$xoopsTpl->assign('lang_user_reviews', $xoopsConfig['sitename'] . " " . _MD_WFD_USERREVIEWSTITLE);
+$xoopsTpl->assign('lang_user_reviews', $xoopsConfig['sitename'] . ' ' . _MD_WFD_USERREVIEWSTITLE);
$xoopsTpl->assign('lang_UserReviews', sprintf($user_reviews, $download->getVar('title')));
$xoopsTpl->assign('review_amount', $reviewsCount);
// User mirrors
$downloadInfo['add_mirror'] = $add_mirror;
-$criteria = new CriteriaCompo(new Criteria("lid", $lid));
-$criteria->add(new Criteria("submit", 1));
+$criteria = new CriteriaCompo(new Criteria('lid', $lid));
+$criteria->add(new Criteria('submit', 1));
$mirrorsCount = $wfdownloads->getHandler('mirror')->getCount($criteria);
if ($mirrorsCount > 0) {
$user_mirrors = "op=list&cid={$cid}&lid={$lid}\">" . _MD_WFD_USERMIRRORS;
} else {
$user_mirrors = "cid={$cid}&lid={$lid}\">" . _MD_WFD_NOUSERMIRRORS;
}
-$xoopsTpl->assign('lang_user_mirrors', $xoopsConfig['sitename'] . " " . _MD_WFD_USERMIRRORSTITLE);
+$xoopsTpl->assign('lang_user_mirrors', $xoopsConfig['sitename'] . ' ' . _MD_WFD_USERMIRRORSTITLE);
$xoopsTpl->assign('lang_UserMirrors', sprintf($user_mirrors, $download->getVar('title')));
$xoopsTpl->assign('mirror_amount', $mirrorsCount);
+$xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
+$xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
+$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+$xoopsTpl->assign('use_rss', $wfdownloads->getConfig('enablerss'));
+
// Copyright
if ($wfdownloads->getConfig('copyright') == true) {
- $xoopsTpl->assign('lang_copyright', $download->getVar('title') . " © " . _MD_WFD_COPYRIGHT . " " . date("Y"));
+ $xoopsTpl->assign('lang_copyright', $download->getVar('title') . ' © ' . _MD_WFD_COPYRIGHT . ' ' . date('Y'));
}
$xoopsTpl->assign('down', $downloadInfo); // this definition is not removed for compatibility issues
$xoopsTpl->assign('download', $downloadInfo);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html 2013-09-15 21:50:16 UTC (rev 12059)
@@ -38,14 +38,18 @@
<br />
+ <{if $download.use_ratings == 1}>
<div style="margin-left: 10px; margin-right: 10px; padding: 4px; background-color:#e6e6e6; border-color:#999999;" class="outer">
<div><b><{$smarty.const._MD_WFD_RATINGC}></b> <img src="images/icon/<{$download.rateimg}>" alt="<{$download.average_rating|string_format:'%.2f'}>" title="<{$download.average_rating|string_format:'%.2f'}>" align="middle" /> (<{$download.votes}>)</div>
</div>
<br />
+ <{/if}>
+ <{if $download.use_reviews == 1}>
<div style="margin-left: 10px; margin-right: 10px; padding: 4px; background-color:#e6e6e6; border-color:#999999;" class="outer">
<div><b><{$smarty.const._MD_WFD_REVIEWS}></b> <img src="images/icon/<{$download.review_rateimg}>" alt="<{$download.review_average_rating|string_format:'%.2f'}>" title="<{$download.review_average_rating|string_format:'%.2f'}>" /> (<{$download.reviews_num}>)</div>
</div>
<br />
+ <{/if}>
<{if $download.use_mirrors == 1}>
<div style="margin-left: 10px; margin-right: 10px; padding: 4px; background-color:#e6e6e6; border-color:#999999;" class="outer">
<div><b><{$smarty.const._MD_WFD_MIRROR_AVAILABLE}></b> <{$download.mirrors_num}></div>
@@ -205,10 +209,14 @@
<a href="mirror.php?cid=<{$download.cid}>&lid=<{$download.id}>"><{$smarty.const._MD_WFD_ADDMIRROR}></a>
|
<{/if}>
+ <{if $download.use_reviews == 1}>
<a href="review.php?cid=<{$download.cid}>&lid=<{$download.id}>"><{$smarty.const._MD_WFD_REVIEWTHISFILE}></a>
|
+ <{/if}>
+ <{if $download.use_ratings == 1}>
<a href="ratefile.php?cid=<{$download.cid}>&lid=<{$download.id}>"><{$smarty.const._MD_WFD_RATETHISFILE}></a>
|
+ <{/if}>
<{if $download.useradminlink == true}>
<a href="submit.php?cid=<{$download.cid}>&lid=<{$download.id}>"><{$smarty.const._MD_WFD_MODIFY}></a>
|
@@ -223,11 +231,11 @@
-
<br />
+<{if $download.use_reviews == 1}>
<div><b><{$smarty.const._MD_WFD_USERREVIEWSTITLE}></b></div>
<div style="padding: 3px; margin:3px;">
<{if ($review_amount > 0)}>
@@ -236,9 +244,11 @@
<a href="review.php?op=review.add&cid=<{$download.cid}>&lid=<{$download.id}>"><{$smarty.const._MD_WFD_NOUSERREVIEWS|replace:'%s':$download.title}></a>
<{/if}>
</div>
-
<br />
+<{/if}>
+
+
<{if $download.use_mirrors == 1 && $download.mirrors_num >= 1}>
<div><b><{$smarty.const._MD_WFD_USERMIRRORSTITLE}></b></div>
<div style="padding: 3px; margin:3px;">
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html 2013-09-15 21:50:16 UTC (rev 12059)
@@ -71,8 +71,10 @@
|
<a href="viewcat.php?cid=<{$category_cid}>&orderby=dateA"><{$smarty.const._MD_WFD_DATE}> ↑</a> <a href="viewcat.php?cid=<{$category_cid}>&orderby=dateD"><{$smarty.const._MD_WFD_DATE}> ↓</a>
|
+ <{if $use_ratings == true}>
<a href="viewcat.php?cid=<{$category_cid}>&orderby=ratingA"><{$smarty.const._MD_WFD_RATING}> ↑</a> <a href="viewcat.php?cid=<{$category_cid}>&orderby=ratingD"><{$smarty.const._MD_WFD_RATING}> ↓</a>
|
+ <{/if}>
<a href="viewcat.php?cid=<{$category_cid}>&orderby=hitsA"><{$smarty.const._MD_WFD_POPULARITY}> ↑</a> <a href="viewcat.php?cid=<{$category_cid}>&orderby=hitsD"><{$smarty.const._MD_WFD_POPULARITY}> ↓</a>
<br />
<b><{$lang_cursortedby}></b>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/topten.php 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/topten.php 2013-09-15 21:50:16 UTC (rev 12059)
@@ -23,6 +23,10 @@
$xoopsOption['template_main'] = 'wfdownloads_topten.html';
+// Check permissions
+if (($_GET['list'] == 'rate') && $wfdownloads->getConfig('enable_ratings') == false && !wfdownloads_userIsAdmin()) {
+ redirect_header('index.php', 3, _NOPERM);
+}
$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
include XOOPS_ROOT_PATH . '/header.php';
@@ -35,14 +39,14 @@
$list_array = array('hits', 'rating');
$lang_array = array(_MD_WFD_HITS, _MD_WFD_RATING);
-$sort = (isset($_GET['list']) && in_array($_GET['list'], $action_array)) ? $_GET['list'] : 'rate';
+$sort = (isset($_GET['list']) && in_array($_GET['list'], $action_array)) ? $_GET['list'] : 'hit';
$thisselected = $action_array[$sort];
$sortDB = $list_array[$thisselected];
$catarray['imageheader'] = wfdownloads_headerImage();
$catarray['letters'] = wfdownloads_lettersChoice();
$catarray['toolbar'] = wfdownloads_toolbar();
-$xoopsTpl -> assign('catarray', $catarray);
+$xoopsTpl->assign('catarray', $catarray);
$arr = array();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php 2013-09-15 21:50:16 UTC (rev 12059)
@@ -274,6 +274,11 @@
$xoopsTpl->assign('pagenav', $pagenav->renderNav());
}
+$xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_mirrors'));
+$xoopsTpl->assign('use_ratings', $wfdownloads->getConfig('enable_ratings'));
+$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
+$xoopsTpl->assign('use_rss', $wfdownloads->getConfig('enablerss'));
+
if($wfdownloads->getConfig('enablerss') == true && $downloads_count > 0) {
$rsslink_URL = WFDOWNLOADS_URL . "/rss.php?cid={$cid}";
$xoopsTpl->assign('category_rssfeed_URL', $rsslink_URL);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-15 17:49:03 UTC (rev 12058)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-15 21:50:16 UTC (rev 12059)
@@ -586,6 +586,14 @@
'default' => 'uploads/' . $modversion['dirname'] . '/images');
$modversion['config'][] = array(
+ 'name' => 'enable_reviews',
+ 'title' => '_MI_WFD_REVIEW_ENABLE',
+ 'description' => '_MI_WFD_REVIEW_ENABLEDSC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => true);
+
+$modversion['config'][] = array(
'name' => 'rev_anonpost',
'title' => '_MI_WFD_REVIEWANONPOST',
'description' => '_MI_WFD_REVIEWANONPOSTDSC',
@@ -602,6 +610,14 @@
'default' => false);
$modversion['config'][] = array(
+ 'name' => 'enable_ratings',
+ 'title' => '_MI_WFD_RATING_ENABLE',
+ 'description' => '_MI_WFD_RATING_ENABLEDSC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => true);
+
+$modversion['config'][] = array(
'name' => 'enable_mirrors',
'title' => '_MI_WFD_MIRROR_ENABLE',
'description' => '_MI_WFD_MIRROR_ENABLEDSC',
|
|
From: <luc...@us...> - 2013-09-15 17:49:07
|
Revision: 12058
http://sourceforge.net/p/xoops/svn/12058
Author: luciorota
Date: 2013-09-15 17:49:03 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.js 2013-09-15 17:01:32 UTC (rev 12057)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.js 2013-09-15 17:49:03 UTC (rev 12058)
@@ -1,10 +1,10 @@
-function imageResize (img, maxWidth)
+function resizeImage (img, maxWidth)
{
if (img.width > maxWidth && maxWidth > 0) img.width = maxWidth;
}
-function imageLoad(img)
+function loadImage(img)
{
tempImage = new Image();
img = encodeURI(img);
@@ -15,13 +15,13 @@
function imageIsLoaded(img)
{
if ( (tempImage.width != 0) && (tempImage.height != 0) ) {
- imageShow(img);
+ showImage(img);
} else {
- intervallo = setTimeout("imageIsLoaded('\"+img+\"')", 20);
+ t = setTimeout("imageIsLoaded('\"+img+\"')", 20);
}
}
-function imageShow(img)
+function showImage(img)
{
imageWidth = tempImage.width;
imageHeight = tempImage.height;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php 2013-09-15 17:01:32 UTC (rev 12057)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php 2013-09-15 17:49:03 UTC (rev 12058)
@@ -53,9 +53,9 @@
'type' => 'text/javascript'));
}
$ts->replacements[] = "<img src='\\5' class='\\2' alt='"._MSC_RESIZED_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" />";
- $ts->replacements[] = "<img src='\\3' class='\\2' alt='"._MSC_RESIZED_IMAGE . "' border='0'" . ($config['resize'] ? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
+ $ts->replacements[] = "<img src='\\3' class='\\2' alt='"._MSC_RESIZED_IMAGE . "' border='0'" . ($config['resize'] ? "onload=\"javascript:resizeImage(this, " . $config['max_width'] . ")\"" : "") . "/>";
$ts->replacements[] = "<img src='\\3' alt='"._MSC_RESIZED_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /><br />";
- $ts->replacements[] = "<img src='\\1' alt='"._MSC_RESIZED_IMAGE . "' border='0'" . ($config['resize'] ? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
+ $ts->replacements[] = "<img src='\\1' alt='"._MSC_RESIZED_IMAGE . "' border='0'" . ($config['resize'] ? " onload=\"javascript:resizeImage(this, " . $config['max_width'] . ")\"" : "") . "/>";
} elseif (!empty($config['clickable']) && !empty($config['max_width']) && !empty($GLOBALS['xoTheme'])) {
if (!$jsLoaded) {
@@ -63,14 +63,15 @@
$GLOBALS['xoTheme']->addScript('/class/textsanitizer/image/image.js', array(
'type' => 'text/javascript'));
}
- $ts->replacements[] = "<a href='javascript:imageLoad(\"\\5\");'><img src='\\5' class='\\2' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" /></a>";
- $ts->replacements[] = "<a href='javascript:imageLoad(\"\\3\");'><img src='\\3' class='\\2' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' " . ($config['resize'] ? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";
- $ts->replacements[] = "<a href='javascript:imageLoad(\"\\3\");'><img src='\\3' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /></a><br />";
- $ts->replacements[] = "<a href='javascript:imageLoad(\"\\1\");'><img src='\\1' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' title='"._MSC_CLICK_TO_OPEN_IMAGE . "'" . ($config['resize'] ? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";} else {
+ $ts->replacements[] = "<a href='javascript:loadImage(\"\\5\");'><img src='\\5' class='\\2' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" /></a>";
+ $ts->replacements[] = "<a href='javascript:loadImage(\"\\3\");'><img src='\\3' class='\\2' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' " . ($config['resize'] ? "onload=\"javascript:resizeImage(this, " . $config['max_width'] . ")\"" : "") . "/></a>";
+ $ts->replacements[] = "<a href='javascript:loadImage(\"\\3\");'><img src='\\3' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /></a><br />";
+ $ts->replacements[] = "<a href='javascript:loadImage(\"\\1\");'><img src='\\1' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' title='"._MSC_CLICK_TO_OPEN_IMAGE . "'" . ($config['resize'] ? " onload=\"javascript:resizeImage(this, " . $config['max_width'] . ")\"" : "") . "/></a>";
+ } else {
$ts->replacements[] = "<img src='\\5' class='\\2' border='0' alt='"._MSC_ORIGINAL_IMAGE ."' onload=\"JavaScript:if(this.width>\\4) this.width=\\4\" />";
- $ts->replacements[] = "<img src='\\3' class='\\2' border='0' alt='"._MSC_ORIGINAL_IMAGE ."' " . ($config['resize'] ? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
+ $ts->replacements[] = "<img src='\\3' class='\\2' border='0' alt='"._MSC_ORIGINAL_IMAGE ."' " . ($config['resize'] ? "onload=\"javascript:resizeImage(this, " . $config['max_width'] . ")\"" : "") . "/>";
$ts->replacements[] = "<img src='\\3' border='0' alt='"._MSC_ORIGINAL_IMAGE ."' onload=\"JavaScript:if(this.width>\\2) this.width=\\2\" />";
- $ts->replacements[] = "<img src='\\1' border='0' alt='"._MSC_ORIGINAL_IMAGE ."' " . ($config['resize'] ? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
+ $ts->replacements[] = "<img src='\\1' border='0' alt='"._MSC_ORIGINAL_IMAGE ."' " . ($config['resize'] ? " onload=\"javascript:resizeImage(this, " . $config['max_width'] . ")\"" : "") . "/>";
}
$ts->replacements[] = '<img src="' . XOOPS_URL . '/image.php?id=\\4" class="\\2" title="\\5" />';
$ts->replacements[] = '<img src="' . XOOPS_URL . '/image.php?id=\\2" title="\\3" />';
|
|
From: <luc...@us...> - 2013-09-15 17:01:37
|
Revision: 12057
http://sourceforge.net/p/xoops/svn/12057
Author: luciorota
Date: 2013-09-15 17:01:32 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
why italiano? here english is better ;-)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.js 2013-09-15 15:55:49 UTC (rev 12056)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.js 2013-09-15 17:01:32 UTC (rev 12057)
@@ -1,37 +1,35 @@
function imageResize (img, maxWidth)
{
- if (img.width > maxWidth && maxWidth > 0) img.width = maxWidth;
+ if (img.width > maxWidth && maxWidth > 0) img.width = maxWidth;
}
-function CaricaFoto(img)
+function imageLoad(img)
{
- foto1= new Image();
+ tempImage = new Image();
img = encodeURI(img);
- foto1.src = (img);
- Controlla(img);
+ tempImage.src = (img);
+ imageIsLoaded(img);
}
-function Controlla(img)
+function imageIsLoaded(img)
{
- if ( (foto1.width != 0) && (foto1.height != 0) ) {
- viewFoto(img);
- } else {
- funzione = "Controlla('\"+img+\"')";
- intervallo = setTimeout(funzione, 20);
- }
+ if ( (tempImage.width != 0) && (tempImage.height != 0) ) {
+ imageShow(img);
+ } else {
+ intervallo = setTimeout("imageIsLoaded('\"+img+\"')", 20);
+ }
}
-function viewFoto(img)
+function imageShow(img)
{
- largh = foto1.width;
- altez = foto1.height;
- stringa = "width=" + largh + ",height=" + altez;
- finestra = window.open ('','', stringa);
- finestra.document.write ("<html><body leftmargin=0 topmargin=0>");
- finestra.document.write ("<a href='javascript:this.close()'><img border=0 src=");
- finestra.document.write (img);
- finestra.document.write ("></a></body></html>");
- finestra.document.close();
- return false;
+ imageWidth = tempImage.width;
+ imageHeight = tempImage.height;
+ imagePopup = window.open ('','', "width=" + imageWidth + ",height=" + imageHeight);
+ imagePopup.document.write ("<html><body leftmargin=0 topmargin=0>");
+ imagePopup.document.write ("<a href='javascript:this.close()'><img border=0 src=");
+ imagePopup.document.write (img);
+ imagePopup.document.write ("></a></body></html>");
+ imagePopup.document.close();
+ return false;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php 2013-09-15 15:55:49 UTC (rev 12056)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php 2013-09-15 17:01:32 UTC (rev 12057)
@@ -46,7 +46,7 @@
$ts->replacements[] = '<a href="' . XOOPS_URL . '/image.php?id=\\2" rel="external" title="\\3">\\3</a>';
} else {
- if (!empty($config['resize']) && empty($config['clickable']) && !empty($config['max_width']) && !empty($GLOBALS['xoTheme'])) {
+ if (!empty($config['resize']) && empty($config['clickable']) && !empty($config['max_width']) && !empty($GLOBALS['xoTheme'])) {
if (!$jsLoaded) {
$jsLoaded = true;
$GLOBALS['xoTheme']->addScript('/class/textsanitizer/image/image.js', array(
@@ -57,18 +57,16 @@
$ts->replacements[] = "<img src='\\3' alt='"._MSC_RESIZED_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /><br />";
$ts->replacements[] = "<img src='\\1' alt='"._MSC_RESIZED_IMAGE . "' border='0'" . ($config['resize'] ? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
- } elseif
-
- (!empty($config['clickable']) && !empty($config['max_width']) && !empty($GLOBALS['xoTheme'])) {
+ } elseif (!empty($config['clickable']) && !empty($config['max_width']) && !empty($GLOBALS['xoTheme'])) {
if (!$jsLoaded) {
$jsLoaded = true;
$GLOBALS['xoTheme']->addScript('/class/textsanitizer/image/image.js', array(
'type' => 'text/javascript'));
}
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\5\");'><img src='\\5' class='\\2' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" /></a>";
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\3\");'><img src='\\3' class='\\2' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' " . ($config['resize'] ? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\3\");'><img src='\\3' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /></a><br />";
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\1\");'><img src='\\1' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' title='"._MSC_CLICK_TO_OPEN_IMAGE . "'" . ($config['resize'] ? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";} else {
+ $ts->replacements[] = "<a href='javascript:imageLoad(\"\\5\");'><img src='\\5' class='\\2' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" /></a>";
+ $ts->replacements[] = "<a href='javascript:imageLoad(\"\\3\");'><img src='\\3' class='\\2' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' " . ($config['resize'] ? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";
+ $ts->replacements[] = "<a href='javascript:imageLoad(\"\\3\");'><img src='\\3' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /></a><br />";
+ $ts->replacements[] = "<a href='javascript:imageLoad(\"\\1\");'><img src='\\1' alt='"._MSC_CLICK_TO_OPEN_IMAGE . "' border='0' title='"._MSC_CLICK_TO_OPEN_IMAGE . "'" . ($config['resize'] ? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";} else {
$ts->replacements[] = "<img src='\\5' class='\\2' border='0' alt='"._MSC_ORIGINAL_IMAGE ."' onload=\"JavaScript:if(this.width>\\4) this.width=\\4\" />";
$ts->replacements[] = "<img src='\\3' class='\\2' border='0' alt='"._MSC_ORIGINAL_IMAGE ."' " . ($config['resize'] ? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
$ts->replacements[] = "<img src='\\3' border='0' alt='"._MSC_ORIGINAL_IMAGE ."' onload=\"JavaScript:if(this.width>\\2) this.width=\\2\" />";
|
|
From: <luc...@us...> - 2013-09-15 15:55:54
|
Revision: 12056
http://sourceforge.net/p/xoops/svn/12056
Author: luciorota
Date: 2013-09-15 15:55:49 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
xoops_version.php and changelog updated
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-15 15:44:48 UTC (rev 12055)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-15 15:55:49 UTC (rev 12056)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta (2013-09-10)</u></b>
+<b><u>=> Version 3.23 Beta (2013-09-15)</u></b>
- module standardization: header.php, admin/admin_header.php, xoops_version.php
- module standardization: standardize directories/files names/structures
- module standardization: standardize code headers
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-15 15:44:48 UTC (rev 12055)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-15 15:55:49 UTC (rev 12056)
@@ -47,9 +47,9 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-09-11';
-$modversion['release_date'] = '2013/09/11';
-$modversion['releasedate'] = '2013-09-11';
+$modversion['date'] = '2013-09-15';
+$modversion['release_date'] = '2013/09/15';
+$modversion['releasedate'] = '2013-09-15';
$modversion['status'] = 'BETA';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
|
|
From: <luc...@us...> - 2013-09-15 15:44:51
|
Revision: 12055
http://sourceforge.net/p/xoops/svn/12055
Author: luciorota
Date: 2013-09-15 15:44:48 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
small code corrections. IMO module is ready for testing... particularly the upgrading procedure from previous module versions
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-09-15 13:46:27 UTC (rev 12054)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-09-15 15:44:48 UTC (rev 12055)
@@ -129,9 +129,7 @@
}
wfdownloads_savePermissions($down_groups, $newid, 'WFDownCatPerm');
wfdownloads_savePermissions($up_groups, $newid, 'WFUpCatPerm');
- /**
- * Notify of new category
- */
+ // Notify of new category
$tags = array();
$tags['CATEGORY_NAME'] = $_POST['title'];
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $newid;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-15 13:46:27 UTC (rev 12054)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-15 15:44:48 UTC (rev 12055)
@@ -34,13 +34,415 @@
$adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, "{$currentFile}?op=downloads.list", 'list');
$adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, "{$currentFile}?op=download.add", 'add');
echo $adminMenu->renderButton();
- addDownload();
+
+ $lid = WfdownloadsRequest::getInt('lid', 0);
+
+ $category_count = $wfdownloads->getHandler('category')->getCount();
+ if ($category_count) {
+ // Allowed mimetypes list
+ echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_FILE_ALLOWEDAMIME . "</legend>\n";
+ echo "<div style='padding: 8px;'>\n";
+ $criteria = new Criteria("mime_admin", true);
+ $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
+ $allowMimetypes = implode(' | ', $mimetypes);
+ echo $allowMimetypes;
+ echo "</div>\n";
+ echo "</fieldset><br />\n";
+
+ if ($lid) {
+ if (!$download = $wfdownloads->getHandler('download')->get($lid)) {
+ redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+ exit();
+ }
+ $cid = $download->getVar('cid');
+ if(!$category = $wfdownloads->getHandler('category')->get($cid)) {
+ redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_CATEGORYNOTFOUND);
+ exit();
+ }
+ $title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_EDITDOWNLOADTITLE);
+ } else {
+ $download = $wfdownloads->getHandler('download')->create();
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ $category = $wfdownloads->getHandler('category')->get($cid);
+ $download->setVar('cid', $cid);
+ $title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_DOWNLOADTITLE);
+ }
+
+ // Added Formulize module support (2006/05/04) jpc - start
+ if (!wfdownloads_checkModule('formulize')) {
+ $sform = $download->getAdminForm($title);
+ } elseif ((isset($_POST['submit_category']) && !empty($_POST['submit_category'])) || $lid) {
+ $fid = $category->getVar('formulize_fid');
+ $customArray = array();
+ if($fid) {
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $customArray['fid'] = $fid;
+ $customArray['formulize_mgr'] =& xoops_getmodulehandler('elements', 'formulize');
+ $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
+ $customArray['prevEntry'] = getEntryValues($download->getVar('formulize_idreq'), $customArray['formulize_mgr'], $customArray['groups'], $fid);
+ $customArray['entry'] = $download->getVar('formulize_idreq');
+ $customArray['go_back'] = "";
+ $customArray['parentLinks'] = "";
+ if (wfdownloads_checkModule('formulize') < 300)
+ $owner = getEntryOwner($entry);
+ else
+ $owner = getEntryOwner($entry, $fid);
+ $ownerGroups = $member_handler->getGroupsByUser($owner, false);
+ $customArray['owner_groups'] = $ownerGroups;
+ }
+ $sform = $download->getAdminForm($title, $customArray);
+ } else {
+ $sform = $download->getCategoryForm();
+ }
+ $sform->display();
+ // Added Formulize module support (2006/05/04) jpc - end
+ } else {
+ redirect_header('categories.php', 1, _AM_WFD_CCATEGORY_NOEXISTS);
+ exit();
+ }
+
+ // Vote data list/manager
+ if ($lid) {
+ $votes_count = $wfdownloads->getHandler('rating')->getCount();
+
+ $registeredCriteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $registeredCriteria->add(new Criteria('ratinguser', 0, '>'));
+ $votesreg = $wfdownloads->getHandler('rating')->getCount($registeredCriteria);
+ $registeredCriteria->setSort('ratingtimestamp');
+ $registeredCriteria->setOrder('DESC');
+ $regvotes = $wfdownloads->getHandler('rating')->getObjects($registeredCriteria);
+
+ $anonymousCriteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $anonymousCriteria->add(new Criteria('ratinguser', 0, '='));
+ $votesanon = $wfdownloads->getHandler('rating')->getCount($anonymousCriteria);
+ $anonymousCriteria->setSort('ratingtimestamp');
+ $anonymousCriteria->setOrder('DESC');
+
+ echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_VOTE_RATINGINFOMATION . "</legend>\n";
+ echo "<div style='padding: 8px;'><b>" . _AM_WFD_VOTE_TOTALVOTES . "</b>{$votes_count}<br /><br />\n";
+
+ printf(_AM_WFD_VOTE_REGUSERVOTES, $votesreg);
+
+ echo "<br />";
+
+ printf(_AM_WFD_VOTE_ANONUSERVOTES, $votesanon);
+
+ echo "
+ </div>\n
+ <table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
+ <tr>\n
+ <th>" . _AM_WFD_VOTE_USER . "</td>\n
+ <th>" . _AM_WFD_VOTE_IP . "</td>\n
+ <th>" . _AM_WFD_VOTE_RATING . "</td>\n
+ <th>" . _AM_WFD_VOTE_USERAVG . "</td>\n
+ <th>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
+ <th>" . _AM_WFD_VOTE_DATE . "</td>\n
+ <th>" . _AM_WFD_MINDEX_ACTION . "</td>\n
+ </tr>\n
+ ";
+
+ if ($votesreg == 0) {
+ echo "<tr><td colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOREGVOTES . "</b></td></tr>";
+ } else {
+ foreach (array_keys($regvotes) as $i) {
+ $uids[] = $regvotes[$i]->getVar('ratinguser');
+ }
+
+ $criteria = new Criteria("ratinguser", "(".implode(',', $uids).")", "IN");
+ $criteria->setGroupby("ratinguser");
+ $userratings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+
+ foreach (array_keys($regvotes) as $i) {
+ $formatted_date = formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), _DATESTRING);
+ $useravgrating = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar('ratinguser')]["avg"] : 0;
+ $uservotes = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar('ratinguser')]["count"] : 0;
+ $ratinguname = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
+
+ echo "
+ <tr><td class='head'>$ratinguname</td>\n
+ <td class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>$useravgrating</th>\n
+ <td class='even'>$uservotes</th>\n
+ <td class='even'>$formatted_date</th>\n
+ <td class='even'>\n
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ </th></tr>\n
+ ";
+ }
+ }
+ echo "
+ </table>\n
+ <br />\n
+ <table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
+ <tr>\n
+ <th>" . _AM_WFD_VOTE_USER . "</td>\n
+ <th>" . _AM_WFD_VOTE_IP . "</td>\n
+ <th>" . _AM_WFD_VOTE_RATING . "</td>\n
+ <th>" . _AM_WFD_VOTE_USERAVG . "</td>\n
+ <th>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
+ <th>" . _AM_WFD_VOTE_DATE . "</td>\n
+ <th>" . _AM_WFD_MINDEX_ACTION . "</td>\n
+ </tr>\n
+ ";
+ if ($votesanon == 0) {
+ echo "<tr><td colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOUNREGVOTES . "</b></td></tr>";
+ } else {
+ $criteria = new Criteria('ratinguser', 0);
+ $userratings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+ $anonymousVotes = $wfdownloads->getHandler('rating')->getObjects($anonymousCriteria);
+
+ foreach (array_keys($anonymousVotes) as $i) {
+ $formatted_date = formatTimestamp($anonymousVotes[$i]->getVar('ratingtimestamp'), _DATESTRING);
+ $useravgrating = isset($userratings['avg']) ? $userratings["avg"] : 0;
+ $uservotes = isset($userratings['count']) ? $userratings["count"] : 0;
+
+ $ratinguname = $GLOBALS['xoopsConfig']['anonymous'];
+
+ echo "
+ <tr><td class='head'>$ratinguname</td>\n
+ <td class='even'>" . $anonymousVotes[$i]->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $anonymousVotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>$useravgrating</th>\n
+ <td class='even'>$uservotes</th>\n
+ <td class='even'>$formatted_date</th>\n
+ <td class='even'>\n
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonymousVotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ </th></tr>\n
+ ";
+ }
+ }
+ echo "</table>\n";
+ echo "</fieldset>\n";
+ }
include 'admin_footer.php';
break;
case "download.save" :
case "addDownload" :
- saveDownload();
+ $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ $status = WfdownloadsRequest::getInt('status', 2, 'POST');
+
+ if ($lid > 0) {
+ $thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
+ $download = $wfdownloads->getHandler('download')->get($lid);
+ } else {
+ $thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
+ $download = $wfdownloads->getHandler('download')->create();
+ }
+ // Define URL
+ if (empty($_FILES['userfile']['name'])) {
+ if ($_POST['url'] && $_POST['url'] != "" && $_POST['url'] != "http://") {
+ $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
+ $filename = '';
+ $filetype = '';
+ } else {
+ $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
+ $filename = $_POST['filename'];
+ $filetype = $_POST['filetype'];
+ }
+ $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int)$_POST["size"];
+ $title = trim($_POST['title']);
+ $download->setVar('filename', $filename);
+ $download->setVar('filetype', $filetype);
+ } else {
+ $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
+ $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
+ $size = $down['size'];
+ $title = $_FILES['userfile']['name'];
+ $ext = rtrim(strrchr($title, '.'), '.');
+ $title = str_replace($ext, '', $title);
+ $title = (isset($_POST['title_checkbox']) && $_POST['title_checkbox'] == 1) ? $title : trim($_POST['title']);
+
+ $filename = $down['filename'];
+ $filetype = $_FILES['userfile']['type'];
+ $download->setVar('filename', $filename);
+ $download->setVar('filetype', $filetype);
+ }
+ // Get data from form
+ $screenshot = ($_POST['screenshot'] != 'blank.png') ? $_POST['screenshot'] : '';
+ $screenshot2 = ($_POST['screenshot2'] != 'blank.png') ? $_POST['screenshot2'] : '';
+ $screenshot3 = ($_POST['screenshot3'] != 'blank.png') ? $_POST['screenshot3'] : '';
+ $screenshot4 = ($_POST['screenshot4'] != 'blank.png') ? $_POST['screenshot4'] : '';
+
+ if (!empty($_POST['homepage']) || $_POST['homepage'] != "http://") {
+ $download->setVar('homepage', trim($_POST['homepage']));
+ $download->setVar('homepagetitle', trim($_POST['homepagetitle']));
+ }
+
+ $version = !empty($_POST['version']) ? trim($_POST['version']) : 0;
+
+ /* Added by Lankford on 2007/3/21 */
+ // Here, I want to know if:
+ // a) Are they actually changing the value of version, or is it the same?
+ // b) Are they actually modifying the record, or is this a new one?
+ // If both conditions are true, then trigger all three notifications related to modified records.
+ if (!$thisIsANewRecord and ($download->getVar('version') != $version)) {
+ // Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $category = $wfdownloads->getHandler('category')->get($cid);
+ $tags['FILE_VERSION'] = $version;
+ $tags['CATEGORY_NAME'] = $category->getVar('title');
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid='{$cid}";
+
+ if ($wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_DOWNLOAD || $wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_BOTH) {
+ // Then this change will be automatically approved, so the notification needs to go out.
+ $notification_handler->triggerEvent('global', 0, 'filemodified', $tags);
+ $notification_handler->triggerEvent('category', $cid, 'filemodified', $tags);
+ $notification_handler->triggerEvent('file', $lid, 'filemodified', $tags);
+ }
+ }
+ /* End add block */
+ $download->setVar('version', $version);
+ $download->setVar('url', $url);
+ $download->setVar('cid', $cid);
+ $download->setVar('title', $title);
+ $download->setVar('status', $status);
+ $download->setVar('size', $size);
+ $download->setVar('screenshot', $screenshot);
+ $download->setVar('screenshot2', $screenshot2);
+ $download->setVar('screenshot3', $screenshot3);
+ $download->setVar('screenshot4', $screenshot4);
+ $download->setVar('platform', trim($_POST['platform']));
+ $download->setVar('summary', trim($_POST['summary']));
+ $download->setVar('description', trim($_POST['description']));
+ $download->setVar('submitter', trim($_POST['submitter']));
+ $download->setVar('publisher', trim($_POST['publisher']));
+ $download->setVar('price', trim($_POST['price']));
+ if (!$wfdownloads->getConfig('enable_mirrors')) {
+ $download->setVar('mirror', formatURL(trim($_POST['mirror'])));
+ }
+ $download->setVar('license', trim($_POST['license']));
+ $download->setVar('features', trim($_POST['features']));
+ $download->setVar('requirements', trim($_POST['requirements']));
+ $limitations = (isset($_POST['limitations'])) ? $_POST['limitations'] : '';
+ $download->setVar('limitations', $limitations);
+ $versiontypes = (isset($_POST['versiontypes'])) ? $_POST['versiontypes'] : '';
+ $download->setVar('versiontypes', $versiontypes);
+
+ $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
+ $dhistoryhistory = (isset($_POST['dhistoryaddedd'])) ? $_POST['dhistoryaddedd'] : '';
+
+ if ($lid > 0 && !empty($dhistoryhistory)) {
+ $dhistory = $dhistory . "\n\n";
+ $time = time();
+ $dhistory .= _AM_WFD_FILE_HISTORYVERS . $version . _AM_WFD_FILE_HISTORDATE . formatTimestamp($time, _DATESTRING) . "\n\n";
+ $dhistory .= $dhistoryhistory;
+ }
+ $download->setVar('dhistory', $dhistory);
+ $download->setVar('dhistoryhistory', $dhistoryhistory);
+
+ $updated = (isset($_POST['was_published']) && $_POST['was_published'] == 0) ? 0 : time();
+
+ if ($_POST['up_dated'] == 0) {
+ $updated = 0;
+ }
+ $download->setVar('updated', $updated);
+
+ $offline = ($_POST['offline'] == 1) ? 1 : 0;
+ $download->setVar('offline', $offline);
+ $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
+ $notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == true);
+
+ $expiredate = 0;
+ if (!$lid) {
+ $publishdate = time();
+ } else {
+ $publishdate = $_POST['was_published'];
+ $expiredate = $_POST['was_expired'];
+ }
+ if ($approved == 1 && empty($publishdate)) {
+ $publishdate = time();
+ }
+ if (isset($_POST['publishdateactivate'])) {
+ $publishdate = strtotime($_POST['published']['date']) + $_POST['published']['time'];
+ }
+ if ($_POST['clearpublish']) {
+ $publishdate = $download->getVar('published');
+ }
+ if (isset($_POST['expiredateactivate'])) {
+ $expiredate = strtotime($_POST['expired']['date']) + $_POST['expired']['time'];
+ }
+ if ($_POST['clearexpire']) {
+ $expiredate = '0';
+ }
+
+ $download->setVar('expired', $expiredate);
+ $download->setVar('published', $publishdate);
+ $download->setVar('date', time());
+ // Update or insert download data into database
+ if (!$lid) {
+ $download->setVar('ipaddress', $_SERVER['REMOTE_ADDR']);
+ }
+
+ $category = $wfdownloads->getHandler('category')->get($cid);
+
+ // Added Formulize module support (2006/05/04) jpc - start
+ if (wfdownloads_checkModule('formulize')) {
+ $fid = $category->getVar('formulize_fid');
+ if($fid) {
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formread.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
+ if ($lid) {
+ $entries[$fid][0] = $download->getVar('formulize_idreq');
+ if($entries[$fid][0]) {
+ if (wfdownloads_checkModule('formulize') < 300)
+ $owner = getEntryOwner($entries[$fid][0]);
+ else
+ $owner = getEntryOwner($entries[$fid][0], $fid);
+ } else {
+ print "no idreq";
+ $entries[$fid][0] = "";
+ $owner = "";
+ }
+ $cid = $download->getVar('cid');
+ } else {
+ $entries[$fid][0] = "";
+ $owner = "";
+ }
+ $ownerGroups =& $member_handler->getGroupsByUser($owner, false);
+ $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+ $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
+ $entries = handleSubmission($formulize_mgr, $entries, $uid, $owner, $fid, $ownerGroups, $groups, "new"); // "new" causes xoops token check to be skipped, since WF-downloads should be doing that
+ if(!$owner) {
+ $id_req = $entries[$fid][0];
+ $download->setVar('formulize_idreq', $id_req);
+ }
+ }
+ }
+ // Added Formulize module support (2006/05/04) jpc - end
+ $wfdownloads->getHandler('download')->insert($download);
+ $newid = (int)$download->getVar('lid');
+ // Send notifications
+ if (!$lid) {
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
+ $tags['CATEGORY_NAME'] = $category->getVar('title');
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $notification_handler->triggerEvent('global', 0, 'new_file', $tags);
+ $notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
+ }
+ if ($lid && $approved && $notifypub) {
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $category = $wfdownloads->getHandler('category')->get($cid);
+ $tags['CATEGORY_NAME'] = $category->getVar('title');
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
+ $notification_handler->triggerEvent('global', 0, 'new_file', $tags);
+ $notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
+ $notification_handler->triggerEvent('file', $lid, 'approve', $tags);
+ }
+ $message = (!$lid) ? _AM_WFD_FILE_NEWFILEUPLOAD : _AM_WFD_FILE_FILEMODIFIEDUPDATE ;
+ $message = ($lid && !$_POST['was_published'] && $approved) ? _AM_WFD_FILE_FILEAPPROVED : $message;
+
+ redirect_header($currentFile, 1, $message);
break;
case "download.delete" :
@@ -344,429 +746,12 @@
function addDownload()
{
- global $xoopsUser, $imagearray, $currentFile;
- $wfdownloads = WfdownloadsWfdownloads::getInstance();
- $member_handler = xoops_gethandler('member');
- $notification_handler = xoops_gethandler('notification');
-
- $lid = WfdownloadsRequest::getInt('lid', 0);
-
- $category_count = $wfdownloads->getHandler('category')->getCount();
- if ($category_count) {
- // allowed mimetypes list
- echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_FILE_ALLOWEDAMIME . "</legend>\n";
- echo "<div style='padding: 8px;'>\n";
- $criteria = new Criteria("mime_admin", true);
- $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
- $allowMimetypes = implode(' | ', $mimetypes);
- echo $allowMimetypes;
- echo "</div>\n";
- echo "</fieldset><br />\n";
-
- if ($lid) {
- if (!$download = $wfdownloads->getHandler('download')->get($lid)) {
- redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
- exit();
- }
- $cid = $download->getVar('cid');
- if(!$category = $wfdownloads->getHandler('category')->get($cid)) {
- redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_CATEGORYNOTFOUND);
- exit();
- }
- $title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_EDITDOWNLOADTITLE);
- } else {
- $download = $wfdownloads->getHandler('download')->create();
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
- $category = $wfdownloads->getHandler('category')->get($cid);
- $download->setVar('cid', $cid);
- $title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_DOWNLOADTITLE);
- }
-
- // Added Formulize module support (2006/05/04) jpc - start
- if (!wfdownloads_checkModule('formulize')) {
- $sform = $download->getAdminForm($title);
- } elseif ((isset($_POST['submit_category']) && !empty($_POST['submit_category'])) || $lid) {
- $fid = $category->getVar('formulize_fid');
- $customArray = array();
- if($fid) {
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $customArray['fid'] = $fid;
- $customArray['formulize_mgr'] =& xoops_getmodulehandler('elements', 'formulize');
- $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues($download->getVar('formulize_idreq'), $customArray['formulize_mgr'], $customArray['groups'], $fid);
- $customArray['entry'] = $download->getVar('formulize_idreq');
- $customArray['go_back'] = "";
- $customArray['parentLinks'] = "";
- if (wfdownloads_checkModule('formulize') < 300)
- $owner = getEntryOwner($entry);
- else
- $owner = getEntryOwner($entry, $fid);
- $owner_groups = $member_handler->getGroupsByUser($owner, false);
- $customArray['owner_groups'] = $owner_groups;
- }
- $sform = $download->getAdminForm($title, $customArray);
- } else {
- $sform = $download->getCategoryForm();
- }
- $sform->display();
- // Added Formulize module support (2006/05/04) jpc - end
- } else {
- redirect_header('categories.php', 1, _AM_WFD_CCATEGORY_NOEXISTS);
- exit();
- }
-
- // Vote data list/manager
- if ($lid) {
- $totalvotes = $wfdownloads->getHandler('rating')->getCount();
-
- $reg_criteria = new CriteriaCompo(new Criteria('lid', $lid));
- $reg_criteria->add(new Criteria("ratinguser", 0, ">"));
- $votesreg = $wfdownloads->getHandler('rating')->getCount($reg_criteria);
- $reg_criteria->setSort("ratingtimestamp");
- $reg_criteria->setOrder('DESC');
- $regvotes = $wfdownloads->getHandler('rating')->getObjects($reg_criteria);
-
- $anon_criteria = new CriteriaCompo(new Criteria('lid', $lid));
- $anon_criteria->add(new Criteria("ratinguser", 0, "="));
- $votesanon = $wfdownloads->getHandler('rating')->getCount($anon_criteria);
- $anon_criteria->setSort("ratingtimestamp");
- $anon_criteria->setOrder('DESC');
-
- echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_VOTE_RATINGINFOMATION . "</legend>\n";
- echo "<div style='padding: 8px;'><b>" . _AM_WFD_VOTE_TOTALVOTES . "</b>{$totalvotes}<br /><br />\n";
-
- printf(_AM_WFD_VOTE_REGUSERVOTES, $votesreg);
-
- echo "<br />";
-
- printf(_AM_WFD_VOTE_ANONUSERVOTES, $votesanon);
-
- echo "
- </div>\n
- <table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
- <tr>\n
- <th>" . _AM_WFD_VOTE_USER . "</td>\n
- <th>" . _AM_WFD_VOTE_IP . "</td>\n
- <th>" . _AM_WFD_VOTE_RATING . "</td>\n
- <th>" . _AM_WFD_VOTE_USERAVG . "</td>\n
- <th>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
- <th>" . _AM_WFD_VOTE_DATE . "</td>\n
- <th>" . _AM_WFD_MINDEX_ACTION . "</td>\n
- </tr>\n
- ";
-
- if ($votesreg == 0) {
- echo "<tr><td colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOREGVOTES . "</b></td></tr>";
- } else {
- foreach (array_keys($regvotes) as $i) {
- $uids[] = $regvotes[$i]->getVar('ratinguser');
- }
-
- $criteria = new Criteria("ratinguser", "(".implode(',', $uids).")", "IN");
- $criteria->setGroupby("ratinguser");
- $userratings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
-
- foreach (array_keys($regvotes) as $i) {
- $formatted_date = formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), _DATESTRING);
- $useravgrating = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar('ratinguser')]["avg"] : 0;
- $uservotes = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar('ratinguser')]["count"] : 0;
- $ratinguname = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
-
- echo "
- <tr><td class='head'>$ratinguname</td>\n
- <td class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
- <td class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
- <td class='even'>$useravgrating</th>\n
- <td class='even'>$uservotes</th>\n
- <td class='even'>$formatted_date</th>\n
- <td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
- </th></tr>\n
- ";
- }
- }
- echo "
- </table>\n
- <br />\n
- <table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
- <tr>\n
- <th>" . _AM_WFD_VOTE_USER . "</td>\n
- <th>" . _AM_WFD_VOTE_IP . "</td>\n
- <th>" . _AM_WFD_VOTE_RATING . "</td>\n
- <th>" . _AM_WFD_VOTE_USERAVG . "</td>\n
- <th>" . _AM_WFD_VOTE_TOTALRATE . "</td>\n
- <th>" . _AM_WFD_VOTE_DATE . "</td>\n
- <th>" . _AM_WFD_MINDEX_ACTION . "</td>\n
- </tr>\n
- ";
- if ($votesanon == 0) {
- echo "<tr><td colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOUNREGVOTES . "</b></td></tr>";
- } else {
- $criteria = new Criteria("ratinguser", 0);
- $userratings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
- $anonvotes = $wfdownloads->getHandler('rating')->getObjects($anon_criteria);
-
- foreach (array_keys($anonvotes) as $i) {
- $formatted_date = formatTimestamp($anonvotes[$i]->getVar('ratingtimestamp'), _DATESTRING);
- $useravgrating = isset($userratings['avg']) ? $userratings["avg"] : 0;
- $uservotes = isset($userratings['count']) ? $userratings["count"] : 0;
-
- $ratinguname = $GLOBALS['xoopsConfig']['anonymous'];
-
- echo "
- <tr><td class='head'>$ratinguname</td>\n
- <td class='even'>" . $anonvotes[$i]->getVar('ratinghostname') . "</th>\n
- <td class='even'>" . $anonvotes[$i]->getVar('rating') . "</th>\n
- <td class='even'>$useravgrating</th>\n
- <td class='even'>$uservotes</th>\n
- <td class='even'>$formatted_date</th>\n
- <td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
- </th></tr>\n
- ";
- }
- }
- echo "</table>\n";
- echo "</fieldset>\n";
- }
}
function saveDownload()
{
- global $xoopsUser, $currentFile;
- $wfdownloads = WfdownloadsWfdownloads::getInstance();
- $member_handler = xoops_gethandler('member');
- $notification_handler = xoops_gethandler('notification');
-
- $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
- $status = WfdownloadsRequest::getInt('status', 2, 'POST');
-
- if ($lid > 0) {
- $thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
- $download = $wfdownloads->getHandler('download')->get($lid);
- } else {
- $thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
- $download = $wfdownloads->getHandler('download')->create();
- }
- /* Define URL */
- if (empty($_FILES['userfile']['name'])) {
- if ($_POST['url'] && $_POST['url'] != "" && $_POST['url'] != "http://") {
- $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
- $filename = '';
- $filetype = '';
- } else {
- $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
- $filename = $_POST['filename'];
- $filetype = $_POST['filetype'];
- }
- $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int)$_POST["size"];
- $title = trim($_POST['title']);
- $download->setVar('filename', $filename);
- $download->setVar('filetype', $filetype);
- } else {
- $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
- $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
- $size = $down['size'];
- $title = $_FILES['userfile']['name'];
- $ext = rtrim(strrchr($title, '.'), '.');
- $title = str_replace($ext, '', $title);
- $title = (isset($_POST['title_checkbox']) && $_POST['title_checkbox'] == 1) ? $title : trim($_POST['title']);
-
- $filename = $down['filename'];
- $filetype = $_FILES['userfile']['type'];
- $download->setVar('filename', $filename);
- $download->setVar('filetype', $filetype);
- }
- /* Get data from form */
- $screenshot = ($_POST['screenshot'] != 'blank.png') ? $_POST['screenshot'] : '';
- $screenshot2 = ($_POST['screenshot2'] != 'blank.png') ? $_POST['screenshot2'] : '';
- $screenshot3 = ($_POST['screenshot3'] != 'blank.png') ? $_POST['screenshot3'] : '';
- $screenshot4 = ($_POST['screenshot4'] != 'blank.png') ? $_POST['screenshot4'] : '';
-
- if (!empty($_POST['homepage']) || $_POST['homepage'] != "http://") {
- $download->setVar('homepage', trim($_POST['homepage']));
- $download->setVar('homepagetitle', trim($_POST['homepagetitle']));
- }
-
- $version = !empty($_POST['version']) ? trim($_POST['version']) : 0;
-
- /* Added by Lankford on 2007/3/21 */
- // Here, I want to know if:
- // a) Are they actually changing the value of version, or is it the same?
- // b) Are they actually modifying the record, or is this a new one?
- // If both conditions are true, then trigger all three notifications related to modified records.
- if (!$thisIsANewRecord and ($download->getVar('version') != $version)) {
- // Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $category = $wfdownloads->getHandler('category')->get($cid);
- $tags['FILE_VERSION'] = $version;
- $tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid='{$cid}";
-
- if ($wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_DOWNLOAD || $wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_BOTH) {
- // Then this change will be automatically approved, so the notification needs to go out.
- $notification_handler->triggerEvent('global', 0, 'filemodified', $tags);
- $notification_handler->triggerEvent('category', $cid, 'filemodified', $tags);
- $notification_handler->triggerEvent('file', $lid, 'filemodified', $tags);
- }
- }
- /* End add block */
- $download->setVar('version', $version);
- $download->setVar('url', $url);
- $download->setVar('cid', $cid);
- $download->setVar('title', $title);
- $download->setVar('status', $status);
- $download->setVar('size', $size);
- $download->setVar('screenshot', $screenshot);
- $download->setVar('screenshot2', $screenshot2);
- $download->setVar('screenshot3', $screenshot3);
- $download->setVar('screenshot4', $screenshot4);
- $download->setVar('platform', trim($_POST['platform']));
- $download->setVar('summary', trim($_POST['summary']));
- $download->setVar('description', trim($_POST['description']));
- $download->setVar('submitter', trim($_POST['submitter']));
- $download->setVar('publisher', trim($_POST['publisher']));
- $download->setVar('price', trim($_POST['price']));
- if (!$wfdownloads->getConfig('enable_mirrors')) {
- $download->setVar('mirror', formatURL(trim($_POST['mirror'])));
- }
- $download->setVar('license', trim($_POST['license']));
- $download->setVar('features', trim($_POST['features']));
- $download->setVar('requirements', trim($_POST['requirements']));
- $limitations = (isset($_POST['limitations'])) ? $_POST['limitations'] : '';
- $download->setVar('limitations', $limitations);
- $versiontypes = (isset($_POST['versiontypes'])) ? $_POST['versiontypes'] : '';
- $download->setVar('versiontypes', $versiontypes);
-
- $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
- $dhistoryhistory = (isset($_POST['dhistoryaddedd'])) ? $_POST['dhistoryaddedd'] : '';
-
- if ($lid > 0 && !empty($dhistoryhistory)) {
- $dhistory = $dhistory . "\n\n";
- $time = time();
- $dhistory .= _AM_WFD_FILE_HISTORYVERS . $version . _AM_WFD_FILE_HISTORDATE . formatTimestamp($time, _DATESTRING) . "\n\n";
- $dhistory .= $dhistoryhistory;
- }
- $download->setVar('dhistory', $dhistory);
- $download->setVar('dhistoryhistory', $dhistoryhistory);
-
- $updated = (isset($_POST['was_published']) && $_POST['was_published'] == 0) ? 0 : time();
-
- if ($_POST['up_dated'] == 0) {
- $updated = 0;
- }
- $download->setVar('updated', $updated);
-
- $offline = ($_POST['offline'] == 1) ? 1 : 0;
- $download->setVar('offline', $offline);
- $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
- $notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == true);
-
- $expiredate = 0;
- if (!$lid) {
- $publishdate = time();
- } else {
- $publishdate = $_POST['was_published'];
- $expiredate = $_POST['was_expired'];
- }
- if ($approved == 1 && empty($publishdate)) {
- $publishdate = time();
- }
- if (isset($_POST['publishdateactivate'])) {
- $publishdate = strtotime($_POST['published']['date']) + $_POST['published']['time'];
- }
- if ($_POST['clearpublish']) {
- $publishdate = $download->getVar('published');
- }
- if (isset($_POST['expiredateactivate'])) {
- $expiredate = strtotime($_POST['expired']['date']) + $_POST['expired']['time'];
- }
- if ($_POST['clearexpire']) {
- $expiredate = '0';
- }
-
- $download->setVar('expired', $expiredate);
- $download->setVar('published', $publishdate);
- $download->setVar('date', time());
- /**
- * Update or insert download data into database
- */
- if (!$lid) {
- $download->setVar('ipaddress', $_SERVER['REMOTE_ADDR']);
- }
-
- $category = $wfdownloads->getHandler('category')->get($cid);
-
- // Added Formulize module support (2006/05/04) jpc - start
- if (wfdownloads_checkModule('formulize')) {
- $fid = $category->getVar('formulize_fid');
- if($fid) {
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formread.php";
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
- if ($lid) {
- $entries[$fid][0] = $download->getVar('formulize_idreq');
- if($entries[$fid][0]) {
- if (wfdownloads_checkModule('formulize') < 300)
- $owner = getEntryOwner($entries[$fid][0]);
- else
- $owner = getEntryOwner($entries[$fid][0], $fid);
- } else {
- print "no idreq";
- $entries[$fid][0] = "";
- $owner = "";
- }
- $cid = $download->getVar('cid');
- } else {
- $entries[$fid][0] = "";
- $owner = "";
- }
- $owner_groups =& $member_handler->getGroupsByUser($owner, false);
- $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
- $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
- $entries = handleSubmission($formulize_mgr, $entries, $uid, $owner, $fid, $owner_groups, $groups, "new"); // "new" causes xoops token check to be skipped, since WF-downloads should be doing that
- if(!$owner) {
- $id_req = $entries[$fid][0];
- $download->setVar('formulize_idreq', $id_req);
- }
- }
- }
- // Added Formulize module support (2006/05/04) jpc - end
- $wfdownloads->getHandler('download')->insert($download);
- $newid = (int)$download->getVar('lid');
- /**
- * Send notifications
- */
- if (!$lid) {
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
- $tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
- $notification_handler->triggerEvent('global', 0, 'new_file', $tags);
- $notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
- }
- if ($lid && $approved && $notifypub) {
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $category = $wfdownloads->getHandler('category')->get($cid);
- $tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
- $notification_handler->triggerEvent('global', 0, 'new_file', $tags);
- $notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
- $notification_handler->triggerEvent('file', $lid, 'approve', $tags);
- }
- $message = (!$lid) ? _AM_WFD_FILE_NEWFILEUPLOAD : _AM_WFD_FILE_FILEMODIFIEDUPDATE ;
- $message = ($lid && !$_POST['was_published'] && $approved) ? _AM_WFD_FILE_FILEAPPROVED : $message;
-
- redirect_header($currentFile, 1, $message);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-15 13:46:27 UTC (rev 12054)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-15 15:44:48 UTC (rev 12055)
@@ -181,6 +181,7 @@
break;
case "download.save" :
+ // Save submitted download
if (empty($_FILES['userfile']['name'])) {
if ($_POST['url'] && $_POST['url'] != '' && $_POST['url'] != "http://") {
$url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
|
|
From: <be...@us...> - 2013-09-15 13:46:30
|
Revision: 12054
http://sourceforge.net/p/xoops/svn/12054
Author: beckmi
Date: 2013-09-15 13:46:27 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
Fixing template (Cifug)
Modified Paths:
--------------
XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt
XoopsModules/extgallery/trunk/modules/extgallery/templates/extgallery_index.html
Modified: XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt 2013-09-15 02:32:35 UTC (rev 12053)
+++ XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt 2013-09-15 13:46:27 UTC (rev 12054)
@@ -3,6 +3,7 @@
============================
- added .jpeg extension (mamba)
- replaced ExtgalleryPhotoUploader with standard XoopsMediaUploader (mamba)
+- fix for index template (Cifug)
============================
2012-12-18: Version 1.11
Modified: XoopsModules/extgallery/trunk/modules/extgallery/templates/extgallery_index.html
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/templates/extgallery_index.html 2013-09-15 02:32:35 UTC (rev 12053)
+++ XoopsModules/extgallery/trunk/modules/extgallery/templates/extgallery_index.html 2013-09-15 13:46:27 UTC (rev 12054)
@@ -1,76 +1,76 @@
-<div class="extgallery">
- <a title="<{$extgalleryName}>" href="<{xoAppUrl modules/extgallery/}>"><{$extgalleryName}></a>
-
- <table class="outer">
- <tr>
- <th><{$lang.categoriesAlbums}></th>
- <th class="txtcenter"><{$lang.nbAlbums}></th>
- <th class="txtcenter"><{$lang.nbPhotos}></th>
- </tr>
- <{foreachq item=child from=$cats}>
- <tr class="<{cycle values="even,odd"}>">
- <{if $child.cat_nb_album == 0}>
- <td colspan="2">
- <{else}>
- <td>
- <{/if}>
-
- <!-- Category/album image -->
- <{if $disp_cat_img == 1 }>
- <{if $child.cat_imgurl != "" }>
- <div class="catThumb">
- <{if $child.cat_isalbum}>
- <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>"><img src="<{$child.cat_imgurl}>" alt="<{$child.cat_name}>" title="<{$child.cat_name}>" /></a>
- <{else}>
- <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-categories.php?id=<{$child.cat_id}>"><img src="<{$child.cat_imgurl}>" alt="<{$child.cat_name}>" title="<{$child.cat_name}>" /></a>
- <{/if}>
- </div>
- <{else}>
- <{if $child.photo}>
- <div class="catThumb">
- <{if $child.cat_isalbum}>
- <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>"><img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>" title="<{$child.photo.photo_title}>" /></a>
- <{else}>
- <a title="<{$child.cat_name}>" href="pu<{$extgalleryName}>blic-categories.php?id=<{$child.cat_id}>"><img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>" title="<{$child.photo.photo_title}>" /></a>
- <{/if}>
- </div>
- <{/if}>
- <{/if}>
- <{else}>
- <{if $child.photo}>
- <div class="catThumb">
- <{if $child.cat_isalbum}>
- <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>"><img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>" title="<{$child.photo.photo_title}>" /></a>
- <{else}>
- <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-categories.php?id=<{$child.cat_id}>"><img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>" title="<{$child.photo.photo_title}>" /></a>
- <{/if}>
- </div>
- <{/if}>
- <{/if}>
-
- <{if $child.cat_isalbum}>
- <h2><a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>"><{$child.cat_name}></a></h2><br /><h3><{$child.cat_desc}></h3></td>
- <{else}>
- <h2><a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-categories.php?id=<{$child.cat_id}>"><{$child.cat_name}></a></h2><br /><h3><{$child.cat_desc}></h3></td>
- <{/if}>
- <{if $child.cat_nb_album != 0}>
- <td class="txtcenter"><{$child.cat_nb_album}></td>
- <{/if}>
- <td class="txtcenter"><{$child.cat_nb_photo}></td>
- </tr>
- <{/foreach}>
- <!--<tr class="even">
- <td><a href="user-categories.php">User categories</a><br />You can find here all user categories</td>
- </tr>-->
- </table>
-
- <{if $show_rss}>
- <div id="rss">
- <a href="<{xoAppUrl modules/extgallery/public-rss.php}>" title="<{$smarty.const._MD_EXTGALLERY_RSS}>">
- <img src="<{xoAppUrl modules/extgallery/images/feed.png}>" alt="<{$smarty.const._MD_EXTGALLERY_RSS}>" />
- </a>
- </div>
- <{/if}>
-
- <{include file='db:system_notification_select.html'}>
-</div>
+<div class="extgallery">
+ <a title="<{$extgalleryName}>" href="<{xoAppUrl modules/extgallery/}>"><{$extgalleryName}></a>
+
+ <table class="outer">
+ <tr>
+ <th><{$lang.categoriesAlbums}></th>
+ <th class="txtcenter"><{$lang.nbAlbums}></th>
+ <th class="txtcenter"><{$lang.nbPhotos}></th>
+ </tr>
+ <{foreachq item=child from=$cats}>
+ <tr class="<{cycle values="even,odd"}>">
+ <{if $child.cat_nb_album == 0}>
+ <td colspan="2">
+ <{else}>
+ <td>
+ <{/if}>
+
+ <!-- Category/album image -->
+ <{if $disp_cat_img == 1 }>
+ <{if $child.cat_imgurl != "" }>
+ <div class="catThumb">
+ <{if $child.cat_isalbum}>
+ <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>"><img src="<{$child.cat_imgurl}>" alt="<{$child.cat_name}>" title="<{$child.cat_name}>" /></a>
+ <{else}>
+ <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-categories.php?id=<{$child.cat_id}>"><img src="<{$child.cat_imgurl}>" alt="<{$child.cat_name}>" title="<{$child.cat_name}>" /></a>
+ <{/if}>
+ </div>
+ <{else}>
+ <{if $child.photo}>
+ <div class="catThumb">
+ <{if $child.cat_isalbum}>
+ <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>"><img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>" title="<{$child.photo.photo_title}>" /></a>
+ <{else}>
+ <a title="<{$child.cat_name}>" href="<{$extgalleryName}>public-categories.php?id=<{$child.cat_id}>"><img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>" title="<{$child.photo.photo_title}>" /></a>
+ <{/if}>
+ </div>
+ <{/if}>
+ <{/if}>
+ <{else}>
+ <{if $child.photo}>
+ <div class="catThumb">
+ <{if $child.cat_isalbum}>
+ <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>"><img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>" title="<{$child.photo.photo_title}>" /></a>
+ <{else}>
+ <a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-categories.php?id=<{$child.cat_id}>"><img src="<{$xoops_url}>/uploads/extgallery/public-photo/thumb/thumb_<{$child.photo.photo_name}>" alt="<{$child.photo.photo_title}>" title="<{$child.photo.photo_title}>" /></a>
+ <{/if}>
+ </div>
+ <{/if}>
+ <{/if}>
+
+ <{if $child.cat_isalbum}>
+ <h2><a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-<{$display_type}>.php?id=<{$child.cat_id}>"><{$child.cat_name}></a></h2><br /><h3><{$child.cat_desc}></h3></td>
+ <{else}>
+ <h2><a title="<{$child.cat_name}>" href="<{xoAppUrl modules/extgallery/}>public-categories.php?id=<{$child.cat_id}>"><{$child.cat_name}></a></h2><br /><h3><{$child.cat_desc}></h3></td>
+ <{/if}>
+ <{if $child.cat_nb_album != 0}>
+ <td class="txtcenter"><{$child.cat_nb_album}></td>
+ <{/if}>
+ <td class="txtcenter"><{$child.cat_nb_photo}></td>
+ </tr>
+ <{/foreach}>
+ <!--<tr class="even">
+ <td><a href="user-categories.php">User categories</a><br />You can find here all user categories</td>
+ </tr>-->
+ </table>
+
+ <{if $show_rss}>
+ <div id="rss">
+ <a href="<{xoAppUrl modules/extgallery/public-rss.php}>" title="<{$smarty.const._MD_EXTGALLERY_RSS}>">
+ <img src="<{xoAppUrl modules/extgallery/images/feed.png}>" alt="<{$smarty.const._MD_EXTGALLERY_RSS}>" />
+ </a>
+ </div>
+ <{/if}>
+
+ <{include file='db:system_notification_select.html'}>
+</div>
|
|
From: <rgr...@us...> - 2013-09-15 02:32:40
|
Revision: 12053
http://sourceforge.net/p/xoops/svn/12053
Author: rgriffith
Date: 2013-09-15 02:32:35 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
Update to reworked XMF 1.0 Alpha
Modified Paths:
--------------
XMF/demo/trunk/demo/admin/about.php
XMF/demo/trunk/demo/admin/admin_header.php
XMF/demo/trunk/demo/admin/index.php
XMF/demo/trunk/demo/admin/menu.php
XMF/demo/trunk/demo/docs/changelog.txt
XMF/demo/trunk/demo/include/common.php
XMF/demo/trunk/demo/include/install.inc.php
XMF/demo/trunk/demo/index.php
XMF/demo/trunk/demo/language/english/manifesto.php
XMF/demo/trunk/demo/xoops_version.php
Added Paths:
-----------
XMF/demo/trunk/demo/admin/admin_footer.php
Removed Paths:
-------------
XMF/demo/trunk/demo/admin/summary.php
Modified: XMF/demo/trunk/demo/admin/about.php
===================================================================
--- XMF/demo/trunk/demo/admin/about.php 2013-09-15 02:23:27 UTC (rev 12052)
+++ XMF/demo/trunk/demo/admin/about.php 2013-09-15 02:32:35 UTC (rev 12053)
@@ -11,24 +11,18 @@
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author trabis <lus...@gm...>
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @author Richard Griffith <ri...@ge...>
* @version $Id$
*/
-include_once dirname(__FILE__) . '/admin_header.php';
-xoops_cp_header();
+require dirname(__FILE__) . '/admin_header.php';
-$menu = new Xmf_Template_Adminmenu();
-$menu->display();
+use Xmf\Module\Admin;
+$aboutAdmin = Admin::getInstance();
-$nav = new Xmf_Template_Adminnav();
-$nav->display();
+$aboutAdmin->displayNavigation('about.php');
+//Admin::setPaypal('AQHQ3WJEPNSUY');
+$aboutAdmin->displayAbout(false);
-$about = new Xmf_Template_Adminabout();
-$about->setPaypal('AQHQ3WJEPNSUY');
-$about->setLogoImageUrl('http://www.xuups.com/images/logo.gif');
-$about->setLogoLinkUrl('http://www.xuups.com');
-$about->display();
-
-xoops_cp_footer();
\ No newline at end of file
+require dirname(__FILE__) . '/admin_footer.php';
Added: XMF/demo/trunk/demo/admin/admin_footer.php
===================================================================
--- XMF/demo/trunk/demo/admin/admin_footer.php (rev 0)
+++ XMF/demo/trunk/demo/admin/admin_footer.php 2013-09-15 02:32:35 UTC (rev 12053)
@@ -0,0 +1,29 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author XOOPS Development Team
+ * @version $Id $
+ */
+
+if (!\Xmf\Module\Admin::is26()) {
+ $button_path = \Xmf\Module\Admin::iconUrl('xoopsmicrobutton.gif');
+ echo "<div class='adminfooter'>\n" .
+ " <div style='text-align: center;'>" .
+ " <a href='http://www.xoops.org' rel='external'>" .
+ "<img src='{$button_path}' alt='XOOPS' title='XOOPS'></a>\n" .
+ " </div>\n" . " " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>";
+}
+xoops_cp_footer();
Modified: XMF/demo/trunk/demo/admin/admin_header.php
===================================================================
--- XMF/demo/trunk/demo/admin/admin_header.php 2013-09-15 02:23:27 UTC (rev 12052)
+++ XMF/demo/trunk/demo/admin/admin_header.php 2013-09-15 02:32:35 UTC (rev 12053)
@@ -1,21 +1,36 @@
<?php
/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
/**
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author trabis <lus...@gm...>
- * @version $Id$
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author XOOPS Development Team
+ * @version $Id $
*/
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once dirname(dirname(__FILE__)) . '/include/common.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
\ No newline at end of file
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+require_once $path . '/mainfile.php';
+require_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
+
+defined('XMF_EXEC') or die('Please install or activate Xmf');
+
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+// Load language files
+//\Xmf\Language::load('admin', $thisModuleDir);
+\Xmf\Language::load('modinfo', $thisModuleDir);
+
+xoops_cp_header();
\ No newline at end of file
Modified: XMF/demo/trunk/demo/admin/index.php
===================================================================
--- XMF/demo/trunk/demo/admin/index.php 2013-09-15 02:23:27 UTC (rev 12052)
+++ XMF/demo/trunk/demo/admin/index.php 2013-09-15 02:32:35 UTC (rev 12053)
@@ -1,25 +1,27 @@
<?php
-include_once dirname(__FILE__) . '/admin_header.php';
-xoops_cp_header();
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
-$menu = new Xmf_Template_Adminmenu();
-$menu->display();
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
-$nav = new Xmf_Template_Adminnav();
-$nav->display();
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @author Richard Griffith <ri...@ge...>
+ * @version $Id$
+ */
-$index = new Xmf_Template_Adminindex();
+require dirname(__FILE__) . '/admin_header.php';
-$infoBox = new Xmf_Template_Infobox();
-$infoBox->setTitle('InfoBox');
-$infoBox->addItem('hello');
-$index->addInfoBox($infoBox);
+use Xmf\Module\Admin;
+$indexAdmin = Admin::getInstance();
+$indexAdmin->displayNavigation('index.php');
+Admin::checkModuleVersion('xmf', 100);
+$indexAdmin->displayIndex();
-
-$configBox = new Xmf_Template_ConfigBox();
-$configBox->addItem(XOOPS_ROOT_PATH . '/uploads/demo', 'folder');
-$configBox->addItem(array(XOOPS_ROOT_PATH . '/modules/demo', '0644'), 'chmod');
-$index->addConfigBox($configBox);
-
-$index->display();
-xoops_cp_footer();
\ No newline at end of file
+require dirname(__FILE__) . '/admin_footer.php';
Modified: XMF/demo/trunk/demo/admin/menu.php
===================================================================
--- XMF/demo/trunk/demo/admin/menu.php 2013-09-15 02:23:27 UTC (rev 12052)
+++ XMF/demo/trunk/demo/admin/menu.php 2013-09-15 02:32:35 UTC (rev 12053)
@@ -11,18 +11,28 @@
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @version $Id$
*/
defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
-$i = 0;
-$adminmenu[$i]['title'] = _MI_DEMO_ADMENU1;
-$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]["icon"] = '../xmf/images/icons/32/home.png';
+// get path to icons
+$pathIcon32='';
+if (class_exists('Xmf\Module\Admin', true)) {
+ $pathIcon32 = \Xmf\Module\Admin::menuIconPath('');
+}
-$i++;
-$adminmenu[$i]['title'] = _MI_DEMO_ADMENU2;
-$adminmenu[$i]['link'] = "admin/summary.php";
-$adminmenu[$i]["icon"] = '../xmf/images/icons/32/view_detailed.png';
+$adminmenu=array();
+// Index
+$adminmenu[] = array(
+ 'title' => _MI_DEMO_ADMENU1 ,
+ 'link' => 'admin/index.php' ,
+ 'icon' => $pathIcon32.'home.png'
+) ;
+// About
+$adminmenu[] = array(
+ 'title' => _MI_DEMO_ADMENU2 ,
+ 'link' => 'admin/about.php' ,
+ 'icon' => $pathIcon32.'about.png'
+) ;
\ No newline at end of file
Deleted: XMF/demo/trunk/demo/admin/summary.php
===================================================================
--- XMF/demo/trunk/demo/admin/summary.php 2013-09-15 02:23:27 UTC (rev 12052)
+++ XMF/demo/trunk/demo/admin/summary.php 2013-09-15 02:32:35 UTC (rev 12053)
@@ -1,66 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author trabis <lus...@gm...>
- * @version $Id$
- */
-
-include_once dirname(__FILE__) . '/admin_header.php';
-xoops_cp_header();
-
-$menu = new Xmf_Template_Adminmenu();
-$menu->display();
-
-$nav = new Xmf_Template_Adminnav();
-$nav->display();
-
-$buttonBox = new Xmf_Template_buttonBox();
-$buttonBox->addItem('Front Page', XOOPS_URL);
-$buttonBox->addItem('Self', '#');
-$buttonBox->display();
-
-$buttonBox2 = new Xmf_Template_buttonBox();
-$buttonBox2->setPosition('left');
-$buttonBox2->setDelimiter('<br /><br />');
-$buttonBox2->addItem('Front Page 2', XOOPS_URL, 'delete');
-$buttonBox2->addItem('Self 2', '#', 'delete');
-$buttonBox2->display();
-
-$infoBox = new Xmf_Template_InfoBox();
-$infoBox->setTitle('This is Info Box 1');
-$infoBox->addItem('My first line <br />');
-$infoBox->addItem('My second line');
-$infoBox->addItem($buttonBox->fetch());
-$infoBox->display();
-
-$infoBox2 = new Xmf_Template_InfoBox();
-$infoBox2->setTitle('This is Info Box 2 with InFo Box 1 Inside');
-$infoBox2->addItem($infoBox->fetch());
-echo $infoBox2->fetch(); //same as $infoBox->display();
-
-$configBox = new Xmf_Template_ConfigBox();
-$configBox->setTitle('This is a Config Box');
-$configBox->addItem('just a line');
-$configBox->addItem(XOOPS_ROOT_PATH . '/uploads/demo', 'folder');
-$configBox->addItem(array(XOOPS_ROOT_PATH . '/modules/demo', '0644'), 'chmod');
-$configBox->display();
-
-
-
-
-
-$addto = new Xmf_Template_Addto();
-$addto->display();
-
-xoops_cp_footer();
\ No newline at end of file
Modified: XMF/demo/trunk/demo/docs/changelog.txt
===================================================================
--- XMF/demo/trunk/demo/docs/changelog.txt 2013-09-15 02:23:27 UTC (rev 12052)
+++ XMF/demo/trunk/demo/docs/changelog.txt 2013-09-15 02:32:35 UTC (rev 12053)
@@ -1,3 +1,7 @@
-v0.1 (Trabis) 2011/09/11
+v0.2 2013/08/05
=================================
+- Update to current xmf
+
+v0.1 (Trabis) 2011/09/11
+=================================
- Original Release
Modified: XMF/demo/trunk/demo/include/common.php
===================================================================
--- XMF/demo/trunk/demo/include/common.php 2013-09-15 02:23:27 UTC (rev 12052)
+++ XMF/demo/trunk/demo/include/common.php 2013-09-15 02:32:35 UTC (rev 12053)
@@ -11,7 +11,7 @@
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @since 1.0
* @author trabis <lus...@gm...>
* @version $Id$
@@ -19,11 +19,11 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-if (!xoops_isActiveModule('xmf')) {
+if (!class_exists('\Xmf\Loader')) {
if (file_exists($file = dirname(dirname(dirname(__FILE__))) . '/xmf/include/bootstrap.php')) {
include_once $file;
- echo 'Please install or reactivate XMF module';
+ trigger_error( 'Please install or reactivate XMF module');
} else {
redirect_header(XOOPS_URL, 5, 'Please install XMF module');
}
-}
\ No newline at end of file
+}
Modified: XMF/demo/trunk/demo/include/install.inc.php
===================================================================
--- XMF/demo/trunk/demo/include/install.inc.php 2013-09-15 02:23:27 UTC (rev 12052)
+++ XMF/demo/trunk/demo/include/install.inc.php 2013-09-15 02:32:35 UTC (rev 12053)
@@ -11,16 +11,16 @@
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @author trabis <lus...@gm...>
* @version $Id$
*/
function xoops_module_pre_install_log($module)
{
- if (!xoops_isActiveModule('xmf')) {
+ if (!class_exists('\Xmf\Loader')) {
$module->setErrors('<b>Please install or reactivate XMF module</b>');
return false;
}
return true;
-}
\ No newline at end of file
+}
Modified: XMF/demo/trunk/demo/index.php
===================================================================
--- XMF/demo/trunk/demo/index.php 2013-09-15 02:23:27 UTC (rev 12052)
+++ XMF/demo/trunk/demo/index.php 2013-09-15 02:32:35 UTC (rev 12053)
@@ -11,33 +11,146 @@
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @author Richard Griffith <ri...@ge...>
* @author trabis <lus...@gm...>
* @version $Id$
*/
-include dirname(dirname(dirname(__FILE__))) . '/mainfile.php';
-include dirname(__FILE__) .'/include/common.php';
+use Xmf\Debug;
+use Xmf\Highlighter;
+use Xmf\Loader;
+use Xmf\Metagen;
+use Xmf\Request;
+use Xmf\Module\Helper;
+use Xmf\Module\Permission;
+use Xmf\Module\Session;
-include XOOPS_ROOT_PATH . '/header.php';
+require_once dirname(dirname(dirname(__FILE__))) . '/mainfile.php';
-$helper = Xmf_Module_Helper::getInstance('demo');
+require_once XOOPS_ROOT_PATH . '/header.php';
+
+if (!class_exists('XoopsThemeForm', true)) {
+ Loader::loadFile(XOOPS_ROOT_PATH.'/class/xoopsformloader.php');
+}
+
+$dir = basename(dirname(__FILE__));
+$helper = Helper::getHelper($dir);
$helper->setDebug(true);
-Xmf_Debug::dump($helper->getObject()->getInfo());
+$helper->loadLanguage('manifesto');
+$helper->loadLanguage('badmanifesto'); //trows error on log because language was not found
-echo $helper->getObject()->getVar('name') . '<br>';
+echo _MA_DEMO_HI . '<br />';
-echo $helper->getConfig('config1') . '<br>';
-echo $helper->getConfig('config2') . '<br>';
-echo $helper->getConfig('config3') . '<br>'; //trows an error on log cause config3 is missing
+echo '<h2>' . _MA_DEMO_SESSION_VAR_TOGGLE . '</h2>';
+// toggle a session variable
+$sessionHelper = new Session();
+if ($sessionHelper) {
+ $sessionHelper->setDebug(true);
+ $var = $sessionHelper->get('fred');
+ if ($var) {
+ echo sprintf(_MA_DEMO_SESSION_VAR_GET, $var) . '<br />';
+ $sessionHelper->destroy();
+ } else {
+ $var = date('Y-m-d H:i:s');
+ echo sprintf(_MA_DEMO_SESSION_VAR_SET, $var) . '<br />';
+ $sessionHelper->set('fred', $var);
+ }
+}
+echo '<h2>' . _MA_DEMO_MODULE_INFO . '</h2>';
-$helper->loadLanguage('badmanifesto'); //trows error on log because language was not found
-$helper->loadLanguage('manifesto');
+echo 'name: ' . $helper->getModule()->getVar('name') . '<br />';
+echo 'mid: ' . $helper->getModule()->getVar('mid') . '<br />';
+echo 'version: ' . $helper->getModule()->getVar('version') . '<br />';
-$helper = Xmf_Module_Helper::getInstance('nomodulehere');
-$helper->setDebug(true);
-$helper->getObject(); //trows an error on log because module was not found */
+echo '<br /><h3>configs:</h3>';
+echo 'config1: ' . $helper->getConfig('config1') . '<br />';
+echo 'config2: ' . $helper->getConfig('config2') . '<br />';
+echo 'config3: ' . $helper->getConfig('config3') . '<br /><br />'; //throws an error on log cause config3 is missing
-include XOOPS_ROOT_PATH . '/footer.php';
+
+$permHelper = new Permission();
+if ($permHelper) {
+
+ // this is the name and item we are going to work with
+ $gperm_name='fred';
+ $gperm_itemid=1;
+
+ // if this is a post operation get our variables
+ if ('POST'==Request::getMethod()) {
+ echo '<h2>$_POST</h2>';
+ Debug::dump($_POST);
+ $helper->addLog($_POST);
+ $name=$permHelper->defaultFieldName($gperm_name, $gperm_itemid);
+ $groups=Request::getVar($name, array(), $hash = 'POST');
+ $permHelper->savePermissionForItem($gperm_name, $gperm_itemid, $groups);
+ }
+
+ $form = new \XoopsThemeForm(_MA_DEMO_FORM_CAPTION, 'form', '', 'POST');
+ $form->addElement(
+ $permHelper->getGroupSelectFormForItem(
+ $gperm_name,
+ $gperm_itemid,
+ _MA_DEMO_PERM_CAPTION,
+ null,
+ true
+ )
+ );
+ $form->addElement(new \XoopsFormButton('', 'submit', _MA_DEMO_FORM_SUBMIT, 'submit'));
+
+ echo $form->render();
+}
+
+echo '<h4>Metagen</h4>';
+$keywords='';
+$description =<<<EOT
+xmf - XOOPS Module Framework
+
+XMF is Copyright © 2011-2013 The XOOPS Project
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+Some portions of this work are licensed under the GNU Lesser
+General Public License Version 2.1 as published by the Free Software
+Foundation. Such portions are clearly identified in the source files.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License,
+and the GNU Lesser General Public License along with this program.
+If not, see <http://www.gnu.org/licenses/>.
+
+You may contact the copyright holder through
+http://sourceforge.net/projects/xoops/
+EOT;
+$title="Viva la XOOPS!";
+
+$keywords = Metagen::generateKeywords($description, array('XOOPS', 'xmf', 'Maveric'), 25, 4);
+$metadesc = Metagen::generateDescription($description, 50);
+Metagen::assignTitle($title);
+Metagen::assignKeywords($keywords);
+Metagen::assignDescription($metadesc);
+
+//Debug::dump($metaGen->findMetaKeywords($description,5));
+Debug::dump($keywords);
+Debug::dump($metadesc);
+Debug::dump(Metagen::generateSeoTitle($title, false));
+
+echo Highlighter::apply(array('xoops','xmf','GNU'), $description);
+echo '<br /><h2>Debugging Tools</h2>';
+echo '<h4>Dump our module object</h4>';
+Debug::dump($helper->getModule());
+echo '<h4>Show declared classes</h4>';
+Debug::dump(get_declared_classes());
+
+echo '<br /><br />' . _MA_DEMO_GOODBYE . '<br />';
+
+require_once XOOPS_ROOT_PATH . '/footer.php';
Modified: XMF/demo/trunk/demo/language/english/manifesto.php
===================================================================
--- XMF/demo/trunk/demo/language/english/manifesto.php 2013-09-15 02:23:27 UTC (rev 12052)
+++ XMF/demo/trunk/demo/language/english/manifesto.php 2013-09-15 02:32:35 UTC (rev 12053)
@@ -1,3 +1,13 @@
<?php
-define('_MA_DEMO_HI', 'Hello');
-define('_MA_DEMO_GOODBYE', 'Goodbye');
\ No newline at end of file
+define('_MA_DEMO_HI','Hello');
+define('_MA_DEMO_GOODBYE','Goodbye');
+
+define('_MA_DEMO_FORM_CAPTION','Permission example');
+define('_MA_DEMO_PERM_CAPTION','Fred permission');
+define('_MA_DEMO_FORM_SUBMIT','Submit');
+
+define('_MA_DEMO_SESSION_VAR_TOGGLE','Toggling session variable.');
+define('_MA_DEMO_SESSION_VAR_GET','Clearing session variable value of "%s"');
+define('_MA_DEMO_SESSION_VAR_SET','Session variable not set. Setting as: %s');
+
+define('_MA_DEMO_MODULE_INFO','Get some module data');
Modified: XMF/demo/trunk/demo/xoops_version.php
===================================================================
--- XMF/demo/trunk/demo/xoops_version.php 2013-09-15 02:23:27 UTC (rev 12052)
+++ XMF/demo/trunk/demo/xoops_version.php 2013-09-15 02:32:35 UTC (rev 12053)
@@ -11,20 +11,20 @@
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
* @author trabis <lus...@gm...>
* @version $Id$
*/
$modversion['dirname'] = basename(dirname(__FILE__));
$modversion['name'] = ucfirst(basename(dirname(__FILE__)));
-$modversion['version'] = '0.1';
-$modversion['description'] = 'This is a basic demo of XMF capabilities. There will be many more new features added in the future.';
-$modversion['author'] = "trabis";
+$modversion['version'] = '1.0';
+$modversion['description'] = 'This is a basic demo of XMF capabilities.';
+$modversion['author'] = "geekwright";
$modversion['credits'] = "trabis(www.xuups.com)";
$modversion['help'] = 'page=help';
-$modversion['license'] = "GNU GPL 2.0";
-$modversion['license_url'] = "http://www.gnu.org/licenses/gpl-2.0.html/";
+$modversion['license'] = "GNU GPL 2 or later";
+$modversion['license_url'] = "http://www.gnu.org/licenses/gpl-2.0.html";
$modversion['official'] = 0;
$modversion['image'] = "images/dummy.png";
@@ -36,6 +36,7 @@
// Admin things
$modversion['hasAdmin'] = 1;
+$modversion['system_menu'] = 1;
$modversion['adminindex'] = "admin/index.php";
$modversion['adminmenu'] = "admin/menu.php";
@@ -59,19 +60,15 @@
// About stuff
$modversion['module_status'] = "Alpha";
$modversion['status'] = "Alpha";
-$modversion['release_date'] = "11/09/2011";
+$modversion['release_date'] = '08/28/2013';
-$modversion['developer_lead'] = "trabis";
-$modversion['developer_website_url'] = "http://www.xuups.com";
-$modversion['developer_website_name'] = "Xuups";
-$modversion['developer_email'] = "lus...@gm...";
+$modversion['developer_lead'] = "geekwright";
+$modversion['developer_website_url'] = "http://xoops.org";
+$modversion['developer_website_name'] = "Xoops";
+$modversion['developer_email'] = "ri...@ge...";
+$modversion['people']['developers'][] = "geekwright";
$modversion['people']['developers'][] = "trabis";
-$modversion['demo_site_url'] = "http://www.xuups.com";
-$modversion['demo_site_name'] = "XOOPS User Utilitites";
-$modversion['support_site_url'] = "http://www.xuups.com/modules/newbb";
-$modversion['support_site_name'] = "Xuups Support Forums";
-
-$modversion['min_xoops'] = "2.4.5";
-$modversion['min_php'] = "5.2";
+$modversion['min_xoops'] = "2.5.6";
+$modversion['min_php'] = "5.3.3";
|
|
From: <rgr...@us...> - 2013-09-15 02:23:33
|
Revision: 12052
http://sourceforge.net/p/xoops/svn/12052
Author: rgriffith
Date: 2013-09-15 02:23:27 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
Rework to XMF 1.0 Alpha
Modified Paths:
--------------
XMF/xmf/trunk/xmf/include/bootstrap.php
XMF/xmf/trunk/xmf/include/functions.php
XMF/xmf/trunk/xmf/language/english/about.php
XMF/xmf/trunk/xmf/language/english/database.php
XMF/xmf/trunk/xmf/language/english/form.php
XMF/xmf/trunk/xmf/language/english/global.php
XMF/xmf/trunk/xmf/language/english/main.php
XMF/xmf/trunk/xmf/language/english/menu.php
XMF/xmf/trunk/xmf/language/french/main.php
XMF/xmf/trunk/xmf/language/german/main.php
XMF/xmf/trunk/xmf/language/italian/about.php
XMF/xmf/trunk/xmf/language/italian/form.php
XMF/xmf/trunk/xmf/language/italian/global.php
XMF/xmf/trunk/xmf/language/italian/main.php
XMF/xmf/trunk/xmf/language/italian/menu.php
XMF/xmf/trunk/xmf/language/russian/main.php
XMF/xmf/trunk/xmf/libraries/Xmf/Debug.php
XMF/xmf/trunk/xmf/libraries/Xmf/Highlighter.php
XMF/xmf/trunk/xmf/libraries/Xmf/Language.php
XMF/xmf/trunk/xmf/libraries/Xmf/Loader.php
XMF/xmf/trunk/xmf/libraries/Xmf/Metagen.php
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Helper.php
XMF/xmf/trunk/xmf/libraries/Xmf/Request.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Breadcrumb.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Buttonbox.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Feed.php
XMF/xmf/trunk/xmf/libraries/Xmf/Utilities.php
XMF/xmf/trunk/xmf/preloads/core.php
XMF/xmf/trunk/xmf/xoops_version.php
Added Paths:
-----------
XMF/xmf/trunk/xmf/README.md
XMF/xmf/trunk/xmf/composer.json
XMF/xmf/trunk/xmf/composer.lock
XMF/xmf/trunk/xmf/css/krumo/
XMF/xmf/trunk/xmf/css/krumo/README.md
XMF/xmf/trunk/xmf/css/krumo/krumo.js
XMF/xmf/trunk/xmf/css/krumo/skins/
XMF/xmf/trunk/xmf/css/krumo/skins/blue/
XMF/xmf/trunk/xmf/css/krumo/skins/blue/bg.gif
XMF/xmf/trunk/xmf/css/krumo/skins/blue/skin.css
XMF/xmf/trunk/xmf/css/krumo/skins/default/
XMF/xmf/trunk/xmf/css/krumo/skins/default/bg.gif
XMF/xmf/trunk/xmf/css/krumo/skins/default/skin.css
XMF/xmf/trunk/xmf/css/krumo/skins/green/
XMF/xmf/trunk/xmf/css/krumo/skins/green/bg.gif
XMF/xmf/trunk/xmf/css/krumo/skins/green/skin.css
XMF/xmf/trunk/xmf/css/krumo/skins/modern/
XMF/xmf/trunk/xmf/css/krumo/skins/modern/skin.css
XMF/xmf/trunk/xmf/css/krumo/skins/orange/
XMF/xmf/trunk/xmf/css/krumo/skins/orange/skin.css
XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/
XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/collapsed.gif
XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/dotted.gif
XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/empty.gif
XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/expanded.gif
XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/skin.css
XMF/xmf/trunk/xmf/docs/
XMF/xmf/trunk/xmf/docs/README.txt
XMF/xmf/trunk/xmf/docs/changelog.txt
XMF/xmf/trunk/xmf/docs/gpl-2.0.txt
XMF/xmf/trunk/xmf/docs/gpl-3.0.txt
XMF/xmf/trunk/xmf/docs/lgpl-2.1.txt
XMF/xmf/trunk/xmf/docs/license.txt
XMF/xmf/trunk/xmf/icons/
XMF/xmf/trunk/xmf/icons/index.html
XMF/xmf/trunk/xmf/icons/logo_large.png
XMF/xmf/trunk/xmf/icons/logo_small.png
XMF/xmf/trunk/xmf/language/english/stopwords.php
XMF/xmf/trunk/xmf/language/french/stopwords.php
XMF/xmf/trunk/xmf/language/german/stopwords.php
XMF/xmf/trunk/xmf/language/italian/stopwords.php
XMF/xmf/trunk/xmf/language/russian/stopwords.php
XMF/xmf/trunk/xmf/libraries/Xmf/Database/Tables.php
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Admin.php
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Cache.php
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Helper/AbstractHelper.php
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Helper/GenericHelper.php
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Permission.php
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Session.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/AbstractTemplate.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/PrintContent.php
Removed Paths:
-------------
XMF/xmf/trunk/xmf/images/compat/
XMF/xmf/trunk/xmf/images/icons/
XMF/xmf/trunk/xmf/libraries/Xmf/Database/Table.php
XMF/xmf/trunk/xmf/libraries/Xmf/Filter/
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Helper/Abstract.php
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Helper/Cache.php
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Helper/Permission.php
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Helper/Session.php
XMF/xmf/trunk/xmf/libraries/Xmf/Pdf.php
XMF/xmf/trunk/xmf/libraries/Xmf/Session.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Abstract.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Addto.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Adminabout.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Adminindex.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Adminmenu.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Adminnav.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Configbox.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Infobox.php
XMF/xmf/trunk/xmf/libraries/Xmf/Template/Print.php
XMF/xmf/trunk/xmf/libraries/addto/
XMF/xmf/trunk/xmf/libraries/tcpdf/
XMF/xmf/trunk/xmf/templates/xmf_addto.html
XMF/xmf/trunk/xmf/templates/xmf_adminabout.html
XMF/xmf/trunk/xmf/templates/xmf_adminmenu.html
Added: XMF/xmf/trunk/xmf/README.md
===================================================================
--- XMF/xmf/trunk/xmf/README.md (rev 0)
+++ XMF/xmf/trunk/xmf/README.md 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,4 @@
+xmf
+===
+
+Experimental framework
Added: XMF/xmf/trunk/xmf/composer.json
===================================================================
--- XMF/xmf/trunk/xmf/composer.json (rev 0)
+++ XMF/xmf/trunk/xmf/composer.json 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,16 @@
+{
+ "name": "xmf/xoops-module-framework",
+ "license": "GPL-2.0+",
+ "type": "project",
+ "description": "The \"XOOPS Module Framework\" distribution",
+ "autoload": {
+ "psr-0": {
+ "Xmf\\": "libraries/"
+ }
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "oodle/krumo": "*",
+ "symfony/yaml": "~2.0"
+ }
+}
Added: XMF/xmf/trunk/xmf/composer.lock
===================================================================
--- XMF/xmf/trunk/xmf/composer.lock (rev 0)
+++ XMF/xmf/trunk/xmf/composer.lock 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,125 @@
+{
+ "_readme": [
+ "This file locks the dependencies of your project to a known state",
+ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+ ],
+ "hash": "788e419589d80bf726debe8487cea675",
+ "packages": [
+ {
+ "name": "oodle/krumo",
+ "version": "v0.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/oodle/krumo.git",
+ "reference": "52686ac5dd3571be1ed3d4698bcef0e8fcb08814"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/oodle/krumo/zipball/52686ac5dd3571be1ed3d4698bcef0e8fcb08814",
+ "reference": "52686ac5dd3571be1ed3d4698bcef0e8fcb08814",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.2.17"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "class.krumo.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL"
+ ],
+ "authors": [
+ {
+ "name": "Kaloyan K. Tsvetkov",
+ "email": "ka...@ka..."
+ },
+ {
+ "name": "Matthew J. Mucklo",
+ "email": "mm...@co..."
+ },
+ {
+ "name": "Stefan Thomas",
+ "email": "mo...@ju..."
+ }
+ ],
+ "description": "KRUMO - version 2.0 of print_r(); and var_dump(); (with new updates)",
+ "keywords": [
+ "debug",
+ "debugging",
+ "krumo",
+ "pretty",
+ "print",
+ "print_r",
+ "var_dump"
+ ],
+ "time": "2013-09-09 22:14:18"
+ },
+ {
+ "name": "symfony/yaml",
+ "version": "v2.3.4",
+ "target-dir": "Symfony/Component/Yaml",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/Yaml.git",
+ "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
+ "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Component\\Yaml\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fa...@sy..."
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Yaml Component",
+ "homepage": "http://symfony.com",
+ "time": "2013-08-24 15:26:22"
+ }
+ ],
+ "packages-dev": [
+
+ ],
+ "aliases": [
+
+ ],
+ "minimum-stability": "stable",
+ "stability-flags": [
+
+ ],
+ "platform": {
+ "php": ">=5.3.3"
+ },
+ "platform-dev": [
+
+ ]
+}
Added: XMF/xmf/trunk/xmf/css/krumo/README.md
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/README.md (rev 0)
+++ XMF/xmf/trunk/xmf/css/krumo/README.md 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,8 @@
+krumo support files
+===================
+
+These files were taken from oodle/krumo package, but are placed here
+so the they are available by url. The main library is in vendor, which
+may or may not be with the web root.
+
+See the full package for more information and license details.
Added: XMF/xmf/trunk/xmf/css/krumo/krumo.js
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/krumo.js (rev 0)
+++ XMF/xmf/trunk/xmf/css/krumo/krumo.js 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,98 @@
+/**
+* JavaScript routines for Krumo
+*
+* @version $Id: krumo.js 22 2007-12-02 07:38:18Z Mrasnika $
+* @link http://sourceforge.net/projects/krumo
+*/
+
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+* Krumo JS Class
+*/
+function krumo() {
+ }
+
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+/**
+* Add a CSS class to an HTML element
+*
+* @param HtmlElement el
+* @param string className
+* @return void
+*/
+krumo.reclass = function(el, className) {
+ if (el.className.indexOf(className) < 0) {
+ el.className += (' ' + className);
+ }
+ }
+
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+/**
+* Remove a CSS class to an HTML element
+*
+* @param HtmlElement el
+* @param string className
+* @return void
+*/
+krumo.unclass = function(el, className) {
+ if (el.className.indexOf(className) > -1) {
+ el.className = el.className.replace(className, '');
+ }
+ }
+
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+/**
+* Toggle the nodes connected to an HTML element
+*
+* @param HtmlElement el
+* @return void
+*/
+krumo.toggle = function(el) {
+ var ul = el.parentNode.getElementsByTagName('ul');
+ for (var i=0; i<ul.length; i++) {
+ if (ul[i].parentNode.parentNode == el.parentNode) {
+ ul[i].parentNode.style.display = (ul[i].parentNode.style.display == 'none')
+ ? 'block'
+ : 'none';
+ }
+ }
+
+ // toggle class
+ //
+ if (ul[0].parentNode.style.display == 'block') {
+ krumo.reclass(el, 'krumo-opened');
+ } else {
+ krumo.unclass(el, 'krumo-opened');
+ }
+ }
+
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+/**
+* Hover over an HTML element
+*
+* @param HtmlElement el
+* @return void
+*/
+krumo.over = function(el) {
+ krumo.reclass(el, 'krumo-hover');
+ }
+
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+/**
+* Hover out an HTML element
+*
+* @param HtmlElement el
+* @return void
+*/
+
+krumo.out = function(el) {
+ krumo.unclass(el, 'krumo-hover');
+ }
+
+/////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
Added: XMF/xmf/trunk/xmf/css/krumo/skins/blue/bg.gif
===================================================================
(Binary files differ)
Index: XMF/xmf/trunk/xmf/css/krumo/skins/blue/bg.gif
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/blue/bg.gif 2013-09-15 01:45:10 UTC (rev 12051)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/blue/bg.gif 2013-09-15 02:23:27 UTC (rev 12052)
Property changes on: XMF/xmf/trunk/xmf/css/krumo/skins/blue/bg.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XMF/xmf/trunk/xmf/css/krumo/skins/blue/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/blue/skin.css (rev 0)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/blue/skin.css 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,158 @@
+/**
+* Krumo "Blue" Skin
+*
+* @version $Id: skin.css 6 2007-06-16 06:37:27Z mrasnika $
+* @author Kaloyan K. Tsvetkov <mra...@us...>
+*/
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+ul.krumo-node {
+ margin: 0px;
+ padding: 0px;
+ }
+ul.krumo-node ul {
+ margin-left: 20px;
+ }
+* html ul.krumo-node ul {
+ margin-left: 24px;
+ }
+div.krumo-root {
+ border: solid 1px black;
+ margin: 1em 0em;
+ }
+ul.krumo-first {
+ font: normal 12px arial;
+ border: solid 2px white;
+ border-top-width:1px;
+ background: url(%url%bg.gif);
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+li.krumo-child {
+ display:block;
+ list-style: none;
+ padding: 0px;
+ margin: 0px;
+ overflow:hidden;
+ }
+div.krumo-element {
+ cursor:default;
+
+ line-height: 24px;
+ display:block;
+
+ clear:both;
+ white-space:nowrap;
+
+ border-top: solid 1px white;
+ background: #BFDFFF;
+ padding-left: 10px;
+ }
+* html div.krumo-element {
+ padding-bottom: 3px;
+ }
+a.krumo-name {
+ color:navy;
+ font: bold 13px Arial;
+ }
+a.krumo-name big {
+ font: bold 20pt Georgia;
+ line-height: 14px;
+ position:relative;
+ top:2px;
+ left:-2px;
+ }
+* html a.krumo-name big {
+ font: bold 19pt Georgia;
+ top: 5px;
+ left: 0px;
+ line-height: 9px;
+ height: 12px;
+ padding: 0px;
+ margin: 0px;
+ }
+div.krumo-expand {
+ background: #AAD5FF;
+ cursor:pointer;
+ }
+div.krumo-hover {
+ background: #FFBE7D;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+div.krumo-preview {
+ font: normal 13px courier new;
+ padding: 5px 5px 14px 5px;
+ background: white;
+ border-top: 0px;
+ overflow:auto;
+ }
+* html div.krumo-preview {
+ padding-top: 2px;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+li.krumo-footnote {
+ background:white;
+ padding: 2px 5px;
+ list-style:none;
+ border-top: solid 1px #bebebe;
+ margin-top:2px;
+ cursor:default;
+ }
+* html li.krumo-footnote {
+ line-height: 13px;
+ }
+div.krumo-version {
+ float:right;
+ }
+li.krumo-footnote h6 {
+ font: bold 11px verdana;
+ margin: 0px;
+ padding: 0px;
+ color:navy;
+ display:inline;
+ }
+* html li.krumo-footnote h6 {
+ margin-right: 3px;
+ }
+li.krumo-footnote a {
+ font: bold 10px arial;
+ color: #434343;
+ text-decoration:none;
+ }
+li.krumo-footnote a:hover {
+ color:black;
+ }
+
+li.krumo-footnote span.krumo-call {
+ font:normal 11px verdana;
+ position: relative;
+ top: 1px;
+ }
+li.krumo-footnote span.krumo-call code {
+ font-weight:bold;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+div.krumo-title {
+ font: normal 11px verdana ;
+ position:relative;
+ top:9px;
+ cursor:default;
+ line-height:2px;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+strong.krumo-array-length,
+strong.krumo-string-length {
+ font-weight: normal;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
Added: XMF/xmf/trunk/xmf/css/krumo/skins/default/bg.gif
===================================================================
(Binary files differ)
Index: XMF/xmf/trunk/xmf/css/krumo/skins/default/bg.gif
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/default/bg.gif 2013-09-15 01:45:10 UTC (rev 12051)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/default/bg.gif 2013-09-15 02:23:27 UTC (rev 12052)
Property changes on: XMF/xmf/trunk/xmf/css/krumo/skins/default/bg.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XMF/xmf/trunk/xmf/css/krumo/skins/default/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/default/skin.css (rev 0)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/default/skin.css 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,158 @@
+/**
+* Krumo Default Skin
+*
+* @version $Id: skin.css 6 2007-06-16 06:37:27Z mrasnika $
+* @author Kaloyan K. Tsvetkov <mra...@us...>
+*/
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+ul.krumo-node {
+ margin: 0px;
+ padding: 0px;
+ }
+ul.krumo-node ul {
+ margin-left: 20px;
+ }
+* html ul.krumo-node ul {
+ margin-left: 24px;
+ }
+div.krumo-root {
+ border: solid 1px black;
+ margin: 1em 0em;
+ }
+ul.krumo-first {
+ font: normal 12px arial;
+ border: solid 2px white;
+ border-top-width:1px;
+ background: url(%url%bg.gif);
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+li.krumo-child {
+ display:block;
+ list-style: none;
+ padding: 0px;
+ margin: 0px;
+ overflow:hidden;
+ }
+div.krumo-element {
+ cursor:default;
+
+ line-height: 24px;
+ display:block;
+
+ clear:both;
+ white-space:nowrap;
+
+ border-top: solid 1px white;
+ background: #E8E8E8;
+ padding-left: 10px;
+ }
+* html div.krumo-element {
+ padding-bottom: 3px;
+ }
+a.krumo-name {
+ color:#2C5858;
+ font: bold 13px Arial;
+ }
+a.krumo-name big {
+ font: bold 20pt Georgia;
+ line-height: 14px;
+ position:relative;
+ top:2px;
+ left:-2px;
+ }
+* html a.krumo-name big {
+ font: bold 19pt Georgia;
+ top: 5px;
+ left: 0px;
+ line-height: 9px;
+ height: 12px;
+ padding: 0px;
+ margin: 0px;
+ }
+div.krumo-expand {
+ background: #CCCCCC;
+ cursor:pointer;
+ }
+div.krumo-hover {
+ background: #B7DBDB;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+div.krumo-preview {
+ font: normal 13px courier new;
+ padding: 5px 5px 14px 5px;
+ background: white;
+ border-top: 0px;
+ overflow:auto;
+ }
+* html div.krumo-preview {
+ padding-top: 2px;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+li.krumo-footnote {
+ background:white;
+ padding: 2px 5px;
+ list-style:none;
+ border-top: solid 1px #bebebe;
+ margin-top:2px;
+ cursor:default;
+ }
+* html li.krumo-footnote {
+ line-height: 13px;
+ }
+div.krumo-version {
+ float:right;
+ }
+li.krumo-footnote h6 {
+ font: bold 11px verdana;
+ margin: 0px;
+ padding: 0px;
+ color:#366D6D;
+ display:inline;
+ }
+* html li.krumo-footnote h6 {
+ margin-right: 3px;
+ }
+li.krumo-footnote a {
+ font: bold 10px arial;
+ color: #434343;
+ text-decoration:none;
+ }
+li.krumo-footnote a:hover {
+ color:black;
+ }
+
+li.krumo-footnote span.krumo-call {
+ font:normal 11px verdana;
+ position: relative;
+ top: 1px;
+ }
+li.krumo-footnote span.krumo-call code {
+ font-weight:bold;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+div.krumo-title {
+ font: normal 11px verdana ;
+ position:relative;
+ top:9px;
+ cursor:default;
+ line-height:2px;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+strong.krumo-array-length,
+strong.krumo-string-length {
+ font-weight: normal;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
Added: XMF/xmf/trunk/xmf/css/krumo/skins/green/bg.gif
===================================================================
(Binary files differ)
Index: XMF/xmf/trunk/xmf/css/krumo/skins/green/bg.gif
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/green/bg.gif 2013-09-15 01:45:10 UTC (rev 12051)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/green/bg.gif 2013-09-15 02:23:27 UTC (rev 12052)
Property changes on: XMF/xmf/trunk/xmf/css/krumo/skins/green/bg.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XMF/xmf/trunk/xmf/css/krumo/skins/green/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/green/skin.css (rev 0)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/green/skin.css 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,158 @@
+/**
+* Krumo "Green" Skin
+*
+* @version $Id: skin.css 6 2007-06-16 06:37:27Z mrasnika $
+* @author Kaloyan K. Tsvetkov <mra...@us...>
+*/
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+ul.krumo-node {
+ margin: 0px;
+ padding: 0px;
+ }
+ul.krumo-node ul {
+ margin-left: 20px;
+ }
+* html ul.krumo-node ul {
+ margin-left: 24px;
+ }
+div.krumo-root {
+ border: solid 1px black;
+ margin: 1em 0em;
+ }
+ul.krumo-first {
+ font: normal 12px arial;
+ border: solid 2px white;
+ border-top-width:1px;
+ background: url(%url%bg.gif);
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+li.krumo-child {
+ display:block;
+ list-style: none;
+ padding: 0px;
+ margin: 0px;
+ overflow:hidden;
+ }
+div.krumo-element {
+ cursor:default;
+
+ line-height: 24px;
+ display:block;
+
+ clear:both;
+ white-space:nowrap;
+
+ border-top: solid 1px white;
+ background: #D7F4CA;
+ padding-left: 10px;
+ }
+* html div.krumo-element {
+ padding-bottom: 3px;
+ }
+a.krumo-name {
+ color:#004000;
+ font: bold 13px Arial;
+ }
+a.krumo-name big {
+ font: bold 20pt Georgia;
+ line-height: 14px;
+ position:relative;
+ top:2px;
+ left:-2px;
+ }
+* html a.krumo-name big {
+ font: bold 19pt Georgia;
+ top: 5px;
+ left: 0px;
+ line-height: 9px;
+ height: 12px;
+ padding: 0px;
+ margin: 0px;
+ }
+div.krumo-expand {
+ background: #C0EEAC;
+ cursor:pointer;
+ }
+div.krumo-hover {
+ background: gold;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+div.krumo-preview {
+ font: normal 13px courier new;
+ padding: 5px 5px 14px 5px;
+ background: white;
+ border-top: 0px;
+ overflow:auto;
+ }
+* html div.krumo-preview {
+ padding-top: 2px;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+li.krumo-footnote {
+ background:white;
+ padding: 2px 5px;
+ list-style:none;
+ border-top: solid 1px #bebebe;
+ margin-top:2px;
+ cursor:default;
+ }
+* html li.krumo-footnote {
+ line-height: 13px;
+ }
+div.krumo-version {
+ float:right;
+ }
+li.krumo-footnote h6 {
+ font: bold 11px verdana;
+ margin: 0px;
+ padding: 0px;
+ color:#008040;
+ display:inline;
+ }
+* html li.krumo-footnote h6 {
+ margin-right: 3px;
+ }
+li.krumo-footnote a {
+ font: bold 10px arial;
+ color: #434343;
+ text-decoration:none;
+ }
+li.krumo-footnote a:hover {
+ color:black;
+ }
+
+li.krumo-footnote span.krumo-call {
+ font:normal 11px verdana;
+ position: relative;
+ top: 1px;
+ }
+li.krumo-footnote span.krumo-call code {
+ font-weight:bold;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+div.krumo-title {
+ font: normal 11px verdana ;
+ position:relative;
+ top:9px;
+ cursor:default;
+ line-height:2px;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+strong.krumo-array-length,
+strong.krumo-string-length {
+ font-weight: normal;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
Added: XMF/xmf/trunk/xmf/css/krumo/skins/modern/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/modern/skin.css (rev 0)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/modern/skin.css 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1 @@
+ul.krumo-node,#content ul.krumo-node li{margin:0;padding:0;background:0}ul.krumo-node ul{margin-left:18px}* html ul.krumo-node ul{margin-left:24px}div.krumo-root{border:solid 1px #000;margin:.5em}ul.krumo-first{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;font-size:12px;border:solid 2px #fff;border-top-width:1px;background:url(data:image/gif;base64,R0lGODlhWgAJALMAAP///8vLy+Tk5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAABaAAkAAAQ6MAgh6az4astz314Ijl/pkaKJrmqbvivssnJN358973qPn7yfMEi0+YrDoxLJXDZxyehzCnNapVdLBAA7)}li.krumo-child{display:block;list-style:none;padding:0;margin:0;overflow:hidden}div.krumo-element{cursor:default;line-height:22px;display:block;clear:both;white-space:nowrap;border-top:solid 1px #fff;background:#E8E8E8;background-repeat:no-repeat;background-position:6px 8px;padding-left:18px}* html div.krumo-element{padding-bottom:3px}a.krumo-name{color:#2C5858;font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;font-size:12px}a.krumo-name big{font:700 20pt Georgia;line-height:14px;position:relative;top:2px;left:-2px}* html a.krumo-name big{font:700 19pt Georgia;top:5px;left:0;line-height:9px;height:12px;padding:0;margin:0}div.krumo-expand{background-color:#CCC;cursor:pointer}div.krumo-hover{background-color:#B7DBDB}div.krumo-expand{background-image:url(data:image/gif;base64,R0lGODlhCQAJALMAAP///wAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAJAAkAAAQTEIAna33USpwt79vncRpZgpcGRAA7);cursor:pointer}div.krumo-opened{background-image:url(data:image/gif;base64,R0lGODlhCQAJALMAAP///wAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAJAAkAAAQQEMhJ63w4Z6C37JUXWmQJRAA7)}div.krumo-preview{font:400 13px courier new;padding:5px 5px 14px;background:#fff;border-top:0;overflow:auto}* html div.krumo-preview{padding-top:2px}li.krumo-footnote{background:#fff;padding:2px 5px;list-style:none;border-top:solid 1px #bebebe;margin-top:2px;cursor:default}* html li.krumo-footnote{line-height:13px}div.krumo-version{float:right}li.krumo-footnote h6{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;font-size:11px;margin:0;padding:0;color:#366D6D;display:inline}* html li.krumo-footnote h6{margin-right:3px}li.krumo-footnote a{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;font-size:10px;color:#434343;text-decoration:none}li.krumo-footnote a:hover{color:#000}li.krumo-footnote span.krumo-call{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;font-size:11px;position:relative;top:1px}li.krumo-footnote span.krumo-call code{font-weight:700}div.krumo-title{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;font-size:11px;cursor:default}strong.krumo-array-length,strong.krumo-string-length{font-weight:400}
Added: XMF/xmf/trunk/xmf/css/krumo/skins/orange/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/orange/skin.css (rev 0)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/orange/skin.css 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,158 @@
+/**
+* Krumo "Orange" Skin
+*
+* @version $Id: skin.css 6 2007-06-16 06:37:27Z mrasnika $
+* @author Kaloyan K. Tsvetkov <mra...@us...>
+*/
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+ul.krumo-node {
+ margin: 0px;
+ padding: 0px;
+ }
+ul.krumo-node ul {
+ margin-left: 20px;
+ }
+* html ul.krumo-node ul {
+ margin-left: 24px;
+ }
+div.krumo-root {
+ border: solid 1px black;
+ margin: 1em 0em;
+ }
+ul.krumo-first {
+ font: normal 12px arial;
+ border: solid 2px white;
+ border-top-width:1px;
+ background: url(data:image/gif;base64,R0lGODlhWgAJALMAAP////+/AP/eAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAABaAAkAAAQ6UIQg6az4astz314Ijl/pkaKJrmqbvivssnJN358973qPn7yfMEi0+YrDoxLJXDZxyehzCnNapVdLBAA7);
+}
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+li.krumo-child {
+ display:block;
+ list-style: none;
+ padding: 0px;
+ margin: 0px;
+ overflow:hidden;
+ }
+div.krumo-element {
+ cursor:default;
+
+ line-height: 24px;
+ display:block;
+
+ clear:both;
+ white-space:nowrap;
+
+ border-top: solid 1px white;
+ background: #FCEBA9;
+ padding-left: 10px;
+ }
+* html div.krumo-element {
+ padding-bottom: 3px;
+ }
+a.krumo-name {
+ color:#404000;
+ font: bold 13px Arial;
+ }
+a.krumo-name big {
+ font: bold 20pt Georgia;
+ line-height: 14px;
+ position:relative;
+ top:2px;
+ left:-2px;
+ }
+* html a.krumo-name big {
+ font: bold 19pt Georgia;
+ top: 5px;
+ left: 0px;
+ line-height: 9px;
+ height: 12px;
+ padding: 0px;
+ margin: 0px;
+ }
+div.krumo-expand {
+ background: #FADB61;
+ cursor:pointer;
+ }
+div.krumo-hover {
+ background: #FF8A4B;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+div.krumo-preview {
+ font: normal 13px courier new;
+ padding: 5px 5px 14px 5px;
+ background: white;
+ border-top: 0px;
+ overflow:auto;
+ }
+* html div.krumo-preview {
+ padding-top: 2px;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+li.krumo-footnote {
+ background:white;
+ padding: 2px 5px;
+ list-style:none;
+ border-top: solid 1px #bebebe;
+ margin-top:2px;
+ cursor:default;
+ }
+* html li.krumo-footnote {
+ line-height: 13px;
+ }
+div.krumo-version {
+ float:right;
+ }
+li.krumo-footnote h6 {
+ font: bold 11px verdana;
+ margin: 0px;
+ padding: 0px;
+ color:#E87400;
+ display:inline;
+ }
+* html li.krumo-footnote h6 {
+ margin-right: 3px;
+ }
+li.krumo-footnote a {
+ font: bold 10px arial;
+ color: #434343;
+ text-decoration:none;
+ }
+li.krumo-footnote a:hover {
+ color:black;
+ }
+
+li.krumo-footnote span.krumo-call {
+ font:normal 11px verdana;
+ position: relative;
+ top: 1px;
+ }
+li.krumo-footnote span.krumo-call code {
+ font-weight:bold;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+div.krumo-title {
+ font: normal 11px verdana ;
+ position:relative;
+ top:9px;
+ cursor:default;
+ line-height:2px;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+strong.krumo-array-length,
+strong.krumo-string-length {
+ font-weight: normal;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
Added: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/collapsed.gif
===================================================================
(Binary files differ)
Index: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/collapsed.gif
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/collapsed.gif 2013-09-15 01:45:10 UTC (rev 12051)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/collapsed.gif 2013-09-15 02:23:27 UTC (rev 12052)
Property changes on: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/collapsed.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/dotted.gif
===================================================================
(Binary files differ)
Index: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/dotted.gif
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/dotted.gif 2013-09-15 01:45:10 UTC (rev 12051)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/dotted.gif 2013-09-15 02:23:27 UTC (rev 12052)
Property changes on: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/dotted.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/empty.gif
===================================================================
(Binary files differ)
Index: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/empty.gif
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/empty.gif 2013-09-15 01:45:10 UTC (rev 12051)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/empty.gif 2013-09-15 02:23:27 UTC (rev 12052)
Property changes on: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/empty.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/expanded.gif
===================================================================
(Binary files differ)
Index: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/expanded.gif
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/expanded.gif 2013-09-15 01:45:10 UTC (rev 12051)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/expanded.gif 2013-09-15 02:23:27 UTC (rev 12052)
Property changes on: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/expanded.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/skin.css (rev 0)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/skin.css 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,165 @@
+/**
+* Krumo `Schablon.com` Skin
+*
+* @version $Id: skin.css 6 2007-06-16 06:37:27Z mrasnika $
+* @author Kaloyan K. Tsvetkov <mra...@us...>
+*/
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+ul.krumo-node {
+ margin: 0px;
+ padding: 0px;
+ background-color: white;
+ }
+ul.krumo-node ul {
+ margin-left: 20px;
+ }
+* html ul.krumo-node ul {
+ margin-left: 24px;
+ }
+div.krumo-root {
+ border: solid 1px black;
+ margin: 1em 0em;
+ }
+ul.krumo-first {
+ font: normal 11px tahoma, verdana;
+ border: solid 1px white;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+li.krumo-child {
+ display:block;
+ list-style: none;
+ padding: 0px;
+ margin: 0px;
+ overflow:hidden;
+ }
+div.krumo-element {
+ cursor:default;
+ display:block;
+ clear:both;
+ white-space:nowrap;
+
+ background-color: white;
+ background-image: url(%url%empty.gif);
+ background-repeat: no-repeat;
+ background-position: 6px 5px;
+ padding: 2px 0px 3px 20px;
+ }
+* html div.krumo-element {
+ padding-bottom: 3px;
+ line-height: 13px;
+ }
+div.krumo-expand {
+ background-image: url(%url%collapsed.gif);
+ cursor:pointer;
+ }
+div.krumo-hover {
+ background-color: #BFDFFF;
+ }
+div.krumo-opened {
+ background-image: url(%url%expanded.gif);
+ }
+a.krumo-name {
+ color:navy;
+ font: bold 13px courier new;
+ line-height:12px;
+ }
+a.krumo-name big {
+ font: bold 16pt Georgia;
+ line-height: 10px;
+ position:relative;
+ top:2px;
+ left:-2px;
+ }
+* html a.krumo-name big {
+ font: bold 15pt Georgia;
+ float:left;
+ top: -5px;
+ left: 0px;
+ padding: 0px;
+ margin: 0px;
+ }
+em.krumo-type {
+ font-style:normal;
+ margin: 0px 2px;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+div.krumo-preview {
+ font: normal 13px courier new;
+ padding: 5px ;
+ background: lightyellow;
+ border: solid 1px #808000;
+ overflow:auto;
+ margin: 5px 1em 1em 0px;
+ }
+* html div.krumo-preview {
+ padding-top: 2px;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+li.krumo-footnote {
+ background: white url(%url%dotted.gif) repeat-x;
+ padding: 4px 5px 3px 5px;
+ list-style:none;
+ cursor:default;
+ }
+* html li.krumo-footnote {
+ line-height: 13px;
+ }
+div.krumo-version {
+ float:right;
+ }
+li.krumo-footnote h6 {
+ font: bold 11px verdana;
+ margin: 0px;
+ padding: 0px;
+ color:navy;
+ display:inline;
+ }
+* html li.krumo-footnote h6 {
+ margin-right: 3px;
+ }
+li.krumo-footnote a {
+ font: bold 10px arial;
+ color: #434343;
+ text-decoration:none;
+ }
+li.krumo-footnote a:hover {
+ color:black;
+ }
+
+
+li.krumo-footnote span.krumo-call {
+ font:normal 11px tahoma, verdana;
+ position: relative;
+ top: 1px;
+ }
+li.krumo-footnote span.krumo-call code {
+ font-weight:bold;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+div.krumo-title {
+ font: normal 11px tahoma, verdana;
+ position:relative;
+ top:9px;
+ cursor:default;
+ line-height:2px;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+
+strong.krumo-array-length,
+strong.krumo-string-length {
+ font-weight: normal;
+ color: #000099;
+ }
+
+/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
Added: XMF/xmf/trunk/xmf/docs/README.txt
===================================================================
--- XMF/xmf/trunk/xmf/docs/README.txt (rev 0)
+++ XMF/xmf/trunk/xmf/docs/README.txt 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,13 @@
+XMF - a XOOPS Module Framework
+
+Introduction
+============
+
+Installation
+============
+
+Notes
+=====
+
+Credits
+=======
Added: XMF/xmf/trunk/xmf/docs/changelog.txt
===================================================================
--- XMF/xmf/trunk/xmf/docs/changelog.txt (rev 0)
+++ XMF/xmf/trunk/xmf/docs/changelog.txt 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,8 @@
+xmf ChangeLog
+
+=== xmf ===
+14-Sep-2013
+
+* 1.0 Alpha for XOOPS 2.5.6
+* reworked at https://github.com/geekwright/xmf.git
+* initial checkout: svn checkout http://svn.code.sf.net/p/xoops/svn/XMF/xmf/trunk/xmf
Added: XMF/xmf/trunk/xmf/docs/gpl-2.0.txt
===================================================================
--- XMF/xmf/trunk/xmf/docs/gpl-2.0.txt (rev 0)
+++ XMF/xmf/trunk/xmf/docs/gpl-2.0.txt 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Added: XMF/xmf/trunk/xmf/docs/gpl-3.0.txt
===================================================================
--- XMF/xmf/trunk/xmf/docs/gpl-3.0.txt (rev 0)
+++ XMF/xmf/trunk/xmf/docs/gpl-3.0.txt 2013-09-15 02:23:27 UTC (rev 12052)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the re...
[truncated message content] |
|
From: <be...@us...> - 2013-09-15 01:45:13
|
Revision: 12051
http://sourceforge.net/p/xoops/svn/12051
Author: beckmi
Date: 2013-09-15 01:45:10 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
Bug # 1271 install last page no css/js (Tarik)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-15 01:28:32 UTC (rev 12050)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-15 01:45:10 UTC (rev 12051)
@@ -8,11 +8,13 @@
- ID: 1227 Sorting bug in Profile module search (Zyspec)
- ID: 1269 Block template file will not updated after update the module (irmtfan)
- ID: 1270 template issue in email notifications (changed X_ITEM_TILE to X_ITEM_NAME) (alain01/slider84/mamba)
+- ID: 1271 install last page no css/js (tarik)
+- ID: 1273 template duplicate issue (irmtfan)
- ID: 1278 _AM_SENDMTOUSERS missed (Mowaffaq/mamba)
- ID: 1285 check if session exists before attempting to start a new one (wishcraft)
- ID: 1287 assigning "static" to various class methods (wishcraft/mamba)
-- ID: 1273 template duplicate issue (irmtfan)
+
- reversing fix for potential lack of rendering css and javascript in Installer on the last screen by culex
- removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
- added missing "`" in upgrade from 2.0.18 to 2.3.0 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php 2013-09-15 01:28:32 UTC (rev 12050)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php 2013-09-15 01:45:10 UTC (rev 12051)
@@ -167,6 +167,7 @@
//window.location = newinstallurl;
loadjscssfile(newPro, 'js');
loadjscssfile(newINST, 'js');
+ loadjscssfile(newCSSDeflt, 'css');
loadjscssfile(newCSS, 'css');
} else {
// Do nothing
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php 2013-09-15 01:28:32 UTC (rev 12050)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php 2013-09-15 01:45:10 UTC (rev 12051)
@@ -42,11 +42,11 @@
$_SESSION['newinstallPRO'] = XOOPS_URL.'/'.$installer_modified.'/js/prototype-1.6.0.3.js';
$_SESSION['newinstallINST'] = XOOPS_URL.'/'.$installer_modified.'/js/xo-installer.js';
if (file_exists('language/' . $wizard->language . '/style.css')) {
- $_SESSION['newinstallCSS'] = XOOPS_URL.'/'.'language/' . $wizard->language . '/style.css';
- $_SESSION['newinstallCSSDeflt'] = XOOPS_URL.'/'.$installer_modified.'/css/style.css';
+$_SESSION['newinstallCSSDeflt'] = XOOPS_URL.'/'.$installer_modified.'/css/style.css';
+$_SESSION['newinstallCSS'] = XOOPS_URL.'/'.$installer_modified.'/language/' . $wizard->language . '/style.css';
} else {
- $_SESSION['newinstallCSSDeflt'] = XOOPS_URL.'/'.$installer_modified.'/css/style.css';
- $_SESSION['newinstallCSS'] = '';
+$_SESSION['newinstallCSSDeflt'] = XOOPS_URL.'/'.$installer_modified.'/css/style.css';
+$_SESSION['newinstallCSS'] = '';
}
$js = '<script type="text/javascript">';
|
|
From: <be...@us...> - 2013-09-15 01:28:36
|
Revision: 12050
http://sourceforge.net/p/xoops/svn/12050
Author: beckmi
Date: 2013-09-15 01:28:32 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
Bug ID: 1273 template duplicate issue (irmtfan)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/sql/mysql.structure.sql
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/xoops_version.php
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 21:28:28 UTC (rev 12049)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-15 01:28:32 UTC (rev 12050)
@@ -11,6 +11,7 @@
- ID: 1278 _AM_SENDMTOUSERS missed (Mowaffaq/mamba)
- ID: 1285 check if session exists before attempting to start a new one (wishcraft)
- ID: 1287 assigning "static" to various class methods (wishcraft/mamba)
+- ID: 1273 template duplicate issue (irmtfan)
- reversing fix for potential lack of rendering css and javascript in Installer on the last screen by culex
- removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/sql/mysql.structure.sql
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/sql/mysql.structure.sql 2013-09-14 21:28:28 UTC (rev 12049)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/sql/mysql.structure.sql 2013-09-15 01:28:32 UTC (rev 12050)
@@ -498,7 +498,7 @@
#
# Table structure for table `tplfile`
#
-
+# irmtfan bug fix: solve templates duplicate issue
CREATE TABLE tplfile (
tpl_id mediumint(7) unsigned NOT NULL auto_increment,
tpl_refid smallint(5) unsigned NOT NULL default '0',
@@ -511,7 +511,8 @@
tpl_type varchar(20) NOT NULL default '',
PRIMARY KEY (tpl_id),
KEY tpl_refid (tpl_refid,tpl_type),
- KEY tpl_tplset (tpl_tplset,tpl_file(10))
+ KEY tpl_tplset (tpl_tplset,tpl_file(10)) ,
+ UNIQUE tpl_refid_module_set_file_type (tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type)
) ENGINE=MyISAM;
# --------------------------------------------------------
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2013-09-14 21:28:28 UTC (rev 12049)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2013-09-15 01:28:32 UTC (rev 12050)
@@ -30,20 +30,22 @@
// ------------------------------------------------------------------------- //
// Check users rights
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit(_NOPERM);
+if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
+ exit(_NOPERM);
+}
include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
include_once XOOPS_ROOT_PATH . '/modules/system/admin/modulesadmin/modulesadmin.php';
-if ( isset($_POST) ) {
- foreach ( $_POST as $k => $v ) {
+if (isset($_POST)) {
+ foreach ($_POST as $k => $v) {
${$k} = $v;
}
}
// Get Action type
-$op = system_CleanVars ( $_REQUEST, 'op', 'list', 'string' );
-$module = system_CleanVars ( $_REQUEST, 'module', '', 'string' );
+$op = system_CleanVars($_REQUEST, 'op', 'list', 'string');
+$module = system_CleanVars($_REQUEST, 'module', '', 'string');
if (in_array($op, array('confirm', 'submit', 'install_ok', 'update_ok', 'uninstall_ok'))) {
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -60,41 +62,43 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(
+ XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css'
+ );
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
$xoTheme->addScript('modules/system/js/admin.js');
$xoTheme->addScript('modules/system/js/module.js');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') );
- $xoBreadCrumb->addTips( _AM_SYSTEM_MODULES_TIPS );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help'));
+ $xoBreadCrumb->addTips(_AM_SYSTEM_MODULES_TIPS);
$xoBreadCrumb->render();
// Get Module Handler
$module_handler =& xoops_gethandler('module');
- $criteria = new CriteriaCompo();
+ $criteria = new CriteriaCompo();
$criteria->setSort('weight');
$criteria->setOrder('ASC');
// Get all installed modules
- $installed_mods = $module_handler->getObjects( $criteria );
- $listed_mods = array();
- $i = 0;
- $install_mods = array();
- foreach ( $installed_mods as $module ) {
- $listed_mods[$i] = $module->toArray();
+ $installed_mods = $module_handler->getObjects($criteria);
+ $listed_mods = array();
+ $i = 0;
+ $install_mods = array();
+ foreach ($installed_mods as $module) {
+ $listed_mods[$i] = $module->toArray();
$listed_mods[$i]['image'] = $module->getInfo('image');
$listed_mods[$i]['adminindex'] = $module->getInfo('adminindex');
- $listed_mods[$i]['version'] = round( $module->getVar('version') / 100, 2 );
- $listed_mods[$i]['last_update'] = formatTimestamp( $module->getVar('last_update'), 'm' );
+ $listed_mods[$i]['version'] = round($module->getVar('version') / 100, 2);
+ $listed_mods[$i]['last_update'] = formatTimestamp($module->getVar('last_update'), 'm');
$listed_mods[$i]['author'] = $module->getInfo('author');
$listed_mods[$i]['credits'] = $module->getInfo('credits');
$listed_mods[$i]['license'] = $module->getInfo('license');
$listed_mods[$i]['description'] = $module->getInfo('description');
- if ( round( $module->getInfo( 'version' ), 2 ) != $listed_mods[$i]['version']){
+ if (round($module->getInfo('version'), 2) != $listed_mods[$i]['version']) {
$listed_mods[$i]['warning_update'] = true;
- }else{
+ } else {
$listed_mods[$i]['warning_update'] = false;
}
$install_mods[] = $module->getInfo('dirname');
@@ -102,14 +106,14 @@
$i++;
}
// Get module to install
- $dirlist = XoopsLists::getModulesList();
+ $dirlist = XoopsLists::getModulesList();
$toinstall_mods = array();
- $i=0;
+ $i = 0;
foreach ($dirlist as $file) {
- if ( file_exists( XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php' ) ) {
+ if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php')) {
clearstatcache();
$file = trim($file);
- if ( !in_array($file, $install_mods) ) {
+ if (!in_array($file, $install_mods)) {
$i++;
}
}
@@ -129,34 +133,36 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(
+ XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css'
+ );
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
$xoTheme->addScript('modules/system/js/admin.js');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_TOINSTALL );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#install' );
- $xoBreadCrumb->addTips( _AM_SYSTEM_MODULES_TIPS );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_TOINSTALL);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#install');
+ $xoBreadCrumb->addTips(_AM_SYSTEM_MODULES_TIPS);
$xoBreadCrumb->render();
// Get Module Handler
$module_handler =& xoops_gethandler('module');
// Get all installed modules
$installed_mods = $module_handler->getObjects();
- foreach ( $installed_mods as $module ) {
+ foreach ($installed_mods as $module) {
$install_mods[] = $module->getInfo('dirname');
}
// Get module to install
- $dirlist = XoopsLists::getModulesList();
+ $dirlist = XoopsLists::getModulesList();
$toinstall_mods = array();
- $i=0;
+ $i = 0;
foreach ($dirlist as $file) {
- if ( file_exists( XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php' ) ) {
+ if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php')) {
clearstatcache();
$file = trim($file);
- if ( !in_array($file, $install_mods) ) {
+ if (!in_array($file, $install_mods)) {
$module =& $module_handler->create();
$module->loadInfo($file);
$toinstall_mods[$i]['name'] = $module->getInfo('name');
@@ -183,16 +189,16 @@
case 'order':
// Get Module Handler
$module_handler =& xoops_gethandler('module');
- if ( isset($_POST['mod']) ) {
- $i=1;
+ if (isset($_POST['mod'])) {
+ $i = 1;
foreach ($_POST['mod'] as $order) {
- if( $order > 0 ) {
+ if ($order > 0) {
$module = $module_handler->get($order);
//Change order only for visible modules
if ($module->getVar('weight') != 0) {
$module->setVar('weight', $i);
if (!$module_handler->insert($module)) {
- $error=true;
+ $error = true;
}
$i++;
}
@@ -208,32 +214,32 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_VALIDATE );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#confirm' );
- $xoBreadCrumb->addTips( _AM_SYSTEM_MODULES_CONFIRM_TIPS );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_VALIDATE);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#confirm');
+ $xoBreadCrumb->addTips(_AM_SYSTEM_MODULES_CONFIRM_TIPS);
$xoBreadCrumb->render();
$error = array();
- if ( !is_writable(XOOPS_CACHE_PATH.'/') ) {
+ if (!is_writable(XOOPS_CACHE_PATH . '/')) {
// attempt to chmod 666
- if ( !chmod(XOOPS_CACHE_PATH.'/', 0777) ) {
- $error[] = sprintf(_MUSTWABLE, "<strong>".XOOPS_CACHE_PATH.'/</strong>');
+ if (!chmod(XOOPS_CACHE_PATH . '/', 0777)) {
+ $error[] = sprintf(_MUSTWABLE, "<strong>" . XOOPS_CACHE_PATH . '/</strong>');
}
}
- if ( count($error) > 0 ) {
+ if (count($error) > 0) {
// Display Error
xoops_error($error);
// Call Footer
xoops_cp_footer();
exit();
}
- $i = 0;
+ $i = 0;
$modifs_mods = array();
- $module = empty($_POST['module']) ? array() : $_POST['module'];
+ $module = empty($_POST['module']) ? array() : $_POST['module'];
foreach ($module as $mid) {
- $mid = (int) $mid;
+ $mid = (int)$mid;
$modifs_mods[$i]['mid'] = $mid;
$modifs_mods[$i]['oldname'] = $myts->htmlspecialchars($myts->stripSlashesGPC($oldname[$mid]));
$modifs_mods[$i]['newname'] = $myts->htmlspecialchars(trim($myts->stripslashesGPC($newname[$mid])));
@@ -249,21 +255,21 @@
case 'display':
// Get module handler
$module_handler =& xoops_gethandler('module');
- $module_id = system_CleanVars ( $_POST, 'mid', 0, 'int' );
- if ( $module_id > 0 ) {
- $module =& $module_handler->get( $module_id );
- $old = $module->getVar('isactive');
+ $module_id = system_CleanVars($_POST, 'mid', 0, 'int');
+ if ($module_id > 0) {
+ $module =& $module_handler->get($module_id);
+ $old = $module->getVar('isactive');
// Set value
- $module->setVar('isactive', !$old );
+ $module->setVar('isactive', !$old);
if (!$module_handler->insert($module)) {
- $error=true;
+ $error = true;
}
- $blocks = XoopsBlock::getByModule($module_id);
- $bcount = count($blocks);
- for ($i = 0; $i < $bcount; $i++) {
- $blocks[$i]->setVar('isactive', !$old);
- $blocks[$i]->store();
- }
+ $blocks = XoopsBlock::getByModule($module_id);
+ $bcount = count($blocks);
+ for ($i = 0; $i < $bcount; $i++) {
+ $blocks[$i]->setVar('isactive', !$old);
+ $blocks[$i]->store();
+ }
//Set active modules in cache folder
xoops_setActiveModules();
}
@@ -272,24 +278,24 @@
case 'display_in_menu':
// Get module handler
$module_handler =& xoops_gethandler('module');
- $module_id = system_CleanVars ( $_POST, 'mid', 0, 'int' );
- if ( $module_id > 0 ) {
+ $module_id = system_CleanVars($_POST, 'mid', 0, 'int');
+ if ($module_id > 0) {
$module =& $module_handler->get($module_id);
- $old = $module->getVar('weight');
+ $old = $module->getVar('weight');
// Set value
- $module->setVar('weight', !$old );
+ $module->setVar('weight', !$old);
if (!$module_handler->insert($module)) {
- $error=true;
+ $error = true;
}
}
- break;
+ break;
case 'submit':
- $ret = array();
- $write = false;
+ $ret = array();
+ $write = false;
$module = empty($_POST['module']) ? array() : $_POST['module'];
foreach ($module as $mid) {
- if (isset($newstatus[$mid]) && $newstatus[$mid] ==1) {
+ if (isset($newstatus[$mid]) && $newstatus[$mid] == 1) {
if ($oldstatus[$mid] == 0) {
$ret[] = xoops_module_activate($mid);
}
@@ -299,12 +305,12 @@
}
}
$newname[$mid] = trim($newname[$mid]);
- if ($oldname[$mid] != $newname[$mid] ) {
+ if ($oldname[$mid] != $newname[$mid]) {
$ret[] = xoops_module_change($mid, $newname[$mid]);
$write = true;
}
}
- if ( $write ) {
+ if ($write) {
// Flush cache files for cpanel GUIs
xoops_load('cpanel', 'system');
XoopsSystemCpanel::flush();
@@ -317,13 +323,13 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_SUBMITRES );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#submit' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_SUBMITRES);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#submit');
$xoBreadCrumb->render();
- if ( count($ret) > 0 ) {
+ if (count($ret) > 0) {
$xoopsTpl->assign('result', $ret);
}
// Call Footer
@@ -334,30 +340,38 @@
$module = $myts->htmlspecialchars($module);
// Get module handler
$module_handler =& xoops_gethandler('module');
- $mod =& $module_handler->create();
+ $mod =& $module_handler->create();
$mod->loadInfoAsVar($module);
// Construct message
if ($mod->getInfo('image') != false && trim($mod->getInfo('image')) != '') {
- $msgs ='<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim($mod->getInfo('image')) . '" alt="" />';
+ $msgs = '<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim(
+ $mod->getInfo('image')
+ ) . '" alt="" />';
}
- $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name', 's') . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREINS;
+ $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name', 's')
+ . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREINS;
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_INSTALL );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#install' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_INSTALL);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#install');
$xoBreadCrumb->render();
// Display question message
- xoops_confirm(array('module' => $module, 'op' => 'install_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _AM_SYSTEM_MODULES_INSTALL);
+ xoops_confirm(
+ array('module' => $module, 'op' => 'install_ok', 'fct' => 'modulesadmin'),
+ 'admin.php',
+ $msgs,
+ _AM_SYSTEM_MODULES_INSTALL
+ );
// Call Footer
xoops_cp_footer();
break;
case 'install_ok':
- $ret = array();
+ $ret = array();
$ret[] = xoops_module_install($module);
// Flush cache files for cpanel GUIs
xoops_load('cpanel', 'system');
@@ -369,11 +383,11 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_INSTALL );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#install' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_INSTALL);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#install');
$xoBreadCrumb->render();
if (count($ret) > 0) {
foreach ($ret as $msg) {
@@ -390,29 +404,37 @@
$module = $myts->htmlspecialchars($module);
// Get module handler
$module_handler =& xoops_gethandler('module');
- $mod =& $module_handler->getByDirname($module);
+ $mod =& $module_handler->getByDirname($module);
// Construct message
if ($mod->getInfo('image') != false && trim($mod->getInfo('image')) != '') {
- $msgs ='<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim($mod->getInfo('image')) . '" alt="" />';
+ $msgs = '<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim(
+ $mod->getInfo('image')
+ ) . '" alt="" />';
}
- $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name') . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREUNINS;
+ $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name')
+ . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREUNINS;
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_UNINSTALL );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#delete' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UNINSTALL);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#delete');
$xoBreadCrumb->render();
// Display Question
- xoops_confirm(array('module' => $module, 'op' => 'uninstall_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _AM_SYSTEM_MODULES_UNINSTALL);
+ xoops_confirm(
+ array('module' => $module, 'op' => 'uninstall_ok', 'fct' => 'modulesadmin'),
+ 'admin.php',
+ $msgs,
+ _AM_SYSTEM_MODULES_UNINSTALL
+ );
// Call Footer
xoops_cp_footer();
break;
case 'uninstall_ok':
- $ret = array();
+ $ret = array();
$ret[] = xoops_module_uninstall($module);
// Flush cache files for cpanel GUIs
xoops_load("cpanel", "system");
@@ -424,11 +446,11 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_UNINSTALL );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#delete' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UNINSTALL);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#delete');
$xoBreadCrumb->render();
if (count($ret) > 0) {
foreach ($ret as $msg) {
@@ -445,70 +467,83 @@
$module = $myts->htmlspecialchars($module);
// Get module handler
$module_handler =& xoops_gethandler('module');
- $mod =& $module_handler->getByDirname($module);
+ $mod =& $module_handler->getByDirname($module);
// Construct message
if ($mod->getInfo('image') != false && trim($mod->getInfo('image')) != '') {
- $msgs ='<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim($mod->getInfo('image')) . '" alt="" />';
+ $msgs = '<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim(
+ $mod->getInfo('image')
+ ) . '" alt="" />';
}
- $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name', 's') . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREUPD;
+ $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name', 's')
+ . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREUPD;
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_UPDATE );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#update' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UPDATE);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#update');
$xoBreadCrumb->render();
// Display message
- xoops_confirm(array('dirname' => $module, 'op' => 'update_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _AM_SYSTEM_MODULES_UPDATE);
+ xoops_confirm(
+ array('dirname' => $module, 'op' => 'update_ok', 'fct' => 'modulesadmin'),
+ 'admin.php',
+ $msgs,
+ _AM_SYSTEM_MODULES_UPDATE
+ );
// Call Footer
xoops_cp_footer();
break;
case 'update_ok':
- $dirname = $myts->htmlspecialchars(trim($dirname));
+ $dirname = $myts->htmlspecialchars(trim($dirname));
$module_handler =& xoops_gethandler('module');
- $module =& $module_handler->getByDirname($dirname);
+ $module =& $module_handler->getByDirname($dirname);
// Save current version for use in the update function
$prev_version = $module->getVar('version');
- $clearTpl = new XoopsTpl();
+ $clearTpl = new XoopsTpl();
$clearTpl->clearCache($dirname);
// we dont want to change the module name set by admin
$temp_name = $module->getVar('name');
$module->loadInfoAsVar($dirname);
$module->setVar('name', $temp_name);
- $module->setVar('last_update', time() );
+ $module->setVar('last_update', time());
// Call Header
// Define main template
$xoopsOption['template_main'] = 'system_header.html';
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_UPDATE );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#update' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UPDATE);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#update');
$xoBreadCrumb->render();
if (!$module_handler->insert($module)) {
- echo '<p>Could not update '.$module->getVar('name').'</p>';
- echo "<br /><div class='center'><a href='admin.php?fct=modulesadmin'>" . _AM_SYSTEM_MODULES_BTOMADMIN . "</a></div>";
+ echo '<p>Could not update ' . $module->getVar('name') . '</p>';
+ echo "<br /><div class='center'><a href='admin.php?fct=modulesadmin'>" . _AM_SYSTEM_MODULES_BTOMADMIN
+ . "</a></div>";
} else {
$newmid = $module->getVar('mid');
- $msgs = array();
+ $msgs = array();
$msgs[] = '<div id="xo-module-log"><div class="header">';
- $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UPDATING . $module->getInfo('name', 's') . '</h4>';
+ $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UPDATING . $module->getInfo('name', 's') . '</h4>';
if ($module->getInfo('image') != false && trim($module->getInfo('image')) != '') {
- $msgs[] ='<img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" />';
+ $msgs[] = '<img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image'))
+ . '" alt="" />';
}
- $msgs[] ='<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version');
+ $msgs[] = '<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version');
if ($module->getInfo('author') != false && trim($module->getInfo('author')) != '') {
- $msgs[] ='<strong>' . _AUTHOR . ':</strong> ' . $myts->htmlspecialchars(trim($module->getInfo('author')));
+ $msgs[]
+ = '<strong>' . _AUTHOR . ':</strong> ' . $myts->htmlspecialchars(trim($module->getInfo('author')));
}
- $msgs[] = '</div><div class="logger">';
- $msgs[] = _AM_SYSTEM_MODULES_MODULE_DATA_UPDATE;
+ $msgs[] = '</div><div class="logger">';
+ $msgs[] = _AM_SYSTEM_MODULES_MODULE_DATA_UPDATE;
$tplfile_handler =& xoops_gethandler('tplfile');
+ // irmtfan bug fix: remove codes for delete templates
+ /*
$deltpl = $tplfile_handler->find('default', 'module', $module->getVar('mid'));
$delng = array();
if (is_array($deltpl)) {
@@ -520,46 +555,72 @@
}
}
}
+ */
+ // irmtfan bug fix: remove codes for delete templates
$templates = $module->getInfo('templates');
if ($templates != false) {
$msgs[] = _AM_SYSTEM_MODULES_TEMPLATES_UPDATE;
foreach ($templates as $tpl) {
$tpl['file'] = trim($tpl['file']);
- if (!in_array($tpl['file'], $delng)) {
- $type = (isset($tpl['type']) ? $tpl['type'] : 'module');
- $tpldata =& xoops_module_gettemplate($dirname, $tpl['file'], $type);
- $tplfile =& $tplfile_handler->create();
- $tplfile->setVar('tpl_refid', $newmid);
- $tplfile->setVar('tpl_lastimported', 0);
- $tplfile->setVar('tpl_lastmodified', time());
+ // START irmtfan solve templates duplicate issue
+ // if (!in_array($tpl['file'], $delng)) { // irmtfan bug fix: remove codes for delete templates
+ $type = (isset($tpl['type']) ? $tpl['type'] : 'module');
+ if (preg_match("/\.css$/i", $tpl['file'])) {
+ $type = 'css';
+ }
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("tpl_refid", $newmid), "AND");
+ $criteria->add(new Criteria("tpl_module", $dirname), "AND");
+ $criteria->add(new Criteria("tpl_tplset", 'default'), "AND");
+ $criteria->add(new Criteria("tpl_file", $tpl['file']), "AND");
+ $criteria->add(new Criteria("tpl_type", $type), "AND");
+ $tplfiles = $tplfile_handler->getObjects($criteria);
- if (preg_match("/\.css$/i", $tpl['file'])) {
- $tplfile->setVar('tpl_type', 'css');
- } else {
- $tplfile->setVar('tpl_type', $type );
- }
- $tplfile->setVar('tpl_source', $tpldata, true);
- $tplfile->setVar('tpl_module', $dirname);
- $tplfile->setVar('tpl_tplset', 'default');
- $tplfile->setVar('tpl_file', $tpl['file'], true);
- $tplfile->setVar('tpl_desc', $tpl['description'], true);
- if (!$tplfile_handler->insert($tplfile)) {
- $msgs[] = ' <span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR, "<strong>".$tpl['file']."</strong>").'</span>';
- } else {
- $newid = $tplfile->getVar('tpl_id');
- $msgs[] = ' '.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_INSERT_DATA, "<strong>".$tpl['file']."</strong>");
- if ($xoopsConfig['template_set'] == 'default') {
- if (!xoops_template_touch($newid)) {
- $msgs[] = ' <span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR, "<strong>".$tpl['file']."</strong>").'</span>';
- } else {
- $msgs[] = ' <span>'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE, "<strong>".$tpl['file']."</strong>").'</span>';
- }
+ $tpldata =& xoops_module_gettemplate($dirname, $tpl['file'], $type);
+ $tplfile = empty($tplfiles) ? $tplfile_handler->create() : $tplfiles[0];
+ // END irmtfan solve templates duplicate issue
+ $tplfile->setVar('tpl_refid', $newmid);
+ $tplfile->setVar('tpl_lastimported', 0);
+ $tplfile->setVar('tpl_lastmodified', time());
+ $tplfile->setVar('tpl_type', $type);
+ $tplfile->setVar('tpl_source', $tpldata, true);
+ $tplfile->setVar('tpl_module', $dirname);
+ $tplfile->setVar('tpl_tplset', 'default');
+ $tplfile->setVar('tpl_file', $tpl['file'], true);
+ $tplfile->setVar('tpl_desc', $tpl['description'], true);
+ if (!$tplfile_handler->insert($tplfile)) {
+ $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR,
+ "<strong>" . $tpl['file'] . "</strong>"
+ ) . '</span>';
+ } else {
+ $newid = $tplfile->getVar('tpl_id');
+ $msgs[] = ' ' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_INSERT_DATA,
+ "<strong>" . $tpl['file'] . "</strong>"
+ );
+ if ($xoopsConfig['template_set'] == 'default') {
+ if (!xoops_template_touch($newid)) {
+ $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR,
+ "<strong>" . $tpl['file'] . "</strong>"
+ ) . '</span>';
+ } else {
+ $msgs[] = ' <span>' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE,
+ "<strong>" . $tpl['file'] . "</strong>"
+ ) . '</span>';
}
}
- unset($tpldata);
+ }
+ unset($tpldata);
+ // irmtfan bug fix: remove codes for delete templates
+ /*
} else {
$msgs[] = ' <span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_DELETE_OLD_ERROR, "<strong>".$tpl['file']."</strong>").'</span>';
}
+ */
+ // irmtfan bug fix: remove codes for delete templates
}
}
$blocks = $module->getInfo('blocks');
@@ -568,11 +629,13 @@
$showfuncs = array();
$funcfiles = array();
foreach ($blocks as $i => $block) {
- if (isset($block['show_func']) && $block['show_func'] != '' && isset($block['file']) && $block['file'] != '') {
- $editfunc = isset($block['edit_func']) ? $block['edit_func'] : '';
+ if (isset($block['show_func']) && $block['show_func'] != '' && isset($block['file'])
+ && $block['file'] != ''
+ ) {
+ $editfunc = isset($block['edit_func']) ? $block['edit_func'] : '';
$showfuncs[] = $block['show_func'];
$funcfiles[] = $block['file'];
- $template = '';
+ $template = '';
if ((isset($block['template']) && trim($block['template']) != '')) {
$content = xoops_module_gettemplate($dirname, $block['template'], 'blocks');
}
@@ -585,17 +648,27 @@
if (!empty($block['options'])) {
$options = $block['options'];
}
- $sql = "SELECT bid, name FROM ".$xoopsDB->prefix('newblocks')." WHERE mid=".$module->getVar('mid')." AND func_num=".$i." AND show_func='".addslashes($block['show_func'])."' AND func_file='".addslashes($block['file'])."'";
+ $sql
+ =
+ "SELECT bid, name FROM " . $xoopsDB->prefix('newblocks') . " WHERE mid=" . $module->getVar(
+ 'mid'
+ ) . " AND func_num=" . $i . " AND show_func='" . addslashes($block['show_func'])
+ . "' AND func_file='" . addslashes($block['file']) . "'";
$fresult = $xoopsDB->query($sql);
- $fcount = 0;
+ $fcount = 0;
while ($fblock = $xoopsDB->fetchArray($fresult)) {
$fcount++;
- $sql = "UPDATE ".$xoopsDB->prefix("newblocks")." SET name='".addslashes($block['name'])."', edit_func='".addslashes($editfunc)."', content='', template='".$template."', last_modified=".time()." WHERE bid=".$fblock['bid'];
+ $sql
+ =
+ "UPDATE " . $xoopsDB->prefix("newblocks") . " SET name='" . addslashes($block['name'])
+ . "', edit_func='" . addslashes($editfunc) . "', content='', template='" . $template
+ . "', last_modified=" . time() . " WHERE bid=" . $fblock['bid'];
$result = $xoopsDB->query($sql);
if (!$result) {
- $msgs[] = " ".sprintf(_AM_SYSTEM_MODULES_UPDATE_ERROR, $fblock['name']);
+ $msgs[] = " " . sprintf(_AM_SYSTEM_MODULES_UPDATE_ERROR, $fblock['name']);
} else {
- $msgs[] = " ".sprintf(_AM_SYSTEM_MODULES_BLOCK_UPDATE, $fblock['name']).sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, "<strong>".$fblock['bid']."</strong>");
+ $msgs[] = " " . sprintf(_AM_SYSTEM_MODULES_BLOCK_UPDATE, $fblock['name'])
+ . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, "<strong>" . $fblock['bid'] . "</strong>");
if ($template != '') {
$tplfile = $tplfile_handler->find('default', 'block', $fblock['bid']);
if (count($tplfile) == 0) {
@@ -612,16 +685,32 @@
$tplfile_new->setVar('tpl_desc', $block['description'], true);
$tplfile_new->setVar('tpl_lastmodified', time());
$tplfile_new->setVar('tpl_lastimported', 0);
- $tplfile_new->setVar('tpl_file', $block['template'], true); // irmtfan bug fix: block template file will not updated after update the module
+ $tplfile_new->setVar(
+ 'tpl_file',
+ $block['template'],
+ true
+ ); // irmtfan bug fix: block template file will not updated after update the module
if (!$tplfile_handler->insert($tplfile_new)) {
- $msgs[] = ' <span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_UPDATE_ERROR, "<strong>".$block['template']."</strong>").'</span>';
+ $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_UPDATE_ERROR,
+ "<strong>" . $block['template'] . "</strong>"
+ ) . '</span>';
} else {
- $msgs[] = " ".sprintf(_AM_SYSTEM_MODULES_TEMPLATE_UPDATE, "<strong>".$block['template']."</strong>");
+ $msgs[] = " " . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_UPDATE,
+ "<strong>" . $block['template'] . "</strong>"
+ );
if ($xoopsConfig['template_set'] == 'default') {
if (!xoops_template_touch($tplfile_new->getVar('tpl_id'))) {
- $msgs[] = ' <span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR, "<strong>".$block['template']."</strong>").'</span>';
+ $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR,
+ "<strong>" . $block['template'] . "</strong>"
+ ) . '</span>';
} else {
- $msgs[] = " ".sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE, "<strong>".$block['template']."</strong>");
+ $msgs[] = " " . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE,
+ "<strong>" . $block['template'] . "</strong>"
+ );
}
}
@@ -630,13 +719,20 @@
}
}
if ($fcount == 0) {
- $newbid = $xoopsDB->genId($xoopsDB->prefix('newblocks').'_bid_seq');
+ $newbid = $xoopsDB->genId($xoopsDB->prefix('newblocks') . '_bid_seq');
$block_name = addslashes($block['name']);
$block_type = ($module->getVar('dirname') == 'system') ? 'S' : 'M';
- $sql = "INSERT INTO ".$xoopsDB->prefix("newblocks")." (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, isactive, dirname, func_file, show_func, edit_func, template, last_modified) VALUES (".$newbid.", ".$module->getVar('mid').", ".$i.",'".addslashes($options)."','".$block_name."', '".$block_name."', '', 0, 0, 0, '{$block_type}', 1, '".addslashes($dirname)."', '".addslashes($block['file'])."', '".addslashes($block['show_func'])."', '".addslashes($editfunc)."', '".$template."', ".time().")";
- $result = $xoopsDB->query($sql);
+ $sql = "INSERT INTO " . $xoopsDB->prefix("newblocks")
+ . " (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, isactive, dirname, func_file, show_func, edit_func, template, last_modified) VALUES ("
+ . $newbid . ", " . $module->getVar('mid') . ", " . $i . ",'" . addslashes($options)
+ . "','" . $block_name . "', '" . $block_name . "', '', 0, 0, 0, '{$block_type}', 1, '"
+ . addslashes($dirname) . "', '" . addslashes($block['file']) . "', '" . addslashes(
+ $block['show_func']
+ ) . "', '" . addslashes($editfunc) . "', '" . $template . "', " . time() . ")";
+ $result = $xoopsDB->query($sql);
if (!$result) {
- $msgs[] = ' '.sprintf(_AM_SYSTEM_MODULES_SQL_NOT_CREATE, $block['name']);echo $sql;
+ $msgs[] = ' ' . sprintf(_AM_SYSTEM_MODULES_SQL_NOT_CREATE, $block['name']);
+ echo $sql;
} else {
if (empty($newbid)) {
$newbid = $xoopsDB->getInsertId();
@@ -654,9 +750,22 @@
$bperm->setVar('gperm_name', 'block_read');
$bperm->setVar('gperm_modid', 1);
if (!$gperm_handler->insert($bperm)) {
- $msgs[] = ' <span style="color:#ff0000;">'._AM_SYSTEM_MODULES_BLOCK_ACCESS_ERROR .sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, "<strong>".$newbid."</strong>"). sprintf(_AM_SYSTEM_MODULES_GROUP_ID, "<strong>".$mygroup."</strong>").'</span>';
+ $msgs[] = ' <span style="color:#ff0000;">'
+ . _AM_SYSTEM_MODULES_BLOCK_ACCESS_ERROR . sprintf(
+ _AM_SYSTEM_MODULES_BLOCK_ID,
+ "<strong>" . $newbid . "</strong>"
+ ) . sprintf(
+ _AM_SYSTEM_MODULES_GROUP_ID,
+ "<strong>" . $mygroup . "</strong>"
+ ) . '</span>';
} else {
- $msgs[] = ' '._AM_SYSTEM_MODULES_BLOCK_ACCESS. sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, "<strong>".$newbid."</strong>") . sprintf(_AM_SYSTEM_MODULES_GROUP_ID, "<strong>".$mygroup."</strong>");
+ $msgs[] = ' ' . _AM_SYSTEM_MODULES_BLOCK_ACCESS . sprintf(
+ _AM_SYSTEM_MODULES_BLOCK_ID,
+ "<strong>" . $newbid . "</strong>"
+ ) . sprintf(
+ _AM_SYSTEM_MODULES_GROUP_ID,
+ "<strong>" . $mygroup . "</strong>"
+ );
}
}
@@ -672,21 +781,37 @@
$tplfile->setVar('tpl_lastmodified', time());
$tplfile->setVar('tpl_desc', $block['description'], true);
if (!$tplfile_handler->insert($tplfile)) {
- $msgs[] = ' <span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR, "<strong>".$block['template']."</strong>").'</span>';
+ $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR,
+ "<strong>" . $block['template'] . "</strong>"
+ ) . '</span>';
} else {
- $newid = $tplfile->getVar('tpl_id');
- $msgs[] = ' '.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_DATA, "<strong>".$block['template']."</strong>");
+ $newid = $tplfile->getVar('tpl_id');
+ $msgs[] = ' ' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_ADD_DATA,
+ "<strong>" . $block['template'] . "</strong>"
+ );
if ($xoopsConfig['template_set'] == 'default') {
if (!xoops_template_touch($newid)) {
- $msgs[] = ' <span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_FAILD, "<strong>".$block['template']."</strong>").'</span>';
+ $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_FAILD,
+ "<strong>" . $block['template'] . "</strong>"
+ ) . '</span>';
} else {
- $msgs[] = ' '.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE, "<strong>".$block['template']."</strong>");
+ $msgs[] = ' ' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE,
+ "<strong>" . $block['template'] . "</strong>"
+ );
}
}
}
}
- $msgs[] = ' '.sprintf(_AM_SYSTEM_MODULES_BLOCK_CREATED, "<strong>".$block['name']."</strong>").sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, "<strong>".$newbid."</strong>");
- $sql = 'INSERT INTO '.$xoopsDB->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newbid.', -1)';
+ $msgs[] = ' ' . sprintf(
+ _AM_SYSTEM_MODULES_BLOCK_CREATED,
+ "<strong>" . $block['name'] . "</strong>"
+ ) . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, "<strong>" . $newbid . "</strong>");
+ $sql = 'INSERT INTO ' . $xoopsDB->prefix('block_module_link')
+ . ' (block_id, module_id) VALUES (' . $newbid . ', -1)';
$xoopsDB->query($sql);
}
}
@@ -694,21 +819,43 @@
}
$block_arr = XoopsBlock::getByModule($module->getVar('mid'));
foreach ($block_arr as $block) {
- if (!in_array($block->getVar('show_func'), $showfuncs) || !in_array($block->getVar('func_file'), $funcfiles)) {
- $sql = sprintf("DELETE FROM %s WHERE bid = %u", $xoopsDB->prefix('newblocks'), $block->getVar('bid'));
- if(!$xoopsDB->query($sql)) {
- $msgs[] = ' <span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE_ERROR, "<strong>".$block->getVar('name')."</strong>").sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, "<strong>".$block->getVar('bid')."</strong>").'</span>';
+ if (!in_array($block->getVar('show_func'), $showfuncs)
+ || !in_array(
+ $block->getVar('func_file'),
+ $funcfiles
+ )
+ ) {
+ $sql = sprintf(
+ "DELETE FROM %s WHERE bid = %u",
+ $xoopsDB->prefix('newblocks'),
+ $block->getVar('bid')
+ );
+ if (!$xoopsDB->query($sql)) {
+ $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
+ _AM_SYSTEM_MODULES_BLOCK_DELETE_ERROR,
+ "<strong>" . $block->getVar('name') . "</strong>"
+ ) . sprintf(
+ _AM_SYSTEM_MODULES_BLOCK_ID,
+ "<strong>" . $block->getVar('bid') . "</strong>"
+ ) . '</span>';
} else {
- $msgs[] = ' Block <strong>'.$block->getVar('name').' deleted. Block ID: <strong>'.$block->getVar('bid').'</strong>';
+ $msgs[]
+ = ' Block <strong>' . $block->getVar('name') . ' deleted. Block ID: <strong>'
+ . $block->getVar('bid') . '</strong>';
if ($block->getVar('template') != '') {
$tplfiles = $tplfile_handler->find(null, 'block', $block->getVar('bid'));
if (is_array($tplfiles)) {
$btcount = count($tplfiles);
for ($k = 0; $k < $btcount; $k++) {
if (!$tplfile_handler->delete($tplfiles[$k])) {
- $msgs[] = ' <span style="color:#ff0000;">'._AM_SYSTEM_MODULES_BLOCK_DEPRECATED_ERROR. '(ID: <strong>'.$tplfiles[$k]->getVar('tpl_id').'</strong>)</span>';
+ $msgs[] = ' <span style="color:#ff0000;">'
+ . _AM_SYSTEM_MODULES_BLOCK_DEPRECATED_ERROR . '(ID: <strong>'
+ . $tplfiles[$k]->getVar('tpl_id') . '</strong>)</span>';
} else {
- $msgs[] = ' '.sprintf(_AM_SYSTEM_MODULES_BLOCK_DEPRECATED, "<strong>".$tplfiles[$k]->getVar('tpl_file')."</strong>");
+ $msgs[] = ' ' . sprintf(
+ _AM_SYSTEM_MODULES_BLOCK_DEPRECATED,
+ "<strong>" . $tplfiles[$k]->getVar('tpl_file') . "</strong>"
+ );
}
}
}
@@ -723,21 +870,38 @@
// first delete all config entries
$config_handler =& xoops_gethandler('config');
- $configs = $config_handler->getConfigs(new Criteria('conf_modid', $module->getVar('mid')));
- $confcount = count($configs);
- $config_delng = array();
+ $configs = $config_handler->getConfigs(new Criteria('conf_modid', $module->getVar('mid')));
+ $confcount = count($configs);
+ $config_delng = array();
if ($confcount > 0) {
$msgs[] = _AM_SYSTEM_MODULES_MODULE_DATA_DELETE;
for ($i = 0; $i < $confcount; $i++) {
if (!$config_handler->deleteConfig($configs[$i])) {
- $msgs[] = ' <span style="color:#ff0000;">'._AM_SYSTEM_MODULES_GONFIG_DATA_DELETE_ERROR. sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, "<strong>".$configs[$i]->getvar('conf_id')."</strong>").'</span>';
+ $msgs[]
+ = ' <span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_GONFIG_DATA_DELETE_ERROR
+ . sprintf(
+ _AM_SYSTEM_MODULES_GONFIG_ID,
+ "<strong>" . $configs[$i]->getvar('conf_id') . "</strong>"
+ ) . '</span>';
// save the name of config failed to delete for later use
$config_delng[] = $configs[$i]->getvar('conf_name');
} else {
- $config_old[$configs[$i]->getvar('conf_name')]['value'] = $configs[$i]->getvar('conf_value', 'N');
- $config_old[$configs[$i]->getvar('conf_name')]['formtype'] = $configs[$i]->getvar('conf_formtype');
- $config_old[$configs[$i]->getvar('conf_name')]['valuetype'] = $configs[$i]->getvar('conf_valuetype');
- $msgs[] = " "._AM_SYSTEM_MODULES_GONFIG_DATA_DELETE. sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, "<strong>".$configs[$i]->getVar('conf_id')."</strong>");
+ $config_old[$configs[$i]->getvar('conf_name')]['value'] = $configs[$i]->getvar(
+ 'conf_value',
+ 'N'
+ );
+ $config_old[$configs[$i]->getvar('conf_name')]['formtype'] = $configs[$i]->getvar(
+ 'conf_formtype'
+ ...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-14 21:28:34
|
Revision: 12049
http://sourceforge.net/p/xoops/svn/12049
Author: luciorota
Date: 2013-09-14 21:28:28 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
fixed download edit links in frontside
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_download.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-14 20:56:00 UTC (rev 12048)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-14 21:28:28 UTC (rev 12049)
@@ -224,13 +224,12 @@
$download['version'] = 0;
}
$download['downtime'] = wfdownloads_getDownloadTime($this->getVar('size'), 1, 1, 1, 1, 0);
- $download['downtime'] = str_replace("|", "<br />", $download['downtime']);
+ $download['downtime'] = str_replace('|', '<br />', $download['downtime']);
$download['size'] = wfdownloads_bytesToSize1024($this->getVar('size'));
$time = ($this->getVar('updated') != 0) ? $this->getVar('updated') : $this->getVar('published');
$download['updated'] = formatTimestamp($time, $this->wfdownloads->getConfig('dateformat'));
- $is_updated = ($this->getVar('updated') != 0) ? _MD_WFD_UPDATEDON : _MD_WFD_SUBMITDATE;
- $download['lang_subdate'] = $is_updated;
+ $download['lang_subdate'] = ($this->getVar('updated') != 0) ? _MD_WFD_UPDATEDON : _MD_WFD_SUBMITDATE;
$summary = $this->getVar('summary');
if ($this->wfdownloads->getConfig('autosummary') == true || empty($summary)) {
@@ -728,8 +727,7 @@
$filestatus_radio = new XoopsFormRadioYN(_AM_WFD_FILE_FILESSTATUS, 'offline', $this->getVar('offline', 'e'));
$sform->addElement($filestatus_radio);
- $up_dated = ($this->getVar('updated', 'e') == 0) ? false : true;
- $file_updated_radio = new XoopsFormRadioYN(_AM_WFD_FILE_SETASUPDATED, 'up_dated', $up_dated);
+ $file_updated_radio = new XoopsFormRadioYN(_AM_WFD_FILE_SETASUPDATED, 'up_dated', ($this->getVar('updated', 'e') == true));
$sform->addElement($file_updated_radio);
if (!$this->isNew() && $this->getVar('published') == 0) {
@@ -755,9 +753,6 @@
$button_delete = new XoopsFormButton('', '', _DELETE, 'submit');
$button_delete->setExtra('onclick="this.form.elements.op.value=\'download.delete\'"');
$button_tray->addElement($button_delete);
- $butt_dupct2 = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'submit');
- $butt_dupct2->setExtra('onclick="this.form.elements.op.value=\'downloadsConfigMenu\'"');
- $button_tray->addElement($butt_dupct2);
}
$button_reset = new XoopsFormButton('', '', _RESET, 'reset');
$button_tray->addElement($button_reset);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_download.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_download.html 2013-09-14 20:56:00 UTC (rev 12048)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_download.html 2013-09-14 21:28:28 UTC (rev 12049)
@@ -1,7 +1,7 @@
<div>
<b><a href="singlefile.php?cid=<{$download.cid}>&lid=<{$download.id}>" title="<{$smarty.const._MD_WFD_VIEWDETAILS}>"><{$download.title}></a></b> <{$download.icons}>
<{if ($download.isadmin == true)}>
- <a href="admin/downloads.php?op=download.edit&lid=<{$download.id}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
+ <a href="submit.php?op=download.edit&lid=<{$download.id}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href="admin/downloads.php?op=download.delete&lid=<{$download.id}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
<{/if}>
</div>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html 2013-09-14 20:56:00 UTC (rev 12048)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html 2013-09-14 21:28:28 UTC (rev 12049)
@@ -7,7 +7,7 @@
<h3>
<{$download.title}> <{$download.icons}>
<{if ($download.isadmin == true)}>
- <a href="admin/downloads.php?op=download.edit&lid=<{$download.id}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
+ <a href="submit.php?op=download.edit&lid=<{$download.id}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href="admin/downloads.php?op=download.delete&lid=<{$download.id}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
<{/if}>
</h3>
|
|
From: <luc...@us...> - 2013-09-14 20:56:09
|
Revision: 12048
http://sourceforge.net/p/xoops/svn/12048
Author: luciorota
Date: 2013-09-14 20:56:00 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
fixed form error
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-09-14 20:47:14 UTC (rev 12047)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-09-14 20:56:00 UTC (rev 12048)
@@ -161,25 +161,20 @@
$button_create = new XoopsFormButton('', '', _SUBMIT, 'submit');
$button_create->setExtra('onclick="this.form.elements.op.value=\'category.save\'"');
$button_tray->addElement($button_create);
- $button_reset = new XoopsFormButton('', '', _RESET, 'reset');
- $button_tray->addElement($button_reset);
- $button_cancel = new XoopsFormButton('', '', _CANCEL, 'button');
- $button_cancel->setExtra('onclick="history.go(-1)"');
- $button_tray->addElement($button_cancel);
} else {
- $form->addElement(new XoopsFormHidden('cid', $this->getVar('cid')));
+ $form->addElement(new XoopsFormHidden('cid', $this->getVar('cid')));
$button_create = new XoopsFormButton('', '', _SUBMIT, 'submit');
$button_create->setExtra('onclick="this.form.elements.op.value=\'category.save\'"');
$button_tray->addElement($button_create);
$button_delete = new XoopsFormButton('', '', _DELETE, 'submit');
$button_delete->setExtra('onclick="this.form.elements.op.value=\'category.delete\'"');
$button_tray->addElement($button_delete);
+ }
$button_reset = new XoopsFormButton('', '', _RESET, 'reset');
$button_tray->addElement($button_reset);
$button_cancel = new XoopsFormButton('', '', _CANCEL, 'button');
$button_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement($button_cancel);
- }
$form->addElement($button_tray);
return $form;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-14 20:47:14 UTC (rev 12047)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-14 20:56:00 UTC (rev 12048)
@@ -740,35 +740,31 @@
}
$button_tray = new XoopsFormElementTray('', '');
+ $button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
if ($this->isNew()) {
$button_tray->addElement(new XoopsFormHidden('status', 1));
$button_tray->addElement(new XoopsFormHidden('notifypub', $this->getVar('notifypub', 'e')));
- $button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
+
$button_tray->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
- $button_reset = new XoopsFormButton('', '', _RESET, 'reset');
- $button_tray->addElement($button_reset);
- $button_cancel = new XoopsFormButton('', '', _CANCEL, 'button');
- $button_cancel->setExtra('onclick="history.go(-1)"');
- $button_tray->addElement($button_cancel);
} else {
$button_tray->addElement(new XoopsFormHidden('status', 2));
$button_tray->addElement(new XoopsFormHidden('lid', (int)$this->getVar('lid')));
- $button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
$button_submit = new XoopsFormButton('', '', _SUBMIT, 'submit');
$button_submit->setExtra('onclick="this.form.elements.op.value=\'download.save\'"');
- $button_tray->addElement($butt_submit);
+ $button_tray->addElement($button_submit);
$button_delete = new XoopsFormButton('', '', _DELETE, 'submit');
$button_delete->setExtra('onclick="this.form.elements.op.value=\'download.delete\'"');
$button_tray->addElement($button_delete);
$butt_dupct2 = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'submit');
$butt_dupct2->setExtra('onclick="this.form.elements.op.value=\'downloadsConfigMenu\'"');
$button_tray->addElement($butt_dupct2);
+ }
$button_reset = new XoopsFormButton('', '', _RESET, 'reset');
$button_tray->addElement($button_reset);
$button_cancel = new XoopsFormButton('', '', _CANCEL, 'button');
$button_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement($button_cancel);
- }
+
$sform->addElement($button_tray);
return $sform;
}
|
|
From: <luc...@us...> - 2013-09-14 20:47:17
|
Revision: 12047
http://sourceforge.net/p/xoops/svn/12047
Author: luciorota
Date: 2013-09-14 20:47:14 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
_SAVE definition doesnt' exist, replaced with _SUBMIT
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-09-14 20:39:38 UTC (rev 12046)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-09-14 20:47:14 UTC (rev 12047)
@@ -158,7 +158,7 @@
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('op', 'save'));
if ($this->isNew()) {
- $button_create = new XoopsFormButton('', '', _SAVE, 'submit');
+ $button_create = new XoopsFormButton('', '', _SUBMIT, 'submit');
$button_create->setExtra('onclick="this.form.elements.op.value=\'category.save\'"');
$button_tray->addElement($button_create);
$button_reset = new XoopsFormButton('', '', _RESET, 'reset');
@@ -168,7 +168,7 @@
$button_tray->addElement($button_cancel);
} else {
$form->addElement(new XoopsFormHidden('cid', $this->getVar('cid')));
- $button_create = new XoopsFormButton('', '', _MODIFY, 'submit');
+ $button_create = new XoopsFormButton('', '', _SUBMIT, 'submit');
$button_create->setExtra('onclick="this.form.elements.op.value=\'category.save\'"');
$button_tray->addElement($button_create);
$button_delete = new XoopsFormButton('', '', _DELETE, 'submit');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-14 20:39:38 UTC (rev 12046)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-14 20:47:14 UTC (rev 12047)
@@ -456,13 +456,13 @@
$button_tray = new XoopsFormElementTray('', '');
if ($this->isNew()) {
$button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
- $button_submit = new XoopsFormButton('', '', _SAVE, 'submit');
+ $button_submit = new XoopsFormButton('', '', _SUBMIT, 'submit');
$button_submit->setExtra('onclick="this.form.elements.op.value=\'download.save\'"');
$button_tray->addElement($button_submit);
} else {
$button_tray->addElement(new XoopsFormHidden('lid', (int)$this->getVar('lid')));
$button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
- $button_submit = new XoopsFormButton('', '', _MODIFY, 'submit');
+ $button_submit = new XoopsFormButton('', '', _SUBMIT, 'submit');
$button_submit->setExtra('onclick="this.form.elements.op.value=\'download.save\'"');
$button_tray->addElement($button_submit);
}
@@ -744,7 +744,7 @@
$button_tray->addElement(new XoopsFormHidden('status', 1));
$button_tray->addElement(new XoopsFormHidden('notifypub', $this->getVar('notifypub', 'e')));
$button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
- $button_tray->addElement(new XoopsFormButton('', '', _SAVE, 'submit'));
+ $button_tray->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
$button_reset = new XoopsFormButton('', '', _RESET, 'reset');
$button_tray->addElement($button_reset);
$button_cancel = new XoopsFormButton('', '', _CANCEL, 'button');
@@ -754,7 +754,7 @@
$button_tray->addElement(new XoopsFormHidden('status', 2));
$button_tray->addElement(new XoopsFormHidden('lid', (int)$this->getVar('lid')));
$button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
- $button_submit = new XoopsFormButton('', '', _MODIFY, 'submit');
+ $button_submit = new XoopsFormButton('', '', _SUBMIT, 'submit');
$button_submit->setExtra('onclick="this.form.elements.op.value=\'download.save\'"');
$button_tray->addElement($butt_submit);
$button_delete = new XoopsFormButton('', '', _DELETE, 'submit');
|
|
From: <luc...@us...> - 2013-09-14 20:39:43
|
Revision: 12046
http://sourceforge.net/p/xoops/svn/12046
Author: luciorota
Date: 2013-09-14 20:39:38 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
all pages uses module footer.php or admin_footer.php
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-09-14 18:48:53 UTC (rev 12045)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-09-14 20:39:38 UTC (rev 12046)
@@ -68,7 +68,7 @@
}
wfdownloads_xoops_cp_header();
xoops_confirm(array('op' => 'image.delete', 'uploadpath' => $_POST['uploadpath'], 'downfile' => $_POST['downfile'], 'ok' => true), $currentFile, _AM_WFD_DOWN_DELETEFILE . "<br /><br />" . $_POST['downfile'], _AM_WFD_BDELETE);
- include_once "admin_footer.php";
+ include 'admin_footer.php';
}
break;
@@ -152,5 +152,5 @@
}
$iform->display();
echo wfdownloads_serverStats();
- include_once "admin_footer.php";
+ include 'admin_footer.php';
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-09-14 18:48:53 UTC (rev 12045)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-09-14 20:39:38 UTC (rev 12046)
@@ -158,4 +158,4 @@
echo $indexAdmin->renderIndex();
echo wfdownloads_serverStats();
-include_once "admin_footer.php";
+include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-09-14 18:48:53 UTC (rev 12045)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-09-14 20:39:38 UTC (rev 12046)
@@ -113,4 +113,4 @@
$sform->display();
break;
}
-include_once "admin_footer.php";
+include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php 2013-09-14 18:48:53 UTC (rev 12045)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php 2013-09-14 20:39:38 UTC (rev 12046)
@@ -72,4 +72,4 @@
echo "</table>";
}
-include_once "admin_footer.php";
+include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-09-14 18:48:53 UTC (rev 12045)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-09-14 20:39:38 UTC (rev 12046)
@@ -213,6 +213,6 @@
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_mimetypeslist.html");
- include_once "admin_footer.php";
+ include 'admin_footer.php';
break;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-09-14 18:48:53 UTC (rev 12045)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-09-14 20:39:38 UTC (rev 12046)
@@ -166,6 +166,6 @@
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_mirrorslist.html");
- include_once "admin_footer.php";
+ include 'admin_footer.php';
break;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php 2013-09-14 18:48:53 UTC (rev 12045)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php 2013-09-14 20:39:38 UTC (rev 12046)
@@ -45,4 +45,4 @@
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_permissions.html");
-include_once "admin_footer.php";
+include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-14 18:48:53 UTC (rev 12045)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-14 20:39:38 UTC (rev 12046)
@@ -356,6 +356,6 @@
$GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_reportsmodificationslist.html");
- include_once "admin_footer.php";
+ include 'admin_footer.php';
break;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-09-14 18:48:53 UTC (rev 12045)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-09-14 20:39:38 UTC (rev 12046)
@@ -178,6 +178,6 @@
$GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_reviewslist.html");
- include_once "admin_footer.php";
+ include 'admin_footer.php';
break;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-14 18:48:53 UTC (rev 12045)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-14 20:39:38 UTC (rev 12046)
@@ -109,7 +109,7 @@
$xoopsTpl->assign('categoryPath', _MD_WFD_DISCLAIMERAGREEMENT);
$xoopsTpl->assign('module_home', wfdownloads_module_home(true));
- include XOOPS_ROOT_PATH . '/footer.php';
+ include 'footer.php';
exit();
break;
@@ -176,7 +176,7 @@
$xoopsTpl->assign('module_home', wfdownloads_module_home(true));
$xoopsTpl -> assign('submit_form' , $sform->render());
- include XOOPS_ROOT_PATH . '/footer.php';
+ include 'footer.php';
exit();
break;
@@ -459,16 +459,3 @@
}
break;
}
-
-/*
-if (!empty($_POST['submit'])) {
-
-} else {
- $agreed = WfdownloadsRequest::getBool('agreed', false);
- if ($wfdownloads->getConfig('showdisclaimer') && $agreed == false) {
-
- } else {
-
- }
-}
-*/
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-09-14 18:48:53 UTC (rev 12045)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-09-14 20:39:38 UTC (rev 12046)
@@ -102,7 +102,7 @@
$xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for compatibility issues
$xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agree=1&lid={$lid}&cid={$cid}");
- include XOOPS_ROOT_PATH . '/footer.php';
+ include 'footer.php';
} else {
if (!$wfdownloads_isAdmin) {
$wfdownloads->getHandler('download')->incrementHits($lid);
@@ -183,5 +183,5 @@
reportBroken($lid);
}
- include XOOPS_ROOT_PATH . '/footer.php';
+ include 'footer.php';
}
|
|
From: <des...@us...> - 2013-09-14 18:48:56
|
Revision: 12045
http://sourceforge.net/p/xoops/svn/12045
Author: designburo
Date: 2013-09-14 18:48:53 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
Added block and several other changes
Added Paths:
-----------
XoopsModules/qrcode/releases/1.1/
XoopsModules/qrcode/releases/1.1/qrcode/
XoopsModules/qrcode/releases/1.1/qrcode/admin/
XoopsModules/qrcode/releases/1.1/qrcode/admin/about.php
XoopsModules/qrcode/releases/1.1/qrcode/admin/footer.php
XoopsModules/qrcode/releases/1.1/qrcode/admin/header.php
XoopsModules/qrcode/releases/1.1/qrcode/admin/help.php
XoopsModules/qrcode/releases/1.1/qrcode/admin/index.php
XoopsModules/qrcode/releases/1.1/qrcode/admin/main.php
XoopsModules/qrcode/releases/1.1/qrcode/admin/menu.php
XoopsModules/qrcode/releases/1.1/qrcode/blocks/
XoopsModules/qrcode/releases/1.1/qrcode/blocks/blocks.php
XoopsModules/qrcode/releases/1.1/qrcode/blocks/index.html
XoopsModules/qrcode/releases/1.1/qrcode/class/
XoopsModules/qrcode/releases/1.1/qrcode/class/admin.php
XoopsModules/qrcode/releases/1.1/qrcode/class/index.html
XoopsModules/qrcode/releases/1.1/qrcode/css/
XoopsModules/qrcode/releases/1.1/qrcode/css/admin.css
XoopsModules/qrcode/releases/1.1/qrcode/css/index.html
XoopsModules/qrcode/releases/1.1/qrcode/docs/
XoopsModules/qrcode/releases/1.1/qrcode/docs/changelog.txt
XoopsModules/qrcode/releases/1.1/qrcode/docs/credits.txt
XoopsModules/qrcode/releases/1.1/qrcode/docs/index.html
XoopsModules/qrcode/releases/1.1/qrcode/docs/install.txt
XoopsModules/qrcode/releases/1.1/qrcode/docs/lang_diff.txt
XoopsModules/qrcode/releases/1.1/qrcode/docs/licence.txt
XoopsModules/qrcode/releases/1.1/qrcode/docs/readme.txt
XoopsModules/qrcode/releases/1.1/qrcode/getimage.php
XoopsModules/qrcode/releases/1.1/qrcode/images/
XoopsModules/qrcode/releases/1.1/qrcode/images/admin/
XoopsModules/qrcode/releases/1.1/qrcode/images/admin/about.png
XoopsModules/qrcode/releases/1.1/qrcode/images/admin/help.png
XoopsModules/qrcode/releases/1.1/qrcode/images/admin/home.png
XoopsModules/qrcode/releases/1.1/qrcode/images/admin/index.html
XoopsModules/qrcode/releases/1.1/qrcode/images/admin/qrcode.png
XoopsModules/qrcode/releases/1.1/qrcode/images/admin/xoopsmicrobutton.gif
XoopsModules/qrcode/releases/1.1/qrcode/images/create_contact.png
XoopsModules/qrcode/releases/1.1/qrcode/images/create_email.png
XoopsModules/qrcode/releases/1.1/qrcode/images/create_geo.png
XoopsModules/qrcode/releases/1.1/qrcode/images/create_phone.png
XoopsModules/qrcode/releases/1.1/qrcode/images/create_sms.png
XoopsModules/qrcode/releases/1.1/qrcode/images/create_txt.png
XoopsModules/qrcode/releases/1.1/qrcode/images/create_url.png
XoopsModules/qrcode/releases/1.1/qrcode/images/icons/
XoopsModules/qrcode/releases/1.1/qrcode/images/icons/index.html
XoopsModules/qrcode/releases/1.1/qrcode/images/icons/off.png
XoopsModules/qrcode/releases/1.1/qrcode/images/icons/on.png
XoopsModules/qrcode/releases/1.1/qrcode/images/logo.png
XoopsModules/qrcode/releases/1.1/qrcode/images/xoops_module_qrcode.png
XoopsModules/qrcode/releases/1.1/qrcode/index.html
XoopsModules/qrcode/releases/1.1/qrcode/language/
XoopsModules/qrcode/releases/1.1/qrcode/language/english/
XoopsModules/qrcode/releases/1.1/qrcode/language/english/admin.php
XoopsModules/qrcode/releases/1.1/qrcode/language/english/blocks.php
XoopsModules/qrcode/releases/1.1/qrcode/language/english/help/
XoopsModules/qrcode/releases/1.1/qrcode/language/english/help/help.html
XoopsModules/qrcode/releases/1.1/qrcode/language/english/help/index.html
XoopsModules/qrcode/releases/1.1/qrcode/language/english/main.php
XoopsModules/qrcode/releases/1.1/qrcode/language/english/modinfo.php
XoopsModules/qrcode/releases/1.1/qrcode/qrcode.php
XoopsModules/qrcode/releases/1.1/qrcode/templates/
XoopsModules/qrcode/releases/1.1/qrcode/templates/blocks/
XoopsModules/qrcode/releases/1.1/qrcode/templates/blocks/qrocde_block.html
XoopsModules/qrcode/releases/1.1/qrcode/templates/help.html
XoopsModules/qrcode/releases/1.1/qrcode/xoops_version.php
Added: XoopsModules/qrcode/releases/1.1/qrcode/admin/about.php
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/admin/about.php (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/admin/about.php 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,46 @@
+<?php
+/**
+ * MyModule module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package MyModule
+ * @since 2.5.0
+ * @author Mage, Mamba
+ * @version $Id $
+ **/
+
+include '../../../include/cp_header.php';
+include '../../../class/xoopsformloader.php';
+xoops_cp_header();
+include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar("dirname") . "/class/admin.php";
+
+$module_info =& $module_handler->get($xoopsModule->getVar("mid"));
+
+$module_info = '<div id="about">
+ <label>' . _AM_QRCODE_ABOUT_DESCRIPTION . '</label><text>' . $module_info->getInfo("description") . '</text><br />
+ <label>' . _AM_QRCODE_ABOUT_RELEASEDATE . '</label><text class="bold">' . $module_info->getInfo("release_date") . '</text><br />
+ <label>' . _AM_QRCODE_ABOUT_UPDATEDATE . '</label><text class="bold">' . formatTimestamp($xoopsModule->getVar("last_update"), "m") . '</text><br />
+ <label>' . _AM_QRCODE_ABOUT_MODULE_STATUS . '</label><text>' . $module_info->getInfo("module_status") . '</text><br />
+ <label>' . _AM_QRCODE_ABOUT_WEBSITE . '</label><text><a class="tooltip" href="' . $module_info->getInfo("module_website_url") . '" rel="external" title="' . $module_info->getInfo("module_website_name") . ' - ' . $module_info->getInfo("module_website_url") . '">
+ ' . $module_info->getInfo("module_website_name") . '</a></text></div>';
+
+$about_admin = new ModuleAdmin();
+$about_admin->addLabel($xoopsModule->getVar("name"));
+$about_admin->addLabel(_AM_QRCODE_ABOUT_MODULE_INFO);
+$about_admin->addLineLabel($xoopsModule->getVar("name"), '', 'VNXNVZZQP5FZJ', '', 'module');
+$about_admin->addLineLabel(_AM_QRCODE_ABOUT_MODULE_INFO, $module_info, '', '', 'information');
+$about_admin->addChangelogLabel(_AM_QRCODE_ABOUT_CHANGELOG);
+
+echo $about_admin->addNavigation('about.php');
+echo $about_admin->renderabout();
+
+include 'footer.php' ;
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.1/qrcode/admin/footer.php
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/admin/footer.php (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/admin/footer.php 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,25 @@
+<?php
+/**
+ * MyLinks module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package:: mylinks
+ * @subpackage:: admin
+ * @since: 2.5.0
+ * @author:: Magic.Shao <mag...@gm...> - Susheng Yang <ezs...@gm...>
+ * @version:: $Id $
+**/
+
+echo "<div align=\"center\"><a href=\"http://www.designburo.nl\" target=\"_blank\"><img src=\"http://designburo.nl/images/dsgnbro.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
+echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://designburo.nl' title='Visit Designburo.nl'>Designburo.nl</a></div>";
+
+xoops_cp_footer();
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.1/qrcode/admin/header.php
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/admin/header.php (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/admin/header.php 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,57 @@
+<?php
+/**
+ * MyLinks module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package:: mylinks
+ * @subpackage:: admin
+ * @since:: 2.5.0
+ * @author:: Magic.Shao <mag...@gm...> - Susheng Yang <ezs...@gm...>
+ * @version:: $Id $
+**/
+
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+include("../../../include/cp_header.php");
+include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar("dirname") . "/class/admin.php";
+
+//defined("FRAMEWORKS_ART_FUNCTIONS_INI") || include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.ini.php';
+//load_functions("admin");
+
+$myts =& MyTextSanitizer::getInstance();
+
+if ($xoopsUser) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+} else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+}
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+
+xoops_cp_header();
+
+// Define Stylesheet and JScript
+$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/css/admin.css" );
+//$xoTheme->addJavaScript( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/admin/switcher.js" );
+
+//Load languages
+xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.1/qrcode/admin/help.php
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/admin/help.php (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/admin/help.php 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,16 @@
+<?php
+// ------------------------------------------------------------------------ //
+// Author: Designburo.nl (in...@de...) //
+// http://www.designburo.nl //
+// Project: QRcode v1.0 //
+// ------------------------------------------------------------------------ //
+include '../../../include/cp_header.php';
+// if the site has no language defined, turn to English default
+if ( file_exists("../language/".$xoopsConfig['language']."/main.php") ) {
+include "../language/".$xoopsConfig['language']."/main.php"; } else { include "../language/english/main.php"; }
+$xoopsOption['template_main'] = 'help.html';
+include(XOOPS_ROOT_PATH.'/mainfile.php');
+xoops_cp_header();
+
+xoops_cp_footer();
+?>
Added: XoopsModules/qrcode/releases/1.1/qrcode/admin/index.php
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/admin/index.php (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/admin/index.php 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,39 @@
+<?php
+/**
+ * ****************************************************************************
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright XOOPS Project
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package
+ * @author
+ *
+ * Version : $Id:
+ * ****************************************************************************
+ */
+
+require_once '../../../include/cp_header.php';
+include 'header.php';
+
+
+include_once XOOPS_ROOT_PATH."/modules/" . $xoopsModule->getVar("dirname") . "/class/admin.php";
+
+ $index_admin = new ModuleAdmin();
+
+$index_admin->addConfigLabel(_AM_QRCODE_CONFIG_CHECK) ;
+$index_admin->addLineConfigLabel(_AM_QRCODE_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php') ;
+$index_admin->addLineConfigLabel(_AM_QRCODE_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops') ;
+
+ echo $index_admin->addNavigation('index.php') ;
+ echo $index_admin->renderIndex();
+
+
+include "footer.php";
+xoops_cp_footer();
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.1/qrcode/admin/main.php
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/admin/main.php (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/admin/main.php 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,331 @@
+<?php
+// ------------------------------------------------------------------------ //
+// Author: Designburo.nl (in...@de...) //
+// http://www.designburo.nl //
+// Project: QRcode v1.0 //
+// ------------------------------------------------------------------------ //
+include '../../../include/cp_header.php';
+// if the site has no language defined, turn to English default
+if ( file_exists("../language/".$xoopsConfig['language']."/main.php") ) {
+include "../language/".$xoopsConfig['language']."/main.php"; } else { include "../language/english/main.php"; }
+include(XOOPS_ROOT_PATH.'/mainfile.php');
+include_once XOOPS_ROOT_PATH."/modules/qrcode/qrcode.php";
+xoops_cp_header();
+if(isset($_POST['type']))
+{
+ switch ($_POST['type'])
+ {
+
+
+ case "phone":
+ if (!$_POST['qr_phone'])
+ {
+ $res= _QRCODE_PHONE_F_ERROR_NR;
+ }
+ else
+ {
+ $data=array();
+ $type="phone";
+ $data['phonenr'] = $_POST['qr_phone'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+ }
+ break;
+
+ case "url":
+ if (!$_POST['qr_url'])
+ {
+ $res= _QRCODE_URL_F_ERROR_URL;
+ }
+ else
+ {
+ $data=array();
+ $type="url";
+ $data['url'] = $_POST['qr_url'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+ }
+ break;
+ case "email":
+ if (!$_POST['qr_email_to'])
+ {
+ $res= _QRCODE_EMAIL_F_ERROR_EMAIL;
+ }
+ else
+ {
+ $data=array();
+ $type="email";
+ $data['email']=$_POST['qr_email_to']; // Send email to ?
+ $data['subject']=$_POST['qr_email_sub']; // Subject of the email
+ $data['txt']=$_POST['qr_email_txt']; // Body of the email
+ $res= qrcode($type,$data);
+
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+ }
+ break;
+
+ case "sms":
+ if (!$_POST['qr_sms_to'])
+ {
+ $res= _QRCODE_SMS_F_ERROR_NR;
+ }
+ else
+ {
+ $data=array();
+ $type="sms";
+ $data['phonenr']=$_POST['qr_sms_to'];
+ $data['txt']=$_POST['qr_sms_txt'];
+ $res= qrcode($type,$data);
+
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+ }
+ break;
+
+ case "txt":
+ if (!$_POST['qr_txt'])
+ {
+ $res= _QRCODE_TXT_F_ERROR_TXT;
+ }
+ else
+ {
+ $data=array();
+ $type="txt";
+ $data['txt'] = $_POST['qr_txt'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ }
+ break;
+
+ case "geo":
+
+ $data=array();
+ $type="geo";
+ $data['lat'] = $_POST['qr_latitude'];
+ $data['long'] = $_POST['qr_longtitude'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+ case "bus":
+
+ $data=array();
+ $type="contact";
+ $data['surname']=$_POST['qr_c_anaam'];
+ $data['name']=$_POST['qr_c_vnaam'];
+ $data['mobile']=$_POST['qr_c_gsm'];
+ $data['phonenr']=$_POST['qr_c_phone'];
+ $data['adres']=$_POST['qr_c_adres'];
+ $data['state']=$_POST['qr_c_state'];
+ $data['city']=$_POST['qr_c_city'];
+ $data['zipcode']=$_POST['qr_c_zip'];
+ $data['country']=$_POST['qr_c_land'];
+ $data['email']=$_POST['qr_c_email'];
+ $data['url']=$_POST['qr_c_web'];
+ $data['title']=$_POST['qr_c_functie'];
+ $data['company']=$_POST['qr_c_bedrijf'];
+ $data['b_year']=$_POST['qr_c_gjaar'];
+ $data['b_month']=$_POST['qr_c_gmaand'];
+ $data['b_day']=$_POST['qr_c_gdag'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+
+ }
+
+
+ break;
+
+}
+
+if(isset($_GET['a']))
+{
+
+ switch ($_GET['a'])
+ {
+
+ case "url":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_URL_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_url.png" border="0" title="'._QRCODE_URL_D.'"></td><td>';
+ echo '<h2>'._QRCODE_URL_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_URL_F_URL.'</td><td><input name="qr_url" id="qr_url" type="text" size="50" value="http://" /></td><td align=right><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr></table></td></tr></table>
+ </div><input type="hidden" name="type" value="url"></form></div></div></td></tr></table>';
+ break;
+
+ case "email":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_EMAIL_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_email.png" border="0" title="'._QRCODE_EMAIL_D.'"></td><td>';
+ echo '<h2>'._QRCODE_EMAIL_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_EMAIL_F_TO.'</td><td><input name="qr_email_to" type="text" size="50" /></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+ echo '<tr>
+ <td valign="middle">'._QRCODE_EMAIL_F_SUBJECT.'</td><td valign="top"><input name="qr_email_sub" type="text" size="50" /></td>
+ </tr><tr>
+ <td>'._QRCODE_EMAIL_F_TXT.'</td><td><input name="qr_email_txt" type="text" size="50" /></td>
+ </tr>
+
+ ';
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="email"></form></div></div></td></tr></table>';
+ break;
+
+ case "phone":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_PHONE_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_phone.png" border="0" title="'._QRCODE_PHONE_D.'"></td><td>';
+ echo '<h2>'._QRCODE_PHONE_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_PHONE_F_NR.'</td><td><input name="qr_phone" type="text" size="50" /></td><td align=right><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr></table></td></tr></table>
+ </div><input type="hidden" name="type" value="phone"></form></div></div></td></tr></table>';
+ break;
+
+ case "sms":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_SMS_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_sms.png" border="0" title="'._QRCODE_SMS_D.'"></td><td>';
+ echo '<h2>'._QRCODE_SMS_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_SMS_F_NR.'</td><td><input name="qr_sms_to" type="text" size="50" maxsize="140" /></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+ echo '<tr>
+ <td>'._QRCODE_SMS_F_TXT.'</td><td><input name="qr_sms_txt" type="text" size="50" /></td>
+ </tr>
+
+ ';
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="sms"></form></div></div></td></tr></table>';
+ break;
+
+ case "txt":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_TXT_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_txt.png" border="0" title="'._QRCODE_TXT_D.'"></td><td>';
+ echo '<h2>'._QRCODE_TXT_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_TXT_F_TXT.'</td><td><textarea name="qr_txt" cols="45" rows="3" /></textarea></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="txt"></form></div></div></td></tr></table>';
+ break;
+
+ case "geo":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_GEO_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_geo.png" border="0" title="'._QRCODE_GEO_D.'"></td><td>';
+ echo '<h2>'._QRCODE_GEO_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_GEO_F_LA.'</td><td><input name="qr_latitude" type="text" size="50" /></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+ echo '<tr>
+ <td>'._QRCODE_GEO_F_LO.'</td><td><input name="qr_longtitude" type="text" size="50" /></td>
+ </tr>
+
+ ';
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="geo"></form></div></div></td></tr></table>';
+ break;
+
+
+ case "bus":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_BUS_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_contact.png" border="0" title="'._QRCODE_BUS_D.'"></td><td>';
+ echo '<h2>'._QRCODE_BUS_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_BUS_F_SNAME.'</td><td><input name="qr_c_anaam" type="text" size="50" /></td><td rowspan="17"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_FNAME.'</td><td><input name="qr_c_vnaam" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_COMPANY.'</td><td><input name="qr_c_bedrijf" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_TITLE.'</td><td><input name="qr_c_functie" type="text" size="50" /></td></tr>';
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_PHONE.'</td><td><input name="qr_c_phone" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_MOB.'</td><td><input name="qr_c_gsm" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_EMAIL.'</td><td><input name="qr_c_email" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_WEB.'</td><td><input name="qr_c_web" type="text" size="50" /></td></tr>';
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_ADRES.'</td><td><input name="qr_c_adres" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_ZIP.'</td><td><input name="qr_c_zip" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_CITY.'</td><td><input name="qr_c_city" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_STATE.'</td><td><input name="qr_c_state" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_COUNTRY.'</td><td><input name="qr_c_land" type="text" size="50" /></td></tr>';
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_BDAY.'</td><td><select name="qr_c_gdag">';
+ for($rt=1;$rt<=31;$rt++){
+ echo "<option value=\"".sprintf('%02d',$rt)."\">".sprintf('%02d',$rt)."</option>\n";
+ }
+ echo '</select> / <select name="qr_c_gmaand">';
+ for($rt=1;$rt<=12;$rt++){
+ echo "<option value=\"".sprintf('%02d',$rt)."\">".sprintf('%02d',$rt)."</option>\n";
+ }
+ echo '</select> / <select name="qr_c_gjaar">';
+ for($rt=2011;$rt>=1920;$rt--){
+ echo "<option value=\"".$rt."\">".$rt."</option>\n";
+ }
+ echo '</select></td></tr>';
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="bus"></form></div></div></td></tr></table>';
+ break;
+
+ }
+
+
+
+
+}
+else {
+
+
+
+
+$module_handler =& xoops_gethandler('module');
+$versioninfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$version=$versioninfo->getInfo('version');
+$description=$versioninfo->getInfo('description');
+$author=$versioninfo->getInfo('author');
+$license=$versioninfo->getInfo('license');
+$licensefile=$versioninfo->getInfo('help');
+$status=$versioninfo->getInfo('status');
+$released=$versioninfo->getInfo('releasedate');
+echo '<div style="margin:30px;padding:10px;border:1px solid #aaa;">';
+echo '<table><tr>';
+echo '<td align="center" style="border-right:0px solid #aaa;"><img src="../images/logo.png"></td>';
+echo '<td><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_DESCRIPTION.'</h3><BR><BR></div></td></tr>';
+echo '<tr><td colspan="2"><div style="margin:30px;padding:10px;border:1px solid #aaa;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">'._QRCODE_CHOOSE;
+echo '<BR><BR><table><tr><td><a href="main.php?a=url"><img src="../images/create_url.png" border="0" title="'._QRCODE_URL_D.'"></a></td><td><a href="main.php?a=email"><img src="../images/create_email.png" border="0" title="'._QRCODE_EMAIL_D.'"></a></td><td><a href="main.php?a=phone"><img src="../images/create_phone.png" border="0" title="'._QRCODE_PHONE_D.'"></a></td><td><a href="main.php?a=sms"><img src="../images/create_sms.png" border="0" title="'._QRCODE_SMS_D.'"></a></td><td><a href="main.php?a=txt"><img src="../images/create_txt.png" border="0" title="'._QRCODE_TXT_D.'"></a></td><td><a href="main.php?a=geo"><img src="../images/create_geo.png" border="0" title="'._QRCODE_GEO_D.'"></a></td><td><a href="main.php?a=bus"><img src="../images/create_contact.png" border="0" title="'._QRCODE_BUS_D.'"></a></td></tr><tr>';
+echo '<td align="center">'._QRCODE_URL_H.'</td><td align="center">'._QRCODE_EMAIL_H.'</td><td align="center">'._QRCODE_PHONE_H.'</td><td align="center">'._QRCODE_SMS_H.'</td><td align="center">'._QRCODE_TXT_H.'</td><td align="center">'._QRCODE_GEO_H.'</td><td align="center">'._QRCODE_BUS_H.'</td></tr></table>';
+
+echo '</div></td></tr></table></div>';
+}
+xoops_cp_footer();
+?>
Added: XoopsModules/qrcode/releases/1.1/qrcode/admin/menu.php
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/admin/menu.php (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/admin/menu.php 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,28 @@
+<?php
+// ------------------------------------------------------------------------ //
+// Author: Designburo.nl (in...@de...) //
+// http://www.designburo.nl //
+// Project: QRcode v1.0 //
+// ------------------------------------------------------------------------ //
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]["title"] = _MI_QRCODE_HOME;
+$adminmenu[$i]["link"] = "admin/index.php";
+$adminmenu[$i]["icon"] = "images/admin/home.png";
+$i++;
+$adminmenu[$i]['title'] = _MI_QRCODE_NAME;
+$adminmenu[$i]['link'] = "admin/main.php";
+$adminmenu[$i]['desc'] = 'QRCodes 4 XOOPS';
+$adminmenu[$i]['icon'] = "images/admin/qrcode.png";
+$i++;
+$adminmenu[$i]["title"] = _MI_QRCODE_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["icon"] = "images/admin/about.png";
+
+// $adminmenu[2]['title'] = _MI_QRCODE_HELP;
+// $adminmenu[2]['link'] = "admin/help.php";
+// $adminmenu[2]['desc'] = 'Help on QRCode';
+// $adminmenu[2]['icon'] = "images/admin/help.png";
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.1/qrcode/blocks/blocks.php
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/blocks/blocks.php (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/blocks/blocks.php 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,41 @@
+<?php
+// ------------------------------------------------------------------------ //
+// Author: Designburo.nl (in...@de...) //
+// http://www.designburo.nl //
+// Project: QRcode v1.1 //
+// ------------------------------------------------------------------------ //
+function xurl_page()
+{
+ $pURL = 'http';
+ if ($_SERVER["HTTPS"]) {$pURL .= "s";}
+ $pURL .= "://";
+ if ($_SERVER["SERVER_PORT"] != "80")
+ {
+ $pURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
+ }
+ else
+ {
+ $pURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+ }
+ return $pURL;
+}
+
+function qrcode_edit_block($options)
+{
+ $form = _QRCODE_BLOCK_SIZE.": <input type='text' value='".$options[0]."'id='options[0]' name='options[0]' /><br /><br />";
+ return $form;
+}
+function qrcode_show($options)
+{
+ if(is_null($options[0])) $options[0]=175;
+ $dir = basename( dirname (dirname( __FILE__ ) ) ) ;
+ include_once (XOOPS_ROOT_PATH.'/modules/'.$dir.'/qrcode.php');
+ $uri = xurl_page();
+ $data=array();
+ $type="url";
+ $data['url'] = $uri;
+ $res= qrcode($type,$data,$options[0]);
+ $block['qr']=$res;
+ return $block;
+}
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.1/qrcode/blocks/index.html
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/blocks/index.html (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/blocks/index.html 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.1/qrcode/class/admin.php
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/class/admin.php (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/class/admin.php 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,337 @@
+<?php
+/**
+ * Class for admin V1.02 (20.03.2011)
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright Gregory Mage (Aka Mage)
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Gregory Mage (Aka Mage)
+ */
+
+class ModuleAdmin
+{
+
+ var $_itemButton = array();
+ var $_itemLabel = array();
+ var $_itemLineLabel = array();
+ var $_itemConfigLabel = '';
+ var $_itemLineConfigLabel = array();
+ var $_itemChangelogLabel = '';
+ var $_obj = array();
+
+ /**
+ * Constructor
+ */
+ function __construct()
+ {
+ global $xoopsModule;
+ $this->_obj =& $xoopsModule;
+ echo "<style type=\"text/css\" media=\"screen\">@import \"" . XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname', 'e') . "/css/admin.css\";</style>";
+
+ }
+
+ function addItemButton($title, $link, $icon = 'add', $extra = '')
+ {
+ $ret['title'] = $title;
+ $ret['link'] = $link;
+ $ret['icon'] = $icon . '.png';
+ $ret['extra'] = $extra;
+ $this -> _itemButton[] = $ret;
+ return true;
+
+ }
+
+ function renderButton($position = "right", $delimeter = " ")
+ {
+ $path = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/images/icons/";
+ switch ($position)
+ {
+ default:
+ case "right":
+ $ret = "<div class=\"floatright\">\n";
+ break;
+
+ case "left":
+ $ret = "<div class=\"floatleft\">\n";
+ break;
+
+ case "center":
+ $ret = "<div class=\"aligncenter\">\n";
+ }
+ $ret .= "<div class=\"xo-buttons\">\n";
+ foreach (array_keys( $this -> _itemButton) as $i) {
+ $ret .= "<a class='ui-corner-all tooltip' href='" . $this -> _itemButton[$i]['link'] . "' title='" . $this -> _itemButton[$i]['title'] . "'>";
+ $ret .= "<img src='" . $path . $this -> _itemButton[$i]['icon'] . "' title='" . $this -> _itemButton[$i]['title'] . "' />" . $this -> _itemButton[$i]['title'] . $this -> _itemButton[$i]['extra'];
+ $ret .= "</a>\n";
+ $ret .= $delimeter;
+ }
+ $ret .= "</div>\n</div>\n";
+ $ret .= "<br /> <br /><br />";
+ return $ret;
+ }
+
+ function addLabel($title)
+ {
+ $ret['title'] = $title;
+ $this -> _itemLabel[] = $ret;
+ return true;
+ }
+
+ function addLineLabel($label, $text, $value = '', $color = 'none', $type = 'default')
+ {
+ $ret['label'] = $label;
+ $line = "";
+ switch ($type)
+ {
+ default:
+ case "default":
+ $line .= sprintf($text, "<span style='color : " . $color . "; font-weight : bold;'>" . $value . "</span>");
+ break;
+
+ case "module":
+ $date = explode('/',$this->_obj->getInfo('release_date'));
+ $release_date = formatTimestamp(mktime(0, 0, 0, $date[1], $date[2], $date[0]), 's');
+ $line .= "<table>\n<tr>\n<td width=\"100px\">\n";
+ $line .= "<img src='" . XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/" . $this->_obj->getInfo('image') . "' alt='" . $this->_obj->getVar('name') . "' style='float: left; margin-right: 10px;' />\n";
+ $line .= "</td><td>\n";
+ $line .= "<div style='margin-top: 1px; margin-bottom: 4px; font-size: 18px; line-height: 18px; color: #2F5376; font-weight: bold;'>\n";
+ $line .= $this->_obj->getInfo('name') . " " . $this->_obj->getInfo('version') . " " . $this->_obj->getInfo('module_status') ;
+ $line .= "<br />\n";
+ $line .= "</div>\n";
+ $line .= "<div style='line-height: 16px; font-weight: bold;'>\n";
+ $line .= "by " . $this->_obj->getInfo('author') ;
+ if ($this->_obj->getInfo('nickname') != ''){
+ $line .= " (" . $this->_obj->getInfo('nickname') . ")\n";
+ }
+ $line .= "</div>\n";
+ $line .= "<div style='line-height: 16px;'>\n";
+
+ if ($this->_obj->getInfo('credits') != ''){
+ $line .= "Credits: " . $this->_obj->getInfo('credits') ;
+ }
+ $line .= "<br />\n";
+
+ $line .= "<a href=\"http://" . $this->_obj->getInfo('license_url') . "\" target=\"_blank\" >" . $this->_obj->getInfo('license') . "</a>\n";
+ $line .= "<br />\n";
+
+ $line .= "<a href=\"http://" . $this->_obj->getInfo('website') . "\" target=\"_blank\" >" . $this->_obj->getInfo('website') . "</a>\n";
+ $line .= "<br />\n";
+ if ($value != ''){
+ $line .= '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input type="hidden" name="cmd" value="_s-xclick">
+ <input type="hidden" name="hosted_button_id" value="' . $value . '">
+ <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" style="border-width: 0px;" name="submit" alt="PayPal - The safer, easier way to pay online!">
+ <img alt="" style="border-width: 0px; height: 1px; width: 1px;" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" />
+ </form>';
+ }
+ $line .= "</div>\n";
+ $line .= "</td>\n</tr>\n</table>\n";
+ break;
+
+ case "information":
+ $line .= $text;
+ break;
+ }
+ $ret['line'] = $line;
+ $this -> _itemLineLabel[] = $ret;
+ return true;
+ }
+
+ function renderLabel()
+ {
+ $ret = "";
+ foreach (array_keys( $this -> _itemLabel) as $i) {
+ $ret .= "<fieldset><legend class=\"label\">";
+ $ret .= $this -> _itemLabel[$i]['title'];
+ $ret .= "</legend>\n";
+ foreach (array_keys( $this -> _itemLineLabel) as $k) {
+ if ($this -> _itemLineLabel[$k]['label'] == $this -> _itemLabel[$i]['title']){
+ $ret .= $this -> _itemLineLabel[$k]['line'];
+ $ret .= "<br />";
+ }
+ }
+ $ret .= "</fieldset>\n";
+ $ret .= "<br/>\n";
+ }
+ return $ret;
+ }
+
+ function addConfigLabel($title)
+ {
+ $this -> _itemConfigLabel = $title;
+ return true;
+ }
+
+ function addLineConfigLabel($text, $value = '', $type = 'default')
+ {
+ $line = "";
+ $path = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/images/icons/";
+ switch ($type)
+ {
+ default:
+ case "default":
+ $line .= sprintf($text, "<span>" . $value . "</span>");
+ break;
+
+ case "php":
+ if (phpversion() < $value){
+ $line .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf($text, $value, phpversion()) . "</span>\n";
+ }else{
+ $line .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf($text, $value, phpversion()) . "</span>\n";
+ }
+ break;
+
+ case "xoops":
+ if (substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6) < $value){
+ $line .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf($text, $value, substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n";
+ }else{
+ $line .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf($text, $value, substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n"; }
+ break;
+
+ case "folder":
+ if (!is_dir($value)){
+ $line .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf($text[1], $value) . "</span>\n";
+ }else{
+ $line .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf($text[0], $value) . "</span>\n";
+ }
+ break;
+
+ case "chmod":
+ if (is_dir($value[0])){
+ if (substr(decoct(fileperms($value[0])),2) != $value[1]) {
+ $line .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf($text, $value[0], $value[1], substr(decoct(fileperms($value[0])),2)) . "</span>\n";
+ }else{
+ $line .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf($text, $value[0], $value[1], substr(decoct(fileperms($value[0])),2)) . "</span>\n";
+ }
+ }
+ break;
+ }
+ $this -> _itemLineConfigLabel[] = $line;
+ return true;
+ }
+
+ function addChangelogLabel($title)
+ {
+ $line = "<fieldset><legend class=\"label\">\n";
+ $line .= $title;
+ $line .= "</legend><br/>\n";
+ $line .= "<div class=\"txtchangelog\">\n";
+ $language = $GLOBALS['xoopsConfig']['language'];
+ if ( !is_file( XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/docs/changelog.txt" ) ){
+ $language = 'english';
+ }
+ $language = empty($language) ? $GLOBALS['xoopsConfig']['language'] : $language;
+ $file = XOOPS_ROOT_PATH. "/modules/" . $this->_obj->getVar("dirname") . "/docs/changelog.txt";
+ if ( is_readable( $file ) ){
+ $line .= utf8_encode(implode("<br />", file( $file ))) . "\n";
+ }
+ $line .= "</div>\n";
+ $line .= "</fieldset>\n";
+ $this -> _itemChangelogLabel = $line;
+ return true;
+ }
+
+ function addNavigation($menu = '')
+ {
+ $ret = "";
+ $path = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/";
+ $this->_obj->loadAdminMenu();
+ foreach (array_keys( $this->_obj->adminmenu) as $i) {
+ if ($this->_obj->adminmenu[$i]['link'] == "admin/" . $menu){
+ $ret = "<div class=\"CPbigTitle\" style=\"background-image: url(" . $path . $this->_obj->adminmenu[$i]['icon'] . "); background-repeat: no-repeat; background-position: left; padding-left: 50px;\">
+ <strong>" . $this->_obj->adminmenu[$i]['title'] . "</strong></div><br />";
+ }
+ }
+ return $ret;
+ }
+
+ function renderMenuIndex()
+ {
+ $path = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/";
+ $pathsystem = XOOPS_URL . "/modules/system/";
+ $this->_obj->loadAdminMenu();
+ $ret = "<div class=\"rmmenuicon\">\n";
+ foreach (array_keys( $this->_obj->adminmenu) as $i) {
+ if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php'){
+ if (isset($this->_obj->adminmenu[$i]['menu'])){
+ $ret .= "<a href=\"../" . $this->_obj->adminmenu[$i]['link'] . "\" title=\"" . $this->_obj->adminmenu[$i]['title'] . "\">" .
+ "<img src=\"" . $path . $this->_obj->adminmenu[$i]['menu'] . "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />";
+ }else{
+ $ret .= "<a href=\"../" . $this->_obj->adminmenu[$i]['link'] . "\" title=\"" . $this->_obj->adminmenu[$i]['title'] . "\">" .
+ "<img src=\"" . $path . $this->_obj->adminmenu[$i]['icon'] . "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />";
+ }
+ $ret .= "<span>" . $this->_obj->adminmenu[$i]['title'] . "</span>";
+ $ret .= "</a>";
+ }
+ }
+ if ($this->_obj->getInfo('help')) {
+ $ret .= "<a href=\"" . $pathsystem . "help.php?mid=" . $this->_obj->getVar('mid', 's') . "&" . $this->_obj->getInfo('help') . "\" title=\"" . _AM_SYSTEM_HELP . "\">" .
+ "<img width=\"32px\" src=\"" . $path . "images/admin/help.png\" alt=\"" . _AM_SYSTEM_HELP . "\" /> ";
+ $ret .= "<span>" . _AM_SYSTEM_HELP . "</span>";
+ $ret .= "</a>";
+ }
+ $ret .= "</div>\n<div style=\"clear: both;\"></div>\n";
+ return $ret;
+ }
+
+ function renderIndex()
+ {
+ $path = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/images/icons/";
+ $ret = "<table>\n<tr>\n";
+ $ret .= "<td width=\"40%\">\n";
+ $ret .= $this -> renderMenuIndex();
+ $ret .= "</td>\n";
+ $ret .= "<td width=\"60%\">\n";
+ $ret .= $this -> renderLabel();
+ $ret .= "</td>\n";
+ $ret .= "</tr>\n";
+ // If you use a config label
+ if ($this -> _itemConfigLabel != ''){
+ $ret .= "<tr>\n";
+ $ret .= "<td colspan=\"2\">\n";
+ $ret .= "<fieldset><legend class=\"label\">";
+ $ret .= $this -> _itemConfigLabel;
+ $ret .= "</legend><br/>\n";
+ foreach (array_keys( $this -> _itemLineConfigLabel) as $i) {
+ $ret .= $this -> _itemLineConfigLabel[$i];
+ $ret .= "<br />";
+ }
+ $ret .= "</fieldset>\n";
+ $ret .= "</td>\n";
+ $ret .= "</tr>\n";
+ }
+ $ret .= "</table>\n";
+
+// $ret .= "<div align=\"center\">";
+// $ret .= "<a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"" . $path . "xoopsmicrobutton.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a>";
+// $ret .= "</div>";
+
+ return $ret;
+ }
+
+ function renderAbout($type = 'default')
+ {
+ $path = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/images/icons/";
+ $ret = "<table>\n<tr>\n";
+ $ret .= "<td width=\"50%\">\n";
+ $ret .= $this -> renderLabel();
+ if ($type == 'line'){
+ $ret .= $this -> _itemChangelogLabel;
+ }else{
+ $ret .= "</td>\n";
+ $ret .= "<td width=\"50%\">\n";
+ $ret .= $this -> _itemChangelogLabel;
+ }
+ $ret .= "</td>\n";
+ $ret .= "</tr>\n";
+ $ret .= "</table>\n";
+ return $ret;
+ }
+}
+?>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.1/qrcode/class/index.html
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/class/index.html (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/class/index.html 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
Added: XoopsModules/qrcode/releases/1.1/qrcode/css/admin.css
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/css/admin.css (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/css/admin.css 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,213 @@
+@charset "UTF-8";
+/**
+ * QRCode module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package:: News
+ * @since:: 2.5.0
+ * @author: kris <http://www.xoofoo.org>
+ * @version:: $Id $
+**/
+#Slideshow_Title {
+ font-size: 20px;
+ color: #393e41;
+ height: 50px;
+ border-bottom: 1px solid #393e41;
+ margin-bottom: 5px;
+ line-height: 50px;
+ background-position: left top;
+ background-repeat: no-repeat;
+ /*text-shadow: 0 1px 0 #eee,
+ 0 2px 0 #e9e9e9,
+ 0 3px 0 #ddd,
+ 0 4px 0 #d9d9d9,
+ 0 5px 0 #ccc,
+ 0 6px 1px rgba(0,0,0,.1),
+ 0 0 5px rgba(0,0,0,.1),
+ 0 1px 3px rgba(0,0,0,.3),
+ 0 3px 5px rgba(0,0,0,.2),
+ 0 5px 10px rgba(0,0,0,.35),
+ 0 10px 10px rgba(0,0,0,.2);*/
+}
+.Slideshow_MediumTitle {
+ font-size: 14px;
+ color: #393e41;
+ /*text-shadow: 0 1px 0 #eee,
+ 0 2px 0 #e9e9e9,
+ 0 3px 0 #ddd,
+ 0 4px 0 #d9d9d9,
+ 0 5px 0 #ccc,
+ 0 6px 1px rgba(0,0,0,.1),
+ 0 0 5px rgba(0,0,0,.1),
+ 0 1px 3px rgba(0,0,0,.3),
+ 0 3px 5px rgba(0,0,0,.2),
+ 0 5px 10px rgba(0,0,0,.35),
+ 0 10px 10px rgba(0,0,0,.2);*/
+}
+/* Index page */
+#Slideshow_Index {
+ float: left;
+ padding: 0 0 0 60px;
+ background-image: url(../images/admin/index.png);
+ background-position: left top;
+ background-repeat: no-repeat;
+}
+/* Help page */
+#Slideshow_Help {
+ float: left;
+ padding: 0 0 0 60px;
+ background-image: url(../images/admin/help.png);
+ background-position: left top;
+ background-repeat: no-repeat;
+}
+/* About page */
+#Slideshow_About {
+ float: left;
+ padding: 0 0 0 60px;
+ background-image: url(../images/admin/about.png);
+ background-position: left top;
+ background-repeat: no-repeat;
+}
+#about fieldset {
+ margin: 10px;
+ padding: 5px;
+}
+#about legend {
+ margin: 0 5px;
+ padding: 0 5px 8px 5px;
+}
+#about label, #about text {
+ display: block;
+ float: left;
+ margin-bottom: 12px;
+}
+#about label {
+ text-align: right;
+ width: 200px;
+ padding-right: 20px;
+}
+#about br { clear: both;}
+#about .txtchangelog { height:350px; overflow:auto;}
+
+fieldset p { margin-bottom: .5em;}
+
+#myid {}
+
+/* Buttons style */
+.xo-buttons a, .xo-buttons button{
+ display:block-inline;
+ margin:0 5px 0 0;
+ background: #e4e4e5 url('../images/admin/bg_button.gif') repeat-x;
+ border:1px solid #d6d6d6;
+ border-top:1px solid #dedede;
+ border-left:1px solid #dedede;
+ font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+ font-size:100%;
+ line-height:110%;
+ text-decoration:none;
+ font-weight:bold;
+ color:#454545;
+ cursor:pointer;
+ padding:3px 8px 4px 5px; /* Links */
+}
+.xo-buttons a:hover, .xo-buttons button:hover {
+ border:1px solid #ccc;
+ border-top:1px solid #d6d6d6;
+ border-left:1px solid #d6d6d6;
+}
+.xo-buttons button{
+ width:auto;
+ overflow:visible;
+ padding:3px 8px 4px 5px; /* IE6 */
+}
+.xo-buttons button[type]{
+ padding:3px 5px 4px 5px; /* Firefox */
+ line-height:15px; /* Safari */
+}
+*:first-child+html button[type]{
+ padding:3px 8px 4px 5px; /* IE7 */
+}
+.xo-buttons button img, .xo-buttons a img{
+ margin:0 3px -3px 0 !important;
+ padding:0;
+ border:none;
+ width:16px;
+ height:16px;
+}
+.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; }
+/* Buttons style */
+
+/* align */
+.floatright{ float:right; margin:0; padding:2px; border:0; }
+.floatleft{ float:left; margin:0; padding:2px; border:0; }
+.aligncenter{ text-align:center; margin:0; padding:2px; border:0; }
+/* align */
+
+/* label */
+.label{font-size: 16px; color: #2F5376; font-weight: bold;}
+
+/* label */
+
+/* menu */
+div.rmmenuicon{
+ margin: 3px;
+ font-family: Tahoma, Arial, Helvetica;
+ text-align: center;
+}
+div.rmmenuicon a {
+ display: block; float: left;
+ height: 75px !important;
+ height: 75px;
+ width: 75px !important;
+ width: 75px;
+ vertical-align: middle;
+ text-decoration : none;
+ border: 1px solid #CCCCCC;
+ padding: 2px 5px 1px 5px;
+ margin: 3px;
+ color: #666666;
+
+ background-color: #f0f0f0;
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ -khtml-border-radius: 6px;
+ border-radius: 6px;
+
+
+}
+div.rmmenuicon img { margin-top: 8px; margin-bottom: 8px; }
+div.rmmenuicon a span {
+ font-size: 11px;
+ font-weight: bold;
+ display: block;
+}
+div.rmmenuicon a:hover{
+ background-color: #FFF6C1;
+ border: 1px solid #FF9900;
+ color: #1E90FF;
+}
+div.rmmenuicon a:hover span{
+ text-decoration: none;
+}
+
+div.CPbigTitle{
+ font-size: 12px;
+ color: #606060;
+ background: no-repeat left top;
+ font-weight: bold;
+ height: 30px;
+ vertical-align: middle;
+ padding: 5px 0 0 40px;
+ border-bottom: 1px solid #393e41;
+}
+/* menu */
+
+.txtchangelog { height:350px; overflow:auto;}
Added: XoopsModules/qrcode/releases/1.1/qrcode/css/index.html
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/css/index.html (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/css/index.html 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.1/qrcode/docs/changelog.txt
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/docs/changelog.txt (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/docs/changelog.txt 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,24 @@
+Changelog
+======================
+
+v1.1
+============
++ added block to show QRCode of current page. Size of the image can be set in the block options (Designburo)
++ now creates qrcode locally, not from external file (as per request) (Designburo)
++ Should now be able to install multiple copies of the module (in case anyone would want to) (Designburo)
+
+
+v1.01
+============
++ added qrcode generator wizard in admin area (Designburo)
+
+
+v1.00
+============
++ converted to XOOPS 2.5.0 Admin GUI (Mamba)
+
+
+v1.00
+============
+
+First official release by Designburo.nl (Designburo)
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.1/qrcode/docs/credits.txt
===================================================================
--- XoopsModules/qrcode/releases/1.1/qrcode/docs/credits.txt (rev 0)
+++ XoopsModules/qrcode/releases/1.1/qrcode/docs/credits.txt 2013-09-14 18:48:53 UTC (rev 12045)
@@ -0,0 +1,6 @@
+Credits
+=============
+
+Following are people who have helped during the development of this module:
+
+- Mamba for setting up 2.5.x compatibility
\ No newline at end of file
Added: XoopsModules/qrcode/releases/1.1/qrcode/docs/index.html
===================================================================
--- XoopsModules/qrcode/releases/1.1/qr...
[truncated message content] |
|
From: <be...@us...> - 2013-09-14 18:07:54
|
Revision: 12044
http://sourceforge.net/p/xoops/svn/12044
Author: beckmi
Date: 2013-09-14 18:07:51 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
bugs: 1227 and 1278
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/search.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/mailusers/main.php
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 16:40:18 UTC (rev 12043)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 18:07:51 UTC (rev 12044)
@@ -4,10 +4,13 @@
2013/05/08: Version 2.5.7 Beta 1
===============================
Bugfixes:
-- ID: 1269 Block template file will not updated after update the module (irmtfan)
- ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec)
+- ID: 1227 Sorting bug in Profile module search (Zyspec)
+- ID: 1269 Block template file will not updated after update the module (irmtfan)
+- ID: 1270 template issue in email notifications (changed X_ITEM_TILE to X_ITEM_NAME) (alain01/slider84/mamba)
+- ID: 1278 _AM_SENDMTOUSERS missed (Mowaffaq/mamba)
+- ID: 1285 check if session exists before attempting to start a new one (wishcraft)
- ID: 1287 assigning "static" to various class methods (wishcraft/mamba)
-- ID: 1285 check if session exists before attempting to start a new one (wishcraft)
- reversing fix for potential lack of rendering css and javascript in Installer on the last screen by culex
- removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
@@ -31,9 +34,7 @@
- bug in commentrenderer.php (Roby73/irmtfan)
- added missing info about new language constants in Fast Comments (irmtfan/mamba)
- fixed Undefined index: uid in file /modules/profile/userinfo.php line 24 (cesag/mamba)
-- fixed template issue in email notifications (changed X_ITEM_TILE to X_ITEM_NAME) (alain01/slider84/mamba)
-
Updated:
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/search.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/search.php 2013-09-14 16:40:18 UTC (rev 12043)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/search.php 2013-09-14 18:07:51 UTC (rev 12044)
@@ -342,14 +342,32 @@
}
}
- if ($_REQUEST['sortby'] == "name") {
- $criteria->setSort("name");
- } else if ($_REQUEST['sortby'] == "email") {
- $criteria->setSort("email");
- } else if ($_REQUEST['sortby'] == "uname") {
- $criteria->setSort("uname");
- } else if (isset($fields[$_REQUEST['sortby']])) {
- $criteria->setSort($fields[$_REQUEST['sortby']]->getVar('field_name'));
+// if ($_REQUEST['sortby'] == "name") {
+// $criteria->setSort("name");
+// } else if ($_REQUEST['sortby'] == "email") {
+// $criteria->setSort("email");
+// } else if ($_REQUEST['sortby'] == "uname") {
+// $criteria->setSort("uname");
+// } else if (isset($fields[$_REQUEST['sortby']])) {
+// $criteria->setSort($fields[$_REQUEST['sortby']]->getVar('field_name'));
+// }
+
+// change by zyspec:
+ $sortby = 'uname';
+ if (!empty($_REQUEST['sortby'])) {
+ switch ($_REQUEST['sortby']) {
+ case 'name':
+ case 'email':
+ case 'uname':
+ $sortby = $_REQUEST['sortby'];
+ break;
+ default:
+ if (isset($fields[$_REQUEST['sortby']])) {
+ $sortby = $fields[$_REQUEST['sortby']]->getVar('field_name');
+ }
+ break;
+ }
+ $criteria->setSort($sortby);
}
// add search groups , only for Webmasters
@@ -403,7 +421,9 @@
if ($total_users > $limit) {
$search_url[] = "op=results";
$search_url[] = "order=" . $order;
- $search_url[] = "sortby=" . htmlspecialchars($_REQUEST['sortby']);
+//TODO remove it for final release
+// $search_url[] = "sortby=" . htmlspecialchars($_REQUEST['sortby']);
+ $search_url[] = "sortby=" . htmlspecialchars($sortby); // change by zyspec
$search_url[] = "limit=" . $limit;
if (isset($search_url)) {
$args = implode("&", $search_url);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/mailusers/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/mailusers/main.php 2013-09-14 16:40:18 UTC (rev 12043)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/mailusers/main.php 2013-09-14 18:07:51 UTC (rev 12044)
@@ -263,7 +263,7 @@
//echo $xoopsMailer->getErrors();
if ( $count_criteria > $limit ) {
- $form = new XoopsThemeForm(_AM_SENDMTOUSERS, "mailusers", "admin.php?fct=mailusers", 'post', true);
+ $form = new XoopsThemeForm(_AM_SYSTEM_MAILUSERS_LIST, "mailusers", "admin.php?fct=mailusers", 'post', true);
if ( !empty($_POST['mail_to_group']) ) {
foreach ( $_POST['mail_to_group'] as $mailgroup) {
$group_hidden = new XoopsFormHidden("mail_to_group[]", $mailgroup);
|
8 messages has been excluded from this view by a project administrator.
;){kind=link}
