xoops-svn — All SVN commits will be posted to this ML

[xoops-svn] SF.net SVN: xoops-svn:[12392] XoopsModules/moduleinstaller/releases/1.0/

[<be...@us...>]

Revision: 12392
          http://sourceforge.net/p/xoops/svn/12392
Author:   beckmi
Date:     2014-03-19 09:10:05 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------


Added Paths:
-----------
    XoopsModules/moduleinstaller/releases/1.0/

[xoops-svn] SF.net SVN: xoops-svn:[12391] ThirdParty/xoopseditor/trunk/htdocs/class/ xoopseditor/tinymce4/tinymce

[<be...@us...>]

Revision: 12391
          http://sourceforge.net/p/xoops/svn/12391
Author:   beckmi
Date:     2014-03-19 08:25:30 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
Update to Version 4.0.20

Modified Paths:
--------------
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/advlist/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/anchor/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/bbcode/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/directionality/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/hr/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/layer/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/legacyoutput/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/pagebreak/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/preview/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/save/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/searchreplace/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/spellchecker/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/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/visualchars/plugin.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	2014-03-18 21:02:55 UTC (rev 12390)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt	2014-03-19 08:25:30 UTC (rev 12391)
@@ -1,3 +1,31 @@
+Version 4.0.20 (2014-03-18)
+	Fixed so all unit tests can be executed in a headless phantomjs instance for CI testing.
+	Fixed so directionality setting gets applied to the preview dialog as well as the editor body element.
+	Fixed a performance issue with the "is" method in DOMUtils. Patch contributed by Paul Bosselaar.
+	Fixed bug where paste plugin wouldn't paste plain text properly when pasting using browser menus.
+	Fixed bug where focusable SVG elements would throw an error since className isn't a proper string.
+	Fixed bug where the preview plugin didn't properly support the document_base_url setting.
+	Fixed bug where the focusedEditor wouldn't be set to null when that editor was removed.
+	Fixed bug where Gecko would throw an exception when editors where removed.
+	Fixed bug where the FocusManager wouldn't handle selection restoration properly on older IE versions.
+	Fixed bug where the searchreplace plugin would produce an exception on very specific multiple searches.
+	Fixed bug where some events wasn't properly unbound when all editors where removed from page.
+	Fixed bug where tapping links on iOS 7.1 would open the link instead of placing the caret inside.
+	Fixed bug where holding the finger down on iOS 7.1 would open the link/image callout menu.
+	Fixed so the jQuery plugin returns null when getting the the tinymce instance of an element before it's initialized.
+	Fixed so selection normalization gets executed more often to reduce incorrect UI states on Gecko.
+	Fixed so the default action of closing the window on a form submission can be prevented using "preventDefault".
+Version 4.0.19 (2014-03-11)
+	Added support for CSS selector expressions in object_resizing option. Allows you to control what to resize.
+	Added addToTop compatibility to compat3x plugin enables more legacy 3.x plugins to work properly.
+	Fixed bug on IE where it wasn't possible to align images when they where floated left.
+	Fixed bug where the indent/outdent buttons was enabled though readonly mode was enabled.
+	Fixed bug where the nodeChanged event was fired when readonly mode was enabled.
+	Fixed bug where events like blur could be fired to editor instances that where manually removed on IE 11.
+	Fixed bug where IE 11 would move focus to menubar/toolbar when using the tab key in a form with an editor.
+	Fixed bug where drag/drop in Safari on Mac didn't work properly due to lack of support for modern dataTransfer object.
+	Fixed bug where the remove event wasn't properly executed when the editor instances where removed.
+	Fixed bug where the selection change handler on inline editors would fail if the editor instance was removed.
 Version 4.0.18 (2014-02-27)
 	Fixed bug where images would get class false/undefined when initially created.
 Version 4.0.17 (2014-02-26)

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/advlist/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/advlist/plugin.min.js	2014-03-18 21:02:55 UTC (rev 12390)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/advlist/plugin.min.js	2014-03-19 08:25:30 UTC (rev 12391)
@@ -1 +1 @@
-tinymce.PluginManager.add("advlist",function(t){function e(t,e){var n=[];return tinymce.each(e.split(/[ ,]/),function(t){n.push({text:t.replace(/\-/g," ").replace(/\b\w/g,function(t){return t.toUpperCase()}),data:"default"==t?"":t})}),n}function n(e,n){var i,r=t.dom,a=t.selection;i=r.getParent(a.getNode(),"ol,ul"),i&&i.nodeName==e&&n!==!1||t.execCommand("UL"==e?"InsertUnorderedList":"InsertOrderedList"),n=n===!1?o[e]:n,o[e]=n,i=r.getParent(a.getNode(),"ol,ul"),i&&(r.setStyle(i,"listStyleType",n),i.removeAttribute("data-mce-style")),t.focus()}function i(e){var n=t.dom.getStyle(t.dom.getParent(t.selection.getNode(),"ol,ul"),"listStyleType")||"";e.control.items().each(function(t){t.active(t.settings.data===n)})}var r,a,o={};r=e("OL",t.getParam("advlist_number_styles","default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman")),a=e("UL",t.getParam("advlist_bullet_styles","default,circle,disc,square")),t.addButton("numlist",{type:"splitbutton",tooltip:"Numbered list",menu:r,onshow:i,onselect:function(t){n("OL",t.control.settings.data)},onclick:function(){n("OL",!1)}}),t.addButton("bullist",{type:"splitbutton",tooltip:"Bullet list",menu:a,onshow:i,onselect:function(t){n("UL",t.control.settings.data)},onclick:function(){n("UL",!1)}})});
\ No newline at end of file
+tinymce.PluginManager.add("advlist",function(t){function e(t,e){var n=[];return tinymce.each(e.split(/[ ,]/),function(t){n.push({text:t.replace(/\-/g," ").replace(/\b\w/g,function(t){return t.toUpperCase()}),data:"default"==t?"":t})}),n}function n(e,n){var o,l=t.dom,a=t.selection;o=l.getParent(a.getNode(),"ol,ul"),o&&o.nodeName==e&&n!==!1||t.execCommand("UL"==e?"InsertUnorderedList":"InsertOrderedList"),n=n===!1?i[e]:n,i[e]=n,o=l.getParent(a.getNode(),"ol,ul"),o&&(l.setStyle(o,"listStyleType",n),o.removeAttribute("data-mce-style")),t.focus()}function o(e){var n=t.dom.getStyle(t.dom.getParent(t.selection.getNode(),"ol,ul"),"listStyleType")||"";e.control.items().each(function(t){t.active(t.settings.data===n)})}var l,a,i={};l=e("OL",t.getParam("advlist_number_styles","default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman")),a=e("UL",t.getParam("advlist_bullet_styles","default,circle,disc,square")),t.addButton("numlist",{type:"splitbutton",tooltip:"Numbered list",menu:l,onshow:o,onselect:function(t){n("OL",t.control.settings.data)},onclick:function(){n("OL",!1)}}),t.addButton("bullist",{type:"splitbutton",tooltip:"Bullet list",menu:a,onshow:o,onselect:function(t){n("UL",t.control.settings.data)},onclick:function(){n("UL",!1)}})});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/anchor/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/anchor/plugin.min.js	2014-03-18 21:02:55 UTC (rev 12390)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/anchor/plugin.min.js	2014-03-19 08:25:30 UTC (rev 12391)
@@ -1 +1 @@
-tinymce.PluginManager.add("anchor",function(e){function t(){var t=e.selection.getNode();e.windowManager.open({title:"Anchor",body:{type:"textbox",name:"name",size:40,label:"Name",value:t.name||t.id},onsubmit:function(t){e.execCommand("mceInsertContent",!1,e.dom.createHTML("a",{id:t.data.name}))}})}e.addButton("anchor",{icon:"anchor",tooltip:"Anchor",onclick:t,stateSelector:"a:not([href])"}),e.addMenuItem("anchor",{icon:"anchor",text:"Anchor",context:"insert",onclick:t})});
\ No newline at end of file
+tinymce.PluginManager.add("anchor",function(n){function e(){var e=n.selection.getNode();n.windowManager.open({title:"Anchor",body:{type:"textbox",name:"name",size:40,label:"Name",value:e.name||e.id},onsubmit:function(e){n.execCommand("mceInsertContent",!1,n.dom.createHTML("a",{id:e.data.name}))}})}n.addButton("anchor",{icon:"anchor",tooltip:"Anchor",onclick:e,stateSelector:"a:not([href])"}),n.addMenuItem("anchor",{icon:"anchor",text:"Anchor",context:"insert",onclick:e})});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/bbcode/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/bbcode/plugin.min.js	2014-03-18 21:02:55 UTC (rev 12390)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/bbcode/plugin.min.js	2014-03-19 08:25:30 UTC (rev 12391)
@@ -1 +1 @@
-!function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(e){var t=this,n=e.getParam("bbcode_dialect","punbb").toLowerCase();e.on("beforeSetContent",function(e){e.content=t["_"+n+"_bbcode2html"](e.content)}),e.on("postProcess",function(e){e.set&&(e.content=t["_"+n+"_bbcode2html"](e.content)),e.get&&(e.content=t["_"+n+"_html2bbcode"](e.content))})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://www.tinymce.com",infourl:"http://www.tinymce.com/wiki.php/Plugin:bbcode"}},_punbb_html2bbcode:function(e){function t(t,n){e=e.replace(t,n)}return e=tinymce.trim(e),t(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]"),t(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"),t(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"),t(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"),t(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"),t(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]"),t(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]"),t(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]"),t(/<font>(.*?)<\/font>/gi,"$1"),t(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]"),t(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]"),t(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]"),t(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]"),t(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]"),t(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]"),t(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]"),t(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]"),t(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]"),t(/<\/(strong|b)>/gi,"[/b]"),t(/<(strong|b)>/gi,"[b]"),t(/<\/(em|i)>/gi,"[/i]"),t(/<(em|i)>/gi,"[i]"),t(/<\/u>/gi,"[/u]"),t(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]"),t(/<u>/gi,"[u]"),t(/<blockquote[^>]*>/gi,"[quote]"),t(/<\/blockquote>/gi,"[/quote]"),t(/<br \/>/gi,"\n"),t(/<br\/>/gi,"\n"),t(/<br>/gi,"\n"),t(/<p>/gi,""),t(/<\/p>/gi,"\n"),t(/&nbsp;|\u00a0/gi," "),t(/&quot;/gi,'"'),t(/&lt;/gi,"<"),t(/&gt;/gi,">"),t(/&amp;/gi,"&"),e},_punbb_bbcode2html:function(e){function t(t,n){e=e.replace(t,n)}return e=tinymce.trim(e),t(/\n/gi,"<br />"),t(/\[b\]/gi,"<strong>"),t(/\[\/b\]/gi,"</strong>"),t(/\[i\]/gi,"<em>"),t(/\[\/i\]/gi,"</em>"),t(/\[u\]/gi,"<u>"),t(/\[\/u\]/gi,"</u>"),t(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>'),t(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>'),t(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />'),t(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>'),t(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;'),t(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;'),e}}),tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)}();
\ No newline at end of file
+!function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(o){var e=this,t=o.getParam("bbcode_dialect","punbb").toLowerCase();o.on("beforeSetContent",function(o){o.content=e["_"+t+"_bbcode2html"](o.content)}),o.on("postProcess",function(o){o.set&&(o.content=e["_"+t+"_bbcode2html"](o.content)),o.get&&(o.content=e["_"+t+"_html2bbcode"](o.content))})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://www.tinymce.com",infourl:"http://www.tinymce.com/wiki.php/Plugin:bbcode"}},_punbb_html2bbcode:function(o){function e(e,t){o=o.replace(e,t)}return o=tinymce.trim(o),e(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]"),e(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"),e(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"),e(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"),e(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"),e(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]"),e(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]"),e(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]"),e(/<font>(.*?)<\/font>/gi,"$1"),e(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]"),e(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]"),e(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]"),e(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]"),e(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]"),e(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]"),e(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]"),e(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]"),e(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]"),e(/<\/(strong|b)>/gi,"[/b]"),e(/<(strong|b)>/gi,"[b]"),e(/<\/(em|i)>/gi,"[/i]"),e(/<(em|i)>/gi,"[i]"),e(/<\/u>/gi,"[/u]"),e(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]"),e(/<u>/gi,"[u]"),e(/<blockquote[^>]*>/gi,"[quote]"),e(/<\/blockquote>/gi,"[/quote]"),e(/<br \/>/gi,"\n"),e(/<br\/>/gi,"\n"),e(/<br>/gi,"\n"),e(/<p>/gi,""),e(/<\/p>/gi,"\n"),e(/&nbsp;|\u00a0/gi," "),e(/&quot;/gi,'"'),e(/&lt;/gi,"<"),e(/&gt;/gi,">"),e(/&amp;/gi,"&"),o},_punbb_bbcode2html:function(o){function e(e,t){o=o.replace(e,t)}return o=tinymce.trim(o),e(/\n/gi,"<br />"),e(/\[b\]/gi,"<strong>"),e(/\[\/b\]/gi,"</strong>"),e(/\[i\]/gi,"<em>"),e(/\[\/i\]/gi,"</em>"),e(/\[u\]/gi,"<u>"),e(/\[\/u\]/gi,"</u>"),e(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>'),e(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>'),e(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />'),e(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>'),e(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;'),e(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;'),o}}),tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)}();
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/directionality/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/directionality/plugin.min.js	2014-03-18 21:02:55 UTC (rev 12390)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/directionality/plugin.min.js	2014-03-19 08:25:30 UTC (rev 12391)
@@ -1 +1 @@
-tinymce.PluginManager.add("directionality",function(e){function t(t){var n,i=e.dom,a=e.selection.getSelectedBlocks();a.length&&(n=i.getAttrib(a[0],"dir"),tinymce.each(a,function(e){i.getParent(e.parentNode,"*[dir='"+t+"']",i.getRoot())||(n!=t?i.setAttrib(e,"dir",t):i.setAttrib(e,"dir",null))}),e.nodeChanged())}function n(e){var t=[];return tinymce.each("h1 h2 h3 h4 h5 h6 div p".split(" "),function(n){t.push(n+"[dir="+e+"]")}),t.join(",")}e.addCommand("mceDirectionLTR",function(){t("ltr")}),e.addCommand("mceDirectionRTL",function(){t("rtl")}),e.addButton("ltr",{title:"Left to right",cmd:"mceDirectionLTR",stateSelector:n("ltr")}),e.addButton("rtl",{title:"Right to left",cmd:"mceDirectionRTL",stateSelector:n("rtl")})});
\ No newline at end of file
+tinymce.PluginManager.add("directionality",function(t){function e(e){var i,n=t.dom,r=t.selection.getSelectedBlocks();r.length&&(i=n.getAttrib(r[0],"dir"),tinymce.each(r,function(t){n.getParent(t.parentNode,"*[dir='"+e+"']",n.getRoot())||(i!=e?n.setAttrib(t,"dir",e):n.setAttrib(t,"dir",null))}),t.nodeChanged())}function i(t){var e=[];return tinymce.each("h1 h2 h3 h4 h5 h6 div p".split(" "),function(i){e.push(i+"[dir="+t+"]")}),e.join(",")}t.addCommand("mceDirectionLTR",function(){e("ltr")}),t.addCommand("mceDirectionRTL",function(){e("rtl")}),t.addButton("ltr",{title:"Left to right",cmd:"mceDirectionLTR",stateSelector:i("ltr")}),t.addButton("rtl",{title:"Right to left",cmd:"mceDirectionRTL",stateSelector:i("rtl")})});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/hr/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/hr/plugin.min.js	2014-03-18 21:02:55 UTC (rev 12390)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/hr/plugin.min.js	2014-03-19 08:25:30 UTC (rev 12391)
@@ -1 +1 @@
-tinymce.PluginManager.add("hr",function(e){e.addCommand("InsertHorizontalRule",function(){e.execCommand("mceInsertContent",!1,"<hr />")}),e.addButton("hr",{icon:"hr",tooltip:"Horizontal line",cmd:"InsertHorizontalRule"}),e.addMenuItem("hr",{icon:"hr",text:"Horizontal line",cmd:"InsertHorizontalRule",context:"insert"})});
\ No newline at end of file
+tinymce.PluginManager.add("hr",function(n){n.addCommand("InsertHorizontalRule",function(){n.execCommand("mceInsertContent",!1,"<hr />")}),n.addButton("hr",{icon:"hr",tooltip:"Horizontal line",cmd:"InsertHorizontalRule"}),n.addMenuItem("hr",{icon:"hr",text:"Horizontal line",cmd:"InsertHorizontalRule",context:"insert"})});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/layer/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/layer/plugin.min.js	2014-03-18 21:02:55 UTC (rev 12390)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/layer/plugin.min.js	2014-03-19 08:25:30 UTC (rev 12391)
@@ -1 +1 @@
-tinymce.PluginManager.add("layer",function(e){function t(e){do if(e.className&&-1!=e.className.indexOf("mceItemLayer"))return e;while(e=e.parentNode)}function n(t){var n=e.dom;tinymce.each(n.select("div,p",t),function(e){/^(absolute|relative|fixed)$/i.test(e.style.position)&&(e.hasVisual?n.addClass(e,"mceItemVisualAid"):n.removeClass(e,"mceItemVisualAid"),n.addClass(e,"mceItemLayer"))})}function i(n){var i,o,a=[],r=t(e.selection.getNode()),l=-1,s=-1;for(o=[],tinymce.walk(e.getBody(),function(e){1==e.nodeType&&/^(absolute|relative|static)$/i.test(e.style.position)&&o.push(e)},"childNodes"),i=0;i<o.length;i++)a[i]=o[i].style.zIndex?parseInt(o[i].style.zIndex,10):0,0>l&&o[i]==r&&(l=i);if(0>n){for(i=0;i<a.length;i++)if(a[i]<a[l]){s=i;break}s>-1?(o[l].style.zIndex=a[s],o[s].style.zIndex=a[l]):a[l]>0&&(o[l].style.zIndex=a[l]-1)}else{for(i=0;i<a.length;i++)if(a[i]>a[l]){s=i;break}s>-1?(o[l].style.zIndex=a[s],o[s].style.zIndex=a[l]):o[l].style.zIndex=a[l]+1}e.execCommand("mceRepaint")}function o(){var t=e.dom,n=t.getPos(t.getParent(e.selection.getNode(),"*")),i=e.getBody();e.dom.add(i,"div",{style:{position:"absolute",left:n.x,top:n.y>20?n.y:20,width:100,height:100},"class":"mceItemVisualAid mceItemLayer"},e.selection.getContent()||e.getLang("layer.content")),tinymce.Env.ie&&t.setHTML(i,i.innerHTML)}function a(){var n=t(e.selection.getNode());n||(n=e.dom.getParent(e.selection.getNode(),"DIV,P,IMG")),n&&("absolute"==n.style.position.toLowerCase()?(e.dom.setStyles(n,{position:"",left:"",top:"",width:"",height:""}),e.dom.removeClass(n,"mceItemVisualAid"),e.dom.removeClass(n,"mceItemLayer")):(n.style.left||(n.style.left="20px"),n.style.top||(n.style.top="20px"),n.style.width||(n.style.width=n.width?n.width+"px":"100px"),n.style.height||(n.style.height=n.height?n.height+"px":"100px"),n.style.position="absolute",e.dom.setAttrib(n,"data-mce-style",""),e.addVisual(e.getBody())),e.execCommand("mceRepaint"),e.nodeChanged())}e.addCommand("mceInsertLayer",o),e.addCommand("mceMoveForward",function(){i(1)}),e.addCommand("mceMoveBackward",function(){i(-1)}),e.addCommand("mceMakeAbsolute",function(){a()}),e.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"}),e.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"}),e.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"}),e.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"}),e.on("init",function(){tinymce.Env.ie&&e.getDoc().execCommand("2D-Position",!1,!0)}),e.on("mouseup",function(n){var i=t(n.target);i&&e.dom.setAttrib(i,"data-mce-style","")}),e.on("mousedown",function(n){var i,o=n.target,a=e.getDoc();tinymce.Env.gecko&&(t(o)?"on"!==a.designMode&&(a.designMode="on",o=a.body,i=o.parentNode,i.removeChild(o),i.appendChild(o)):"on"==a.designMode&&(a.designMode="off"))}),e.on("NodeChange",n)});
\ No newline at end of file
+tinymce.PluginManager.add("layer",function(e){function t(e){do if(e.className&&-1!=e.className.indexOf("mceItemLayer"))return e;while(e=e.parentNode)}function o(t){var o=e.dom;tinymce.each(o.select("div,p",t),function(e){/^(absolute|relative|fixed)$/i.test(e.style.position)&&(e.hasVisual?o.addClass(e,"mceItemVisualAid"):o.removeClass(e,"mceItemVisualAid"),o.addClass(e,"mceItemLayer"))})}function d(o){var d,n,a=[],i=t(e.selection.getNode()),s=-1,l=-1;for(n=[],tinymce.walk(e.getBody(),function(e){1==e.nodeType&&/^(absolute|relative|static)$/i.test(e.style.position)&&n.push(e)},"childNodes"),d=0;d<n.length;d++)a[d]=n[d].style.zIndex?parseInt(n[d].style.zIndex,10):0,0>s&&n[d]==i&&(s=d);if(0>o){for(d=0;d<a.length;d++)if(a[d]<a[s]){l=d;break}l>-1?(n[s].style.zIndex=a[l],n[l].style.zIndex=a[s]):a[s]>0&&(n[s].style.zIndex=a[s]-1)}else{for(d=0;d<a.length;d++)if(a[d]>a[s]){l=d;break}l>-1?(n[s].style.zIndex=a[l],n[l].style.zIndex=a[s]):n[s].style.zIndex=a[s]+1}e.execCommand("mceRepaint")}function n(){var t=e.dom,o=t.getPos(t.getParent(e.selection.getNode(),"*")),d=e.getBody();e.dom.add(d,"div",{style:{position:"absolute",left:o.x,top:o.y>20?o.y:20,width:100,height:100},"class":"mceItemVisualAid mceItemLayer"},e.selection.getContent()||e.getLang("layer.content")),tinymce.Env.ie&&t.setHTML(d,d.innerHTML)}function a(){var o=t(e.selection.getNode());o||(o=e.dom.getParent(e.selection.getNode(),"DIV,P,IMG")),o&&("absolute"==o.style.position.toLowerCase()?(e.dom.setStyles(o,{position:"",left:"",top:"",width:"",height:""}),e.dom.removeClass(o,"mceItemVisualAid"),e.dom.removeClass(o,"mceItemLayer")):(o.style.left||(o.style.left="20px"),o.style.top||(o.style.top="20px"),o.style.width||(o.style.width=o.width?o.width+"px":"100px"),o.style.height||(o.style.height=o.height?o.height+"px":"100px"),o.style.position="absolute",e.dom.setAttrib(o,"data-mce-style",""),e.addVisual(e.getBody())),e.execCommand("mceRepaint"),e.nodeChanged())}e.addCommand("mceInsertLayer",n),e.addCommand("mceMoveForward",function(){d(1)}),e.addCommand("mceMoveBackward",function(){d(-1)}),e.addCommand("mceMakeAbsolute",function(){a()}),e.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"}),e.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"}),e.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"}),e.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"}),e.on("init",function(){tinymce.Env.ie&&e.getDoc().execCommand("2D-Position",!1,!0)}),e.on("mouseup",function(o){var d=t(o.target);d&&e.dom.setAttrib(d,"data-mce-style","")}),e.on("mousedown",function(o){var d,n=o.target,a=e.getDoc();tinymce.Env.gecko&&(t(n)?"on"!==a.designMode&&(a.designMode="on",n=a.body,d=n.parentNode,d.removeChild(n),d.appendChild(n)):"on"==a.designMode&&(a.designMode="off"))}),e.on("NodeChange",o)});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/legacyoutput/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/legacyoutput/plugin.min.js	2014-03-18 21:02:55 UTC (rev 12390)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/legacyoutput/plugin.min.js	2014-03-19 08:25:30 UTC (rev 12391)
@@ -1 +1 @@
-!function(e){e.on("AddEditor",function(e){e.editor.settings.inline_styles=!1}),e.PluginManager.add("legacyoutput",function(t){t.on("init",function(){var n="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",i=e.explode(t.settings.font_size_style_values),o=t.schema;t.formatter.register({alignleft:{selector:n,attributes:{align:"left"}},aligncenter:{selector:n,attributes:{align:"center"}},alignright:{selector:n,attributes:{align:"right"}},alignjustify:{selector:n,attributes:{align:"justify"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:!0}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:!0}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(t){return e.inArray(i,t.value)+1}}},forecolor:{inline:"font",attributes:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}}),e.each("b,i,u,strike".split(","),function(e){o.addValidElements(e+"[*]")}),o.getElementRule("font")||o.addValidElements("font[face|size|color|style]"),e.each(n.split(","),function(e){var t=o.getElementRule(e);t&&(t.attributes.align||(t.attributes.align={},t.attributesOrder.push("align")))})})})}(tinymce);
\ No newline at end of file
+!function(e){e.on("AddEditor",function(e){e.editor.settings.inline_styles=!1}),e.PluginManager.add("legacyoutput",function(t){t.on("init",function(){var i="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",n=e.explode(t.settings.font_size_style_values),l=t.schema;t.formatter.register({alignleft:{selector:i,attributes:{align:"left"}},aligncenter:{selector:i,attributes:{align:"center"}},alignright:{selector:i,attributes:{align:"right"}},alignjustify:{selector:i,attributes:{align:"justify"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:!0}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:!0}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(t){return e.inArray(n,t.value)+1}}},forecolor:{inline:"font",attributes:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}}),e.each("b,i,u,strike".split(","),function(e){l.addValidElements(e+"[*]")}),l.getElementRule("font")||l.addValidElements("font[face|size|color|style]"),e.each(i.split(","),function(e){var t=l.getElementRule(e);t&&(t.attributes.align||(t.attributes.align={},t.attributesOrder.push("align")))})})})}(tinymce);
\ 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	2014-03-18 21:02:55 UTC (rev 12390)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/lists/plugin.min.js	2014-03-19 08:25:30 UTC (rev 12391)
@@ -1 +1 @@
-tinymce.PluginManager.add("lists",function(e){function t(e){return e&&/^(OL|UL)$/.test(e.nodeName)}function n(e){return e.parentNode.firstChild==e}function r(e){return e.parentNode.lastChild==e}function o(t){return t&&!!e.schema.getTextBlockElements()[t.nodeName]}function i(e){return e&&"SPAN"===e.nodeName&&"bookmark"===e.getAttribute("data-mce-type")}var a=this;e.on("init",function(){function d(e){function t(t){var r,o,i;o=e[t?"startContainer":"endContainer"],i=e[t?"startOffset":"endOffset"],1==o.nodeType&&(r=b.create("span",{"data-mce-type":"bookmark"}),o.hasChildNodes()?(i=Math.min(i,o.childNodes.length-1),t?o.insertBefore(r,o.childNodes[i]):b.insertAfter(r,o.childNodes[i])):o.appendChild(r),o=r,i=0),n[t?"startContainer":"endContainer"]=o,n[t?"startOffset":"endOffset"]=i}var n={};return t(!0),e.collapsed||t(),n}function s(e){function t(t){function n(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,o,i;r=i=e[t?"startContainer":"endContainer"],o=e[t?"startOffset":"endOffset"],r&&(1==r.nodeType&&(o=n(r),r=r.parentNode,b.remove(i)),e[t?"startContainer":"endContainer"]=r,e[t?"startOffset":"endOffset"]=o)}t(!0),t();var n=b.createRng();n.setStart(e.startContainer,e.startOffset),e.endContainer&&n.setEnd(e.endContainer,e.endOffset),L.setRng(n)}function f(t,n){var r,o,i,a=b.createFragment(),d=e.schema.getBlockElements();if(e.settings.forced_root_block&&(n=n||e.settings.forced_root_block),n&&(o=b.create(n),o.tagName===e.settings.forced_root_block&&b.setAttribs(o,e.settings.forced_root_block_attrs),a.appendChild(o)),t)for(;r=t.firstChild;){var s=r.nodeName;i||"SPAN"==s&&"bookmark"==r.getAttribute("data-mce-type")||(i=!0),d[s]?(a.appendChild(r),o=null):n?(o||(o=b.create(n),a.appendChild(o)),o.appendChild(r)):a.appendChild(r)}return e.settings.forced_root_block?i||tinymce.Env.ie&&!(tinymce.Env.ie>10)||o.appendChild(b.create("br",{"data-mce-bogus":"1"})):a.appendChild(b.create("br")),a}function l(){return tinymce.grep(L.getSelectedBlocks(),function(e){return"LI"==e.nodeName})}function c(e,t,n){var r,o,i=b.select('span[data-mce-type="bookmark"]',e);n=n||f(t),r=b.createRng(),r.setStartAfter(t),r.setEndAfter(e),o=r.extractContents(),b.isEmpty(o)||b.insertAfter(o,e),b.insertAfter(n,e),b.isEmpty(t.parentNode)&&(tinymce.each(i,function(e){t.parentNode.parentNode.insertBefore(e,t.parentNode)}),b.remove(t.parentNode)),b.remove(t)}function p(e){var n,r;if(n=e.nextSibling,n&&t(n)&&n.nodeName==e.nodeName){for(;r=n.firstChild;)e.appendChild(r);b.remove(n)}if(n=e.previousSibling,n&&t(n)&&n.nodeName==e.nodeName){for(;r=n.firstChild;)e.insertBefore(r,e.firstChild);b.remove(n)}}function u(e){tinymce.each(tinymce.grep(b.select("ol,ul",e)),function(e){var n,r=e.parentNode;"LI"==r.nodeName&&r.firstChild==e&&(n=r.previousSibling,n&&"LI"==n.nodeName&&(n.appendChild(e),b.isEmpty(r)&&b.remove(r))),t(r)&&(n=r.previousSibling,n&&"LI"==n.nodeName&&n.appendChild(e))})}function m(e){function o(e){b.isEmpty(e)&&b.remove(e)}var i,a=e.parentNode,d=a.parentNode;return n(e)&&r(e)?("LI"==d.nodeName?(b.insertAfter(e,d),o(d),b.remove(a)):t(d)?b.remove(a,!0):(d.insertBefore(f(e),a),b.remove(a)),!0):n(e)?("LI"==d.nodeName?(b.insertAfter(e,d),e.appendChild(a),o(d)):t(d)?d.insertBefore(e,a):(d.insertBefore(f(e),a),b.remove(e)),!0):r(e)?("LI"==d.nodeName?b.insertAfter(e,d):t(d)?b.insertAfter(e,a):(b.insertAfter(f(e),a),b.remove(e)),!0):("LI"==d.nodeName?(a=d,i=f(e,"LI")):i=t(d)?f(e,"LI"):f(e),c(a,e,i),u(a.parentNode),!0)}function h(e){function n(n,r){var o;if(t(n)){for(;o=e.lastChild.firstChild;)r.appendChild(o);b.remove(n)}}var r,o;return r=e.previousSibling,r&&t(r)?(r.appendChild(e),!0):r&&"LI"==r.nodeName&&t(r.lastChild)?(r.lastChild.appendChild(e),n(e.lastChild,r.lastChild),!0):(r=e.nextSibling,r&&t(r)?(r.insertBefore(e,r.firstChild),!0):r&&"LI"==r.nodeName&&t(e.lastChild)?!1:(r=e.previousSibling,r&&"LI"==r.nodeName?(o=b.create(e.parentNode.nodeName),r.appendChild(o),o.appendChild(e),n(e.lastChild,o),!0):!1))}function v(){var t=l();if(t.length){for(var n=d(L.getRng(!0)),r=0;r<t.length&&(h(t[r])||0!==r);r++);return s(n),e.nodeChanged(),!0}}function C(){var t=l();if(t.length){var n,r,o=d(L.getRng(!0)),i=e.getBody();for(n=t.length;n--;)for(var a=t[n].parentNode;a&&a!=i;){for(r=t.length;r--;)if(t[r]===a){t.splice(n,1);break}a=a.parentNode}for(n=0;n<t.length&&(m(t[n])||0!==n);n++);return s(o),e.nodeChanged(),!0}}function g(n){function r(){function t(e){var t,n;for(t=a[e?"startContainer":"endContainer"],n=a[e?"startOffset":"endOffset"],1==t.nodeType&&(t=t.childNodes[Math.min(n,t.childNodes.length-1)]||t);t.parentNode!=d;){if(o(t))return t;if(/^(TD|TH)$/.test(t.parentNode.nodeName))return t;t=t.parentNode}return t}for(var n,r=[],d=e.getBody(),s=t(!0),f=t(),l=[],c=s;c&&(l.push(c),c!=f);c=c.nextSibling);return tinymce.each(l,function(e){if(o(e))return r.push(e),n=null,void 0;if(b.isBlock(e)||"BR"==e.nodeName)return"BR"==e.nodeName&&b.remove(e),n=null,void 0;var t=e.nextSibling;return i(e)&&(o(t)||!t&&e.parentNode==d)?(n=null,void 0):(n||(n=b.create("p"),e.parentNode.insertBefore(n,e),r.push(n)),n.appendChild(e),void 0)}),r}var a=L.getRng(!0),f=d(a),l=r();tinymce.each(l,function(e){var r,o;o=e.previousSibling,o&&t(o)&&o.nodeName==n?(r=o,e=b.rename(e,"LI"),o.appendChild(e)):(r=b.create(n),e.parentNode.insertBefore(r,e),r.appendChild(e),e=b.rename(e,"LI")),p(r)}),s(f)}function N(){var n=d(L.getRng(!0)),r=e.getBody();tinymce.each(l(),function(e){var n,o;if(b.isEmpty(e))return m(e),void 0;for(n=e;n&&n!=r;n=n.parentNode)t(n)&&(o=n);c(o,e)}),s(n)}function y(e){var t=b.getParent(L.getStart(),"OL,UL");if(t)if(t.nodeName==e)N(e);else{var n=d(L.getRng(!0));p(b.rename(t,e)),s(n)}else g(e)}var b=e.dom,L=e.selection;a.backspaceDelete=function(e){function n(e,t){var n=e.startContainer,r=e.startOffset;if(3==n.nodeType&&(t?r<n.data.length:r>0))return n;for(var o=new tinymce.dom.TreeWalker(e.startContainer);n=o[t?"next":"prev"]();)if(3==n.nodeType&&n.data.length>0)return n}function r(e,n){var r,o,i=e.parentNode;for(t(n.lastChild)&&(o=n.lastChild),r=n.lastChild,r&&"BR"==r.nodeName&&e.hasChildNodes()&&b.remove(r);r=e.firstChild;)n.appendChild(r);o&&n.appendChild(o),b.remove(e),b.isEmpty(i)&&b.remove(i)}if(L.isCollapsed()){var o=b.getParent(L.getStart(),"LI");if(o){var i=L.getRng(!0),a=b.getParent(n(i,e),"LI");if(a&&a!=o){var f=d(i);return e?r(a,o):r(o,a),s(f),!0}if(!a&&!e&&N(o.parentNode.nodeName))return!0}}},e.addCommand("Indent",function(){return v()?void 0:!0}),e.addCommand("Outdent",function(){return C()?void 0:!0}),e.addCommand("InsertUnorderedList",function(){y("UL")}),e.addCommand("InsertOrderedList",function(){y("OL")}),e.on("keydown",function(t){9==t.keyCode&&e.dom.getParent(e.selection.getStart(),"LI")&&(t.preventDefault(),t.shiftKey?C():v())})}),e.addButton("indent",{icon:"indent",title:"Increase indent",cmd:"Indent",onPostRender:function(){var t=this;e.on("nodechange",function(){var r=e.dom.getParent(e.selection.getNode(),"LI,UL,OL");t.disabled(r&&("LI"!=r.nodeName||n(r)))})}}),e.on("keydown",function(e){e.keyCode==tinymce.util.VK.BACKSPACE?a.backspaceDelete()&&e.preventDefault():e.keyCode==tinymce.util.VK.DELETE&&a.backspaceDelete(!0)&&e.preventDefault()})});
\ No newline at end of file
+tinymce.PluginManager.add("lists",function(e){function t(e){return e&&/^(OL|UL)$/.test(e.nodeName)}function n(e){return e.parentNode.firstChild==e}function r(e){return e.parentNode.lastChild==e}function o(t){return t&&!!e.schema.getTextBlockElements()[t.nodeName]}function i(e){return e&&"SPAN"===e.nodeName&&"bookmark"===e.getAttribute("data-mce-type")}var a=this;e.on("init",function(){function d(e){function t(t){var r,o,i;o=e[t?"startContainer":"endContainer"],i=e[t?"startOffset":"endOffset"],1==o.nodeType&&(r=b.create("span",{"data-mce-type":"bookmark"}),o.hasChildNodes()?(i=Math.min(i,o.childNodes.length-1),t?o.insertBefore(r,o.childNodes[i]):b.insertAfter(r,o.childNodes[i])):o.appendChild(r),o=r,i=0),n[t?"startContainer":"endContainer"]=o,n[t?"startOffset":"endOffset"]=i}var n={};return t(!0),e.collapsed||t(),n}function s(e){function t(t){function n(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,o,i;r=i=e[t?"startContainer":"endContainer"],o=e[t?"startOffset":"endOffset"],r&&(1==r.nodeType&&(o=n(r),r=r.parentNode,b.remove(i)),e[t?"startContainer":"endContainer"]=r,e[t?"startOffset":"endOffset"]=o)}t(!0),t();var n=b.createRng();n.setStart(e.startContainer,e.startOffset),e.endContainer&&n.setEnd(e.endContainer,e.endOffset),L.setRng(n)}function f(t,n){var r,o,i,a=b.createFragment(),d=e.schema.getBlockElements();if(e.settings.forced_root_block&&(n=n||e.settings.forced_root_block),n&&(o=b.create(n),o.tagName===e.settings.forced_root_block&&b.setAttribs(o,e.settings.forced_root_block_attrs),a.appendChild(o)),t)for(;r=t.firstChild;){var s=r.nodeName;i||"SPAN"==s&&"bookmark"==r.getAttribute("data-mce-type")||(i=!0),d[s]?(a.appendChild(r),o=null):n?(o||(o=b.create(n),a.appendChild(o)),o.appendChild(r)):a.appendChild(r)}return e.settings.forced_root_block?i||tinymce.Env.ie&&!(tinymce.Env.ie>10)||o.appendChild(b.create("br",{"data-mce-bogus":"1"})):a.appendChild(b.create("br")),a}function l(){return tinymce.grep(L.getSelectedBlocks(),function(e){return"LI"==e.nodeName})}function c(e,t,n){var r,o,i=b.select('span[data-mce-type="bookmark"]',e);n=n||f(t),r=b.createRng(),r.setStartAfter(t),r.setEndAfter(e),o=r.extractContents(),b.isEmpty(o)||b.insertAfter(o,e),b.insertAfter(n,e),b.isEmpty(t.parentNode)&&(tinymce.each(i,function(e){t.parentNode.parentNode.insertBefore(e,t.parentNode)}),b.remove(t.parentNode)),b.remove(t)}function p(e){var n,r;if(n=e.nextSibling,n&&t(n)&&n.nodeName==e.nodeName){for(;r=n.firstChild;)e.appendChild(r);b.remove(n)}if(n=e.previousSibling,n&&t(n)&&n.nodeName==e.nodeName){for(;r=n.firstChild;)e.insertBefore(r,e.firstChild);b.remove(n)}}function u(e){tinymce.each(tinymce.grep(b.select("ol,ul",e)),function(e){var n,r=e.parentNode;"LI"==r.nodeName&&r.firstChild==e&&(n=r.previousSibling,n&&"LI"==n.nodeName&&(n.appendChild(e),b.isEmpty(r)&&b.remove(r))),t(r)&&(n=r.previousSibling,n&&"LI"==n.nodeName&&n.appendChild(e))})}function m(e){function o(e){b.isEmpty(e)&&b.remove(e)}var i,a=e.parentNode,d=a.parentNode;return n(e)&&r(e)?("LI"==d.nodeName?(b.insertAfter(e,d),o(d),b.remove(a)):t(d)?b.remove(a,!0):(d.insertBefore(f(e),a),b.remove(a)),!0):n(e)?("LI"==d.nodeName?(b.insertAfter(e,d),e.appendChild(a),o(d)):t(d)?d.insertBefore(e,a):(d.insertBefore(f(e),a),b.remove(e)),!0):r(e)?("LI"==d.nodeName?b.insertAfter(e,d):t(d)?b.insertAfter(e,a):(b.insertAfter(f(e),a),b.remove(e)),!0):("LI"==d.nodeName?(a=d,i=f(e,"LI")):i=t(d)?f(e,"LI"):f(e),c(a,e,i),u(a.parentNode),!0)}function h(e){function n(n,r){var o;if(t(n)){for(;o=e.lastChild.firstChild;)r.appendChild(o);b.remove(n)}}var r,o;return r=e.previousSibling,r&&t(r)?(r.appendChild(e),!0):r&&"LI"==r.nodeName&&t(r.lastChild)?(r.lastChild.appendChild(e),n(e.lastChild,r.lastChild),!0):(r=e.nextSibling,r&&t(r)?(r.insertBefore(e,r.firstChild),!0):r&&"LI"==r.nodeName&&t(e.lastChild)?!1:(r=e.previousSibling,r&&"LI"==r.nodeName?(o=b.create(e.parentNode.nodeName),r.appendChild(o),o.appendChild(e),n(e.lastChild,o),!0):!1))}function v(){var t=l();if(t.length){for(var n=d(L.getRng(!0)),r=0;r<t.length&&(h(t[r])||0!==r);r++);return s(n),e.nodeChanged(),!0}}function C(){var t=l();if(t.length){var n,r,o=d(L.getRng(!0)),i=e.getBody();for(n=t.length;n--;)for(var a=t[n].parentNode;a&&a!=i;){for(r=t.length;r--;)if(t[r]===a){t.splice(n,1);break}a=a.parentNode}for(n=0;n<t.length&&(m(t[n])||0!==n);n++);return s(o),e.nodeChanged(),!0}}function g(n){function r(){function t(e){var t,n;for(t=a[e?"startContainer":"endContainer"],n=a[e?"startOffset":"endOffset"],1==t.nodeType&&(t=t.childNodes[Math.min(n,t.childNodes.length-1)]||t);t.parentNode!=d;){if(o(t))return t;if(/^(TD|TH)$/.test(t.parentNode.nodeName))return t;t=t.parentNode}return t}for(var n,r=[],d=e.getBody(),s=t(!0),f=t(),l=[],c=s;c&&(l.push(c),c!=f);c=c.nextSibling);return tinymce.each(l,function(e){if(o(e))return r.push(e),void(n=null);if(b.isBlock(e)||"BR"==e.nodeName)return"BR"==e.nodeName&&b.remove(e),void(n=null);var t=e.nextSibling;return i(e)&&(o(t)||!t&&e.parentNode==d)?void(n=null):(n||(n=b.create("p"),e.parentNode.insertBefore(n,e),r.push(n)),void n.appendChild(e))}),r}var a=L.getRng(!0),f=d(a),l=r();tinymce.each(l,function(e){var r,o;o=e.previousSibling,o&&t(o)&&o.nodeName==n?(r=o,e=b.rename(e,"LI"),o.appendChild(e)):(r=b.create(n),e.parentNode.insertBefore(r,e),r.appendChild(e),e=b.rename(e,"LI")),p(r)}),s(f)}function N(){var n=d(L.getRng(!0)),r=e.getBody();tinymce.each(l(),function(e){var n,o;if(b.isEmpty(e))return void m(e);for(n=e;n&&n!=r;n=n.parentNode)t(n)&&(o=n);c(o,e)}),s(n)}function y(e){var t=b.getParent(L.getStart(),"OL,UL");if(t)if(t.nodeName==e)N(e);else{var n=d(L.getRng(!0));p(b.rename(t,e)),s(n)}else g(e)}var b=e.dom,L=e.selection;a.backspaceDelete=function(e){function n(e,t){var n=e.startContainer,r=e.startOffset;if(3==n.nodeType&&(t?r<n.data.length:r>0))return n;for(var o=new tinymce.dom.TreeWalker(e.startContainer);n=o[t?"next":"prev"]();)if(3==n.nodeType&&n.data.length>0)return n}function r(e,n){var r,o,i=e.parentNode;for(t(n.lastChild)&&(o=n.lastChild),r=n.lastChild,r&&"BR"==r.nodeName&&e.hasChildNodes()&&b.remove(r);r=e.firstChild;)n.appendChild(r);o&&n.appendChild(o),b.remove(e),b.isEmpty(i)&&b.remove(i)}if(L.isCollapsed()){var o=b.getParent(L.getStart(),"LI");if(o){var i=L.getRng(!0),a=b.getParent(n(i,e),"LI");if(a&&a!=o){var f=d(i);return e?r(a,o):r(o,a),s(f),!0}if(!a&&!e&&N(o.parentNode.nodeName))return!0}}},e.addCommand("Indent",function(){return v()?void 0:!0}),e.addCommand("Outdent",function(){return C()?void 0:!0}),e.addCommand("InsertUnorderedList",function(){y("UL")}),e.addCommand("InsertOrderedList",function(){y("OL")}),e.on("keydown",function(t){9==t.keyCode&&e.dom.getParent(e.selection.getStart(),"LI")&&(t.preventDefault(),t.shiftKey?C():v())})}),e.addButton("indent",{icon:"indent",title:"Increase indent",cmd:"Indent",onPostRender:function(){var t=this;e.on("nodechange",function(){var r=e.dom.getParent(e.selection.getNode(),"LI,UL,OL");t.disabled(r&&("LI"!=r.nodeName||n(r)))})}}),e.on("keydown",function(e){e.keyCode==tinymce.util.VK.BACKSPACE?a.backspaceDelete()&&e.preventDefault():e.keyCode==tinymce.util.VK.DELETE&&a.backspaceDelete(!0)&&e.preventDefault()})});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/pagebreak/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/pagebreak/plugin.min.js	2014-03-18 21:02:55 UTC (rev 12390)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/pagebreak/plugin.min.js	2014-03-19 08:25:30 UTC (rev 12391)
@@ -1 +1 @@
-tinymce.PluginManager.add("pagebreak",function(e){var a="mce-pagebreak",t=e.getParam("pagebreak_separator","<!-- pagebreak -->"),n=new RegExp(t.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(e){return"\\"+e}),"gi"),r='<img src="'+tinymce.Env.transparentSrc+'" class="'+a+'" data-mce-resize="false" />';e.addCommand("mcePageBreak",function(){e.settings.pagebreak_split_block?e.insertContent("<p>"+r+"</p>"):e.insertContent(r)}),e.addButton("pagebreak",{title:"Page break",cmd:"mcePageBreak"}),e.addMenuItem("pagebreak",{text:"Page break",icon:"pagebreak",cmd:"mcePageBreak",context:"insert"}),e.on("ResolveName",function(t){"IMG"==t.target.nodeName&&e.dom.hasClass(t.target,a)&&(t.name="pagebreak")}),e.on("click",function(t){t=t.target,"IMG"===t.nodeName&&e.dom.hasClass(t,a)&&e.selection.select(t)}),e.on("BeforeSetContent",function(e){e.content=e.content.replace(n,r)}),e.on("PreInit",function(){e.serializer.addNodeFilter("img",function(a){for(var n,r,c=a.length;c--;)if(n=a[c],r=n.attr("class"),r&&-1!==r.indexOf("mce-pagebreak")){var o=n.parent;if(e.schema.getBlockElements()[o.name]&&e.settings.pagebreak_split_block){o.type=3,o.value=t,o.raw=!0,n.remove();continue}n.type=3,n.value=t,n.raw=!0}})})});
\ No newline at end of file
+tinymce.PluginManager.add("pagebreak",function(e){var a="mce-pagebreak",t=e.getParam("pagebreak_separator","<!-- pagebreak -->"),n=new RegExp(t.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(e){return"\\"+e}),"gi"),r='<img src="'+tinymce.Env.transparentSrc+'" class="'+a+'" data-mce-resize="false" />';e.addCommand("mcePageBreak",function(){e.insertContent(e.settings.pagebreak_split_block?"<p>"+r+"</p>":r)}),e.addButton("pagebreak",{title:"Page break",cmd:"mcePageBreak"}),e.addMenuItem("pagebreak",{text:"Page break",icon:"pagebreak",cmd:"mcePageBreak",context:"insert"}),e.on("ResolveName",function(t){"IMG"==t.target.nodeName&&e.dom.hasClass(t.target,a)&&(t.name="pagebreak")}),e.on("click",function(t){t=t.target,"IMG"===t.nodeName&&e.dom.hasClass(t,a)&&e.selection.select(t)}),e.on("BeforeSetContent",function(e){e.content=e.content.replace(n,r)}),e.on("PreInit",function(){e.serializer.addNodeFilter("img",function(a){for(var n,r,c=a.length;c--;)if(n=a[c],r=n.attr("class"),r&&-1!==r.indexOf("mce-pagebreak")){var o=n.parent;if(e.schema.getBlockElements()[o.name]&&e.settings.pagebreak_split_block){o.type=3,o.value=t,o.raw=!0,n.remove();continue}n.type=3,n.value=t,n.raw=!0}})})});
\ 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	2014-03-18 21:02:55 UTC (rev 12390)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/paste/plugin.min.js	2014-03-19 08:25:30 UTC (rev 12391)
@@ -1 +1 @@
-!function(e,t){"use strict";function n(e,t){for(var n,i=[],r=0;r<e.length;++r){if(n=s[e[r]]||a(e[r]),!n)throw"module definition dependecy not found: "+e[r];i.push(n)}t.apply(null,i)}function i(e,i,r){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(i===t)throw"invalid module definition, dependencies must be specified";if(r===t)throw"invalid module definition, definition function must be specified";n(i,function(){s[e]=r.apply(null,arguments)})}function r(e){return!!s[e]}function a(t){for(var n=e,i=t.split(/[.\/]/),r=0;r<i.length;++r){if(!n[i[r]])return;n=n[i[r]]}return n}function o(n){for(var i=0;i<n.length;i++){for(var r=e,a=n[i],o=a.split(/[.\/]/),l=0;l<o.length-1;++l)r[o[l]]===t&&(r[o[l]]={}),r=r[o[l]];r[o[o.length-1]]=s[a]}}var s={},l="tinymce/pasteplugin/Utils",c="tinymce/util/Tools",d="tinymce/html/DomParser",p="tinymce/html/Schema",f="tinymce/pasteplugin/Clipboard",u="tinymce/Env",m="tinymce/util/VK",g="tinymce/pasteplugin/WordFilter",v="tinymce/html/Serializer",h="tinymce/html/Node",b="tinymce/pasteplugin/Quirks",y="tinymce/pasteplugin/Plugin",P="tinymce/PluginManager";i(l,[c,d,p],function(e,t,n){function i(t,n){return e.each(n,function(e){t=e.constructor==RegExp?t.replace(e,""):t.replace(e[0],e[1])}),t}function r(i){function r(e){var t=e.name,n=e;if("br"===t)return void(s+="\n");if(l[t]&&(s+=" "),c[t])return void(s+=" ");if(3==e.type&&(s+=e.value),!e.shortEnded&&(e=e.firstChild))do r(e);while(e=e.next);d[t]&&n.next&&(s+="\n","p"==t&&(s+="\n"))}var a=new n,o=new t({},a),s="",l=a.getShortEndedElements(),c=e.makeMap("script noscript style textarea video audio iframe object"," "),d=a.getBlockElements();return r(o.parse(i)),s}return{filter:i,innerText:r}}),i(f,[u,m,l],function(e,t,n){return function(i){function r(e){var t,n=i.dom;if(t=i.fire("BeforePastePreProcess",{content:e}),t=i.fire("PastePreProcess",t),e=t.content,!t.isDefaultPrevented()){if(i.hasEventListeners("PastePostProcess")&&!t.isDefaultPrevented()){var r=n.add(i.getBody(),"div",{style:"display:none"},e);t=i.fire("PastePostProcess",{node:r}),n.remove(r),e=t.node.innerHTML}t.isDefaultPrevented()||i.insertContent(e)}}function a(e){e=i.dom.encode(e).replace(/\r\n/g,"\n");var t=i.dom.getParent(i.selection.getStart(),i.dom.isBlock),a=i.settings.forced_root_block,o;a&&(o=i.dom.createHTML(a,i.settings.forced_root_block_attrs),o=o.substr(0,o.length-3)+">"),t&&/^(PRE|DIV)$/.test(t.nodeName)||!a?e=n.filter(e,[[/\n/g,"<br>"]]):(e=n.filter(e,[[/\n\n/g,"</p>"+o],[/^(.*<\/p>)(<p>)$/,o+"$1"],[/\n/g,"<br />"]]),-1!=e.indexOf("<p>")&&(e=o+e)),r(e)}function o(){var t=i.dom,n=i.getBody(),r=i.dom.getViewPort(i.getWin()),a=r.y,o=20,s;if(v=i.selection.getRng(),i.inline&&(s=i.selection.getScrollContainer(),s&&(a=s.scrollTop)),v.getClientRects){var l=v.getClientRects();if(l.length)o=a+(l[0].top-t.getPos(n).y);else{o=a;var c=v.startContainer;c&&(3==c.nodeType&&c.parentNode!=n&&(c=c.parentNode),1==c.nodeType&&(o=t.getPos(c,s||n).y))}}g=t.add(i.getBody(),"div",{id:"mcepastebin",contentEditable:!0,"data-mce-bogus":"1",style:"position: absolute; top: "+o+"px;width: 10px; height: 10px; overflow: hidden; opacity: 0"},b),(e.ie||e.gecko)&&t.setStyle(g,"left","rtl"==t.getStyle(n,"direction",!0)?65535:-65535),t.bind(g,"beforedeactivate focusin focusout",function(e){e.stopPropagation()}),g.focus(),i.selection.select(g,!0)}function s(){if(g){for(var e;e=i.dom.get("mcepastebin");)i.dom.remove(e),i.dom.unbind(e);v&&i.selection.setRng(v)}y=!1,g=v=null}function l(){var e=b,t,n;for(t=i.dom.select("div[id=mcepastebin]"),n=t.length;n--;){var r=t[n].innerHTML;e==b&&(e=""),r.length>e.length&&(e=r)}return e}function c(e){var t={};if(e&&e.types){var n=e.getData("Text");n&&n.length>0&&(t["text/plain"]=n);for(var i=0;i<e.types.length;i++){var r=e.types[i];t[r]=e.getData(r)}}return t}function d(e){return c(e.clipboardData||i.getDoc().dataTransfer)}function p(e,t){function n(e){if("image/png"==a[o].type){var t=new FileReader;return t.onload=function(){r('<img src="'+t.result+'">')},t.readAsDataURL(e.getAsFile()),!0}}if(!(!i.settings.paste_data_images||"text/html"in t||"text/plain"in t)&&e.clipboardData){var a=e.clipboardData.items;if(a)for(var o=0;o<a.length;o++)if(n(a[o]))return!0}}function f(e){var t=i.getDoc(),n;if(t.caretPositionFromPoint){var r=t.caretPositionFromPoint(e.clientX,e.clientY);n=t.createRange(),n.setStart(r.offsetNode,r.offset),n.collapse(!0)}else t.caretRangeFromPoint&&(n=t.caretRangeFromPoint(e.clientX,e.clientY));return n}function u(){i.on("keydown",function(n){if(!n.isDefaultPrevented()&&(t.metaKeyPressed(n)&&86==n.keyCode||n.shiftKey&&45==n.keyCode)){if(y=n.shiftKey&&86==n.keyCode,n.stopImmediatePropagation(),h=(new Date).getTime(),e.ie&&y)return n.preventDefault(),void i.fire("paste",{ieFake:!0});s(),o()}}),i.on("paste",function(t){var c=d(t),f=(new Date).getTime()-h<1e3,u="text"==m.pasteFormat||y;return t.isDefaultPrevented()?void s():p(t,c)?void s():(f||t.preventDefault(),!e.ie||f&&!t.ieFake||(o(),i.dom.bind(g,"paste",function(e){e.stopPropagation()}),i.getDoc().execCommand("Paste",!1,null),c["text/html"]=l()),void setTimeout(function(){var e=l();return g&&g.firstChild&&"mcepastebin"===g.firstChild.id&&(u=!0),s(),e!=b&&f||(e=c["text/html"]||c["text/plain"]||b,e!=b)?void(u?a(c["text/plain"]||n.innerText(e)):r(e)):void(f||i.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents."))},0))}),i.on("dragstart",function(e){if(e.dataTransfer.types)try{e.dataTransfer.setData("mce-internal",i.selection.getContent())}catch(t){}}),i.on("drop",function(e){var t=f(e);if(t&&!e.isDefaultPrevented()){var n=c(e.dataTransfer),o=n["mce-internal"]||n["text/html"]||n["text/plain"];o&&(e.preventDefault(),i.undoManager.transact(function(){n["mce-internal"]&&i.execCommand("Delete"),i.selection.setRng(t),n["text/html"]?r(o):a(o)}))}})}var m=this,g,v,h=0,b="%MCEPASTEBIN%",y;m.pasteHtml=r,m.pasteText=a,i.on("preInit",function(){u(),i.parser.addNodeFilter("img",function(t){if(!i.settings.paste_data_images)for(var n=t.length;n--;){var r=t[n].attributes.map.src;r&&0===r.indexOf("data:image")&&(t[n].attr("data-mce-object")||r===e.transparentSrc||t[n].remove())}})}),i.on("PreProcess",function(){i.dom.remove(i.dom.get("mcepastebin"))})}}),i(g,[c,d,p,v,h,l],function(e,t,n,i,r,a){function o(e){return/<font face="Times New Roman"|class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i.test(e)}function s(s){var l=s.settings;s.on("BeforePastePreProcess",function(c){function d(e){function t(e,t,o,s){var l=e._listLevel||a;l!=a&&(a>l?n&&(n=n.parent.parent):(i=n,n=null)),n&&n.name==o?n.append(e):(i=i||n,n=new r(o,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>a&&i&&i.lastChild.append(n),a=l}for(var n,i,a=1,o=e.getAll("p"),s=0;s<o.length;s++)if(e=o[s],"p"==e.name&&e.firstChild){for(var l="",c=e.firstChild;c&&!(l=c.value);)c=c.firstChild;if(/^\s*[\u2022\u00b7\u00a7\u00d8\u25CF]\s*$/.test(l)){t(e,c,"ul");continue}if(/^\s*\w+\.$/.test(l)){var d=/([0-9])\./.exec(l),p=1;d&&(p=parseInt(d[1],10)),t(e,c,"ol",p);continue}n=null}}function p(t,n){if("p"===t.name){var i=/mso-list:\w+ \w+([0-9]+)/.exec(n);i&&(t._listLevel=parseInt(i[1],10))}if(s.getParam("paste_retain_style_properties","none")){var r="";if(e.each(s.dom.parseStyle(n),function(e,t){switch(t){case"horiz-align":return void(t="text-align");case"vert-align":return void(t="vertical-align");case"font-color":case"mso-foreground":return void(t="color");case"mso-background":case"mso-highlight":t="background"}("all"==u||m&&m[t])&&(r+=t+":"+e+";")}),r)return r}return null}var f=c.content,u,m;if(u=l.paste_retain_style_properties,u&&(m=e.makeMap(u)),l.paste_enable_default_filters!==!1&&o(c.content)){c.wordContent=!0,f=a.filter(f,[/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/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 g=l.paste_word_valid_elements;g||(g="@[style],-strong/b,-em/i,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,-table[width],-tr,-td[colspan|rowspan|width],-th,-thead,-tfoot,-tbody,-a[href|name],sub,sup,strike,br");var v=new n({valid_elements:g}),h=new t({},v);h.addAttributeFilter("style",function(e){for(var t=e.length,n;t--;)n=e[t],n.attr("style",p(n,n.attr("style"))),"span"!=n.name||n.attributes.length||n.unwrap()}),h.addNodeFilter("a",function(e){for(var t=e.length,n,i,r;t--;)n=e[t],i=n.attr("href"),r=n.attr("name"),i&&0===i.indexOf("file://")&&(i=i.split("#")[1],i&&(i="#"+i)),i||r?n.attr({href:i,name:r}):n.unwrap()});var b=h.parse(f);d(b),c.content=new i({},v).serialize(b)}})}return s.isWordContent=o,s}),i(b,[u,c,g,l],function(e,t,n,i){return function(r){function a(e){r.on("BeforePastePreProcess",function(t){t.content=e(t.content)})}function o(e){return e=i.filter(e,[/^[\s\S]*<!--StartFragment-->|<!--EndFragment-->[\s\S]*$/g,[/<span class="Apple-converted-space">\u00a0<\/span>/g,"\xa0"],/<br>$/])}function s(e){if(!n.isWordContent(e))return e;var a=[];t.each(r.schema.getBlockElements(),function(e,t){a.push(t)});var o=new RegExp("(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*(<\\/?("+a.join("|")+")[^>]*>)(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*","g");return e=i.filter(e,[[o,"$1"]]),e=i.filter(e,[[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}function l(e){return(r.settings.paste_remove_styles||r.settings.paste_remove_styles_if_webkit!==!1)&&(e=e.replace(/ style=\"[^\"]+\"/g,"")),e}e.webkit&&(a(l),a(o)),e.ie&&a(s)}}),i(y,[P,f,g,b],function(e,t,n,i){var r;e.add("paste",function(e){function a(){"text"==s.pasteFormat?(this.active(!1),s.pasteFormat="html"):(s.pasteFormat="text",this.active(!0),r||(e.windowManager.alert("Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off."),r=!0))}var o=this,s,l=e.settings;o.clipboard=s=new t(e),o.quirks=new i(e),o.wordFilter=new n(e),e.settings.paste_as_text&&(o.clipboard.pasteFormat="text"),l.paste_preprocess&&e.on("PastePreProcess",function(e){l.paste_preprocess.call(o,o,e)}),l.paste_postprocess&&e.on("PastePostProcess",function(e){l.paste_postprocess.call(o,o,e)}),e.addCommand("mceInsertClipboardContent",function(e,t){t.content&&o.clipboard.pasteHtml(t.content),t.text&&o.clipboard.pasteText(t.text)}),e.paste_block_drop&&e.on("dragend dragover draggesture dragdrop drop drag",function(e){e.preventDefault(),e.stopPropagation()}),e.settings.paste_data_images||e.on("drop",function(e){var t=e.dataTransfer;t&&t.files&&t.files.length>0&&e.preventDefault()}),e.addButton("pastetext",{icon:"pastetext",tooltip:"Paste as text",onclick:a,active:"text"==o.clipboard.pasteFormat}),e.addMenuItem("pastetext",{text:"Paste as text",selectable:!0,active:s.pasteFormat,onclick:a})})}),o([l,f,g,b,y])}(this);
\ No newline at end of file
+!function(e,t){"use strict";function n(e,t){for(var n,i=[],r=0;r<e.length;++r){if(n=s[e[r]]||a(e[r]),!n)throw"module definition dependecy not found: "+e[r];i.push(n)}t.apply(null,i)}function i(e,i,r){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(i===t)throw"invalid module definition, dependencies must be specified";if(r===t)throw"invalid module definition, definition function must be specified";n(i,function(){s[e]=r.apply(null,arguments)})}function r(e){return!!s[e]}function a(t){for(var n=e,i=t.split(/[.\/]/),r=0;r<i.length;++r){if(!n[i[r]])return;n=n[i[r]]}return n}function o(n){for(var i=0;i<n.length;i++){for(var r=e,a=n[i],o=a.split(/[.\/]/),c=0;c<o.length-1;++c)r[o[c]]===t&&(r[o[c]]={}),r=r[o[c]];r[o[o.length-1]]=s[a]}}var s={},c="tinymce/pasteplugin/Utils",l="tinymce/util/Tools",u="tinymce/html/DomParser",p="tinymce/html/Schema",d="tinymce/pasteplugin/Clipboard",f="tinym...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops-svn:[12390] XoopsCore/branches/2.5.x/2.5.7

[<be...@us...>]

Revision: 12390
          http://sourceforge.net/p/xoops/svn/12390
Author:   beckmi
Date:     2014-03-18 21:02:55 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
fixed icons for active module sections in System module not shown correctly (Slider84/mamba) 

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_index.html

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	2014-03-17 13:49:38 UTC (rev 12389)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-03-18 21:02:55 UTC (rev 12390)
@@ -7,6 +7,8 @@
 Bugfixes:
 - fixed System Module image manager html/js bugs (luciorota)
 - replaced "array_diff_assoc" with "array_diff_key" in /class/theme_blocks.php (masel/mamba)
+- icons for active module sections in System module not shown correctly (Slider84/mamba)  
+- added two new language definitions (see lang_diff.txt)
 
 ===============================
 2014/03/06: Version 2.5.7 Beta 1

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt	2014-03-17 13:49:38 UTC (rev 12389)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/lang_diff.txt	2014-03-18 21:02:55 UTC (rev 12390)
@@ -2,7 +2,18 @@
 =====================
 
 Below are language differences from a version to next version.
+
 ===============================
+2014/03/18: Version 2.5.7 RC1
+===============================
+ADDED/DELETED DEFINES
+
+/modules/system/language/english/admin.php
+- added define('_AM_SYSTEM_USAGE',"Usage");
+- added define('_AM_SYSTEM_ACTIVE',"Active");
+
+
+===============================
 2012/04/15: Version 2.5.5
 ===============================
 ADDED/DELETED DEFINES

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin.php	2014-03-17 13:49:38 UTC (rev 12389)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin.php	2014-03-18 21:02:55 UTC (rev 12390)
@@ -130,7 +130,7 @@
 
             if ($modversion['hasAdmin']) {
 
-                if ( xoops_getModuleOption('active_' . $directory) ) {
+                if ( xoops_getModuleOption('active_' . $directory, 'system') ) {
                     $category = isset($modversion['category']) ? intval($modversion['category']) : 0;
                     if ( false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
                         $menu['file']  = $directory;

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin.php	2014-03-17 13:49:38 UTC (rev 12389)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin.php	2014-03-18 21:02:55 UTC (rev 12390)
@@ -71,3 +71,7 @@
 define('_MD_AM_PERMRESETNG',"Could not reset group permission for module %s");
 define('_MD_AM_PERMADDNGP',"All parent items must be selected.");
 define('_AM_SYSTEM_UNINSTALL',"Uninstall");
+
+//2.5.7
+define('_AM_SYSTEM_USAGE',"Usage");
+define('_AM_SYSTEM_ACTIVE',"Active");

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_index.html	2014-03-17 13:49:38 UTC (rev 12389)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_index.html	2014-03-18 21:02:55 UTC (rev 12390)
@@ -8,11 +8,11 @@
         <tr>
             <th class="txtcenter"><{$smarty.const._AM_SYSTEM_SECTION}></th>
             <th class="txtcenter"><{$smarty.const._AM_SYSTEM_DESC}></th>
-            <th class="txtcenter">&nbsp;</th>
-            <th class="txtcenter">&nbsp;</th>
+            <th class="txtcenter"><{$smarty.const._AM_SYSTEM_USAGE}></th>
+            <th class="txtcenter"><{$smarty.const._AM_SYSTEM_ACTIVE}></th>
         </tr>
     </thead>
-    
+
     <tbody>
     <{foreach item=menu from=$menu}>
     <{if $menu.title}>
@@ -35,4 +35,4 @@
     <{/if}>
     <{/foreach}>
     </tbody>
-</table>
\ No newline at end of file
+</table>

[xoops-svn] SF.net SVN: xoops-svn:[12389] XoopsModules/waiting

[<be...@us...>]

Revision: 12389
          http://sourceforge.net/p/xoops/svn/12389
Author:   beckmi
Date:     2014-03-17 13:49:38 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
Upgrading changelog, adding releases 

Modified Paths:
--------------
    XoopsModules/waiting/trunk/waiting/docs/changelog.txt

Added Paths:
-----------
    XoopsModules/waiting/releases/0.97/
    XoopsModules/waiting/releases/0.97/waiting/
    XoopsModules/waiting/releases/0.97/waiting/admin/
    XoopsModules/waiting/releases/0.97/waiting/admin/about.php
    XoopsModules/waiting/releases/0.97/waiting/admin/admin_footer.php
    XoopsModules/waiting/releases/0.97/waiting/admin/admin_header.php
    XoopsModules/waiting/releases/0.97/waiting/admin/index.php
    XoopsModules/waiting/releases/0.97/waiting/admin/main.php
    XoopsModules/waiting/releases/0.97/waiting/admin/menu.php
    XoopsModules/waiting/releases/0.97/waiting/blocks/
    XoopsModules/waiting/releases/0.97/waiting/blocks/.htaccess
    XoopsModules/waiting/releases/0.97/waiting/blocks/index.html
    XoopsModules/waiting/releases/0.97/waiting/blocks/waiting_waiting.php
    XoopsModules/waiting/releases/0.97/waiting/docs/
    XoopsModules/waiting/releases/0.97/waiting/docs/changelog.txt
    XoopsModules/waiting/releases/0.97/waiting/docs/credits.txt
    XoopsModules/waiting/releases/0.97/waiting/docs/index.html
    XoopsModules/waiting/releases/0.97/waiting/docs/install.txt
    XoopsModules/waiting/releases/0.97/waiting/docs/lang_diff.txt
    XoopsModules/waiting/releases/0.97/waiting/docs/licence.txt
    XoopsModules/waiting/releases/0.97/waiting/docs/readme.txt
    XoopsModules/waiting/releases/0.97/waiting/images/
    XoopsModules/waiting/releases/0.97/waiting/images/folder16.gif
    XoopsModules/waiting/releases/0.97/waiting/images/index.html
    XoopsModules/waiting/releases/0.97/waiting/images/waiting_slogo.png
    XoopsModules/waiting/releases/0.97/waiting/include/
    XoopsModules/waiting/releases/0.97/waiting/include/.htaccess
    XoopsModules/waiting/releases/0.97/waiting/include/functions.php
    XoopsModules/waiting/releases/0.97/waiting/include/index.html
    XoopsModules/waiting/releases/0.97/waiting/include/updateblock.inc.php
    XoopsModules/waiting/releases/0.97/waiting/language/
    XoopsModules/waiting/releases/0.97/waiting/language/.htaccess
    XoopsModules/waiting/releases/0.97/waiting/language/english/
    XoopsModules/waiting/releases/0.97/waiting/language/english/admin.php
    XoopsModules/waiting/releases/0.97/waiting/language/english/blocks.php
    XoopsModules/waiting/releases/0.97/waiting/language/english/help/
    XoopsModules/waiting/releases/0.97/waiting/language/english/help/help.html
    XoopsModules/waiting/releases/0.97/waiting/language/english/help/index.html
    XoopsModules/waiting/releases/0.97/waiting/language/english/index.html
    XoopsModules/waiting/releases/0.97/waiting/language/english/modinfo.php
    XoopsModules/waiting/releases/0.97/waiting/language/english/plugins.php
    XoopsModules/waiting/releases/0.97/waiting/language/index.html
    XoopsModules/waiting/releases/0.97/waiting/plugins/
    XoopsModules/waiting/releases/0.97/waiting/plugins/.htaccess
    XoopsModules/waiting/releases/0.97/waiting/plugins/AMS.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/PDdownloads.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/PDlinks.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/TDMDownloads.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/addresses.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/adslight.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/agendax.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/articles.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/catads.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/eguide.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/extcal.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/extgallery.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/index.html
    XoopsModules/waiting/releases/0.97/waiting/plugins/myAds.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/myalbum.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/mydownloads.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/mylinks.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/newbb.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/news.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/piCal.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/popnupblog.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/publisher.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/recette.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/simpleblog.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/smartfaq.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/smartpartner.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/smartsection.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/system.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/tutorials.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/weblinks.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/wfdownloads.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/wflinks.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/wfsection.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/wordbook.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/wordpress.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/xcgal.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/xdirectory.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/xfguestbook.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/xfsection.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/xoopstube.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/xyp4all.php
    XoopsModules/waiting/releases/0.97/waiting/plugins/yomi.php
    XoopsModules/waiting/releases/0.97/waiting/templates/
    XoopsModules/waiting/releases/0.97/waiting/templates/.htaccess
    XoopsModules/waiting/releases/0.97/waiting/templates/blocks/
    XoopsModules/waiting/releases/0.97/waiting/templates/blocks/index.html
    XoopsModules/waiting/releases/0.97/waiting/templates/blocks/waiting_block_waiting.html
    XoopsModules/waiting/releases/0.97/waiting/templates/index.html
    XoopsModules/waiting/releases/0.97/waiting/xoops_version.php
    XoopsModules/waiting/releases/0.97beta1/
    XoopsModules/waiting/releases/0.97beta1/waiting/
    XoopsModules/waiting/releases/0.97beta1/waiting/admin/
    XoopsModules/waiting/releases/0.97beta1/waiting/admin/about.php
    XoopsModules/waiting/releases/0.97beta1/waiting/admin/admin_footer.php
    XoopsModules/waiting/releases/0.97beta1/waiting/admin/admin_header.php
    XoopsModules/waiting/releases/0.97beta1/waiting/admin/index.php
    XoopsModules/waiting/releases/0.97beta1/waiting/admin/main.php
    XoopsModules/waiting/releases/0.97beta1/waiting/admin/menu.php
    XoopsModules/waiting/releases/0.97beta1/waiting/blocks/
    XoopsModules/waiting/releases/0.97beta1/waiting/blocks/.htaccess
    XoopsModules/waiting/releases/0.97beta1/waiting/blocks/index.html
    XoopsModules/waiting/releases/0.97beta1/waiting/blocks/waiting_waiting.php
    XoopsModules/waiting/releases/0.97beta1/waiting/docs/
    XoopsModules/waiting/releases/0.97beta1/waiting/docs/changelog.txt
    XoopsModules/waiting/releases/0.97beta1/waiting/docs/credits.txt
    XoopsModules/waiting/releases/0.97beta1/waiting/docs/index.html
    XoopsModules/waiting/releases/0.97beta1/waiting/docs/install.txt
    XoopsModules/waiting/releases/0.97beta1/waiting/docs/lang_diff.txt
    XoopsModules/waiting/releases/0.97beta1/waiting/docs/licence.txt
    XoopsModules/waiting/releases/0.97beta1/waiting/docs/readme.txt
    XoopsModules/waiting/releases/0.97beta1/waiting/images/
    XoopsModules/waiting/releases/0.97beta1/waiting/images/folder16.gif
    XoopsModules/waiting/releases/0.97beta1/waiting/images/index.html
    XoopsModules/waiting/releases/0.97beta1/waiting/images/waiting_slogo.png
    XoopsModules/waiting/releases/0.97beta1/waiting/include/
    XoopsModules/waiting/releases/0.97beta1/waiting/include/.htaccess
    XoopsModules/waiting/releases/0.97beta1/waiting/include/functions.php
    XoopsModules/waiting/releases/0.97beta1/waiting/include/index.html
    XoopsModules/waiting/releases/0.97beta1/waiting/include/updateblock.inc.php
    XoopsModules/waiting/releases/0.97beta1/waiting/language/
    XoopsModules/waiting/releases/0.97beta1/waiting/language/.htaccess
    XoopsModules/waiting/releases/0.97beta1/waiting/language/english/
    XoopsModules/waiting/releases/0.97beta1/waiting/language/english/admin.php
    XoopsModules/waiting/releases/0.97beta1/waiting/language/english/blocks.php
    XoopsModules/waiting/releases/0.97beta1/waiting/language/english/help/
    XoopsModules/waiting/releases/0.97beta1/waiting/language/english/help/help.html
    XoopsModules/waiting/releases/0.97beta1/waiting/language/english/help/index.html
    XoopsModules/waiting/releases/0.97beta1/waiting/language/english/index.html
    XoopsModules/waiting/releases/0.97beta1/waiting/language/english/modinfo.php
    XoopsModules/waiting/releases/0.97beta1/waiting/language/english/plugins.php
    XoopsModules/waiting/releases/0.97beta1/waiting/language/index.html
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/.htaccess
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/AMS.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/PDdownloads.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/PDlinks.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/TDMDownloads.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/addresses.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/adslight.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/agendax.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/articles.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/catads.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/eguide.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/extcal.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/extgallery.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/index.html
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/myAds.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/myalbum.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/mydownloads.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/mylinks.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/newbb.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/news.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/piCal.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/popnupblog.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/publisher.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/recette.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/simpleblog.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/smartfaq.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/smartpartner.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/smartsection.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/system.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/tutorials.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/weblinks.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/wfdownloads.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/wflinks.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/wfsection.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/wordbook.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/wordpress.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/xcgal.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/xdirectory.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/xfguestbook.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/xfsection.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/xoopstube.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/xyp4all.php
    XoopsModules/waiting/releases/0.97beta1/waiting/plugins/yomi.php
    XoopsModules/waiting/releases/0.97beta1/waiting/templates/
    XoopsModules/waiting/releases/0.97beta1/waiting/templates/.htaccess
    XoopsModules/waiting/releases/0.97beta1/waiting/templates/blocks/
    XoopsModules/waiting/releases/0.97beta1/waiting/templates/blocks/index.html
    XoopsModules/waiting/releases/0.97beta1/waiting/templates/blocks/waiting_block_waiting.html
    XoopsModules/waiting/releases/0.97beta1/waiting/templates/index.html
    XoopsModules/waiting/releases/0.97beta1/waiting/xoops_version.php

Added: XoopsModules/waiting/releases/0.97/waiting/admin/about.php
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/admin/about.php	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/admin/about.php	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Birthday 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://www.xoops.org)
+ * @license      GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package    birthday
+ * @since        2.5.0
+ * @author     XOOPS Module Team
+ * @version    $Id $
+ **/
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('WKFZBRBGMYKCA', false);
+
+include 'admin_footer.php';


Property changes on: XoopsModules/waiting/releases/0.97/waiting/admin/about.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/waiting/releases/0.97/waiting/admin/admin_footer.php
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/admin/admin_footer.php	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/admin/admin_footer.php	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,16 @@
+<?php
+// $Id$
+// FILE		::	index.php
+// AUTHOR	::	Ryuji AMANO <in...@ry...>
+// WEB		::	Ryu's Planning <http://ryus.co.jp/>
+//
+
+
+echo "<div class='adminfooter'>\n"
+    ."  <div style='text-align: center;'>\n"
+    ."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+    ."  </div>\n"
+    ."  " . _AM_WAITING_FOOTER . "\n"
+    ."</div>";
+
+xoops_cp_footer();


Property changes on: XoopsModules/waiting/releases/0.97/waiting/admin/admin_footer.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/waiting/releases/0.97/waiting/admin/admin_header.php
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/admin/admin_header.php	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/admin/admin_header.php	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,31 @@
+<?php
+// $Id$
+// FILE		::	index.php
+// AUTHOR	::	Ryuji AMANO <in...@ry...>
+// WEB		::	Ryu's Planning <http://ryus.co.jp/>
+//
+
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
+
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))) {
+        include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+    } else {
+        redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+    }


Property changes on: XoopsModules/waiting/releases/0.97/waiting/admin/admin_header.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/waiting/releases/0.97/waiting/admin/index.php
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/admin/index.php	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/admin/index.php	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,19 @@
+<?php
+// $Id$
+// FILE		::	index.php
+// AUTHOR	::	Ryuji AMANO <in...@ry...>
+// WEB		::	Ryu's Planning <http://ryus.co.jp/>
+//
+
+
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+    $indexAdmin = new ModuleAdmin();
+
+    echo $indexAdmin->addNavigation('index.php');
+    echo $indexAdmin->renderIndex();
+
+include 'admin_footer.php';


Property changes on: XoopsModules/waiting/releases/0.97/waiting/admin/index.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/waiting/releases/0.97/waiting/admin/main.php
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/admin/main.php	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/admin/main.php	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,34 @@
+<?php
+// $Id$
+// FILE		::	index.php
+// AUTHOR	::	Ryuji AMANO <in...@ry...>
+// WEB		::	Ryu's Planning <http://ryus.co.jp/>
+//
+
+require_once '../../../include/cp_header.php';
+require_once dirname(dirname(__FILE__)).'/include/functions.php' ;
+include_once dirname(__FILE__) . '/admin_header.php';
+xoops_cp_header();
+
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('main.php');
+
+$plugins_path = XOOPS_ROOT_PATH . "/modules/waiting/plugins";
+$module_handler =& xoops_gethandler('module');
+$block = array();
+
+
+$mod_lists = $module_handler->getList(new Criteria(1,1),true);
+echo "<h4>"._AM_WAITING_PLUGINLIST."</h4>";
+echo "<table class='outer'>";
+echo "<th>"._AM_WAITING_MODNAME."</th><th>"._AM_WAITING_DIRNAME."</th><th>"._AM_WAITING_STATUS."</th>";// dirname added by cesag
+foreach ($mod_lists as $dirname => $name) {
+    $style = ( @$style == "odd" ) ? "even" : "odd" ;
+    $plugin_info = waiting_get_plugin_info( $dirname ) ;
+    printf( "<tr class='%s'><td>%s</td><td>%s</td><td>%s</td></tr>" , $style , htmlspecialchars( $name ) , htmlspecialchars( $dirname ) , @$plugin_info['type'] ) ;
+}
+echo "</table>";
+echo _AM_WAITING_PLUGINLIST_DESC;
+
+
+include 'admin_footer.php';


Property changes on: XoopsModules/waiting/releases/0.97/waiting/admin/main.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/waiting/releases/0.97/waiting/admin/menu.php
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/admin/menu.php	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/admin/menu.php	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,27 @@
+<?php
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+
+//xoops_loadLanguage('admin', $dirname);
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]["title"] = _MI_WAITING_MENU_HOME;
+$adminmenu[$i]["link"] = 'admin/index.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
+
+++$i;
+$adminmenu[$i]["title"] = _MI_WAITING_MENU_PLUGINS;
+$adminmenu[$i]["link"] = 'admin/main.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/search.png';
+
+++$i;
+$adminmenu[$i]["title"] = _MI_WAITING_MENU_ABOUT;
+$adminmenu[$i]["link"] = 'admin/about.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';


Property changes on: XoopsModules/waiting/releases/0.97/waiting/admin/menu.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/waiting/releases/0.97/waiting/blocks/.htaccess
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/blocks/.htaccess	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/blocks/.htaccess	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,2 @@
+order deny,allow
+deny from all

Added: XoopsModules/waiting/releases/0.97/waiting/blocks/index.html
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/blocks/index.html	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/blocks/index.html	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/waiting/releases/0.97/waiting/blocks/waiting_waiting.php
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/blocks/waiting_waiting.php	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/blocks/waiting_waiting.php	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,160 @@
+<?php
+// $Id$
+//  ------------------------------------------------------------------------ //
+//                XOOPS - PHP Content Management System                      //
+//                    Copyright (c) 2000 XOOPS.org                           //
+//                       <http://www.xoops.org/>                             //
+//  ------------------------------------------------------------------------ //
+//  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.                                      //
+//                                                                           //
+//  You may not change or alter any portion of this comment or credits       //
+//  of supporting developers from this source code or any supporting         //
+//  source code which is considered copyrighted (c) material of the          //
+//  original comment or credit authors.                                      //
+//                                                                           //
+//  This program is distributed in the hope that it will be useful,          //
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
+//  GNU General Public License for more details.                             //
+//                                                                           //
+//  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
+//  ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu)                                          //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project                                                //
+// ------------------------------------------------------------------------- //
+
+// EXTENSIBLE "waiting block" by plugins in both waiting and modules
+
+/**
+ * @param $options
+ *
+ * @return array
+ */
+function b_waiting_waiting_show($options)
+{
+    global $xoopsUser, $xoopsConfig;
+
+    $userlang = $xoopsConfig['language'] ;
+
+    $sql_cache_min = empty( $options[1] ) ? 0 : intval( $options[1] ) ;
+    $sql_cache_file = XOOPS_CACHE_PATH.'/waiting_touch' ;
+
+    // SQL cache check (you have to use this cache with block's cache by system)
+    if ( file_exists( $sql_cache_file ) ) {
+        $sql_cache_mtime = filemtime( $sql_cache_file ) ;
+        if( time() < $sql_cache_mtime + $sql_cache_min * 60 ) return array() ;
+        else {
+            unlink( $sql_cache_file ) ;
+        }
+    }
+
+    require_once dirname(dirname(__FILE__)).'/include/functions.php' ;
+
+    // read language files for plugins
+    $lang_dir = XOOPS_ROOT_PATH . "/modules/waiting/language";
+    if ( file_exists( "$lang_dir/$userlang/plugins.php" ) ) {
+        include_once( "$lang_dir/$userlang/plugins.php" ) ;
+    } elseif ( file_exists( "$lang_dir/english/plugins.php" ) ) {
+        include_once( "$lang_dir/english/plugins.php" ) ;
+    }
+
+    $plugins_path = XOOPS_ROOT_PATH . "/modules/waiting/plugins";
+    $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
+    $module_handler =& xoops_gethandler('module');
+    $block = array();
+
+    // get module's list installed
+    $mod_lists = $module_handler->getList(new Criteria(1,1),true);
+    foreach ($mod_lists as $dirname => $name) {
+
+        $plugin_info = waiting_get_plugin_info( $dirname , $xoopsConfig['language'] ) ;
+        if( empty( $plugin_info ) || empty( $plugin_info['plugin_path'] ) ) continue ;
+
+        if ( ! empty( $plugin_info['langfile_path'] ) ) {
+            include_once $plugin_info['langfile_path'] ;
+        }
+        include_once $plugin_info['plugin_path'] ;
+
+        // call the plugin
+        if ( function_exists( @$plugin_info['func'] ) ) {
+            // get the list of waitings
+            $_tmp = call_user_func( $plugin_info['func'] , $dirname ) ;
+            if ( isset( $_tmp["lang_linkname"] ) ) {
+                if (@$_tmp["pendingnum"] > 0 || $options[0] > 0) {
+                    $block["modules"][$dirname]["pending"][] = $_tmp;
+                }
+                unset( $_tmp ) ;
+            } else {
+                // Judging the plugin returns multiple items
+                // if lang_linkname does not exist
+                foreach ($_tmp as $_one) {
+                    if (@$_one["pendingnum"] > 0 || $options[0] > 0) {
+                        $block["modules"][$dirname]["pending"][] = $_one;
+                    }
+                }
+            }
+        }
+
+        // for older compatibilities
+        // Hacked by GIJOE
+        $i = 0 ;
+        while (1) {
+            $function_name = "b_waiting_{$dirname}_$i" ;
+            if (function_exists( $function_name )) {
+                $_tmp = call_user_func( $function_name ) ;
+                ++ $i ;
+                if ($_tmp["pendingnum"] > 0 || $options[0] > 0) {
+                    $block["modules"][$dirname]["pending"][] = $_tmp;
+                }
+                unset($_tmp);
+            } else break ;
+        }
+        // End of Hack
+
+        // if (count($block["modules"][$dirname]) > 0) {
+        if ( ! empty( $block["modules"][$dirname] ) ) {
+            $block["modules"][$dirname]["name"] = $name;
+        }
+    }
+    //print_r($block);
+
+    // SQL cache touch (you have to use this cache with block's cache by system)
+    if ( empty( $block ) && $sql_cache_min > 0 ) {
+        $fp = fopen( $sql_cache_file , "w" ) ;
+        fclose( $fp ) ;
+    }
+
+    return $block ;
+}
+
+/**
+ * @param $options
+ *
+ * @return string
+ */
+function b_waiting_waiting_edit($options)
+{
+    $mod_url = XOOPS_URL."/modules/waiting" ;
+
+    $sql_cache_min = empty( $options[1] ) ? 0 : intval( $options[1] ) ;
+
+    $form = _MB_WAITING_NOWAITING_DISPLAY.":&nbsp;<input type='radio' name='options[0]' value='1'";
+    if ($options[0] == 1) {
+        $form .= " checked='checked'";
+    }
+    $form .= " />&nbsp;"._YES."<input type='radio' name='options[0]' value='0'";
+    if ($options[0] == 0) {
+        $form .= " checked='checked'";
+    }
+    $form .=" />&nbsp;"._NO."<br />\n";
+    $form .= sprintf( _MINUTES , _MB_WAITING_SQL_CACHE.":&nbsp;<input type='text' name='options[1]' value='$sql_cache_min' size='2' />" ) ;
+    $form .="<br />\n<br />\n<a href='$mod_url/admin/index.php'><img src='$mod_url/images/folder16.gif' />"._MB_WAITING_LINKTOPLUGINCHECK."</a>" ;
+
+    return $form;
+}


Property changes on: XoopsModules/waiting/releases/0.97/waiting/blocks/waiting_waiting.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/waiting/releases/0.97/waiting/docs/changelog.txt
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/docs/changelog.txt	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/docs/changelog.txt	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,184 @@
+---------------------------------------
+0.97 Final (2014/03/15)
+---------------------------------------
+- small cosmetic code changes (mamba)
+
+---------------------------------------
+0.97 beta 1 (2013/04/25)
+---------------------------------------
+- System plugin link corrected (alain 01)
+- xoopstube plugin added (alain 01)
+- Publisher and extgallery plugin added (Grom)
+- Replacing all Database::getInstance to XoopsDatabaseFactory::getDatabaseConnection (cesag)
+- language files updated for Transifex (cesag)
+- adslight plugin added (cesag)
+- define 'dirname' added, see docs/lang_diff.txt (cesag)
+
+---------------------------------------
+0.96 (2012/12/22)
+---------------------------------------
+- converted to AdminModule GUI (mamba)
+
+---------------------------------------
+0.95 (2009/4/22)
+---------------------------------------
+- added D3 module ready
+- added french (thx marco)
+- added portuguesebr (thx Izzy)
+- added persian (thx stranger) 0.95a
+- a plugin added
+-- eguide (by tes) 0.95b
+- languge files added
+-- ja_utf8 0.95c
+
+---------------------------------------
+0.94b
+---------------------------------------
+- modified the module icon (thx Argon)
+- 2 pugins added
+-- extcal (thx alain01)
+-- articles (thx twilo)
+
+---------------------------------------
+0.94a
+---------------------------------------
+- fixed a typo in plugins/yomi.php (thx yshima)
+
+---------------------------------------
+0.94
+---------------------------------------
+- removed CRs in some php files
+- a plugin added
+-- XFSection (thx Bezoops)
+
+:ver 0.93|
+- updated Italian (thx flying.tux)
+- a plugin added
+-- SmartPartner (thx mariuss)
+
+---------------------------------------
+0.92
+---------------------------------------
+- add SQL cache
+- fixed some typos (thx karedokx)
+- 2 plugin modified
+-- WF-Section (thx karedokx)
+-- catads (thx Alain01)
+- 2 plugins added
+-- WordBook (thx AgD)
+-- recette (thx karedokx)
+
+---------------------------------------
+0.91
+---------------------------------------
+- updated Italian (thx flying.tux)
+
+---------------------------------------
+0.90
+---------------------------------------
+- modified the structure of the directory for plugins
+- modified system plugin (thx gravies)
+- 3 plugins added
+-- newbb2 or CBB (thx gravies)
+-- catads (thx Alain01)
+-- WF-links (thx flying.tux)
+
+---------------------------------------
+0.86 by flying.tux
+---------------------------------------
+- Italian updated
+- 2 plug-ins added
+-- PDlinks (thx flying.tux)
+-- PDdownloads (thx flying.tux)
+
+---------------------------------------
+0.85 by GIJOE
+---------------------------------------
+- modified the dependencies of language files and constants radically
+
+---------------------------------------
+0.84 by GIJOE
+---------------------------------------
+- fixed a typo in the form for block's options (thx flying.tux)
+- fixed some Notices in "not always" mode
+- 2 plug-ins added
+-- xfguestbook (thx karedokx) (0.84a)
+-- AMS (thx karedokx) (0.84a)
+- a plug-in modified
+-- weblinks (thx Tom_G3X) (0.84b)
+
+---------------------------------------
+0.83| by GIJOE
+---------------------------------------
+- fixed missing a Creteria in getList()
+
+---------------------------------------
+0.82 by flying.tux
+---------------------------------------
+- few modifications in English
+- few modifications in Italian
+- 1 plug-in added
+-- smartsection(thx flying.tux)
+
+---------------------------------------
+0.81 by GIJOE
+---------------------------------------
+- changed the route to admin (from block's option edit)
+- modified English
+- added some protections against direct accessing
+- Italian added(thx flying.tux)
+- 1 plug-in added
+-- xyp4all(thx flying.tux)
+
+---------------------------------------
+0.8
+---------------------------------------
+-- modified as reading plug-in from module's directory if it exists
+-- multiple waitings can be returned from single function
+--- almost plug-ins are modified along this new spec by GIJOE
+-- modified the template as watings belonging modules
+--- English and Japanese text are shorten by GIJOE
+- 1 plug-in added
+-- Weblinks(by Ryuji)
+
+---------------------------------------
+0.7c
+---------------------------------------
+-- 1 plug-in added
+--- WordPress ME(by nobunobu) multiple
+
+---------------------------------------
+0.7b
+---------------------------------------
+-- 1 plug-in added
+--- SmartFAQ (by mariuss)
+
+---------------------------------------
+0.7a
+---------------------------------------
+-- 1 plug-in added
+--- WF-Downloads (by coldfire)
+
+---------------------------------------
+0.7
+---------------------------------------
+-- 2 language files added
+--- spanish (by ColdBeer)
+--- swedish (by Leif Madsen)
+-- 1 plug-in added
+--- xcGallery (by nao-pon)
+
+---------------------------------------
+0.6
+---------------------------------------
+-- An option added whether it is displayed when no wating exists
+-- 3 plug-ins added
+--- Addresses (by gruessle)
+--- MyAds (by Tom_G3X)
+--- Tutorials (by GIJOE)
+
+---------------------------------------
+0.5
+---------------------------------------
+-- some plug-ins added
+-- English document file - is this - added.

Added: XoopsModules/waiting/releases/0.97/waiting/docs/credits.txt
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/docs/credits.txt	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/docs/credits.txt	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,6 @@
+Credits
+===============
+
+Originally developed by Ryuji (http://ryus.co.jp/)
+
+Improved by GiJOE (http://xoops.peak.ne.jp)
\ No newline at end of file

Added: XoopsModules/waiting/releases/0.97/waiting/docs/index.html
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/docs/index.html	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/docs/index.html	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/waiting/releases/0.97/waiting/docs/install.txt
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/docs/install.txt	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/docs/install.txt	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,6 @@
+INSTALL/UNISTALL
+=================
+
+No special measures necessary, follow the standard installation process \x96 extract the module folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
+
+Detailed instructions on installing modules are available in the XOOPS Operations Manual: http://goo.gl/adT2i
\ No newline at end of file

Added: XoopsModules/waiting/releases/0.97/waiting/docs/lang_diff.txt
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/docs/lang_diff.txt	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/docs/lang_diff.txt	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,19 @@
+LANGUAGE DIFFERENCES
+=====================
+
+Below are language differences from a version to next version.
+
+Version 0.97
+
+waiting\language\english\admin.php
+	Line 8: define('_AM_WAITING_DIRNAME',"Directory name");
+
+--------------------------------------------------------------
+
+Version 0.96
+
+waiting\language\english\modinfo.php
+
++ _MI_WAITING_MENU_HOME
++ _MI_WAITING_MENU_ABOUT
++ _MI_WAITING_MENU_PLUGINS
\ No newline at end of file

Added: XoopsModules/waiting/releases/0.97/waiting/docs/licence.txt
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/docs/licence.txt	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/docs/licence.txt	2014-03-17 13:49:38 UTC (rev 12389)
@@ -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: XoopsModules/waiting/releases/0.97/waiting/docs/readme.txt
===================================================================
--- XoopsModules/waiting/releases/0.97/waiting/docs/readme.txt	                        (rev 0)
+++ XoopsModules/waiting/releases/0.97/waiting/docs/readme.txt	2014-03-17 13:49:38 UTC (rev 12389)
@@ -0,0 +1,98 @@
+README
+===========
+
+- WAITING MODULE -
+
+This module offers you an extensible waiting contents block into your XOOPS.
+
+The original XOOPS block of "Waiting Contents" works only for official modules,
+and is no longer extensible.
+It is nonsense to have to do Hack for yourself when you use 3rd party modules.
+
+By installing this module and adding proper plug-ins only,
+you as webmaster can confirm any approval waitings of any modules at one view.
+
+NEW FEATURE in 0.96
+
+Update to XOOPS 2.5.0 ModuleAdmin GUI
+
+NEW FEATURE in 0.8
+
+- plug-ins for waiting can be placed inside module's directory
+
+If you as module developper put your plug-in as modules/(your module)/include/waiting.plugin.php, waiting module will find it.
+The plugin in module's directory has higher prioriy than the plugin in waiting's directory.
+
+- multiple waitings can be returned from single function
+
+You can return waitings multiplly with the format as follows:
+[code]
+array(
+  array("adminlink"=>URL",
+        "pendingnum"=>NUM,
+        "lang_linkname"=>LINKNAME),
+  array("adminlink"=>URL",
+        "pendingnum"=>NUM,
+        "lang_linkname"=>LINKNAME),
+  array("adminlink"=>URL",
+        "pendingnum"=>NUM,
+        "lang_linkname"=>LINKNAME)
+)
+[/code]
+
+If you'll return just one waiting, this format is also ok.
+[code]
+  array("adminlink"=>URL",
+        "pendingnum"=>NUM,
+        "lang_linkname"=>LINKNAME)
+[/code]
+It will be deprecated functions named b_waiting_(dirname)_X
+
+- modified the template as watings belonging modules
+
+This modification makes that plug-ins need not to return the information of the module. It is enough to display short message like "submitted".
+
+
+
+This module is made by Ryuji (http://ryus.co.jp/)
+If you can read Japanese, let's visit Ryuji's site!
+
+PLUGINS:
+
+-addresses (by gruessle)
+-Agenda-X (by GIJOE)
+-AMS (by karedokx)
+-articles (by twilo)
+-catads (by Alain01)
+-CBB (by gravies)
+-extcal (by alain01)
+-MyAds (by Tom_G3X)
+-myAlbum-P (by GIJOE) multiple
+-mydownloads (by GIJOE)
+-mylinks(by GIJOE)
+-newbb2 (by gravies)
+-news (by GIJOE)
+-PDlinks (by flying.tux)
+-PDdownloads (by flying.tux)
+-piCal (by GIJOE) (>=0.8 has the module side plugin)
+-pico (by GIJOE) (D3 module side plugin)
+-popnupblog (by dashboard)
+-simpleblog (by kousuke)
+-smartfaq (by mariuss)
+-smartpartner (by mariuss)
+-smartsection (by flying.tux)
+-system -- comments (by GIJOE)
+-tutorials (by GIJOE)
+-weblinks (by Tom_G3X)
+-WF-downloads (by coldfire, flying.tux)
+-WF-links (by flying.tux)
+-WF-Sections (by GIJOE)
+-WordBook (by AgD)
+-WordPress ME (by nobunobu) multiple (>=0.5 has the module side plugin)
+-xcGallery (by nao-pon)
+-xDirectory (by GIJOE)
+-xfguestbook (by karedokx)
+-xfsection (by Bezoops)
+-xyp4all (by flying.tux)
+-yomi search (by nao-pon)
+-eguide (by tes)
\ No newline at end of file

Added: XoopsModules/waiting/releases/0.97/waiting/images/folder16.gif
===================================================================
(Binary files...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops-svn:[12388] XoopsModules/waiting/trunk/waiting

[<be...@us...>]

Revision: 12388
          http://sourceforge.net/p/xoops/svn/12388
Author:   beckmi
Date:     2014-03-17 13:42:27 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
Upgrading to 0.97 Final

Modified Paths:
--------------
    XoopsModules/waiting/trunk/waiting/admin/about.php
    XoopsModules/waiting/trunk/waiting/admin/admin_footer.php
    XoopsModules/waiting/trunk/waiting/admin/admin_header.php
    XoopsModules/waiting/trunk/waiting/admin/index.php
    XoopsModules/waiting/trunk/waiting/admin/main.php
    XoopsModules/waiting/trunk/waiting/admin/menu.php
    XoopsModules/waiting/trunk/waiting/blocks/waiting_waiting.php
    XoopsModules/waiting/trunk/waiting/docs/changelog.txt
    XoopsModules/waiting/trunk/waiting/include/functions.php
    XoopsModules/waiting/trunk/waiting/include/updateblock.inc.php
    XoopsModules/waiting/trunk/waiting/language/english/admin.php
    XoopsModules/waiting/trunk/waiting/language/english/blocks.php
    XoopsModules/waiting/trunk/waiting/language/english/modinfo.php
    XoopsModules/waiting/trunk/waiting/language/english/plugins.php
    XoopsModules/waiting/trunk/waiting/plugins/AMS.php
    XoopsModules/waiting/trunk/waiting/plugins/PDdownloads.php
    XoopsModules/waiting/trunk/waiting/plugins/PDlinks.php
    XoopsModules/waiting/trunk/waiting/plugins/TDMDownloads.php
    XoopsModules/waiting/trunk/waiting/plugins/addresses.php
    XoopsModules/waiting/trunk/waiting/plugins/adslight.php
    XoopsModules/waiting/trunk/waiting/plugins/agendax.php
    XoopsModules/waiting/trunk/waiting/plugins/articles.php
    XoopsModules/waiting/trunk/waiting/plugins/catads.php
    XoopsModules/waiting/trunk/waiting/plugins/eguide.php
    XoopsModules/waiting/trunk/waiting/plugins/extcal.php
    XoopsModules/waiting/trunk/waiting/plugins/extgallery.php
    XoopsModules/waiting/trunk/waiting/plugins/myAds.php
    XoopsModules/waiting/trunk/waiting/plugins/myalbum.php
    XoopsModules/waiting/trunk/waiting/plugins/mydownloads.php
    XoopsModules/waiting/trunk/waiting/plugins/mylinks.php
    XoopsModules/waiting/trunk/waiting/plugins/newbb.php
    XoopsModules/waiting/trunk/waiting/plugins/news.php
    XoopsModules/waiting/trunk/waiting/plugins/piCal.php
    XoopsModules/waiting/trunk/waiting/plugins/popnupblog.php
    XoopsModules/waiting/trunk/waiting/plugins/publisher.php
    XoopsModules/waiting/trunk/waiting/plugins/recette.php
    XoopsModules/waiting/trunk/waiting/plugins/simpleblog.php
    XoopsModules/waiting/trunk/waiting/plugins/smartfaq.php
    XoopsModules/waiting/trunk/waiting/plugins/smartpartner.php
    XoopsModules/waiting/trunk/waiting/plugins/smartsection.php
    XoopsModules/waiting/trunk/waiting/plugins/system.php
    XoopsModules/waiting/trunk/waiting/plugins/tutorials.php
    XoopsModules/waiting/trunk/waiting/plugins/weblinks.php
    XoopsModules/waiting/trunk/waiting/plugins/wfdownloads.php
    XoopsModules/waiting/trunk/waiting/plugins/wflinks.php
    XoopsModules/waiting/trunk/waiting/plugins/wfsection.php
    XoopsModules/waiting/trunk/waiting/plugins/wordbook.php
    XoopsModules/waiting/trunk/waiting/plugins/wordpress.php
    XoopsModules/waiting/trunk/waiting/plugins/xcgal.php
    XoopsModules/waiting/trunk/waiting/plugins/xdirectory.php
    XoopsModules/waiting/trunk/waiting/plugins/xfguestbook.php
    XoopsModules/waiting/trunk/waiting/plugins/xfsection.php
    XoopsModules/waiting/trunk/waiting/plugins/xoopstube.php
    XoopsModules/waiting/trunk/waiting/plugins/xyp4all.php
    XoopsModules/waiting/trunk/waiting/plugins/yomi.php
    XoopsModules/waiting/trunk/waiting/xoops_version.php

Modified: XoopsModules/waiting/trunk/waiting/admin/about.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/admin/about.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/admin/about.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -1,29 +1,29 @@
-<?php
-/**
- * Birthday 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://www.xoops.org)
- * @license      GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package    birthday
- * @since        2.5.0
- * @author     XOOPS Module Team
- * @version    $Id $
- **/
-
-include_once dirname(__FILE__) . '/admin_header.php';
-
-xoops_cp_header();
-
-$aboutAdmin = new ModuleAdmin();
-
-echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderAbout('WKFZBRBGMYKCA', false);
-
-include 'admin_footer.php';
\ No newline at end of file
+<?php
+/**
+ * Birthday 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://www.xoops.org)
+ * @license      GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package    birthday
+ * @since        2.5.0
+ * @author     XOOPS Module Team
+ * @version    $Id $
+ **/
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('WKFZBRBGMYKCA', false);
+
+include 'admin_footer.php';

Modified: XoopsModules/waiting/trunk/waiting/admin/admin_footer.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/admin/admin_footer.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/admin/admin_footer.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -13,4 +13,4 @@
     ."  " . _AM_WAITING_FOOTER . "\n"
     ."</div>";
 
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();

Modified: XoopsModules/waiting/trunk/waiting/admin/admin_header.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/admin/admin_header.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/admin/admin_header.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -1,31 +1,31 @@
-<?php
-// $Id: index.php,v 1.2 2005/04/06 09:49:05 gij Exp $
-// FILE		::	index.php
-// AUTHOR	::	Ryuji AMANO <in...@ry...>
-// WEB		::	Ryu's Planning <http://ryus.co.jp/>
-//
-
-
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-include_once $path . '/mainfile.php';
-include_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
-
-global $xoopsModule;
-
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
-
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
-$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
-        include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-    }else{
-        redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
-    }
\ No newline at end of file
+<?php
+// $Id: index.php,v 1.2 2005/04/06 09:49:05 gij Exp $
+// FILE		::	index.php
+// AUTHOR	::	Ryuji AMANO <in...@ry...>
+// WEB		::	Ryu's Planning <http://ryus.co.jp/>
+//
+
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
+
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))) {
+        include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+    } else {
+        redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+    }

Modified: XoopsModules/waiting/trunk/waiting/admin/index.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/admin/index.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/admin/index.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -1,19 +1,19 @@
-<?php
-// $Id: index.php,v 1.2 2005/04/06 09:49:05 gij Exp $
-// FILE		::	index.php
-// AUTHOR	::	Ryuji AMANO <in...@ry...>
-// WEB		::	Ryu's Planning <http://ryus.co.jp/>
-//
-
-
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-include_once dirname(__FILE__) . '/admin_header.php';
-
-xoops_cp_header();
-
-	$indexAdmin = new ModuleAdmin();
-
-    echo $indexAdmin->addNavigation('index.php');
-    echo $indexAdmin->renderIndex();
-
-include "admin_footer.php";
\ No newline at end of file
+<?php
+// $Id: index.php,v 1.2 2005/04/06 09:49:05 gij Exp $
+// FILE		::	index.php
+// AUTHOR	::	Ryuji AMANO <in...@ry...>
+// WEB		::	Ryu's Planning <http://ryus.co.jp/>
+//
+
+
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+    $indexAdmin = new ModuleAdmin();
+
+    echo $indexAdmin->addNavigation('index.php');
+    echo $indexAdmin->renderIndex();
+
+include 'admin_footer.php';

Modified: XoopsModules/waiting/trunk/waiting/admin/main.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/admin/main.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/admin/main.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -5,7 +5,7 @@
 // WEB		::	Ryu's Planning <http://ryus.co.jp/>
 //
 
-require_once "../../../include/cp_header.php";
+require_once '../../../include/cp_header.php';
 require_once dirname(dirname(__FILE__)).'/include/functions.php' ;
 include_once dirname(__FILE__) . '/admin_header.php';
 xoops_cp_header();
@@ -22,21 +22,13 @@
 echo "<h4>"._AM_WAITING_PLUGINLIST."</h4>";
 echo "<table class='outer'>";
 echo "<th>"._AM_WAITING_MODNAME."</th><th>"._AM_WAITING_DIRNAME."</th><th>"._AM_WAITING_STATUS."</th>";// dirname added by cesag
-foreach( $mod_lists as $dirname => $name ) {
-	$style = ( @$style == "odd" ) ? "even" : "odd" ;
-	$plugin_info = waiting_get_plugin_info( $dirname ) ;
-	printf( "<tr class='%s'><td>%s</td><td>%s</td><td>%s</td></tr>" , $style , htmlspecialchars( $name ) , htmlspecialchars( $dirname ) , @$plugin_info['type'] ) ;
+foreach ($mod_lists as $dirname => $name) {
+    $style = ( @$style == "odd" ) ? "even" : "odd" ;
+    $plugin_info = waiting_get_plugin_info( $dirname ) ;
+    printf( "<tr class='%s'><td>%s</td><td>%s</td><td>%s</td></tr>" , $style , htmlspecialchars( $name ) , htmlspecialchars( $dirname ) , @$plugin_info['type'] ) ;
 }
 echo "</table>";
 echo _AM_WAITING_PLUGINLIST_DESC;
 
 
 include 'admin_footer.php';
-
-
-
-
-
-
-
-

Modified: XoopsModules/waiting/trunk/waiting/admin/menu.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/admin/menu.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/admin/menu.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -1,34 +1,27 @@
-<?php
-/**
- * Created by JetBrains PhpStorm.
- * User: Mamba
- * Date: 1/25/12
- * Time: 7:04 AM
- * To change this template use File | Settings | File Templates.
- */
-
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-
-$dirname = basename(dirname(dirname(__FILE__)));
-$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname($dirname);
-$pathIcon32 = $module->getInfo('icons32');
-
-//xoops_loadLanguage('admin', $dirname);
-
-$adminmenu = array();
-
-$i = 1;
-$adminmenu[$i]["title"] = _MI_WAITING_MENU_HOME;
-$adminmenu[$i]["link"] = 'admin/index.php';
-$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-
-$i++;
-$adminmenu[$i]["title"] = _MI_WAITING_MENU_PLUGINS;
-$adminmenu[$i]["link"] = 'admin/main.php';
-$adminmenu[$i]["icon"] = $pathIcon32.'/search.png';
-
-$i++;
-$adminmenu[$i]["title"] = _MI_WAITING_MENU_ABOUT;
-$adminmenu[$i]["link"] = 'admin/about.php';
-$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
\ No newline at end of file
+<?php
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+
+//xoops_loadLanguage('admin', $dirname);
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]["title"] = _MI_WAITING_MENU_HOME;
+$adminmenu[$i]["link"] = 'admin/index.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
+
+++$i;
+$adminmenu[$i]["title"] = _MI_WAITING_MENU_PLUGINS;
+$adminmenu[$i]["link"] = 'admin/main.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/search.png';
+
+++$i;
+$adminmenu[$i]["title"] = _MI_WAITING_MENU_ABOUT;
+$adminmenu[$i]["link"] = 'admin/about.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';

Modified: XoopsModules/waiting/trunk/waiting/blocks/waiting_waiting.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/blocks/waiting_waiting.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/blocks/waiting_waiting.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -31,122 +31,130 @@
 
 // EXTENSIBLE "waiting block" by plugins in both waiting and modules
 
+/**
+ * @param $options
+ *
+ * @return array
+ */
 function b_waiting_waiting_show($options)
 {
     global $xoopsUser, $xoopsConfig;
 
     $userlang = $xoopsConfig['language'] ;
 
-	$sql_cache_min = empty( $options[1] ) ? 0 : intval( $options[1] ) ;
-	$sql_cache_file = XOOPS_CACHE_PATH.'/waiting_touch' ;
+    $sql_cache_min = empty( $options[1] ) ? 0 : intval( $options[1] ) ;
+    $sql_cache_file = XOOPS_CACHE_PATH.'/waiting_touch' ;
 
-	// SQL cache check (you have to use this cache with block's cache by system)
-	if( file_exists( $sql_cache_file ) ) {
-		$sql_cache_mtime = filemtime( $sql_cache_file ) ;
-		if( time() < $sql_cache_mtime + $sql_cache_min * 60 ) return array() ;
-		else {
-			unlink( $sql_cache_file ) ;
-		}
-	}
+    // SQL cache check (you have to use this cache with block's cache by system)
+    if ( file_exists( $sql_cache_file ) ) {
+        $sql_cache_mtime = filemtime( $sql_cache_file ) ;
+        if( time() < $sql_cache_mtime + $sql_cache_min * 60 ) return array() ;
+        else {
+            unlink( $sql_cache_file ) ;
+        }
+    }
 
-	require_once dirname(dirname(__FILE__)).'/include/functions.php' ;
+    require_once dirname(dirname(__FILE__)).'/include/functions.php' ;
 
-	// read language files for plugins
-	$lang_dir = XOOPS_ROOT_PATH . "/modules/waiting/language";
-	if( file_exists( "$lang_dir/$userlang/plugins.php" ) ) {
-		include_once( "$lang_dir/$userlang/plugins.php" ) ;
-	} else if( file_exists( "$lang_dir/english/plugins.php" ) ) {
-		include_once( "$lang_dir/english/plugins.php" ) ;
-	}
+    // read language files for plugins
+    $lang_dir = XOOPS_ROOT_PATH . "/modules/waiting/language";
+    if ( file_exists( "$lang_dir/$userlang/plugins.php" ) ) {
+        include_once( "$lang_dir/$userlang/plugins.php" ) ;
+    } elseif ( file_exists( "$lang_dir/english/plugins.php" ) ) {
+        include_once( "$lang_dir/english/plugins.php" ) ;
+    }
 
-	$plugins_path = XOOPS_ROOT_PATH . "/modules/waiting/plugins";
-	$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
-	$module_handler =& xoops_gethandler('module');
-	$block = array();
+    $plugins_path = XOOPS_ROOT_PATH . "/modules/waiting/plugins";
+    $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
+    $module_handler =& xoops_gethandler('module');
+    $block = array();
 
-	// get module's list installed
-	$mod_lists = $module_handler->getList(new Criteria(1,1),true);
-	foreach( $mod_lists as $dirname => $name ) {
+    // get module's list installed
+    $mod_lists = $module_handler->getList(new Criteria(1,1),true);
+    foreach ($mod_lists as $dirname => $name) {
 
-		$plugin_info = waiting_get_plugin_info( $dirname , $xoopsConfig['language'] ) ;
-		if( empty( $plugin_info ) || empty( $plugin_info['plugin_path'] ) ) continue ;
+        $plugin_info = waiting_get_plugin_info( $dirname , $xoopsConfig['language'] ) ;
+        if( empty( $plugin_info ) || empty( $plugin_info['plugin_path'] ) ) continue ;
 
-		if( ! empty( $plugin_info['langfile_path'] ) ) {
-			include_once $plugin_info['langfile_path'] ;
-		}
-		include_once $plugin_info['plugin_path'] ;
+        if ( ! empty( $plugin_info['langfile_path'] ) ) {
+            include_once $plugin_info['langfile_path'] ;
+        }
+        include_once $plugin_info['plugin_path'] ;
 
-		// call the plugin
-		if( function_exists( @$plugin_info['func'] ) ) {
-			// get the list of waitings
-			$_tmp = call_user_func( $plugin_info['func'] , $dirname ) ;
-			if( isset( $_tmp["lang_linkname"] ) ) {
-				if( @$_tmp["pendingnum"] > 0 || $options[0] > 0){
-					$block["modules"][$dirname]["pending"][] = $_tmp;
-				}
-				unset( $_tmp ) ;
-			} else {
-				// Judging the plugin returns multiple items
-				// if lang_linkname does not exist
-				foreach( $_tmp as $_one ) {
-					if( @$_one["pendingnum"] > 0 || $options[0] > 0){
-						$block["modules"][$dirname]["pending"][] = $_one;
-					}
-				}
-			}
-		}
+        // call the plugin
+        if ( function_exists( @$plugin_info['func'] ) ) {
+            // get the list of waitings
+            $_tmp = call_user_func( $plugin_info['func'] , $dirname ) ;
+            if ( isset( $_tmp["lang_linkname"] ) ) {
+                if (@$_tmp["pendingnum"] > 0 || $options[0] > 0) {
+                    $block["modules"][$dirname]["pending"][] = $_tmp;
+                }
+                unset( $_tmp ) ;
+            } else {
+                // Judging the plugin returns multiple items
+                // if lang_linkname does not exist
+                foreach ($_tmp as $_one) {
+                    if (@$_one["pendingnum"] > 0 || $options[0] > 0) {
+                        $block["modules"][$dirname]["pending"][] = $_one;
+                    }
+                }
+            }
+        }
 
-		// for older compatibilities
-		// Hacked by GIJOE
-		$i = 0 ;
-		while( 1 ) {
-			$function_name = "b_waiting_{$dirname}_$i" ;
-			if (function_exists( $function_name )){
-				$_tmp = call_user_func( $function_name ) ;
-				++ $i ;
-				if($_tmp["pendingnum"] > 0 || $options[0] > 0){
-					$block["modules"][$dirname]["pending"][] = $_tmp;
-				}
-				unset($_tmp);
-			} else break ;
-		}
-		// End of Hack
+        // for older compatibilities
+        // Hacked by GIJOE
+        $i = 0 ;
+        while (1) {
+            $function_name = "b_waiting_{$dirname}_$i" ;
+            if (function_exists( $function_name )) {
+                $_tmp = call_user_func( $function_name ) ;
+                ++ $i ;
+                if ($_tmp["pendingnum"] > 0 || $options[0] > 0) {
+                    $block["modules"][$dirname]["pending"][] = $_tmp;
+                }
+                unset($_tmp);
+            } else break ;
+        }
+        // End of Hack
 
-		// if(count($block["modules"][$dirname]) > 0){
-		if ( ! empty( $block["modules"][$dirname] ) ) {
-			$block["modules"][$dirname]["name"] = $name;
-		}
-	}
-	//print_r($block);
+        // if (count($block["modules"][$dirname]) > 0) {
+        if ( ! empty( $block["modules"][$dirname] ) ) {
+            $block["modules"][$dirname]["name"] = $name;
+        }
+    }
+    //print_r($block);
 
-	// SQL cache touch (you have to use this cache with block's cache by system)
-	if( empty( $block ) && $sql_cache_min > 0 ) {
-		$fp = fopen( $sql_cache_file , "w" ) ;
-		fclose( $fp ) ;
-	}
+    // SQL cache touch (you have to use this cache with block's cache by system)
+    if ( empty( $block ) && $sql_cache_min > 0 ) {
+        $fp = fopen( $sql_cache_file , "w" ) ;
+        fclose( $fp ) ;
+    }
 
-	return $block ;
+    return $block ;
 }
 
-function b_waiting_waiting_edit($options){
+/**
+ * @param $options
+ *
+ * @return string
+ */
+function b_waiting_waiting_edit($options)
+{
+    $mod_url = XOOPS_URL."/modules/waiting" ;
 
-	$mod_url = XOOPS_URL."/modules/waiting" ;
+    $sql_cache_min = empty( $options[1] ) ? 0 : intval( $options[1] ) ;
 
-	$sql_cache_min = empty( $options[1] ) ? 0 : intval( $options[1] ) ;
+    $form = _MB_WAITING_NOWAITING_DISPLAY.":&nbsp;<input type='radio' name='options[0]' value='1'";
+    if ($options[0] == 1) {
+        $form .= " checked='checked'";
+    }
+    $form .= " />&nbsp;"._YES."<input type='radio' name='options[0]' value='0'";
+    if ($options[0] == 0) {
+        $form .= " checked='checked'";
+    }
+    $form .=" />&nbsp;"._NO."<br />\n";
+    $form .= sprintf( _MINUTES , _MB_WAITING_SQL_CACHE.":&nbsp;<input type='text' name='options[1]' value='$sql_cache_min' size='2' />" ) ;
+    $form .="<br />\n<br />\n<a href='$mod_url/admin/index.php'><img src='$mod_url/images/folder16.gif' />"._MB_WAITING_LINKTOPLUGINCHECK."</a>" ;
 
-	$form = _MB_WAITING_NOWAITING_DISPLAY.":&nbsp;<input type='radio' name='options[0]' value='1'";
-	if ( $options[0] == 1 ) {
-		$form .= " checked='checked'";
-	}
-	$form .= " />&nbsp;"._YES."<input type='radio' name='options[0]' value='0'";
-	if ( $options[0] == 0 ) {
-		$form .= " checked='checked'";
-	}
-	$form .=" />&nbsp;"._NO."<br />\n";
-	$form .= sprintf( _MINUTES , _MB_WAITING_SQL_CACHE.":&nbsp;<input type='text' name='options[1]' value='$sql_cache_min' size='2' />" ) ;
-	$form .="<br />\n<br />\n<a href='$mod_url/admin/index.php'><img src='$mod_url/images/folder16.gif' />"._MB_WAITING_LINKTOPLUGINCHECK."</a>" ;
-
-	return $form;
+    return $form;
 }
-
-?>
\ No newline at end of file

Modified: XoopsModules/waiting/trunk/waiting/docs/changelog.txt
===================================================================
--- XoopsModules/waiting/trunk/waiting/docs/changelog.txt	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/docs/changelog.txt	2014-03-17 13:42:27 UTC (rev 12388)
@@ -1,42 +1,179 @@
----------------------------------------
-1.06 Beta 1  2013-04-20
----------------------------------------
-- Converted to XOOPS 2.5.5 Admin GUI (Mamba)
-
----------------------------------------
-1.05 2008-12-08
----------------------------------------
-- updated README
-- updated mymenu
-- added language files
--- portuguesebr (thx leco1)
-
----------------------------------------
-1.04 2008-12-05
----------------------------------------
-- modified the compatibilities with XCL2.1
-- modified MySQL5 compatibility
-- changed altsys friendly module
-
----------------------------------------
-1.03 2006-07-13
----------------------------------------
-- modified xoops_version.php as hasMain=1 (thx Rollei)
-- added language files
--- persian (thx voltan) 1.03a
-
----------------------------------------
-1.02 2005-12-03
----------------------------------------
-- updated myblocksadmin 0.41 & mymenu 0.15a
-- updated module icon (thx argon)
-
----------------------------------------
-1.01   2005-07-21
----------------------------------------
-- fixed a bug in JavaScript (thx yamaichi)
-
----------------------------------------
-1.00   2005-05-25
----------------------------------------
-- the 1st release
+---------------------------------------
+0.97 beta 1 (2013/04/25)
+---------------------------------------
+- System plugin link corrected (alain 01)
+- xoopstube plugin added (alain 01)
+- Publisher and extgallery plugin added (Grom)
+- Replacing all Database::getInstance to XoopsDatabaseFactory::getDatabaseConnection (cesag)
+- language files updated for Transifex (cesag)
+- adslight plugin added (cesag)
+- define 'dirname' added, see docs/lang_diff.txt (cesag)
+
+---------------------------------------
+0.96 (2012/12/22)
+---------------------------------------
+- converted to AdminModule GUI (mamba)
+
+---------------------------------------
+0.95 (2009/4/22)
+---------------------------------------
+- added D3 module ready
+- added french (thx marco)
+- added portuguesebr (thx Izzy)
+- added persian (thx stranger) 0.95a
+- a plugin added
+-- eguide (by tes) 0.95b
+- languge files added
+-- ja_utf8 0.95c
+
+---------------------------------------
+0.94b
+---------------------------------------
+- modified the module icon (thx Argon)
+- 2 pugins added
+-- extcal (thx alain01)
+-- articles (thx twilo)
+
+---------------------------------------
+0.94a
+---------------------------------------
+- fixed a typo in plugins/yomi.php (thx yshima)
+
+---------------------------------------
+0.94
+---------------------------------------
+- removed CRs in some php files
+- a plugin added
+-- XFSection (thx Bezoops)
+
+:ver 0.93|
+- updated Italian (thx flying.tux)
+- a plugin added
+-- SmartPartner (thx mariuss)
+
+---------------------------------------
+0.92
+---------------------------------------
+- add SQL cache
+- fixed some typos (thx karedokx)
+- 2 plugin modified
+-- WF-Section (thx karedokx)
+-- catads (thx Alain01)
+- 2 plugins added
+-- WordBook (thx AgD)
+-- recette (thx karedokx)
+
+---------------------------------------
+0.91
+---------------------------------------
+- updated Italian (thx flying.tux)
+
+---------------------------------------
+0.90
+---------------------------------------
+- modified the structure of the directory for plugins
+- modified system plugin (thx gravies)
+- 3 plugins added
+-- newbb2 or CBB (thx gravies)
+-- catads (thx Alain01)
+-- WF-links (thx flying.tux)
+
+---------------------------------------
+0.86 by flying.tux
+---------------------------------------
+- Italian updated
+- 2 plug-ins added
+-- PDlinks (thx flying.tux)
+-- PDdownloads (thx flying.tux)
+
+---------------------------------------
+0.85 by GIJOE
+---------------------------------------
+- modified the dependencies of language files and constants radically
+
+---------------------------------------
+0.84 by GIJOE
+---------------------------------------
+- fixed a typo in the form for block's options (thx flying.tux)
+- fixed some Notices in "not always" mode
+- 2 plug-ins added
+-- xfguestbook (thx karedokx) (0.84a)
+-- AMS (thx karedokx) (0.84a)
+- a plug-in modified
+-- weblinks (thx Tom_G3X) (0.84b)
+
+---------------------------------------
+0.83| by GIJOE
+---------------------------------------
+- fixed missing a Creteria in getList()
+
+---------------------------------------
+0.82 by flying.tux
+---------------------------------------
+- few modifications in English
+- few modifications in Italian
+- 1 plug-in added
+-- smartsection(thx flying.tux)
+
+---------------------------------------
+0.81 by GIJOE
+---------------------------------------
+- changed the route to admin (from block's option edit)
+- modified English
+- added some protections against direct accessing
+- Italian added(thx flying.tux)
+- 1 plug-in added
+-- xyp4all(thx flying.tux)
+
+---------------------------------------
+0.8
+---------------------------------------
+-- modified as reading plug-in from module's directory if it exists
+-- multiple waitings can be returned from single function
+--- almost plug-ins are modified along this new spec by GIJOE
+-- modified the template as watings belonging modules
+--- English and Japanese text are shorten by GIJOE
+- 1 plug-in added
+-- Weblinks(by Ryuji)
+
+---------------------------------------
+0.7c
+---------------------------------------
+-- 1 plug-in added
+--- WordPress ME(by nobunobu) multiple
+
+---------------------------------------
+0.7b
+---------------------------------------
+-- 1 plug-in added
+--- SmartFAQ (by mariuss)
+
+---------------------------------------
+0.7a
+---------------------------------------
+-- 1 plug-in added
+--- WF-Downloads (by coldfire)
+
+---------------------------------------
+0.7
+---------------------------------------
+-- 2 language files added
+--- spanish (by ColdBeer)
+--- swedish (by Leif Madsen)
+-- 1 plug-in added
+--- xcGallery (by nao-pon)
+
+---------------------------------------
+0.6
+---------------------------------------
+-- An option added whether it is displayed when no wating exists
+-- 3 plug-ins added
+--- Addresses (by gruessle)
+--- MyAds (by Tom_G3X)
+--- Tutorials (by GIJOE)
+
+---------------------------------------
+0.5
+---------------------------------------
+-- some plug-ins added
+-- English document file - is this - added.
\ No newline at end of file

Modified: XoopsModules/waiting/trunk/waiting/include/functions.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/include/functions.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/include/functions.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -1,68 +1,72 @@
 <?php
 
+/**
+ * @param        $dirname
+ * @param string $language
+ *
+ * @return array
+ */
 function waiting_get_plugin_info( $dirname , $language = 'english' )
 {
-	// get $mytrustdirname for D3 modules
-	$mytrustdirname = '' ;
-	if( defined( 'XOOPS_TRUST_PATH' ) && file_exists( XOOPS_ROOT_PATH."/modules/".$dirname."/mytrustdirname.php" ) ) {
-		@include XOOPS_ROOT_PATH."/modules/".$dirname."/mytrustdirname.php" ;
-	}
+    // get $mytrustdirname for D3 modules
+    $mytrustdirname = '' ;
+    if ( defined( 'XOOPS_TRUST_PATH' ) && file_exists( XOOPS_ROOT_PATH."/modules/".$dirname."/mytrustdirname.php" ) ) {
+        @include XOOPS_ROOT_PATH."/modules/".$dirname."/mytrustdirname.php" ;
+    }
 
-	$module_plugin_file = XOOPS_ROOT_PATH."/modules/".$dirname."/include/waiting.plugin.php" ;
-	$d3module_plugin_file = XOOPS_TRUST_PATH."/modules/".$mytrustdirname."/include/waiting.plugin.php" ;
-	$builtin_plugin_file = XOOPS_ROOT_PATH."/modules/waiting/plugins/".$dirname.".php" ;
+    $module_plugin_file = XOOPS_ROOT_PATH."/modules/".$dirname."/include/waiting.plugin.php" ;
+    $d3module_plugin_file = XOOPS_TRUST_PATH."/modules/".$mytrustdirname."/include/waiting.plugin.php" ;
+    $builtin_plugin_file = XOOPS_ROOT_PATH."/modules/waiting/plugins/".$dirname.".php" ;
 
-	if( file_exists( $module_plugin_file ) ) {
-		// module side (1st priority)
-		$lang_files = array(
-			XOOPS_ROOT_PATH."/modules/$dirname/language/$language/waiting.php" ,
-			XOOPS_ROOT_PATH."/modules/$dirname/language/english/waiting.php" ,
-		) ;
-		$langfile_path = '' ;
-		foreach( $lang_files as $lang_file ) {
-			if( file_exists( $lang_file ) ) {
-				$langfile_path = $lang_file ;
-				break ;
-			}
-		}
-		$ret = array(
-			'plugin_path' => $module_plugin_file ,
-			'langfile_path' => $langfile_path ,
-			'func' => 'b_waiting_'.$dirname ,
-			'type' => 'module' ,
-		) ;
-	} else if( ! empty( $mytrustdirname ) && file_exists( $d3module_plugin_file ) ) {
-		// D3 module's plugin under xoops_trust_path (2nd priority)
-		$lang_files = array(
-			XOOPS_TRUST_PATH."/modules/$mytrustdirname/language/$language/waiting.php" ,
-			XOOPS_TRUST_PATH."/modules/$mytrustdirname/language/english/waiting.php" ,
-		) ;
-		$langfile_path = '' ;
-		foreach( $lang_files as $lang_file ) {
-			if( file_exists( $lang_file ) ) {
-				$langfile_path = $lang_file ;
-				break ;
-			}
-		}
-		$ret = array(
-			'plugin_path' => $d3module_plugin_file ,
-			'langfile_path' => $langfile_path ,
-			'func' => 'b_waiting_'.$mytrustdirname ,
-			'type' => 'module (D3)' ,
-		) ;
-	} else if( file_exists( $builtin_plugin_file ) ) {
-		// built-in plugin under modules/waiting (3rd priority)
-		$ret = array(
-			'plugin_path' => $builtin_plugin_file ,
-			'langfile_path' => '' ,
-			'func' => 'b_waiting_'.$dirname ,
-			'type' => 'Waiting' ,
-		) ;
-	} else {
-		$ret = array() ;
-	}
+    if ( file_exists( $module_plugin_file ) ) {
+        // module side (1st priority)
+        $lang_files = array(
+            XOOPS_ROOT_PATH."/modules/$dirname/language/$language/waiting.php" ,
+            XOOPS_ROOT_PATH."/modules/$dirname/language/english/waiting.php" ,
+        ) ;
+        $langfile_path = '' ;
+        foreach ($lang_files as $lang_file) {
+            if ( file_exists( $lang_file ) ) {
+                $langfile_path = $lang_file ;
+                break ;
+            }
+        }
+        $ret = array(
+            'plugin_path' => $module_plugin_file ,
+            'langfile_path' => $langfile_path ,
+            'func' => 'b_waiting_'.$dirname ,
+            'type' => 'module' ,
+        ) ;
+    } elseif ( ! empty( $mytrustdirname ) && file_exists( $d3module_plugin_file ) ) {
+        // D3 module's plugin under xoops_trust_path (2nd priority)
+        $lang_files = array(
+            XOOPS_TRUST_PATH."/modules/$mytrustdirname/language/$language/waiting.php" ,
+            XOOPS_TRUST_PATH."/modules/$mytrustdirname/language/english/waiting.php" ,
+        ) ;
+        $langfile_path = '' ;
+        foreach ($lang_files as $lang_file) {
+            if ( file_exists( $lang_file ) ) {
+                $langfile_path = $lang_file ;
+                break ;
+            }
+        }
+        $ret = array(
+            'plugin_path' => $d3module_plugin_file ,
+            'langfile_path' => $langfile_path ,
+            'func' => 'b_waiting_'.$mytrustdirname ,
+            'type' => 'module (D3)' ,
+        ) ;
+    } elseif ( file_exists( $builtin_plugin_file ) ) {
+        // built-in plugin under modules/waiting (3rd priority)
+        $ret = array(
+            'plugin_path' => $builtin_plugin_file ,
+            'langfile_path' => '' ,
+            'func' => 'b_waiting_'.$dirname ,
+            'type' => 'Waiting' ,
+        ) ;
+    } else {
+        $ret = array() ;
+    }
 
-	return $ret ;
+    return $ret ;
 }
-
-?>
\ No newline at end of file

Modified: XoopsModules/waiting/trunk/waiting/include/updateblock.inc.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/include/updateblock.inc.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/include/updateblock.inc.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -1,95 +1,93 @@
 <?php
 // $Id: updateblock.inc.php,v 1.1 2005/04/05 02:48:40 gij Exp $
 
-	if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
+    if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
 
-	// Keep Block option values when update (by nobunobu)
-	global $xoopsDB;
-	$query = "SELECT mid FROM ".$xoopsDB->prefix('modules')." WHERE dirname='".$modversion['dirname']."' ";
-	$result = $xoopsDB->query($query);
-	$record= $xoopsDB->fetcharray($result);
-	if ($record) {
-		$mid = $record['mid'];
-		$count = count($modversion['blocks']);
-		/* $sql = "SELECT * FROM ".$xoopsDB->prefix('newblocks')." WHERE mid=".$mid." AND block_type ='D'";
-		$fresult = $xoopsDB->query($sql);
-		$n_funcnum = $count;
-		while ($fblock = $xoopsDB->fetchArray($fresult)) {
-			$bnum = 0;
-			for ($i = 1 ; $i <= $count ; $i++) {
-				if (($modversion['blocks'][$i]['file'] == $fblock['func_file']) and ($modversion['blocks'][$i]['show_func'] == $fblock['show_func'])) {
-					$bnum = $i;
-					break;
-				}
-			}
-			if($bnum) {
-				$n_funcnum++;
-				$modversion['blocks'][$n_funcnum]['file'] = $fblock['func_file'];
-				$modversion['blocks'][$n_funcnum]['name'] = $fblock['name'];
-				$modversion['blocks'][$n_funcnum]['description'] = $fblock['name'];
-				$modversion['blocks'][$n_funcnum]['show_func'] = $fblock['show_func'];
-				$modversion['blocks'][$n_funcnum]['edit_func'] = $fblock['edit_func'];
-				$modversion['blocks'][$n_funcnum]['template'] = $fblock['template'];
-				if ($fblock['options']) {
-					$old_vals=explode("|",$fblock['options']);
-					$def_vals=explode("|",$modversion['blocks'][$bnum]['options']);
-					if (count($old_vals) == count($def_vals)) {
-						// the number of parameters is not changed
-						$modversion['blocks'][$n_funcnum]['options'] = $fblock['options'];
-						$local_msgs[] = "Option's values of the cloned block <b>".$fblock['name']."</b> will be kept. (value = <b>".$fblock['options']."</b>)";
-					} else if (count($old_vals) < count($def_vals)){
-						// the number of parameters is increased
-						for ($j=0; $j < count($old_vals); $j++) {
-							$def_vals[$j] = $old_vals[$j];
-						}
-						$modversion['blocks'][$n_funcnum]['options'] = implode("|",$def_vals);
-						$local_msgs[] = "Option's values of the cloned block <b>".$fblock['name']."</b> will be kept and new options are added. (value = <b>".$modversion['blocks'][$fblock['func_num']]['options']."</b>)";
-					} else {
-						$modversion['blocks'][$n_funcnum]['options'] = implode("|",$def_vals);
-						$local_msgs[] = "Option's values of the cloned block <b>".$fblock['name']."</b> will be reset to the default, because of some decrease of options. (value = <b>".$modversion['blocks'][$n_funcnum]['options']."</b>)";
-					}
-				}
-				$sql = "UPDATE ".$xoopsDB->prefix('newblocks')." SET func_num='$n_funcnum' WHERE mid=".$mid." AND bid='".$fblock['bid']."'";
-				$iret = $xoopsDB->query($sql);
+    // Keep Block option values when update (by nobunobu)
+    global $xoopsDB;
+    $query = "SELECT mid FROM ".$xoopsDB->prefix('modules')." WHERE dirname='".$modversion['dirname']."' ";
+    $result = $xoopsDB->query($query);
+    $record= $xoopsDB->fetcharray($result);
+    if ($record) {
+        $mid = $record['mid'];
+        $count = count($modversion['blocks']);
+        /* $sql = "SELECT * FROM ".$xoopsDB->prefix('newblocks')." WHERE mid=".$mid." AND block_type ='D'";
+        $fresult = $xoopsDB->query($sql);
+        $n_funcnum = $count;
+        while ($fblock = $xoopsDB->fetchArray($fresult)) {
+            $bnum = 0;
+            for ($i = 1 ; $i <= $count ; ++$i) {
+                if (($modversion['blocks'][$i]['file'] == $fblock['func_file']) and ($modversion['blocks'][$i]['show_func'] == $fblock['show_func'])) {
+                    $bnum = $i;
+                    break;
+                }
+            }
+            if ($bnum) {
+                $n_funcnum++;
+                $modversion['blocks'][$n_funcnum]['file'] = $fblock['func_file'];
+                $modversion['blocks'][$n_funcnum]['name'] = $fblock['name'];
+                $modversion['blocks'][$n_funcnum]['description'] = $fblock['name'];
+                $modversion['blocks'][$n_funcnum]['show_func'] = $fblock['show_func'];
+                $modversion['blocks'][$n_funcnum]['edit_func'] = $fblock['edit_func'];
+                $modversion['blocks'][$n_funcnum]['template'] = $fblock['template'];
+                if ($fblock['options']) {
+                    $old_vals=explode("|",$fblock['options']);
+                    $def_vals=explode("|",$modversion['blocks'][$bnum]['options']);
+                    if (count($old_vals) == count($def_vals)) {
+                        // the number of parameters is not changed
+                        $modversion['blocks'][$n_funcnum]['options'] = $fblock['options'];
+                        $local_msgs[] = "Option's values of the cloned block <b>".$fblock['name']."</b> will be kept. (value = <b>".$fblock['options']."</b>)";
+                    } elseif (count($old_vals) < count($def_vals)) {
+                        // the number of parameters is increased
+                        for ($j=0; $j < count($old_vals); $j++) {
+                            $def_vals[$j] = $old_vals[$j];
+                        }
+                        $modversion['blocks'][$n_funcnum]['options'] = implode("|",$def_vals);
+                        $local_msgs[] = "Option's values of the cloned block <b>".$fblock['name']."</b> will be kept and new options are added. (value = <b>".$modversion['blocks'][$fblock['func_num']]['options']."</b>)";
+                    } else {
+                        $modversion['blocks'][$n_funcnum]['options'] = implode("|",$def_vals);
+                        $local_msgs[] = "Option's values of the cloned block <b>".$fblock['name']."</b> will be reset to the default, because of some decrease of options. (value = <b>".$modversion['blocks'][$n_funcnum]['options']."</b>)";
+                    }
+                }
+                $sql = "UPDATE ".$xoopsDB->prefix('newblocks')." SET func_num='$n_funcnum' WHERE mid=".$mid." AND bid='".$fblock['bid']."'";
+                $iret = $xoopsDB->query($sql);
 
-			}
-		} */
-		
-		$sql = "SELECT * FROM ".$xoopsDB->prefix('newblocks')." WHERE mid=".$mid." AND block_type <>'D' AND func_num > $count";
-		$fresult = $xoopsDB->query($sql);
-		while ($fblock = $xoopsDB->fetchArray($fresult)) {
-			$local_msgs[] = "Non Defined Block <b>".$fblock['name']."</b> will be deleted";
-			$sql = "DELETE FROM ".$xoopsDB->prefix('newblocks')." WHERE bid='".$fblock['bid']."'";
-			$iret = $xoopsDB->query($sql);
-		}
-		
-		for ($i = 1 ; $i <= $count ; $i++) {
-			$sql = "SELECT name,options FROM ".$xoopsDB->prefix('newblocks')." WHERE mid=".$mid." AND func_num=".$i." AND show_func='".addslashes($modversion['blocks'][$i]['show_func'])."' AND func_file='".addslashes($modversion['blocks'][$i]['file'])."'";
-			$fresult = $xoopsDB->query($sql);
-			$fblock = $xoopsDB->fetchArray($fresult);
-			if ( isset( $fblock['options'] ) ) {
-				$old_vals=explode("|",$fblock['options']);
-				$def_vals=explode("|",$modversion['blocks'][$i]['options']);
-				if (count($old_vals) == count($def_vals)) {
-					$modversion['blocks'][$i]['options'] = $fblock['options'];
-					$local_msgs[] = "Option's values of the block <b>".$fblock['name']."</b> will be kept. (value = <b>".$fblock['options']."</b>)";
-				} else if (count($old_vals) < count($def_vals)){
-					for ($j=0; $j < count($old_vals); $j++) {
-						$def_vals[$j] = $old_vals[$j];
-					}
-					$modversion['blocks'][$i]['options'] = implode("|",$def_vals);
-					$local_msgs[] = "Option's values of the block <b>".$fblock['name']."</b> will be kept and new option(s) are added. (value = <b>".$modversion['blocks'][$i]['options']."</b>)";
-				} else {
-					$local_msgs[] = "Option's values of the block <b>".$fblock['name']."</b> will be reset to the default, because of some decrease of options. (value = <b>".$modversion['blocks'][$i]['options']."</b>)";
-				}
-			}
-		}
-	}
+            }
+        } */
 
-	global $msgs , $myblocksadmin_parsed_updateblock ;
-	if( ! empty( $msgs ) && empty( $myblocksadmin_parsed_updateblock ) ) {
-		$msgs = array_merge( $msgs , $local_msgs ) ;
-		$myblocksadmin_parsed_updateblock = true ;
-	}
+        $sql = "SELECT * FROM ".$xoopsDB->prefix('newblocks')." WHERE mid=".$mid." AND block_type <>'D' AND func_num > $count";
+        $fresult = $xoopsDB->query($sql);
+        while ($fblock = $xoopsDB->fetchArray($fresult)) {
+            $local_msgs[] = "Non Defined Block <b>".$fblock['name']."</b> will be deleted";
+            $sql = "DELETE FROM ".$xoopsDB->prefix('newblocks')." WHERE bid='".$fblock['bid']."'";
+            $iret = $xoopsDB->query($sql);
+        }
 
-?>
\ No newline at end of file
+        for ($i = 1 ; $i <= $count ; ++$i) {
+            $sql = "SELECT name,options FROM ".$xoopsDB->prefix('newblocks')." WHERE mid=".$mid." AND func_num=".$i." AND show_func='".addslashes($modversion['blocks'][$i]['show_func'])."' AND func_file='".addslashes($modversion['blocks'][$i]['file'])."'";
+            $fresult = $xoopsDB->query($sql);
+            $fblock = $xoopsDB->fetchArray($fresult);
+            if ( isset( $fblock['options'] ) ) {
+                $old_vals=explode("|",$fblock['options']);
+                $def_vals=explode("|",$modversion['blocks'][$i]['options']);
+                if (count($old_vals) == count($def_vals)) {
+                    $modversion['blocks'][$i]['options'] = $fblock['options'];
+                    $local_msgs[] = "Option's values of the block <b>".$fblock['name']."</b> will be kept. (value = <b>".$fblock['options']."</b>)";
+                } elseif (count($old_vals) < count($def_vals)) {
+                    for ($j=0; $j < count($old_vals); $j++) {
+                        $def_vals[$j] = $old_vals[$j];
+                    }
+                    $modversion['blocks'][$i]['options'] = implode("|",$def_vals);
+                    $local_msgs[] = "Option's values of the block <b>".$fblock['name']."</b> will be kept and new option(s) are added. (value = <b>".$modversion['blocks'][$i]['options']."</b>)";
+                } else {
+                    $local_msgs[] = "Option's values of the block <b>".$fblock['name']."</b> will be reset to the default, because of some decrease of options. (value = <b>".$modversion['blocks'][$i]['options']."</b>)";
+                }
+            }
+        }
+    }
+
+    global $msgs , $myblocksadmin_parsed_updateblock ;
+    if ( ! empty( $msgs ) && empty( $myblocksadmin_parsed_updateblock ) ) {
+        $msgs = array_merge( $msgs , $local_msgs ) ;
+        $myblocksadmin_parsed_updateblock = true ;
+    }

Modified: XoopsModules/waiting/trunk/waiting/language/english/admin.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/language/english/admin.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/language/english/admin.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -12,4 +12,4 @@
 // ModuleAdmin
 define('_AM_WAITING_MISSING',"Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)");
 // Text for Admin footer
-define('_AM_WAITING_FOOTER',"<div class='center smallsmall italic pad5'>Waiting is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
+define('_AM_WAITING_FOOTER',"<div class='center smallsmall italic pad5'>Waiting is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");

Modified: XoopsModules/waiting/trunk/waiting/language/english/blocks.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/language/english/blocks.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/language/english/blocks.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -7,4 +7,3 @@
 define('_MB_WAITING_NOWAITING_DISPLAY',"Always displayed");
 define('_MB_WAITING_SQL_CACHE',"SQL cache");
 define('_MB_WAITING_LINKTOPLUGINCHECK',"check plugins");
-?>
\ No newline at end of file

Modified: XoopsModules/waiting/trunk/waiting/language/english/modinfo.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/language/english/modinfo.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/language/english/modinfo.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -12,4 +12,4 @@
 define('_MI_WAITING_BNAME1',"Waiting");
 define('_MI_WAITING_MENU_HOME',"Home");
 define('_MI_WAITING_MENU_ABOUT',"About");
-define('_MI_WAITING_MENU_PLUGINS',"Plugins");
\ No newline at end of file
+define('_MI_WAITING_MENU_PLUGINS',"Plugins");

Modified: XoopsModules/waiting/trunk/waiting/language/english/plugins.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/language/english/plugins.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/language/english/plugins.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -21,4 +21,3 @@
 define('_PI_WAITING_NEWANSWERS',"New Answers");
 define('_PI_WAITING_ANSWERED',"Answered");
 define('_PI_WAITING_WAITINGS_FMT',"Waitings (%s)");
-?>
\ No newline at end of file

Modified: XoopsModules/waiting/trunk/waiting/plugins/AMS.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/plugins/AMS.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/plugins/AMS.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -1,17 +1,19 @@
 <?php
+/**
+ * @return array
+ */
 function b_waiting_AMS()
 {
-	$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
-	$block = array();
+    $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
+    $block = array();
 
-	// AMS articles
-	$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("ams_article")." WHERE published=0");
-	if ( $result ) {
-		$block['adminlink'] = XOOPS_URL."/modules/AMS/admin/index.php?op=newarticle";
-		list($block['pendingnum']) = $xoopsDB->fetchRow($result);
-		$block['lang_linkname'] = _PI_WAITING_WAITINGS ;
-	}
+    // AMS articles
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("ams_article")." WHERE published=0");
+    if ($result) {
+        $block['adminlink'] = XOOPS_URL."/modules/AMS/admin/index.php?op=newarticle";
+        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
+        $block['lang_linkname'] = _PI_WAITING_WAITINGS ;
+    }
 
-	return $block;
+    return $block;
 }
-?>
\ No newline at end of file

Modified: XoopsModules/waiting/trunk/waiting/plugins/PDdownloads.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/plugins/PDdownloads.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/plugins/PDdownloads.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -8,42 +8,43 @@
 #                                                                        #
 # Last modified on 21.04.2005                                            #
 /*************************************************************************/
+/**
+ * @return array
+ */
 function b_waiting_PDdownloads()
 {
-	$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
-	$ret = array() ;
+    $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
+    $ret = array() ;
 
-	// PDdownloads waiting
-	$block = array();
-	$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDdownloads_downloads")." WHERE status=0");
-	if ( $result ) {
-		$block['adminlink'] = XOOPS_URL."/modules/PDdownloads/admin/newdownloads.php";
-		list($block['pendingnum']) = $xoopsDB->fetchRow($result);
-		$block['lang_linkname'] = _PI_WAITING_WAITINGS ;
-	}
-	$ret[] = $block ;
+    // PDdownloads waiting
+    $block = array();
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDdownloads_downloads")." WHERE status=0");
+    if ($result) {
+        $block['adminlink'] = XOOPS_URL."/modules/PDdownloads/admin/newdownloads.php";
+        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
+        $block['lang_linkname'] = _PI_WAITING_WAITINGS ;
+    }
+    $ret[] = $block ;
 
-	// PDdownloads broken
-	$block = array();
-	$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDdownloads_broken"));
-	if ( $result ) {
-		$block['adminlink'] = XOOPS_URL."/modules/PDdownloads/admin/brokendown.php";
-		list($block['pendingnum']) = $xoopsDB->fetchRow($result);
-		$block['lang_linkname'] = _PI_WAITING_BROKENS ;
-	}
-	$ret[] = $block ;
+    // PDdownloads broken
+    $block = array();
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDdownloads_broken"));
+    if ($result) {
+        $block['adminlink'] = XOOPS_URL."/modules/PDdownloads/admin/brokendown.php";
+        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
+        $block['lang_linkname'] = _PI_WAITING_BROKENS ;
+    }
+    $ret[] = $block ;
 
-	// PDdownloads modreq
-	$block = array();
-	$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDdownloads_mod"));
-	if ( $result ) {
-		$block['adminlink'] = XOOPS_URL."/modules/PDdownloads/admin/modifications.php";
-		list($block['pendingnum']) = $xoopsDB->fetchRow($result);
-		$block['lang_linkname'] = _PI_WAITING_MODREQS ;
-	}
-	$ret[] = $block ;
-	
-	return $ret;
+    // PDdownloads modreq
+    $block = array();
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDdownloads_mod"));
+    if ($result) {
+        $block['adminlink'] = XOOPS_URL."/modules/PDdownloads/admin/modifications.php";
+        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
+        $block['lang_linkname'] = _PI_WAITING_MODREQS ;
+    }
+    $ret[] = $block ;
+
+    return $ret;
 }
-
-?>
\ No newline at end of file

Modified: XoopsModules/waiting/trunk/waiting/plugins/PDlinks.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/plugins/PDlinks.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/plugins/PDlinks.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -8,42 +8,43 @@
 #                                                                        #
 # Last modified on 21.04.2005                                            #
 /*************************************************************************/
+/**
+ * @return array
+ */
 function b_waiting_PDlinks()
 {
-	$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
-	$ret = array() ;
+    $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
+    $ret = array() ;
 
-	// PDlinks waiting
-	$block = array();
-	$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDlinks_links")." WHERE status=0");
-	if ( $result ) {
-		$block['adminlink'] = XOOPS_URL."/modules/PDlinks/admin/newlinks.php";
-		list($block['pendingnum']) = $xoopsDB->fetchRow($result);
-		$block['lang_linkname'] = _PI_WAITING_WAITINGS ;
-	}
-	$ret[] = $block ;
+    // PDlinks waiting
+    $block = array();
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDlinks_links")." WHERE status=0");
+    if ($result) {
+        $block['adminlink'] = XOOPS_URL."/modules/PDlinks/admin/newlinks.php";
+        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
+        $block['lang_linkname'] = _PI_WAITING_WAITINGS ;
+    }
+    $ret[] = $block ;
 
-	// PDlinks broken
-	$block = array();
-	$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDlinks_broken"));
-	if ( $result ) {
-		$block['adminlink'] = XOOPS_URL."/modules/PDlinks/admin/brokenlink.php";
-		list($block['pendingnum']) = $xoopsDB->fetchRow($result);
-		$block['lang_linkname'] = _PI_WAITING_BROKENS ;
-	}
-	$ret[] = $block ;
+    // PDlinks broken
+    $block = array();
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDlinks_broken"));
+    if ($result) {
+        $block['adminlink'] = XOOPS_URL."/modules/PDlinks/admin/brokenlink.php";
+        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
+        $block['lang_linkname'] = _PI_WAITING_BROKENS ;
+    }
+    $ret[] = $block ;
 
-	// PDlinks modreq
-	$block = array();
-	$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDlinks_mod"));
-	if ( $result ) {
-		$block['adminlink'] = XOOPS_URL."/modules/PDlinks/admin/index.php?op=listModReq";
-		list($block['pendingnum']) = $xoopsDB->fetchRow($result);
-		$block['lang_linkname'] = _PI_WAITING_MODREQS ;
-	}
-	$ret[] = $block ;
+    // PDlinks modreq
+    $block = array();
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("PDlinks_mod"));
+    if ($result) {
+        $block['adminlink'] = XOOPS_URL."/modules/PDlinks/admin/index.php?op=listModReq";
+        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
+        $block['lang_linkname'] = _PI_WAITING_MODREQS ;
+    }
+    $ret[] = $block ;
 
-	return $ret;
+    return $ret;
 }
-
-?>
\ No newline at end of file

Modified: XoopsModules/waiting/trunk/waiting/plugins/TDMDownloads.php
===================================================================
--- XoopsModules/waiting/trunk/waiting/plugins/TDMDownloads.php	2014-03-17 00:21:17 UTC (rev 12387)
+++ XoopsModules/waiting/trunk/waiting/plugins/TDMDownloads.php	2014-03-17 13:42:27 UTC (rev 12388)
@@ -1,45 +1,47 @@
-<?php
-/*************************************************************************/
-# Waiting Contents Extensible                                            #
-# Plugin for module TDMDownloads                                         #
-#                                                                        #
-# Author                                                                 #
-# Danordesign     -   fly...@gm...                               #
-#                                                                        #
-# Last modified on 19.10.2009                                            #
-/*************************************************************************/
-function b_waiting_tdmdownloads()
-{
-    $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
-    $ret = array() ;
-    // TDMdownloads waiting
-    $block = array();
-    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("tdmdownloads_downloads")." WHERE status=0");
-    if ( $result ) {
-        $block['adminlink'] = XOOPS_URL."/modules/TDMDownloads/admin/downloads.php?op=liste&statut_display=0";
-        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
-        $block['lang_linkname'] = _PI_WAITING_WAITINGS ;
-    }
-    $ret[] = $block ;
-    // TDMDownloads broken
-    $block = array();
-    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("tdmdownloads_broken"));
-    if ( $result ) {
-        $block['adminlink'] = XOOPS_URL."/modules/TDMDownloads/admin/broken.php";
-        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
-        $block['lang_linkname'] = _PI_WAITING_BROKENS ;
-    }
-    $ret[] = $block ;
-    // TDMDownloads modreq
-    $block = array();
-    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("tdmdownloads_mod"));
-    if ( $result ) {
-        $block['adminlink'] = XOOPS_URL."/modules/TDMDownloads/admin/modified.php";
-        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
-        $block['lang_linkname'] = _PI_WAITING_MODREQS ;
-    }
-    $ret[] = $block ;
-    
-    return $ret;
-}
-?>
\ No newline at end of file
+<?php
+/*************************************************************************/
+# Waiting Contents Extensible                                            #
+# Plugin for module TDMDownloads                                         #
+#                                                                        #
+# Author                                                                 #
+# Danordesign     -   fly...@gm...                               #
+#                                                                        #
+# Last modified on 19.10.2009                                            #
+/*************************************************************************/
+/**
+ * @return array
+ */
+function b_waiting_tdmdownloads()
+{
+    $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
+    $ret = array() ;
+    // TDMdownloads waiting
+    $block = array();
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("tdmdownloads_downloads")." WHERE status=0");
+    if ($result) {
+        $block['adminlink'] = XOOPS_URL."/modules/TDMDownloads/admin/downloads.php?op=liste&statut_display=0";
+        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
+        $block['lang_linkname'] = _PI_WAITING_WAITINGS ;
+    }
+    $ret[] = $block ;
+    // TDMDownloads broken
+    $block = array();
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("tdmdownloads_broken"));
+    if ($result) {
+        $block['adminlink'] = XOOPS_URL."/modules/TDMDownloads/admin/broken.php";
+        list($block['pendingnum']) = $xoopsDB->fetchRow($result);
+        $block['lang_linkname'] = _PI_WAITING_BROKENS ;
+    }
+    $ret[] = $block ;
+    // TDMDownloads modreq
+    $block = array();
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB-...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops-svn:[12387] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate

[<txm...@us...>]

Revision: 12387
          http://sourceforge.net/p/xoops/svn/12387
Author:   txmodxoops
Date:     2014-03-17 00:21:17 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
Updated

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/install.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html

Added Paths:
-----------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/empty.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logos/empty.png

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-03-16 19:46:29 UTC (rev 12386)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-03-17 00:21:17 UTC (rev 12387)
@@ -32,14 +32,14 @@
 		$template_main = 'tdmcreate_building.html';	
 		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));
 		// Clear repertory of new module if there are
-		TDMCreate_clearDir(TDMC_PATH.'/modules/'.strtolower($modules->getVar('mod_name')));
+		TDMCreate_clearDir(TDMC_UPLOAD_MODULE_PATH . '/' . strtolower($modules->getVar('mod_name')));
 		// Debut
 		/************************************************/
 		/*Structure*/
 		/************************************************/		
 		include_once TDMC_PATH . '/class/files/architecture.php';
-		$handler = new TDMCreateArchitecture();
-		$handler->getPath( TDMC_PATH );
+		$handler = TDMCreateArchitecture::getInstance();
+		$handler->getUploadPath( TDMC_UPLOAD_MODULE_PATH );
 		$handler->getArchitectureFiles( $modules );
 		
         // Creation of the structure of folders and files

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-03-16 19:46:29 UTC (rev 12386)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-03-17 00:21:17 UTC (rev 12387)
@@ -29,6 +29,14 @@
 	*/
 	public $structure = null;
 	/*
+	* @var mixed
+	*/
+	public $path = null;
+	/*
+	* @var mixed
+	*/
+	public $upload_path = null;
+	/*
 	*  @public function constructor class
 	*  @param null
 	*/
@@ -54,79 +62,86 @@
 	public function getPath($path) {		
 		$this->path = $path;
 	} 
+	/*
+	*  @public function getUploadPath
+	*  @param string $path
+	*/
+	public function getUploadPath($path) {		
+		$this->upload_path = $path;
+	} 
 	/* 
 	*  @public function getArchitectureFiles
 	*  @param string $module                              
 	*/
 	public function getArchitectureFiles( $module )
 	{		
-		$indexFile = $this->path.'/index.html';  
-		$fdocs = $this->path.'/docs';	
-		$fimages = $this->path.'/images';
+		$indexFile = $this->upload_path.'/index.html';  
+		$fdocs = $this->upload_path.'/docs';	
+		$fimages = $this->upload_path.'/images';
 		//Creation of the Directory of modules
-		$targetDirectory = $this->path.'/modules/'.strtolower($module->getVar('mod_name'));	
+		$targetDirectory = $this->upload_path.'/'. str_replace(' ', '', strtolower($module->getVar('mod_name')));	
 		
 		// Creation of "module" folder
 		$this->structure->getPath($targetDirectory);
 		// Creation of "module" folder
 		$this->structure->makeDir($targetDirectory);
 		// Creation of "admin" folder and index.html file
-		$this->structure->makeDirAndCopyFile('admin/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('admin', $indexFile, 'index.html');
 		// Creation of "blocks" folder and index.html file
-		$this->structure->makeDirAndCopyFile('blocks/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('blocks', $indexFile, 'index.html');
 		// Creation of "class" folder and index.html file
-		$this->structure->makeDirAndCopyFile('class/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('class', $indexFile, 'index.html');	
 		// Creation of "css" folder and index.html file
-		$this->structure->makeDirAndCopyFile('css/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('css', $indexFile, 'index.html');
 		// Creation of "images" folder and index.html file
-		$this->structure->makeDirAndCopyFile('images/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('images', $indexFile, 'index.html');	
 		//Copy the logo of the module
 		$mod_image = str_replace(' ', '', strtolower($module->getVar('mod_image')));
-		$this->structure->copyFile('images/', $fimages.'/uploads/modules/'.$mod_image, $mod_image);	
+		$this->structure->copyFile('images', $fimages.'/modules/'.$mod_image, $mod_image);	
 		
 		// Creation of 'images/icons' folder and index.html file - Added in Version 1.15
-		$this->structure->makeDirAndCopyFile('images/icons/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('images/icons', $indexFile, 'index.html');	
 		// Creation of "images/icons/16" folder and index.html file
-		$this->structure->makeDirAndCopyFile('images/icons/16/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('images/icons/16', $indexFile, 'index.html');
 		// Creation of "images/icons/32" folder and index.html file
-		$this->structure->makeDirAndCopyFile('images/icons/32/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('images/icons/32', $indexFile, 'index.html');	
 		// Creation of 'on.png' file
-		$this->structure->copyFile('images/icons/16/', $fimages.'/icons/16/on.png', 'on.png');
+		$this->structure->copyFile('images/icons/16', $fimages.'/icons/16/on.png', 'on.png');
 		// Creation of 'off.png' file
-		$this->structure->copyFile('images/icons/16/', $fimages.'/icons/16/off.png', 'off.png');
+		$this->structure->copyFile('images/icons/16', $fimages.'/icons/16/off.png', 'off.png');
 		// Creation of 'arrow.gif' file
-		$this->structure->copyFile('images/icons/16/', $fimages.'/icons/16/arrow.gif', 'arrow.gif');
+		$this->structure->copyFile('images/icons/16', $fimages.'/icons/16/arrow.gif', 'arrow.gif');
 		// Creation of 'txmodxoops_logo.png' file
-		$this->structure->copyFile('images/', $fimages.'/txmodxoops_logo.png', 'txmodxoops_logo.png');	
+		$this->structure->copyFile('images', $fimages.'/txmodxoops_logo.png', 'txmodxoops_logo.png');	
 		
 		// Creation of 'docs' folder and index.html file
-		$this->structure->makeDirAndCopyFile('docs/', $indexFile, 'index.html');    
+		$this->structure->makeDirAndCopyFile('docs', $indexFile, 'index.html');    
 		// Creation of 'credits.txt' file
-		$this->structure->copyFile('docs/', $fdocs.'/credits.txt', 'credits.txt');	
+		$this->structure->copyFile('docs', $fdocs.'/credits.txt', 'credits.txt');	
 		// Creation of 'install.txt' file
-		$this->structure->copyFile('docs/', $fdocs.'/install.txt', 'install.txt');
+		$this->structure->copyFile('docs', $fdocs.'/install.txt', 'install.txt');
 		// Creation of 'lang_diff.txt' file
-		$this->structure->copyFile('docs/', $fdocs.'/lang_diff.txt', 'lang_diff.txt');
+		$this->structure->copyFile('docs', $fdocs.'/lang_diff.txt', 'lang_diff.txt');
 		// Creation of 'license.txt' file
-		$this->structure->copyFile('docs/', $fdocs.'/license.txt', 'license.txt');
+		$this->structure->copyFile('docs', $fdocs.'/license.txt', 'license.txt');
 		// Creation of 'readme.txt' file
-		$this->structure->copyFile('docs/', $fdocs.'/readme.txt', 'readme.txt');
+		$this->structure->copyFile('docs', $fdocs.'/readme.txt', 'readme.txt');
 		
 		// Creation of "include" folder and index.html file	
-		$this->structure->makeDirAndCopyFile('include/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('include', $indexFile, 'index.html');
 		// Creation of "language" folder and index.html file	
-		$this->structure->makeDirAndCopyFile('language/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('language', $indexFile, 'index.html');
 		// Creation of "language/local_language" folder and index.html file	
-		$this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language']. '/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language'], $indexFile, 'index.html');	
 		// Creation of "language/local_language/help" folder and index.html file	
-		$this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language']. '/help/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language']. '/help', $indexFile, 'index.html');
 		// Creation of "templates" folder and index.html file	
-		$this->structure->makeDirAndCopyFile('templates/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('templates', $indexFile, 'index.html');
 		// Creation of "templates/admin" folder and index.html file	
-		$this->structure->makeDirAndCopyFile('templates/admin/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('templates/admin', $indexFile, 'index.html');	
 		// Creation of "templates/blocks" folder and index.html file	
-		$this->structure->makeDirAndCopyFile('templates/blocks/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('templates/blocks', $indexFile, 'index.html');
 		// Creation of "sql" folder and index.html file	
-		$this->structure->makeDirAndCopyFile('sql/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('sql', $indexFile, 'index.html');	
 	}	
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php	2014-03-16 19:46:29 UTC (rev 12386)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php	2014-03-17 00:21:17 UTC (rev 12387)
@@ -147,7 +147,7 @@
 	    $this->from_file = $from_file;
 	    $this->to_file = $to_file;
 		$dname = $this->folderPath($folder_name);
-		$fname = $this->folderPath($folder_name) . $this->to_file;
+		$fname = $this->folderPath($folder_name) . DIRECTORY_SEPARATOR . $this->to_file;
 	    $this->getCopy($dname, $fname);
 	}
 	/* 
@@ -157,8 +157,8 @@
 	*/
 	public function getCopy($dname, $fname)
 	{	   
-	    if(is_dir($fname)) {		   
-		    chmod($fname, 0777);
+	    if(is_dir($dname)) {		   
+		    chmod($dname, 0777);
 	        copy($this->from_file, $fname);
 	    } else {
 			$this->makeDir($dname);
@@ -204,7 +204,7 @@
 				$this->setErrors("({$file}) is a folder or not exist");
 				continue;
 			}
-			if (($ret = $file_nameHandler->delete()) == false) {
+			if (($ret = $fileHandler->delete()) == false) {
 				$this->setErrors("Cannot delete ({$file})");
 				continue;
 			}

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/empty.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/empty.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/empty.png	2014-03-16 19:46:29 UTC (rev 12386)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/empty.png	2014-03-17 00:21:17 UTC (rev 12387)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/empty.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logos/empty.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logos/empty.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logos/empty.png	2014-03-16 19:46:29 UTC (rev 12386)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logos/empty.png	2014-03-17 00:21:17 UTC (rev 12387)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logos/empty.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php	2014-03-16 19:46:29 UTC (rev 12386)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php	2014-03-17 00:21:17 UTC (rev 12387)
@@ -22,9 +22,13 @@
 	die('XOOPS root path not defined');
 }
 $dirname = $GLOBALS['xoopsModule']->getVar('dirname');
-define('TDMC_PATH', XOOPS_ROOT_PATH."/modules/" . $dirname );
-define('TDMC_URL', XOOPS_URL."/modules/" . $dirname );
-define('TDMC_UPLOAD_PATH', XOOPS_UPLOAD_PATH . "/" . $dirname );
-define('TDMC_UPLOAD_URL', XOOPS_UPLOAD_URL . "/" . $dirname );
-define('TDM_CREATE_URL', XOOPS_ROOT_PATH . '/modules/TDMCreate');
+define('TDMC_PATH', XOOPS_ROOT_PATH . '/modules/' . $dirname );
+define('TDMC_URL', XOOPS_URL . '/modules/' . $dirname );
+define('TDMC_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $dirname );
+define('TDMC_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $dirname );
+define('TDMC_UPLOAD_MODULE_PATH', TDMC_UPLOAD_PATH . '/modules/' );
+define('TDMC_UPLOAD_MODULE_URL', TDMC_UPLOAD_URL . '/modules/' );
+define('TDMC_UPLOAD_TABLE_PATH', TDMC_UPLOAD_PATH . '/tables/' );
+define('TDMC_UPLOAD_TABLE_URL', TDMC_UPLOAD_URL . '/tables/' );
+define('TDM_CREATE_URL', XOOPS_ROOT_PATH . '/modules/' . $dirname );
 define('TDM_CREATE_MURL', TDM_CREATE_URL . '/modules');
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/install.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/install.php	2014-03-16 19:46:29 UTC (rev 12386)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/install.php	2014-03-17 00:21:17 UTC (rev 12387)
@@ -1,22 +1,60 @@
 <?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.
+ */
 /**
- * ****************************************************************************
- *  - TDMCreate By TDM   - TEAM DEV MODULE FOR XOOPS
- *  - Licence GPL Copyright (c)  (http://www.tdmxoops.net)
+ * tdmcreate module
  *
- * Cette licence, contient des limitations!!!
- *
- * 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.
- *
- * @license     TDM GPL license
- * @author		TDM TEAM DEV MODULE 
- *
- * ****************************************************************************
+ * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package         tdmcreate
+ * @since           2.5.0
+ * @author          Txmod Xoops http://www.txmodxoops.org
+ * @version         $Id: functions.php 11084 2013-02-23 15:44:20Z timgno $
  */
 
-?>
\ No newline at end of file
+$indexFile = XOOPS_UPLOAD_PATH.'/index.html';
+$blankFile = XOOPS_UPLOAD_PATH.'/blank.gif';
+
+// Making of "uploads" folder
+$tdmcreate = XOOPS_UPLOAD_PATH.'/tdmcreate';
+if(!is_dir($tdmcreate))
+	mkdir($tdmcreate, 0777);
+	chmod($tdmcreate, 0777);
+copy($indexFile, $tdmcreate.'/index.html');
+
+// Making of images uploads folder
+$modules = $tdmcreate.'/modules';
+if(!is_dir($modules))
+	mkdir($modules, 0777);
+	chmod($modules, 0777);
+copy($indexFile, $modules.'/index.html');
+
+// Making of images uploads folder
+$images = $tdmcreate.'/images';
+if(!is_dir($images))
+	mkdir($images, 0777);
+	chmod($images, 0777);
+copy($indexFile, $images.'/index.html');
+
+// Making of "modules" images folder
+$modules = $images.'/modules';
+if(!is_dir($modules))
+	mkdir($modules, 0777);
+	chmod($modules, 0777);
+copy($indexFile, $modules.'/index.html');
+copy($blankFile, $modules.'/blank.gif');
+
+// Making of "tables" images folder
+$tables = $images.'/tables';
+if(!is_dir($tables))
+	mkdir($tables, 0777);
+	chmod($tables, 0777);
+copy($indexFile, $tables.'/index.html');
+copy($blankFile, $tables.'/blank.gif');
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html	2014-03-16 19:46:29 UTC (rev 12386)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html	2014-03-17 00:21:17 UTC (rev 12387)
@@ -12,6 +12,16 @@
    </tr>
    </thead>
    <tbody>
+       <tr class="even">
+          <td style="padding-left: 30px;"><{$list.file}></td>
+          <{if $architecture_created}>
+              <td class="center"><img src="<{xoModuleIcons16 on.png}>" alt="" /></td>
+              <td>&nbsp;</td>
+          <{else}>
+              <td>&nbsp;</td>
+              <td class="center"><img src="<{xoModuleIcons16 off.png}>" alt="" /></td>
+          <{/if}>
+       <tr>
       <!--  <{foreach item=list from=$build_list}> -->
        <tr class="<{cycle values='odd, even'}>">
           <td class="center" colspan="3"><{$build_list}></td>

[xoops-svn] SF.net SVN: xoops-svn:[12386] XoopsCore/branches/2.5.x/2.5.7/htdocs/include /version.php

[<be...@us...>]

Revision: 12386
          http://sourceforge.net/p/xoops/svn/12386
Author:   beckmi
Date:     2014-03-16 19:46:29 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Changed internal version to RC1

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php	2014-03-16 13:12:24 UTC (rev 12385)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php	2014-03-16 19:46:29 UTC (rev 12386)
@@ -30,4 +30,4 @@
 /**
  *  Define XOOPS version
  */
-define('XOOPS_VERSION', 'XOOPS 2.5.7 Beta 1');
+define('XOOPS_VERSION', 'XOOPS 2.5.7 RC1');

[xoops-svn] SF.net SVN: xoops-svn:[12385] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate/modules

[<txm...@us...>]

Revision: 12385
          http://sourceforge.net/p/xoops/svn/12385
Author:   txmodxoops
Date:     2014-03-16 13:12:24 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Deleted modules

Removed Paths:
-------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/modules/car/
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/modules/test1/

[xoops-svn] SF.net SVN: xoops-svn:[12384] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate/const/

[<txm...@us...>]

Revision: 12384
          http://sourceforge.net/p/xoops/svn/12384
Author:   txmodxoops
Date:     2014-03-16 13:11:47 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Deleted const folder

Removed Paths:
-------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/const/

[xoops-svn] SF.net SVN: xoops-svn:[12383] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate/class/building.php

[<txm...@us...>]

Revision: 12383
          http://sourceforge.net/p/xoops/svn/12383
Author:   txmodxoops
Date:     2014-03-16 13:02:50 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Added class/building.php

Added Paths:
-----------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php	2014-03-16 13:02:50 UTC (rev 12383)
@@ -0,0 +1,62 @@
+<?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.
+ */
+
+/**
+ * Xoops Javascript class
+ *
+ * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package         media
+ * @since           2.5.x
+ * @author          TDM TEAM DEV MODULE
+ * @version         $Id: modules.php 12209 2013-10-23 02:49:09Z beckmi $ modules.php 11114 2013-02-13 10:22:12Z timgno $
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class TDMCreateBuilding extends XoopsObject
+{ 
+	// Constructor
+	public function __construct()
+	{
+		$this->XoopsObject();		
+	}
+	
+	/*
+	*  @static function &getInstance
+	*  @param null
+	*/
+	public static function &getInstance()
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self();
+        }
+        return $instance;
+    }
+
+    public function getForm($action = false)
+    {		
+        if ($action === false) {
+            $action = $_SERVER['REQUEST_URI'];
+        }
+        xoops_load('XoopsFormLoader');
+        $form = new XoopsThemeForm(_AM_TDMCREATE_ADMIN_CONST, 'buildform', $action, 'post', true);
+		$modulesHandler =& xoops_getModuleHandler('modules', 'TDMCreate');
+        $mod_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_MODULES, 'mod_name', 'mod_name');
+        $mod_select->addOptionArray($modulesHandler->getList());
+        $form->addElement($mod_select, true);
+
+        $form->addElement(new XoopsFormHidden('op', 'build'));
+        $form->addElement(new XoopsFormButton(_REQUIRED.' <span class="red bold">*</span>', 'submit', _SUBMIT, 'submit'));
+        return $form;
+	}
+}
\ No newline at end of file

[xoops-svn] SF.net SVN: xoops-svn:[12382] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate/images

[<txm...@us...>]

Revision: 12382
          http://sourceforge.net/p/xoops/svn/12382
Author:   txmodxoops
Date:     2014-03-16 13:00:18 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Added images

Added Paths:
-----------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/default_slogo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/blocks.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/editfields.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/green.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/nb_fields.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/red.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/yellow.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/edittable.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/fields.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/naked.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Car_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Hotel_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_slogo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/MyShop_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Real Estate_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopper_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopping_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/album_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_slogo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/default_slogo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module1_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/moduleimport_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/realestate_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test3_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test4_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test5_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test6_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test7_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/travel_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmLinks_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmrestaurant_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/tables/cat.png

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/default_slogo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/default_slogo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/default_slogo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/default_slogo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/default_slogo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/blocks.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/blocks.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/blocks.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/blocks.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/blocks.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/editfields.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/editfields.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/editfields.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/editfields.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/editfields.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/green.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/green.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/green.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/green.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/green.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/nb_fields.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/nb_fields.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/nb_fields.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/nb_fields.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/nb_fields.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/red.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/red.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/red.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/red.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/red.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/yellow.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/yellow.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/yellow.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/yellow.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/16/yellow.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/edittable.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/edittable.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/edittable.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/edittable.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/edittable.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/fields.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/fields.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/fields.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/fields.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/icons/32/fields.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/naked.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/naked.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/naked.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/naked.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/naked.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Car_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Car_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Car_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Car_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Car_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Hotel_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Hotel_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Hotel_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Hotel_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Hotel_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_slogo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_slogo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_slogo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_slogo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_slogo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/MyShop_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/MyShop_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/MyShop_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/MyShop_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/MyShop_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Real Estate_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Real Estate_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Real Estate_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Real Estate_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Real Estate_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopper_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopper_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopper_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopper_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopper_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopping_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopping_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopping_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopping_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Shopping_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/album_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/album_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/album_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/album_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/album_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_slogo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_slogo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_slogo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_slogo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/ams_slogo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/default_slogo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/default_slogo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/default_slogo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/default_slogo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/default_slogo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module1_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module1_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module1_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module1_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module1_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/module_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/moduleimport_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/moduleimport_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/moduleimport_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/moduleimport_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/moduleimport_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/realestate_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/realestate_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/realestate_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/realestate_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/realestate_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test3_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test3_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test3_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test3_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test3_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test4_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test4_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test4_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test4_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test4_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test5_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test5_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test5_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test5_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test5_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test6_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test6_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test6_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test6_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test6_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test7_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test7_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test7_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test7_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/test7_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/travel_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/travel_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/travel_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/travel_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/travel_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmLinks_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmLinks_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmLinks_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmLinks_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmLinks_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmrestaurant_logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmrestaurant_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmrestaurant_logo.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmrestaurant_logo.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/txmrestaurant_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/tables/cat.png
===================================================================
(Binary files differ)

Index: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/tables/cat.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/tables/cat.png	2014-03-16 12:58:17 UTC (rev 12381)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/tables/cat.png	2014-03-16 13:00:18 UTC (rev 12382)

Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/tables/cat.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property

[xoops-svn] SF.net SVN: xoops-svn:[12381] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate

[<txm...@us...>]

Revision: 12381
          http://sourceforge.net/p/xoops/svn/12381
Author:   txmodxoops
Date:     2014-03-16 12:58:17 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Updated
If you test this, is needed a new installation

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/about.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions_const.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php

Added Paths:
-----------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/about.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/about.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/about.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -19,7 +19,10 @@
  * @version         $Id: about.php 11084 2013-02-23 15:44:20Z timgno $
  */
 include 'header.php';
-$xoopsOption['template_main'] = 'tdmcreate_about.html'; 
+$template_main = 'tdmcreate_about.html'; 
 $xoopsTpl->assign('navigation', $adminMenu->addNavigation('about.php'));
 $xoopsTpl->assign('about', $adminMenu->renderAbout('6KJ7RW5DR3VTJ', false));
+if ( isset($template_main)  ) {
+    $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+}
 include 'footer.php';
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -27,57 +27,37 @@
     $modules =& $modulesHandler;
 }
 
-$mod_name = strtolower($modules->getVar('mod_name'));
-$mod_author_website_name = $modules->getVar('mod_author_website_name');
-$mod_author_website_url = $modules->getVar('mod_author_website_url');
-$mod_user = $modules->getVar('mod_user');
-$mod_notifications = $modules->getVar('mod_notifications');
-$mod_permissions = $modules->getVar('mod_permissions');
-
-if (isset($_REQUEST['table_name'])) {
-	$tables =& $tablesHandler->get($_REQUEST['table_name']);
-} else {
-    $tables =& $tablesHandler;	
-}
-
-//Name of tables
-$criteria = new CriteriaCompo();
-if (isset($_REQUEST['mod_name'])) {
-    $criteria->add(new Criteria('table_mid', $_REQUEST['mod_name']));
-} else {
-    $criteria->add(new Criteria('table_mid'));
-}
-
-$nb_tables = $tablesHandler->getCount($criteria);
-$tables_arr = $tablesHandler->getAll($criteria);
-$xoopsOption['template_main'] = 'tdmcreate_building.html'; 
-$xoopsTpl->assign('navigation', $adminMenu->addNavigation('building.php'));
 switch ($op) {
-	case 'build':		
-		// Effacer repertoire of nouveau module s'il existe
-		TDMCreate_clearDir($modPath.'/modules/'.strtolower($mod_name));			
+	case 'build':		 
+		$template_main = 'tdmcreate_building.html';	
+		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));
+		// Clear repertory of new module if there are
+		TDMCreate_clearDir(TDMC_PATH.'/modules/'.strtolower($modules->getVar('mod_name')));
 		// Debut
 		/************************************************/
 		/*Structure*/
-		/************************************************/	
-        //Creation of the structure of folders and files
-		$xoopsTpl->assign('build_list', 'Under new construction - Temporary build');
+		/************************************************/		
+		include_once TDMC_PATH . '/class/files/architecture.php';
+		$handler = new TDMCreateArchitecture();
+		$handler->getPath( TDMC_PATH );
+		$handler->getArchitectureFiles( $modules );
+		
+        // Creation of the structure of folders and files
+		$GLOBALS['xoopsTpl']->assign('build_list', 'Under new construction - Temporary build');
 	break;
 	
 	case 'default':
-	default:	
-		include_once(XOOPS_ROOT_PATH . '/class/xoopsformloader.php');
-		$action = $_SERVER['REQUEST_URI'];
-
-        $form = new XoopsThemeForm(_AM_TDMCREATE_ADMIN_CONST, 'buildform', $action, 'post', true);
-
-        $mod_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_MODULES, 'mod_name', 'mod_name');
-        $mod_select->addOptionArray($modulesHandler->getList());
-        $form->addElement($mod_select, true);
-
-        $form->addElement(new XoopsFormHidden('op', 'build'));
-        $form->addElement(new XoopsFormButton(_REQUIRED.' <span class="red bold">*</span>', 'submit', _SUBMIT, 'submit'));
-		$xoopsTpl->assign('form', $form->display());
+	default:
+		$template_main = 'tdmcreate_building.html';	
+		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));	
+		
+		include_once(TDMC_PATH . '/class/building.php');
+		$handler = TDMCreateBuilding::getInstance();
+		$form = $handler->getForm();
+		$GLOBALS['xoopsTpl']->assign('form', $form->render());
 	break;
 }
+if ( isset($template_main)  ) {
+    $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+}
 include 'footer.php';
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -0,0 +1,134 @@
+<?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.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package         tdmcreate
+ * @since           2.5.5
+ * @author          Txmod Xoops <su...@tx...>
+ * @version         $Id: 1.59 fields.php 11297 2013-03-24 10:58:10Z timgno $
+ */
+include 'header.php';
+// Recovered the value of the argument op in the URL $ 
+$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
+$field_id = TDMCreate_CleanVars($_REQUEST, 'field_id', 0, 'int');
+// Get table Variables
+$table_id = TDMCreate_CleanVars($_REQUEST, 'field_tid', 0, 'int');
+$table_mid = TDMCreate_CleanVars($_REQUEST, 'field_mid', 0, 'int');
+$table_nbfields = TDMCreate_CleanVars($_REQUEST, 'field_numb', 0, 'int');
+$table_fieldname = TDMCreate_CleanVars($_REQUEST, 'field_name', '', 'string');
+/*$table_id = $_SESSION['field_tid'];
+$table_mid = $_SESSION['field_mid'];
+$table_nbfields = $_SESSION['field_numb'];
+$table_fieldname = $_SESSION['field_name'];*/
+switch ($op) 
+{   
+    case 'list': 
+    default:
+	    $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+		$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);        		
+		// Define main template
+		$xoopsOption['template_main'] = 'tdmcreate_fields.html';
+		xoops_cp_header();
+		$xoopsTpl->assign('navigation', $adminMenu->addNavigation('fields.php'));
+		$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');            
+		$xoopsTpl->assign('button_new', $adminMenu->renderButton()); 
+		$xoopsTpl->assign('tdmc_url', TDMC_URL);
+		$xoopsTpl->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
+		$xoopsTpl->assign('pathIcon32', XOOPS_URL.'/Frameworks/moduleclasses/icons/32');
+		// Get the list of tables
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('table_mid', $_REQUEST['mod_id']));
+		$criteria->setSort('table_id ASC, table_name');
+		$criteria->setOrder('ASC');	
+		$nb_tables = $tablesHandler->getCount();
+		$tables_arr = $tablesHandler->getAll($criteria);
+		unset($criteria);
+		if ($nb_tables > 0) 
+		{	
+            $_yes = "<img src='../images/icons/16/green.png' alt='"._YES."' title='"._YES."' />";
+			$_no = "<img src='../images/icons/16/red.png' alt='"._NO."' title='"._NO."' />";								
+			foreach (array_keys($tables_arr) as $t) 
+			{				
+				$table['id'] = $t;
+				$table['mid'] = $tables_arr[$t]->getVar('table_mid');
+				$table['name'] = $tables_arr[$t]->getVar('table_name');					
+				$table['image'] = $tables_arr[$t]->getVar('table_image');	
+				$table['nbfields'] = $tables_arr[$t]->getVar('table_nbfields');	
+				$table['blocks'] = ( $tables_arr[$t]->getVar('table_blocks') == 1 ) ? $_yes : $_no;						
+				$table['admin'] = ( $tables_arr[$t]->getVar('table_admin') == 1 ) ? $_yes : $_no;	
+				$table['user'] = ( $tables_arr[$t]->getVar('table_user') == 1 ) ? $_yes : $_no;	
+				$table['submenu'] = ( $tables_arr[$t]->getVar('table_submenu') == 1 ) ? $_yes : $_no;	
+				$table['search'] = ( $tables_arr[$t]->getVar('table_search') == 1 ) ? $_yes : $_no;				
+				$table['comments'] = ( $tables_arr[$t]->getVar('table_comments') == 1 ) ? $_yes : $_no;	
+				$table['notifications'] = ( $tables_arr[$t]->getVar('table_notifications') == 1 ) ? $_yes : $_no;								
+				$xoopsTpl->append('tables_list', $table);
+                unset($mod);				
+			}
+			if ( $nb_tables > $limit ) {
+				include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+				$pagenav = new XoopsPageNav($nb_tables, $limit, $start, 'start', 'op=list&limit=' . $limit);
+				$xoopsTpl->assign('pagenav', $pagenav->renderNav(4));
+			} 			
+		} else {
+			$xoopsTpl->assign('error', 'Add, Edit or List View in Tables');
+		}		
+	break;
+	
+    case 'new': 
+	    xoops_cp_header();
+	    echo $adminMenu->addNavigation('fields.php');
+        $obj =& $fieldsHandler->create();        	
+		$form = $obj->getForm($table_id, $table_mid, $table_nbfields, $table_fieldname);
+		$form->display();
+    break;	
+	
+	case 'save':
+		if ( !$GLOBALS['xoopsSecurity']->check() ) {
+            redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+        }
+        if (isset($field_id)) {
+            $obj =& $fieldsHandler->get($field_id);
+        } else {
+            $obj =& $fieldsHandler->create();
+        }		
+		//Form fields
+		$obj->setVars(array('field_mid' => $table_mid, 'field_tid' => $table_id, 'field_name' => $_POST['field_name'], 
+		                    'field_numb' => $table_nbfields, 'field_type' => $_POST['field_type'], 
+							'field_value' => $_POST['field_value'], 'field_attribute' => $_POST['field_attribute'], 
+							'field_null' => $_POST['field_null'], 'field_default' => $_POST['field_default'], 
+							'field_key' => $_POST['field_key'],	'field_elements' => $_POST['field_elements'],
+	                        'field_admin' => (($_REQUEST['field_admin'] == 1) ? '1' : '0'),
+							'field_user' => (($_REQUEST['field_user'] == 1) ? '1' : '0'), 
+							'field_blocks' => (($_REQUEST['field_blocks'] == 1) ? '1' : '0'), 
+							'field_mainfield' => (($_REQUEST['field_mainfield'] == 1) ? '1' : '0'), 
+							'field_search' =>  (($_REQUEST['field_search'] == 1) ? '1' : '0'), 
+							'field_required' => (($_REQUEST['field_required'] == 1) ? '1' : '0')));	
+		
+        if ($fieldsHandler->insert($obj)) {
+            redirect_header('tables.php', 2, _AM_TDMCREATE_FORMOK);
+        }
+        echo $obj->getHtmlErrors();        		
+		$form = $obj->getForm();
+		$form->display();
+	break;
+	
+	case 'edit':
+        xoops_cp_header();	
+        echo $adminMenu->addNavigation('fields.php');	
+		$obj = $fieldsHandler->get($field_id);        		
+		$form = $obj->getForm($table_id, $table_mid, $table_nbfields, $table_fieldname);
+		$form->display();
+	break;	
+}
+include 'footer.php';
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -19,8 +19,9 @@
  * @version         $Id: header.php 12207 2013-10-23 02:46:52Z beckmi $
  */
 include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+include_once('../include/common.php');
 include_once('../include/functions.php');
-include_once 'includes.php';
+//include_once 'includes.php';
 //
 $thisDirname = $GLOBALS['xoopsModule']->getVar('dirname');
 //

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -28,7 +28,11 @@
 $adminMenu->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES) ;
 $adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' ._AM_TDMCREATE_THEREARE_NUMMODULES. '</label>', $count_modules, 'Green') ;
 $adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' ._AM_TDMCREATE_THEREARE_NUMTABLES. '</label>', $count_tables, 'Orange');
-$xoopsOption['template_main'] = 'tdmcreate_index.html'; 
-$xoopsTpl->assign('navigation', $adminMenu->addNavigation('index.php'));
-$xoopsTpl->assign('index', $adminMenu->renderIndex());
+//$xoopsOption['template_main'] = 'tdmcreate_index.html'; 
+$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('index.php'));
+$GLOBALS['xoopsTpl']->assign('index', $adminMenu->renderIndex());
+$template_main = 'tdmcreate_index.html';
+if ( isset($template_main)  ) {
+    $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+}
 include 'footer.php';
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -26,15 +26,14 @@
 {   
     case 'list': 
     default: 		
-		$limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+		$limit = $GLOBALS['xoopsModuleConfig']['mod_adminpager'];
 		$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);		
 	    // Define main template
-        $xoopsOption['template_main'] = 'tdmcreate_modules.html'; 
-		xoops_cp_header();
-        $xoopsTpl->assign('navigation', $adminMenu->addNavigation('modules.php'));
+        $template_main = 'tdmcreate_modules.html'; 
+        $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php'));
 		$adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');            
-		$xoopsTpl->assign('button_new', $adminMenu->renderButton());        		
-		$xoopsTpl->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
+		$GLOBALS['xoopsTpl']->assign('button_new', $adminMenu->renderButton());        		
+		$GLOBALS['xoopsTpl']->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
 		$criteria = new CriteriaCompo();
 		$criteria->setSort('mod_id ASC, mod_name');
 		$criteria->setOrder('ASC');
@@ -60,30 +59,29 @@
 				$mod['mod_search'] = ( $mods_arr[$i]->getVar('mod_search') == 1 ) ? $yes : $no;				
 				$mod['mod_comments'] = ( $mods_arr[$i]->getVar('mod_comments') == 1 ) ? $yes : $no;	
 				$mod['mod_notifications'] = ( $mods_arr[$i]->getVar('mod_notifications') == 1 ) ? $yes : $no;							
-				$xoopsTpl->append('modules_list', $mod);
+				$GLOBALS['xoopsTpl']->append('modules_list', $mod);
                 unset($mod);				
 			}
 			if ( $numrows > $limit ) {
 				include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
 				$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit);
-				$xoopsTpl->assign('pagenav', $pagenav->renderNav(4));
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
 			} 		
 		} else {
-			$xoopsTpl->assign('error', 'There aren\'t modules');
+			$GLOBALS['xoopsTpl']->assign('error', 'There aren\'t modules');
 		}		
     break;
 
     case 'new': 
 	    // Define main template
-        $xoopsOption['template_main'] = 'tdmcreate_modules.html'; 
-        xoops_cp_header();		
-		$xoopsTpl->assign('navigation', $adminMenu->addNavigation('modules.php'));
+        $template_main = 'tdmcreate_modules.html'; 
+		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php'));
         $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list');
-        $xoopsTpl->assign('button_list', $adminMenu->renderButton());
+        $GLOBALS['xoopsTpl']->assign('button_list', $adminMenu->renderButton());
         
         $obj =& $modulesHandler->create();
         $form = $obj->getForm();			
-        $xoopsTpl->assign('form', $form->render());
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
     break;	
 	
 	case 'save':
@@ -144,24 +142,23 @@
             redirect_header('modules.php', 2, _AM_TDMCREATE_FORMOK);
         }
 
-        $xoopsTpl->assign('error', $obj->getHtmlErrors());
+        $GLOBALS['xoopsTpl']->assign('error', $obj->getHtmlErrors());
         $form =& $obj->getForm();		
-        $xoopsTpl->assign('form', $form->render());
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 	break;
 	
 	case 'edit':	 
 	    // Define main template
-        $xoopsOption['template_main'] = 'tdmcreate_modules.html'; 
-        xoops_cp_header();		
-		$xoopsTpl->assign('navigation', $adminMenu->addNavigation('modules.php'));
+        $template_main = 'tdmcreate_modules.html'; 
+		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php'));
         $adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');
 		$adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list');        
-        $xoopsTpl->assign('button_new', $adminMenu->renderButton());
-		$xoopsTpl->assign('button_list', $adminMenu->renderButton());		
+        $GLOBALS['xoopsTpl']->assign('button_new', $adminMenu->renderButton());
+		$GLOBALS['xoopsTpl']->assign('button_list', $adminMenu->renderButton());		
 		
 		$obj = $modulesHandler->get($_REQUEST['mod_id']);
 		$form = $obj->getForm();		
-        $xoopsTpl->assign('form', $form->render());
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 	break;
 	
 	case 'delete':
@@ -173,11 +170,14 @@
 			if ($modulesHandler->delete($obj)) {
 				redirect_header('modules.php', 3, _AM_TDMCREATE_FORMDELOK);
 			} else {
-				$xoopsTpl->assign('error', $obj->getHtmlErrors());
+				$GLOBALS['xoopsTpl']->assign('error', $obj->getHtmlErrors());
 			}
 		} else {
 			xoops_confirm(array('ok' => 1, 'mod_id' => $_REQUEST['mod_id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('mod_name')));
 		}
 	break;	
 }
+if ( isset($template_main)  ) {
+    $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+}
 include 'footer.php';
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -29,26 +29,25 @@
 		$limit = xoops_getModuleOption('adminperpage');
 		$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);        		
 		// Define main template
-		$xoopsOption['template_main'] = 'tdmcreate_tables.html';
-		xoops_cp_header();
+		$template_main = 'tdmcreate_tables.html';
 		$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/style.css' );
 		$GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
 
-		$xoopsTpl->assign('navigation', $adminMenu->addNavigation('tables.php'));
+		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('tables.php'));
 		$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');            
-		$xoopsTpl->assign('button_new', $adminMenu->renderButton()); 
-		$xoopsTpl->assign('tdmc_url', TDMC_URL);
-		$xoopsTpl->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
-		$xoopsTpl->assign('pathIcon32', XOOPS_URL.'/Frameworks/moduleclasses/icons/32');		
+		$GLOBALS['xoopsTpl']->assign('button_new', $adminMenu->renderButton()); 
+		$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
+		$GLOBALS['xoopsTpl']->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
+		$GLOBALS['xoopsTpl']->assign('pathIcon32', XOOPS_URL.'/Frameworks/moduleclasses/icons/32');		
 		// Get the list of modules
 		$criteria = new CriteriaCompo();
 		$criteria->setSort('mod_id ASC, mod_name');
 		$criteria->setOrder('ASC');        
 		$numrows_modules = $modulesHandler->getCount();
 		// Redirect if there aren't modules
-		if ( $numrows_modules == 0 ) {
+		/*if ( $numrows_modules == 0 ) {
 			redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
-		}        
+		} */       
 		$mods_arr = $modulesHandler->getAll($criteria);
 		unset($criteria);				
 		// Display modules list
@@ -99,30 +98,29 @@
 					}									
 				} 
 				$mod['tables']	= $tables;	    			
-				$xoopsTpl->append('modules_list', $mod);                
+				$GLOBALS['xoopsTpl']->append('modules_list', $mod);                
 				unset($mod);
 			}	            
 			if ( $numrows_modules > $limit ) {
 				include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
 				$pagenav = new XoopsPageNav($numrows_modules, $limit, $start, 'start', 'op=list&limit=' . $limit);
-				$xoopsTpl->assign('pagenav', $pagenav->renderNav(4));
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
 			} 			
 		} else {
-			$xoopsTpl->assign('error', 'There aren\'t modules');
+			$GLOBALS['xoopsTpl']->assign('error', 'There aren\'t modules');
 		}
 	break;
 
 	case 'new': 
 		// Define main template
-		$xoopsOption['template_main'] = 'tdmcreate_tables.html';
-		xoops_cp_header();	
-		$xoopsTpl->assign('navigation', $adminMenu->addNavigation('tables.php'));
+		$template_main = 'tdmcreate_tables.html';
+		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('tables.php'));
 		$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');            
-		$xoopsTpl->assign('button_new', $adminMenu->renderButton());	
+		$GLOBALS['xoopsTpl']->assign('button_new', $adminMenu->renderButton());	
 
 		$obj =& $tablesHandler->create();
-		$form = $obj->getForm();		
-		$xoopsTpl->assign('form', $form->render());
+		$form = $obj->getFormTable();		
+		$GLOBALS['xoopsTpl']->assign('form', $form->render());
 		break;	
 
 	case 'save':
@@ -186,22 +184,21 @@
 			}
 		}		
 
-		$xoopsTpl->assign('error', $obj->getHtmlErrors());        
+		$GLOBALS['xoopsTpl']->assign('error', $obj->getHtmlErrors());        
 		$form = $obj->getForm();
-		$xoopsTpl->assign('form', $form->render());
+		$GLOBALS['xoopsTpl']->assign('form', $form->render());
 	break;
 
 	case 'edit':	    		
 		// Define main template            			
-		$xoopsOption['template_main'] = 'tdmcreate_tables.html';
-		xoops_cp_header();	
-		$xoopsTpl->assign('navigation', $adminMenu->addNavigation('tables.php'));
+		$template_main = 'tdmcreate_tables.html';
+		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('tables.php'));
 		$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');		   
-		$xoopsTpl->assign('button_new', $adminMenu->renderButton());			
+		$GLOBALS['xoopsTpl']->assign('button_new', $adminMenu->renderButton());			
 		
 		$obj = $tablesHandler->get($_REQUEST['table_id']);
 		$form = $obj->getForm();
-		$xoopsTpl->assign('form', $form->render());
+		$GLOBALS['xoopsTpl']->assign('form', $form->render());
 	break;	
 
 	case 'delete':
@@ -220,4 +217,7 @@
 		}
 	break;	
 }
+if ( isset($template_main)  ) {
+    $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+}
 include 'footer.php';
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -217,6 +217,6 @@
 {
 	function __construct(&$db) 
 	{
-		parent::__construct($db, "tdmcreate_fields", "tdmcreatefields", "field_id", "field_table");
+		parent::__construct($db, "mod_tdmcreate_fields", "tdmcreatefields", "field_id", "field_table");
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -21,90 +21,112 @@
 if (!defined('XOOPS_ROOT_PATH')) {
 	die('XOOPS root path not defined');
 }
-
-class Architecture extends Structure
+require_once 'structure.php';
+class TDMCreateArchitecture
 {	
 	/*
+	* @var mixed
+	*/
+	public $structure = null;
+	/*
 	*  @public function constructor class
+	*  @param null
+	*/
+	public function __construct() {		
+		$this->structure = TDMCreateStructure::getInstance();
+	} 
+	/*
+	*  @static function &getInstance
+	*  @param null
+	*/
+	public static function &getInstance()
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self();
+        }
+        return $instance;
+    }	
+	/*
+	*  @public function getPath
 	*  @param string $path
 	*/
-	public function __construct($path) {    
+	public function getPath($path) {		
 		$this->path = $path;
-	} 	
+	} 
 	/* 
-	*  @public function isDir
-	*  @param string $dname                                 
+	*  @public function getArchitectureFiles
+	*  @param string $module                              
 	*/
-	public function ArchitectureFiles( $module, $pathName )
-	{	
-		$indexFile = $pathName.'/index.html';  
-		$this->path = XOOPS_ROOT_PATH.'/modules/TDMCreate';	
+	public function getArchitectureFiles( $module )
+	{		
+		$indexFile = $this->path.'/index.html';  
 		$fdocs = $this->path.'/docs';	
 		$fimages = $this->path.'/images';
 		//Creation of the Directory of modules
-		$targetDirectory = $pathName.'/modules/'.strtolower($module->getVar('mod_name'));	
+		$targetDirectory = $this->path.'/modules/'.strtolower($module->getVar('mod_name'));	
 		
-		// Making of a new object
-		$classStruct = Structure::Structure($targetDirectory);
 		// Creation of "module" folder
-		$classStruct->makeDir($targetDirectory);
+		$this->structure->getPath($targetDirectory);
+		// Creation of "module" folder
+		$this->structure->makeDir($targetDirectory);
 		// Creation of "admin" folder and index.html file
-		$classStruct->makeDirAndCopyFile('admin/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('admin/', $indexFile, 'index.html');
 		// Creation of "blocks" folder and index.html file
-		$classStruct->makeDirAndCopyFile('blocks/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('blocks/', $indexFile, 'index.html');
 		// Creation of "class" folder and index.html file
-		$classStruct->makeDirAndCopyFile('class/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('class/', $indexFile, 'index.html');	
 		// Creation of "css" folder and index.html file
-		$classStruct->makeDirAndCopyFile('css/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('css/', $indexFile, 'index.html');
 		// Creation of "images" folder and index.html file
-		$classStruct->makeDirAndCopyFile('images/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('images/', $indexFile, 'index.html');	
 		//Copy the logo of the module
 		$mod_image = str_replace(' ', '', strtolower($module->getVar('mod_image')));
-		$classStruct->copyFile('images/', $fimages.'/uploads/modules/'.$mod_image, $mod_image);	
+		$this->structure->copyFile('images/', $fimages.'/uploads/modules/'.$mod_image, $mod_image);	
 		
 		// Creation of 'images/icons' folder and index.html file - Added in Version 1.15
-		$classStruct->makeDirAndCopyFile('images/icons/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('images/icons/', $indexFile, 'index.html');	
 		// Creation of "images/icons/16" folder and index.html file
-		$classStruct->makeDirAndCopyFile('images/icons/16/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('images/icons/16/', $indexFile, 'index.html');
 		// Creation of "images/icons/32" folder and index.html file
-		$classStruct->makeDirAndCopyFile('images/icons/32/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('images/icons/32/', $indexFile, 'index.html');	
 		// Creation of 'on.png' file
-		$classStruct->copyFile('images/icons/16/', $fimages.'/icons/16/on.png', 'on.png');
+		$this->structure->copyFile('images/icons/16/', $fimages.'/icons/16/on.png', 'on.png');
 		// Creation of 'off.png' file
-		$classStruct->copyFile('images/icons/16/', $fimages.'/icons/16/off.png', 'off.png');
+		$this->structure->copyFile('images/icons/16/', $fimages.'/icons/16/off.png', 'off.png');
 		// Creation of 'arrow.gif' file
-		$classStruct->copyFile('images/icons/16/', $fimages.'/icons/16/arrow.gif', 'arrow.gif');
+		$this->structure->copyFile('images/icons/16/', $fimages.'/icons/16/arrow.gif', 'arrow.gif');
 		// Creation of 'txmodxoops_logo.png' file
-		$classStruct->copyFile('images/', $fimages.'/txmodxoops_logo.png', 'txmodxoops_logo.png');	
+		$this->structure->copyFile('images/', $fimages.'/txmodxoops_logo.png', 'txmodxoops_logo.png');	
 		
 		// Creation of 'docs' folder and index.html file
-		$classStruct->makeDirAndCopyFile('docs/', $indexFile, 'index.html');    
+		$this->structure->makeDirAndCopyFile('docs/', $indexFile, 'index.html');    
 		// Creation of 'credits.txt' file
-		$classStruct->copyFile('docs/', $fdocs.'/credits.txt', 'credits.txt');	
+		$this->structure->copyFile('docs/', $fdocs.'/credits.txt', 'credits.txt');	
 		// Creation of 'install.txt' file
-		$classStruct->copyFile('docs/', $fdocs.'/install.txt', 'install.txt');
+		$this->structure->copyFile('docs/', $fdocs.'/install.txt', 'install.txt');
 		// Creation of 'lang_diff.txt' file
-		$classStruct->copyFile('docs/', $fdocs.'/lang_diff.txt', 'lang_diff.txt');
+		$this->structure->copyFile('docs/', $fdocs.'/lang_diff.txt', 'lang_diff.txt');
 		// Creation of 'license.txt' file
-		$classStruct->copyFile('docs/', $fdocs.'/license.txt', 'license.txt');
+		$this->structure->copyFile('docs/', $fdocs.'/license.txt', 'license.txt');
 		// Creation of 'readme.txt' file
-		$classStruct->copyFile('docs/', $fdocs.'/readme.txt', 'readme.txt');
+		$this->structure->copyFile('docs/', $fdocs.'/readme.txt', 'readme.txt');
 		
 		// Creation of "include" folder and index.html file	
-		$classStruct->makeDirAndCopyFile('include/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('include/', $indexFile, 'index.html');
 		// Creation of "language" folder and index.html file	
-		$classStruct->makeDirAndCopyFile('language/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('language/', $indexFile, 'index.html');
 		// Creation of "language/local_language" folder and index.html file	
-		$classStruct->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language']. '/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language']. '/', $indexFile, 'index.html');	
 		// Creation of "language/local_language/help" folder and index.html file	
-		$classStruct->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language']. '/help/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language']. '/help/', $indexFile, 'index.html');
 		// Creation of "templates" folder and index.html file	
-		$classStruct->makeDirAndCopyFile('templates/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('templates/', $indexFile, 'index.html');
 		// Creation of "templates/admin" folder and index.html file	
-		$classStruct->makeDirAndCopyFile('templates/admin/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('templates/admin/', $indexFile, 'index.html');	
 		// Creation of "templates/blocks" folder and index.html file	
-		$classStruct->makeDirAndCopyFile('templates/blocks/', $indexFile, 'index.html');
+		$this->structure->makeDirAndCopyFile('templates/blocks/', $indexFile, 'index.html');
 		// Creation of "sql" folder and index.html file	
-		$classStruct->makeDirAndCopyFile('sql/', $indexFile, 'index.html');	
+		$this->structure->makeDirAndCopyFile('sql/', $indexFile, 'index.html');	
 	}	
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -21,14 +21,14 @@
 if (!defined('XOOPS_ROOT_PATH')) {
 	die('XOOPS root path not defined');
 }
-
-class Structure extends XoopsFile 
+xoops_load('XoopsFile');
+class TDMCreateStructure
 {
-	/**
-     * @var string
-     */
-    public $tdmc = null;
 	/*
+	* @var mixed
+	*/
+	public $xoopsfile = null;
+	/*
 	* @var string
 	*/
 	public $module_name = null;
@@ -56,9 +56,28 @@
 	*  @public function constructor class
 	*  @param string $path
 	*/
-	public function __construct($path) {    
+	public function __construct() {    
+		$this->xoopsfile = XoopsFile::getInstance();
+	} 	
+	/*
+	*  @static function &getInstance
+	*  @param null
+	*/
+	public static function &getInstance()
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self();
+        }
+        return $instance;
+    }
+	/*
+	*  @public function getPath
+	*  @param string $path
+	*/
+	public function getPath($path) {		
 		$this->path = $path;
-	} 	
+	} 
 	/* 
 	*  @public function isDir
 	*  @param string $dname                                 
@@ -74,15 +93,16 @@
 	}
 	/* 
 	*  @public function makeDir
-	*  @param string $path
+	*  @param string $dir
 	*/
 	public function makeDir($dir)
 	{   
-		$this->isDir($dir);
+		$this->isDir(strtolower(trim($dir)));
 	}
 	/* 
 	*  @public function folderPath
-	*  @param string $folder_name                                 
+	*  @param string $folder_name  
+    *  @param string $file_name	
 	*/
 	public function folderPath($folder_name, $file_name = null)
 	{		
@@ -119,21 +139,29 @@
 	/* 
 	*  @public function copy file
 	*  @param string $foldername                                 
-	*  @param string $to_file            
-	*  @param string $filename	
+	*  @param string $from_file
+	*  @param string $to_file
 	*/
 	public function copyFile($folder_name, $from_file, $to_file)
 	{	   
-		//$fname = $this->folderPath($folder_name, $from_file, $to_file);
-		//copy($file_name, $fname);
-		//$this->folder_name = $folder_name;
 	    $this->from_file = $from_file;
 	    $this->to_file = $to_file;
+		$dname = $this->folderPath($folder_name);
 		$fname = $this->folderPath($folder_name) . $this->to_file;
+	    $this->getCopy($dname, $fname);
+	}
+	/* 
+	*  @public function copy file
+	*  @param string $dname                                 
+	*  @param string $fname            
+	*/
+	public function getCopy($dname, $fname)
+	{	   
 	    if(is_dir($fname)) {		   
 		    chmod($fname, 0777);
 	        copy($this->from_file, $fname);
 	    } else {
+			$this->makeDir($dname);
 	        copy($this->from_file, $fname);
 	    }
 	}	
@@ -145,7 +173,7 @@
 	{		
 		$deleteFolders = 0;
 		// folder open/read
-		$folderHandler = $this->getHandler('folder', $path);
+		$folderHandler = $this->xoopsfile->getHandler('folder', $path);
 		foreach($log_files as $older) {
 			$folderHandler->__construct($older, false);
 			if (!$folderHandler->exists()) {
@@ -169,7 +197,7 @@
 	{		
 		$deletedFiles = 0;
 		// file open/read
-		$fileHandler = $this->getHandler('file', $path);
+		$fileHandler = $this->xoopsfile->getHandler('file', $path);
 		foreach($log_files as $file) {
 			$fileHandler->__construct($file, false);
 			if (!$fileHandler->exists()) {

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -76,21 +76,21 @@
         if ($action === false) {
             $action = $_SERVER['REQUEST_URI'];
         }
-        $title = $this->isNew() ? sprintf(_AM_TDMCREATE_MODULES_ADD) : sprintf(_AM_TDMCREATE_MODULES_EDIT);
+        $title = $this->isNew() ? sprintf(_AM_TDMCREATE_MODULE_ADD) : sprintf(_AM_TDMCREATE_MODULE_EDIT);
 
         include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
 
         $form = new XoopsThemeForm($title, 'modulesform', $action, 'post', true);
 		$form->setExtra('enctype="multipart/form-data"');
 		
-		$form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULES_IMPORTANT.'</b></div>','head');
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_NAME, 'mod_name', 50, 255, $this->getVar('mod_name')), true);
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_VERSION, 'mod_version', 10, 25, $this->getVar('mod_version')), true);
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_SINCE, 'mod_since', 10, 25, $this->getVar('mod_since')), true);
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_MIN_PHP, 'mod_min_php', 10, 25, $this->getVar('mod_min_php')), true);
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_MIN_XOOPS, 'mod_min_xoops', 10, 25, $this->getVar('mod_min_xoops')), true);
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_MIN_ADMIN, 'mod_min_admin', 10, 25, $this->getVar('mod_min_admin')), true);
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_MIN_MYSQL, 'mod_min_mysql', 10, 25, $this->getVar('mod_min_mysql')), true);
+		$form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULE_IMPORTANT.'</b></div>','head');
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_NAME, 'mod_name', 50, 255, $this->getVar('mod_name')), true);
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_VERSION, 'mod_version', 10, 25, $this->getVar('mod_version')), true);
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SINCE, 'mod_since', 10, 25, $this->getVar('mod_since')), true);
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_PHP, 'mod_min_php', 10, 25, $this->getVar('mod_min_php')), true);
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_XOOPS, 'mod_min_xoops', 10, 25, $this->getVar('mod_min_xoops')), true);
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_ADMIN, 'mod_min_admin', 10, 25, $this->getVar('mod_min_admin')), true);
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_MYSQL, 'mod_min_mysql', 10, 25, $this->getVar('mod_min_mysql')), true);
 		// Name description
         $editor_configs=array();
         $editor_configs['name'] = 'mod_description';
@@ -100,32 +100,32 @@
         $editor_configs['width'] = '50%';
         $editor_configs['height'] = '100px';
         $editor_configs['editor'] = $GLOBALS['xoopsModuleConfig']['tdmcreate_editor'];
-        $form->addElement( new XoopsFormEditor(_AM_TDMCREATE_MODULES_DESCRIPTION, 'mod_description', $editor_configs), true);
+        $form->addElement( new XoopsFormEditor(_AM_TDMCREATE_MODULE_DESCRIPTION, 'mod_description', $editor_configs), true);
 		// Author
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR, 'mod_author', 50, 255, $this->getVar('mod_author')), true);
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_LICENSE, 'mod_license', 50, 255, $this->getVar('mod_license')), true);
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR, 'mod_author', 50, 255, $this->getVar('mod_author')), true);
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_LICENSE, 'mod_license', 50, 255, $this->getVar('mod_license')), true);
 		$mod_admin =  $this->isNew() ? $GLOBALS['xoopsModuleConfig']['display_admin'] : $this->getVar('mod_admin');
-		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_DISPLAY_ADMIN, 'mod_admin', $mod_admin, _YES, _NO));
+		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_ADMIN, 'mod_admin', $mod_admin, _YES, _NO));
 		$mod_user =  $this->isNew() ? $GLOBALS['xoopsModuleConfig']['display_user'] : $this->getVar('mod_user');
-		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_DISPLAY_USER, 'mod_user', $mod_user, _YES, _NO));
+		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_USER, 'mod_user', $mod_user, _YES, _NO));
 		$mod_search =  $this->isNew() ? $GLOBALS['xoopsModuleConfig']['active_search'] : $this->getVar('mod_search');
-		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_ACTIVE_SEARCH, 'mod_search', $mod_search, _YES, _NO));
+		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_SEARCH, 'mod_search', $mod_search, _YES, _NO));
 		$mod_comments =  $this->isNew() ? $GLOBALS['xoopsModuleConfig']['active_comments'] : $this->getVar('mod_comments');
-		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_ACTIVE_COMMENTS, 'mod_comments', $mod_comments, _YES, _NO));
+		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_COMMENTS, 'mod_comments', $mod_comments, _YES, _NO));
 		
 		$mod_notifications =  $this->isNew() ? $GLOBALS['xoopsModuleConfig']['active_notifications'] : $this->getVar('mod_notifications');
-		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_ACTIVE_NOTIFICATIONS, 'mod_notifications', $mod_notifications, _YES, _NO));
+		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_NOTIFICATIONS, 'mod_notifications', $mod_notifications, _YES, _NO));
 		
 		$mod_permissions =  $this->isNew() ? $GLOBALS['xoopsModuleConfig']['active_permissions'] : $this->getVar('mod_permissions');
-		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_ACTIVE_PERMISSIONS, 'mod_permissions', $mod_permissions, _YES, _NO));
+		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_PERMISSIONS, 'mod_permissions', $mod_permissions, _YES, _NO));
 		
 		$mod_install =  $this->isNew() ? $GLOBALS['xoopsModuleConfig']['inroot_install'] : $this->getVar('mod_install');
-		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_INROOT_INSTALL, 'mod_install', $mod_install, _YES, _NO));
+		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_INSTALL, 'mod_install', $mod_install, _YES, _NO));
 		
 		$mod_image = $this->getVar('mod_image') ? $this->getVar('mod_image') : 'empty.png';
 		
 		$uploadirectory = '/modules/'.$xoopsModule->dirname().'/images/uploads/modules';
-		$imgtray = new XoopsFormElementTray(_AM_TDMCREATE_MODULES_IMAGE, '<br />');
+		$imgtray = new XoopsFormElementTray(_AM_TDMCREATE_MODULE_IMAGE, '<br />');
 		$imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './modules/' . $xoopsModule->dirname() . '/images/uploads/modules');
 		$imageselect= new XoopsFormSelect($imgpath, 'mod_image', $mod_image);
 		$mod_image_array = XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $uploadirectory );
@@ -232,29 +232,28 @@
 
 //------------ END --------------------
 		        
-		$form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULES_NOTIMPORTANT.'</b></div>','head');		
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR_MAIL, 'mod_author_mail', 50, 255, $this->getVar('mod_author_mail')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR_WEBSITE_URL, 'mod_author_website_url', 50, 255, $this->getVar('mod_author_website_url')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR_WEBSITE_NAME, 'mod_author_website_name', 50, 255, $this->getVar('mod_author_website_name')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_CREDITS, 'mod_credits', 50, 255, $this->getVar('mod_credits')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_RELEASE_INFO, 'mod_release_info', 50, 255, $this->getVar('mod_release_info')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_RELEASE_FILE, 'mod_release_file', 50, 255, $this->getVar('mod_release_file')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_MANUAL, 'mod_manual', 50, 255, $this->getVar('mod_manual')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_MANUAL_FILE, 'mod_manual_file', 50, 255, $this->getVar('mod_manual_file')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_DEMO_SITE_URL, 'mod_demo_site_url', 50, 255, $this->getVar('mod_demo_site_url')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_DEMO_SITE_NAME, 'mod_demo_site_name', 50, 255, $this->getVar('mod_demo_site_name')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_FORUM_SITE_URL, 'mod_support_url', 50, 255, $this->getVar('mod_support_url')));
-        $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_FORUM_SITE_NAME, 'mod_support_name', 50, 255, $this->getVar('mod_support_name')));
-        $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_WEBSITE_URL, 'mod_website_url', 50, 255, $this->getVar('mod_website_url')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_WEBSITE_NAME, 'mod_website_name', 50, 255, $this->getVar('mod_website_name')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_RELEASE, 'mod_release', 50, 255, $this->getVar('mod_release')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_STATUS, 'mod_status', 50, 255, $this->getVar('mod_status')));		
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_PAYPAL_BUTTON, 'mod_donations', 50, 255, $this->getVar('mod_donations')));
-		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_SUBVERSION, 'mod_subversion', 50, 255, $this->getVar('mod_subversion')));
+		$form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULE_NOTIMPORTANT.'</b></div>','head');		
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_MAIL, 'mod_author_mail', 50, 255, $this->getVar('mod_author_mail')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_WEBSITE_URL, 'mod_author_website_url', 50, 255, $this->getVar('mod_author_website_url')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_WEBSITE_NAME, 'mod_author_website_name', 50, 255, $this->getVar('mod_author_website_name')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_CREDITS, 'mod_credits', 50, 255, $this->getVar('mod_credits')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE_INFO, 'mod_release_info', 50, 255, $this->getVar('mod_release_info')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE_FILE, 'mod_release_file', 50, 255, $this->getVar('mod_release_file')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MANUAL, 'mod_manual', 50, 255, $this->getVar('mod_manual')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MANUAL_FILE, 'mod_manual_file', 50, 255, $this->getVar('mod_manual_file')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_DEMO_SITE_URL, 'mod_demo_site_url', 50, 255, $this->getVar('mod_demo_site_url')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_DEMO_SITE_NAME, 'mod_demo_site_name', 50, 255, $this->getVar('mod_demo_site_name')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SUPPORT_URL, 'mod_support_url', 50, 255, $this->getVar('mod_support_url')));
+        $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SUPPORT_NAME, 'mod_support_name', 50, 255, $this->getVar('mod_support_name')));
+        $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_WEBSITE_URL, 'mod_website_url', 50, 255, $this->getVar('mod_website_url')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_WEBSITE_NAME, 'mod_website_name', 50, 255, $this->getVar('mod_website_name')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE, 'mod_release', 50, 255, $this->getVar('mod_release')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_STATUS, 'mod_status', 50, 255, $this->getVar('mod_status')));		
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_PAYPAL_BUTTON, 'mod_donations', 50, 255, $this->getVar('mod_donations')));
+		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SUBVERSION, 'mod_subversion', 50, 255, $this->getVar('mod_subversion')));
     
 		$form->addElement(new XoopsFormHidden('op', 'save'));
         $form->addElement(new XoopsFormButton(_REQUIRED.' <span class="red bold">*</span>', 'submit', _SUBMIT, 'submit'));
-		$form->display();
         return $form;
 	}
 }

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -814,7 +814,6 @@
 		
 		$form->addElement(new XoopsFormHidden('op', $sending));
         $form->addElement(new XoopsFormButton(_REQUIRED.' <span class="red bold">*</span>', 'submit', _SUBMIT, 'submit'));
-		$form->display();
         return $form;
 	}	
 	
@@ -878,7 +877,6 @@
 		
 		$form->addElement(new XoopsFormHidden('op', 'save_table'));
         $form->addElement(new XoopsFormButton(_REQUIRED.' <span class="red bold">*</span>', 'submit', _SUBMIT, 'submit'));
-		$form->display();
         return $form;
 	}
 }

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -21,6 +21,10 @@
 if (!defined('XOOPS_ROOT_PATH')) {
 	die('XOOPS root path not defined');
 }
-
+$dirname = $GLOBALS['xoopsModule']->getVar('dirname');
+define('TDMC_PATH', XOOPS_ROOT_PATH."/modules/" . $dirname );
+define('TDMC_URL', XOOPS_URL."/modules/" . $dirname );
+define('TDMC_UPLOAD_PATH', XOOPS_UPLOAD_PATH . "/" . $dirname );
+define('TDMC_UPLOAD_URL', XOOPS_UPLOAD_URL . "/" . $dirname );
 define('TDM_CREATE_URL', XOOPS_ROOT_PATH . '/modules/TDMCreate');
 define('TDM_CREATE_MURL', TDM_CREATE_URL . '/modules');
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions_const.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions_const.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions_const.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -557,7 +557,7 @@
 
 function UcFirstAndToLower($str)
 {
-	 return ucfirst(strtolower(trim($str)));
+	return ucfirst(strtolower(trim($str)));
 }
 
 function createFile($path, $text, $lng_ok, $lng_notok, $file, $class = 'even', $mode = 'w+')

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php	2014-03-16 03:03:00 UTC (rev 12380)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php	2014-03-16 12:58:17 UTC (rev 12381)
@@ -64,7 +64,116 @@
 define('_AM_TDMCREATE_DISPLAY_USER', "Visible in User View");
 
 //Modules.php
+//Buttons
+define('_AM_TDMCREATE_ADD_MODULE', "Add new module");
 //Form
+define('_AM_TDMCREATE_MODULE_ADD', "Add a new module");
+define('_AM_TDMCREATE_MODULE_EDIT', "Edit module");
+//define('_AM_TDMCREATE_MODULE_IMPORTANT', "Required Information");
+
+define('_AM_TDMCREATE_MODULE_IMPORTANT', "Information");
+define('_AM_TDMCREATE_MODULE_NOTIMPORTANT', "Optional Information");
+define('_AM_TDMCREATE_MODULE_ID', "Id");
+define('_AM_TDMCREATE_MODULE_NAME', "Name");
+define('_AM_TDMCREATE_MODULE_VERSION', "Version");
+define('_AM_TDMCREATE_MODULE_SINCE', "Since");
+define('_AM_TDMCREATE_MODULE_DESCRIPTION', "Description");
+define('_AM_TDMCREATE_MODULE_AUTHOR', "Author");
+define('_AM_TDMCREATE_MODULE_AUTHOR_MAIL', "Author Email");
+define('_AM_TDMCREATE_MODULE_AUTHOR_WEBSITE_URL', "Author Site Url");
+define('_AM_TDMCREATE_MODULE_AUTHOR_WEBSITE_NAME', "Author Site Name");
+define('_AM_TDMCREATE_MODULE_CREDITS', "Credits");	
+define('_AM_TDMCREATE_MODULE_LICENSE', "License");
+define('_AM_TDMCREATE_MODULE_RELEASE_INFO', "Release Info");	
+define('_AM_TDMCREATE_MODULE_RELEASE_FILE', "Release File");
+define('_AM_TDMCREATE_MODULE_MANUAL', "Manual");	
+define('_AM_TDMCREATE_MODULE_MANUAL_FILE', "Manual File");
+define('_AM_TDMCREATE_MODULE_IMAGE', "Image");
+define('_AM_TDMCREATE_MODULE_DEMO_SITE_URL', "Demo Site Url");	
+define('_AM_TDMCREATE_MODULE_DEMO_SITE_NAME', "Demo Site Name");	
+define('_AM_TDMCREATE_MODULE_SUPPORT_URL', "Support URL");
+define('_AM_TDMCREATE_MODULE_SUPPORT_NAME', "Support Name");
+define('_AM_TDMCREATE_MODULE_WEBSITE_URL', "Module Website URL");
+define('_AM_TDMCREATE_MODULE_WEBSITE_NAME', "Module Website Name");
+define('_AM_TDMCREATE_MODULE_RELEASE', "Release");
+define('_AM_TDMCREATE_MODULE_STATUS', "Status");
+define('_AM_TDMCREATE_MODULE_PAYPAL_BUTTON', "Button for Donations");
+define('_AM_TDMCREATE_MODULE_SUBVERSION', "Subversion module");
+define('_AM_TDMCREATE_MODULE_ADMIN', "Visible Admin");
+define('_AM_TDMCREATE_MODULE_USER', "Visible User");
+define('_AM_TDMCREATE_MODULE_SEARCH', "Enable Search");
+define('_AM_TDMCREATE_MODULE_COMMENTS', "Enable Comments");
+define('_AM_TDMCREATE_MODULE_NOTIFICATIONS', "Notifications");
+define('_AM_TDMCREATE_MODULE_PERMISSIONS', "Enable permissions");
+define('_AM_TDMCREATE_MODULE_INSTALL', "Install this module directly in root/modules?");
+// Added in version 1.39
+define('_AM_TDMCREATE_MODULE_NBFIELDS', "Fields");
+define('_AM_TDMCREATE_MODULE_BLOCKS', "Blocks");
+define('_AM_TDMCREATE_MODULE_ADMIN_LIST', "Admin");
+define('_AM_TDMCREATE_MODULE_USER_LIST', "User");
+define('_AM_TDMCREATE_MODULE_SUBMENU_LIST', "Submenu");
+define('_AM_TDMCREATE_MODULE_SEARCH_LIST', "Search");
+define('_AM_TDMCREATE_MODULE_COMMENTS_LIST', "Comments");
+define('_AM_TDMCREATE_MODULE_NOTIFICATIONS_LIST', "Notifications");
+define('_AM_TDMCREATE_MODULE_MIN_PHP', "Minimum PHP");
+define('_AM_TDMCREATE_MODULE_MIN_XOOPS', "Minimum XOOPS");
+define('_AM_TDMCREATE_MODULE_MIN_ADMIN', "Minimum Admin");
+define('_AM_TDMCREATE_MODULE_MIN_MYSQL', "Minimum Database");
+
+//Tables.php
+// Buttons
+define('_AM_TDMCREATE_ADD_TABLE', "Add new table");
+//Form1
+define('_AM_TDMCREATE_TABLE_ADD', "Add Table");
+define('_AM_TDMCREATE_TABLE_EDIT', "Edit Table");
+define('_AM_TDMCREATE_TABLE_MODULES', "Choose a module");
+define('_AM_TDMCREATE_TABLE_NAME', "Table Name");
+define('_AM_TDMCREATE_TABLE_NAME_DESC', "Unique Name for this Table");
+define('_AM_TDMCREATE_TABLE_NBFIELDS', "Number fields");
+define('_AM_TDMCREATE_TABLE_NBFIELDS_DESC', "Number of fields for this table");
+define('_AM_TDMCREATE_TABLE_FIELDNAME', "Field Name");
+define('_AM_TDMCREATE_TABLE_FIELDNAME_DESC', "This is the prefix of field name (optional)<br />If you leave the field blank,<br />doesn't appear anything in the fields of the next screen,<br />otherwise you'll see all the fields with a prefix type (e.g: <span class='bold'>fieldname_</span>)");
+define('_AM_TDMCREATE_TABLE_IMAGE', "Table Logo");
+define('_AM_TDMCREATE_TABLE_BLOCKS', "Block for this table");
+define('_AM_TDMCREATE_TABLE_BLOCKS_DESC', "(blocks: random, latest, today)");
+define('_AM_TDMCREATE_TABLE_ADMIN', "View in Admin Panel");
+define('_AM_TDMCREATE_TABLE_USER', "View in User Side");
+define('_AM_TDMCREATE_TABLE_SUBMENU', "View in Submenu");
+define('_AM_TDMCREATE_TABLE_SEARCH', "Search for this table");
+define('_AM_TDMCREATE_TABLE_EXIST', "The name specified for this table is already in use");
+define('_AM_TDMCREATE_TABLE_COMMENTS', "Comments for this table");
+// Added in version 1.39
+define('_AM_TDMCREATE_TABLE_NOTIFICATIONS', "Notifications for this table");
+
+// v1.38
+define('_AM_TDMCREATE_TABLE_IMAGE_DESC', "<span class='red bold'>Attention</span>: If you want to choose a new image, is best to name it with the module name before and follow with the name of the image so as not to overwrite any images with the same name, in the <span class='bold'>Frameworks/moduleclasses/moduleadmin/icons/32/</span>. Otherwise an other solution, would be to insert the images in the module, a new folder is created, with the creation of the same module - <span class='bold'>images/32</span>.");
+
+//Form2
+define('_AM_TDMCREATE_FIELD_ADD', "Add fields");
+define('_AM_TDMCREATE_FIELD_EDIT', "Edit fields");
+define('_AM_TDMCREATE_FIELD_NUMBER', "N&#176;");
+define('_AM_TDMCREATE_FIELD_NAME', "Field Name");
+define('_AM_TDMCREATE_FIELD_TYPE', "Type");
+define('_AM_TDMCREATE_FIELD_VALUE', "Value");
+define('_AM_TDMCREATE_FIELD_ATTRIBUTE', "Attribute");
+define('_AM_TDMCREATE_FIELD_NULL', "Null");
+define('_AM_TDMCREATE_FIELD_DEFAULT', "Default");
+define('_AM_TDMCREATE_FIELD_KEY', "Key");
+define('_AM_TDMCREATE_FIELD_AUTO_INCREMENT', " Auto Increment");
+// Others
+define('_AM_TDMCREATE_FIELD_OTHERS', "Others");
+define('_AM_TDMCREATE_FIELD_ELEMENTS', "Options Elements");
+define('_AM_TDMCREATE_FIELD_ELEMENT_NAME', "Form: Element");
+define('_AM_TDMCREATE_FIELD_ADMIN', "Page: Show Admin Side");
+define('_AM_TDMCREATE_FIELD_USER', "Page: Show User Side");
+define('_AM_TDMCREATE_FIELD_BLOCK', "Block: View");
+define('_AM_TDMCREATE_FIELD_MAINFIELD', "Table: Main Field");
+define('_AM_TDMCREATE_FIELD_SEARCH', "Search: Index");
+define('_AM_TDMCREATE_FIELD_REQUIRED', "Field: Required");
+define('_AM_TDMCREATE_ADMIN_SUBMIT', "Send");
+
+//Modules.php
+//Form
 define('_AM_TDMCREATE_MODULES_ADD', "Add a new module");
 define('_AM_TDMCREATE_MODULES_EDIT', "Create a module");
 define('_AM_TDMCREATE_MODULES_IMPORTANT', "Required Information");
@@ -101,6 +210,7 @@
 define('_AM_TDMCREATE_MODULES_INROOT_INSTALL', "Install this module directly in root/modules?");
 define('_AM_TDMCREATE_MODULES_PAYPAL_BUTTON', "Paypal Button");
 define('_AM_TDMCREATE_MODULES_SUBVERSION', "Subversion");
+
 //Tables.php
 //Form1
 define('_AM_TDMCREATE_TABLES_ADD', "Add tables to the form:");
@@ -135,7 +245,7 @@
 define('_AM_TDMCREATE_TABLES_FIELDS_...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops-svn:[12380] XoopsCore/branches/2.5.x/2.5.7/htdocs/index. php

[<rgr...@us...>]

Revision: 12380
          http://sourceforge.net/p/xoops/svn/12380
Author:   rgriffith
Date:     2014-03-16 03:03:00 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Fix issue during install on some servers

If display_errors is on (a very bad choice for a production server,) the 'failed to open' warnings generated if mainfile.php doesn't exist  can interfere  with the headers that redirect to installer. The check that the file exists prevents us from stopping on a dead page during install.

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php	2014-03-16 00:55:50 UTC (rev 12379)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php	2014-03-16 03:03:00 UTC (rev 12380)
@@ -19,7 +19,9 @@
  * @version         $Id$
  */
 
-include dirname(__FILE__) . '/mainfile.php';
+if (file_exists(dirname(__FILE__) . '/mainfile.php')) {
+    include dirname(__FILE__) . '/mainfile.php';
+}
 if (!defined('XOOPS_MAINFILE_INCLUDED')) {
     if (file_exists(dirname(__FILE__) . '/install/index.php')) {
         header('Location: install/index.php');

[xoops-svn] SF.net SVN: xoops-svn:[12379] XoopsModules/gbook

[<be...@us...>]

Revision: 12379
          http://sourceforge.net/p/xoops/svn/12379
Author:   beckmi
Date:     2014-03-16 00:55:50 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Adding gBook 1.0 by Ingo H. de Boer

Added Paths:
-----------
    XoopsModules/gbook/releases/1.0/
    XoopsModules/gbook/releases/1.0/gbook/
    XoopsModules/gbook/releases/1.0/gbook/admin/
    XoopsModules/gbook/releases/1.0/gbook/admin/about.php
    XoopsModules/gbook/releases/1.0/gbook/admin/admin_footer.php
    XoopsModules/gbook/releases/1.0/gbook/admin/admin_header.php
    XoopsModules/gbook/releases/1.0/gbook/admin/entries.php
    XoopsModules/gbook/releases/1.0/gbook/admin/index.html
    XoopsModules/gbook/releases/1.0/gbook/admin/index.php
    XoopsModules/gbook/releases/1.0/gbook/admin/menu.php
    XoopsModules/gbook/releases/1.0/gbook/class/
    XoopsModules/gbook/releases/1.0/gbook/class/entries.php
    XoopsModules/gbook/releases/1.0/gbook/class/index.html
    XoopsModules/gbook/releases/1.0/gbook/docs/
    XoopsModules/gbook/releases/1.0/gbook/docs/changelog.txt
    XoopsModules/gbook/releases/1.0/gbook/docs/credits.txt
    XoopsModules/gbook/releases/1.0/gbook/docs/index.html
    XoopsModules/gbook/releases/1.0/gbook/docs/install.txt
    XoopsModules/gbook/releases/1.0/gbook/docs/licence.txt
    XoopsModules/gbook/releases/1.0/gbook/docs/readme.txt
    XoopsModules/gbook/releases/1.0/gbook/footer.php
    XoopsModules/gbook/releases/1.0/gbook/header.php
    XoopsModules/gbook/releases/1.0/gbook/images/
    XoopsModules/gbook/releases/1.0/gbook/images/email.png
    XoopsModules/gbook/releases/1.0/gbook/images/gbook.png
    XoopsModules/gbook/releases/1.0/gbook/images/index.html
    XoopsModules/gbook/releases/1.0/gbook/images/ip.png
    XoopsModules/gbook/releases/1.0/gbook/images/sign.png
    XoopsModules/gbook/releases/1.0/gbook/images/url.png
    XoopsModules/gbook/releases/1.0/gbook/include/
    XoopsModules/gbook/releases/1.0/gbook/include/functions.php
    XoopsModules/gbook/releases/1.0/gbook/include/index.html
    XoopsModules/gbook/releases/1.0/gbook/index.php
    XoopsModules/gbook/releases/1.0/gbook/language/
    XoopsModules/gbook/releases/1.0/gbook/language/english/
    XoopsModules/gbook/releases/1.0/gbook/language/english/admin.php
    XoopsModules/gbook/releases/1.0/gbook/language/english/help/
    XoopsModules/gbook/releases/1.0/gbook/language/english/help/help.html
    XoopsModules/gbook/releases/1.0/gbook/language/english/help/index.html
    XoopsModules/gbook/releases/1.0/gbook/language/english/index.html
    XoopsModules/gbook/releases/1.0/gbook/language/english/main.php
    XoopsModules/gbook/releases/1.0/gbook/language/english/modinfo.php
    XoopsModules/gbook/releases/1.0/gbook/language/german/
    XoopsModules/gbook/releases/1.0/gbook/language/german/admin.php
    XoopsModules/gbook/releases/1.0/gbook/language/german/help/
    XoopsModules/gbook/releases/1.0/gbook/language/german/help/help.html
    XoopsModules/gbook/releases/1.0/gbook/language/german/help/index.html
    XoopsModules/gbook/releases/1.0/gbook/language/german/index.html
    XoopsModules/gbook/releases/1.0/gbook/language/german/main.php
    XoopsModules/gbook/releases/1.0/gbook/language/german/modinfo.php
    XoopsModules/gbook/releases/1.0/gbook/language/index.html
    XoopsModules/gbook/releases/1.0/gbook/sign.php
    XoopsModules/gbook/releases/1.0/gbook/sql/
    XoopsModules/gbook/releases/1.0/gbook/sql/index.html
    XoopsModules/gbook/releases/1.0/gbook/sql/mysql.sql
    XoopsModules/gbook/releases/1.0/gbook/templates/
    XoopsModules/gbook/releases/1.0/gbook/templates/gbook.css
    XoopsModules/gbook/releases/1.0/gbook/templates/gbook_admin_entries.html
    XoopsModules/gbook/releases/1.0/gbook/templates/gbook_sign.html
    XoopsModules/gbook/releases/1.0/gbook/templates/gbook_view_entries.html
    XoopsModules/gbook/releases/1.0/gbook/templates/index.html
    XoopsModules/gbook/releases/1.0/gbook/xoops_version.php
    XoopsModules/gbook/trunk/gbook/admin/
    XoopsModules/gbook/trunk/gbook/admin/about.php
    XoopsModules/gbook/trunk/gbook/admin/admin_footer.php
    XoopsModules/gbook/trunk/gbook/admin/admin_header.php
    XoopsModules/gbook/trunk/gbook/admin/entries.php
    XoopsModules/gbook/trunk/gbook/admin/index.html
    XoopsModules/gbook/trunk/gbook/admin/index.php
    XoopsModules/gbook/trunk/gbook/admin/menu.php
    XoopsModules/gbook/trunk/gbook/class/
    XoopsModules/gbook/trunk/gbook/class/entries.php
    XoopsModules/gbook/trunk/gbook/class/index.html
    XoopsModules/gbook/trunk/gbook/docs/
    XoopsModules/gbook/trunk/gbook/docs/changelog.txt
    XoopsModules/gbook/trunk/gbook/docs/credits.txt
    XoopsModules/gbook/trunk/gbook/docs/index.html
    XoopsModules/gbook/trunk/gbook/docs/install.txt
    XoopsModules/gbook/trunk/gbook/docs/licence.txt
    XoopsModules/gbook/trunk/gbook/docs/readme.txt
    XoopsModules/gbook/trunk/gbook/footer.php
    XoopsModules/gbook/trunk/gbook/header.php
    XoopsModules/gbook/trunk/gbook/images/
    XoopsModules/gbook/trunk/gbook/images/email.png
    XoopsModules/gbook/trunk/gbook/images/gbook.png
    XoopsModules/gbook/trunk/gbook/images/index.html
    XoopsModules/gbook/trunk/gbook/images/ip.png
    XoopsModules/gbook/trunk/gbook/images/sign.png
    XoopsModules/gbook/trunk/gbook/images/url.png
    XoopsModules/gbook/trunk/gbook/include/
    XoopsModules/gbook/trunk/gbook/include/functions.php
    XoopsModules/gbook/trunk/gbook/include/index.html
    XoopsModules/gbook/trunk/gbook/index.php
    XoopsModules/gbook/trunk/gbook/language/
    XoopsModules/gbook/trunk/gbook/language/english/
    XoopsModules/gbook/trunk/gbook/language/english/admin.php
    XoopsModules/gbook/trunk/gbook/language/english/help/
    XoopsModules/gbook/trunk/gbook/language/english/help/help.html
    XoopsModules/gbook/trunk/gbook/language/english/help/index.html
    XoopsModules/gbook/trunk/gbook/language/english/index.html
    XoopsModules/gbook/trunk/gbook/language/english/main.php
    XoopsModules/gbook/trunk/gbook/language/english/modinfo.php
    XoopsModules/gbook/trunk/gbook/language/german/
    XoopsModules/gbook/trunk/gbook/language/german/admin.php
    XoopsModules/gbook/trunk/gbook/language/german/help/
    XoopsModules/gbook/trunk/gbook/language/german/help/help.html
    XoopsModules/gbook/trunk/gbook/language/german/help/index.html
    XoopsModules/gbook/trunk/gbook/language/german/index.html
    XoopsModules/gbook/trunk/gbook/language/german/main.php
    XoopsModules/gbook/trunk/gbook/language/german/modinfo.php
    XoopsModules/gbook/trunk/gbook/language/index.html
    XoopsModules/gbook/trunk/gbook/sign.php
    XoopsModules/gbook/trunk/gbook/sql/
    XoopsModules/gbook/trunk/gbook/sql/index.html
    XoopsModules/gbook/trunk/gbook/sql/mysql.sql
    XoopsModules/gbook/trunk/gbook/templates/
    XoopsModules/gbook/trunk/gbook/templates/gbook.css
    XoopsModules/gbook/trunk/gbook/templates/gbook_admin_entries.html
    XoopsModules/gbook/trunk/gbook/templates/gbook_sign.html
    XoopsModules/gbook/trunk/gbook/templates/gbook_view_entries.html
    XoopsModules/gbook/trunk/gbook/templates/index.html
    XoopsModules/gbook/trunk/gbook/xoops_version.php

Added: XoopsModules/gbook/releases/1.0/gbook/admin/about.php
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/admin/about.php	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/admin/about.php	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,43 @@
+<?php
+/**
+ * ****************************************************************************
+ *  GBOOK - MODULE FOR XOOPS
+ *  Copyright (c) 2007 - 2012
+ *  Ingo H. de Boer (http://www.winshell.org)
+ *
+ *  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.
+ *
+ *  You may not change or alter any portion of this comment or credits
+ *  of supporting developers from this source code or any supporting
+ *  source code which is considered copyrighted (c) material of the
+ *  original comment or credit authors.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  ---------------------------------------------------------------------------
+ *  @copyright       Ingo H. de Boer (http://www.winshell.org)
+ *  @license         GNU General Public License (GPL)
+ *  @package         GBook
+ *  @author          Ingo H. de Boer (id...@wi...)
+ *
+ *  Version : 1.00 Wed 2012/06/13 22:32:57 : Ingo H. de Boer Exp $
+ * ****************************************************************************
+ */
+
+include '../../../include/cp_header.php';
+include '../../../class/xoopsformloader.php';
+include 'admin_header.php';
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderabout('', false);
+
+include 'admin_footer.php';
+xoops_cp_footer();


Property changes on: XoopsModules/gbook/releases/1.0/gbook/admin/about.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/admin/admin_footer.php
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/admin/admin_footer.php	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/admin/admin_footer.php	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,32 @@
+<?php
+/**
+ * ****************************************************************************
+ *  GBOOK - MODULE FOR XOOPS
+ *  Copyright (c) 2007 - 2012
+ *  Ingo H. de Boer (http://www.winshell.org)
+ *
+ *  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.
+ *
+ *  You may not change or alter any portion of this comment or credits
+ *  of supporting developers from this source code or any supporting
+ *  source code which is considered copyrighted (c) material of the
+ *  original comment or credit authors.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  ---------------------------------------------------------------------------
+ *  @copyright       Ingo H. de Boer (http://www.winshell.org)
+ *  @license         GNU General Public License (GPL)
+ *  @package         GBook
+ *  @author          Ingo H. de Boer (id...@wi...)
+ *
+ *  Version : 1.00 Wed 2012/06/13 22:32:57 : Ingo H. de Boer Exp $
+ * ****************************************************************************
+ */
+
+xoops_cp_footer();
\ No newline at end of file


Property changes on: XoopsModules/gbook/releases/1.0/gbook/admin/admin_footer.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/admin/admin_header.php
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/admin/admin_header.php	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/admin/admin_header.php	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,49 @@
+<?php
+/**
+ * ****************************************************************************
+ *  GBOOK - MODULE FOR XOOPS
+ *  Copyright (c) 2007 - 2012
+ *  Ingo H. de Boer (http://www.winshell.org)
+ *
+ *  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.
+ *
+ *  You may not change or alter any portion of this comment or credits
+ *  of supporting developers from this source code or any supporting
+ *  source code which is considered copyrighted (c) material of the
+ *  original comment or credit authors.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  ---------------------------------------------------------------------------
+ *  @copyright       Ingo H. de Boer (http://www.winshell.org)
+ *  @license         GNU General Public License (GPL)
+ *  @package         GBook
+ *  @author          Ingo H. de Boer (id...@wi...)
+ *
+ *  Version : 1.00 Wed 2012/06/13 22:32:57 : Ingo H. de Boer Exp $
+ * ****************************************************************************
+ */
+
+include("../../../include/cp_header.php");
+include_once XOOPS_ROOT_PATH."/Frameworks/art/functions.php";
+include_once XOOPS_ROOT_PATH."/Frameworks/art/functions.admin.php";
+
+xoops_loadLanguage('main','gbook');
+xoops_loadLanguage('modinfo','gbook');
+
+$newXoopsModuleGui = false;
+if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+    include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+    $moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+	$pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+	$pathIcon32 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+	$newXoopsModuleGui = true;
+	$indexAdmin = new ModuleAdmin();
+}
+$myts = &MyTextSanitizer::getInstance();
+?>
\ No newline at end of file


Property changes on: XoopsModules/gbook/releases/1.0/gbook/admin/admin_header.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/admin/entries.php
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/admin/entries.php	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/admin/entries.php	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,102 @@
+<?php
+/**
+ * ****************************************************************************
+ *  GBOOK - MODULE FOR XOOPS
+ *  Copyright (c) 2007 - 2012
+ *  Ingo H. de Boer (http://www.winshell.org)
+ *
+ *  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.
+ *
+ *  You may not change or alter any portion of this comment or credits
+ *  of supporting developers from this source code or any supporting
+ *  source code which is considered copyrighted (c) material of the
+ *  original comment or credit authors.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  ---------------------------------------------------------------------------
+ *  @copyright       Ingo H. de Boer (http://www.winshell.org)
+ *  @license         GNU General Public License (GPL)
+ *  @package         GBook
+ *  @author          Ingo H. de Boer (id...@wi...)
+ *
+ *  Version : 1.00 Wed 2012/06/13 22:32:57 : Ingo H. de Boer Exp $
+ * ****************************************************************************
+ */
+
+include 'admin_header.php';
+xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+
+echo $indexAdmin->addNavigation('entries.php');	
+echo $indexAdmin->renderButton('right', '');
+
+$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['id']) ? "edit" : "list");
+
+$handler =& xoops_getmodulehandler('entries');
+
+switch($op ) {
+default:
+case "list":
+    $criteria = new CriteriaCompo();
+    $criteria->setSort('id');
+    $criteria->setOrder('DESC');
+    $GLOBALS['xoopsTpl']->assign('entries', $handler->getObjects($criteria, true, false) );
+    $template_main = "gbook_admin_entries.html";
+    break;
+
+case "edit":
+    $obj = $handler->get($_REQUEST['id']);
+    $form = $obj->getForm();
+    $form->display();
+    break;
+
+case "save":
+    if ( !$GLOBALS['xoopsSecurity']->check()  ) {
+        redirect_header('entries.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+    }
+    if ( isset($_REQUEST['id'])  ) {
+        $obj =& $handler->get($_REQUEST['id']);
+    } else {
+        $obj =& $handler->create();
+    }
+    $obj->setVar('name', $_REQUEST['name']);
+    $obj->setVar('email', $_REQUEST['email']);
+    $obj->setVar('url', $_REQUEST['url']);
+    $obj->setVar('message', $_REQUEST['message']);
+    $obj->setVar('note', $_REQUEST['note']);
+    if ( $handler->insert($obj)  ) {
+        redirect_header('entries.php', 3, _GBOOK_AM_ENTRY_EDITED );
+    }
+    include_once '../include/forms.php';
+    echo $obj->getHtmlErrors();
+    $form =& $obj->getForm();
+    $form->display();
+    break;
+
+case "delete":
+    $obj =& $handler->get($_REQUEST['id']);
+    if ( isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1 ) {
+        if ( !$GLOBALS['xoopsSecurity']->check()  ) {
+            redirect_header('entries.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+        }
+        if ( $handler->delete($obj)  ) {
+            redirect_header('entries.php', 3, sprintf(_GBOOK_AM_DELETE_SUCCESS, $obj->getVar('name')) );
+        } else {
+            echo $obj->getHtmlErrors();
+        }
+    } else {
+        xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_GBOOK_AM_DELETE_SURE, $obj->getVar('name') ));
+    }
+    break;
+}
+
+if ( isset($template_main)  ) {
+    $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+}
+include 'admin_footer.php';
\ No newline at end of file


Property changes on: XoopsModules/gbook/releases/1.0/gbook/admin/entries.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/admin/index.html
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/admin/index.html	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/admin/index.html	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/gbook/releases/1.0/gbook/admin/index.php
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/admin/index.php	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/admin/index.php	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,42 @@
+<?php
+/**
+ * ****************************************************************************
+ *  GBOOK - MODULE FOR XOOPS
+ *  Copyright (c) 2007 - 2012
+ *  Ingo H. de Boer (http://www.winshell.org)
+ *
+ *  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.
+ *
+ *  You may not change or alter any portion of this comment or credits
+ *  of supporting developers from this source code or any supporting
+ *  source code which is considered copyrighted (c) material of the
+ *  original comment or credit authors.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  ---------------------------------------------------------------------------
+ *  @copyright       Ingo H. de Boer (http://www.winshell.org)
+ *  @license         GNU General Public License (GPL)
+ *  @package         GBook
+ *  @author          Ingo H. de Boer (id...@wi...)
+ *
+ *  Version : 1.00 Wed 2012/06/13 22:32:57 : Ingo H. de Boer Exp $
+ * ****************************************************************************
+ */
+
+require_once '../../../include/cp_header.php';
+include 'admin_header.php';
+xoops_cp_header();
+
+$indexAdmin = new ModuleAdmin();
+
+echo $indexAdmin->addNavigation('index.php');
+echo $indexAdmin->renderIndex();
+
+include "admin_footer.php";
+?>
\ No newline at end of file


Property changes on: XoopsModules/gbook/releases/1.0/gbook/admin/index.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/admin/menu.php
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/admin/menu.php	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/admin/menu.php	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,54 @@
+<?php
+/**
+ * ****************************************************************************
+ *  GBOOK - MODULE FOR XOOPS
+ *  Copyright (c) 2007 - 2012
+ *  Ingo H. de Boer (http://www.winshell.org)
+ *
+ *  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.
+ *
+ *  You may not change or alter any portion of this comment or credits
+ *  of supporting developers from this source code or any supporting
+ *  source code which is considered copyrighted (c) material of the
+ *  original comment or credit authors.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  ---------------------------------------------------------------------------
+ *  @copyright       Ingo H. de Boer (http://www.winshell.org)
+ *  @license         GNU General Public License (GPL)
+ *  @package         GBook
+ *  @author          Ingo H. de Boer (id...@wi...)
+ *
+ *  Version : 1.00 Wed 2012/06/13 22:32:57 : Ingo H. de Boer Exp $
+ * ****************************************************************************
+ */
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+
+xoops_loadLanguage('admin', $dirname);
+
+$i = 0;
+
+// Index
+$adminmenu[$i]['title']	= _GBOOK_AM_HOME;
+$adminmenu[$i]['link']	= 'admin/index.php';
+$adminmenu[$i]['icon']	= '../../'.$pathIcon32.'/home.png';
+$i++;
+
+$adminmenu[$i]['title']	= _GBOOK_AM_MANAGE_ENTRIES;
+$adminmenu[$i]['link']	= 'admin/entries.php';
+$adminmenu[$i]['icon']	= '../../'.$pathIcon32.'/manage.png';
+
+$i++;
+$adminmenu[$i]['title']	= _GBOOK_AM_ABOUT;
+$adminmenu[$i]['link']	=  'admin/about.php';
+$adminmenu[$i]['icon']	= '../../'.$pathIcon32.'/about.png';


Property changes on: XoopsModules/gbook/releases/1.0/gbook/admin/menu.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/class/entries.php
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/class/entries.php	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/class/entries.php	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,104 @@
+<?php
+/**
+ * ****************************************************************************
+ *  GBOOK - MODULE FOR XOOPS
+ *  Copyright (c) 2007 - 2012
+ *  Ingo H. de Boer (http://www.winshell.org)
+ *
+ *  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.
+ *
+ *  You may not change or alter any portion of this comment or credits
+ *  of supporting developers from this source code or any supporting
+ *  source code which is considered copyrighted (c) material of the
+ *  original comment or credit authors.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  ---------------------------------------------------------------------------
+ *  @copyright       Ingo H. de Boer (http://www.winshell.org)
+ *  @license         GNU General Public License (GPL)
+ *  @package         GBook
+ *  @author          Ingo H. de Boer (id...@wi...)
+ *
+ *  Version : 1.00 Wed 2012/06/13 22:32:57 : Ingo H. de Boer Exp $
+ * ****************************************************************************
+ */
+
+/**
+ * @package kernel
+ * @copyright copyright &copy; 2000 XOOPS.org
+ */
+class gbookEntries extends XoopsObject
+{
+    function __construct()
+    {
+        $this->initVar('id', XOBJ_DTYPE_INT, null, true);
+        $this->initVar('name', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('email', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('url', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('message', XOBJ_DTYPE_TXTAREA);
+        $this->initVar('note', XOBJ_DTYPE_TXTAREA);
+        $this->initVar('time', XOBJ_DTYPE_INT);
+        $this->initVar('date', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('ip', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('admin', XOBJ_DTYPE_TXTBOX);
+    }
+
+    function gbookEntries()
+    {
+        $this->__construct();
+    }
+
+    /**
+    * Get {@link XoopsThemeForm} for adding/editing categories
+    *
+    * @param mixed $action URL to submit to or false for $_SERVER['REQUEST_URI']
+    *
+    * @return object
+    */
+    function getForm($action = false)
+    {
+        if ($action === false) {
+            $action = $_SERVER['REQUEST_URI'];
+        }
+        $title = _GBOOK_AM_ENTRY_EDIT;
+
+        include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+
+        $form = new XoopsThemeForm($title, 'form', $action, 'post', true);
+
+        $form->addElement(new XoopsFormText(_GBOOK_AM_NAME, 'name', 35, 255, $this->getVar('name')));
+        $form->addElement(new XoopsFormText(_GBOOK_AM_EMAIL, 'email', 35, 255, $this->getVar('email')));
+        $form->addElement(new XoopsFormText(_GBOOK_AM_URL, 'url', 35, 255, $this->getVar('url')));
+        $form->addElement(new XoopsFormTextArea(_GBOOK_AM_MESSAGE, 'message', $this->getVar('message', 'e')));
+        $form->addElement(new XoopsFormTextArea(_GBOOK_AM_NOTE, 'note', $this->getVar('note', 'e')));
+
+        $form->addElement(new XoopsFormHidden('op', 'save') );
+        $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+
+        return $form;
+    }
+}
+
+/**
+ * @package kernel
+ * @copyright copyright &copy; 2000 XOOPS.org
+ */
+class gbookEntriesHandler extends XoopsPersistableObjectHandler
+{
+    function gbookEntriesHandler(&$db)
+    {
+        $this->__construct($db);
+    }
+
+    function __construct(&$db)
+    {
+        parent::__construct($db, "gbook_entries", "gbookEntries", "id", "name", "email", "url", "message", "note", "time", "date", "ip", "admin");
+    }
+}
+?>
\ No newline at end of file


Property changes on: XoopsModules/gbook/releases/1.0/gbook/class/entries.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/class/index.html
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/class/index.html	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/class/index.html	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/gbook/releases/1.0/gbook/docs/changelog.txt
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/docs/changelog.txt	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/docs/changelog.txt	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,4 @@
+Version 1.0
+-------------------
+- first release
+

Added: XoopsModules/gbook/releases/1.0/gbook/docs/credits.txt
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/docs/credits.txt	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/docs/credits.txt	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,4 @@
+Credits
+===============
+
+- MyGuestbook (Narga)

Added: XoopsModules/gbook/releases/1.0/gbook/docs/index.html
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/docs/index.html	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/docs/index.html	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/gbook/releases/1.0/gbook/docs/install.txt
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/docs/install.txt	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/docs/install.txt	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,5 @@
+INSTALL/UNISTALL
+=================
+
+- Extract the /gbook folder into the ../modules directory
+- Install the module through Admin -> System Module -> Modules

Added: XoopsModules/gbook/releases/1.0/gbook/docs/licence.txt
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/docs/licence.txt	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/docs/licence.txt	2014-03-16 00:55:50 UTC (rev 12379)
@@ -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: XoopsModules/gbook/releases/1.0/gbook/docs/readme.txt
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/docs/readme.txt	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/docs/readme.txt	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,22 @@
+Read Me First
+=============
+
+Description
+------------
+The GBook module is for managing a guestbook.
+
+ Requirements
+ _____________________________________________________________________
+ 
+- PHP version >= 5.2.0
+- XOOPS 2.5.3+  
+
+Install/uninstall
+------------------
+- Extract the /gbook folder into the ../modules directory
+- Install the module through Admin -> System Module -> Modules
+
+Operating instructions
+------------------------
+- Configure your preferences for the module (see 'Peferences').</li>
+- Manage the GBook entries (see 'Manage Entries').</li>

Added: XoopsModules/gbook/releases/1.0/gbook/footer.php
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/footer.php	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/footer.php	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,33 @@
+<?php
+/**
+ * ****************************************************************************
+ *  GBOOK - MODULE FOR XOOPS
+ *  Copyright (c) 2007 - 2012
+ *  Ingo H. de Boer (http://www.winshell.org)
+ *
+ *  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.
+ *
+ *  You may not change or alter any portion of this comment or credits
+ *  of supporting developers from this source code or any supporting
+ *  source code which is considered copyrighted (c) material of the
+ *  original comment or credit authors.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  ---------------------------------------------------------------------------
+ *  @copyright       Ingo H. de Boer (http://www.winshell.org)
+ *  @license         GNU General Public License (GPL)
+ *  @package         GBook
+ *  @author          Ingo H. de Boer (id...@wi...)
+ *
+ *  Version : 1.00 Wed 2012/06/13 22:32:57 : Ingo H. de Boer Exp $
+ * ****************************************************************************
+ */
+
+include $GLOBALS['xoops']->path('footer.php');
+?>
\ No newline at end of file


Property changes on: XoopsModules/gbook/releases/1.0/gbook/footer.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/header.php
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/header.php	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/header.php	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,35 @@
+<?php
+/**
+ * ****************************************************************************
+ *  GBOOK - MODULE FOR XOOPS
+ *  Copyright (c) 2007 - 2012
+ *  Ingo H. de Boer (http://www.winshell.org)
+ *
+ *  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.
+ *
+ *  You may not change or alter any portion of this comment or credits
+ *  of supporting developers from this source code or any supporting
+ *  source code which is considered copyrighted (c) material of the
+ *  original comment or credit authors.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  ---------------------------------------------------------------------------
+ *  @copyright       Ingo H. de Boer (http://www.winshell.org)
+ *  @license         GNU General Public License (GPL)
+ *  @package         GBook
+ *  @author          Ingo H. de Boer (id...@wi...)
+ *
+ *  Version : 1.00 Wed 2012/06/13 22:32:57 : Ingo H. de Boer Exp $
+ * ****************************************************************************
+ */
+
+include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
+$xoopsOption['xoops_module_header'] = '<link rel="stylesheet" type="text/css" href="templates/style.css" />';
+
+?>
\ No newline at end of file


Property changes on: XoopsModules/gbook/releases/1.0/gbook/header.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/images/email.png
===================================================================
(Binary files differ)

Index: XoopsModules/gbook/releases/1.0/gbook/images/email.png
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/images/email.png	2014-03-16 00:49:49 UTC (rev 12378)
+++ XoopsModules/gbook/releases/1.0/gbook/images/email.png	2014-03-16 00:55:50 UTC (rev 12379)

Property changes on: XoopsModules/gbook/releases/1.0/gbook/images/email.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/images/gbook.png
===================================================================
(Binary files differ)

Index: XoopsModules/gbook/releases/1.0/gbook/images/gbook.png
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/images/gbook.png	2014-03-16 00:49:49 UTC (rev 12378)
+++ XoopsModules/gbook/releases/1.0/gbook/images/gbook.png	2014-03-16 00:55:50 UTC (rev 12379)

Property changes on: XoopsModules/gbook/releases/1.0/gbook/images/gbook.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/images/index.html
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/images/index.html	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/images/index.html	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/gbook/releases/1.0/gbook/images/ip.png
===================================================================
(Binary files differ)

Index: XoopsModules/gbook/releases/1.0/gbook/images/ip.png
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/images/ip.png	2014-03-16 00:49:49 UTC (rev 12378)
+++ XoopsModules/gbook/releases/1.0/gbook/images/ip.png	2014-03-16 00:55:50 UTC (rev 12379)

Property changes on: XoopsModules/gbook/releases/1.0/gbook/images/ip.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/images/sign.png
===================================================================
(Binary files differ)

Index: XoopsModules/gbook/releases/1.0/gbook/images/sign.png
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/images/sign.png	2014-03-16 00:49:49 UTC (rev 12378)
+++ XoopsModules/gbook/releases/1.0/gbook/images/sign.png	2014-03-16 00:55:50 UTC (rev 12379)

Property changes on: XoopsModules/gbook/releases/1.0/gbook/images/sign.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/images/url.png
===================================================================
(Binary files differ)

Index: XoopsModules/gbook/releases/1.0/gbook/images/url.png
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/images/url.png	2014-03-16 00:49:49 UTC (rev 12378)
+++ XoopsModules/gbook/releases/1.0/gbook/images/url.png	2014-03-16 00:55:50 UTC (rev 12379)

Property changes on: XoopsModules/gbook/releases/1.0/gbook/images/url.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/gbook/releases/1.0/gbook/include/functions.php
===================================================================
--- XoopsModules/gbook/releases/1.0/gbook/include/functions.php	                        (rev 0)
+++ XoopsModules/gbook/releases/1.0/gbook/include/functions.php	2014-03-16 00:55:50 UTC (rev 12379)
@@ -0,0 +1,65 @@
+<?php
+/**
+ * ****************************************************************************
+ *  GBOOK - MODULE FOR XOOPS
+ *  Copyright (c) 2007 - 2012
+ *  Ingo H. de Boer (http://www.winshell.org)
+ *
+ *  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.
+ *
+ *  You may not change or alter any portion of this comment or credits
+ *  of supporting developers from this source code or any supporting
+ *  source code which is considered copyrighted (c) material of the
+ *  original comment or credit authors.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  ---------------------------------------------------------------------------
+ *  @copyright       Ingo H. de Boer (http://www.winshell.org)
+ *  @license         GNU General Public License (GPL)
+ *  @package       ...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops-svn:[12378] XoopsModules

[<be...@us...>]

Revision: 12378
          http://sourceforge.net/p/xoops/svn/12378
Author:   beckmi
Date:     2014-03-16 00:49:49 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Adding placeholder for gBook (Guestbook) module

Added Paths:
-----------
    XoopsModules/gbook/
    XoopsModules/gbook/branches/
    XoopsModules/gbook/releases/
    XoopsModules/gbook/trunk/
    XoopsModules/gbook/trunk/gbook/

[xoops-svn] SF.net SVN: xoops-svn:[12377] XoopsCore/branches/2.5.x/2.5.7/htdocs/include /common.php

[<rgr...@us...>]

Revision: 12377
          http://sourceforge.net/p/xoops/svn/12377
Author:   rgriffith
Date:     2014-03-15 15:52:18 +0000 (Sat, 15 Mar 2014)
Log Message:
-----------
Rework to remove inadvertent dependency on PHP 5.4+ feature

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-14 09:32:52 UTC (rev 12376)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-15 15:52:18 UTC (rev 12377)
@@ -197,8 +197,13 @@
                          array(&$sess_handler, 'destroy'),
                          array(&$sess_handler, 'gc'));
 
-if (session_status() !== PHP_SESSION_ACTIVE) {
-    session_start();
+if (function_exists('session_status')) {
+    if (session_status() !== PHP_SESSION_ACTIVE) {
+        session_start();
+    }
+} else {
+    // this should silently fail if session has already started (for PHP 5.3)
+    @session_start();
 }
 
 /**

[xoops-svn] SF.net SVN: xoops-svn:[12376] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate

[<txm...@us...>]

Revision: 12376
          http://sourceforge.net/p/xoops/svn/12376
Author:   txmodxoops
Date:     2014-03-14 09:32:52 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
Updated
Removed unnecessary code

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_footer.html

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-03-14 08:46:54 UTC (rev 12375)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-03-14 09:32:52 UTC (rev 12376)
@@ -57,13 +57,11 @@
 		// Effacer repertoire of nouveau module s'il existe
 		TDMCreate_clearDir($modPath.'/modules/'.strtolower($mod_name));			
 		// Debut
-		$xoopsTpl->assign('open_table', TDMCreate_OpenTable(_AM_TDMCREATE_BUILDING_FILES, _AM_TDMCREATE_BUILDING_SUCCESS, _AM_TDMCREATE_BUILDING_FAILED));
 		/************************************************/
 		/*Structure*/
 		/************************************************/	
         //Creation of the structure of folders and files
 		$xoopsTpl->assign('build_list', 'Under new construction - Temporary build');
-		$xoopsTpl->assign('close_table', TDMCreate_CloseTable());
 	break;
 	
 	case 'default':

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php	2014-03-14 08:46:54 UTC (rev 12375)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php	2014-03-14 09:32:52 UTC (rev 12376)
@@ -55,13 +55,4 @@
 $r=@rmdir($folder);
 if (!$r) return false;
 	return true;
-}
-
-function TDMCreate_OpenTable($file, $_ok, $_notok) {
-    echo '<table class="outer"><tr><th width="70%">'.$file.'</th><th width="15%">'.$_ok.'</th><th  width="15%">'.$_notok.'</th></tr>';
-}
-
-function TDMCreate_CloseTable() {
-    echo '</table><br />';
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html	2014-03-14 08:46:54 UTC (rev 12375)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html	2014-03-14 09:32:52 UTC (rev 12376)
@@ -2,8 +2,33 @@
 <{includeq file="db:tdmcreate_header.html"}>
 <!-- Display building form  -->
 <br />
-<{if $form}>
-   <{$form}>
+<{if $build_list}>
+ <table class="outer">
+   <thead>
+   <tr class="head">
+      <th width="70%"><{$smarty.const._AM_TDMCREATE_BUILDING_FILES}></th>
+      <th width="15%"><{$smarty.const._AM_TDMCREATE_BUILDING_SUCCESS}></th>
+      <th width="15%"><{$smarty.const._AM_TDMCREATE_BUILDING_FAILED}></th>
+   </tr>
+   </thead>
+   <tbody>
+      <!--  <{foreach item=list from=$build_list}> -->
+       <tr class="<{cycle values='odd, even'}>">
+          <td class="center" colspan="3"><{$build_list}></td>
+         <!--   <td style="padding-left: 30px;"><{$list.file}></td>
+          <{if $list.on}>
+              <td class="center"><img src="<{xoModuleIcons16 on.png}>" alt="" /></td>
+              <td>&nbsp;</td>
+          <{elseif $list.off}>
+              <td>&nbsp;</td>
+              <td class="center"><img src="<{xoModuleIcons16 off.png}>" alt="" /></td>
+          <{/if}> -->
+       <tr>
+      <!--  <{/foreach}> -->
+   </tbody>
+ </table><br />
 <{else}>
-   <{$build_list}>
+  <{if $form}>
+    <{$form}>
+  <{/if}>
 <{/if}>
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_footer.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_footer.html	2014-03-14 08:46:54 UTC (rev 12375)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_footer.html	2014-03-14 09:32:52 UTC (rev 12376)
@@ -1,5 +1,5 @@
 <div class='center'><a href='http://www.xoops.org' title='Visit XOOPS' target='_blank'>
-         <img src="<{$xoModuleIcons32 xoopsmicrobutton.gif}>" alt='XOOPS' /></a></div>
+         <img src="<{xoModuleIcons32 xoopsmicrobutton.gif}>" alt='XOOPS' /></a></div>
 <div class='center smallsmall italic pad5'>
           <strong><{$module_name}></strong> is maintained by the
             <a href='http://xoops.org/forums/newbb' title='Visit Support Forum' class='tooltip' rel='external'>Support Forum</a></div>
\ No newline at end of file

[xoops-svn] SF.net SVN: xoops-svn:[12375] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate

[<txm...@us...>]

Revision: 12375
          http://sourceforge.net/p/xoops/svn/12375
Author:   txmodxoops
Date:     2014-03-14 08:46:54 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
Moved all html code in templates files

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/about.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php

Added Paths:
-----------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_about.html
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_footer.html
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_header.html
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_help.html
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_index.html
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/about.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/about.php	2014-03-14 08:06:01 UTC (rev 12374)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/about.php	2014-03-14 08:46:54 UTC (rev 12375)
@@ -19,6 +19,7 @@
  * @version         $Id: about.php 11084 2013-02-23 15:44:20Z timgno $
  */
 include 'header.php';
-echo $adminMenu->addNavigation('about.php');
-echo $adminMenu->renderabout('6KJ7RW5DR3VTJ', false);
+$xoopsOption['template_main'] = 'tdmcreate_about.html'; 
+$xoopsTpl->assign('navigation', $adminMenu->addNavigation('about.php'));
+$xoopsTpl->assign('about', $adminMenu->renderAbout('6KJ7RW5DR3VTJ', false));
 include 'footer.php';
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-03-14 08:06:01 UTC (rev 12374)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-03-14 08:46:54 UTC (rev 12375)
@@ -50,22 +50,20 @@
 
 $nb_tables = $tablesHandler->getCount($criteria);
 $tables_arr = $tablesHandler->getAll($criteria);
-
-echo $adminMenu->addNavigation('building.php');
+$xoopsOption['template_main'] = 'tdmcreate_building.html'; 
+$xoopsTpl->assign('navigation', $adminMenu->addNavigation('building.php'));
 switch ($op) {
 	case 'build':		
 		// Effacer repertoire of nouveau module s'il existe
 		TDMCreate_clearDir($modPath.'/modules/'.strtolower($mod_name));			
 		// Debut
-		TDMCreate_OpenTable(_AM_TDMCREATE_BUILDING_FILES, _AM_TDMCREATE_BUILDING_SUCCESS, _AM_TDMCREATE_BUILDING_FAILED);
+		$xoopsTpl->assign('open_table', TDMCreate_OpenTable(_AM_TDMCREATE_BUILDING_FILES, _AM_TDMCREATE_BUILDING_SUCCESS, _AM_TDMCREATE_BUILDING_FAILED));
 		/************************************************/
 		/*Structure*/
 		/************************************************/	
         //Creation of the structure of folders and files
-		
-		echo 'Under new construction';
-		
-		TDMCreate_CloseTable();
+		$xoopsTpl->assign('build_list', 'Under new construction - Temporary build');
+		$xoopsTpl->assign('close_table', TDMCreate_CloseTable());
 	break;
 	
 	case 'default':
@@ -81,7 +79,7 @@
 
         $form->addElement(new XoopsFormHidden('op', 'build'));
         $form->addElement(new XoopsFormButton(_REQUIRED.' <span class="red bold">*</span>', 'submit', _SUBMIT, 'submit'));
-        $form->display();
+		$xoopsTpl->assign('form', $form->display());
 	break;
 }
 include 'footer.php';
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php	2014-03-14 08:06:01 UTC (rev 12374)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php	2014-03-14 08:46:54 UTC (rev 12375)
@@ -18,10 +18,7 @@
  * @author          Txmod Xoops http://www.txmodxoops.org
  * @version         $Id: footer.php 12207 2013-10-23 02:46:52Z beckmi $
  */
-echo "<div align='center'><a href='http://www.xoops.org' title='Visit XOOPS' target='_blank'>
-         <img src='".$pathIcon32."/xoopsmicrobutton.gif' alt='XOOPS' /></a></div>";
-echo "<div class='center smallsmall italic pad5'>
-          <strong>" . $xoopsModule->getVar('name') . "</strong> is maintained by the 
-            <a href='http://xoops.org/forums/newbb' title='Visit Support Forum' class='tooltip' rel='external'>Support Forum</a></div>";
+
+$xoopsTpl->assign('module_name', $xoopsModule->getVar('name'));
 xoops_cp_footer();
 ?>
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php	2014-03-14 08:06:01 UTC (rev 12374)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php	2014-03-14 08:46:54 UTC (rev 12375)
@@ -19,14 +19,16 @@
  * @version         $Id: index.php 11084 2013-02-23 15:44:20Z timgno $
  */
 include 'header.php';
-    $criteria = new CriteriaCompo();
-	$count_modules = $modulesHandler->getCount($criteria);
-	$count_tables = $tablesHandler->getCount($criteria);
 
+$criteria = new CriteriaCompo();
+$count_modules = $modulesHandler->getCount($criteria);
+$count_tables = $tablesHandler->getCount($criteria);
+unset($criteria);
+
 $adminMenu->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES) ;
 $adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' ._AM_TDMCREATE_THEREARE_NUMMODULES. '</label>', $count_modules, 'Green') ;
 $adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' ._AM_TDMCREATE_THEREARE_NUMTABLES. '</label>', $count_tables, 'Orange');
-
-    echo $adminMenu->addNavigation('index.php');
-    echo $adminMenu->renderIndex();
+$xoopsOption['template_main'] = 'tdmcreate_index.html'; 
+$xoopsTpl->assign('navigation', $adminMenu->addNavigation('index.php'));
+$xoopsTpl->assign('index', $adminMenu->renderIndex());
 include 'footer.php';
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_about.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_about.html	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_about.html	2014-03-14 08:46:54 UTC (rev 12375)
@@ -0,0 +1,4 @@
+<!-- Header -->
+<{includeq file="db:tdmcreate_header.html"}>
+<!-- About Page -->
+<div class="top"><{$about}></div>
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_building.html	2014-03-14 08:46:54 UTC (rev 12375)
@@ -0,0 +1,9 @@
+<!-- Header -->
+<{includeq file="db:tdmcreate_header.html"}>
+<!-- Display building form  -->
+<br />
+<{if $form}>
+   <{$form}>
+<{else}>
+   <{$build_list}>
+<{/if}>
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html	2014-03-14 08:46:54 UTC (rev 12375)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_footer.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_footer.html	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_footer.html	2014-03-14 08:46:54 UTC (rev 12375)
@@ -0,0 +1,5 @@
+<div class='center'><a href='http://www.xoops.org' title='Visit XOOPS' target='_blank'>
+         <img src="<{$xoModuleIcons32 xoopsmicrobutton.gif}>" alt='XOOPS' /></a></div>
+<div class='center smallsmall italic pad5'>
+          <strong><{$module_name}></strong> is maintained by the
+            <a href='http://xoops.org/forums/newbb' title='Visit Support Forum' class='tooltip' rel='external'>Support Forum</a></div>
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_header.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_header.html	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_header.html	2014-03-14 08:46:54 UTC (rev 12375)
@@ -0,0 +1,4 @@
+<div class="top">
+<span class="left"><{$navigation}></span>
+<{if $button_new}><span class="right"><{$button_new}>&nbsp;</span><{/if}><{if $button_list}><span class="right">&nbsp;<{$button_list}></span><{/if}>
+</div>
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_help.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_help.html	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_help.html	2014-03-14 08:46:54 UTC (rev 12375)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_index.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_index.html	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_index.html	2014-03-14 08:46:54 UTC (rev 12375)
@@ -0,0 +1,4 @@
+<!-- Header -->
+<{includeq file="db:tdmcreate_header.html"}>
+<!-- Index Page -->
+<div class="top"><{$index}></div>
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html	2014-03-14 08:46:54 UTC (rev 12375)
@@ -0,0 +1,60 @@
+<!-- Header -->
+<{includeq file="db:tdmcreate_header.html"}>
+<!-- Display modules list -->
+<{if $modules_list}>    
+   <table width='100%' cellspacing='1' class='outer'>
+     <tr>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_ID}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_NAME}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_VERSION}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_IMAGE}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_RELEASE}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_STATUS}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_ADMIN_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_USER_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_SUBMENU_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_SEARCH_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_COMMENTS_LIST}></th>
+         <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_NOTIFICATIONS_LIST}></th>
+	 <th class='center width5'><{$smarty.const._AM_TDMCREATE_FORMACTION}></th>
+     </tr>
+     <{foreach item=module from=$modules_list}>
+         <tr class="<{cycle values='odd,even'}>">
+	    <td class='center'><{$module.mod_id}></td>
+            <td class='center'><{$module.mod_name}></td>
+	    <td class='center'><{$module.mod_version}></td>
+            <td class='center'><img src="<{$tdmc_upload_url}>/images/modules/<{$module.mod_image}>" height="32" /></td>
+	    <td class='center'><{$module.mod_release}></td>
+	    <td class='center'><{$module.mod_status}></td>
+	    <td class='center'><{$module.mod_admin}></td>
+	    <td class='center'><{$module.mod_user}></td>
+	    <td class='center'><{$module.mod_submenu}></td>
+	    <td class='center'><{$module.mod_search}></td>
+	    <td class='center'><{$module.mod_comments}></td>
+	    <td class='center'><{$module.mod_notifications}></td>
+
+	    <td class='xo-actions txtcenter width5'>
+		<a href="modules.php?op=edit&amp;mod_id=<{$module.mod_id}>" title="<{$smarty.const._EDIT}>">
+                   <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" height="16" />
+                </a>
+                <a href="modules.php?op=delete&amp;mod_id=<{$module.mod_id}>" title="<{$smarty.const._DELETE}>">
+                   <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" height="16" />
+                </a>
+	    </td>
+        </tr>  
+     <{/foreach}>
+   </table><br /><br />
+<!-- Display modules navigation -->
+<div class="clear">&nbsp;</div>
+<{if $pagenav}><div class="xo-pagenav floatright"><{$pagenav}></div><div class="clear spacer"></div><{/if}>
+<{/if}>
+<{if $error}>
+<div class="errorMsg">
+    <strong><{$error}></strong>
+</div>
+<{/if}>
+<!-- Display module form (add,edit) -->
+<{if $form}>
+<div class="spacer"><{$form}></div>
+<{/if}>
+<!-- Display module images on edit page -->
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html	2014-03-14 08:46:54 UTC (rev 12375)
@@ -0,0 +1,84 @@
+<!-- Header -->
+<{includeq file="db:tdmcreate_header.html"}>
+<!-- Display modules list -->
+<{if $modules_list}>    
+   <table width='100%' cellspacing='1' class='outer'>
+     <tr>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_ID}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_NAME}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_IMAGE}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_NBFIELDS}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_BLOCKS}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_ADMIN_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_USER_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_SUBMENU_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_SEARCH_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_COMMENTS_LIST}></th>
+         <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_NOTIFICATIONS_LIST}></th>
+	 <th class='center width6'><{$smarty.const._AM_TDMCREATE_FORMACTION}></th>
+     </tr>
+     <{foreach item=module from=$modules_list}>
+         <tr class="head toggleTables">
+	    <td class='center'><{$module.id}><br /><img src="<{$tdmc_url}>/images/icons/16/toggle.png" alt="Toggle" title="Toggle" /></td>
+            <td class='center'><{$module.name}></td>
+            <td class='center'><img src="<{$tdmc_upload_url}>/images/modules/<{$module.image}>" height="32" /></td>
+	    <td class='center'><img src="<{$tdmc_url}>/images/icons/16/nb_fields.png" height="16" /></td>
+	    <td class='center'><img src="<{$tdmc_url}>/images/icons/16/blocks.png" height="16" /></td>
+	    <td class='center'><{$module.admin}></td>
+	    <td class='center'><{$module.user}></td>
+	    <td class='center'><{$module.submenu}></td>
+	    <td class='center'><{$module.search}></td>
+	    <td class='center'><{$module.comments}></td>
+	    <td class='center'><{$module.notifications}></td>
+
+	    <td class='xo-actions txtcenter width6'>
+		<a href="modules.php?op=edit&amp;mod_id=<{$module.id}>" title="<{$smarty.const._EDIT}>">
+                   <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" height="16" />
+                </a>
+                <a href="modules.php?op=delete&amp;mod_id=<{$module.id}>" title="<{$smarty.const._DELETE}>">
+                   <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" height="16" />
+                </a>
+	    </td>
+         </tr>  
+         <{foreach item=table from=$module.tables}>
+             <tr class="<{cycle values='even,odd'}> toggleHidden">
+    	        <td class='center'><{$table.id}></td>
+                <td class='center'><{$table.name}></td>
+                <td class='center'><img src="<{$pathIcon32}>/<{$table.image}>" alt="<{$table.name}>" height="32" /></td>
+    	        <td class='center'><{$table.nbfields}></td>
+    	        <td class='center'><{$table.blocks}></td>
+    	        <td class='center'><{$table.admin}></td>
+    	        <td class='center'><{$table.user}></td>
+    	        <td class='center'><{$table.submenu}></td>
+    	        <td class='center'><{$table.search}></td>
+    	        <td class='center'><{$table.comments}></td>
+    	        <td class='center'><{$table.notifications}></td>
+    	        <td class='xo-actions txtcenter width5'>
+    		    <a href="tables.php?op=edit&amp;table_id=<{$table.id}>" title="<{$smarty.const._EDIT}>">
+                       <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" height="16" />
+                    </a>
+                    <a href="fields.php?op=edit&amp;field_tid=<{$table.id}>" title="<{$smarty.const._EDIT}>">
+                       <img src="<{$tdmc_url}>/images/icons/16/editfields.png" alt="<{$smarty.const._EDIT}>" height="16" />
+                    </a>
+                    <a href="tables.php?op=delete&amp;table_id=<{$table.id}>" title="<{$smarty.const._DELETE}>">
+                       <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" height="16" />
+                    </a>
+    	        </td>
+             </tr>
+         <{/foreach}>
+     <{/foreach}>
+   </table><br /><br />
+<!-- Display modules navigation -->
+<div class="clear">&nbsp;</div>
+<{if $pagenav}><div class="xo-pagenav floatright"><{$pagenav}></div><div class="clear spacer"></div><{/if}>
+<{/if}>
+<{if $error}>
+<div class="errorMsg">
+    <strong><{$error}></strong>
+</div>
+<{/if}>
+<!-- Display module form (add,edit) -->
+<{if $form}>
+<div class="spacer"><{$form}></div>
+<{/if}>
+<!-- Display module images on edit page -->

[xoops-svn] SF.net SVN: xoops-svn:[12374] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate/sql/mysql.sql

[<txm...@us...>]

Revision: 12374
          http://sourceforge.net/p/xoops/svn/12374
Author:   txmodxoops
Date:     2014-03-14 08:06:01 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
Unique key

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql	2014-03-13 21:55:43 UTC (rev 12373)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql	2014-03-14 08:06:01 UTC (rev 12374)
@@ -36,7 +36,8 @@
   `mod_install` tinyint(1) unsigned NOT NULL default '0',
   `mod_donations` varchar(50) NOT NULL default '',
   `mod_subversion` varchar(10) NOT NULL default '',
-  PRIMARY KEY (`mod_id`)
+  PRIMARY KEY (`mod_id`),
+  KEY `mod_name` (`mod_name`)
 ) ENGINE=MyISAM;
 
 
@@ -60,5 +61,7 @@
   `table_comments` tinyint(1) unsigned NOT NULL default '0',
   `table_notifications` tinyint(1) unsigned NOT NULL default '0',
   `table_permissions` tinyint(1) unsigned NOT NULL default '0',
-  PRIMARY KEY (`table_id`)
+  PRIMARY KEY (`table_id`),
+  KEY `table_mid` (`table_mid`),
+  KEY `table_name` (`table_name`)
 ) ENGINE=MyISAM;
\ No newline at end of file

[xoops-svn] SF.net SVN: xoops-svn:[12373] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate

[<txm...@us...>]

Revision: 12373
          http://sourceforge.net/p/xoops/svn/12373
Author:   txmodxoops
Date:     2014-03-13 21:55:43 +0000 (Thu, 13 Mar 2014)
Log Message:
-----------
Work in progress

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/headerfiles.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/htmlsmartycodes.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_comments.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_common.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_notifications.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_file.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_index.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions_const.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php

Added Paths:
-----------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/create_file.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/docs_files.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/fields_parameters.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/form_elements.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/tables_fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_xoopsversion.php

Removed Paths:
-------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/architecture.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields_parameters.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/xoopsversion_file.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form_elements.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/structure.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables_fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/Car_logo.png
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/images/uploads/modules/My Module_logo.png

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-03-12 20:19:24 UTC (rev 12372)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-03-13 21:55:43 UTC (rev 12373)
@@ -62,164 +62,9 @@
 		/*Structure*/
 		/************************************************/	
         //Creation of the structure of folders and files
-		const_structure($modules);			
-		//Creation of changelog.txt
-		const_changelog($modules);
-						
-		$result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix('mod_tdmcreate_tables') . " WHERE table_name = 'mod_".strtolower($mod_name)."_categories'");
-		list( $category ) = $xoopsDB->fetchRow($result);
-
-		foreach (array_keys($tables_arr) as $i)
-		{	
-			// Variables
-			$table_name = $tables_arr[$i]->getVar('table_name');			
-			$table_fieldname = $tables_arr[$i]->getVar('table_fieldname');
-            $table_category = $tables_arr[$i]->getVar('table_category');
-			$table_fields = $tables_arr[$i]->getVar('table_fields');
-			$table_parameters = $tables_arr[$i]->getVar('table_parameters');
-			$table_image = $tables_arr[$i]->getVar('table_image');			
-			$table_blocks = $tables_arr[$i]->getVar('table_blocks');
-			$table_admin = $tables_arr[$i]->getVar('table_admin');
-			$table_user = $tables_arr[$i]->getVar('table_user');
-			$table_search = $tables_arr[$i]->getVar('table_search');
-			$table_comments = $tables_arr[$i]->getVar('table_comments');			
-			$table_notifications = $tables_arr[$i]->getVar('table_notifications');						
-			$table_permissions = $tables_arr[$i]->getVar('table_permissions');
-            $table_waiting = $tables_arr[$i]->getVar('table_waiting');
-
-			// Fabrication
-			// Copy of images tables			
-			$table_image1 = $modPath . '/images/uploads/tables/' . $table_image;
-			if (file_exists($table_image1)) {
-				copy($table_image1, $modPath . '/modules/' . strtolower($mod_name) . '/images/icons/32/' . $table_image);
-			}
-			// Creation of classes
-			if ( $table_admin == 1 || $table_user == 1) {				
-				const_class($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $table_permissions);
-			}			
-            // Creation of pages admin
-			if ( $table_admin == 1 ) {				
-				const_admin_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $category);
-			}
-			// Creation of pages and templates user
-			if ( $table_user == 1 && $table_name != null ) {
-				const_user_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);							
-				const_templates_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
-			} 
-			// Creation of search
-			if ( $table_search == 1 ) {
-				const_include_search($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $table_image);
-			}	
-			// Creation of admin permissions.php
-			if ( $table_permissions == 1) {
-				const_admin_permissions($modules, $table_name, $table_fields, $table_parameters);
-			}
-			// Creation of notifications
-			if ( $table_notifications == 1 ) {
-                const_include_notifications($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
-			}
-			// Creation of the file mysql.sql
-			const_sql($modules, $table_name, $table_fieldname, $category, $table_fields);		
-			
-			// Creation of blocks
-			if ( $table_blocks == 1 ) {
-				const_blocks($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $category);
-				//Creation of template per blocks
-				const_blocks_templates($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
-			}            			
-		}	
-		$table_name = isset($table_name) ? $table_name : null;
-		$table_comments = isset($table_comments) ? $table_comments : null;
-		$table_waiting = isset($table_waiting) ? $table_waiting : null;
-		$table_parameters = isset($table_parameters) ? $table_parameters : null;
-		$table_user = isset($table_user) ? $table_user : null;
-		$table_admin = isset($table_admin) ? $table_admin : null;
-		$table_fields = isset($table_fields) ? $table_fields : null;
-		$table_blocks = isset($table_blocks) ? $table_blocks : null;
-		$table_image = isset($table_image) ? $table_image : null;
-		$table_permissions = isset($table_permissions) ? $table_permissions : null;
-		$table_notifications = isset($table_notifications) ? $table_notifications : null;
-		//Creation of architecture of more fields and data
-		//const_architecture(null, null, $table_admin, $table_blocks, $table_admin, $table_blocks );	
-		// Creation of comments
-		if ( $table_comments == 1 ) {
-			const_include_comments($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
-		}		
-				
-		if ( $table_waiting == 1 ) {
-			// Creation of Waiting Plugin
-			const_waiting($modules, $tables_arr);
-		}
-		// Creation of class helper, module & request
-		if ( $table_name != '' ) {				
-			const_class_helper($modules);
-			const_class_module($modules);
-			const_class_request($modules);
-		}
-        // Creation of xoopsversion.php		
-		const_xoopsversion($modules, $table_name, $table_fields, $table_parameters, $table_image, $tables_arr);
-		// Creation of template index
-		const_templates_index($modules);
-		// Creation of template header
-		const_templates_header($modules, $tables_arr);
-		// Creation of template footer
-		const_templates_footer($modules, $table_comments, $table_notifications);
 		
-		if ( $table_admin == 1 ) {	
-			// Creation of template admin about
-			const_templates_admin_about($modules);
-			// Creation of template admin help
-			const_templates_admin_help($modules);
-		}
-		// Include
-		///////////////////////////////////////////////////////////////////////			
-		// Configs
-		const_include_common($modules, $mod_author_website_name, $mod_author_website_url);
-		// Functions
-		const_include_functions($modules);
-		//Creation of file install per l'uploads
-		const_include_install($modules, $tables_arr);
-		// Language
-		///////////////////////////////////////////////////////////////////////
-		if ( $mod_user == 1 ) {
-			//Creation of language main.php
-			const_main_language($modules, $tables_arr);
-		}
-		// Creation of language modinfo.php
-		const_modinfo_language($modules, $table_name, $table_image, $tables_arr, $mod_notifications);
-		if ( $table_admin == 1 ) {	
-			// Creation of language admin.php
-			const_admin_language($modules, $tables_arr, $mod_permissions);
-		}
-		if ( $table_blocks == 1 ) {
-			// Creation of language blocks.php
-			const_blocks_language($modules, $tables_arr);	
-        }			
-		// Creation of language help/help.html
-		const_help_language($modules); 
-		///////////////////////////////////////////////////////////////////////
-		//Creation of style.css
-		const_css_style($modules);		
-		/************************************************/
-		/*Admin*/
-		/************************************************/
-		// Creation of admin header.php
-		const_admin_header($modules, $table_name, $tables_arr);
-		// Creation of admin index.php		
-		const_admin_index($modules, $tables_arr);
-		// Creation of admin footer.php
-		const_admin_footer($modules);
-		// Creation of admin menu.php
-		const_admin_menu($modules, $tables_arr, $mod_permissions);
-		// Creation of admin about.php
-		const_admin_about($modules);        		
-		/************************************************/
-		/*User*/
-		/************************************************/
-		if ( $mod_user == 1 ) {
-			const_user_header($modules);
-			const_user_index($modules);
-		}
+		echo 'Under new construction';
+		
 		TDMCreate_CloseTable();
 	break;
 	

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php	2014-03-12 20:19:24 UTC (rev 12372)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/footer.php	2014-03-13 21:55:43 UTC (rev 12373)
@@ -23,4 +23,5 @@
 echo "<div class='center smallsmall italic pad5'>
           <strong>" . $xoopsModule->getVar('name') . "</strong> is maintained by the 
             <a href='http://xoops.org/forums/newbb' title='Visit Support Forum' class='tooltip' rel='external'>Support Forum</a></div>";
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();
+?>
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php	2014-03-12 20:19:24 UTC (rev 12372)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php	2014-03-13 21:55:43 UTC (rev 12373)
@@ -1,4 +1,4 @@
-<?php
+<?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
@@ -14,173 +14,170 @@
  * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
  * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
  * @package         tdmcreate
- * @since           2.5.0
- * @author          Txmod Xoops http://www.txmodxoops.org
- * @version         $Id: modules.php 11084 2013-02-23 15:44:20Z timgno $
+ * @since           2.5.5
+ * @author          Txmod Xoops <su...@tx...>
+ * @version         $Id: 1.59 modules.php 11297 2013-03-24 10:58:10Z timgno $
  */
-include_once 'header.php';
-$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'list', 'string' );
-echo $adminMenu->addNavigation('modules.php');
+include 'header.php';
+// Recovered the value of the argument op in the URL $ 
+$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
+
 switch ($op) 
-{
-    case 'save':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
+{   
+    case 'list': 
+    default: 		
+		$limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+		$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);		
+	    // Define main template
+        $xoopsOption['template_main'] = 'tdmcreate_modules.html'; 
+		xoops_cp_header();
+        $xoopsTpl->assign('navigation', $adminMenu->addNavigation('modules.php'));
+		$adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');            
+		$xoopsTpl->assign('button_new', $adminMenu->renderButton());        		
+		$xoopsTpl->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
+		$criteria = new CriteriaCompo();
+		$criteria->setSort('mod_id ASC, mod_name');
+		$criteria->setOrder('ASC');
+		$numrows = $modulesHandler->getCount();		
+		$mods_arr = $modulesHandler->getAll( $criteria );
+		unset($criteria);        
+		// Display modules list
+		if ($numrows>0) 
+		{	
+            $yes = "<img src='../images/icons/16/green.png' alt='"._YES."' title='"._YES."' />";
+			$no = "<img src='../images/icons/16/red.png' alt='"._NO."' title='"._NO."' />";								
+			foreach (array_keys($mods_arr) as $i) 
+			{				
+				$mod['mod_id'] = $i;
+                $mod['mod_name'] = $mods_arr[$i]->getVar('mod_name');	
+				$mod['mod_version'] = $mods_arr[$i]->getVar('mod_version');	
+                $mod['mod_image'] = $mods_arr[$i]->getVar('mod_image');				
+				$mod['mod_release'] = $mods_arr[$i]->getVar('mod_release');	
+				$mod['mod_status'] = $mods_arr[$i]->getVar('mod_status');	
+				$mod['mod_admin'] = ( $mods_arr[$i]->getVar('mod_admin') == 1 ) ? $yes : $no;	
+				$mod['mod_user'] = ( $mods_arr[$i]->getVar('mod_user') == 1 ) ? $yes : $no;	
+				$mod['mod_submenu'] = ( $mods_arr[$i]->getVar('mod_submenu') == 1 ) ? $yes : $no;	
+				$mod['mod_search'] = ( $mods_arr[$i]->getVar('mod_search') == 1 ) ? $yes : $no;				
+				$mod['mod_comments'] = ( $mods_arr[$i]->getVar('mod_comments') == 1 ) ? $yes : $no;	
+				$mod['mod_notifications'] = ( $mods_arr[$i]->getVar('mod_notifications') == 1 ) ? $yes : $no;							
+				$xoopsTpl->append('modules_list', $mod);
+                unset($mod);				
+			}
+			if ( $numrows > $limit ) {
+				include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+				$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit);
+				$xoopsTpl->assign('pagenav', $pagenav->renderNav(4));
+			} 		
+		} else {
+			$xoopsTpl->assign('error', 'There aren\'t modules');
+		}		
+    break;
+
+    case 'new': 
+	    // Define main template
+        $xoopsOption['template_main'] = 'tdmcreate_modules.html'; 
+        xoops_cp_header();		
+		$xoopsTpl->assign('navigation', $adminMenu->addNavigation('modules.php'));
+        $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list');
+        $xoopsTpl->assign('button_list', $adminMenu->renderButton());
+        
+        $obj =& $modulesHandler->create();
+        $form = $obj->getForm();			
+        $xoopsTpl->assign('form', $form->render());
+    break;	
+	
+	case 'save':
+		if ( !$GLOBALS['xoopsSecurity']->check() ) {
            redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
         }
-
         if (isset($_REQUEST['mod_id'])) {
            $obj =& $modulesHandler->get($_REQUEST['mod_id']);
         } else {
            $obj =& $modulesHandler->create();
+        }		
+		//Form module save		
+		$obj->setVars(array('mod_name' => $_POST['mod_name'], 'mod_version' => $_POST['mod_version'],
+                            'mod_min_php' => $_POST['mod_min_php'], 'mod_min_xoops' => $_POST['mod_min_xoops'], 
+                            'mod_min_admin' => $_POST['mod_min_admin'], 'mod_min_mysql' => $_POST['mod_min_mysql'], 							
+		                    'mod_description' => $_POST['mod_description'], 'mod_author' => $_POST['mod_author'], 'mod_author_mail' => $_POST['mod_author_mail'], 
+							'mod_author_website_url' => $_POST['mod_author_website_url'], 
+							'mod_author_website_name' => $_POST['mod_author_website_name'], 
+							'mod_credits' => $_POST['mod_credits'], 'mod_license' => $_POST['mod_license'], 
+							'mod_release_info' => $_POST['mod_release_info'], 
+							'mod_release_file' => $_POST['mod_release_file'], 
+							'mod_manual' => $_POST['mod_manual'], 'mod_manual_file' => $_POST['mod_manual_file']));
+		//Form mod_image	
+		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		$uploaddir = TDMC_UPLOAD_PATH.'/images/modules/';
+		$uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']['mimetypes'], 
+													   $GLOBALS['xoopsModuleConfig']['maxsize'], null, null);
+		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+		    $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attaccedFile']['name']);
+            $name_img = $_GET['mod_name'].'_slogo.'.$extension;
+			$uploader->setPrefix($name_img);
+			$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+			if (!$uploader->upload()) {
+				$errors = $uploader->getErrors();
+				redirect_header('javascript:history.go(-1)',3, $errors);
+			} else {
+				$obj->setVar('mod_image', $uploader->getSavedFileName());
+			}
+		} else {
+			$obj->setVar('mod_image', $_POST['mod_image']);
+		}		
+		//Form module save		
+		$obj->setVars(array('mod_demo_site_url' => $_POST['mod_demo_site_url'], 
+		                    'mod_demo_site_name' => $_POST['mod_demo_site_name'], 
+							'mod_support_url' => $_POST['mod_support_url'], 
+							'mod_support_name' => $_POST['mod_support_name'], 
+							'mod_website_url' => $_POST['mod_website_url'], 
+							'mod_website_name' => $_POST['mod_website_name'], 
+							'mod_release' => $_POST['mod_release'], 'mod_status' => $_POST['mod_status'],
+							'mod_admin' => (($_REQUEST['mod_admin'] == 1) ? '1' : '0'),
+							'mod_user' => (($_REQUEST['mod_user'] == 1) ? '1' : '0'),
+							'mod_submenu' => (($_REQUEST['mod_submenu'] == 1) ? '1' : '0'),
+							'mod_search' => (($_REQUEST['mod_search'] == 1) ? '1' : '0'),
+							'mod_comments' => (($_REQUEST['mod_comments'] == 1) ? '1' : '0'),
+							'mod_notifications' => (($_REQUEST['mod_notifications'] == 1) ? '1' : '0')));
+		
+        if ($modulesHandler->insert($obj)) {
+            redirect_header('modules.php', 2, _AM_TDMCREATE_FORMOK);
         }
-        //Image 'gif|jpeg|pjpeg|png' 500000
-        include_once XOOPS_ROOT_PATH.'/class/uploader.php';
-        $uploaddir = XOOPS_ROOT_PATH . '/modules/'.$xoopsModule->dirname().'/images/uploads/modules/';
-        $uploader = new XoopsMediaUploader($uploaddir, xoops_getModuleOption('mimetypes', $thisDirname), 
-		                                               xoops_getModuleOption('maxsize', $thisDirname), null, null);
 
-        if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-            $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attachedfile']['name']) ;
-            $img_name = $obj->getVar('mod_name').'_slogo.'.$extension;
-            $uploader->setTargetFileName($img_name);
-            $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
-            if (!$uploader->upload()) {
-                $errors = $uploader->getErrors();
-                redirect_header('javascript:history.go(-1)', 3, $errors);
-            } else {
-                $obj->setVar('mod_image', $uploader->getSavedFileName());
-            }
-        } else {
-            $obj->setVar('mod_image', $_POST['mod_image']);
-        }
-                                    
-        $obj->setVar('mod_name', preg_replace('/\s+/', '', $_POST['mod_name'])); //remove all spaces from the new name
-        $obj->setVar('mod_version', $_POST['mod_version']);
-		$obj->setVar('mod_since', $_POST['mod_since']);
-		$obj->setVar('mod_min_php', $_POST['mod_min_php']); 
-		$obj->setVar('mod_min_xoops', $_POST['mod_min_xoops']); 
-        $obj->setVar('mod_min_admin', $_POST['mod_min_admin']); 
-		$obj->setVar('mod_min_mysql', $_POST['mod_min_mysql']); 
-        $obj->setVar('mod_description', $_POST['mod_description']);
-        $obj->setVar('mod_author', $_POST['mod_author']);
-        $obj->setVar('mod_author_mail', $_POST['mod_author_mail']);
-        $obj->setVar('mod_author_website_url', $_POST['mod_author_website_url']);
-        $obj->setVar('mod_author_website_name', $_POST['mod_author_website_name']);
-        $obj->setVar('mod_credits', $_POST['mod_credits']);
-        $obj->setVar('mod_license', $_POST['mod_license']);
-        $obj->setVar('mod_release_info', $_POST['mod_release_info']);
-        $obj->setVar('mod_release_file', $_POST['mod_release_file']);
-        $obj->setVar('mod_manual', $_POST['mod_manual']);
-        $obj->setVar('mod_manual_file', $_POST['mod_manual_file']);
-        $obj->setVar('mod_demo_site_url', $_POST['mod_demo_site_url']);
-        $obj->setVar('mod_demo_site_name', $_POST['mod_demo_site_name']);
-        $obj->setVar('mod_support_url', $_POST['mod_support_url']);
-        $obj->setVar('mod_support_name', $_POST['mod_support_name']);
-        $obj->setVar('mod_website_url', $_POST['mod_website_url']);
-        $obj->setVar('mod_website_name', $_POST['mod_website_name']);
-        $obj->setVar('mod_release', $_POST['mod_release']);
-        $obj->setVar('mod_status', $_POST['mod_status']);        
-        $obj->setVar('mod_admin', $_REQUEST['mod_admin']);
-        $obj->setVar('mod_user', $_REQUEST['mod_user']);
-        $obj->setVar('mod_search', $_REQUEST['mod_search']);
-		$obj->setVar('mod_comments', $_REQUEST['mod_comments']);
-		$obj->setVar('mod_notifications', $_REQUEST['mod_notifications']);
-		$obj->setVar('mod_permissions', $_REQUEST['mod_permissions']);
-		$obj->setVar('mod_install', $_REQUEST['mod_install']);
-		$obj->setVar('mod_donations', $_POST['mod_donations']);
-		$obj->setVar('mod_subversion', $_POST['mod_subversion']);
-
-        if ($modulesHandler->insert($obj)) {
-			redirect_header('modules.php?op=list', 2, _AM_TDMCREATE_FORMOK);
-        }
+        $xoopsTpl->assign('error', $obj->getHtmlErrors());
+        $form =& $obj->getForm();		
+        $xoopsTpl->assign('form', $form->render());
 	break;
-
-    case 'new':        
-        $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php?op=list', 'list');
-        echo $adminMenu->renderButton();
-
-        $obj =& $modulesHandler->create();
-        $form = $obj->getForm();
-    break;
-    case 'edit':
+	
+	case 'edit':	 
+	    // Define main template
+        $xoopsOption['template_main'] = 'tdmcreate_modules.html'; 
+        xoops_cp_header();		
+		$xoopsTpl->assign('navigation', $adminMenu->addNavigation('modules.php'));
+        $adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');
+		$adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list');        
+        $xoopsTpl->assign('button_new', $adminMenu->renderButton());
+		$xoopsTpl->assign('button_list', $adminMenu->renderButton());		
+		
+		$obj = $modulesHandler->get($_REQUEST['mod_id']);
+		$form = $obj->getForm();		
+        $xoopsTpl->assign('form', $form->render());
+	break;
+	
+	case 'delete':
 		$obj =& $modulesHandler->get($_REQUEST['mod_id']);
-        $form = $obj->getForm();
-    break;
-    case 'delete':
-		$obj =& $modulesHandler->get($_REQUEST['mod_id']);
-		if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1)
-		{
-			if (!$GLOBALS['xoopsSecurity']->check()) {
+		if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+			if ( !$GLOBALS['xoopsSecurity']->check() ) {
 				redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
 			}
 			if ($modulesHandler->delete($obj)) {
-				$xoopsDB->queryF("DELETE FROM ".$xoopsDB->prefix("tdmcreate_modules")." WHERE mod_id = ".$_REQUEST['mod_id']);
 				redirect_header('modules.php', 3, _AM_TDMCREATE_FORMDELOK);
 			} else {
-				echo $obj->getHtmlErrors();
+				$xoopsTpl->assign('error', $obj->getHtmlErrors());
 			}
 		} else {
 			xoops_confirm(array('ok' => 1, 'mod_id' => $_REQUEST['mod_id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('mod_name')));
 		}
-    break;
-    case 'list':
-    default:       
-        $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_NEW, 'modules.php?op=new', 'add');
-        echo $adminMenu->renderButton();
-
-        $criteria = new CriteriaCompo();
-        $criteria->setSort('mod_id');
-        $criteria->setOrder('ASC');
-        $mod_arr = $modulesHandler->getall($criteria);
-        $numrows_modules = $modulesHandler->getCount();
-
-        if ( $numrows_modules > 0 )
-		{
-			echo '<table width="100%" cellspacing="1" class="outer">';
-			echo '<tr class="center">';
-			echo '<th width="1%">'._AM_TDMCREATE_ID.'</th>';
-			echo '<th width="10%">'._AM_TDMCREATE_NAME.'</th>';
-			echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
-			echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
-			echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
-			echo '<th width="1%">'._AM_TDMCREATE_FORMACTION.'</th>';
-			echo '</tr>';
-			$class = 'odd';
-			foreach (array_keys($mod_arr) as $i)
-			{
-				$mod_id = $mod_arr[$i]->getVar('mod_id');
-				$mod_name = $mod_arr[$i]->getVar('mod_name');
-				$mod_image = $mod_arr[$i]->getVar('mod_image');
-				//$mod_blocks = $mod_arr[$i]->getVar('mod_blocks');
-				$mod_admin = $mod_arr[$i]->getVar('mod_admin');
-				$mod_user = $mod_arr[$i]->getVar('mod_user');
-				$admin = ($mod_admin == 1) ? _YES : _NO;
-				$user = ($mod_user == 1) ? _YES : _NO;            
-				echo '<tr class="odd center">';
-				echo '<td><b>'.$i.'</b></td>';
-				$nbsps = '&nbsp;&nbsp;&nbsp;';
-				echo '<td class="left">'.$nbsps.'<img src="../images/icons/16/arrow.gif" alt="Arrow" />'.$nbsps.'<b>'.$mod_name.'</b></td>';
-				echo '<td><img src="../images/uploads/modules/'.$mod_image.'" height="30px" /></td>';
-				echo '<td>'.$admin.'</td>';
-				echo '<td>'.$user.'</td>';				
-				echo '<td>';
-				echo '<a href="modules.php?op=edit&mod_id='.$mod_id.'"><img src="'. $pathIcon16 .'/edit.png" alt="'._EDIT.'" title="'._EDIT.'" /></a>&nbsp;<a href="modules.php?op=delete&mod_id='.$mod_id.'"><img src="'. $pathIcon16 .'/delete.png" alt="'._DELETE.'" title="'._DELETE.'" /></a>';
-				echo '</td>';
-				echo '</tr>';
-				}
-			echo '</table><br><br>';
-		} else {
-		    echo '<table width="100%" cellspacing="1" class="outer">';
-			echo '<tr class="center">';
-			echo '<th width="1%">'._AM_TDMCREATE_ID.'</th>';
-			echo '<th width="10%">'._AM_TDMCREATE_NAME.'</th>';
-			echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
-			echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
-			echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';			
-			echo '<th width="1%">'._AM_TDMCREATE_FORMACTION.'</th>';
-			echo '<tr><td class="errorMsg" colspan="8">No modules</td></tr>';
-			echo '</tr></table><br><br>';			
-		}
-    break;
+	break;	
 }
-include_once 'footer.php';
\ No newline at end of file
+include 'footer.php';
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-03-12 20:19:24 UTC (rev 12372)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-03-13 21:55:43 UTC (rev 12373)
@@ -1,198 +1,164 @@
-<?php
+<?php   
 /*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
+You may not change or alter any portion of this comment or credits
+of supporting developers from this source code or any supporting source code
+which is considered copyrighted (c) material of the original comment or credit authors.
 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
 /**
- * tdmcreate module
- *
- * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package         tdmcreate
- * @since           2.5.0
- * @author          Txmod Xoops http://www.txmodxoops.org
- * @version         $Id: tables.php 11084 2013-02-23 15:44:20Z timgno $
- */
-include_once 'header.php';
-$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
-$table_id = TDMCreate_CleanVars( $_REQUEST, 'table_id', 0 );
-echo $adminMenu->addNavigation('tables.php');
-switch ($op) {
-	case 'save_table':
-        if (isset($_REQUEST['table_id'])) {
-           $obj =& $tablesHandler->get($_REQUEST['table_id']);
-        } else {
-           $obj =& $tablesHandler->create();
-        }
+* tdmcreate module
+*
+* @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+* @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+* @package         tdmcreate
+* @since           2.5.5
+* @author          Txmod Xoops <su...@tx...>
+* @version         $Id: 1.59 tables.php 11297 2013-03-24 10:58:10Z timgno $
+*/
+include 'header.php';
+// Recovered the value of the argument op in the URL $ 
+$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
+$mod_id = TDMCreate_CleanVars($_REQUEST, 'mod_id', 0);
+switch ($op) 
+{   
+	case 'list': 
+	default: 
+		$limit = xoops_getModuleOption('adminperpage');
+		$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);        		
+		// Define main template
+		$xoopsOption['template_main'] = 'tdmcreate_tables.html';
+		xoops_cp_header();
+		$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/style.css' );
+		$GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
 
-		//Module Name
-		$modules =& $modulesHandler->get($_REQUEST['table_mid']);
-		$mod_name = $modules->getVar('mod_name');
-		
-		$obj->setVar('table_mid', $_REQUEST['table_mid']);
-		
-		if ( $_REQUEST['select'] ==  1 )
-		{
-			$obj->setVar('table_name', 'categories');
-            $obj->setVar('table_category', 1);
-			$obj->setVar('table_fieldname', 'cat');
-			$obj->setVar('table_blocks', 0);
-			$obj->setVar('table_admin', 1);
-			$obj->setVar('table_user', 1);
-			$obj->setVar('table_status', 0);
-			$obj->setVar('table_waiting', 0);
-			$obj->setVar('table_online', 0);
-			$obj->setVar('table_search', 0);
-			$obj->setVar('table_comments', 0);
-			$obj->setVar('table_notifications', 0);
-			$obj->setVar('table_permissions', 0);
-			$obj->setVar('table_nbfields', 7);
-			
-			$table_fields = 'cat_id:int:8:unsigned:NOT NULL: :primary|cat_pid:int:5:unsigned:NOT NULL:0:unique|cat_title:varchar:255: :NOT NULL: :unique|cat_desc:text: : :NOT NULL: :|cat_image:varchar:255: :NOT NULL: :|cat_weight:int:5:unsigned:NOT NULL:0:|cat_color:varchar:10: :NULL: :';
-			
-			$table_parameters = 'XoopsFormCategory:0:0:0:0:0:1|XoopsFormText:1:1:0:1:0:1|XoopsFormTextArea:0:1:0:0:0:1|XoopsFormUploadImage:1:1:0:0:0:0|XoopsFormText:1:1:0:0:0:0|XoopsFormColorPicker:1:1:0:0:0:0|XoopsFormSelectUser:0:0:0:0:0:1|XoopsFormTextDateSelect:0:0:0:0:0:1|XoopsFormCheckBox:1:1:0:0:0:1';
-		
-			//Image
-			include_once XOOPS_ROOT_PATH.'/class/uploader.php';
-			
-			if(is_dir($pathIcon32)){
-			   $uploaddir = $pathIcon32;
-			}else{
-			   $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
-			}
-			
-			$uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
-
-			if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-				$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile1"]['name']) ;
-				$name_img = 'category.'.$extension;
-				$uploader->setTargetFileName($name_img); 
-				$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
-				if (!$uploader->upload()) {
-					$errors = $uploader->getErrors();
-					redirect_header("javascript:history.go(-1)",3, $errors);
-				} else {
-					$obj->setVar('table_image', $uploader->getSavedFileName());
-				}
-			} else {
-				$obj->setVar('table_image', $_REQUEST['table_image1']);
-			}		
+		$xoopsTpl->assign('navigation', $adminMenu->addNavigation('tables.php'));
+		$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');            
+		$xoopsTpl->assign('button_new', $adminMenu->renderButton()); 
+		$xoopsTpl->assign('tdmc_url', TDMC_URL);
+		$xoopsTpl->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
+		$xoopsTpl->assign('pathIcon32', XOOPS_URL.'/Frameworks/moduleclasses/icons/32');		
+		// Get the list of modules
+		$criteria = new CriteriaCompo();
+		$criteria->setSort('mod_id ASC, mod_name');
+		$criteria->setOrder('ASC');        
+		$numrows_modules = $modulesHandler->getCount();
+		// Redirect if there aren't modules
+		if ( $numrows_modules == 0 ) {
+			redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
+		}        
+		$mods_arr = $modulesHandler->getAll($criteria);
+		unset($criteria);				
+		// Display modules list
+		if ( $numrows_modules > 0 ) 
+		{	
+			$_yyes = "<img src='../images/icons/16/yellow.png' alt='"._YES."' title='"._YES."' />";
+			$_no = "<img src='../images/icons/16/red.png' alt='"._NO."' title='"._NO."' />";            					
+			foreach (array_keys($mods_arr) as $i) 
+			{				
+				$mod['id'] = $i;				
+				$mod['name'] = $mods_arr[$i]->getVar('mod_name');					
+				$mod['image'] = $mods_arr[$i]->getVar('mod_image');					
+				$mod['admin'] = ( $mods_arr[$i]->getVar('mod_admin') == 1 ) ? $_yyes : $_no;	
+				$mod['user'] = ( $mods_arr[$i]->getVar('mod_user') == 1 ) ? $_yyes : $_no;	
+				$mod['submenu'] = ( $mods_arr[$i]->getVar('mod_submenu') == 1 ) ? $_yyes : $_no;	
+				$mod['search'] = ( $mods_arr[$i]->getVar('mod_search') == 1 ) ? $_yyes : $_no;				
+				$mod['comments'] = ( $mods_arr[$i]->getVar('mod_comments') == 1 ) ? $_yyes : $_no;	
+				$mod['notifications'] = ( $mods_arr[$i]->getVar('mod_notifications') == 1 ) ? $_yyes : $_no;							
+				// Get the list of tables
+				$criteria = new CriteriaCompo();
+				$criteria->add(new Criteria('table_mid', $i));
+				$criteria->setSort('table_id ASC, table_name');
+				$criteria->setOrder('ASC');	
+				$numrows_tables = $tablesHandler->getCount();
+				$tables_arr = $tablesHandler->getAll($criteria);
+				unset($criteria);
+				// Display tables list
+				$tables = array();
+				if ( $numrows_tables > 0 ) 
+				{ 	
+					$_yes = "<img src='../images/icons/16/green.png' alt='"._YES."' title='"._YES."' />";				
+					foreach (array_keys($tables_arr) as $t) 
+					{	
+						$table['id'] = $t;
+						$table['mid'] = $tables_arr[$t]->getVar('table_mid');
+						$table['name'] = $tables_arr[$t]->getVar('table_name');					
+						$table['image'] = $tables_arr[$t]->getVar('table_image');	
+						$table['nbfields'] = $tables_arr[$t]->getVar('table_nbfields');	
+						$table['blocks'] = ( $tables_arr[$t]->getVar('table_blocks') == 1 ) ? $_yes : $_no;						
+						$table['admin'] = ( $tables_arr[$t]->getVar('table_admin') == 1 ) ? $_yes : $_no;	
+						$table['user'] = ( $tables_arr[$t]->getVar('table_user') == 1 ) ? $_yes : $_no;	
+						$table['submenu'] = ( $tables_arr[$t]->getVar('table_submenu') == 1 ) ? $_yes : $_no;	
+						$table['search'] = ( $tables_arr[$t]->getVar('table_search') == 1 ) ? $_yes : $_no;				
+						$table['comments'] = ( $tables_arr[$t]->getVar('table_comments') == 1 ) ? $_yes : $_no;	
+						$table['notifications'] = ( $tables_arr[$t]->getVar('table_notifications') == 1 ) ? $_yes : $_no;					
+						$tables[] = $table;
+						unset($table);					
+					}									
+				} 
+				$mod['tables']	= $tables;	    			
+				$xoopsTpl->append('modules_list', $mod);                
+				unset($mod);
+			}	            
+			if ( $numrows_modules > $limit ) {
+				include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+				$pagenav = new XoopsPageNav($numrows_modules, $limit, $start, 'start', 'op=list&limit=' . $limit);
+				$xoopsTpl->assign('pagenav', $pagenav->renderNav(4));
+			} 			
 		} else {
-				
-			$obj->setVar('table_name', strtolower($_REQUEST['table_name']));
-			$obj->setVar('table_fieldname', strtolower($_REQUEST['table_fieldname']));
-			$obj->setVar('table_nbfields', $_REQUEST['table_nbfields']);
-			$obj->setVar('table_blocks', $_REQUEST['table_blocks']);
-			$obj->setVar('table_admin', $_REQUEST['table_admin']);
-			$obj->setVar('table_user', $_REQUEST['table_user']);
-			$obj->setVar('table_status', $_REQUEST['table_status']);
-			$obj->setVar('table_waiting', $_REQUEST['table_waiting']);
-			$obj->setVar('table_online', $_REQUEST['table_online']);
-			$obj->setVar('table_search', $_REQUEST['table_search']);
-			$obj->setVar('table_comments', $_REQUEST['table_comments']);
-			$obj->setVar('table_notifications', $_REQUEST['table_notifications']);	
-            $obj->setVar('table_permissions', $_REQUEST['table_permissions']);				
-			
-			$table_fields = '';
-			$table_parameters = '';
-			for($i=0; $i<$_REQUEST['table_nbfields']; $i++)
-			{
-				//Additions of parameters: text: on: off: ...
-				if ( $i != 0 ) {
-					$table_parameters .= ( !empty($_REQUEST['fields_param_elements'][$i]) ) ? "".$_REQUEST['fields_param_elements'][$i].":" : " :";					
-					$table_parameters .= ( !empty($_REQUEST['fields_param_admin'][$i]) ) ? "1:" : "0:";
-					$table_parameters .= ( !empty($_REQUEST['fields_param_user'][$i]) ) ? "1:" : "0:";
-					$table_parameters .= ( !empty($_REQUEST['fields_param_blocks'][$i]) ) ? "1:" : "0:";
-					$table_parameters .= ( $i == $_REQUEST['fields_param_main_field']) ? "1:" : "0:";
-					$table_parameters .= ( !empty($_REQUEST['fields_param_search_field'][$i]) ) ? "1:" : "0:";
-					$table_parameters .= ( !empty($_REQUEST['fields_param_required_field'][$i]) ) ? "1" : "0";
-				}
-
-				//Additions of fields: test: int: 4: ...
-				$table_fields .= (!empty($_REQUEST['fields_name'][$i])) ? $_REQUEST['fields_name'][$i].":" : " :";
-				$table_fields .= (!empty($_REQUEST['fields_type'][$i])) ? $_REQUEST['fields_type'][$i].":" : " :";
-				$table_fields .= (!empty($_REQUEST['fields_value'][$i])) ? $_REQUEST['fields_value'][$i].":" : " :";
-				$table_fields .= (!empty($_REQUEST['fields_attributes'][$i])) ? $_REQUEST['fields_attributes'][$i].":" : " :";
-				$table_fields .= (!empty($_REQUEST['fields_null'][$i])) ? strtoupper($_REQUEST['fields_null'][$i]).":" : " :";
-				$table_fields .= (!empty($_REQUEST['fields_default'][$i])) ? $_REQUEST['fields_default'][$i].":" : " :";
-				$table_fields .= (!empty($_REQUEST['fields_index'][$i])) ? $_REQUEST['fields_index'][$i]."" : " ";
-				
-				// Break between fields and between the parameters
-				if ( $i != $_REQUEST['table_nbfields'] - 1) {
-					$table_fields .= '|';
-					if ( $i != 0 )
-						$table_parameters .= '|';
-				} else {	
-					if ( isset($_REQUEST['table_status']) ) {
-					    if ( $_REQUEST['table_status'] == 1 ) {
-							$table_fields .= '|'.strtolower($_REQUEST['table_fieldname']).'_status:int:10:unsigned:NOT NULL:0:';
-							$table_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1';
-						}
-					} else {
-						$table_fields .= '';
-						$table_parameters .= '';
-					}
-					if ( isset($_REQUEST['table_waiting']) ) {
-						if ( $_REQUEST['table_waiting'] == 1 ) {
-							$table_fields .= '|'.strtolower($_REQUEST['table_fieldname']).'_waiting:int:10:unsigned:NOT NULL:0:';
-							$table_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1';
-						}
-					} else {
-						$table_fields .= '';
-						$table_parameters .= '';
-					}
-					if ( isset($_REQUEST['table_online']) ) {
-						if ( $_REQUEST['table_online'] == 1 ) {
-							$table_fields .= '|'.strtolower($_REQUEST['table_fieldname']).'_online:tinyint:1: unsigned:NOT NULL:0:'; $table_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1';
-						}
-					} else {
-						$table_fields .= '';
-						$table_parameters .= '';
-					}                   
-				}
-			}
-		}		
-		$obj->setVar('table_fields', $table_fields);
-		$obj->setVar('table_parameters', $table_parameters);
-    
-		if ($tablesHandler->insert($obj)) {
-			redirect_header('tables.php', 2, _AM_TDMCREATE_FORMOK);
+			$xoopsTpl->assign('error', 'There aren\'t modules');
 		}
-		
 	break;
-	
-	case 'table_save_fields':	
-		if (!$GLOBALS['xoopsSecurity']->check()) {
-		   redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+
+	case 'new': 
+		// Define main template
+		$xoopsOption['template_main'] = 'tdmcreate_tables.html';
+		xoops_cp_header();	
+		$xoopsTpl->assign('navigation', $adminMenu->addNavigation('tables.php'));
+		$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');            
+		$xoopsTpl->assign('button_new', $adminMenu->renderButton());	
+
+		$obj =& $tablesHandler->create();
+		$form = $obj->getForm();		
+		$xoopsTpl->assign('form', $form->render());
+		break;	
+
+	case 'save':
+		if ( !$GLOBALS['xoopsSecurity']->check() ) {
+			redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
 		}
-
-		if (isset($_REQUEST['table_id'])) {
-		   $obj =& $tablesHandler->get($_REQUEST['table_id']);
+		$table_id = TDMCreate_CleanVars($_REQUEST, 'table_id', 0, 'int');		
+		if (isset($table_id)) {
+			$obj =& $tablesHandler->get($table_id);
 		} else {
-		   $obj =& $tablesHandler->create();
+			$obj =& $tablesHandler->create();
 		}
-		//Module Name
-		$modules =& $modulesHandler->get($_REQUEST['table_mid']);
-		$mod_name = $modules->getVar('mod_name');		
-		
-		//Image
+
+		$table_mid = intval($_REQUEST['table_mid']);
+		$table_nbfields = intval($_REQUEST['table_nbfields']);
+		$table_fieldname = strtolower($_REQUEST['table_fieldname']);
+		$_SESSION['field_tid'] = $tid;
+		$_SESSION['field_mid'] = $table_mid;
+		$_SESSION['field_numb'] = $table_nbfields;
+		$_SESSION['field_name'] = $table_fieldname;
+		//Form tables
+		$obj->setVars(array('table_mid' => $table_mid, 'table_name' => $_POST['table_name'], 
+			'table_nbfields' => $table_nbfields, 'table_fieldname' => $table_fieldname));
+		//Form table_image	
 		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
 		if(is_dir($pathIcon32)){
-		   $uploaddir = $pathIcon32;
+			$uploaddir = $pathIcon32;
 		}else{
-		   $uploaddir = XOOPS_ROOT_PATH . '/modules/'.$xoopsModule->dirname().'/images/uploads/tables/';
-		}			
-		$uploader = new XoopsMediaUploader($uploaddir, 'gif|jpeg|pjpeg|png', 104857600, null, null);
-
+			$uploaddir = TDMC_UPLOAD_PATH.'/images/tables';
+		}		
+		$uploader = new XoopsMediaUploader($uploaddir, xoops_getModuleOption('mimetypes'), 
+													   xoops_getModuleOption('maxsize'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-			$extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attachedfile']['name']);
-			$name_img = $_REQUEST['table_name'].'.'.$extension;
-			$uploader->setTargetFileName($name_img); 
+			$extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['table_image']['name']);
+			$name_img = $_GET['table_name'].'.'.$extension;
+			$uploader->setPrefix($name_img);			
 			$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
 			if (!$uploader->upload()) {
 				$errors = $uploader->getErrors();
@@ -201,65 +167,47 @@
 				$obj->setVar('table_image', $uploader->getSavedFileName());
 			}
 		} else {
-			$obj->setVar('table_image', $_REQUEST['table_image']);
-		}
+			$obj->setVar('table_image', $_POST['table_image']);
+		}		
+		$obj->setVars(array('table_blocks' => (($_REQUEST['table_blocks'] == 1) ? '1' : '0'), 
+			'table_admin' => (($_REQUEST['table_admin'] == 1) ? '1' : '0'), 
+			'table_user' => (($_REQUEST['table_user'] == 1) ? '1' : '0'), 
+			'table_submenu' => (($_REQUEST['table_submenu'] == 1) ? '1' : '0'), 
+			'table_search' => (($_REQUEST['table_search'] == 1) ? '1' : '0'), 
+			'table_comments' => (($_REQUEST['table_comments'] == 1) ? '1' : '0'), 
+			'table_notifications' => (($_REQUEST['table_notifications'] == 1) ? '1' : '0')));        
 
+		if( $tablesHandler->insert($obj) ) {	 
+			if( $obj->isNew() ) { 
+				$tid = $GLOBALS['xoopsDB']->getInsertId();			
+				redirect_header('fields.php?op=new&field_tid='.$tid, 3, _AM_TDMCREATE_FORMOK);
+			} else {
+				redirect_header('tables.php', 3, _AM_TDMCREATE_FORMOK);
+			}
+		}		
 
-        $oldname = $obj->getVar('table_fieldname');
+		$xoopsTpl->assign('error', $obj->getHtmlErrors());        
+		$form = $obj->getForm();
+		$xoopsTpl->assign('form', $form->render());
+	break;
 
-		$obj->setVar('table_mid', strtolower($_POST['table_mid']));
-		$obj->setVar('table_name', strtolower($_POST['table_name']));
-		$obj->setVar('table_fieldname', strtolower($_POST['table_fieldname']));
-		$obj->setVar('table_nbfields', $_POST['table_nbfields']);
-		$obj->setVar('table_blocks', $_REQUEST['table_blocks']);
-		$obj->setVar('table_admin', $_REQUEST['table_admin']);
-		$obj->setVar('table_user', $_REQUEST['table_user']);
-		$obj->setVar('table_status', $_REQUEST['table_status']);
-		$obj->setVar('table_waiting', $_REQUEST['table_waiting']);
-		$obj->setVar('table_online', $_REQUEST['table_online']);
-		$obj->setVar('table_search', $_REQUEST['table_search']);
-		$obj->setVar('table_comments', $_REQUEST['table_comments']);
-		$obj->setVar('table_notifications', $_REQUEST['table_notifications']);	
-        $obj->setVar('table_permissions', $_REQUEST['table_permissions']);			
+	case 'edit':	    		
+		// Define main template            			
+		$xoopsOption['template_main'] = 'tdmcreate_tables.html';
+		xoops_cp_header();	
+		$xoopsTpl->assign('navigation', $adminMenu->addNavigation('tables.php'));
+		$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');		   
+		$xoopsTpl->assign('button_new', $adminMenu->renderButton());			
+		
+		$obj = $tablesHandler->get($_REQUEST['table_id']);
+		$form = $obj->getForm();
+		$xoopsTpl->assign('form', $form->render());
+	break;	
 
-        $table_fields = $obj->getVar('table_fields');
-        $table_nbfields=$_REQUEST['table_nbfields'];
-
-        $fields_total = explode('|', $table_fields);
-      	$count_fields = count($fields_total);
-
-        $newname = strtolower($_REQUEST['table_fieldname']);
-		//echo $count_parameters;
-		//fields
-		for($i=0; $i<$count_fields; $i++)
-		{
-			$fields = explode(":", $fields_total[$i]);
-			$fields[0] = $newname . substr($fields[0], stripos($fields[0], '_'));
-			$newfields[$i] = implode(":", $fields);
-		}
-
-		$newTableFields=implode("|",$newfields);
-        $obj->setVar('table_fields', $newTableFields);
-			
-		if ($tablesHandler->insert($obj)) {
-			redirect_header('tables.php', 2, _AM_TDMCREATE_FORMOK);
-		}	
-	break;
-	
-	case "edit_table":
+	case 'delete':
 		$obj =& $tablesHandler->get($_REQUEST['table_id']);
-		$form = $obj->getFormTable(false, $_REQUEST['table_mid']);
-	break;
-	
-	case "edit_fields":
-		$obj =& $tablesHandler->get($_REQUEST['table_id']);
-		$form = $obj->getFormEditFields(false, $_REQUEST['table_id']);
-	break;
-		
-	case "delete_table":
-		$obj =& $tablesHandler->get($_REQUEST['table_id']);
 		if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
-			if (!$GLOBALS['xoopsSecurity']->check()) {
+			if ( !$GLOBALS['xoopsSecurity']->check() ) {
 				redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
 			}
 			if ($tablesHandler->delete($obj)) {
@@ -268,216 +216,8 @@
 				echo $obj->getHtmlErrors();
 			}
 		} else {
-			xoops_confirm(array('ok' => 1, 'table_id' => $_REQUEST['table_id'], 'op' => 'delete_table'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('table_name')));
+			xoops_confirm(array('ok' => 1, 'table_id' => $_REQUEST['table_id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('table_name')));
 		}
-	break;
-	
-	case "table_fields":        
-		$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=table_list', 'list');
-        $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=table_fields', 'add');
-        echo $adminMenu->renderButton();
-        
-		//fields existe deja ?
-		$criteria = new CriteriaCompo();
-		$criteria->add(new Criteria('table_mid', $_REQUEST['table_mid']));
-		$criteria->add(new Criteria('table_name', $_REQUEST['table_name']));
-		$nb_tables1 = $tablesHandler->getCount($criteria);
-	
-		if ( $nb_tables1 < 1 )
-		{
-			if (!$GLOBALS['xoopsSecurity']->check()) {
-			   redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-			}
-			if (isset($_REQUEST['table_id'])) {
-			   $obj =& $tablesHandler->get($_REQUEST['table_id']);
-			} else {
-			   $obj =& $tablesHandler->create();
-			}
-			$table_blocks = (isset($_REQUEST['table_blocks'])) ? $_REQUEST['table_blocks'] : '0';
-			$table_display_admin = (isset($_REQUEST['table_admin'])) ? $_REQUEST['table_admin'] : '0';
-			$table_display_user = (isset($_REQUEST['table_user'])) ? $_REQUEST['table_user'] : '0';			
-			$table_status = (isset($_REQUEST['table_status'])) ? $_REQUEST['table_status'] : '0';
-			$table_waiting = (isset($_REQUEST['table_waiting'])) ? $_REQUEST['table_waiting'] : '0';
-			$table_online = (isset($_REQUEST['table_online'])) ? $_REQUEST['table_online'] : '0';			
-			$table_search = (isset($_REQUEST['table_search'])) ? $_REQUEST['table_search'] : '0';
-			$table_comments = (isset($_REQUEST['table_comments'])) ? $_REQUEST['table_comments'] : '0';
-			$table_notifications = (isset($_REQUEST['table_notifications'])) ? $_REQUEST['table_notifications'] : '0';
-			$table_permissions = (isset($_REQUEST['table_permissions'])) ? $_REQUEST['table_permissions'] : '0';
-			
-			$select = (isset($_REQUEST['select'])) ? $_REQUEST['select'] : '0';
-			
-			//Image
-			include_once XOOPS_ROOT_PATH.'/class/uploader.php';
-			if(!is_dir($pathIcon32)){
-			   $uploaddir = $pathIcon32;
-			}else{
-			   $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
-			}
-			$uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
-
-			if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-				$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']);
-				$name_img = $_REQUEST['table_fieldname'].'.'.$extension;
-				$uploader->setTargetFileName($name_img); 
-				$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
-				if (!$uploader->upload()) {
-					$errors = $uploader->getErrors();
-					redirect_header("javascript:history.go(-1)",3, $errors);
-				} else {
-					$obj->setVar('table_image', $uploader->getSavedFileName());
-				}
-			} else {
-				$obj->setVar('table_image', $_REQUEST['table_image']);
-			}
-				
-			if ($tablesHandler->insert($obj)) {
-				$table_id = $xoopsDB->getInsertId();
-				$obj = $tablesHandler->get($table_id);
-				$form = $obj->getFormFields(false, $table_id, intval($_REQUEST['table_mid']), strtolower($_REQUEST['table_name']), strtolower($_REQUEST['table_fieldname']), $table_blocks, $table_display_admin, $table_display_user, $table_status, $table_waiting, $table_online, $table_search, $table_comments, $table_notifications, $table_permissions, intval($_REQUEST['table_nbfields']), $select);
-			}	
-		} else {
-			redirect_header('tables.php', 2, _AM_TDMCREATE_TABLES_EXIST);
-		}
-	break;
-	
-	case "create_table":		    
-		$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW_CATEGORY, 'tables.php?op=create_category', 'add');
-		$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=table_list', 'list');	
-        echo $adminMenu->renderButton();
-
-		$table_mid = TDMCreate_CleanVars( $_REQUEST, 'table_mid', 0);
-		$obj =& $tablesHandler->create();
-		$form = $obj->getFormTable(false, $table_mid);
-	break;
-	
-	case "create_category":	       
-        $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=create_table', 'add');
-		$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=table_list', 'list');  
-        echo $adminMenu->renderButton();
-		
-        $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("mod_tdmcreate_tables")." WHERE table_name = 'categories'");
-		list( $category ) = $xoopsDB->fetchRow($result);
-        $obj =& $tablesHandler->get($_REQUEST['table_id']);
-        if ( $category >= 0 ) {
-		    $form = $obj->getFormCategory();
-		}
-	break;
-	
-	case "table_list":
-	default:	           
-        $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=create_table', 'add');
-		$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_NEW_CATEGORY, 'tables.php?op=create_category', 'add');
-        echo $adminMenu->renderButton();
-		
-		$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/style.css' );
-		$GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
-        			
-		// Remove unnecessary tables
-		/*$sql = "SELECT table_id FROM ".$xoopsDB->prefix("mod_tdmcreate_tables")." WHERE table_mid = 0";
-		$result = $xoopsDB->queryF($sql);
-		while ( $myrow = $xoopsDB->fetchArray($result) ) 
-		{
-			$sql_del = "DELETE FROM ".$xoopsDB->prefix("mod_tdmcreate_tables")." WHERE table_id = ".$myrow['table_id']."";
-			$xoopsDB->queryF($sql_del);
-		}*/
-		$obj =& $tablesHandler->get($table_id);
-		if ($tablesHandler->deleteAll($obj)) {
-			redirect_header('tables.php', 3, _AM_TDMCREATE_FORMDELOK);
-		}
-		
-	    $criteria = new CriteriaCompo();
-		$criteria->add( new Criteria('mod_id', 0, '!=') );
-        $criteria->setSort('mod_id');
-        $criteria->setOrder('ASC');
-		$mod_arr = $modulesHandler->getAll($criteria);
-		$numrows_modules = $modulesHandler->getCount($criteria);
-		
-        if ( $numrows_modules > 0 ) 
-		{
-			echo '<table width="100%" cellspacing="1" class="outer">';
-			echo '<tr>';
-			echo '<th class="center width1">'._AM_TDMCREATE_ID.'</th>';
-			echo '<th class="center width10">'._AM_TDMCREATE_NAME.'</th>';
-			echo '<th class="center width10">'._AM_TDMCREATE_IMAGE.'</th>';
-			echo '<th class="center width10">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
-			echo '<th class="center width10">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
-			echo '<th class="center width10">'._AM_TDMCREATE_BLOCKS.'</th>';
-			echo '<th class="center width10">'._AM_TDMCREATE_NB_FIELDS.'</th>';
-			echo '<th class="center width5">'._AM_TDMCREATE_FORMACTION.'</th>';			
-			echo '</tr>';
-			$class = 'odd';
-            foreach (array_keys($mod_arr) as $i) 
-			{                                  
-				$mod_id = $mod_arr[$i]->getVar('mod_id');
-				$mod_name = $mod_arr[$i]->getVar('mod_name');
-				$mod_image = $mod_arr[$i]->getVar('mod_image');
-				$mod_display_admin = ($mod_arr[$i]->getVar('mod_display_admin') == 1) ? _YES : _NO;
-				$mod_display_user = ($mod_arr[$i]->getVar('mod_display_user') == 1) ? _YES : _NO; 					
-				echo '<tr class="odd center toggleTables">';
-				echo '<td class="width5"><b>'.$i.'</b><br /><img src="../images/icons/16/toggle.png" alt="Toggle" title="Toggle" /></td>';
-				$nbsps = '&nbsp;&nbsp;&nbsp;';
-				echo '<td class="left">'.$nbsps.'<img src="../images/icons/16/arrow.gif" alt="Arrow" />'.$nbsps.'<b>'.$mod_name.'</b></td>';
-				echo '<td><img src="../images/uploads/modules/'.$mod_image.'" height="30px"></td>';
-				echo '<td>'.$mod_display_admin.'</td>';
-				echo '<td>'.$mod_display_user.'</td>';
-				echo '<td>&#126;</td>';
-				echo '<td>&#126;</td>';
-				echo '<td>';
-				echo '<a href="modules.php?op=edit&mod_id='.$mod_id.'"><img src="'. $pathIcon16 .'/edit.png" alt="'._EDIT.'" title="'._EDIT.'" /></a>&nbsp;<a href="modules.php?op=delete&mod_id='.$mod_id.'"><img src="'. $pathIcon16 .'/delete.png" alt="'._DELETE.'" title="'._DELETE.'" /></a>';
-				echo '</td>';                    
-				echo '</tr>';
-				
-				$criteria = new CriteriaCompo();
-				$criteria->add(new Criteria('table_mid', $mod_id));
-				$criteria->setSort('table_name');
-				$criteria->setOrder('ASC');
-				$table_arr = $tablesHandler->getall($criteria);
-				$numrows_tables = $tablesHandler->getCount();
-				if ( $numrows_tables != 0 )
-				{
-					foreach (array_keys($table_arr) as $i) 
-					{												
-						$table_name = $table_arr[$i]->getVar('table_name');
-						$table_image = $table_arr[$i]->getVar('table_image');
-						$table_blocks = $table_arr[$i]->getVar('table_blocks');						
-						$table_admin = (($table_arr[$i]->getVar('table_admin') == 1) ? _YES : _NO);
-						$table_user = (($table_arr[$i]->getVar('table_user') == 1) ? _YES : _NO);						
-						$nb_fields = $table_arr[$i]->getVar('table_nbfields');
-						$blocks = ($table_blocks == 1) ? _YES : _NO;
-						echo '<tr class="even center toggleHidden">';
-						echo '<td class="center">'.$i.'</b></a></td>';
-						echo '<td class="left">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>- '.$table_name.'</b></a></td>';
-						if(file_exists($image = $pathIcon32.'/'.$table_image)) {
-							echo '<td><img src="'.$image.'" height="25px"></td>';
-						} else {
-							echo '<td><img src="../images/uploads/tables/'.$table_image.'" height="25px"></td>';
-						}
-						echo '<td>'.$table_admin.'</td>';
-						echo '<td>'.$table_user.'</td>';
-						echo '<td>'.$blocks.'</td>';
-						echo '<td>'.$nb_fields.'</td>';
-						echo '<td class="width6">';
-						echo '<a href="tables.php?op=edit_table&table_id='.$i.'"><img src="'. $pathIcon16 .'/edit.png" alt="'._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a>&nbsp;<a href="tables.php?op=edit_fields&table_id='.$i.'"><img src="'. $pathIcon16 .'/inserttable.png" alt="'._AM_TDMCREATE_FORMFIELDS.'" title="'._AM_TDMCREATE_FORMFIELDS.'" /></a>&nbsp;<a href="tables.php?op=delete_table&table_id='.$i.'"><img src="'. $pathIcon16 .'/delete.png" alt="'._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
-						echo '</td>';        
-						echo '</tr>';
-					}
-				}
-            }
-			echo '</table>';
-		} else {
-		    echo '<table width="100%" cellspacing="1" class="outer">';
-			echo '<tr class="center">';
-			echo '<th width="1%">'._AM_TDMCREATE_ID.'</th>';
-			echo '<th width="10%">'._AM_TDMCREATE_NAME.'</th>';
-			echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
-			echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
-			echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
-			echo '<th width="10%">'._AM_TDMCREATE_BLOCKS.'</th>';
-			echo '<th width="10%">'._AM_TDMCREATE_NB_FIELDS.'</th>';
-			echo '<th width="1%">'._AM_TDMCREATE_FORMACTION.'</th>';
-			echo '<tr><td class="errorMsg" colspan="8">There are no modules</td></tr>';
-			echo '</tr></table><br><br>';			
-		}			
-	break;
+	break;	
 }
 include 'footer.php';
\ No newline at end of file

Deleted: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/architecture.php	2014-03-12 20:19:24 UTC (rev 12372)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/architecture.php	2014-03-13 21:55:43 UTC (rev 12373)
@@ -1,110 +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 a...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops-svn:[12372] XoopsCore/branches/2.5.x/2.5.7/htdocs/class/ xoopseditor/xoopseditor.php

[<be...@us...>]

Revision: 12372
          http://sourceforge.net/p/xoops/svn/12372
Author:   beckmi
Date:     2014-03-12 20:19:24 +0000 (Wed, 12 Mar 2014)
Log Message:
-----------
making XoopsEditorHandler function &getInstance static

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php	2014-03-12 08:20:50 UTC (rev 12371)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php	2014-03-12 20:19:24 UTC (rev 12372)
@@ -121,7 +121,7 @@
      * @static
      * @staticvar object
      */
-    function &getInstance()
+    static function &getInstance()
     {
         static $instance;
         if (!isset($instance)) {

[xoops-svn] SF.net SVN: xoops-svn:[12371] XoopsModules

[<be...@us...>]

Revision: 12371
          http://sourceforge.net/p/xoops/svn/12371
Author:   beckmi
Date:     2014-03-12 08:20:50 +0000 (Wed, 12 Mar 2014)
Log Message:
-----------
Adding placeholder for Pages module

Added Paths:
-----------
    XoopsModules/pages/
    XoopsModules/pages/branches/
    XoopsModules/pages/releases/
    XoopsModules/pages/trunk/
    XoopsModules/pages/trunk/pages/

[xoops-svn] SF.net SVN: xoops-svn:[12370] XoopsCore/branches/2.5.x/2.5.7/htdocs/include /common.php

[<rgr...@us...>]

Revision: 12370
          http://sourceforge.net/p/xoops/svn/12370
Author:   rgriffith
Date:     2014-03-09 20:53:49 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
Address issues with custom sessions - part 2

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-09 19:40:11 UTC (rev 12369)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-09 20:53:49 UTC (rev 12370)
@@ -186,12 +186,8 @@
 ) {
     session_id($_POST[$xoopsConfig['sslpost_name']]);
 } else if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '' && $xoopsConfig['session_expire'] > 0) {
-    if (isset($_COOKIE[$xoopsConfig['session_name']])) {
-        session_id($_COOKIE[$xoopsConfig['session_name']]);
-    }
-    if (function_exists('session_cache_expire')) {
-        session_cache_expire($xoopsConfig['session_expire']);
-    }
+    session_name($xoopsConfig['session_name']);
+    session_cache_expire($xoopsConfig['session_expire']);
     @ini_set('session.gc_maxlifetime', $xoopsConfig['session_expire'] * 60);
 }
 session_set_save_handler(array(&$sess_handler, 'open'),

[xoops-svn] SF.net SVN: xoops-svn:[12369] XoopsCore/branches/2.5.x/2.5.7/htdocs/include /common.php

[<rgr...@us...>]

Revision: 12369
          http://sourceforge.net/p/xoops/svn/12369
Author:   rgriffith
Date:     2014-03-09 19:40:11 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
Address issues with custom sessions

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-09 09:53:17 UTC (rev 12368)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-09 19:40:11 UTC (rev 12369)
@@ -201,7 +201,7 @@
                          array(&$sess_handler, 'destroy'),
                          array(&$sess_handler, 'gc'));
 
-if (strlen(session_id()) == 0) {
+if (session_status() !== PHP_SESSION_ACTIVE) {
     session_start();
 }
 

[xoops-svn] SF.net SVN: xoops-svn:[12368] XoopsModules/lexikon/trunk/lexikon

[<be...@us...>]

Revision: 12368
          http://sourceforge.net/p/xoops/svn/12368
Author:   beckmi
Date:     2014-03-09 09:53:17 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
Cosmetic code changes related to PSR-2

Modified Paths:
--------------
    XoopsModules/lexikon/trunk/lexikon/admin/about.php
    XoopsModules/lexikon/trunk/lexikon/admin/admin.php
    XoopsModules/lexikon/trunk/lexikon/admin/admin_footer.php
    XoopsModules/lexikon/trunk/lexikon/admin/category.php
    XoopsModules/lexikon/trunk/lexikon/admin/entry.php
    XoopsModules/lexikon/trunk/lexikon/admin/functions.php
    XoopsModules/lexikon/trunk/lexikon/admin/importdictionary.php
    XoopsModules/lexikon/trunk/lexikon/admin/importglossaire.php
    XoopsModules/lexikon/trunk/lexikon/admin/importwiwimod.php
    XoopsModules/lexikon/trunk/lexikon/admin/importwordbook.php
    XoopsModules/lexikon/trunk/lexikon/admin/importxwords.php
    XoopsModules/lexikon/trunk/lexikon/admin/index.php
    XoopsModules/lexikon/trunk/lexikon/admin/main.php
    XoopsModules/lexikon/trunk/lexikon/admin/menu.php
    XoopsModules/lexikon/trunk/lexikon/admin/myblockform.php
    XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin.php
    XoopsModules/lexikon/trunk/lexikon/admin/myblocksadmin2.php
    XoopsModules/lexikon/trunk/lexikon/admin/mygroupperm.php
    XoopsModules/lexikon/trunk/lexikon/admin/mygrouppermform.php
    XoopsModules/lexikon/trunk/lexikon/admin/permissions.php
    XoopsModules/lexikon/trunk/lexikon/admin/preferences.php
    XoopsModules/lexikon/trunk/lexikon/admin/statistics.php
    XoopsModules/lexikon/trunk/lexikon/admin/submissions.php
    XoopsModules/lexikon/trunk/lexikon/admin/upgrade.php
    XoopsModules/lexikon/trunk/lexikon/authorlist.php
    XoopsModules/lexikon/trunk/lexikon/blocks/categories_block.php
    XoopsModules/lexikon/trunk/lexikon/blocks/entries_authors.php
    XoopsModules/lexikon/trunk/lexikon/blocks/entries_initial.php
    XoopsModules/lexikon/trunk/lexikon/blocks/entries_new.php
    XoopsModules/lexikon/trunk/lexikon/blocks/entries_scrolling.php
    XoopsModules/lexikon/trunk/lexikon/blocks/entries_spot.php
    XoopsModules/lexikon/trunk/lexikon/blocks/entries_top.php
    XoopsModules/lexikon/trunk/lexikon/blocks/random_term.php
    XoopsModules/lexikon/trunk/lexikon/category.php
    XoopsModules/lexikon/trunk/lexikon/class/keyhighlighter.class.php
    XoopsModules/lexikon/trunk/lexikon/comment_delete.php
    XoopsModules/lexikon/trunk/lexikon/comment_edit.php
    XoopsModules/lexikon/trunk/lexikon/comment_new.php
    XoopsModules/lexikon/trunk/lexikon/comment_post.php
    XoopsModules/lexikon/trunk/lexikon/comment_reply.php
    XoopsModules/lexikon/trunk/lexikon/content.php
    XoopsModules/lexikon/trunk/lexikon/entry.php
    XoopsModules/lexikon/trunk/lexikon/header.php
    XoopsModules/lexikon/trunk/lexikon/include/blocksadmin.inc.php
    XoopsModules/lexikon/trunk/lexikon/include/comment_functions.php
    XoopsModules/lexikon/trunk/lexikon/include/common.inc.php
    XoopsModules/lexikon/trunk/lexikon/include/functions.php
    XoopsModules/lexikon/trunk/lexikon/include/gtickets.php
    XoopsModules/lexikon/trunk/lexikon/include/install_function.php
    XoopsModules/lexikon/trunk/lexikon/include/notification.inc.php
    XoopsModules/lexikon/trunk/lexikon/include/onupdate.inc.php
    XoopsModules/lexikon/trunk/lexikon/include/plugin.tag.php
    XoopsModules/lexikon/trunk/lexikon/include/requestform.php
    XoopsModules/lexikon/trunk/lexikon/include/search.inc.php
    XoopsModules/lexikon/trunk/lexikon/include/sitemap.plugin.php
    XoopsModules/lexikon/trunk/lexikon/include/storyform.inc.php
    XoopsModules/lexikon/trunk/lexikon/include/syndication.inc.php
    XoopsModules/lexikon/trunk/lexikon/include/updateblock.inc.php
    XoopsModules/lexikon/trunk/lexikon/include/waiting.plugin.php
    XoopsModules/lexikon/trunk/lexikon/index.php
    XoopsModules/lexikon/trunk/lexikon/language/english/admin.php
    XoopsModules/lexikon/trunk/lexikon/language/english/blocks.php
    XoopsModules/lexikon/trunk/lexikon/language/english/main.php
    XoopsModules/lexikon/trunk/lexikon/language/english/modinfo.php
    XoopsModules/lexikon/trunk/lexikon/letter.php
    XoopsModules/lexikon/trunk/lexikon/list.tag.php
    XoopsModules/lexikon/trunk/lexikon/notification_update.php
    XoopsModules/lexikon/trunk/lexikon/popup.php
    XoopsModules/lexikon/trunk/lexikon/print.php
    XoopsModules/lexikon/trunk/lexikon/profile.php
    XoopsModules/lexikon/trunk/lexikon/request.php
    XoopsModules/lexikon/trunk/lexikon/rss.php
    XoopsModules/lexikon/trunk/lexikon/search.php
    XoopsModules/lexikon/trunk/lexikon/submit.php
    XoopsModules/lexikon/trunk/lexikon/syndication.php
    XoopsModules/lexikon/trunk/lexikon/templates/blocks/entries_scrolling.html
    XoopsModules/lexikon/trunk/lexikon/templates/lx_rss.xml
    XoopsModules/lexikon/trunk/lexikon/view.tag.php
    XoopsModules/lexikon/trunk/lexikon/xoops_version.php

Modified: XoopsModules/lexikon/trunk/lexikon/admin/about.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/about.php	2014-03-08 23:43:58 UTC (rev 12367)
+++ XoopsModules/lexikon/trunk/lexikon/admin/about.php	2014-03-09 09:53:17 UTC (rev 12368)
@@ -27,4 +27,4 @@
 echo $aboutAdmin->addNavigation('about.php');
 echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
 
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';

Modified: XoopsModules/lexikon/trunk/lexikon/admin/admin.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/admin.php	2014-03-08 23:43:58 UTC (rev 12367)
+++ XoopsModules/lexikon/trunk/lexikon/admin/admin.php	2014-03-09 09:53:17 UTC (rev 12368)
@@ -1,160 +1,158 @@
-<?php
-// $Id: admin.php,v 1.7 2003/04/11 13:00:53 okazu Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
-//  ------------------------------------------------------------------------ //
-//  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.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-// Author: Kazumi Ono (AKA onokazu)                                          //
-// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
-// Project: The XOOPS Project                                                //
-// ------------------------------------------------------------------------- //
-
-$admin_mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-
-$fct = empty( $_POST['fct'] ) ? '' : trim( $_POST['fct'] ) ;
-$fct = empty( $_GET['fct'] ) ? $fct : trim( $_GET['fct'] ) ;
-if( empty( $fct ) ) $fct = 'preferences' ;
-//if (isset($fct) && $fct == "users") {
-//	$xoopsOption['pagetype'] = "user";
-//}
-include "../../../mainfile.php";
-// include "../../mainfile.php"; GIJ
-include XOOPS_ROOT_PATH."/include/cp_functions.php";
-
-include_once XOOPS_ROOT_PATH."/kernel/module.php";
-include_once "../include/gtickets.php" ;// GIJ
-
-$admintest = 0;
-
-if (is_object($xoopsUser)) {
-	$xoopsModule =& XoopsModule::getByDirname("system");
-	if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
-		redirect_header(XOOPS_URL.'/user.php',3,_NOPERM);
-		exit();
-	}
-	$admintest=1;
-} else {
-	redirect_header(XOOPS_URL.'/user.php',3,_NOPERM);
-	exit();
-}
-
-// include system category definitions
-include_once XOOPS_ROOT_PATH."/modules/system/constants.php";
-$error = false;
-if ($admintest != 0) {
-	if (isset($fct) && $fct != '') {
-		if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) {
-
-			if ( file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php") ) {
-				include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php";
-			} else {
-				include XOOPS_ROOT_PATH."/modules/system/language/english/admin.php";
-			}
-
-			if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
-				include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php";
-			} elseif (file_exists(XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php")) {
-				include XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php";
-			}
-			include XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php";
-			$sysperm_handler =& xoops_gethandler('groupperm');
-			$category = !empty($modversion['category']) ? intval($modversion['category']) : 0;
-			unset($modversion);
-			if ($category > 0) {
-				$groups = $xoopsUser->getGroups();
-				if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))){
-//					if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php")) {
-//						include_once XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php"; GIJ
-					if (file_exists("../include/{$fct}.inc.php")) {
-						include_once "../include/{$fct}.inc.php" ;
-					} else {
-						$error = true;
-					}
-				} else {
-					$error = true;
-				}
-			} elseif ($fct == 'version') {
-				if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/version/main.php")) {
-					include_once XOOPS_ROOT_PATH."/modules/system/admin/version/main.php";
-				} else {
-					$error = true;
-				}
-			} else {
-				$error = true;
-			}
-		} else {
-			$error = true;
-		}
-	} else {
-		$error = true;
-	}
-}
-
-if (false != $error) {
-	xoops_cp_header();
-	echo "<h4>System Configuration</h4>";
-	echo '<table class="outer" cellpadding="4" cellspacing="1">';
-	echo '<tr>';
-	$groups = $xoopsUser->getGroups();
-	$all_ok = false;
-	if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
-		$sysperm_handler =& xoops_gethandler('groupperm');
-		$ok_syscats = $sysperm_handler->getItemIds('system_admin', $groups);
-	} else {
-		$all_ok = true;
-	}
-	$admin_dir = XOOPS_ROOT_PATH."/modules/system/admin";
-	$handle = opendir($admin_dir);
-	$counter = 0;
-	$class = 'even';
-	while ($file = readdir($handle)) {
-		if (strtolower($file) != 'cvs' && !preg_match("/[.]/", $file) && is_dir($admin_dir.'/'.$file)) {
-			include $admin_dir.'/'.$file.'/xoops_version.php';
-			if ($modversion['hasAdmin']) {
-				$category = isset($modversion['category']) ? intval($modversion['category']) : 0;
-				if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
-					echo "<td class='$class' align='center' valign='bottom' width='19%'>";
-					echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><b>" .trim($modversion['name'])."</b></a>\n";
-					echo "</td>";
-					$counter++;
-					$class = ($class == 'even') ? 'odd' : 'even';
-				}
-				if ( $counter > 4 ) {
-					$counter = 0;
-					echo "</tr>";
-					echo "<tr>";
-				}
-			}
-			unset($modversion);
-		}
-	}
-	while ($counter < 5) {
-		echo '<td class="'.$class.'">&nbsp;</td>';
-		$class = ($class == 'even') ? 'odd' : 'even';
-		$counter++;
-	}
-	echo '</tr></table>';
-    xoops_cp_footer();
-}
-
-?>
\ No newline at end of file
+<?php
+// $Id: admin.php,v 1.7 2003/04/11 13:00:53 okazu Exp $
+//  ------------------------------------------------------------------------ //
+//                XOOPS - PHP Content Management System                      //
+//                    Copyright (c) 2000 XOOPS.org                           //
+//                       <http://www.xoops.org/>                             //
+//  ------------------------------------------------------------------------ //
+//  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.                                      //
+//                                                                           //
+//  You may not change or alter any portion of this comment or credits       //
+//  of supporting developers from this source code or any supporting         //
+//  source code which is considered copyrighted (c) material of the          //
+//  original comment or credit authors.                                      //
+//                                                                           //
+//  This program is distributed in the hope that it will be useful,          //
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
+//  GNU General Public License for more details.                             //
+//                                                                           //
+//  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
+//  ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu)                                          //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project                                                //
+// ------------------------------------------------------------------------- //
+
+$admin_mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+
+$fct = empty( $_POST['fct'] ) ? '' : trim( $_POST['fct'] ) ;
+$fct = empty( $_GET['fct'] ) ? $fct : trim( $_GET['fct'] ) ;
+if( empty( $fct ) ) $fct = 'preferences' ;
+//if (isset($fct) && $fct == "users") {
+//	$xoopsOption['pagetype'] = "user";
+//}
+include '../../../mainfile.php';
+// include "../../mainfile.php"; GIJ
+include XOOPS_ROOT_PATH."/include/cp_functions.php";
+
+include_once XOOPS_ROOT_PATH."/kernel/module.php";
+include_once '../include/gtickets.php';// GIJ
+
+$admintest = 0;
+
+if (is_object($xoopsUser)) {
+    $xoopsModule =& XoopsModule::getByDirname("system");
+    if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+        redirect_header(XOOPS_URL.'/user.php',3,_NOPERM);
+        exit();
+    }
+    $admintest=1;
+} else {
+    redirect_header(XOOPS_URL.'/user.php',3,_NOPERM);
+    exit();
+}
+
+// include system category definitions
+include_once XOOPS_ROOT_PATH."/modules/system/constants.php";
+$error = false;
+if ($admintest != 0) {
+    if (isset($fct) && $fct != '') {
+        if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) {
+
+            if ( file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php") ) {
+                include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php";
+            } else {
+                include XOOPS_ROOT_PATH."/modules/system/language/english/admin.php";
+            }
+
+            if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
+                include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php";
+            } elseif (file_exists(XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php")) {
+                include XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php";
+            }
+            include XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php";
+            $sysperm_handler =& xoops_gethandler('groupperm');
+            $category = !empty($modversion['category']) ? intval($modversion['category']) : 0;
+            unset($modversion);
+            if ($category > 0) {
+                $groups = $xoopsUser->getGroups();
+                if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))) {
+//					if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php")) {
+//						include_once XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php"; GIJ
+                    if (file_exists("../include/{$fct}.inc.php")) {
+                        include_once "../include/{$fct}.inc.php" ;
+                    } else {
+                        $error = true;
+                    }
+                } else {
+                    $error = true;
+                }
+            } elseif ($fct == 'version') {
+                if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/version/main.php")) {
+                    include_once XOOPS_ROOT_PATH."/modules/system/admin/version/main.php";
+                } else {
+                    $error = true;
+                }
+            } else {
+                $error = true;
+            }
+        } else {
+            $error = true;
+        }
+    } else {
+        $error = true;
+    }
+}
+
+if (false != $error) {
+    xoops_cp_header();
+    echo "<h4>System Configuration</h4>";
+    echo '<table class="outer" cellpadding="4" cellspacing="1">';
+    echo '<tr>';
+    $groups = $xoopsUser->getGroups();
+    $all_ok = false;
+    if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
+        $sysperm_handler =& xoops_gethandler('groupperm');
+        $ok_syscats = $sysperm_handler->getItemIds('system_admin', $groups);
+    } else {
+        $all_ok = true;
+    }
+    $admin_dir = XOOPS_ROOT_PATH."/modules/system/admin";
+    $handle = opendir($admin_dir);
+    $counter = 0;
+    $class = 'even';
+    while ($file = readdir($handle)) {
+        if (strtolower($file) != 'cvs' && !preg_match("/[.]/", $file) && is_dir($admin_dir.'/'.$file)) {
+            include $admin_dir.'/'.$file.'/xoops_version.php';
+            if ($modversion['hasAdmin']) {
+                $category = isset($modversion['category']) ? intval($modversion['category']) : 0;
+                if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
+                    echo "<td class='$class' align='center' valign='bottom' width='19%'>";
+                    echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><b>" .trim($modversion['name'])."</b></a>\n";
+                    echo "</td>";
+                    $counter++;
+                    $class = ($class == 'even') ? 'odd' : 'even';
+                }
+                if ($counter > 4) {
+                    $counter = 0;
+                    echo "</tr>";
+                    echo "<tr>";
+                }
+            }
+            unset($modversion);
+        }
+    }
+    while ($counter < 5) {
+        echo '<td class="'.$class.'">&nbsp;</td>';
+        $class = ($class == 'even') ? 'odd' : 'even';
+        $counter++;
+    }
+    echo '</tr></table>';
+    xoops_cp_footer();
+}

Modified: XoopsModules/lexikon/trunk/lexikon/admin/admin_footer.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/admin_footer.php	2014-03-08 23:43:58 UTC (rev 12367)
+++ XoopsModules/lexikon/trunk/lexikon/admin/admin_footer.php	2014-03-09 09:53:17 UTC (rev 12368)
@@ -25,4 +25,4 @@
     ."  " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
     ."</div>";
 
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();

Modified: XoopsModules/lexikon/trunk/lexikon/admin/category.php
===================================================================
--- XoopsModules/lexikon/trunk/lexikon/admin/category.php	2014-03-08 23:43:58 UTC (rev 12367)
+++ XoopsModules/lexikon/trunk/lexikon/admin/category.php	2014-03-09 09:53:17 UTC (rev 12368)
@@ -1,434 +1,430 @@
-<?php
-/**
- * $Id: category.php v 1.0 8 May 2004 hsalazar Exp $
- * Module: Lexikon - glossary module
- * Version: v 1.00
- * Release Date: 8 May 2004
- * Author: hsalazar
- * Licence: GNU
- */
-
-// -- General Stuff -- //
-include( "admin_header.php" );
-$myts =& MyTextSanitizer::getInstance();
-xoops_cp_header();
-xoops_load('XoopsUserUtility');
-$indexAdmin = new ModuleAdmin();
-echo $indexAdmin->addNavigation('category.php');
-$indexAdmin->addItemButton(_AM_LEXIKON_CREATECAT, 'category.php?op=addcat', 'add');
-echo $indexAdmin->renderButton('left');
-$op = '';
-
-/* -- Available operations -- */
-
-function categoryDefault() {
-    $op = 'default';
-    include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
-    include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-
-    $startentry = isset( $_GET['startentry'] ) ? intval( $_GET['startentry'] ) : 0;
-    $startcat = isset( $_GET['startcat'] ) ? intval( $_GET['startcat'] ) : 0;
-    $startsub = isset( $_GET['startsub'] ) ? intval( $_GET['startsub'] ) : 0;
-    $datesub = isset( $_GET['datesub'] ) ? intval( $_GET['datesub'] ) : 0;
-    
-    global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID, $pathIcon16;
-
-    $myts =& MyTextSanitizer::getInstance();
-//    lx_adminMenu(1, _AM_LEXIKON_CATS);
-    $result01 = $xoopsDB -> query( "SELECT COUNT(*)
-                                   FROM " . $xoopsDB -> prefix( "lxcategories" ) . " " );
-    list( $totalcategories ) = $xoopsDB -> fetchRow( $result01 );
-
-    $result02 = $xoopsDB -> query( "SELECT COUNT(*)
-                                   FROM " . $xoopsDB -> prefix( "lxentries" ) . "
-                                   WHERE submit = 0" );
-    list( $totalpublished ) = $xoopsDB -> fetchRow( $result02 );
-
-    $result03 = $xoopsDB -> query( "SELECT COUNT(*)
-                                   FROM " . $xoopsDB -> prefix( "lxentries" ) . "
-                                   WHERE submit = '1' AND request = '0' " );
-    list( $totalsubmitted ) = $xoopsDB -> fetchRow( $result03 );
-
-    $result04 = $xoopsDB -> query( "SELECT COUNT(*)
-                                   FROM " . $xoopsDB -> prefix( "lxentries" ) . "
-                                   WHERE submit = '1' AND request = '1' " );
-    list( $totalrequested ) = $xoopsDB -> fetchRow( $result04 );
-
-//    echo "<table width='100%' class='outer' style=\"margin-top: 6px; clear:both;\" cellspacing='2' cellpadding='3' border='0' ><tr>";
-//    echo "<td class='odd'>" . _AM_LEXIKON_TOTALENTRIES . "</td><td align='center' class='even'>" . $totalpublished . "</td>";
-//    if ($xoopsModuleConfig['multicats'] == 1) {
-//        echo "<td class='odd'>" . _AM_LEXIKON_TOTALCATS . "</td><td align='center' class='even'>" . $totalcategories . "</td>";
-//    }
-//    echo "<td class='odd'>" . _AM_LEXIKON_TOTALSUBM . "</td><td align='center' class='even'>" . $totalsubmitted . "</td>
-//    <td class='odd'>" . _AM_LEXIKON_TOTALREQ . "</td><td align='center' class='even'>" . $totalrequested . "</td>
-//    </tr></table>
-//    <br /><br />";
-
-    if ($xoopsModuleConfig['multicats'] == 1) {
-        /**
-        * Code to show existing categories
-        **/
-
-        echo" <table class='outer' width='100%' border='0'>
-        <tr>
-        <td colspan='7' class='odd'>
-        <strong>". _AM_LEXIKON_SHOWCATS . ' (' . $totalcategories . ')'. "</strong></td></TR>";
-        echo "<tr>";
-        // create existing columns table //doppio
-        $resultC1 = $xoopsDB -> query( "SELECT COUNT(*)
-                                       FROM " . $xoopsDB -> prefix( "lxcategories" ) . " " );
-        list( $numrows ) = $xoopsDB -> fetchRow( $resultC1 );
-
-        $sql = "SELECT *
-               FROM " . $xoopsDB -> prefix( "lxcategories" ) . "
-               ORDER BY weight";
-        $resultC2 = $xoopsDB -> query( $sql, $xoopsModuleConfig['perpage'], $startcat );
-
-        echo "<th width='40'  align='center'><b>" . _AM_LEXIKON_ID . "</b></td>
-        <th  align='center'><b>" . _AM_LEXIKON_WEIGHT . "</b></td>
-        <th width='30%'  align='center'><b>" . _AM_LEXIKON_CATNAME . "</b></td>
-        <th width='10'  align='center'><b>" . _AM_LEXIKON_ENTRIES . "</b></td>
-        <th width='*'  align='center'><b>" . _AM_LEXIKON_DESCRIP . "</b></td>
-        <th width='60'  align='center'><b>" . _AM_LEXIKON_ACTION . "</b></td>
-        </tr>";
-
-
-        $class   = "odd";
-        if ( $numrows > 0 ) // That is, if there ARE columns in the system
-        {
-            while ( list( $categoryID, $name, $description, $total, $weight ) = $xoopsDB -> fetchrow( $resultC2 ) )
-                //while ( list( $categoryID, $name, $description, $total, $weight, ) = $xoopsDB -> fetchrow( $resultC2 ) )
-            {
-                $name = $myts -> htmlSpecialChars( $name );
-//                $description = $myts -> htmlSpecialChars(xoops_substr( strip_tags( $description ),0,60));
-                $description = strip_tags(htmlspecialchars_decode($description));
-                $modify = "<a href='category.php?op=mod&categoryID=" . $categoryID . "'><img src=" . $pathIcon16."/edit.png width='16' height='16' ALT='"._AM_LEXIKON_EDITCAT."'></a>";
-                $delete = "<a href='category.php?op=del&categoryID=" . $categoryID . "'><img src=" . $pathIcon16."/delete.png  width='16' height='16' ALT='"._AM_LEXIKON_DELETECAT."'></a>";
-
-                echo "<tr class='" . $class . "'>";
-                $class = ($class == "even") ? "odd" : "even";
-
-                echo "
-                <td  align='center'>" . $categoryID . "</td>
-                <td  width='10' align='center'>" . $weight . "</td>
-                <td  align='left'><a href='../category.php?categoryID=" . $categoryID . "'>" . $name . "</td>
-                <td  align='left'>" . $total . "</td>
-                <td  align='left'>" . $description . "</td>
-                <td  align='center'> $modify $delete </td>
-                </tr></DIV>";
-            }
-        }
-        else // that is, $numrows = 0, there's no columns yet
-        {
-            echo "<tr>";
-            echo "<td class='odd' align='center' colspan= '7'>"._AM_LEXIKON_NOCATS."</td>";
-            echo "</tr></DIV>";
-            $categoryID = '0';
-        }
-        echo "</table>\n";
-        $pagenav = new XoopsPageNav( $numrows, $xoopsModuleConfig['perpage'], $startcat, 'startcat' );
-        echo '<div style="text-align:right;">' . $pagenav -> renderNav(8) . '</div>';
-        echo "<br /><br />\n";
-        echo "</div>";
-    } else {
-        redirect_header( "index.php", 1, sprintf( _AM_LEXIKON_SINGLECAT, '' ) );
-    }
-}
-
-/**
- * Code to edit categories
- **/
-function categoryEdit( $categoryID = '' ) {
-	include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-	include_once XOOPS_ROOT_PATH."/class/uploader.php";
-	include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-	
-    $weight = 1;
-    $name = '';
-    $description = '';
-    $logourl = '';
-
-    Global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
-
-    // If there is a parameter, and the id exists, retrieve data: we're editing a column
-    if ( $categoryID ) {
-        $result = $xoopsDB -> query( "
-                                     SELECT categoryID, name, description, total, weight,logourl
-                                     FROM " . $xoopsDB -> prefix( "lxcategories" ) . "
-                                     WHERE categoryID = '$categoryID'" );
-
-        list( $categoryID, $name, $description, $total, $weight, $logourl ) = $xoopsDB -> fetchrow( $result );
-        $myts =& MyTextSanitizer::getInstance();
-        $name = $myts->htmlSpecialChars($name);
-        //permissions
-		$member_handler = & xoops_gethandler('member');
-		$group_list = & $member_handler -> getGroupList();
-		$gperm_handler = & xoops_gethandler('groupperm');
-
-		$groups = $gperm_handler -> getGroupIds("lexikon_view", $categoryID, $xoopsModule -> getVar('mid'));
-		$groups = $groups;
-        if ( $xoopsDB -> getRowsNum( $result ) == 0 ) {
-            redirect_header( "index.php", 1, _AM_LEXIKON_NOCATTOEDIT );
-            exit();
-        }
-        if ( $xoopsDB -> getRowsNum( $result ) == 0 ) {
-            redirect_header( "index.php", 1, _AM_LEXIKON_NOCATTOEDIT );
-            exit();
-        }
-        //$myts =& MyTextSanitizer::getInstance();
-//        lx_adminMenu(1, _AM_LEXIKON_CATS);
-
-        echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LEXIKON_CATSHEADER . "</h3>";
-        $sform = new XoopsThemeForm( _AM_LEXIKON_MODCAT . ": $name" , "op", xoops_getenv( 'PHP_SELF' ) );
-    } else {
-        //$myts =& MyTextSanitizer::getInstance();
-//        lx_adminMenu(1, _AM_LEXIKON_CATS);
-         $groups = true;
-        echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LEXIKON_CATSHEADER . "</h3>";
-        $sform = new XoopsThemeForm( _AM_LEXIKON_NEWCAT, "op", xoops_getenv( 'PHP_SELF' ) );
-    }
-
-    $sform -> setExtra( 'enctype="multipart/form-data"' );
-    $sform -> addElement( new XoopsFormText( _AM_LEXIKON_CATNAME, 'name', 50, 80, $name ), true );
-
-    $editor = lx_getWysiwygForm( _AM_LEXIKON_CATDESCRIPT, 'description', $description, 7, 60 );
-    $sform -> addElement( $editor,true );
-    unset($editor);
-
-    $sform -> addElement( new XoopsFormText( _AM_LEXIKON_CATPOSIT, 'weight', 4, 4, $weight ), true );
-    $sform -> addElement( new XoopsFormHidden( 'categoryID', $categoryID ) );
-    //CategoryImage
-    if ($xoopsModuleConfig['useshots'] == 1) {
-        //CategoryImage :: Common querys from Article module by phppp
-	   $image_option_tray = new XoopsFormElementTray("<b>"._AM_LEXIKON_CATIMGUPLOAD."</b>", "<br />");
-	   $image_option_tray->addElement(new XoopsFormFile("", "userfile",""));
-	   $sform->addElement($image_option_tray);
-	   unset($image_tray);
-	   unset($image_option_tray);
-
-	   $path_catimg = "modules/".$xoopsModule->getVar('dirname')."/images/uploads";
-	   $image_option_tray = new XoopsFormElementTray(_AM_LEXIKON_CATIMAGE."<br />"._AM_LEXIKON_CATIMG_DSC."<br />".$path_catimg, "<br />");
-	   //$image_option_tray = new XoopsFormElementTray(_AM_LEXIKON_CATIMAGE.'');
-	   $image_array =& XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH."/".$path_catimg."/");
-	   array_unshift($image_array, _NONE);
-
-	   $image_select = new XoopsFormSelect("", "logourl", $logourl);
-	   $image_select->addOptionArray($image_array);
-	   $image_select->setExtra("onchange=\"showImgSelected('img', 'logourl', '/".$path_catimg."/', '', '" . XOOPS_URL . "')\"");
-	   $image_tray = new XoopsFormElementTray("", "&nbsp;");
-	   $image_tray->addElement($image_select);
-	   if (!empty($logourl) && file_exists(XOOPS_ROOT_PATH . "/" .$path_catimg."/" . $logourl)){
-		   $image_tray->addElement(new XoopsFormLabel("", "<div style=\"padding: 4px;\"><img src=\"" . XOOPS_URL . "/" .$path_catimg."/" . $logourl . "\" name=\"img\" id=\"img\" alt=\"\" /></div>"));
-		   } else {
-		   $image_tray->addElement(new XoopsFormLabel("", "<div style=\"padding: 4px;\"><img src=\"" . XOOPS_URL . "/" .$path_catimg."/blank.gif\" name=\"img\" id=\"img\" alt=\"\" /></div>"));
-	   }
-	   $image_option_tray->addElement($image_tray);
-	   $sform->addElement($image_option_tray);        
-    }
-	$sform -> addElement(new XoopsFormSelectGroup(_AM_LEXIKON_CAT_GROUPSVIEW, "groups", true, $groups, 5, true));
-	
-    $button_tray = new XoopsFormElementTray( '', '' );
-    $hidden = new XoopsFormHidden( 'op', 'addcategory' );
-    $button_tray -> addElement( $hidden );
-
-    // No ID for column -- then it's new column, button says 'Create'
-    if ( !$categoryID ) {
-        $butt_create = new XoopsFormButton( '', '', _AM_LEXIKON_CREATE, 'submit' );
-        $butt_create->setExtra('onclick="this.form.elements.op.value=\'addcategory\'"');
-        $button_tray->addElement( $butt_create );
-
-        $butt_clear = new XoopsFormButton( '', '', _AM_LEXIKON_CLEAR, 'reset' );
-        $button_tray->addElement( $butt_clear );
-
-        $butt_cancel = new XoopsFormButton( '', '', _AM_LEXIKON_CANCEL, 'button' );
-        $butt_cancel->setExtra('onclick="history.go(-1)"');
-        $button_tray->addElement( $butt_cancel );
-    } else // button says 'Update'
-    {
-        $butt_create = new XoopsFormButton( '', '', _AM_LEXIKON_MODIFY, 'submit' );
-        $butt_create->setExtra('onclick="this.form.elements.op.value=\'addcategory\'"');
-        $button_tray->addElement( $butt_create );
-
-        $butt_cancel = new XoopsFormButton( '', '', _AM_LEXIKON_CANCEL, 'button' );
-        $butt_cancel->setExtra('onclick="history.go(-1)"');
-        $button_tray->addElement( $butt_cancel );
-    }
-
-    $sform -> addElement( $button_tray );
-    $sform -> display();
-    unset( $hidden );
-//  xoops_cp_footer();
-//  break;
-}
-
-/**
- * Code to delete existing categories
- **/
-function categoryDelete($categoryID = '') {
-    //global $xoopsDB, $xoopsConfig;
-    global $xoopsConfig, $xoopsDB, $xoopsModule;
-    $idc = isset($_POST['categoryID']) ? intval($_POST['categoryID']) : intval($_GET['categoryID']);
-    if ($idc == '') $idc = $_GET['categoryID'];
-    if ($idc <= 0) {
-        header('location: category.php');
-        die();
-    }
-
-    $ok = isset($_POST['ok']) ? intval($_POST['ok']) : 0;
-    $result = $xoopsDB -> query( "SELECT categoryID, name FROM " . $xoopsDB -> prefix( "lxcategories" ) . " WHERE categoryID = $idc" );
-    list( $categoryID, $name ) = $xoopsDB -> fetchrow( $result );
-    // confirmed, so delete
-    if ( $ok == 1 ) {
-        //get all entries in the category
-        $result3=$xoopsDB->query("SELECT entryID from ".$xoopsDB->prefix("lxentries")." where categoryID = $idc");
-        //now for each entry, delete the coments
-        while ( list($entryID)=$xoopsDB->fetchRow($result3) ) {
-			xoops_comment_delete($xoopsModule->getVar('mid'), $entryID);
-			xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'term', $entryID);
-        }
-        $xoopsDB->query("DELETE FROM ".$xoopsDB->prefix('lxcategories')." WHERE categoryID='$idc'");
-        $result2 = $xoopsDB -> query( "DELETE FROM " .$xoopsDB -> prefix("lxentries")." WHERE categoryID = $idc");
-        // remove permissions
-		xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_view', $categoryID);
-		xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_submit', $categoryID);
-		xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_approve', $categoryID);
-		xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_request', $categoryID);
-        // delete notifications
-        xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'global', $categoryID);
-        xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'category', $categoryID);
-        
-        redirect_header("category.php",1,sprintf( _AM_LEXIKON_CATISDELETED, $name ) );
-        exit();
-    } else {
-        //xoops_cp_header();
-        xoops_confirm(array('op' => 'del', 'categoryID' => $categoryID, 'ok' => 1, 'name' => $name ), 'category.php', _AM_LEXIKON_DELETETHISCAT . "<br /><br>" . $name, _AM_LEXIKON_DELETE );
-    }
-}
-
-
-
-function categorySave ($categoryID = '') {
-	include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-	include_once XOOPS_ROOT_PATH."/class/uploader.php";
-    Global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule, $xoopsDB, $myts, $categoryID;
-    //print_r ($_POST);
-    $categoryID = isset( $_POST['categoryID'] ) ? intval( $_POST['categoryID'] ) : intval( $_GET['categoryID'] );
-    $weight = isset($_POST['weight'] ) ? intval($_POST['weight']) : intval($_GET['weight']);
-    $name = isset($_POST['name'] ) ? htmlSpecialChars($_POST['name']) : htmlSpecialChars($_GET['name']);
-    $description = isset($_POST['description'] ) ? htmlSpecialChars($_POST['description']) : htmlSpecialChars($_GET['description']);
-    //$description = $myts->xoopsCodeDecode($description, $allowimage = 0);
-    $description = $myts -> xoopsCodeDecode($myts->censorString($description), $allowimage = 1);
-    $name = $myts->addSlashes($_POST['name']);
-    $logourl = $myts->addSlashes($_POST["logourl"]);
-	$groups = isset($_POST['groups']) ? $_POST['groups'] : array();
-	// image upload
-	$logourl = "";
-	$maxfilesize = 30000;
-	$maxfilewidth = 128;
-	$maxfileheight = 128;
-	  if (!empty($_FILES['userfile']['name'])) { 
-		$allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
-		$uploader = new XoopsMediaUploader(XOOPS_ROOT_PATH ."/modules/".$xoopsModule->getVar('dirname')."/images/uploads/", $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-		  if (!$uploader->upload()) {
-			 echo $uploader->getErrors();
-		  } else {
-			 echo '<h4>'._AM_LEXIKON_FILESUCCESS.'</h4>';
-			 $logourl = $uploader->getSavedFileName();
-		  }
-		} else {
-		  echo $uploader->getErrors();
-		}
-	 }
-	$logourl = empty($logourl)?(empty($_POST['logourl'])?"":$_POST['logourl']):$logourl;
-	
-    // Run the query and update the data
-    if ( !$_POST['categoryID'] ) {
-        if ( $xoopsDB -> query( "INSERT INTO " . $xoopsDB -> prefix( "lxcategories" ) . " (categoryID, name, description, weight, logourl) 
-								 VALUES ('', '$name', '$description', '$weight', '$logourl')" ) ) {
-			$newid = $xoopsDB->getInsertId();
-            // Increment author's posts count (only if it's a new definition)
-            if (is_object($xoopsUser) && empty($categoryID)) {
-                $member_handler = &xoops_gethandler('member');
-                $submitter =& $member_handler -> getUser($uid);
-                if (is_object($submitter) ) {
-                    $submitter -> setVar('posts',$submitter -> getVar('posts') + 1);
-                    $res=$member_handler -> insertUser($submitter, true);
-                    unset($submitter);
-                }
-            }
-			//notification
-			if(!empty($xoopsModuleConfig['notification_enabled']) ){
-				if ($newid == 0) {
-					$newid = $xoopsDB -> getInsertId();
-				}
-				global $xoopsModule;
-				$notification_handler =& xoops_gethandler('notification');
-				$tags = array();
-				$tags['ITEM_NAME'] = $name;
-				$tags['ITEM_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/category.php?categoryID=' . $newid;
-				$notification_handler->triggerEvent( 'global', 0, 'new_category', $tags);
-			}
-			lx_save_Permissions($groups, $categoryID, "lexikon_view");
-            redirect_header( "category.php", 1, _AM_LEXIKON_CATCREATED );
-            exit();
-        } else {
-            redirect_header( "index.php", 1, _AM_LEXIKON_NOTUPDATED );
-            exit();
-        }
-    } else {
-        if ( $xoopsDB -> queryF( "
-								UPDATE " . $xoopsDB -> prefix( "lxcategories" ) . " 
-								SET name = '$name', description = '$description', weight = '$weight' , logourl = '$logourl' 
-								WHERE categoryID = '$categoryID'" ) ) {
-			lx_save_Permissions($groups, $categoryID, "lexikon_view");
-            redirect_header( "category.php", 1, _AM_LEXIKON_CATMODIFIED );
-            exit();
-        } else {
-            redirect_header( "index.php", 1, _AM_LEXIKON_NOTUPDATED );
-            exit();
-        }
-    }
-}
-
-
-/**
- * Available operations
- **/
-
-$op = 'default';
-if (isset($_POST['op'])) {
-    $op=$_POST['op'];
-} else {
-    if (isset($_GET['op'])) {
-        $op=$_GET['op'];
-    }
-}
-
-
-switch ( $op ) {
-case "mod":
-    $categoryID = isset( $_POST['categoryID'] ) ? intval( $_POST['categoryID'] ) : intval( $_GET['categoryID'] );
-    categoryEdit( $categoryID );
-    break;
-
-case "addcat":
-    categoryEdit();
-    break;
-
-case "addcategory":
-    categorySave();
-    break;
-
-case "del":
-    categoryDelete();
-    break;
-
-
-case "default":
-default:
-    categoryDefault();
-    break;
-}
-xoops_cp_footer();
-?>
\ No newline at end of file
+<?php
+/**
+ * $Id: category.php v 1.0 8 May 2004 hsalazar Exp $
+ * Module: Lexikon - glossary module
+ * Version: v 1.00
+ * Release Date: 8 May 2004
+ * Author: hsalazar
+ * Licence: GNU
+ */
+
+// -- General Stuff -- //
+include 'admin_header.php';
+$myts =& MyTextSanitizer::getInstance();
+xoops_cp_header();
+xoops_load('XoopsUserUtility');
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('category.php');
+$indexAdmin->addItemButton(_AM_LEXIKON_CREATECAT, 'category.php?op=addcat', 'add');
+echo $indexAdmin->renderButton('left');
+$op = '';
+
+/* -- Available operations -- */
+
+function categoryDefault()
+{
+    $op = 'default';
+    include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
+    include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+
+    $startentry = isset( $_GET['startentry'] ) ? intval( $_GET['startentry'] ) : 0;
+    $startcat = isset( $_GET['startcat'] ) ? intval( $_GET['startcat'] ) : 0;
+    $startsub = isset( $_GET['startsub'] ) ? intval( $_GET['startsub'] ) : 0;
+    $datesub = isset( $_GET['datesub'] ) ? intval( $_GET['datesub'] ) : 0;
+
+    global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $entryID, $pathIcon16;
+
+    $myts =& MyTextSanitizer::getInstance();
+//    lx_adminMenu(1, _AM_LEXIKON_CATS);
+    $result01 = $xoopsDB -> query( "SELECT COUNT(*)
+                                   FROM " . $xoopsDB -> prefix( "lxcategories" ) . " " );
+    list( $totalcategories ) = $xoopsDB -> fetchRow( $result01 );
+
+    $result02 = $xoopsDB -> query( "SELECT COUNT(*)
+                                   FROM " . $xoopsDB -> prefix( "lxentries" ) . "
+                                   WHERE submit = 0" );
+    list( $totalpublished ) = $xoopsDB -> fetchRow( $result02 );
+
+    $result03 = $xoopsDB -> query( "SELECT COUNT(*)
+                                   FROM " . $xoopsDB -> prefix( "lxentries" ) . "
+                                   WHERE submit = '1' AND request = '0' " );
+    list( $totalsubmitted ) = $xoopsDB -> fetchRow( $result03 );
+
+    $result04 = $xoopsDB -> query( "SELECT COUNT(*)
+                                   FROM " . $xoopsDB -> prefix( "lxentries" ) . "
+                                   WHERE submit = '1' AND request = '1' " );
+    list( $totalrequested ) = $xoopsDB -> fetchRow( $result04 );
+
+//    echo "<table width='100%' class='outer' style=\"margin-top: 6px; clear:both;\" cellspacing='2' cellpadding='3' border='0' ><tr>";
+//    echo "<td class='odd'>" . _AM_LEXIKON_TOTALENTRIES . "</td><td align='center' class='even'>" . $totalpublished . "</td>";
+//    if ($xoopsModuleConfig['multicats'] == 1) {
+//        echo "<td class='odd'>" . _AM_LEXIKON_TOTALCATS . "</td><td align='center' class='even'>" . $totalcategories . "</td>";
+//    }
+//    echo "<td class='odd'>" . _AM_LEXIKON_TOTALSUBM . "</td><td align='center' class='even'>" . $totalsubmitted . "</td>
+//    <td class='odd'>" . _AM_LEXIKON_TOTALREQ . "</td><td align='center' class='even'>" . $totalrequested . "</td>
+//    </tr></table>
+//    <br /><br />";
+
+    if ($xoopsModuleConfig['multicats'] == 1) {
+        /**
+        * Code to show existing categories
+        **/
+
+        echo" <table class='outer' width='100%' border='0'>
+        <tr>
+        <td colspan='7' class='odd'>
+        <strong>". _AM_LEXIKON_SHOWCATS . ' (' . $totalcategories . ')'. "</strong></td></TR>";
+        echo "<tr>";
+        // create existing columns table //doppio
+        $resultC1 = $xoopsDB -> query( "SELECT COUNT(*)
+                                       FROM " . $xoopsDB -> prefix( "lxcategories" ) . " " );
+        list( $numrows ) = $xoopsDB -> fetchRow( $resultC1 );
+
+        $sql = "SELECT *
+               FROM " . $xoopsDB -> prefix( "lxcategories" ) . "
+               ORDER BY weight";
+        $resultC2 = $xoopsDB -> query( $sql, $xoopsModuleConfig['perpage'], $startcat );
+
+        echo "<th width='40'  align='center'><b>" . _AM_LEXIKON_ID . "</b></td>
+        <th  align='center'><b>" . _AM_LEXIKON_WEIGHT . "</b></td>
+        <th width='30%'  align='center'><b>" . _AM_LEXIKON_CATNAME . "</b></td>
+        <th width='10'  align='center'><b>" . _AM_LEXIKON_ENTRIES . "</b></td>
+        <th width='*'  align='center'><b>" . _AM_LEXIKON_DESCRIP . "</b></td>
+        <th width='60'  align='center'><b>" . _AM_LEXIKON_ACTION . "</b></td>
+        </tr>";
+
+        $class   = "odd";
+        if ($numrows > 0) { // That is, if there ARE columns in the system
+            while ( list( $categoryID, $name, $description, $total, $weight ) = $xoopsDB -> fetchrow( $resultC2 ) )
+                //while ( list( $categoryID, $name, $description, $total, $weight, ) = $xoopsDB -> fetchrow( $resultC2 ) ) {
+                $name = $myts -> htmlSpecialChars( $name );
+//                $description = $myts -> htmlSpecialChars(xoops_substr( strip_tags( $description ),0,60));
+                $description = strip_tags(htmlspecialchars_decode($description));
+                $modify = "<a href='category.php?op=mod&categoryID=" . $categoryID . "'><img src=" . $pathIcon16."/edit.png width='16' height='16' ALT='"._AM_LEXIKON_EDITCAT."'></a>";
+                $delete = "<a href='category.php?op=del&categoryID=" . $categoryID . "'><img src=" . $pathIcon16."/delete.png  width='16' height='16' ALT='"._AM_LEXIKON_DELETECAT."'></a>";
+
+                echo "<tr class='" . $class . "'>";
+                $class = ($class == "even") ? "odd" : "even";
+
+                echo "
+                <td  align='center'>" . $categoryID . "</td>
+                <td  width='10' align='center'>" . $weight . "</td>
+                <td  align='left'><a href='../category.php?categoryID=" . $categoryID . "'>" . $name . "</td>
+                <td  align='left'>" . $total . "</td>
+                <td  align='left'>" . $description . "</td>
+                <td  align='center'> $modify $delete </td>
+                </tr></DIV>";
+
+        } else { // that is, $numrows = 0, there's no columns yet
+            echo "<tr>";
+            echo "<td class='odd' align='center' colspan= '7'>"._AM_LEXIKON_NOCATS."</td>";
+            echo "</tr></DIV>";
+            $categoryID = '0';
+        }
+        echo "</table>\n";
+        $pagenav = new XoopsPageNav( $numrows, $xoopsModuleConfig['perpage'], $startcat, 'startcat' );
+        echo '<div style="text-align:right;">' . $pagenav -> renderNav(8) . '</div>';
+        echo "<br /><br />\n";
+        echo "</div>";
+    } else {
+        redirect_header( "index.php", 1, sprintf( _AM_LEXIKON_SINGLECAT, '' ) );
+    }
+}
+
+/**
+ * Code to edit categories
+ **/
+function categoryEdit( $categoryID = '' )
+{
+    include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+    include_once XOOPS_ROOT_PATH."/class/uploader.php";
+    include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+
+    $weight = 1;
+    $name = '';
+    $description = '';
+    $logourl = '';
+
+    Global $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
+
+    // If there is a parameter, and the id exists, retrieve data: we're editing a column
+    if ($categoryID) {
+        $result = $xoopsDB -> query( "
+                                     SELECT categoryID, name, description, total, weight,logourl
+                                     FROM " . $xoopsDB -> prefix( "lxcategories" ) . "
+                                     WHERE categoryID = '$categoryID'" );
+
+        list( $categoryID, $name, $description, $total, $weight, $logourl ) = $xoopsDB -> fetchrow( $result );
+        $myts =& MyTextSanitizer::getInstance();
+        $name = $myts->htmlSpecialChars($name);
+        //permissions
+        $member_handler = & xoops_gethandler('member');
+        $group_list = & $member_handler -> getGroupList();
+        $gperm_handler = & xoops_gethandler('groupperm');
+
+        $groups = $gperm_handler -> getGroupIds("lexikon_view", $categoryID, $xoopsModule -> getVar('mid'));
+//        $groups = $groups;
+        if ( $xoopsDB -> getRowsNum( $result ) == 0 ) {
+            redirect_header( "index.php", 1, _AM_LEXIKON_NOCATTOEDIT );
+            exit();
+        }
+        if ( $xoopsDB -> getRowsNum( $result ) == 0 ) {
+            redirect_header( "index.php", 1, _AM_LEXIKON_NOCATTOEDIT );
+            exit();
+        }
+        //$myts =& MyTextSanitizer::getInstance();
+//        lx_adminMenu(1, _AM_LEXIKON_CATS);
+
+        echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LEXIKON_CATSHEADER . "</h3>";
+        $sform = new XoopsThemeForm( _AM_LEXIKON_MODCAT . ": $name" , "op", xoops_getenv( 'PHP_SELF' ) );
+    } else {
+        //$myts =& MyTextSanitizer::getInstance();
+//        lx_adminMenu(1, _AM_LEXIKON_CATS);
+         $groups = true;
+        echo "<h3 style=\"color: #2F5376; margin-top: 6px; \">" . _AM_LEXIKON_CATSHEADER . "</h3>";
+        $sform = new XoopsThemeForm( _AM_LEXIKON_NEWCAT, "op", xoops_getenv( 'PHP_SELF' ) );
+    }
+
+    $sform -> setExtra( 'enctype="multipart/form-data"' );
+    $sform -> addElement( new XoopsFormText( _AM_LEXIKON_CATNAME, 'name', 50, 80, $name ), true );
+
+    $editor = lx_getWysiwygForm( _AM_LEXIKON_CATDESCRIPT, 'description', $description, 7, 60 );
+    $sform -> addElement( $editor,true );
+    unset($editor);
+
+    $sform -> addElement( new XoopsFormText( _AM_LEXIKON_CATPOSIT, 'weight', 4, 4, $weight ), true );
+    $sform -> addElement( new XoopsFormHidden( 'categoryID', $categoryID ) );
+    //CategoryImage
+    if ($xoopsModuleConfig['useshots'] == 1) {
+        //CategoryImage :: Common querys from Article module by phppp
+       $image_option_tray = new XoopsFormElementTray("<b>"._AM_LEXIKON_CATIMGUPLOAD."</b>", "<br />");
+       $image_option_tray->addElement(new XoopsFormFile("", "userfile",""));
+       $sform->addElement($image_option_tray);
+       unset($image_tray);
+       unset($image_option_tray);
+
+       $path_catimg = "modules/".$xoopsModule->getVar('dirname')."/images/uploads";
+       $image_option_tray = new XoopsFormElementTray(_AM_LEXIKON_CATIMAGE."<br />"._AM_LEXIKON_CATIMG_DSC."<br />".$path_catimg, "<br />");
+       //$image_option_tray = new XoopsFormElementTray(_AM_LEXIKON_CATIMAGE.'');
+       $image_array =& XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH."/".$path_catimg."/");
+       array_unshift($image_array, _NONE);
+
+       $image_select = new XoopsFormSelect("", "logourl", $logourl);
+       $image_select->addOptionArray($image_array);
+       $image_select->setExtra("onchange=\"showImgSelected('img', 'logourl', '/".$path_catimg."/', '', '" . XOOPS_URL . "')\"");
+       $image_tray = new XoopsFormElementTray("", "&nbsp;");
+       $image_tray->addElement($image_select);
+       if (!empty($logourl) && file_exists(XOOPS_ROOT_PATH . "/" .$path_catimg."/" . $logourl)) {
+           $image_tray->addElement(new XoopsFormLabel("", "<div style=\"padding: 4px;\"><img src=\"" . XOOPS_URL . "/" .$path_catimg."/" . $logourl . "\" name=\"img\" id=\"img\" alt=\"\" /></div>"));
+           } else {
+           $image_tray->addElement(new XoopsFormLabel("", "<div style=\"padding: 4px;\"><img src=\"" . XOOPS_URL . "/" .$path_catimg."/blank.gif\" name=\"img\" id=\"img\" alt=\"\" /></div>"));
+       }
+       $image_option_tray->addElement($image_tray);
+       $sform->addElement($image_option_tray);
+    }
+    $sform -> addElement(new XoopsFormSelectGroup(_AM_LEXIKON_CAT_GROUPSVIEW, "groups", true, $groups, 5, true));
+
+    $button_tray = new XoopsFormElementTray( '', '' );
+    $hidden = new XoopsFormHidden( 'op', 'addcategory' );
+    $button_tray -> addElement( $hidden );
+
+    // No ID for column -- then it's new column, button says 'Create'
+    if (!$categoryID) {
+        $butt_create = new XoopsFormButton( '', '', _AM_LEXIKON_CREATE, 'submit' );
+        $butt_create->setExtra('onclick="this.form.elements.op.value=\'addcategory\'"');
+        $button_tray->addElement( $butt_create );
+
+        $butt_clear = new XoopsFormButton( '', '', _AM_LEXIKON_CLEAR, 'reset' );
+        $button_tray->addElement( $butt_clear );
+
+        $butt_cancel = new XoopsFormButton( '', '', _AM_LEXIKON_CANCEL, 'button' );
+        $butt_cancel->setExtra('onclick="history.go(-1)"');
+        $button_tray->addElement( $butt_cancel );
+    } else { // button says 'Update'
+        $butt_create = new XoopsFormButton( '', '', _AM_LEXIKON_MODIFY, 'submit' );
+        $butt_create->setExtra('onclick="this.form.elements.op.value=\'addcategory\'"');
+        $button_tray->addElement( $butt_create );
+
+        $butt_cancel = new XoopsFormButton( '', '', _AM_LEXIKON_CANCEL, 'button' );
+        $butt_cancel->setExtra('onclick="history.go(-1)"');
+        $button_tray->addElement( $butt_cancel );
+    }
+
+    $sform -> addElement( $button_tray );
+    $sform -> display();
+    unset( $hidden );
+//  xoops_cp_footer();
+//  break;
+}
+
+/**
+ * Code to delete existing categories
+ **/
+function categoryDelete($categoryID = '')
+{
+    //global $xoopsDB, $xoopsConfig;
+    global $xoopsConfig, $xoopsDB, $xoopsModule;
+    $idc = isset($_POST['categoryID']) ? intval($_POST['categoryID']) : intval($_GET['categoryID']);
+    if ($idc == '') $idc = $_GET['categoryID'];
+    if ($idc <= 0) {
+        header('location: category.php');
+        die();
+    }
+
+    $ok = isset($_POST['ok']) ? intval($_POST['ok']) : 0;
+    $result = $xoopsDB -> query( "SELECT categoryID, name FROM " . $xoopsDB -> prefix( "lxcategories" ) . " WHERE categoryID = $idc" );
+    list( $categoryID, $name ) = $xoopsDB -> fetchrow( $result );
+    // confirmed, so delete
+    if ($ok == 1) {
+        //get all entries in the category
+        $result3=$xoopsDB->query("SELECT entryID from ".$xoopsDB->prefix("lxentries")." where categoryID = $idc");
+        //now for each entry, delete the coments
+        while ( list($entryID)=$xoopsDB->fetchRow($result3) ) {
+            xoops_comment_delete($xoopsModule->getVar('mid'), $entryID);
+            xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'term', $entryID);
+        }
+        $xoopsDB->query("DELETE FROM ".$xoopsDB->prefix('lxcategories')." WHERE categoryID='$idc'");
+        $result2 = $xoopsDB -> query( "DELETE FROM " .$xoopsDB -> prefix("lxentries")." WHERE categoryID = $idc");
+        // remove permissions
+        xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_view', $categoryID);
+        xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_submit', $categoryID);
+        xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_approve', $categoryID);
+        xoops_groupperm_deletebymoditem($xoopsModule->getVar('mid'), 'lexikon_request', $categoryID);
+        // delete notifications
+        xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'global', $categoryID);
+        xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'category', $categoryID);
+
+        redirect_header("category.php",1,sprintf( _AM_LEXIKON_CATISDELETED, $name ) );
+        exit();
+    } else {
+        //xoops_cp_header();
+        xoops_confirm(array('op' => 'del', 'categoryID' => $categoryID, 'ok' => 1, 'name' => $name ), 'category.php', _AM_LEXIKON_DELETETHISCAT . "<br /><br>" . $name, _AM_LEXIKON_DELETE );
+    }
+}
+
+
+
+function categorySave ($categoryID = '')
+{
+    include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+    include_once XOOPS_ROOT_PATH."/class/uploader.php";
+    Global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule, $xoopsDB, $myts, $categoryID;
+    //print_r ($_POST);
+    $categoryID = isset( $_POST['categoryID'] ) ? intval( $_POST['categoryID'] ) : intval( $_GET['categoryID'] );
+    $weight = isset($_POST['weight'] ) ? intval($_POST['weight']) : intval($_GET['weight']);
+    $name = isset($_POST['name'] ) ? htmlSpecialChars($_POST['name']) : htmlSpecialChars($_GET['name']);
+    $description = isset($_POST['description'] ) ? htmlSpecialChars($_POST['description']) : htmlSpecialChars($_GET['description']);
+    //$description = $myts->xoopsCodeDecode($description, $allowimage = 0);
+    $description = $myts -> xoopsCodeDecode($myts->censorString($description), $allowimage = 1);
+    $name = $myts->addSlashes($_POST['name']);
+    $logourl = $myts->addSlashes($_POST["logourl"]);
+    $groups = isset($_POST['groups']) ? $_POST['groups'] : array();
+    // image upload
+    $logourl = "";
+    $maxfilesize = 30000;
+    $maxfilewidth = 128;
+    $maxfileheight = 128;
+      if (!empty($_FILES['userfile']['name'])) {
+        $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
+        $uploader = new XoopsMediaUploader(XOOPS_ROOT_PATH ."/modules/".$xoopsModule->getVar('dirname')."/images/uploads/", $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+          if (!$uploader->upload()) {
+             echo $uploader->getErrors();
+          } else {
+             echo '<h4>'._AM_LEXIKON_FILESUCCESS.'</h4>';
+             $logourl = $uploader->getSavedFileName();
+          }
+        } else {
+          echo $uploader->getErrors();
+        }
+     }
+    $logourl = empty($logourl)?(empty($_POST['logourl'])?"":$_POST['logourl']):$logourl;
+
+    // Run the query and update the data
+    if (!$_POST['categoryID']) {
+        if ( $xoopsDB -> query( "INSERT INTO " . $xoopsDB -> prefix( "lxcategories" ) . " (categoryID, name, description, weight, logourl)
+                                 VALUES ('', '$name', '$description', '$weight', '$logourl')" ) ) {
+            $newid = $xoopsDB->getInsertId();
+            // Increment author's posts count (only if it's a new definition)
+            if (is_object($xoopsUser) && empty($categoryID)) {
+                $member_handler = &xoops_gethandler('member');
+                $submitter =& $member_handler -> getUser($uid);
+                if (is_object($submitter) ) {
+                    $submitter -> setVar('posts',$submitter -> getVar('posts') + 1);
+                    $res=$member_handler -> insertUser($submitter, true);
+                    unset($submitter);
+                }
+            }
+            //notification
+            if (!empty($xoopsModuleConfig['notification_enabled']) ) {
+                if ($newid == 0) {
+                    $newid = $xoopsDB -> getInsertId();
+                }
+                global $xoopsModule;
+                $notification_handler =& xoops_gethandler('notification');
+                $tags = array();
+                $tags['ITEM_NAME'] = $name;
+                $tags['ITEM_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/category.php?categoryID=' . $newid;
+                $notification_handler->triggerEvent( 'global', 0, 'new_category', $tags);
+            }
+            lx_save_Permissions($groups, $categoryID, "lexikon_view");
+            redirect_header( "category.php", 1, _AM_LEXIKON_CATCREATED );
+            exit();
+        } else {
+            redirect_header( "index.php", 1, _AM_LEXIKON_NOTUPDATED );
+            exit();
+        }
+    } else {
+        if ( $xoopsDB -> queryF( "
+                              ...
 
[truncated message content]