Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2013-09-14 16:40:21
|
Revision: 12043
http://sourceforge.net/p/xoops/svn/12043
Author: beckmi
Date: 2013-09-14 16:40:18 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
Bug fixes (missing index in Profile, wrong name in email notification template)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/mail_template/default_notify.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 15:28:17 UTC (rev 12042)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 16:40:18 UTC (rev 12043)
@@ -4,7 +4,7 @@
2013/05/08: Version 2.5.7 Beta 1
===============================
Bugfixes:
-- ID: 1269 Block template file will not updated after update the module (Irmtfan)
+- ID: 1269 Block template file will not updated after update the module (irmtfan)
- ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec)
- ID: 1287 assigning "static" to various class methods (wishcraft/mamba)
- ID: 1285 check if session exists before attempting to start a new one (wishcraft)
@@ -28,7 +28,12 @@
- adding some missing generic default fonts (mamba)
- removing some unreachable statements (mamba)
- replacing deprecated HTML tags (mamba)
+- bug in commentrenderer.php (Roby73/irmtfan)
+- added missing info about new language constants in Fast Comments (irmtfan/mamba)
+- fixed Undefined index: uid in file /modules/profile/userinfo.php line 24 (cesag/mamba)
+- fixed template issue in email notifications (changed X_ITEM_TILE to X_ITEM_NAME) (alain01/slider84/mamba)
+
Updated:
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/mail_template/default_notify.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/mail_template/default_notify.tpl 2013-09-14 15:28:17 UTC (rev 12042)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/mail_template/default_notify.tpl 2013-09-14 16:40:18 UTC (rev 12043)
@@ -1,6 +1,6 @@
Hello {X_UNAME},
-The event {X_NOTIFY_EVENT} has occurred to the {X_ITEM_TYPE} "{X_ITEM_TILE}" you are monitoring in the {X_MODULE} module at our site.
+The event {X_NOTIFY_EVENT} has occurred to the {X_ITEM_TYPE} "{X_ITEM_NAME}" you are monitoring in the {X_MODULE} module at our site.
You can view the {X_ITEM_TYPE} here:
{X_ITEM_URL}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php 2013-09-14 15:28:17 UTC (rev 12042)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php 2013-09-14 16:40:18 UTC (rev 12043)
@@ -21,7 +21,7 @@
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
include_once $GLOBALS['xoops']->path('modules/system/constants.php');
-$uid = intval($_GET['uid']);
+$uid = isset($_GET['uid'])? intval($_GET['uid']):0;
if ($uid <= 0) {
if (is_object($GLOBALS['xoopsUser']) ) {
$uid = $GLOBALS['xoopsUser']->getVar('uid');
|
|
From: <be...@us...> - 2013-09-14 15:28:20
|
Revision: 12042
http://sourceforge.net/p/xoops/svn/12042
Author: beckmi
Date: 2013-09-14 15:28:17 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
ID: 1285 check if session exists before attempting to start a new one (wishcraft)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 14:06:17 UTC (rev 12041)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 15:28:17 UTC (rev 12042)
@@ -5,6 +5,10 @@
===============================
Bugfixes:
- ID: 1269 Block template file will not updated after update the module (Irmtfan)
+- ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec)
+- ID: 1287 assigning "static" to various class methods (wishcraft/mamba)
+- ID: 1285 check if session exists before attempting to start a new one (wishcraft)
+
- reversing fix for potential lack of rendering css and javascript in Installer on the last screen by culex
- removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
- added missing "`" in upgrade from 2.0.18 to 2.3.0 (mamba)
@@ -13,13 +17,11 @@
- fixed wrong return icon in Smarty xoModuleIcons32
- fixed issue with jGrows in xoops.css (xoobaru/tarik)
- fix for deprecated "preg_replace/e" function in PHP 5.5 (mamba)
-- ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec)
- added: check if 'date.timezone' is set in php.ini, if not, set it to UTC (cesag/mamba)
- assigned _SHORTDATESTRING to _CAL_FORMAT to have consistency in local languages (jcweb/guspel)
- fixed bug in calendar.js (mamba)
- added link to Module's Admin after "Update" (currently only to XOOPS Modules section) (mamba)
- added placeholder for a link to upload test data, if available after installation (mamba)
-- assigning "static" to various class methods (mamba)
- solved bug into PM module readpmsg.php (escrime-info/slider84)
- fixed missing check on variable in userinfo.php (cesag/mamba)
- replaced extract($_POST) in /include/comment_delete.php with filters (mamba)
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 2013-09-14 14:06:17 UTC (rev 12041)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php 2013-09-14 15:28:17 UTC (rev 12042)
@@ -200,8 +200,11 @@
array(&$sess_handler, 'write'),
array(&$sess_handler, 'destroy'),
array(&$sess_handler, 'gc'));
-session_start();
+if (strlen(session_id()) == 0) {
+ session_start();
+}
+
/**
* Remove expired session for xoopsUserId
*/
|
|
From: <be...@us...> - 2013-09-14 14:06:20
|
Revision: 12041
http://sourceforge.net/p/xoops/svn/12041
Author: beckmi
Date: 2013-09-14 14:06:17 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
replacing deprecated HTML tags
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/debug.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/color-picker.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install2.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/css/help.css
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 14:06:17 UTC (rev 12041)
@@ -25,6 +25,7 @@
- replaced extract($_POST) in /include/comment_delete.php with filters (mamba)
- adding some missing generic default fonts (mamba)
- removing some unreachable statements (mamba)
+- replacing deprecated HTML tags (mamba)
Updated:
- jGrowl to 1.2.13 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/debug.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/debug.tpl 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/debug.tpl 2013-09-14 14:06:17 UTC (rev 12041)
@@ -37,12 +37,12 @@
}
body {
- background: black;
+ background: black;
}
p, table, div {
background: #f0ead8;
-}
+}
p {
margin: 0;
@@ -98,8 +98,8 @@
<div>
{section name=templates loop=$_debug_tpls}
{section name=indent loop=$_debug_tpls[templates].depth} {/section}
- <font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>
- {$_debug_tpls[templates].filename|escape:html}</font>
+ <span color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>
+ {$_debug_tpls[templates].filename|escape:html}</span>
{if isset($_debug_tpls[templates].exec_time)}
<span class="exectime">
({$_debug_tpls[templates].exec_time|string_format:"%.5f"})
@@ -154,4 +154,4 @@
_smarty_console.document.close();
// ]]>
</script>
-{/if}
\ No newline at end of file
+{/if}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js 2013-09-14 14:06:17 UTC (rev 12041)
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/ |\u00a0/gi," ");b(/"/gi,'"');b(/</gi,"<");b(/>/gi,">");b(/&/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span> ');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span> ');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/ |\u00a0/gi," ");b(/"/gi,'"');b(/</gi,"<");b(/>/gi,">");b(/&/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<span color="$1">$2</span>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span> ');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span> ');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/color-picker.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/color-picker.js 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/color-picker.js 2013-09-14 14:06:17 UTC (rev 12041)
@@ -13,8 +13,8 @@
this.field = field;
this.initPalette = !palette || palette > 3 ? 3 : palette;
var w = 194, h = 240,
- move = screen ?
- ',left=' + ((screen.width - w) >> 1) + ',top=' + ((screen.height - h) >> 1) : '',
+ move = screen ?
+ ',left=' + ((screen.width - w) >> 1) + ',top=' + ((screen.height - h) >> 1) : '',
o_colWindow = window.open(this.path+'color-picker.html', null, "help=no,status=no,scrollbars=no,resizable=no" + move + ",width=" + w + ",height=" + h + ",dependent=yes", true);
o_colWindow.opener = window;
o_colWindow.focus();
@@ -33,11 +33,11 @@
function TCPaint(c, b_noPref) {
c = (b_noPref ? '' : '#') + c.toUpperCase();
- if (this.o_samp)
- this.o_samp.innerHTML = '<font face=Tahoma size=2>' + c +' <font color=white>' + c + '</font></font>'
+ if (this.o_samp)
+ this.o_samp.innerHTML = '<span face=Tahoma size=2>' + c +' <span color=white>' + c + '</span></span>'
if(this.doc.layers)
this.sample.bgColor = c;
- else {
+ else {
if (this.sample.backgroundColor != null) this.sample.backgroundColor = c;
else if (this.sample.background != null) this.sample.background = c;
}
@@ -64,7 +64,7 @@
s += this.bldCell(i * 51, k * 51 + (j % 2) * 51 * 3, Math.floor(j / 2) * 51, 8, 10);
s += "</tr>";
}
- return s
+ return s
}
function TCGenerateMac() {
var s = '';
@@ -127,10 +127,10 @@
this.build1 = TCGenerateWind;
this.build2 = TCGenerateGray;
this.build3 = TCGenerateMac;
- this.show = document.layers ?
+ this.show = document.layers ?
function (div) { this.divs[div].visibility = 'show' } :
function (div) { this.divs[div].visibility = 'visible' };
- this.hide = document.layers ?
+ this.hide = document.layers ?
function (div) { this.divs[div].visibility = 'hide' } :
function (div) { this.divs[div].visibility = 'hidden' };
// event handlers
@@ -147,25 +147,25 @@
function TCDraw(o_win, o_doc) {
this.win = o_win;
this.doc = o_doc;
- var
- s_tag_openT = o_doc.layers ?
- 'layer visibility=hidden top=30 left=5 width=182' :
- 'div style=visibility:hidden;position:absolute;left:6px;top:30px;width:182px;height:0',
- s_tag_openS = o_doc.layers ? 'layer top=32 left=6' : 'div',
- s_tag_close = o_doc.layers ? 'layer' : 'div'
-
- this.doc.write('<' + s_tag_openS + ' id=sam name=sam><table cellpadding=0 cellspacing=0 border=1 width=181 align=center class=bd><tr><td align=center height=18><div id="samp"><font face=Tahoma size=2>sample <font color=white>sample</font></font></div></td></tr></table></' + s_tag_close + '>');
- this.sample = o_doc.layers ? o_doc.layers['sam'] :
+ var
+ s_tag_openT = o_doc.layers ?
+ 'layer visibility=hidden top=30 left=5 width=182' :
+ 'div style=visibility:hidden;position:absolute;left:6px;top:30px;width:182px;height:0',
+ s_tag_openS = o_doc.layers ? 'layer top=32 left=6' : 'div',
+ s_tag_close = o_doc.layers ? 'layer' : 'div'
+
+ this.doc.write('<' + s_tag_openS + ' id=sam name=sam><table cellpadding=0 cellspacing=0 border=1 width=181 align=center class=bd><tr><td align=center height=18><div id="samp"><span face=Tahoma size=2>sample <span color=white>sample</span></span></div></td></tr></table></' + s_tag_close + '>');
+ this.sample = o_doc.layers ? o_doc.layers['sam'] :
o_doc.getElementById ? o_doc.getElementById('sam').style : o_doc.all['sam'].style
for (var k = 0; k < 4; k ++) {
this.doc.write('<' + s_tag_openT + ' id="p' + k + '" name="p' + k + '"><table cellpadding=0 cellspacing=0 border=1 align=center>' + this['build' + k]() + '</table></' + s_tag_close + '>');
- this.divs[k] = o_doc.layers
- ? o_doc.layers['p' + k] : o_doc.all
+ this.divs[k] = o_doc.layers
+ ? o_doc.layers['p' + k] : o_doc.all
? o_doc.all['p' + k].style : o_doc.getElementById('p' + k).style
}
- if (!o_doc.layers && o_doc.body.innerHTML)
- this.o_samp = o_doc.all
+ if (!o_doc.layers && o_doc.body.innerHTML)
+ this.o_samp = o_doc.all
? o_doc.all.samp : o_doc.getElementById('samp');
this.C(this.initPalette);
if (this.field.value) this.P(this.field.value, true)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php 2013-09-14 14:06:17 UTC (rev 12041)
@@ -18,7 +18,7 @@
// Translator: XOOPS Translation Team
define('SHOW_HIDE_HELP',"Show/hide help text");
// License
-define('LICENSE_NOT_WRITEABLE','License is %s . <br/><font style="colour:#ff0000">Make ../include/license.php Writable</font>');
+define('LICENSE_NOT_WRITEABLE','License is %s . <br/><span style="colour:#ff0000">Make ../include/license.php Writable</span>');
define('LICENSE_IS_WRITEABLE','License is %s');
// Configuration check page
define('SERVER_API',"Server API");
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install2.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install2.php 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install2.php 2013-09-14 14:06:17 UTC (rev 12041)
@@ -4,7 +4,7 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
// License
-define('LICENSE_NOT_WRITEABLE','License is %s . <br/><font style="colour:#ff0000">Make ../include/license.php Writable</font>');
+define('LICENSE_NOT_WRITEABLE','License is %s . <br/><span style="colour:#ff0000">Make ../include/license.php Writable</span>');
define('LICENSE_IS_WRITEABLE','License is %s');
define('_INSTALL_WEBMASTER','Webmasters');
define('_INSTALL_WEBMASTERD','Webmasters of this site');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php 2013-09-14 14:06:17 UTC (rev 12041)
@@ -6,7 +6,7 @@
$content .= '
<p>
- <acronym title="eXtensible Object-Oriented Portal System">XOOPS</acronym> is an open-source
+ <abbr title="eXtensible Object-Oriented Portal System">XOOPS</abbr> is an open-source
Object-Oriented Web publishing system written in PHP. It is an ideal tool for
developing small to large dynamic community websites, intra company portals, corporate portals, weblogs and much more.
</p>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.php 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.php 2013-09-14 14:06:17 UTC (rev 12041)
@@ -22,7 +22,7 @@
define('_OLDESTFIRST','Oldest First');
define('_NEWESTFIRST','Newest First');
define('_MORE','more...');
-define('_MULTIPAGE','To have your article span multiple pages, insert the word <font color=red>[pagebreak]</font> (with brackets) in the article.');
+define('_MULTIPAGE','To have your article span multiple pages, insert the word <span color=red>[pagebreak]</span> (with brackets) in the article.');
define('_IFNOTRELOAD','If the page does not automatically reload, please click <a href=\'%s\'>here</a>');
// Error messages issued by XoopsObject::cleanVars()
define('_XOBJ_ERR_REQUIRED','%s is required');
@@ -108,7 +108,7 @@
define("_MD_STRTYOPENG","This can not be changed afterwards!");
define("_MD_ASFILE","Store as files (in uploads directory)");
define("_MD_INDB","Store in the database (as binary \"blob\" data)");
-define("_MD_IMGMAIN","Category");
+define("_MD_IMGMAIN","Category");
define("_MD_EDITIMGCAT","Images Settings");
define('_IMGMANAGER','Image Manager');
define('_NUMIMAGES','%s images');
@@ -219,4 +219,4 @@
**/
define('_DBDATESTRING','Y-m-d');
define('_DBTIMESTRING','H:i:s');
-define('_DBTIMESTAMPSTRING','Y-m-d H:i:s');
\ No newline at end of file
+define('_DBTIMESTAMPSTRING','Y-m-d H:i:s');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/css/help.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/css/help.css 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/css/help.css 2013-09-14 14:06:17 UTC (rev 12041)
@@ -1,46 +1,46 @@
-/* Help */
-.tips{
- color:#000;
- border:1px solid #00cc00;
- padding:8px;
- margin:15px 10px;
+/* Help */
+.tips{
+ color:#000;
+ border:1px solid #00cc00;
+ padding:8px;
+ margin:15px 10px;
}
-
-.tips img {
+
+.tips img {
width:22px;
height:22px;
}
-
-p {
+
+p {
text-align:justify;
}
-
-.xo-help-menu {
- border:1px solid #ccc;
+
+.xo-help-menu {
+ border:1px solid #ccc;
padding: 5px;
margin: 5px auto;
border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
-khtml-border-radius: 3px;
-}
-
-#help-template {
- width: 98% !important;
+}
+
+#help-template {
+ width: 98% !important;
border:1px solid #ccc;
- padding: 5px;
+ padding: 5px;
}
-#help-content {
- width: 98% !important;
- margin: 0 auto;
+#help-content {
+ width: 98% !important;
+ margin: 0 auto;
}
#non-modhelp {
padding: 20px;
background-color: #dfdfdf;
border:1px solid #ccc;
- font-style: 12px;
+ font-size: 12px;
font-weight: bold;
-
-}
\ No newline at end of file
+
+}
|
|
From: <be...@us...> - 2013-09-14 12:53:20
|
Revision: 12040
http://sourceforge.net/p/xoops/svn/12040
Author: beckmi
Date: 2013-09-14 12:53:17 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
removing some unreachable statements
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/user.php
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 12:50:52 UTC (rev 12039)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 12:53:17 UTC (rev 12040)
@@ -24,8 +24,8 @@
- fixed missing check on variable in userinfo.php (cesag/mamba)
- replaced extract($_POST) in /include/comment_delete.php with filters (mamba)
- adding some missing generic default fonts (mamba)
+- removing some unreachable statements (mamba)
-
Updated:
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2013-09-14 12:50:52 UTC (rev 12039)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2013-09-14 12:53:17 UTC (rev 12040)
@@ -783,7 +783,7 @@
return true;
}
- return false;
+// return false;
}
function BMPcompressionWindowsLookup($compressionid)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/user.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/user.php 2013-09-14 12:50:52 UTC (rev 12039)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/user.php 2013-09-14 12:53:17 UTC (rev 12040)
@@ -109,7 +109,7 @@
if (empty($id)) {
redirect_header('index.php', 1, '');
- exit();
+// exit();
}
$member_handler =& xoops_gethandler('member');
$thisuser =& $member_handler->getUser($id);
|
|
From: <be...@us...> - 2013-09-14 12:50:56
|
Revision: 12039
http://sourceforge.net/p/xoops/svn/12039
Author: beckmi
Date: 2013-09-14 12:50:52 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
adding some missing generic default fonts
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/css/admin.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/globalnav.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/style.css
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 12:49:29 UTC (rev 12038)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 12:50:52 UTC (rev 12039)
@@ -19,11 +19,13 @@
- fixed bug in calendar.js (mamba)
- added link to Module's Admin after "Update" (currently only to XOOPS Modules section) (mamba)
- added placeholder for a link to upload test data, if available after installation (mamba)
-- assigning "static" to functions in XoopsUserUtility class (mamba)
+- assigning "static" to various class methods (mamba)
- solved bug into PM module readpmsg.php (escrime-info/slider84)
- fixed missing check on variable in userinfo.php (cesag/mamba)
- replaced extract($_POST) in /include/comment_delete.php with filters (mamba)
+- adding some missing generic default fonts (mamba)
+
Updated:
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/css/admin.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/css/admin.css 2013-09-14 12:49:29 UTC (rev 12038)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/css/admin.css 2013-09-14 12:50:52 UTC (rev 12039)
@@ -78,7 +78,7 @@
/* label */
.label {
-
+
color: #2F5376;
font-weight: bold;
}
@@ -131,7 +131,7 @@
/* menu */
div.rmmenuicon {
margin: 3px;
- font-family: Tahoma, Arial, Helvetica;
+ font-family: Tahoma, Arial, Helvetica, sans-serif;
text-align: center;
}
@@ -194,4 +194,4 @@
.txtchangelog {
height: 350px;
overflow: auto;
-}
\ No newline at end of file
+}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/globalnav.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/globalnav.css 2013-09-14 12:49:29 UTC (rev 12038)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/globalnav.css 2013-09-14 12:50:52 UTC (rev 12039)
@@ -19,9 +19,9 @@
position: absolute;
background : #3390EF url(../img/navbar-bg.png) repeat-x left top;
color: #333;
- font-family: "Malgun Gothic", AppleGothic, Dotum, Lucida Grande, Verdana Sans-serif;
+ font-family: "Malgun Gothic", AppleGothic, Dotum, Lucida Grande, Verdana, Sans-serif;
font-weight: bold;
-
+
cursor: hand;
cursor: pointer;
z-index: 10;
@@ -54,14 +54,14 @@
body#sitemap .menu .xo-gbnavmodsitemap {background-color:transparent; color:#333; text-decoration: underline;}
.clearfix:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
+ content: ".";
+ display: block;
+ height: 0;
+ clear: both;
visibility: hidden;
}
.clearfix {display: inline-block;}
/* Hides from IE-mac \*/
* html .clearfix {height: 1%;}
.clearfix {display: block;}
-/* End hide from IE-mac */
\ No newline at end of file
+/* End hide from IE-mac */
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/style.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/style.css 2013-09-14 12:49:29 UTC (rev 12038)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/style.css 2013-09-14 12:50:52 UTC (rev 12039)
@@ -14,7 +14,7 @@
/* IMPORTANT !!! :
propriety semantic order = position box, width, heigth, margin, background-color, background-image, padding, content (color, style font, ...), border, ...
*/
-
+
/* include style sheets */
@import url(reset.css); /* reset css for web browsers */
@import url(globalnav.css); /* horizontal menu in header */
@@ -29,7 +29,7 @@
margin: 0;
background-color: #fff;
color: #333;
- font-family: "Malgun Gothic", AppleGothic, Dotum, Lucida Grande, Verdana Sans-serif;
+ font-family: "Malgun Gothic", AppleGothic, Dotum, Lucida Grande, Verdana, Sans-serif;
line-height: 1.5em;
}
html {font-size:100.01%;}
@@ -78,11 +78,11 @@
a.pdf { background-image: url(../icons/action/pdf.png);}
a.friend { background-image: url(../icons/action/friend.png);}
/* ===== titles ===== */
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6 {
margin: 1em 0 .5em 0;
- line-height: 1.2;
+ line-height: 1.2;
font-weight: bold;
- font-style: normal;
+ font-style: normal;
}
h1 { font-size: 1.4em; font-weight: bold;}
h2 {font-size: 1.2em;}
@@ -115,7 +115,7 @@
q, cite, em, dfn, strong { font-style:italic;}
bdo { direction: ltr;}
acronym, abbr, abbr[title], dfn { border-bottom: 1px dashed; cursor: help;}
-abbr[title] { border-bottom: 1px dotted; cursor: help;}
+abbr[title] { border-bottom: 1px dotted; cursor: help;}
acronym:hover, abbr:hover { border-bottom: #3390EF 1px dashed;}
::selection { background-color: #E7F4F7; color: #3390EF;}
::-moz-selection { background-color: #E7F4F7; color: #3390EF;}
@@ -135,8 +135,8 @@
#xo-canvas-content dd {}
#xo-canvas-content dl {}
#xo-canvas-content dt {}
-dl { margin: .75em 0;}
-dt { margin: .75em 0 0 0; font-weight: bold;}
+dl { margin: .75em 0;}
+dt { margin: .75em 0 0 0; font-weight: bold;}
dd { margin: .25em 0 .25em 1em; }
/* ===== forms ===== */
fieldset { margin: .5em; padding : 1em;}
@@ -333,7 +333,7 @@
margin-bottom: 1em;
color: #aaa;
font-size: .9em;
- font-family: Tahoma;
+ font-family: Tahoma, sans-serif;
text-align: center;
text-shadow: 1px 1px 2px #ccc;
border : 1px solid #ddd;
@@ -422,7 +422,7 @@
background-color: #fff;
padding: 6px;
color: inherit;
- font-family: "Courier New",Courier,monospace;
+ font-family: "Courier New",Courier,monospace;
border: 1px solid #ddd;
}
.xoopsQuote {
@@ -629,7 +629,7 @@
font-size: 1.4em;
font-weight: bold;
border-bottom: 2px solid #333;
-}
+}
/* fix bug publisher module */
#tabs ul li {list-style: none;}
|
|
From: <be...@us...> - 2013-09-14 12:49:33
|
Revision: 12038
http://sourceforge.net/p/xoops/svn/12038
Author: beckmi
Date: 2013-09-14 12:49:29 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
Adding missing "static" to some class methods
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/utility/xoopsutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsblock.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopslocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopslocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/cpanel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/ProtectorFilter.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -38,12 +38,13 @@
* @param mixed $auth_instance
* @return
*/
- function &getInstance(&$auth_instance)
+ static function &getInstance(&$auth_instance)
{
static $provis_instance;
if (!isset($provis_instance)) {
$provis_instance = new XoopsAuthProvisionning($auth_instance);
}
+
return $provis_instance;
}
@@ -101,6 +102,7 @@
$xoopsUser = $this->change($xoopsUser, $datas, $uname, $pwd);
}
}
+
return $xoopsUser;
}
@@ -130,14 +132,16 @@
$newuser->setVar(trim($fields[0]), utf8_decode($datas[trim($fields[1])][0]));
}
if ($member_handler->insertUser($newuser)) {
- foreach($this->ldap_provisionning_group as $groupid) {
+ foreach ($this->ldap_provisionning_group as $groupid) {
$member_handler->addUserToGroup($groupid, $newuser->getVar('uid'));
}
$newuser->unsetNew();
+
return $newuser;
} else {
redirect_header(XOOPS_URL . '/user.php', 5, $newuser->getHtmlErrors());
}
+
return $ret;
}
@@ -163,6 +167,7 @@
} else {
redirect_header(XOOPS_URL . '/user.php', 5, $xoopsUser->getHtmlErrors());
}
+
return $ret;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -39,7 +39,7 @@
* @static
* @return object Reference to the only instance of authentication class
*/
- function &getAuthConnection($uname)
+ static function &getAuthConnection($uname)
{
static $auth_instance;
if (!isset($auth_instance)) {
@@ -66,6 +66,7 @@
$class = 'XoopsAuth' . ucfirst($xoops_auth_method);
if (!class_exists($class)) {
$GLOBALS['xoopsLogger']->triggerError($class, _XO_ER_CLASSNOTFOUND, __FILE__, __LINE__, E_USER_ERROR );
+
return false;
}
switch ($xoops_auth_method) {
@@ -81,6 +82,7 @@
}
$auth_instance = new $class($dao);
}
+
return $auth_instance;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -36,7 +36,6 @@
var $engine = null;
// static $engine = null;
-
/**
* Cache configuration stack
*
@@ -73,6 +72,7 @@
$class = __CLASS__;
$instance = new $class();
}
+
return $instance;
}
@@ -90,18 +90,20 @@
include $file;
} else {
trigger_error('File :' . $file . ' not found in file : ' . __FILE__ . ' at line: ' . __LINE__, E_USER_WARNING);
+
return false;
}
}
+
return true;
}
/**
* Set the cache configuration to use
*
- * @param string $name Name of the configuration
- * @param array $settings Optional associative array of settings passed to the engine
- * @return array (engine, settings) on success, false on failure
+ * @param string $name Name of the configuration
+ * @param array $settings Optional associative array of settings passed to the engine
+ * @return array (engine, settings) on success, false on failure
* @access public
*/
function config($name = 'default', $settings = array())
@@ -113,9 +115,9 @@
if (isset($_this->configs[$name])) {
$settings = array_merge($_this->configs[$name], $settings);
- } else if (!empty($settings)) {
+ } elseif (!empty($settings)) {
$_this->configs[$name] = $settings;
- } else if ($_this->configs !== null && isset($_this->configs[$_this->name])) {
+ } elseif ($_this->configs !== null && isset($_this->configs[$_this->name])) {
$name = $_this->name;
$settings = $_this->configs[$_this->name];
} else {
@@ -135,6 +137,7 @@
if ($name !== $_this->name) {
if ($_this->engine($engine, $settings) === false) {
trigger_error("Cache Engine {$engine} is not set", E_USER_WARNING);
+
return false;
}
$_this->name = $name;
@@ -142,14 +145,15 @@
}
$settings = $_this->configs[$name];
+
return compact('engine', 'settings');
}
/**
* Set the cache engine to use or modify settings for one instance
*
- * @param string $name Name of the engine (without 'Engine')
- * @param array $settings Optional associative array of settings passed to the engine
+ * @param string $name Name of the engine (without 'Engine')
+ * @param array $settings Optional associative array of settings passed to the engine
* @return boolean True on success, false on failure
* @access public
*/
@@ -164,6 +168,7 @@
if (!isset($_this->engine[$name])) {
if ($_this->loadEngine($name) === false) {
trigger_error("Cache Engine {$name} is not loaded", E_USER_WARNING);
+
return false;
}
$_this->engine[$name] = new $cacheClass();
@@ -173,10 +178,12 @@
if (time() % $_this->engine[$name]->settings['probability'] == 0) {
$_this->engine[$name]->gc();
}
+
return true;
}
$_this->engine[$name] = null;
trigger_error("Cache Engine {$name} is not initialized", E_USER_WARNING);
+
return false;
}
@@ -198,21 +205,21 @@
/**
* Write data for key into cache
*
- * @param string $key Identifier for the data
- * @param mixed $value Data to be cached - anything except a resource
- * @param mixed $duration Optional - string configuration name OR how long to cache the data, either in seconds or a
+ * @param string $key Identifier for the data
+ * @param mixed $value Data to be cached - anything except a resource
+ * @param mixed $duration Optional - string configuration name OR how long to cache the data, either in seconds or a
* string that can be parsed by the strtotime() function OR array('config' => 'default', 'duration' => '3600')
* @return boolean True if the data was successfully cached, false on failure
* @access public
*/
- function write($key, $value, $duration = null)
+ static function write($key, $value, $duration = null)
{
$key = substr(md5(XOOPS_URL), 0, 8) . '_' . $key;
$_this =& XoopsCache::getInstance();
$config = null;
if (is_array($duration)) {
extract($duration);
- } else if (isset($_this->configs[$duration])) {
+ } elseif (isset($_this->configs[$duration])) {
$config = $duration;
$duration = null;
}
@@ -225,6 +232,7 @@
if (!$_this->isInitialized($engine)) {
trigger_error('Cache write not initialized: ' . $engine);
+
return false;
}
@@ -246,15 +254,16 @@
}
$_this->engine[$engine]->init($settings);
$success = $_this->engine[$engine]->write($key, $value, $duration);
+
return $success;
}
/**
* Read a key from the cache
*
- * @param string $key Identifier for the data
- * @param string $config name of the configuration to use
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
+ * @param string $key Identifier for the data
+ * @param string $config name of the configuration to use
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
* @access public
*/
static function read($key, $config = null)
@@ -277,18 +286,19 @@
}
$_this->engine[$engine]->init($settings);
$success = $_this->engine[$engine]->read($key);
+
return $success;
}
/**
* Delete a key from the cache
*
- * @param string $key Identifier for the data
- * @param string $config name of the configuration to use
+ * @param string $key Identifier for the data
+ * @param string $config name of the configuration to use
* @return boolean True if the value was succesfully deleted, false if it didn't exist or couldn't be removed
* @access public
*/
- function delete($key, $config = null)
+ static function delete($key, $config = null)
{
$key = substr(md5(XOOPS_URL), 0, 8) . '_' . $key;
$_this =& XoopsCache::getInstance();
@@ -306,14 +316,15 @@
$_this->engine[$engine]->init($settings);
$success = $_this->engine[$engine]->delete($key);
+
return $success;
}
/**
* Delete all keys from the cache
*
- * @param boolean $check if true will check expiration, otherwise delete all
- * @param string $config name of the configuration to use
+ * @param boolean $check if true will check expiration, otherwise delete all
+ * @param string $config name of the configuration to use
* @return boolean True if the cache was succesfully cleared, false otherwise
* @access public
*/
@@ -328,14 +339,15 @@
}
$success = $_this->engine[$engine]->clear($check);
$_this->engine[$engine]->init($settings);
+
return $success;
}
/**
* Check if Cache has initialized a working storage engine
*
- * @param string $engine Name of the engine
- * @param string $config Name of the configuration setting
+ * @param string $engine Name of the engine
+ * @param string $config Name of the configuration setting
* @return bool
* @access public
*/
@@ -352,8 +364,8 @@
/**
* Return the settings for current cache engine
*
- * @param string $engine Name of the engine
- * @return array list of settings for this engine
+ * @param string $engine Name of the engine
+ * @return array list of settings for this engine
* @access public
*/
function settings($engine = null)
@@ -365,14 +377,15 @@
if (isset($_this->engine[$engine]) && ! is_null($_this->engine[$engine])) {
return $_this->engine[$engine]->settings();
}
+
return array();
}
/**
* generates a safe key
*
- * @param string $key the key passed over
- * @return mixed string $key or false
+ * @param string $key the key passed over
+ * @return mixed string $key or false
* @access private
*/
function key($key)
@@ -381,6 +394,7 @@
return false;
}
$key = str_replace(array('/', '.'), '_', strval($key));
+
return $key;
}
}
@@ -406,7 +420,7 @@
*
* Called automatically by the cache frontend
*
- * @param array $params Associative array of parameters for the engine
+ * @param array $params Associative array of parameters for the engine
* @return boolean True if the engine has been succesfully initialized, false if not
* @access public
*/
@@ -415,6 +429,7 @@
$this->settings = array_merge(array(
'duration' => 31556926 ,
'probability' => 100), $settings);
+
return true;
}
@@ -432,9 +447,9 @@
/**
* Write value for a key into cache
*
- * @param string $key Identifier for the data
- * @param mixed $value Data to be cached
- * @param mixed $duration How long to cache the data, in seconds
+ * @param string $key Identifier for the data
+ * @param mixed $value Data to be cached
+ * @param mixed $duration How long to cache the data, in seconds
* @return boolean True if the data was succesfully cached, false on failure
* @access public
*/
@@ -446,8 +461,8 @@
/**
* Read a key from the cache
*
- * @param string $key Identifier for the data
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
+ * @param string $key Identifier for the data
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
* @access public
*/
function read($key)
@@ -458,7 +473,7 @@
/**
* Delete a key from the cache
*
- * @param string $key Identifier for the data
+ * @param string $key Identifier for the data
* @return boolean True if the value was succesfully deleted, false if it didn't exist or couldn't be removed
* @access public
*/
@@ -469,7 +484,7 @@
/**
* Delete all keys from the cache
*
- * @param boolean $check if true will check expiration, otherwise delete all
+ * @param boolean $check if true will check expiration, otherwise delete all
* @return boolean True if the cache was succesfully cleared, false otherwise
* @access public
*/
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -60,13 +60,14 @@
*
* @return Instance
*/
- function &getInstance()
+ static function &getInstance()
{
static $instance;
if (!isset($instance)) {
$class = __CLASS__;
$instance = new $class();
}
+
return $instance;
}
@@ -92,6 +93,7 @@
foreach ($config as $key => $val) {
$config[$key] = $val;
}
+
return $config;
}
@@ -107,16 +109,19 @@
}
if (!empty($this->config['disabled'])) {
$this->active = false;
+
return $this->active;
}
if (!empty($this->config['skipmember']) && is_object($GLOBALS['xoopsUser'])) {
$this->active = false;
+
return $this->active;
}
if (!isset($this->handler)) {
$this->loadHandler();
}
$this->active = isset($this->handler);
+
return $this->active;
}
@@ -151,6 +156,7 @@
$this->handler = $handler;
$this->handler->loadConfig($name);
}
+
return $this->handler;
}
@@ -165,6 +171,7 @@
foreach ($configs as $key => $val) {
$this->setConfig($key, $val);
}
+
return true;
}
@@ -182,6 +189,7 @@
} else {
$this->config[$name] = $val;
}
+
return true;
}
@@ -206,10 +214,10 @@
if (!$this->isActive()) {
$is_valid = true;
// Skip CAPTCHA for member if set
- } else if (is_object($GLOBALS['xoopsUser']) && ! empty($skipMember)) {
+ } elseif (is_object($GLOBALS['xoopsUser']) && ! empty($skipMember)) {
$is_valid = true;
// Kill too many attempts
- } else if (!empty($maxAttempts) && $attempt > $maxAttempts) {
+ } elseif (!empty($maxAttempts) && $attempt > $maxAttempts) {
$this->message[] = _CAPTCHA_TOOMANYATTEMPTS;
// Verify the code
} else {
@@ -226,6 +234,7 @@
$_SESSION["{$sessionName}_attempt"] = null;
}
$this->destroyGarbage(true);
+
return $is_valid;
}
@@ -294,6 +303,7 @@
} else {
$form = $this->loadForm();
}
+
return $form;
}
@@ -307,6 +317,7 @@
if (!$this->active || empty($this->config['name'])) {
return '';
}
+
return $this->handler->renderValidationJS();
}
@@ -321,8 +332,10 @@
$code = ($code === null) ? $this->handler->getCode() : $code;
if (!empty($code)) {
$_SESSION[$this->name . '_code'] = $code;
+
return true;
}
+
return false;
}
@@ -335,6 +348,7 @@
{
$form = $this->handler->render();
$this->setCode();
+
return $form;
}
}
@@ -432,6 +446,7 @@
$func = !empty($this->config['casesensitive']) ? 'strcmp' : 'strcasecmp';
$is_valid = !$func(trim(@$_POST[$sessionName]), $_SESSION["{$sessionName}_code"]);
}
+
return $is_valid;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -62,17 +62,18 @@
/**
* Access the only instance of this class
*
- * @param object $tpl reference to a {@link Smarty} object
+ * @param object $tpl reference to a {@link Smarty} object
* @param boolean $use_icons
* @param boolean $do_iconcheck
* @return
*/
- function &instance(&$tpl, $use_icons = true, $do_iconcheck = false)
+ static function &instance(&$tpl, $use_icons = true, $do_iconcheck = false)
{
static $instance;
if (!isset($instance)) {
$instance = new XoopsCommentRenderer($tpl, $use_icons, $do_iconcheck);
}
+
return $instance;
}
@@ -106,13 +107,13 @@
// Start edit by voltan
$poster = $this->_getPosterArray($this->_comments[$i]->getVar('com_uid'), $this->_comments[$i]->getVar('com_user'), $this->_comments[$i]->getVar('com_url'));
if (false != $admin_view) {
- $com_email = $this->_comments[$i]->getVar('com_email');
+ $com_email = $this->_comments[$i]->getVar('com_email');
$text = $this->_comments[$i]->getVar('com_text');
$text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">';
$text .= _CM_STATUS . ': ' . $this->_statusText[$this->_comments[$i]->getVar('com_status')] . '<br />';
$text .= 'IP: <span style="font-weight: bold;">' . $this->_comments[$i]->getVar('com_ip') . '</span>';
- if(!empty($com_email)) {
- $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
+ if (!empty($com_email)) {
+ $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
}
$text .= '</div>';
} else {
@@ -163,8 +164,8 @@
$text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">';
$text .= _CM_STATUS . ': ' . $this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')] . '<br />';
$text .= 'IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('com_ip') . '</span>';
- if(!empty($com_email)) {
- $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
+ if (!empty($com_email)) {
+ $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
}
$text .= '</div>';
} else {
@@ -176,6 +177,7 @@
$this->renderThreadView($child_id, $admin_view, false);
}
}
+
return;
} else {
$text = $tree[$comment_id]['obj']->getVar('com_text');
@@ -193,12 +195,12 @@
* Render replies to a thread
*
* @param array $ &$thread
- * @param int $key
- * @param array $replies
- * @param string $prefix
- * @param bool $admin_view
+ * @param int $key
+ * @param array $replies
+ * @param string $prefix
+ * @param bool $admin_view
* @param integer $depth
- * @param string $current_prefix
+ * @param string $current_prefix
* @access private
*/
function _renderThreadReplies(&$thread, $key, &$replies, $prefix, $admin_view, $depth = 0, $current_prefix = '')
@@ -251,13 +253,13 @@
$title = $tree[$comment_id]['obj']->getVar('com_title');
}
if (false != $admin_view) {
- $com_email = $tree[$comment_id]['obj']->getVar('com_email');
+ $com_email = $tree[$comment_id]['obj']->getVar('com_email');
$text = $tree[$comment_id]['obj']->getVar('com_text');
$text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">';
$text .= _CM_STATUS . ': ' . $this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')] . '<br />';
$text .= 'IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('com_ip') . '</span>';
- if(!empty($com_email)) {
- $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
+ if (!empty($com_email)) {
+ $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
}
$text .= '</div>';
} else {
@@ -269,6 +271,7 @@
$this->renderNestView($child_id, $admin_view);
}
}
+
return;
} else {
$text = $tree[$comment_id]['obj']->getVar('com_text');
@@ -284,11 +287,11 @@
/**
* Render replies in nested view
*
- * @param array $thread
- * @param int $key
- * @param array $replies
- * @param string $prefix
- * @param bool $admin_view
+ * @param array $thread
+ * @param int $key
+ * @param array $replies
+ * @param string $prefix
+ * @param bool $admin_view
* @param integer $depth
* @access private
*/
@@ -326,7 +329,7 @@
/**
* Get the name of the poster
*
- * @param int $poster_id
+ * @param int $poster_id
* @return string
* @access private
*/
@@ -341,15 +344,15 @@
}
} elseif ($poster['id'] == 0 && $poster_user != '') {
- $poster['id'] = 0; // to cope with deleted user accounts
- if(!empty($poster_website)) {
- $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>';
- } else {
- $poster['uname'] = $poster_user;
- }
+ $poster['id'] = 0; // to cope with deleted user accounts
+ if (!empty($poster_website)) {
+ $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>';
+ } else {
+ $poster['uname'] = $poster_user;
+ }
} else {
- $poster['id'] = 0; // to cope with deleted user accounts
- $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
+ $poster['id'] = 0; // to cope with deleted user accounts
+ $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
}
return $poster;
@@ -359,7 +362,7 @@
/**
* Get an array with info about the poster
*
- * @param int $poster_id
+ * @param int $poster_id
* @return array
* @access private
*/
@@ -381,27 +384,27 @@
$poster['status'] = $com_poster->isOnline() ? _CM_ONLINE : '';
}
} elseif ($poster['id'] == 0 && $poster_user != '') {
- if(!empty($poster_website)) {
- $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>';
- } else {
- $poster['uname'] = $poster_user;
- }
- $poster['id'] = 0; // to cope with deleted user accounts
- $poster['rank_title'] = '';
- $poster['avatar'] = 'blank.gif';
- $poster['regdate'] = '';
- $poster['from'] = '';
- $poster['postnum'] = 0;
- $poster['status'] = '';
+ if (!empty($poster_website)) {
+ $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>';
+ } else {
+ $poster['uname'] = $poster_user;
+ }
+ $poster['id'] = 0; // to cope with deleted user accounts
+ $poster['rank_title'] = '';
+ $poster['avatar'] = 'blank.gif';
+ $poster['regdate'] = '';
+ $poster['from'] = '';
+ $poster['postnum'] = 0;
+ $poster['status'] = '';
} else {
- $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
- $poster['id'] = 0; // to cope with deleted user accounts
- $poster['rank_title'] = '';
- $poster['avatar'] = 'blank.gif';
- $poster['regdate'] = '';
- $poster['from'] = '';
- $poster['postnum'] = 0;
- $poster['status'] = '';
+ $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
+ $poster['id'] = 0; // to cope with deleted user accounts
+ $poster['rank_title'] = '';
+ $poster['avatar'] = 'blank.gif';
+ $poster['regdate'] = '';
+ $poster['from'] = '';
+ $poster['postnum'] = 0;
+ $poster['status'] = '';
}
return $poster;
@@ -411,7 +414,7 @@
/**
* Get the IMG tag for the title icon
*
- * @param string $icon_image
+ * @param string $icon_image
* @return string HTML IMG tag
* @access private
*/
@@ -429,6 +432,7 @@
return '<img src="' . XOOPS_URL . '/images/subject/' . $icon_image . '" alt="" />';
}
}
+
return '<img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" />';
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -40,7 +40,7 @@
* @return boolean always true
* @access public
*/
- function splitMySqlFile(&$ret, $sql)
+ static function splitMySqlFile(&$ret, $sql)
{
$sql = trim($sql);
$sql_len = strlen($sql);
@@ -152,7 +152,7 @@
* @param string $prefix prefix to add to all table names
* @return mixed FALSE on failure
*/
- function prefixQuery($query, $prefix)
+ static function prefixQuery($query, $prefix)
{
$pattern = "/^(INSERT[\s]+INTO|CREATE[\s]+TABLE|ALTER[\s]+TABLE|UPDATE)(\s)+([`]?)([^`\s]+)\\3(\s)+/siU";
$pattern2 = "/^(DROP TABLE)(\s)+([`]?)([^`\s]+)\\3(\s)?$/siU";
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -59,6 +59,7 @@
$class = __CLASS__;
$instance = new $class();
}
+
return $instance;
}
@@ -66,12 +67,12 @@
* Load object handler
*
* @access public
- * @param object $ohandler reference to {@link XoopsPersistableObjectHandler}
- * @param string $name handler name
- * @param mixed $args args
+ * @param object $ohandler reference to {@link XoopsPersistableObjectHandler}
+ * @param string $name handler name
+ * @param mixed $args args
* @return object of handler
*/
- function loadHandler($ohander, $name, $args = null)
+ static function loadHandler($ohander, $name, $args = null)
{
static $handlers;
if (!isset($handlers[$name])) {
@@ -79,11 +80,12 @@
include_once $file;
$className = 'XoopsModel' . ucfirst($name);
$handler = new $className();
- } else if (xoops_load('model', 'framework')) {
+ } elseif (xoops_load('model', 'framework')) {
$handler = XoopsModel::loadHandler($name);
}
if (!is_object($handler)) {
trigger_error('Handler not found in file ' . __FILE__ . 'at line ' . __LINE__, E_USER_WARNING);
+
return null;
}
$handlers[$name] = $handler;
@@ -92,6 +94,7 @@
if (!empty($args) && is_array($args) && is_a($handlers[$name], 'XoopsModelAbstract')) {
$handlers[$name]->setVars($args);
}
+
return $handlers[$name];
}
}
@@ -148,8 +151,10 @@
{
if (is_object($handler) && is_a($handler, 'XoopsPersistableObjectHandler')) {
$this->handler =& $handler;
+
return true;
}
+
return false;
}
@@ -166,6 +171,7 @@
$this->$key = $value;
}
}
+
return true;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -22,7 +22,6 @@
$GLOBALS['xoopsLogger']->addDeprecated("'/class/module.errorhandler.php' is deprecated since XOOPS 2.5.4, please create your own error messages instead.");
-
/**
* Error Handler class
*
@@ -35,11 +34,11 @@
/**
* Show an error message
*
- * @param string $e_code Errorcode
- * @param integer $pages How many pages should the link take you back?
+ * @param string $e_code Errorcode
+ * @param integer $pages How many pages should the link take you back?
* @global $xoopsConfig
*/
- function show($e_code, $pages = 1)
+ static function show($e_code, $pages = 1)
{
global $xoopsConfig;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/utility/xoopsutility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/utility/xoopsutility.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/utility/xoopsutility.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -45,19 +45,20 @@
$this->__construct();
}
- /**
+ /**
* XoopsUtility::recursive()
*
* @param mixed $handler
* @param mixed $data
* @return
*/
- function recursive($handler, $data)
+ static function recursive($handler, $data)
{
if (is_array($data)) {
$return = array_map(array(
'XoopsUtility' ,
'recursive'), $handler, $data);
+
return $return;
}
// single function
@@ -70,6 +71,7 @@
$handler[0] ,
$handler[1]), $data);
}
+
return $data;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsblock.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsblock.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsblock.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -108,11 +108,13 @@
}
if (!$this->db->query($sql)) {
$this->setErrors("Could not save block data into database");
+
return false;
}
if (empty($bid)) {
$bid = $this->db->getInsertId();
}
+
return $bid;
}
@@ -131,6 +133,7 @@
$this->db->query($sql);
$sql = sprintf("DELETE FROM %s WHERE block_id = %u", $this->db->prefix('block_module_link'), $this->getVar('bid'));
$this->db->query($sql);
+
return true;
}
@@ -152,19 +155,22 @@
// T : use text sanitizater (smilies disabled)
if ($c_type == 'H') {
return str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
- } else if ($c_type == 'P') {
+ } elseif ($c_type == 'P') {
ob_start();
echo eval($this->getVar('content', 'n'));
$content = ob_get_contents();
ob_end_clean();
+
return str_replace('{X_SITEURL}', XOOPS_URL . '/', $content);
- } else if ($c_type == 'S') {
+ } elseif ($c_type == 'S') {
$myts =& MyTextSanitizer::getInstance();
$content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+
return $myts->displayTarea($content, 1, 1);
} else {
$myts =& MyTextSanitizer::getInstance();
$content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+
return $myts->displayTarea($content, 1, 0);
}
break;
@@ -210,13 +216,14 @@
} else {
return false;
}
- } else {
+ } else {
// it is a custom block, so just return the contents
$block['content'] = $this->getContent('s', $this->getVar('c_type'));
if (empty($block['content'])) {
return false;
}
}
+
return $block;
}
@@ -231,17 +238,18 @@
{
if ($position == 0) {
$ret = $contentdb . $content;
- } else if ($position == 1) {
+ } elseif ($position == 1) {
$ret = $content . $contentdb;
}
+
return $ret;
}
/**
* Enter description here...
*
- * @param string $originaltitle
- * @param string $newtitle
+ * @param string $originaltitle
+ * @param string $newtitle
* @return string title
*/
function buildTitle($originaltitle, $newtitle = '')
@@ -251,6 +259,7 @@
} else {
$ret = $originaltitle;
}
+
return $ret;
}
@@ -291,6 +300,7 @@
if (!$edit_form) {
return false;
}
+
return $edit_form;
} else {
return false;
@@ -314,7 +324,7 @@
* @param $orderby order of the blocks
* @returns array of block objects
*/
- function getAllBlocksByGroup($groupid, $asobject = true, $side = null, $visible = null, $orderby = "b.weight,b.bid", $isactive = 1)
+ static function getAllBlocksByGroup($groupid, $asobject = true, $side = null, $visible = null, $orderby = "b.weight,b.bid", $isactive = 1)
{
$db =& XoopsDatabaseFactory::getDatabaseConnection();
$ret = array();
@@ -328,7 +338,7 @@
$sql .= " AND (l.gperm_groupid=" . $groupid[0] . "";
$size = count($groupid);
if ($size > 1) {
- for($i = 1; $i < $size; $i ++) {
+ for ($i = 1; $i < $size; $i ++) {
$sql .= " OR l.gperm_groupid=" . $groupid[$i] . "";
}
}
@@ -364,16 +374,17 @@
array_push($added, $myrow['bid']);
}
}
+
return $ret;
}
/**
* XoopsBlock::getAllBlocks()
*
- * @param string $rettype
- * @param mixed $side
- * @param mixed $visible
- * @param string $orderby
+ * @param string $rettype
+ * @param mixed $side
+ * @param mixed $visible
+ * @param string $orderby
* @param integer $isactive
* @return
*/
@@ -434,7 +445,7 @@
* @param mixed $asobject
* @return
*/
- function getByModule($moduleid, $asobject = true)
+ static function getByModule($moduleid, $asobject = true)
{
$moduleid = intval($moduleid);
$db =& XoopsDatabaseFactory::getDatabaseConnection();
@@ -452,17 +463,18 @@
$ret[] = $myrow['bid'];
}
}
+
return $ret;
}
/**
* XoopsBlock::getAllByGroupModule()
*
- * @param mixed $groupid
+ * @param mixed $groupid
* @param integer $module_id
- * @param mixed $toponlyblock
- * @param mixed $visible
- * @param string $orderby
+ * @param mixed $toponlyblock
+ * @param mixed $visible
+ * @param string $orderby
* @param integer $isactive
* @return
*/
@@ -495,7 +507,7 @@
$sql .= ' AND b.visible=' . intval($visible);
}
if (!isset($module_id)) {
- } else if (!empty($module_id)) {
+ } elseif (!empty($module_id)) {
$sql .= ' AND m.module_id IN (0,' . intval($module_id);
if ($toponlyblock) {
$sql .= ',-1';
@@ -518,6 +530,7 @@
$ret[$myrow['bid']] = & $block;
unset($block);
}
+
return $ret;
}
@@ -525,9 +538,9 @@
* XoopsBlock::getNonGroupedBlocks()
*
* @param integer $module_id
- * @param mixed $toponlyblock
- * @param mixed $visible
- * @param string $orderby
+ * @param mixed $toponlyblock
+ * @param mixed $visible
+ * @param string $orderby
* @param integer $isactive
* @return
*/
@@ -557,7 +570,7 @@
$sql .= ' AND b.visible=' . intval($visible);
}
if (!isset($module_id)) {
- } else if (!empty($module_id)) {
+ } elseif (!empty($module_id)) {
$sql .= ' AND m.module_id IN (0,' . intval($module_id);
if ($toponlyblock) {
$sql .= ',-1';
@@ -579,6 +592,7 @@
unset($block);
}
}
+
return $ret;
}
@@ -609,6 +623,7 @@
return 0;
}
list ($count) = $db->fetchRow($result);
+
return $count;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopslocal.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopslocal.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopslocal.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -24,19 +24,20 @@
/**
* XoopsLocalAbstract::substr()
*
- * @param mixed $str
- * @param mixed $start
- * @param mixed $length
+ * @param mixed $str
+ * @param mixed $start
+ * @param mixed $length
* @param string $trimmarker
* @return
*/
- function substr($str, $start, $length, $trimmarker = '...')
+ static function substr($str, $start, $length, $trimmarker = '...')
{
if (! XOOPS_USE_MULTIBYTES) {
return (strlen($str) - $start <= $length) ? substr($str, $start, $length) : substr($str, $start, $length - strlen($trimmarker)) . $trimmarker;
}
if (function_exists('mb_internal_encoding') && @mb_internal_encoding(_CHARSET)) {
$str2 = mb_strcut($str, $start, $length - strlen($trimmarker));
+
return $str2 . (mb_strlen($str) != mb_strlen($str2) ? $trimmarker : '');
}
@@ -49,25 +50,26 @@
* @param mixed $text
* @return
*/
- function utf8_encode($text)
+ static function utf8_encode($text)
{
if (XOOPS_USE_MULTIBYTES == 1) {
if (function_exists('mb_convert_encoding')) {
return mb_convert_encoding($text, 'UTF-8', 'auto');
}
}
+
return utf8_encode($text);
}
/**
* XoopsLocalAbstract::convert_encoding()
*
- * @param mixed $text
+ * @param mixed $text
* @param string $to
* @param string $from
* @return
*/
- function convert_encoding($text, $to = 'utf-8', $from = '')
+ static function convert_encoding($text, $to = 'utf-8', $from = '')
{
if (empty($text)) {
return $text;
@@ -87,6 +89,7 @@
$converted_text = utf8_encode($text);
}
$text = empty($converted_text) ? $text : $converted_text;
+
return $text;
}
@@ -96,9 +99,10 @@
* @param mixed $text
* @return
*/
- function trim($text)
+ static function trim($text)
{
$ret = trim($text);
+
return $ret;
}
@@ -115,7 +119,7 @@
*
* Setting $timeoffset to null (by default) will skip timezone calculation for user, using default timezone instead, which is a MUST for cached contents
*/
- function formatTimestamp($time, $format = 'l', $timeoffset = null)
+ static function formatTimestamp($time, $format = 'l', $timeoffset = null)
{
global $xoopsConfig, $xoopsUser;
@@ -130,6 +134,7 @@
$TIME_ZONE = $prefix . date('Hi', $server_TZ);
}
$date = gmdate('D, d M Y H:i:s', intval($time)) . $TIME_ZONE;
+
return $date;
}
@@ -146,6 +151,7 @@
$num = $seconds > 1 ? sprintf(_SECONDS, $seconds) : _SECOND;
}
$ret = sprintf(_ELAPSE, $num);
+
return $ret;
}
// disable user timezone calculation and use default timezone,
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopslocal.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopslocal.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopslocal.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -24,7 +24,7 @@
*/
class XoopsLocalWrapper
{
- function load($language = null)
+ static function load($language = null)
{
if (class_exists('Xoopslocal')) {
return true;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -66,7 +66,7 @@
/**
* Load module info
*
- * @param string $dirname Directory Name
+ * @param string $dirname Directory Name
* @param boolean $verbose
*/
function loadInfoAsVar($dirname, $verbose = true)
@@ -119,9 +119,9 @@
/**
* Set module info
*
- * @param string $name
- * @param mix $value
- * @return bool
+ * @param string $name
+ * @param mix $value
+ * @return bool
**/
function setInfo($name, $value)
{
@@ -130,14 +130,15 @@
} else {
$this->modinfo[$name] = $value;
}
+
return true;
}
/**
* Get module info
*
- * @param string $name
- * @return array |string Array of module information.
+ * @param string $name
+ * @return array |string Array of module information.
* If {@link $name} is set, returns a single module information item as string.
*/
function &getInfo($name = null)
@@ -150,8 +151,10 @@
return $this->modinfo[$name];
}
$return = false;
+
return $return;
}
+
return $this->modinfo;
}
@@ -164,8 +167,10 @@
{
if ($this->getVar('hasmain') == 1) {
$ret = '<a href="' . XOOPS_URL . '/modules/' . $this->getVar('dirname') . '/">' . $this->getVar('name') . '</a>';
+
return $ret;
}
+
return false;
}
@@ -184,6 +189,7 @@
'url' => $submenu['url']);
}
}
+
return $ret;
}
@@ -209,6 +215,7 @@
if (!isset($this->adminmenu)) {
$this->loadAdminMenu();
}
+
return $this->adminmenu;
}
@@ -216,7 +223,7 @@
* Load the module info for this module
*
* @param string $dirname Module directory
- * @param bool $verbose Give an error on fail?
+ * @param bool $verbose Give an error on fail?
*/
function loadInfo($dirname, $verbose = true)
{
@@ -224,7 +231,7 @@
global $xoopsConfig;
if (file_exists($file = $GLOBALS['xoops']->path('modules/' . $dirname . '/language/' . $xoopsConfig['language'] . '/modinfo.php'))) {
include_once $file;
- } else if (file_exists($file = $GLOBALS['xoops']->path('modules/' . $dirname . '/language/english/modinfo.php'))) {
+ } elseif (file_exists($file = $GLOBALS['xoops']->path('modules/' . $dirname . '/language/english/modinfo.php'))) {
include_once $file;
}
@@ -232,22 +239,24 @@
if (false != $verbose) {
echo "Module File for $dirname Not Found!";
}
+
return false;
}
include $file;
$this->modinfo = $modversion;
+
return true;
}
/**
* Search contents within a module
*
- * @param string $term
- * @param string $andor 'AND' or 'OR'
- * @param integer $limit
- * @param integer $offset
- * @param integer $userid
- * @return mixed Search result.
+ * @param string $term
+ * @param string $andor 'AND' or 'OR'
+ * @param integer $limit
+ * @param integer $offset
+ * @param integer $userid
+ * @return mixed Search result.
*/
function search($term = '', $andor = 'AND', $limit = 0, $offset = 0, $userid = 0)
{
@@ -265,8 +274,10 @@
}
if (function_exists($search['func'])) {
$func = $search['func'];
+
return $func($term, $andor, $limit, $offset, $userid);
}
+
return false;
}
@@ -382,10 +393,11 @@
return $this->getVar('hasnotification', $format);
}
- function &getByDirName($dirname)
+ static function &getByDirName($dirname)
{
$modhandler =& xoops_gethandler('module');
$inst =& $modhandler->getByDirname($dirname);
+
return $inst;
}
@@ -397,96 +409,112 @@
function checkAccess()
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function loadLanguage($type = "main")
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function loadErrorMessages()
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function getCurrentPage()
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function install($admingroups = array(), $accessgroups = array())
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function update()
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function insert()
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function executeSQL()
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function insertTemplates()
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function gettemplate($template, $block = false)
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function insertBlocks()
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function insertConfigCategories()
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function insertConfig()
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function insertProfileFields()
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function executeScript($type, $state = 2)
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
function insertGroupPermissions($groups, $type)
{
trigger_error(__CLASS__ . "::" . __FUNCTION__ . ' is deprecated', E_USER_WARNING);
+
return false;
}
/**#@-*/
@@ -523,7 +551,7 @@
/**
* Create a new {@link XoopsModule} object
*
- * @param boolean $isNew Flag the new object as "new"
+ * @param boolean $isNew Flag the new object as "new"
* @return object
*/
function &create($isNew = true)
@@ -532,13 +560,14 @@
if ($isNew) {
$module->setNew();
}
+
return $module;
}
/**
* Load a module from the database
*
- * @param int $id ID of the module
+ * @param int $id ID of the module
* @return object FALSE on fail
*/
function &get($id)
@@ -562,17 +591,19 @@
$module->assignVars($myrow);
$_cachedModule_mid[$id] = &$module;
$_cachedModule_dirname[$module->getVar('dirname')] = &$module;
+
return $module;
}
}
}
+
return $module;
}
/**
* Load a module by its dirname
*
- * @param string $dirname
+ * @param string $dirname
* @return object FALSE on fail
*/
function &getByDirname($dirname)
@@ -600,6 +631,7 @@
$_cachedModule_dirname[$dirname] =& $module;
$_cachedModule_mid[$module->getVar('mid')] =& $module;
}
+
return $module;
}
}
@@ -647,6 +679,7 @@
if (!empty($this->_cachedModule_mid[$mid])) {
unset($this->_cachedModule_mid[$mid]);
}
+
return true;
}
@@ -709,14 +742,15 @@
if (!empty($this->_cachedModule_mid[$module->getVar('mid')])) {
unset($this->_cachedModule_mid[$module->getVar('mid')]);
}
+
return true;
}
/**
* Load some modules
*
- * @param object $criteria {@link CriteriaElement}
- * @param boolean $id_as_key Use the ID as key into the array
+ * @param object $criteria {@link CriteriaElement}
+ * @param boolean $id_as_key Use the ID as key into the array
* @return array
*/
function getObjects($criteria = null, $id_as_key = false)
@@ -744,13 +778,14 @@
}
unset($module);
}
+
return $ret;
}
/**
* Count some modules
*
- * @param object $criteria {@link CriteriaElement}
+ * @param object $criteria {@link CriteriaElement}
* @return int
*/
function getCount($criteria = null)
@@ -763,13 +798,14 @@
return 0;
}
list ($count) = $this->db->fetchRow($result);
+
return $count;
}
/**
* returns an array of module names
*
- * @param bool $criteria
+ * @param bool $criteria
* @param boolean $dirname_as_key if true, array keys will be module directory names
* if false, array keys will be module id
* @return array
@@ -785,6 +821,7 @@
$ret[$modules[$i]->getVar('dirname')] = $modules[$i]->getVar('name');
}
}
+
return $ret;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/user.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/user.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/user.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -121,7 +121,7 @@
* @param int $usereal switch for usename or realname
* @return string name of the user. name for 'anonymous' if not found.
*/
- function getUnameFromId($userid, $usereal = 0)
+ static function getUnameFromId($userid, $usereal = 0)
{
$userid = intval($userid);
$usereal = intval($usereal);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/cpanel.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/cpanel.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/cpanel.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -39,13 +39,14 @@
*
* @return unknown
*/
- function &getInstance()
+ static function &getInstance()
{
static $instance;
if (!isset($instance)) {
$class = __CLASS__;
$instance = new $class();
}
+
return $instance;
}
@@ -82,7 +83,7 @@
*
* @return unknown
*/
- function getGuis()
+ static function getGuis()
{
$guis = array();
xoops_load('XoopsLists');
@@ -97,6 +98,7 @@
}
}
}
+
return $guis;
}
@@ -104,7 +106,7 @@
* Flush the Xoops Admin Gui
*
*/
- function flush()
+ static function flush()
{
$guis = XoopsSystemCpanel::getGuis();
foreach ($guis as $gui) {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.class.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.class.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -610,7 +610,7 @@
}
if (headers_sent()) {
return $this->ErrorImage('OutputThumbnail() failed - headers already sent');
- exit;
+// exit;
}
$downloadfilename = phpthumb_functions::SanitizeFilename(is_string($this->sia) ? $this->sia : ($this->down ? $this->down : 'phpThumb_generated_thumbnail'.'.'.$this->thumbnailFormat));
@@ -1374,7 +1374,7 @@
// $UnAllowedParameters contains options that can only be processed in GD, not ImageMagick
// note: 'fltr' *may* need to be processed by GD, but we'll check that in more detail below
$UnAllowedParameters = array('xto', 'ar', 'bg', 'bc');
- // 'ra' may be part of this list, if not a multiple of 90\xB0
+ // 'ra' may be part of this list, if not a multiple of 90°
foreach ($UnAllowedParameters as $parameter) {
if (isset($this->$parameter)) {
$this->DebugMessage('$this->useRawIMoutput=false because "'.$parameter.'" is set', __FILE__, __LINE__);
@@ -3981,7 +3981,7 @@
return true;
}
- function ErrorImage($text, $width=0, $height=0, $forcedisplay=false)
+ static function ErrorImage($text, $width=0, $height=0, $forcedisplay=false)
{
$width = ($width ? $width : $this->config_error_image_width);
$height = ($height ? $height : $this->config_error_image_height);
@@ -4225,7 +4225,7 @@
return true;
}
- function phpThumb_tempnam()
+ static function phpThumb_tempnam()
{
$this->InitializeTempDirSetting();
$tempnam = realpath(tempnam($this->config_temp_directory, 'pThumb'));
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/ProtectorFilter.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/ProtectorFilter.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/ProtectorFilter.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -43,7 +43,7 @@
$this->filters_base = dirname(dirname(__FILE__)).'/filters_enabled' ;
}
- function &getInstance()
+ static function &getInstance()
{
static $instance ;
if ( ! isset( $instance ) ) {
|
|
From: <be...@us...> - 2013-09-14 07:32:56
|
Revision: 12037
http://sourceforge.net/p/xoops/svn/12037
Author: beckmi
Date: 2013-09-14 07:32:51 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
standardizing HTMLPurifier and TinyMCE for consistency
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/editor_registry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/settings.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.gif.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrCollections.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Background.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Border.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Color.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Composite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Filter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Font.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Ident.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Multiple.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Number.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Percentage.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/URI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Clone.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Enum.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Bool.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Color.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/ID.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Pixels.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Integer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Lang.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Switch.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/Email.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/Host.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/IPv4.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/IPv6.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Background.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/BdoDir.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/BgColor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/BoolToCSS.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Border.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/EnumToCSS.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/ImgRequired.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/ImgSpace.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Input.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Lang.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Name.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/NameSync.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Nofollow.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/SafeEmbed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/SafeObject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/SafeParam.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/ScriptRequired.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/TargetBlank.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Textarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTypes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrValidator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Bootstrap.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/CSSDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Chameleon.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Custom.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Empty.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/List.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Optional.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Required.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/StrictBlockquote.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Table.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Interchange.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Validator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ContentSets.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Context.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Definition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Decorator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Null.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Serializer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCacheFactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DoctypeRegistry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ElementDef.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Encoder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/EntityLookup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/EntityParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ErrorCollector.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ErrorStruct.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Filter/YouTube.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Filter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Bdo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Edit.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Forms.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Hypertext.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Iframe.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Legacy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/List.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Name.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Nofollow.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Object.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Presentation.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Proprietary.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Ruby.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/SafeEmbed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/SafeObject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/SafeScripting.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Scripting.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/StyleAttribute.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tables.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Target.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/TargetBlank.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/Name.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModuleManager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/IDAccumulator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/AutoParagraph.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/DisplayLinkURI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/Linkify.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/PurifierLinkify.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/RemoveEmpty.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/SafeObject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Language.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/LanguageFactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/DOMLex.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/DirectLex.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/PH5P.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/PercentEncoder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer/CSSDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer/ConfigForm.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer/HTMLDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/PropertyList.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/PropertyListIterator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/Composite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/Core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/MakeWellFormed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/RemoveForeignElements.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/ValidateAttributes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/StringHash.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/StringHashParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TagTransform/Font.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TagTransform/Simple.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TagTransform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/Comment.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/Tag.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/Text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TokenFactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/DisableExternal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/DisableExternalResources.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/DisableResources.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/HostBlacklist.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/MakeAbsolute.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/Munge.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/SafeIframe.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/data.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/ftp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/http.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/https.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/mailto.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/news.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/nntp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URISchemeRegistry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/UnitConverter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/VarParser/Flexible.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/VarParser/Native.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/VarParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.autoload.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.func.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.kses.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/editor_registry.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/editor_registry.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/editor_registry.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -19,4 +19,3 @@
"order" => 5,
"nohtml" => 0
);
-?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -33,12 +33,12 @@
/**
* Constructor
*
- * @param array $configs Editor Options
+ * @param array $configs Editor Options
*/
function __construct($configs)
{
$current_path = __FILE__;
- if ( DIRECTORY_SEPARATOR != "/" ) {
+ if (DIRECTORY_SEPARATOR != "/") {
$current_path = str_replace( strpos( $current_path, "\\\\", 2 ) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $current_path);
}
@@ -66,7 +66,7 @@
* I'VE USED THIS EXAMPLE TO WRITE VALIDATION CODE
* http://tinymce.moxiecode.com/punbb/viewtopic.php?id=12616
*
- * @return string
+ * @return string
*/
function renderValidationJS()
{
@@ -78,15 +78,17 @@
$ret = "\n";
$ret.= "if ( tinyMCE.get('{$eltname}').getContent() == \"\" || tinyMCE.get('{$eltname}').getContent() == null) ";
$ret.= "{ window.alert(\"{$eltmsg}\"); tinyMCE.get('{$eltname}').focus(); return false; }";
+
return $ret;
}
+
return '';
}
/**
* get language
*
- * @return string
+ * @return string
*/
function getLanguage()
{
@@ -97,7 +99,7 @@
$this->language = strtolower(constant("_XOOPS_EDITOR_TINYMCE_LANGUAGE"));
} else {
$this->language = str_replace('_', '-', strtolower(_LANGCODE));
- if(strtolower(_CHARSET) == "utf-8") {
+ if (strtolower(_CHARSET) == "utf-8") {
$this->language .= "_utf8";
}
}
@@ -117,7 +119,7 @@
/**
* prepare HTML for output
*
- * @return sting HTML
+ * @return sting HTML
*/
function render()
{
@@ -137,4 +139,3 @@
return is_readable(XOOPS_ROOT_PATH . $this->rootPath . "/tinymce.php");
}
}
-?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/settings.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/settings.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/settings.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -342,4 +342,3 @@
."|title]",
);
-?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -13,10 +13,9 @@
* @version $Id: xoopsemotions.php 8066 2011-11-06 05:09:33Z beckmi $
*/
-
// load mainfile.php - start
$current_path = dirname(__FILE__);
-if ( DIRECTORY_SEPARATOR != "/" ) {
+if (DIRECTORY_SEPARATOR != "/") {
$current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
}
$xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
@@ -49,7 +48,7 @@
$myts =& MyTextSanitizer::getInstance();
-if ( $admin && $op == 'SmilesAdd' ) {
+if ($admin && $op == 'SmilesAdd') {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($current_file, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
}
@@ -110,7 +109,7 @@
<body>
<?php
-if ( !$_SESSION['XoopsEmotions'] && !$admin) {
+if (!$_SESSION['XoopsEmotions'] && !$admin) {
echo "<div class='xoopsEmotions'>";
echo "<div>{#xoopsemotions_dlg.error_noemotions}</div>";
echo "</div>";
@@ -136,21 +135,21 @@
<div class="panel_wrapper">
<div id="emotionsbrowser_panel" class="panel current" style="overflow:auto;">
<?php
- if ( $smiles = $_SESSION['XoopsEmotions'] ) {
+ if ($smiles = $_SESSION['XoopsEmotions']) {
echo "<div><strong>" . _MSC_CLICKASMILIE . "</strong></div>";
echo "<div class='xoopsEmotions'>";
$count = count($smiles);
for ($i = 0; $i < $count; $i++) {
- if ( $op == '' ) {
- if ( $smiles[$i]['display'] ) {
+ if ($op == '') {
+ if ($smiles[$i]['display']) {
echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="' . XOOPS_UPLOAD_URL . '/' . $smiles[$i]['smile_url'] . '" alt="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" title="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" />';
}
} else {
echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="' . XOOPS_UPLOAD_URL . '/' . $smiles[$i]['smile_url'] . '" alt="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" title="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" />';
}
}
- if ( $op == '' ) {
+ if ($op == '') {
echo '<div class="xoopsEmotions">';
echo '<a class="xoopsEmotions" href="' . $current_file . '?op=' . _MORE . '">' . _MORE . '</a>';
echo '</div>';
@@ -195,4 +194,4 @@
</div>
</div>
-<?php xoops_footer(); ?>
\ No newline at end of file
+<?php xoops_footer();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -15,7 +15,7 @@
// load mainfile.php
$current_path = dirname(__FILE__);
-if ( DIRECTORY_SEPARATOR != "/" ) {
+if (DIRECTORY_SEPARATOR != "/") {
$current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
}
$xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
@@ -27,7 +27,7 @@
*/
$op = "list"; // default
if (isset($_POST)) {
- foreach ( $_POST as $k => $v ) {
+ foreach ($_POST as $k => $v) {
${$k} = $v;
}
}
@@ -39,7 +39,6 @@
xoops_loadLanguage("admin", "system");
xoops_loadLanguage("/admin/images", "system");
-
// include
xoops_load( "xoopsformloader" );
xoops_load( "xoopsmodule" );
@@ -63,7 +62,6 @@
$catreadcount = count($catreadlist); // count readable categories
$catwritecount = count($catwritelist); // count writable categories
-
// check/set parameters - start
if (!isset($_REQUEST["target"])) {
exit();
@@ -87,15 +85,13 @@
$imgcat_id = intval($_GET["imgcat_id"]);
}
-if(isset($imgcat_id)) {
+if (isset($imgcat_id)) {
$imgcat_id = intval($imgcat_id);
}
$target = htmlspecialchars($target);
-
if ( ($isadmin) || ($catreadcount > 0) || ($catwritecount > 0) ) {
-
// Save Image modification - start
if ( !empty($_POST["op"]) && $op == "save" ) {
if (!$GLOBALS["xoopsSecurity"]->check()) {
@@ -346,7 +342,6 @@
}
// Delete categorie - end
-
// ************************* NOT USED ************************************
// Confirm delete file - start
if ( !empty($_GET["op"]) && $op == "delfile" ) {
@@ -402,7 +397,7 @@
echo '<div class="tabs">';
echo '<ul>';
echo '<li id="imagebrowser_tab" class="current"><span><a href="javascript:mcTabs.displayTab(\'imagebrowser_tab\',\'imagebrowser_panel\');" onmousedown="return false;">';
-if ( $op == 'listimg' ) {
+if ($op == 'listimg') {
echo '{#xoopsimagebrowser_dlg.tab_listimages}';
} else {
echo '{#xoopsimagebrowser_dlg.tab_listcategories}';
@@ -411,7 +406,7 @@
if (!empty($catwritelist)) {
echo '<li id="loadimage_tab"><span><a href="javascript:mcTabs.displayTab(\'loadimage_tab\',\'loadimage_panel\');" onmousedown="return false;">{#xoopsimagebrowser_dlg.tab_loadimage}</a></span></li>';
}
-if ( $isadmin ) {
+if ($isadmin) {
echo '<li id="createcategory_tab"><span><a href="javascript:mcTabs.displayTab(\'createcategory_tab\',\'createcategory_panel\');" onmousedown="return false;">{#xoopsimagebrowser_dlg.tab_createcategory}</a></span></li>';
}
echo '</ul>';
@@ -503,7 +498,7 @@
echo '<td class="odd">'.$images[$i]->getVar('image_mimetype').'</td>';
echo '</tr>';
- if ( $catwritelist ) {
+ if ($catwritelist) {
echo '<tr>';
echo '<td class="head">'._IMAGECAT.'</td>';
echo '<td class="even">';
@@ -538,7 +533,7 @@
$nav = new XoopsPageNav($imgcount, 20, $start, 'start', 'op=listimg&target='.$target.'&imgcat_id='.$imgcat_id);
echo '<div text-align="right">'.$nav->renderNav().'</div>';
}
- if ( $catwritelist ) {
+ if ($catwritelist) {
echo '<input type="hidden" name="op" value="save" />'.$GLOBALS['xoopsSecurity']->getTokenHTML().'<input type="submit" name="submit" value="'._SUBMIT.'" />';
echo '</form>';
}
@@ -608,7 +603,7 @@
//create Image - end
//create Category - start
- if ( $isadmin ) {
+ if ($isadmin) {
echo '<div id="createcategory_panel" class="panel" style="overflow:auto;">';
$form = new XoopsThemeForm(_MD_ADDIMGCAT, 'imagecat_form', ''.$current_file.'?target='.$target.'', 'post', true);
$form->addElement(new XoopsFormText(_MD_IMGCATNAME, 'imgcat_name', 50, 255), true);
@@ -634,4 +629,3 @@
echo '</div>';
xoops_footer();
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -15,7 +15,7 @@
// load mainfile.php
$current_path = dirname(__FILE__);
-if ( DIRECTORY_SEPARATOR != "/" ) {
+if (DIRECTORY_SEPARATOR != "/") {
$current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
}
$xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
@@ -301,12 +301,13 @@
</html>
<?php
-function imageBrowser( $inputname = "src", $canbrowse = false ) {
+function imageBrowser( $inputname = "src", $canbrowse = false )
+{
$html = "";
- if ( $canbrowse ) {
+ if ($canbrowse) {
$html = "<img title=\"{#xoopsimagebrowser.desc}\" class=\"xoopsimagebrowser\" src=\"img/xoopsimagemanager.png\"
onclick=\"javascript:XoopsImageBrowser('" . $inputname . "');\" />\n";
}
+
return $html;
}
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -15,7 +15,7 @@
// load mainfile.php - start
$current_path = dirname(__FILE__);
-if ( DIRECTORY_SEPARATOR != "/" ) {
+if (DIRECTORY_SEPARATOR != "/") {
$current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
}
$xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
@@ -23,7 +23,8 @@
if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); }
// load mainfile.php - end
-function langDropdown() {
+function langDropdown()
+{
$content = '';
$time = time();
@@ -41,7 +42,7 @@
$content .= '<select name="mlanguages" id="mlanguages">';
$content .= '<option value="">{#xoopsmlcontent_dlg.sellang}</option>';
if ( is_array($lang_list)&&count( $lang_list ) > 0 ) {
- foreach( array_keys($lang_list) as $lang_name ) {
+ foreach ( array_keys($lang_list) as $lang_name ) {
$lang =& $lang_list[$lang_name];
$content .= '<option value="' . $lang['base']->getVar('lang_code') . '">' . $lang['base']->getVar('lang_name') . '</option>';
}
@@ -54,7 +55,7 @@
$content .= '<select name="mlanguages" id="mlanguages">';
$content .= '<option value="">{#xoopsmlcontent_dlg.sellang}</option>';
- foreach( $easiestml_langs as $l => $lang ) {
+ foreach ($easiestml_langs as $l => $lang) {
$content .= '<option value="'.$lang.'">'.$langnames[$l].'</option>' ;
}
$content .= '</select>';
@@ -114,7 +115,6 @@
</tr>
</table>
-
<div class="mceActionPanel floatright">
<input type="submit" id="insert" name="insert" value="{#insert}" onclick="XoopsmlcontentDialog.insertMLC();return false;"/>
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
@@ -123,4 +123,4 @@
</div>
</form>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -31,7 +31,6 @@
static $LastOfElementsTinymce="";
static $ListOfElementsTinymce=array();
-
// PHP 5 Constructor
function __construct($config)
{
@@ -39,7 +38,7 @@
$this->rootpath = $this->config["rootpath"] . "/tinymce/jscripts/tiny_mce";
$this->xoopsPlugins = $this->get_xoopsPlugins();
self::$LastOfElementsTinymce=$this->config["elements"];
- self::$ListOfElementsTinymce[]= self::$LastOfElementsTinymce;
+ self::$ListOfElementsTinymce[]= self::$LastOfElementsTinymce;
}
// PHP 4 Contructor
@@ -56,6 +55,7 @@
} else {
$instance->setConfig($config);
}
+
return $instance;
}
@@ -99,7 +99,7 @@
$this->setting["plugins"] = implode(",", $this->loadPlugins());
$configured[] = "plugins";
- if ( $this->setting["theme"] != "simple" ) {
+ if ($this->setting["theme"] != "simple") {
if (empty($this->config["buttons"])) {
$this->config["buttons"][] = array(
"before" => "",
@@ -168,11 +168,11 @@
$configured[] = "fonts";
}
- for ($i=1 ; $i <= 4 ; $i++ ) {
+ for ($i=1 ; $i <= 4 ; $i++) {
$buttons = array();
if ( isset($this->setting["theme_" . $this->setting["theme"] . "_buttons{$i}"]) ) {
$checklist = explode(",", $this->setting["theme_" . $this->setting["theme"] . "_buttons{$i}"] );
- foreach ( $checklist as $plugin ) {
+ foreach ($checklist as $plugin) {
if ( strpos( strtolower($plugin), "xoops") != false ) {
if ( in_array( $plugin, $this->xoopsPlugins ) ) {
$buttons[] = $plugin;
@@ -219,20 +219,23 @@
if (!empty($this->config["plugins"])) {
$plugins = array_merge($plugins, $this->config["plugins"]);
}
+
return $plugins;
}
// return all xoops plugins
- function get_xoopsPlugins() {
+ function get_xoopsPlugins()
+ {
$xoopsPlugins = array();
$allplugins = XoopsLists::getDirListAsArray( XOOPS_ROOT_PATH . $this->rootpath . "/plugins" );
- foreach ( $allplugins as $plugin ) {
+ foreach ($allplugins as $plugin) {
if ( strpos( strtolower($plugin), "xoops") != false && file_exists(XOOPS_ROOT_PATH . $this->config["rootpath"] . "/include/$plugin.php") ) {
- if ( $right = @include XOOPS_ROOT_PATH . $this->config["rootpath"] . "/include/$plugin.php" ) {
+ if ($right = @include XOOPS_ROOT_PATH . $this->config["rootpath"] . "/include/$plugin.php") {
$xoopsPlugins[$plugin] = $plugin;
}
}
}
+
return $xoopsPlugins;
}
@@ -251,10 +254,11 @@
// get all import css files
if ( preg_match_all("~\@import url\((.*\.css)\);~sUi", $css_content, $matches, PREG_PATTERN_ORDER) ) {
- foreach( $matches[1] as $key => $css_import ) {
+ foreach ($matches[1] as $key => $css_import) {
$css = array_merge( $css, $this->loadCss( $css_import) );
}
}
+
return $css;
}
@@ -263,23 +267,23 @@
static $isTinyMceJsLoaded = false;
$this->init();
- if (self::$LastOfElementsTinymce!=$this->setting["elements"]){
- $ret = "\n<!-- 'tiny_mce.js' SCRIPT NOT YET ".$this->setting["elements"]." -->\n"; //debug
- return $ret;
- }
- else {
- $this->setting["elements"]=implode(",",self::$ListOfElementsTinymce);
- }
+ if (self::$LastOfElementsTinymce!=$this->setting["elements"]) {
+ $ret = "\n<!-- 'tiny_mce.js' SCRIPT NOT YET ".$this->setting["elements"]." -->\n"; //debug
+
+ return $ret;
+ } else {
+ $this->setting["elements"]=implode(",",self::$ListOfElementsTinymce);
+ }
if ( !empty($this->setting["callback"]) ) {
$callback = $this->setting["callback"];
unset($this->setting["callback"]);
} else {
$callback = "";
- }
+ }
if ( !empty($this->setting["file_browser_callback"]) ) {
- $fbc_name=XOOPS_ROOT_PATH . "/class/xoopseditor/tinymce/include/".$this->setting["file_browser_callback"].".js";
- //suis passé la /lesrevespossibles/x244/class/xoopseditor/tinymce/tinymce/jscripts/include/openFinder.js
- $file_browser_callback ="MyXoopsUrl ='".XOOPS_URL."';\n";
+ $fbc_name=XOOPS_ROOT_PATH . "/class/xoopseditor/tinymce/include/".$this->setting["file_browser_callback"].".js";
+ //suis passé la /lesrevespossibles/x244/class/xoopseditor/tinymce/tinymce/jscripts/include/openFinder.js
+ $file_browser_callback ="MyXoopsUrl ='".XOOPS_URL."';\n";
$file_browser_callback .= file_get_contents($fbc_name);
$file_browser_callback .="\n//suis passé la ".$fbc_name;
//unset($this->setting["file_browser_callback"]);
@@ -298,24 +302,24 @@
// http://www.sixteensmallstones.org/ie-javascript-bugs-overriding-internet-explorers-documentgetelementbyid-to-be-w3c-compliant-exposes-an-additional-bug-in-getattributes
$ret =<<<EOF
<script language='javascript' type='text/javascript'>
- if (/msie/i.test (navigator.userAgent)) //only override IE
- {
+ if (/msie/i.test (navigator.userAgent)) { //only override IE
document.nativeGetElementById = document.getElementById;
document.getElementById = function(id) {
var elem = document.nativeGetElementById(id);
- if(elem) {
+ if (elem) {
//make sure that it is a valid match on id
- if(elem.attributes['id'].value == id) {
+ if (elem.attributes['id'].value == id) {
return elem;
} else {
//otherwise find the correct element
- for(var i=1;i<document.all[id].length;i++) {
- if(document.all[id][i].attributes['id'].value == id) {
+ for (var i=1;i<document.all[id].length;i++) {
+ if (document.all[id][i].attributes['id'].value == id) {
return document.all[id][i];
}
}
}
}
+
return null;
};
}
@@ -350,7 +354,7 @@
$ret .= "tinymceload: true\n";
$ret .= "});\n";
$ret .= $callback . "\n";
- $ret .= $file_browser_callback. "\n";
+ $ret .= $file_browser_callback. "\n";
//$ret .= "function toggleEditor(id) {tinyMCE.execCommand('mceToggleEditor',false, id);}\n";
$ret .= "</script>\n";
$ret .= "<!-- End TinyMce Rendering -->\n";//debug
@@ -358,4 +362,3 @@
return $ret ;
}
}
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.gif.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.gif.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.gif.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -292,9 +292,7 @@
$this->Stack[$this->sp] = $this->FirstCode;
$this->sp++;
$Code = $this->OldCode;
- }
-
- while ($Code >= $this->ClearCode) {
+ } while ($Code >= $this->ClearCode) {
$this->Stack[$this->sp] = $this->Vals[$Code];
$this->sp++;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrCollections.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrCollections.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrCollections.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -19,7 +19,8 @@
* @param $attr_types HTMLPurifier_AttrTypes instance
* @param $modules Hash array of HTMLPurifier_HTMLModule members
*/
- public function __construct($attr_types, $modules) {
+ public function __construct($attr_types, $modules)
+ {
// load extensions from the modules
foreach ($modules as $module) {
foreach ($module->attr_collections as $coll_i => $coll) {
@@ -51,7 +52,8 @@
* all inclusions specified by the zero index.
* @param &$attr Reference to attribute array
*/
- public function performInclusions(&$attr) {
+ public function performInclusions(&$attr)
+ {
if (!isset($attr[0])) return;
$merge = $attr[0];
$seen = array(); // recursion guard
@@ -79,8 +81,8 @@
* @param &$attr Reference to attribute array
* @param $attr_types HTMLPurifier_AttrTypes instance
*/
- public function expandIdentifiers(&$attr, $attr_types) {
-
+ public function expandIdentifiers(&$attr, $attr_types)
+ {
// because foreach will process new elements we add, make sure we
// skip duplicates
$processed = array();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -3,11 +3,13 @@
class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number
{
- public function __construct() {
+ public function __construct()
+ {
parent::__construct(false); // opacity is non-negative, but we will clamp it
}
- public function validate($number, $config, $context) {
+ public function validate($number, $config, $context)
+ {
$result = parent::validate($number, $config, $context);
if ($result === false) return $result;
$float = (float) $result;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Background.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Background.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Background.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -13,7 +13,8 @@
*/
protected $info;
- public function __construct($config) {
+ public function __construct($config)
+ {
$def = $config->getCSSDefinition();
$this->info['background-color'] = $def->info['background-color'];
$this->info['background-image'] = $def->info['background-image'];
@@ -22,8 +23,8 @@
$this->info['background-position'] = $def->info['background-position'];
}
- public function validate($string, $config, $context) {
-
+ public function validate($string, $config, $context)
+ {
// regular pre-processing
$string = $this->parseCDATA($string);
if ($string === '') return false;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -47,12 +47,14 @@
protected $length;
protected $percentage;
- public function __construct() {
+ public function __construct()
+ {
$this->length = new HTMLPurifier_AttrDef_CSS_Length();
$this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
}
- public function validate($string, $config, $context) {
+ public function validate($string, $config, $context)
+ {
$string = $this->parseCDATA($string);
$bits = explode(' ', $string);
@@ -116,8 +118,7 @@
elseif ($keywords['ch']) {
$ret[] = $keywords['ch'];
$keywords['cv'] = false; // prevent re-use: center = center center
- }
- elseif (count($measures)) $ret[] = array_shift($measures);
+ } elseif (count($measures)) $ret[] = array_shift($measures);
if ($keywords['v']) $ret[] = $keywords['v'];
elseif ($keywords['cv']) $ret[] = $keywords['cv'];
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Border.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Border.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Border.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -11,14 +11,16 @@
*/
protected $info = array();
- public function __construct($config) {
+ public function __construct($config)
+ {
$def = $config->getCSSDefinition();
$this->info['border-width'] = $def->info['border-width'];
$this->info['border-style'] = $def->info['border-style'];
$this->info['border-top-color'] = $def->info['border-top-color'];
}
- public function validate($string, $config, $context) {
+ public function validate($string, $config, $context)
+ {
$string = $this->parseCDATA($string);
$string = $this->mungeRgb($string);
$bits = explode(' ', $string);
@@ -35,6 +37,7 @@
}
}
}
+
return rtrim($ret);
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Color.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Color.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Color.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -6,8 +6,8 @@
class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
{
- public function validate($color, $config, $context) {
-
+ public function validate($color, $config, $context)
+ {
static $colors = null;
if ($colors === null) $colors = $config->get('Core.ColorKeywords');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Composite.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Composite.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Composite.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -21,15 +21,18 @@
/**
* @param $defs List of HTMLPurifier_AttrDef objects
*/
- public function __construct($defs) {
+ public function __construct($defs)
+ {
$this->defs = $defs;
}
- public function validate($string, $config, $context) {
+ public function validate($string, $config, $context)
+ {
foreach ($this->defs as $i => $def) {
$result = $this->defs[$i]->validate($string, $config, $context);
if ($result !== false) return $result;
}
+
return false;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -11,14 +11,16 @@
* @param $def Definition to wrap
* @param $element Element to deny
*/
- public function __construct($def, $element) {
+ public function __construct($def, $element)
+ {
$this->def = $def;
$this->element = $element;
}
/**
* Checks if CurrentToken is set and equal to $this->element
*/
- public function validate($string, $config, $context) {
+ public function validate($string, $config, $context)
+ {
$token = $context->get('CurrentToken', true);
if ($token && $token->name == $this->element) return false;
return $this->def->validate($string, $config, $context);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Filter.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Filter.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Filter.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -10,11 +10,13 @@
protected $intValidator;
- public function __construct() {
+ public function __construct()
+ {
$this->intValidator = new HTMLPurifier_AttrDef_Integer();
}
- public function validate($value, $config, $context) {
+ public function validate($value, $config, $context)
+ {
$value = $this->parseCDATA($value);
if ($value === 'none') return $value;
// if we looped this we could support multiple filters
@@ -46,6 +48,7 @@
}
$ret_parameters = implode(',', $ret_params);
$ret_function = "$function($ret_parameters)";
+
return $ret_function;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Font.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Font.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Font.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -16,7 +16,8 @@
*/
protected $info = array();
- public function __construct($config) {
+ public function __construct($config)
+ {
$def = $config->getCSSDefinition();
$this->info['font-style'] = $def->info['font-style'];
$this->info['font-variant'] = $def->info['font-variant'];
@@ -26,8 +27,8 @@
$this->info['font-family'] = $def->info['font-family'];
}
- public function validate($string, $config, $context) {
-
+ public function validate($string, $config, $context)
+ {
static $system_fonts = array(
'caption' => true,
'icon' => true,
@@ -125,6 +126,7 @@
$stage = 2;
break;
}
+
return false;
// attempting to catch font-family
@@ -138,9 +140,11 @@
// processing completed successfully
return rtrim($final);
}
+
return false;
}
}
+
return false;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/A...
[truncated message content] |
|
From: <be...@us...> - 2013-09-14 04:59:00
|
Revision: 12036
http://sourceforge.net/p/xoops/svn/12036
Author: beckmi
Date: 2013-09-14 04:58:55 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
standardizing braces
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha/recaptchalib.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.phpmailer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.pop3.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.smtp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.textsanitizer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Config_File.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.display_debug_console.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.rmdir.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_checkboxes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_options.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_radios.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_table.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.escape.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/snoopy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/rtsp/rtsp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wmp/wmp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/youtube/youtube.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tree.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xmlrpctag.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/saxparser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formbuttontray.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelementtray.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectuser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopstopic.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/imagemanager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.encoding.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.legacy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/makedata.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_pathsettings.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/block.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/comment.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configitem.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/misc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/banners/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/comments/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groups/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/cookie.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/group.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpThumb.config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpThumb.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.gif.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.ico.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/zetadigme/zetadigme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/readpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/extras/function.xoMemberInfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/viewpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/ProtectorFilter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/gtickets.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/protector.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/bruteforce_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/crawler_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/f5attack_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_deny_by_httpbl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_deny_by_rbl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4everyone.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4guest.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_need_multibyte.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_register_moratorium.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_register_insert_js_check.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_errorlog.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_redirection.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_bwlimit_errorlog.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_bwlimit_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/prepurge_exit_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/spamcheck_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_enabled/precommon_badip_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/include/install_extramodcheck.inc.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2013-09-14 04:49:34 UTC (rev 12035)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2013-09-14 04:58:55 UTC (rev 12036)
@@ -45,6 +45,7 @@
$infoArray['releasedate'] = $this->getReleaseDate();
$infoArray['methods'] = $this->getClassMethods();
}
+
return $infoArray;
}
@@ -59,6 +60,7 @@
*/
Include_once 'xoops_version.php';
$version = XOOPS_FRAMEWORKS_MODULEADMIN_VERSION;
+
return $version;
}
@@ -73,6 +75,7 @@
*/
Include_once 'xoops_version.php';
$releasedate = XOOPS_FRAMEWORKS_MODULEADMIN_RELEASEDATE;
+
return $releasedate;
}
@@ -84,6 +87,7 @@
function getClassMethods()
{
$myMethods = get_class_methods(__CLASS__);
+
return $myMethods;
}
@@ -92,14 +96,16 @@
//******************************************************************************************************************
// Loaf the language file.
//******************************************************************************************************************
- function loadLanguage() {
+ function loadLanguage()
+ {
$language = $GLOBALS['xoopsConfig']['language'];
- if ( !file_exists($fileinc = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/moduleadmin/language/{$language}/main.php" )){
- if ( !file_exists($fileinc = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/moduleadmin/language/english/main.php" )){
+ if ( !file_exists($fileinc = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/moduleadmin/language/{$language}/main.php" )) {
+ if ( !file_exists($fileinc = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/moduleadmin/language/english/main.php" )) {
return false;
}
}
$ret = include_once $fileinc;
+
return $ret;
}
//******************************************************************************************************************
@@ -114,7 +120,7 @@
$this->_obj->loadAdminMenu();
$ret = "<div class=\"rmmenuicon\">\n";
foreach (array_keys( $this->_obj->adminmenu) as $i) {
- if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php'){
+ if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php') {
$ret .= "<a href=\"../" . $this->_obj->adminmenu[$i]['link'] . "\" title=\"" . (isset($this->_obj->adminmenu[$i]['desc']) ? $this->_obj->adminmenu[$i]['desc'] : '') . "\">";
$ret .= "<img src=\"" . $path . $this->_obj->adminmenu[$i]['icon']. "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />";
$ret .= "<span>" . $this->_obj->adminmenu[$i]['title'] . "</span>";
@@ -122,7 +128,7 @@
}
}
if ($this->_obj->getInfo('help')) {
- if (substr(XOOPS_VERSION, 0, 9) >= 'XOOPS 2.5'){
+ if (substr(XOOPS_VERSION, 0, 9) >= 'XOOPS 2.5') {
$ret .= "<a href=\"" . $pathsystem . "help.php?mid=" . $this->_obj->getVar('mid', 's') . "&" . $this->_obj->getInfo('help') . "\" title=\"" . _AM_SYSTEM_HELP . "\">";
$ret .= "<img width=\"32px\" src=\"" . XOOPS_URL . "/Frameworks/moduleclasses/icons/32/help.png\" alt=\"" . _AM_SYSTEM_HELP . "\" /> ";
$ret .= "<span>" . _AM_SYSTEM_HELP . "</span>";
@@ -130,6 +136,7 @@
}
}
$ret .= "</div>\n<div style=\"clear: both;\"></div>\n";
+
return $ret;
}
//******************************************************************************************************************
@@ -140,8 +147,7 @@
function renderButton($position = "right", $delimeter = " ")
{
$path = XOOPS_URL . "/Frameworks/moduleclasses/icons/32/";
- switch ($position)
- {
+ switch ($position) {
default:
case "right":
$ret = "<div class=\"floatright\">\n";
@@ -163,6 +169,7 @@
}
$ret .= "</div>\n</div>\n";
$ret .= "<br /> <br /><br />";
+
return $ret;
}
@@ -173,6 +180,7 @@
$ret['icon'] = $icon . '.png';
$ret['extra'] = $extra;
$this -> _itemButton[] = $ret;
+
return true;
}
@@ -189,20 +197,19 @@
{
$line = "";
$path = XOOPS_URL . "/Frameworks/moduleclasses/icons/16/";
- switch ($type)
- {
+ switch ($type) {
default:
case "default":
$line .= "<span>" . $value . "</span>";
break;
case "folder":
- if (!is_dir($value)){
+ if (!is_dir($value)) {
$line .= "<span style='color : red; font-weight : bold;'>";
$line .= "<img src='" . $path . "off.png' >";
$line .= sprintf(_AM_MODULEADMIN_CONFIG_FOLDERKO, $value);
$line .= "</span>\n";
- }else{
+ } else {
$line .= "<span style='color : green;'>";
$line .= "<img src='" . $path . "on.png' >";
$line .= sprintf(_AM_MODULEADMIN_CONFIG_FOLDEROK, $value);
@@ -211,13 +218,13 @@
break;
case "chmod":
- if (is_dir($value[0])){
+ if (is_dir($value[0])) {
if (substr(decoct(fileperms($value[0])),2) != $value[1]) {
$line .= "<span style='color : red; font-weight : bold;'>";
$line .= "<img src='" . $path . "off.png' >";
$line .= sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])),2));
$line .= "</span>\n";
- }else{
+ } else {
$line .= "<span style='color : green;'>";
$line .= "<img src='" . $path . "on.png' >";
$line .= sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])),2));
@@ -227,6 +234,7 @@
break;
}
$this -> _itemConfigBoxLine[] = $line;
+
return true;
}
//******************************************************************************************************************
@@ -245,7 +253,7 @@
$ret .= "</td>\n";
$ret .= "</tr>\n";
// If you use a config label
- if ($this->_obj->getInfo('min_php') || $this->_obj->getInfo('min_xoops') || !empty($this -> _itemConfigBoxLine)){
+ if ($this->_obj->getInfo('min_php') || $this->_obj->getInfo('min_xoops') || !empty($this -> _itemConfigBoxLine)) {
$ret .= "<tr>\n";
$ret .= "<td colspan=\"2\">\n";
$ret .= "<fieldset><legend class=\"label\">";
@@ -254,10 +262,10 @@
// php version
$path = XOOPS_URL . "/Frameworks/moduleclasses/icons/16/";
- if ($this->_obj->getInfo('min_php')){
- if (phpversion() < $this->_obj->getInfo('min_php')){
+ if ($this->_obj->getInfo('min_php')) {
+ if (phpversion() < $this->_obj->getInfo('min_php')) {
$ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n";
- }else{
+ } else {
$ret .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n";
}
$ret .= "<br />";
@@ -282,10 +290,10 @@
$dbCurrentVersion = '0';
break;
}
- $currentVerParts = explode('.', (string)$dbCurrentVersion);
+ $currentVerParts = explode('.', (string) $dbCurrentVersion);
$iCurrentVerParts = array_map('intval', $currentVerParts);
$dbRequiredVersion = $dbarray[XOOPS_DB_TYPE];
- $reqVerParts = explode('.', (string)$dbRequiredVersion);
+ $reqVerParts = explode('.', (string) $dbRequiredVersion);
$iReqVerParts = array_map('intval', $reqVerParts);
$icount = $j = count($iReqVerParts);
$reqVer = $curVer = 0;
@@ -306,25 +314,25 @@
}
// xoops version
- if ($this->_obj->getInfo('min_xoops')){
- if (substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6) < $this->_obj->getInfo('min_xoops')){
+ if ($this->_obj->getInfo('min_xoops')) {
+ if (substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6) < $this->_obj->getInfo('min_xoops')) {
$ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n";
- }else{
+ } else {
$ret .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n";
}
$ret .= "<br />";
}
// ModuleAdmin version
- if ($this->_obj->getInfo('min_admin')){
- if ($this->getVersion() < $this->_obj->getInfo('min_admin')){
+ if ($this->_obj->getInfo('min_admin')) {
+ if ($this->getVersion() < $this->_obj->getInfo('min_admin')) {
$ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n";
- }else{
+ } else {
$ret .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n";
}
$ret .= "<br />";
}
- if (!empty($this -> _itemConfigBoxLine)){
+ if (!empty($this -> _itemConfigBoxLine)) {
foreach (array_keys( $this -> _itemConfigBoxLine) as $i) {
$ret .= $this -> _itemConfigBoxLine[$i];
$ret .= "<br />";
@@ -335,6 +343,7 @@
$ret .= "</tr>\n";
}
$ret .= "</table>\n";
+
return $ret;
}
//******************************************************************************************************************
@@ -346,6 +355,7 @@
{
$ret['title'] = $title;
$this -> _itemInfoBox[] = $ret;
+
return true;
}
//******************************************************************************************************************
@@ -362,8 +372,7 @@
{
$ret['label'] = $label;
$line = "";
- switch ($type)
- {
+ switch ($type) {
default:
case "default":
$line .= sprintf($text, "<span style='color : " . $color . "; font-weight : bold;'>" . $value . "</span>");
@@ -375,6 +384,7 @@
}
$ret['line'] = $line;
$this -> _itemInfoBoxLine[] = $ret;
+
return true;
}
function renderInfoBox()
@@ -385,7 +395,7 @@
$ret .= $this -> _itemInfoBox[$i]['title'];
$ret .= "</legend>\n";
foreach (array_keys( $this -> _itemInfoBoxLine) as $k) {
- if ($this -> _itemInfoBoxLine[$k]['label'] == $this -> _itemInfoBox[$i]['title']){
+ if ($this -> _itemInfoBoxLine[$k]['label'] == $this -> _itemInfoBox[$i]['title']) {
$ret .= $this -> _itemInfoBoxLine[$k]['line'];
$ret .= "<br />";
}
@@ -393,10 +403,10 @@
$ret .= "</fieldset>\n";
$ret .= "<br/>\n";
}
+
return $ret;
}
-
function renderAbout($paypal = '', $logo_xoops = true)
{
$path = XOOPS_URL . "/Frameworks/moduleclasses/icons/32/";
@@ -425,7 +435,7 @@
$ret .= $author[$i];
if (isset($nickname[$i]) && $nickname[$i] !='') {
$ret .= " (" . $nickname[$i] . "), ";
- }else{
+ } else {
$ret .= ", ";
}
}
@@ -437,7 +447,7 @@
$ret .= "<a href=\"http://" . $this->_obj->getInfo('website') . "\" target=\"_blank\" >" . $this->_obj->getInfo('website') . "</a>\n";
$ret .= "<br />\n";
$ret .= "<br />\n";
- if ($paypal != ''){
+ if ($paypal != '') {
$ret .= '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="' . $paypal . '">
@@ -457,16 +467,16 @@
$ret .= "</legend><br/>\n";
$ret .= "<div class=\"txtchangelog\">\n";
$language = $GLOBALS['xoopsConfig']['language'];
- if ( !is_file( XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/language/" . $language . "/changelog.txt" ) ){
+ if ( !is_file( XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/language/" . $language . "/changelog.txt" ) ) {
$language = 'english';
}
$language = empty($language) ? $GLOBALS['xoopsConfig']['language'] : $language;
$file = XOOPS_ROOT_PATH. "/modules/" . $this->_obj->getVar("dirname") . "/language/" . $language . "/changelog.txt";
- if ( is_readable( $file ) ){
+ if ( is_readable( $file ) ) {
$ret .= utf8_encode(implode("<br />", file( $file ))) . "\n";
- }else{
+ } else {
$file = XOOPS_ROOT_PATH. "/modules/" . $this->_obj->getVar("dirname") . "/docs/changelog.txt";
- if ( is_readable( $file ) ){
+ if ( is_readable( $file ) ) {
$ret .= utf8_encode(implode("<br />", file( $file ))) . "\n";
}
}
@@ -475,11 +485,12 @@
$ret .= "</td>\n";
$ret .= "</tr>\n";
$ret .= "</table>\n";
- if ($logo_xoops == true){
+ if ($logo_xoops == true) {
$ret .= "<div align=\"center\">";
$ret .= "<a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"" . $path . "xoopsmicrobutton.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a>";
$ret .= "</div>";
}
+
return $ret;
}
@@ -490,18 +501,19 @@
$path = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/";
$this->_obj->loadAdminMenu();
foreach (array_keys( $this->_obj->adminmenu) as $i) {
- if ($this->_obj->adminmenu[$i]['link'] == "admin/" . $menu){
+ if ($this->_obj->adminmenu[$i]['link'] == "admin/" . $menu) {
$navigation .= $this->_obj->adminmenu[$i]['title'] . " | ";
$ret = "<div class=\"CPbigTitle\" style=\"background-image: url(" . $path . $this->_obj->adminmenu[$i]['icon'] . "); background-repeat: no-repeat; background-position: left; padding-left: 50px;\">
<strong>" . $this->_obj->adminmenu[$i]['title'] . "</strong></div><br />";
- }else{
+ } else {
$navigation .= "<a href = '../" . $this->_obj->adminmenu[$i]['link'] . "'>" . $this->_obj->adminmenu[$i]['title'] . "</a> | ";
}
}
- if (substr(XOOPS_VERSION, 0, 9) < 'XOOPS 2.5'){
+ if (substr(XOOPS_VERSION, 0, 9) < 'XOOPS 2.5') {
$navigation .= "<a href = '../../system/admin.php?fct=preferences&op=showmod&mod=" . $this->_obj->getVar('mid') . "'>" . _MI_SYSTEM_ADMENU6 . "</a>";
$ret = $navigation . "<br /><br />" . $ret;
}
+
return $ret;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha/recaptchalib.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha/recaptchalib.php 2013-09-14 04:49:34 UTC (rev 12035)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha/recaptchalib.php 2013-09-14 04:58:55 UTC (rev 12036)
@@ -44,13 +44,15 @@
* @param $data - array of string elements to be encoded
* @return string - encoded request
*/
-function _recaptcha_qsencode ($data) {
+function _recaptcha_qsencode ($data)
+{
$req = "";
foreach ( $data as $key => $value )
$req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
// Cut the last '&'
$req=substr($req,0,strlen($req)-1);
+
return $req;
}
@@ -64,8 +66,8 @@
* @param int port
* @return array response
*/
-function _recaptcha_http_post($host, $path, $data, $port = 80) {
-
+function _recaptcha_http_post($host, $path, $data, $port = 80)
+{
$req = _recaptcha_qsencode ($data);
$http_request = "POST $path HTTP/1.0\r\n";
@@ -77,7 +79,7 @@
$http_request .= $req;
$response = '';
- if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+ if ( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
die ('Could not open socket');
}
@@ -105,11 +107,11 @@
*/
function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
{
- if ($pubkey == null || $pubkey == '') {
- die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
- }
+ if ($pubkey == null || $pubkey == '') {
+ die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+ }
- if ($use_ssl) {
+ if ($use_ssl) {
$server = RECAPTCHA_API_SECURE_SERVER;
} else {
$server = RECAPTCHA_API_SERVER;
@@ -119,27 +121,25 @@
if ($error) {
$errorpart = "&error=" . $error;
}
+
return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
- <noscript>
- <iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
- <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
- <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
- </noscript>';
+ <noscript>
+ <iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+ <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+ <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
+ </noscript>';
}
-
-
-
/**
* A ReCaptchaResponse is returned from recaptcha_check_answer()
*/
-class ReCaptchaResponse {
+class ReCaptchaResponse
+{
var $is_valid;
var $error;
}
-
/**
* Calls an HTTP POST function to verify if the user's guess was correct
* @param string $privkey
@@ -151,13 +151,13 @@
*/
function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
{
- if ($privkey == null || $privkey == '') {
- die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
- }
+ if ($privkey == null || $privkey == '') {
+ die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+ }
- if ($remoteip == null || $remoteip == '') {
- die ("For security reasons, you must pass the remote ip to reCAPTCHA");
- }
+ if ($remoteip == null || $remoteip == '') {
+ die ("For security reasons, you must pass the remote ip to reCAPTCHA");
+ }
@@ -166,6 +166,7 @@
$recaptcha_response = new ReCaptchaResponse();
$recaptcha_response->is_valid = false;
$recaptcha_response->error = 'incorrect-captcha-sol';
+
return $recaptcha_response;
}
@@ -183,11 +184,11 @@
if (trim ($answers [0]) == 'true') {
$recaptcha_response->is_valid = true;
- }
- else {
+ } else {
$recaptcha_response->is_valid = false;
$recaptcha_response->error = $answers [1];
}
+
return $recaptcha_response;
}
@@ -199,45 +200,52 @@
* @param string $domain The domain where the page is hosted
* @param string $appname The name of your application
*/
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
- return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
+function recaptcha_get_signup_url ($domain = null, $appname = null)
+{
+ return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
}
-function _recaptcha_aes_pad($val) {
- $block_size = 16;
- $numpad = $block_size - (strlen ($val) % $block_size);
- return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+function _recaptcha_aes_pad($val)
+{
+ $block_size = 16;
+ $numpad = $block_size - (strlen ($val) % $block_size);
+
+ return str_pad($val, strlen ($val) + $numpad, chr($numpad));
}
/* Mailhide related code */
-function _recaptcha_aes_encrypt($val,$ky) {
- if (! function_exists ("mcrypt_encrypt")) {
- die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
- }
- $mode=MCRYPT_MODE_CBC;
- $enc=MCRYPT_RIJNDAEL_128;
- $val=_recaptcha_aes_pad($val);
- return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+function _recaptcha_aes_encrypt($val,$ky)
+{
+ if (! function_exists ("mcrypt_encrypt")) {
+ die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
+ }
+ $mode=MCRYPT_MODE_CBC;
+ $enc=MCRYPT_RIJNDAEL_128;
+ $val=_recaptcha_aes_pad($val);
+
+ return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
}
-function _recaptcha_mailhide_urlbase64 ($x) {
- return strtr(base64_encode ($x), '+/', '-_');
+function _recaptcha_mailhide_urlbase64 ($x)
+{
+ return strtr(base64_encode ($x), '+/', '-_');
}
/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
-function recaptcha_mailhide_url($pubkey, $privkey, $email) {
- if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
- die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
- "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
- }
+function recaptcha_mailhide_url($pubkey, $privkey, $email)
+{
+ if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
+ die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
+ "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
+ }
- $ky = pack('H*', $privkey);
- $cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+ $ky = pack('H*', $privkey);
+ $cryptmail = _recaptcha_aes_encrypt ($email, $ky);
- return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+ return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
}
/**
@@ -245,17 +253,19 @@
* eg, given johndoe@example,com return ["john", "example.com"].
* the email is then displayed as jo...@ex...
*/
-function _recaptcha_mailhide_email_parts ($email) {
- $arr = preg_split("/@/", $email );
+function _recaptcha_mailhide_email_parts ($email)
+{
+ $arr = preg_split("/@/", $email );
- if (strlen ($arr[0]) <= 4) {
- $arr[0] = substr ($arr[0], 0, 1);
- } else if (strlen ($arr[0]) <= 6) {
- $arr[0] = substr ($arr[0], 0, 3);
- } else {
- $arr[0] = substr ($arr[0], 0, 4);
- }
- return $arr;
+ if (strlen ($arr[0]) <= 4) {
+ $arr[0] = substr ($arr[0], 0, 1);
+ } elseif (strlen ($arr[0]) <= 6) {
+ $arr[0] = substr ($arr[0], 0, 3);
+ } else {
+ $arr[0] = substr ($arr[0], 0, 4);
+ }
+
+ return $arr;
}
/**
@@ -264,11 +274,12 @@
*
* http://www.google.com/recaptcha/mailhide/apikey
*/
-function recaptcha_mailhide_html($pubkey, $privkey, $email) {
- $emailparts = _recaptcha_mailhide_email_parts ($email);
- $url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
+function recaptcha_mailhide_html($pubkey, $privkey, $email)
+{
+ $emailparts = _recaptcha_mailhide_email_parts ($email);
+ $url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
- return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
- "' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+ return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
+ "' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php 2013-09-14 04:49:34 UTC (rev 12035)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php 2013-09-14 04:58:55 UTC (rev 12036)
@@ -26,7 +26,8 @@
* @package kernel
* @subpackage database
*/
-class SqlUtility {
+class SqlUtility
+{
/**
* Function from phpMyAdmin (http://phpwizard.net/projects/phpMyAdmin/)
*
@@ -58,6 +59,7 @@
// substring to the returned array
if (!$i) {
$ret[] = $sql;
+
return true;
}
// Backquotes or no backslashes before
@@ -139,6 +141,7 @@
if (!empty($sql) && trim($sql) != '') {
$ret[] = $sql;
}
+
return true; // end for
}
@@ -156,8 +159,10 @@
if (preg_match($pattern, $query, $matches) || preg_match($pattern2, $query, $matches)) {
$replace = "\\1 " . $prefix . "_\\4\\5";
$matches[0] = preg_replace($pattern, $replace, $query);
+
return $matches;
}
+
return false;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php 2013-09-14 04:49:34 UTC (rev 12035)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php 2013-09-14 04:58:55 UTC (rev 12036)
@@ -124,7 +124,7 @@
if (empty($mode) || $mode == 'queries') {
$class = 'even';
$ret .= '<table id="xo-logger-queries" class="outer"><tr><th>' . _LOGGER_QUERIES . '</th></tr>';
- $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
+ $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
$pattern = '/\b' . preg_quote($xoopsDB->prefix()) . '\_/i';
foreach ($this->queries as $q) {
@@ -181,33 +181,37 @@
$ret .= <<<EOT
</div>
<script type="text/javascript">
- function xoLogCreateCookie(name,value,days) {
+ function xoLogCreateCookie(name,value,days)
+ {
if (days) {
var date = new Date();
date.setTime(date.getTime()+(days*24*60*60*1000));
var expires = "; expires="+date.toGMTString();
- }
- else var expires = "";
+ } else var expires = "";
document.cookie = name+"="+value+expires+"; path=/";
}
- function xoLogReadCookie(name) {
+ function xoLogReadCookie(name)
+ {
var nameEQ = name + "=";
var ca = document.cookie.split(';');
- for(var i=0;i < ca.length;i++) {
+ for (var i=0;i < ca.length;i++) {
var c = ca[i];
while (c.charAt(0)==' ') c = c.substring(1,c.length);
if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
}
+
return null;
}
- function xoLogEraseCookie(name) {
+ function xoLogEraseCookie(name)
+ {
createCookie(name,"",-1);
}
- function xoSetLoggerView( name ) {
+ function xoSetLoggerView( name )
+ {
var log = document.getElementById( "xo-logger-output" );
if ( !log ) return;
var i, elt;
- for ( i=0; i!=log.childNodes.length; i++ ) {
+ for (i=0; i!=log.childNodes.length; i++) {
elt = log.childNodes[i];
if ( elt.tagName && elt.tagName.toLowerCase() != 'script' && elt.id != "xo-logger-tabs" ) {
elt.style.display = ( !name || elt.id == "xo-logger-" + name ) ? "block" : "none";
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.phpmailer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.phpmailer.php 2013-09-14 04:49:34 UTC (rev 12035)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.phpmailer.php 2013-09-14 04:58:55 UTC (rev 12036)
@@ -37,8 +37,8 @@
if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
-class PHPMailer {
-
+class PHPMailer
+{
/////////////////////////////////////////////////
// PROPERTIES, PUBLIC
/////////////////////////////////////////////////
@@ -369,7 +369,8 @@
* Constructor
* @param boolean $exceptions Should we throw external exceptions?
*/
- public function __construct($exceptions = false) {
+ public function __construct($exceptions = false)
+ {
$this->exceptions = ($exceptions == true);
}
@@ -378,7 +379,8 @@
* @param bool $ishtml
* @return void
*/
- public function IsHTML($ishtml = true) {
+ public function IsHTML($ishtml = true)
+ {
if ($ishtml) {
$this->ContentType = 'text/html';
} else {
@@ -390,7 +392,8 @@
* Sets Mailer to send message using SMTP.
* @return void
*/
- public function IsSMTP() {
+ public function IsSMTP()
+ {
$this->Mailer = 'smtp';
}
@@ -398,7 +401,8 @@
* Sets Mailer to send message using PHP mail() function.
* @return void
*/
- public function IsMail() {
+ public function IsMail()
+ {
$this->Mailer = 'mail';
}
@@ -406,7 +410,8 @@
* Sets Mailer to send message using the $Sendmail program.
* @return void
*/
- public function IsSendmail() {
+ public function IsSendmail()
+ {
if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
$this->Sendmail = '/var/qmail/bin/sendmail';
}
@@ -417,7 +422,8 @@
* Sets Mailer to send message using the qmail MTA.
* @return void
*/
- public function IsQmail() {
+ public function IsQmail()
+ {
if (stristr(ini_get('sendmail_path'), 'qmail')) {
$this->Sendmail = '/var/qmail/bin/sendmail';
}
@@ -434,7 +440,8 @@
* @param string $name
* @return boolean true on success, false if address already used
*/
- public function AddAddress($address, $name = '') {
+ public function AddAddress($address, $name = '')
+ {
return $this->AddAnAddress('to', $address, $name);
}
@@ -445,7 +452,8 @@
* @param string $name
* @return boolean true on success, false if address already used
*/
- public function AddCC($address, $name = '') {
+ public function AddCC($address, $name = '')
+ {
return $this->AddAnAddress('cc', $address, $name);
}
@@ -456,7 +464,8 @@
* @param string $name
* @return boolean true on success, false if address already used
*/
- public function AddBCC($address, $name = '') {
+ public function AddBCC($address, $name = '')
+ {
return $this->AddAnAddress('bcc', $address, $name);
}
@@ -466,7 +475,8 @@
* @param string $name
* @return boolean
*/
- public function AddReplyTo($address, $name = '') {
+ public function AddReplyTo($address, $name = '')
+ {
return $this->AddAnAddress('Reply-To', $address, $name);
}
@@ -479,15 +489,17 @@
* @return boolean true on success, false if address already used or invalid in some way
* @access protected
*/
- protected function AddAnAddress($kind, $address, $name = '') {
+ protected function AddAnAddress($kind, $address, $name = '')
+ {
if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
$this->SetError($this->Lang('Invalid recipient array').': '.$kind);
if ($this->exceptions) {
throw new phpmailerException('Invalid recipient array: ' . $kind);
}
- if ($this->SMTPDebug) {
+ if ($this->SMTPDebug) {
echo $this->Lang('Invalid recipient array').': '.$kind;
}
+
return false;
}
$address = trim($address);
@@ -497,23 +509,27 @@
if ($this->exceptions) {
throw new phpmailerException($this->Lang('invalid_address').': '.$address);
}
- if ($this->SMTPDebug) {
+ if ($this->SMTPDebug) {
echo $this->Lang('invalid_address').': '.$address;
}
+
return false;
}
if ($kind != 'Reply-To') {
if (!isset($this->all_recipients[strtolower($address)])) {
array_push($this->$kind, array($address, $name));
$this->all_recipients[strtolower($address)] = true;
+
return true;
}
} else {
if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
$this->ReplyTo[strtolower($address)] = array($address, $name);
+
return true;
}
}
+
return false;
}
@@ -523,7 +539,8 @@
* @param string $name
* @return boolean
*/
- public function SetFrom($address, $name = '', $auto = 1) {
+ public function SetFrom($address, $name = '', $auto = 1)
+ {
$address = trim($address);
$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
if (!self::ValidateAddress($address)) {
@@ -531,9 +548,10 @@
if ($this->exceptions) {
throw new phpmailerException($this->Lang('invalid_address').': '.$address);
}
- if ($this->SMTPDebug) {
+ if ($this->SMTPDebug) {
echo $this->Lang('invalid_address').': '.$address;
}
+
return false;
}
$this->From = $address;
@@ -546,6 +564,7 @@
$this->Sender = $address;
}
}
+
return true;
}
@@ -560,9 +579,10 @@
* @static
* @access public
*/
- public static function ValidateAddress($address) {
+ public static function ValidateAddress($address)
+ {
if (function_exists('filter_var')) { //Introduced in PHP 5.2
- if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+ if (filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
return false;
} else {
return true;
@@ -582,29 +602,33 @@
* variable to view description of the error.
* @return bool
*/
- public function Send() {
+ public function Send()
+ {
try {
if(!$this->PreSend()) return false;
+
return $this->PostSend();
} catch (phpmailerException $e) {
- $this->SentMIMEMessage = '';
+ $this->SentMIMEMessage = '';
$this->SetError($e->getMessage());
if ($this->exceptions) {
throw $e;
}
+
return false;
}
}
- protected function PreSend() {
+ protected function PreSend()
+ {
try {
- $mailHeader = "";
+ $mailHeader = "";
if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
}
// Set whether the message is multipart/alternative
- if(!empty($this->AltBody)) {
+ if (!empty($this->AltBody)) {
$this->ContentType = 'multipart/alternative';
}
@@ -619,7 +643,7 @@
$this->MIMEBody = $this->CreateBody();
// To capture the complete message when using mail(), create
- // an extra header list which CreateHeader() doesn't fold in
+ // an extra header list which CreateHeader() doesn't fold in
if ($this->Mailer == 'mail') {
if (count($this->to) > 0) {
$mailHeader .= $this->AddrAppend("To", $this->to);
@@ -627,7 +651,7 @@
$mailHeader .= $this->HeaderLine("To", "undisclosed-recipients:;");
}
$mailHeader .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader(trim($this->Subject))));
- // if(count($this->cc) > 0) {
+ // if (count($this->cc) > 0) {
// $mailHeader .= $this->AddrAppend("Cc", $this->cc);
// }
}
@@ -639,6 +663,7 @@
}
$this->SentMIMEMessage = sprintf("%s%s\r\n\r\n%s",$this->MIMEHeader,$mailHeader,$this->MIMEBody);
+
return true;
} catch (phpmailerException $e) {
@@ -646,14 +671,16 @@
if ($this->exceptions) {
throw $e;
}
+
return false;
}
}
- protected function PostSend() {
+ protected function PostSend()
+ {
try {
// Choose the mailer and send through it
- switch($this->Mailer) {
+ switch ($this->Mailer) {
case 'sendmail':
return $this->SendmailSend($this->MIMEHeader, $this->MIMEBody);
case 'smtp':
@@ -669,9 +696,10 @@
if ($this->exceptions) {
throw $e;
}
- if ($this->SMTPDebug) {
+ if ($this->SMTPDebug) {
echo $e->getMessage()."\n";
}
+
return false;
}
}
@@ -683,7 +711,8 @@
* @access protected
* @return bool
*/
- protected function SendmailSend($header, $body) {
+ protected function SendmailSend($header, $body)
+ {
if ($this->Sender != '') {
$sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
} else {
@@ -691,7 +720,7 @@
}
if ($this->SingleTo === true) {
foreach ($this->SingleToArray as $key => $val) {
- if(!@$mail = popen($sendmail, 'w')) {
+ if (!@$mail = popen($sendmail, 'w')) {
throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
}
fputs($mail, "To: " . $val . "\n");
@@ -701,12 +730,12 @@
// implement call back function if it exists
$isSent = ($result == 0) ? 1 : 0;
$this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
- if($result != 0) {
+ if ($result != 0) {
throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
}
}
} else {
- if(!@$mail = popen($sendmail, 'w')) {
+ if (!@$mail = popen($sendmail, 'w')) {
throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
}
fputs($mail, $header);
@@ -715,10 +744,11 @@
// implement call back function if it exists
$isSent = ($result == 0) ? 1 : 0;
$this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body);
- if($result != 0) {
+ if ($result != 0) {
throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
}
}
+
return true;
}
@@ -729,9 +759,10 @@
* @access protected
* @return bool
*/
- protected function MailSend($header, $body) {
+ protected function MailSend($header, $body)
+ {
$toArr = array();
- foreach($this->to as $t) {
+ foreach ($this->to as $t) {
$toArr[] = $this->AddrFormat($t);
}
$to = implode(', ', $toArr);
@@ -775,9 +806,10 @@
if (isset($old_from)) {
ini_set('sendmail_from', $old_from);
}
- if(!$rt) {
+ if (!$rt) {
throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
}
+
return true;
}
@@ -790,20 +822,21 @@
* @access protected
* @return bool
*/
- protected function SmtpSend($header, $body) {
+ protected function SmtpSend($header, $body)
+ {
require_once $this->PluginDir . 'class.smtp.php';
$bad_rcpt = array();
- if(!$this->SmtpConnect()) {
+ if (!$this->SmtpConnect()) {
throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
}
$smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
- if(!$this->smtp->Mail($smtp_from)) {
+ if (!$this->smtp->Mail($smtp_from)) {
throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
}
// Attempt to send attach all recipients
- foreach($this->to as $to) {
+ foreach ($this->to as $to) {
if (!$this->smtp->Recipient($to[0])) {
$bad_rcpt[] = $to[0];
// implement call back function if it exists
@@ -815,7 +848,7 @@
$this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
}
}
- foreach($this->cc as $cc) {
+ foreach ($this->cc as $cc) {
if (!$this->smtp->Recipient($cc[0])) {
$bad_rcpt[] = $cc[0];
// implement call back function if it exists
@@ -827,7 +860,7 @@
$this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
}
}
- foreach($this->bcc as $bcc) {
+ foreach ($this->bcc as $bcc) {
if (!$this->smtp->Recipient($bcc[0])) {
$bad_rcpt[] = $bcc[0];
// implement call back function if it exists
@@ -845,12 +878,13 @@
$badaddresses = implode(', ', $bad_rcpt);
throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
}
- if(!$this->smtp->Data($header . $body)) {
+ if (!$this->smtp->Data($header . $body)) {
throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
}
- if($this->SMTPKeepAlive == true) {
+ if ($this->SMTPKeepAlive == true) {
$this->smtp->Reset();
}
+
return true;
}
@@ -861,8 +895,9 @@
* @access public
* @return bool
*/
- public function SmtpConnect() {
- if(is_null($this->smtp)) {
+ public function SmtpConnect()
+ {
+ if (is_null($this->smtp)) {
$this->smtp = new SMTP();
}
@@ -873,7 +908,7 @@
// Retry while there is no connection
try {
- while($index < count($hosts) && !$connection) {
+ while ($index < count($hosts) && !$connection) {
$hostinfo = array();
if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
$host = $hostinfo[1];
@@ -914,10 +949,11 @@
}
} catch (phpmailerException $e) {
$this->smtp->Reset();
- if ($this->exceptions) {
+ if ($this->exceptions) {
throw $e;
}
}
+
return true;
}
@@ -925,9 +961,10 @@
* Closes the active SMTP session if one exists.
* @return void
*/
- public function SmtpClose() {
- if(!is_null($this->smtp)) {
- if($this->smtp->Connected()) {
+ public function SmtpClose()
+ {
+ if (!is_null($this->smtp)) {
+ if ($this->smtp->Connected()) {
$this->smtp->Quit();
$this->smtp->Close();
}
@@ -941,7 +978,8 @@
* @param string $lang_path Path to the language file directory
* @access public
*/
- function SetLanguage($langcode = 'en', $lang_path = 'language/') {
+ function SetLanguage($langcode = 'en', $lang_path = 'language/')
+ {
//Define full set of translatable strings
$PHPMAILER_LANG = array(
'provide_address' => 'You must provide at least one recipient email address.',
@@ -968,6 +1006,7 @@
$l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
}
$this->language = $PHPMAILER_LANG;
+
return ($l == true); //Returns false if language not found
}
@@ -975,7 +1014,8 @@
* Return the current array of language strings
* @return array
*/
- public function GetTranslations() {
+ public function GetTranslations()
+ {
return $this->language;
}
@@ -988,7 +1028,8 @@
* @access public
* @return string
*/
- public function AddrAppend($type, $addr) {
+ public function AddrAppend($type, $addr)
+ {
$addr_str = $type . ': ';
$addresses = array();
foreach ($addr as $a) {
@@ -1005,7 +1046,8 @@
* @access public
* @return string
*/
- public function AddrFormat($addr) {
+ public function AddrFormat($addr)
+ {
if (empty($addr[1])) {
return $this->SecureHeader($addr[0]);
} else {
@@ -1023,7 +1065,8 @@
* @access public
* @return string
*/
- public function WrapText($message, $length, $qp_mode = false) {
+ public function WrapText($message, $length, $qp_mode = false)
+ {
$soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
// If utf-8 encoding is used, we will need to make sure we don't
// split multibyte characters when we wrap
@@ -1105,7 +1148,8 @@
* @param int $maxLength find last character boundary prior to this length
* @return int
*/
- public function UTF8CharBoundary($encodedText, $maxLength) {
+ public function UTF8CharBoundary($encodedText, $maxLength)
+ {
$foundSplitPos = false;
$lookBack = 3;
while (!$foundSplitPos) {
@@ -1134,6 +1178,7 @@
$foundSplitPos = true;
}
}
+
return $maxLength;
}
@@ -1143,12 +1188,13 @@
* @access public
* @return void
*/
- public function SetWordWrap() {
- if($this->WordWrap < 1) {
+ public function SetWordWrap()
+ {
+ if ($this->WordWrap < 1) {
return;
}
- switch($this->message_type) {
+ switch ($this->message_type) {
case 'alt':
case 'alt_inline':
case 'alt_attach':
@@ -1166,7 +1212,8 @@
* @access public
* @return string The assembled header
*/
- public function CreateHeader() {
+ public function CreateHeader()
+ {
$result = '';
// Set the boundaries
@@ -1176,26 +1223,26 @@
$this->boundary[3] = 'b3_' . $uniq_id;
$result .= $this->HeaderLine('Date', self::RFCDate());
- if($this->Sender == '') {
+ if ($this->Sender == '') {
$result .= $this->HeaderLine('Return-Path', trim($this->From));
} else {
$result .= $this->HeaderLine('Return-Path', trim($this->Sender));
}
// To be created automatically by mail()
- if($this->Mailer != 'mail') {
+ if ($this->Mailer != 'mail') {
if ($this->SingleTo === true) {
- foreach($this->to as $t) {
+ foreach ($this->to as $t) {
$this->SingleToArray[] = $this->AddrFormat($t);
}
} else {
- if(count($this->to) > 0) {
+ if (count($this->to) > 0) {
$result .= $this->AddrAppend('To', $this->to);
} elseif (count($this->cc) == 0) {
$result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
}
}
- }
+ }
$from = array();
$from[0][0] = trim($this->From);
@@ -1203,42 +1250,42 @@
$result .= $this->AddrAppend('From', $from);
// sendmail and mail() extract Cc from the header before sending
- if(count($this->cc) > 0) {
+ if (count($this->cc) > 0) {
$result .= $this->AddrAppend('Cc', $this->cc);
}
// sendmail and mail() extract Bcc from the header before sending
- if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
+ if ((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
$result .= $this->AddrAppend('Bcc', $this->bcc);
}
- if(count($this->ReplyTo) > 0) {
+ if (count($this->ReplyTo) > 0) {
$result .= $this->AddrAppend('Reply-To', $this->ReplyTo);
}
// mail() sets the subject itself
- if($this->Mailer != 'mail') {
+ if ($this->Mailer != 'mail') {
$result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
}
- if($this->MessageID != '') {
+ if ($this->MessageID != '') {
$result .= $this->HeaderLine('Message-ID', $this->MessageID);
} else {
$result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
}
$result .= $this->HeaderLine('X-Priority', $this->Priority);
- if($this->XMailer) {
+ if ($this->XMailer) {
$result .= $this->HeaderLine('X-Mailer', $this->XMailer);
} else {
$result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (http://code.google.com/a/apache-extras.org/p/phpmailer/)');
}
- if($this->ConfirmReadingTo != '') {
+ if ($this->ConfirmReadingTo != '') {
$result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
}
// Add custom headers
- for($index = 0; $index < count($this->CustomHeader); $index++) {
+ for ($index = 0; $index < count($this->CustomHeader); $index++) {
$result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
}
if (!$this->sign_key_file) {
@@ -1254,9 +1301,10 @@
* @access public
* @return string
*/
- public function GetMailMIME() {
+ public function GetMailMIME()
+ {
$result = '';
- switch($this->message_type) {
+ switch ($this->message_type) {
case 'plain':
$result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
$result .= $this->TextLine('Content-Type: '.$this->ContentType.'; charset="'.$this->CharSet.'"');
@@ -1279,7 +1327,7 @@
break;
}
- if($this->Mailer != 'mail') {
+ if ($this->Mailer != 'mail') {
$result .= $this->LE.$this->LE;
}
@@ -1291,17 +1339,18 @@
* @access public
* @return string
*/
- public function GetSentMIMEMessage() {
+ public function GetSentMIMEMessage()
+ {
return $this->SentMIMEMessage;
}
-
/**
* Assembles the message body. Returns an empty string on failure.
* @access public
* @return string The assembled message body
*/
- public function CreateBody() {
+ public function CreateBody()
+ {
$body = '';
if ($this->sign_key_file) {
@@ -1310,7 +1359,7 @@
$this->SetWordWrap();
- switch($this->message_type) {
+ switch ($this->message_type) {
case 'plain':
$body .= $this->EncodeString($this->Body, $this->Encoding);
break;
@@ -1432,15 +1481,16 @@
* @access protected
* @return string
*/
- protected function GetBoundary($boundary, $charSet, $contentType, $encoding) {
+ protected function GetBoundary($boundary, $charSet, $contentType, $encoding)
+ {
$re...
[truncated message content] |
|
From: <be...@us...> - 2013-09-14 04:49:40
|
Revision: 12035
http://sourceforge.net/p/xoops/svn/12035
Author: beckmi
Date: 2013-09-14 04:49:34 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
standardizing include statements
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image/scripts/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_moduleinstaller.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablescreate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablesfill.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_theme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/admin_header.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image/scripts/image.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image/scripts/image.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image/scripts/image.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -18,7 +18,7 @@
* @subpackage CAPTCHA
*/
-include "../../../../mainfile.php";
+include '../../../../mainfile.php';
error_reporting(0);
$xoopsLogger->activated = false;
@@ -86,6 +86,7 @@
}
}
$this->captcha_handler->setCode($this->code);
+
return true;
}
@@ -94,6 +95,7 @@
if ($this->invalid) {
header("Content-type: image/gif");
readfile(XOOPS_ROOT_PATH."/images/subject/icon2.gif");
+
return;
}
@@ -115,12 +117,13 @@
require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
$file_path = XOOPS_ROOT_PATH . "/class/captcha/image/{$name}";
$files = XoopsLists::getFileListAsArray($file_path);
- foreach( $files as $item ) {
+ foreach ($files as $item) {
if ( empty($extension) || preg_match("/(\.{$extension})$/i",$item) ) {
$items[] = $item;
}
}
XoopsCache::write("captcha_captcha_{$name}", $items);
+
return $items;
}
@@ -199,11 +202,11 @@
for ($i = 65; $i <= 90; $i++) {
$CharDetails = imageftbbox($FontSize, $Angle, $this->font, chr($i), array());
$_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]);
- if ($_MaxCharWidth > $MaxCharWidth ) {
+ if ($_MaxCharWidth > $MaxCharWidth) {
$MaxCharWidth = $_MaxCharWidth;
}
$_MaxCharHeight = abs($CharDetails[1] + $CharDetails[5]);
- if ($_MaxCharHeight > $MaxCharHeight ) {
+ if ($_MaxCharHeight > $MaxCharHeight) {
$MaxCharHeight = $_MaxCharHeight;
}
}
@@ -226,6 +229,7 @@
if ( $backgrounds = $this->getList("backgrounds", "(gif|jpg|png)") ) {
$RandBackground = XOOPS_ROOT_PATH . "/class/captcha/image/backgrounds/" . $backgrounds[array_rand($backgrounds)];
}
+
return $RandBackground;
}
@@ -236,7 +240,7 @@
{
if ( $RandImage = $this->loadBackground() ) {
$ImageType = @getimagesize($RandImage);
- switch ( @$ImageType[2] ) {
+ switch (@$ImageType[2]) {
case 1:
$BackgroundImage = imagecreatefromgif($RandImage);
break;
@@ -302,7 +306,7 @@
*/
function drawCircles()
{
- for($i = 1; $i <= $this->config["background_num"]; $i++) {
+ for ($i = 1; $i <= $this->config["background_num"]; $i++) {
$randomcolor = imagecolorallocate ($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
imagefilledellipse($this->oImage, mt_rand(0, $this->width - 10), mt_rand(0, $this->height - 3), mt_rand(10, 20), mt_rand(20, 30), $randomcolor);
}
@@ -352,7 +356,7 @@
*/
function drawEllipses()
{
- for ($i = 1; $i <= $this->config["background_num"]; $i++){
+ for ($i = 1; $i <= $this->config["background_num"]; $i++) {
$randomcolor = imagecolorallocate ($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
imageellipse($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
}
@@ -363,7 +367,7 @@
*/
function drawPolygons()
{
- for ($i = 1; $i <= $this->config["background_num"]; $i++){
+ for ($i = 1; $i <= $this->config["background_num"]; $i++) {
$randomcolor = imagecolorallocate ($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
$coords = array();
for ($j = 1; $j <= $this->config["polygon_point"]; $j++) {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsite.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsite.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsite.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -37,11 +37,11 @@
$pageHasHelp = true;
if (!@include_once "../modules/system/language/{$wizard->language}/admin.php") {
- include_once "../modules/system/language/english/admin.php";
+ include_once '../modules/system/language/english/admin.php';
}
if (!@include_once "../modules/system/language/{$wizard->language}/admin/preferences.php") {
- include_once "../modules/system/language/english/admin/preferences.php";
+ include_once '../modules/system/language/english/admin/preferences.php';
}
$config_handler = xoops_gethandler('config');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_moduleinstaller.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_moduleinstaller.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_moduleinstaller.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -21,10 +21,10 @@
defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
if (!@include_once "../language/{$wizard->language}/global.php") {
- include_once "../language/english/global.php";
+ include_once '../language/english/global.php';
}
if (!@include_once "../modules/system/language/{$wizard->language}/admin/modulesadmin.php") {
- include_once "../modules/system/language/english/admin/modulesadmin.php";
+ include_once '../modules/system/language/english/admin/modulesadmin.php';
}
require_once '../class/xoopsformloader.php';
require_once '../class/xoopslists.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablescreate.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablescreate.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablescreate.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -34,7 +34,7 @@
$vars =& $_SESSION['settings'];
-include_once "../mainfile.php";
+include_once '../mainfile.php';
include_once './class/dbmanager.php';
$dbm = new db_manager();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablesfill.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablesfill.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablesfill.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -34,7 +34,7 @@
$vars =& $_SESSION['settings'];
-include_once "../mainfile.php";
+include_once '../mainfile.php';
include_once './class/dbmanager.php';
$dbm = new db_manager();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_theme.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_theme.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_theme.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -41,7 +41,7 @@
$pageHasHelp = false;
if (!@include_once "../modules/system/language/{$wizard->language}/admin/preferences.php") {
- include_once "../modules/system/language/english/admin/preferences.php";
+ include_once '../modules/system/language/english/admin/preferences.php';
}
$config_handler = xoops_gethandler('config');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/header.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/header.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-require_once "../../../include/cp_header.php";
+require_once '../../../include/cp_header.php';
if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
include_once XOOPS_ROOT_PATH . '/class/template.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -100,7 +100,7 @@
break;
case "new":
- include_once('../include/forms.php');
+ include_once '../include/forms.php';
$obj =& $profilefield_handler->create();
$form = profile_getFieldForm($obj);
$form->display();
@@ -111,7 +111,7 @@
if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
redirect_header('field.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
}
- include_once('../include/forms.php');
+ include_once '../include/forms.php';
$form = profile_getFieldForm($obj);
$form->display();
break;
@@ -191,7 +191,7 @@
if (!empty($_REQUEST['addOption'])) {
foreach ($_REQUEST['addOption'] as $option) {
- if (empty($option['value'])) continue;
+ if (empty($option['value'])) continue;
$options[$option['key']] = $option['value'];
$redirect_to_edit = true;
}
@@ -278,7 +278,7 @@
$url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
redirect_header($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD));
}
- include_once('../include/forms.php');
+ include_once '../include/forms.php';
echo $obj->getHtmlErrors();
$form = profile_getFieldForm($obj);
$form->display();
@@ -331,5 +331,4 @@
}
}
-
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -3,7 +3,7 @@
* Extended User Profile
*
* 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
+ * 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
@@ -22,13 +22,13 @@
$indexAdmin = new ModuleAdmin();
$indexAdmin->addItemButton(_ADD . ' ' . _PROFILE_AM_STEP, 'step.php?op=new', 'add', '');
-echo $indexAdmin->addNavigation('step.php');
+echo $indexAdmin->addNavigation('step.php');
echo $indexAdmin->renderButton('right', '');
$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['id']) ? "edit" : 'list');
$handler =& xoops_getmodulehandler('regstep');
-switch ($op ) {
+switch ($op) {
case "list":
$GLOBALS['xoopsTpl']->assign('steps', $handler->getObjects(null, true, false) );
$template_main = "profile_admin_steplist.html";
@@ -36,14 +36,14 @@
case "new":
$obj =& $handler->create();
- include_once "../include/forms.php";
+ include_once '../include/forms.php';
$form = profile_getStepForm($obj);;
$form->display();
break;
case "edit":
$obj =& $handler->get($_REQUEST['id']);
- include_once "../include/forms.php";
+ include_once '../include/forms.php';
$form = profile_getStepForm($obj);;
$form->display();
break;
@@ -79,7 +79,6 @@
}
break;
-
case 'toggle':
if (isset($_GET['step_id'])) {
$field_id=intval($_GET['step_id']);
@@ -103,9 +102,9 @@
$obj->setVar('step_save', $step_save);
if ($handler->insert($obj,true)) {
redirect_header('step.php', 1, _PROFILE_AM_SAVESTEP_TOGGLE_SUCCESS);
- }else {
+ } else {
redirect_header('step.php', 1, _PROFILE_AM_SAVESTEP_TOGGLE_FAILED);
}
}
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -27,90 +27,90 @@
$GLOBALS['xoopsLogger']->activated = false;
if ( file_exists("./../../language/".$xoopsConfig['language']."/admin/tplsets.php") ) {
- include_once("./../../language/".$xoopsConfig['language']."/admin/tplsets.php");
+ include_once './../../language/'.$xoopsConfig['language']."/admin/tplsets.php");
} else {
- include_once("./../../language/english/admin/tplsets.php");
+ include_once './../../language/english/admin/tplsets.php';
}
if (isset($_REQUEST["op"])) {
- $op = $_REQUEST["op"];
+ $op = $_REQUEST["op"];
} else {
- @$op = "default";
+ @$op = "default";
}
$GLOBALS['xoopsLogger']->usePopup = true;
switch ($op) {
- // Display tree folder
- case "tpls_display_folder":
- $_REQUEST['dir'] = urldecode($_REQUEST['dir']);
- $root = XOOPS_THEME_PATH;
- if( file_exists($root . $_REQUEST['dir']) ) {
- $files = scandir($root . $_REQUEST['dir']);
- natcasesort($files);
- if( count($files) > 2 ) { /* The 2 accounts for . and .. */
- echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
- // All dirs
- foreach( $files as $file ) {
+ // Display tree folder
+ case "tpls_display_folder":
+ $_REQUEST['dir'] = urldecode($_REQUEST['dir']);
+ $root = XOOPS_THEME_PATH;
+ if ( file_exists($root . $_REQUEST['dir']) ) {
+ $files = scandir($root . $_REQUEST['dir']);
+ natcasesort($files);
+ if ( count($files) > 2 ) { /* The 2 accounts for . and .. */
+ echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
+ // All dirs
+ foreach ($files as $file) {
- if( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && is_dir($root . $_REQUEST['dir'] . $file) ) {
- //retirer .svn
- $file_no_valid = array('.svn', 'icons', 'img', 'images', 'language');
+ if ( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && is_dir($root . $_REQUEST['dir'] . $file) ) {
+ //retirer .svn
+ $file_no_valid = array('.svn', 'icons', 'img', 'images', 'language');
- if(!in_array($file, $file_no_valid))
- {
- echo "<li class=\"directory collapsed\"><a href=\"#\" rel=\"" . htmlentities($_REQUEST['dir'] . $file) . "/\">" . htmlentities($file) . "</a></li>";
- }
- }
- }
- // All files
- foreach( $files as $file )
- {
- if( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && !is_dir($root . $_REQUEST['dir'] . $file) && $file != 'index.html' ) {
- $ext = preg_replace('/^.*\./', '', $file);
+ if(!in_array($file, $file_no_valid))
+ {
+ echo "<li class=\"directory collapsed\"><a href=\"#\" rel=\"" . htmlentities($_REQUEST['dir'] . $file) . "/\">" . htmlentities($file) . "</a></li>";
+ }
+ }
+ }
+ // All files
+ foreach( $files as $file )
+ {
+ if ( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && !is_dir($root . $_REQUEST['dir'] . $file) && $file != 'index.html' ) {
+ $ext = preg_replace('/^.*\./', '', $file);
- $extensions = array('.html', '.htm', '.css');
- $extension_verif = strrchr($file, '.');
+ $extensions = array('.html', '.htm', '.css');
+ $extension_verif = strrchr($file, '.');
- if(in_array($extension_verif, $extensions)) {
- echo "<li class=\"file ext_$ext\"><a href=\"#\" onclick=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\" rel=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\">" . htmlentities($file) . "</a></li>";
- } else {
- //echo "<li class=\"file ext_$ext\">" . htmlentities($file) . "</li>";
- }
+ if (in_array($extension_verif, $extensions)) {
+ echo "<li class=\"file ext_$ext\"><a href=\"#\" onclick=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\" rel=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\">" . htmlentities($file) . "</a></li>";
+ } else {
+ //echo "<li class=\"file ext_$ext\">" . htmlentities($file) . "</li>";
+ }
- }
- }
- echo "</ul>";
- }
- }
- break;
+ }
+ }
+ echo "</ul>";
+ }
+ }
+ break;
// Edit File
- case 'tpls_edit_file':
- $path_file = realpath(XOOPS_ROOT_PATH.'/themes'.trim($_REQUEST['path_file']));
+ case 'tpls_edit_file':
+ $path_file = realpath(XOOPS_ROOT_PATH.'/themes'.trim($_REQUEST['path_file']));
$path_file = str_replace('\\','/',$path_file);
- //Button restore
- if(file_exists($path_file.'.back')){
- $restore = '<button class="ui-corner-all tooltip" type="button" onclick="tpls_restore(\''.$path_file.'\')" value="'._AM_SYSTEM_TEMPLATES_RESTORE.'" title="'._AM_SYSTEM_TEMPLATES_RESTORE.'">
+ //Button restore
+ if (file_exists($path_file.'.back')) {
+ $restore = '<button class="ui-corner-all tooltip" type="button" onclick="tpls_restore(\''.$path_file.'\')" value="'._AM_SYSTEM_TEMPLATES_RESTORE.'" title="'._AM_SYSTEM_TEMPLATES_RESTORE.'">
<img src="'.system_AdminIcons('revert.png').'" alt="'._AM_SYSTEM_TEMPLATES_RESTORE.'" />
</button>';
- }else{
- $restore = '';
- }
- xoops_load('XoopsFile');
+ } else {
+ $restore = '';
+ }
+ xoops_load('XoopsFile');
XoopsFile::load('file');
- $file = XoopsFile::getHandler('file', $path_file);
- $content = $file->read();
- if(empty($content)) {
- echo _AM_SYSTEM_TEMPLATES_EMPTY_FILE;
- }
- $ext = preg_replace('/^.*\./', '', $_REQUEST['path_file']);
+ $file = XoopsFile::getHandler('file', $path_file);
+ $content = $file->read();
+ if (empty($content)) {
+ echo _AM_SYSTEM_TEMPLATES_EMPTY_FILE;
+ }
+ $ext = preg_replace('/^.*\./', '', $_REQUEST['path_file']);
- echo '<form name="back" action="admin.php?fct=tplsets&op=tpls_save" method="POST">
- <table border="0">
- <tr>
- <td>
+ echo '<form name="back" action="admin.php?fct=tplsets&op=tpls_save" method="POST">
+ <table border="0">
+ <tr>
+ <td>
<div class="xo-btn-actions">
<div class="xo-buttons">
<button class="ui-corner-all tooltip" type="submit" value="'._AM_SYSTEM_TEMPLATES_SAVE.'" title="'._AM_SYSTEM_TEMPLATES_SAVE.'">
@@ -124,37 +124,37 @@
</div>
</div>
</td>
- </tr>
- <tr>
- <td><textarea id="code_mirror" name="templates" rows=24 cols=110>'.$content.'</textarea></td>
- </tr>
- </table>';
- echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>';
- break;
+ </tr>
+ <tr>
+ <td><textarea id="code_mirror" name="templates" rows=24 cols=110>'.$content.'</textarea></td>
+ </tr>
+ </table>';
+ echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>';
+ break;
- // Restore backup file
- case 'tpls_restore':
+ // Restore backup file
+ case 'tpls_restore':
$extensions = array('.html', '.htm', '.css');
//check if the file is inside themes directory
$valid_dir = stristr(realpath($_REQUEST['path_file']), realpath(XOOPS_ROOT_PATH . '/themes'));
- $old_file = $_REQUEST['path_file'].'.back';
- $new_file = $_REQUEST['path_file'];
+ $old_file = $_REQUEST['path_file'].'.back';
+ $new_file = $_REQUEST['path_file'];
$extension_verif = strrchr($new_file, '.');
- if($valid_dir && in_array($extension_verif, $extensions) && file_exists($old_file) && file_exists($new_file) )
- {
- if(unlink($new_file))
- {
- if(rename($old_file, $new_file))
- {
- xoops_result(_AM_SYSTEM_TEMPLATES_RESTORE_OK);
- exit();
- }
- }
- }
- xoops_error(_AM_SYSTEM_TEMPLATES_RESTORE_NOTOK);
+ if($valid_dir && in_array($extension_verif, $extensions) && file_exists($old_file) && file_exists($new_file) )
+ {
+ if(unlink($new_file))
+ {
+ if(rename($old_file, $new_file))
+ {
+ xoops_result(_AM_SYSTEM_TEMPLATES_RESTORE_OK);
+ exit();
+ }
+ }
+ }
+ xoops_error(_AM_SYSTEM_TEMPLATES_RESTORE_NOTOK);
break;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-require('../../../../mainfile.php');
+require '../../../../mainfile.php';
require(XOOPS_ROOT_PATH.'/header.php');
if (!defined('XOOPS_ROOT_PATH')) { die('Error'); }
@@ -25,52 +25,52 @@
if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );
if (isset($_REQUEST["op"])) {
- $op = $_REQUEST["op"];
+ $op = $_REQUEST["op"];
} else {
- @$op = "default";
+ @$op = "default";
}
switch ($op) {
- // Display post
- case 'display_post':
- global $xoopsDB;
+ // Display post
+ case 'display_post':
+ global $xoopsDB;
$GLOBALS['xoopsLogger']->activated = false;
- include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
- include_once XOOPS_ROOT_PATH . '/kernel/module.php';
+ include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
+ include_once XOOPS_ROOT_PATH . '/kernel/module.php';
include_once XOOPS_ROOT_PATH . '/modules/system/include/functions.php';
- $tables = array();
- // Count comments (approved only: com_status == XOOPS_COMMENT_ACTIVE)
- $tables[] = array ('table_name' => 'xoopscomments', 'uid_column' => 'com_uid', 'criteria' => new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
- // Count forum posts
- if (XoopsModule::getByDirname("newbb")) {
- $tables[] = array ('table_name' => 'bb_posts', 'uid_column' => 'uid');
- }
- $uid = system_CleanVars($_REQUEST, 'uid', int);
- $total_posts = 0;
- foreach ($tables as $table)
- {
- $criteria = new CriteriaCompo();
- $criteria->add (new Criteria($table['uid_column'], $uid ));
- if (!empty($table['criteria'])) {
- $criteria->add ($table['criteria']);
- }
- $sql = "SELECT COUNT(*) AS total FROM ".$xoopsDB->prefix($table['table_name']) . ' ' . $criteria->renderWhere();
- if ( $result = $xoopsDB->query($sql) ) {
- if ($row = $xoopsDB->fetchArray($result)) {
- $total_posts = $total_posts + $row['total'];
- }
- }
- }
+ $tables = array();
+ // Count comments (approved only: com_status == XOOPS_COMMENT_ACTIVE)
+ $tables[] = array ('table_name' => 'xoopscomments', 'uid_column' => 'com_uid', 'criteria' => new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+ // Count forum posts
+ if (XoopsModule::getByDirname("newbb")) {
+ $tables[] = array ('table_name' => 'bb_posts', 'uid_column' => 'uid');
+ }
+ $uid = system_CleanVars($_REQUEST, 'uid', int);
+ $total_posts = 0;
+ foreach ($tables as $table)
+ {
+ $criteria = new CriteriaCompo();
+ $criteria->add (new Criteria($table['uid_column'], $uid ));
+ if (!empty($table['criteria'])) {
+ $criteria->add ($table['criteria']);
+ }
+ $sql = "SELECT COUNT(*) AS total FROM ".$xoopsDB->prefix($table['table_name']) . ' ' . $criteria->renderWhere();
+ if ( $result = $xoopsDB->query($sql) ) {
+ if ($row = $xoopsDB->fetchArray($result)) {
+ $total_posts = $total_posts + $row['total'];
+ }
+ }
+ }
- $sql = "UPDATE ".$xoopsDB->prefix("users")." SET posts = '".$total_posts."' WHERE uid = '".$uid."'";
- if ( !$result = $xoopsDB->queryF($sql) ) {
- redirect_header("admin.php?fct=users",1,_AM_SYSTEM_USERS_CNUUSER);
- } else {
- echo $total_posts;
- }
- break;
+ $sql = "UPDATE ".$xoopsDB->prefix("users")." SET posts = '".$total_posts."' WHERE uid = '".$uid."'";
+ if ( !$result = $xoopsDB->queryF($sql) ) {
+ redirect_header("admin.php?fct=users",1,_AM_SYSTEM_USERS_CNUUSER);
+ } else {
+ echo $total_posts;
+ }
+ break;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/admin_header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/admin_header.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/admin_header.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -17,30 +17,27 @@
* @version $Id$
*/
-
//include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
include_once XOOPS_ROOT_PATH.'/mainfile.php';
//include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include("../../../include/cp_header.php");
+include '../../../include/cp_header.php';
//require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/include/functions.php';
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))) {
include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
//return true;
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+ } else {
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
//return false;
}
$myts =& MyTextSanitizer::getInstance();
-
+
$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
$pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
$pathIcon32 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
-
-
if ($xoopsUser) {
$moduleperm_handler =& xoops_gethandler('groupperm');
if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar('mid'), $xoopsUser->getGroups())) {
@@ -57,7 +54,6 @@
$xoopsTpl = new XoopsTpl();
}
-
$xoopsTpl->assign('pathIcon16', $pathIcon16);
// Load language files
@@ -69,4 +65,4 @@
}
if (!@include_once(XOOPS_TRUST_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/" . $xoopsConfig['language'] . "/main.php")) {
include_once(XOOPS_TRUST_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/english/main.php");
-}
\ No newline at end of file
+}
|
|
From: <be...@us...> - 2013-09-14 04:38:09
|
Revision: 12034
http://sourceforge.net/p/xoops/svn/12034
Author: beckmi
Date: 2013-09-14 04:38:02 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
removing php_closing_tag in few more files
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopscode.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopscode.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopscode.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopscode.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -16,4 +16,3 @@
// Add your code here to check acces by groups
return true;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -17,4 +17,3 @@
// Add your code here to check acces by groups
return true;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -20,4 +20,3 @@
return false;
}
return true;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -24,4 +24,3 @@
}
return false;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -16,4 +16,3 @@
// Add your code here to check acces by groups
return true;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -20,4 +20,3 @@
define('_XOOPS_EDITOR_TINYMCE_LANGUAGE',"en");
// FONT LIST, FORMAT: "Name=value1,value2;Name=value"
define('_XOOPS_EDITOR_TINYMCE_FONTS',"Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings");
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -10,61 +10,62 @@
class phpthumb_filters {
- var $phpThumbObject = null;
+ var $phpThumbObject = null;
- function phpthumb_filters() {
- return true;
- }
+ function phpthumb_filters() {
+ return true;
+ }
- function ApplyMask(&$gdimg_mask, &$gdimg_image) {
- if (phpthumb_functions::gd_version() < 2) {
- $this->DebugMessage('Skipping ApplyMask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
- return false;
- }
- if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.2', '>=')) {
+ function ApplyMask(&$gdimg_mask, &$gdimg_image) {
+ if (phpthumb_functions::gd_version() < 2) {
+ $this->DebugMessage('Skipping ApplyMask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
- $this->DebugMessage('Using alpha ApplyMask() technique', __FILE__, __LINE__);
- if ($gdimg_mask_resized = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_image), ImageSY($gdimg_image))) {
+ return false;
+ }
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.2', '>=')) {
- ImageCopyResampled($gdimg_mask_resized, $gdimg_mask, 0, 0, 0, 0, ImageSX($gdimg_image), ImageSY($gdimg_image), ImageSX($gdimg_mask), ImageSY($gdimg_mask));
- if ($gdimg_mask_blendtemp = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_image), ImageSY($gdimg_image))) {
+ $this->DebugMessage('Using alpha ApplyMask() technique', __FILE__, __LINE__);
+ if ($gdimg_mask_resized = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_image), ImageSY($gdimg_image))) {
- $color_background = ImageColorAllocate($gdimg_mask_blendtemp, 0, 0, 0);
- ImageFilledRectangle($gdimg_mask_blendtemp, 0, 0, ImageSX($gdimg_mask_blendtemp), ImageSY($gdimg_mask_blendtemp), $color_background);
- ImageAlphaBlending($gdimg_mask_blendtemp, false);
- ImageSaveAlpha($gdimg_mask_blendtemp, true);
- for ($x = 0; $x < ImageSX($gdimg_image); $x++) {
- for ($y = 0; $y < ImageSY($gdimg_image); $y++) {
- //$RealPixel = phpthumb_functions::GetPixelColor($gdimg_mask_blendtemp, $x, $y);
- $RealPixel = phpthumb_functions::GetPixelColor($gdimg_image, $x, $y);
- $MaskPixel = phpthumb_functions::GrayscalePixel(phpthumb_functions::GetPixelColor($gdimg_mask_resized, $x, $y));
- $MaskAlpha = 127 - (floor($MaskPixel['red'] / 2) * (1 - ($RealPixel['alpha'] / 127)));
- $newcolor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_mask_blendtemp, $RealPixel['red'], $RealPixel['green'], $RealPixel['blue'], $MaskAlpha);
- ImageSetPixel($gdimg_mask_blendtemp, $x, $y, $newcolor);
- }
- }
- ImageAlphaBlending($gdimg_image, false);
- ImageSaveAlpha($gdimg_image, true);
- ImageCopy($gdimg_image, $gdimg_mask_blendtemp, 0, 0, 0, 0, ImageSX($gdimg_mask_blendtemp), ImageSY($gdimg_mask_blendtemp));
- ImageDestroy($gdimg_mask_blendtemp);
+ ImageCopyResampled($gdimg_mask_resized, $gdimg_mask, 0, 0, 0, 0, ImageSX($gdimg_image), ImageSY($gdimg_image), ImageSX($gdimg_mask), ImageSY($gdimg_mask));
+ if ($gdimg_mask_blendtemp = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_image), ImageSY($gdimg_image))) {
- } else {
- $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
- }
- ImageDestroy($gdimg_mask_resized);
+ $color_background = ImageColorAllocate($gdimg_mask_blendtemp, 0, 0, 0);
+ ImageFilledRectangle($gdimg_mask_blendtemp, 0, 0, ImageSX($gdimg_mask_blendtemp), ImageSY($gdimg_mask_blendtemp), $color_background);
+ ImageAlphaBlending($gdimg_mask_blendtemp, false);
+ ImageSaveAlpha($gdimg_mask_blendtemp, true);
+ for ($x = 0; $x < ImageSX($gdimg_image); $x++) {
+ for ($y = 0; $y < ImageSY($gdimg_image); $y++) {
+ //$RealPixel = phpthumb_functions::GetPixelColor($gdimg_mask_blendtemp, $x, $y);
+ $RealPixel = phpthumb_functions::GetPixelColor($gdimg_image, $x, $y);
+ $MaskPixel = phpthumb_functions::GrayscalePixel(phpthumb_functions::GetPixelColor($gdimg_mask_resized, $x, $y));
+ $MaskAlpha = 127 - (floor($MaskPixel['red'] / 2) * (1 - ($RealPixel['alpha'] / 127)));
+ $newcolor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_mask_blendtemp, $RealPixel['red'], $RealPixel['green'], $RealPixel['blue'], $MaskAlpha);
+ ImageSetPixel($gdimg_mask_blendtemp, $x, $y, $newcolor);
+ }
+ }
+ ImageAlphaBlending($gdimg_image, false);
+ ImageSaveAlpha($gdimg_image, true);
+ ImageCopy($gdimg_image, $gdimg_mask_blendtemp, 0, 0, 0, 0, ImageSX($gdimg_mask_blendtemp), ImageSY($gdimg_mask_blendtemp));
+ ImageDestroy($gdimg_mask_blendtemp);
- } else {
- $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
- }
+ } else {
+ $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
+ }
+ ImageDestroy($gdimg_mask_resized);
- } else {
- // alpha merging requires PHP v4.3.2+
- $this->DebugMessage('Skipping ApplyMask() technique because PHP is v"'.phpversion().'"', __FILE__, __LINE__);
- }
- return true;
- }
+ } else {
+ $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
+ }
+ } else {
+ // alpha merging requires PHP v4.3.2+
+ $this->DebugMessage('Skipping ApplyMask() technique because PHP is v"'.phpversion().'"', __FILE__, __LINE__);
+ }
+ return true;
+ }
+
function Bevel(&$gdimg, $width, $hexcolor1, $hexcolor2) {
$width = ($width ? $width : 5);
$hexcolor1 = ($hexcolor1 ? $hexcolor1 : 'FFFFFF');
@@ -81,1464 +82,1501 @@
ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i - 1, ImageSX($gdimg) - $i, $i + 1, $color2); // right
ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i , $i, ImageSY($gdimg) - $i , $color2); // bottom
}
+
return true;
}
+ function Blur(&$gdimg, $radius=0.5) {
+ // Taken from Torstein H\xF8nsi's phpUnsharpMask (see phpthumb.unsharp.php)
- function Blur(&$gdimg, $radius=0.5) {
- // Taken from Torstein H\xF8nsi's phpUnsharpMask (see phpthumb.unsharp.php)
+ $radius = round(max(0, min($radius, 50)) * 2);
+ if (!$radius) {
+ return false;
+ }
- $radius = round(max(0, min($radius, 50)) * 2);
- if (!$radius) {
- return false;
- }
+ $w = ImageSX($gdimg);
+ $h = ImageSY($gdimg);
+ if ($imgBlur = ImageCreateTrueColor($w, $h)) {
+ // Gaussian blur matrix:
+ // 1 2 1
+ // 2 4 2
+ // 1 2 1
- $w = ImageSX($gdimg);
- $h = ImageSY($gdimg);
- if ($imgBlur = ImageCreateTrueColor($w, $h)) {
- // Gaussian blur matrix:
- // 1 2 1
- // 2 4 2
- // 1 2 1
+ // Move copies of the image around one pixel at the time and merge them with weight
+ // according to the matrix. The same matrix is simply repeated for higher radii.
+ for ($i = 0; $i < $radius; $i++) {
+ ImageCopy ($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1); // up left
+ ImageCopyMerge($imgBlur, $gdimg, 1, 1, 0, 0, $w, $h, 50.00000); // down right
+ ImageCopyMerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h, 33.33333); // down left
+ ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 1, $w, $h - 1, 25.00000); // up right
+ ImageCopyMerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h, 33.33333); // left
+ ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 0, $w, $h, 25.00000); // right
+ ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 1, $w, $h - 1, 20.00000); // up
+ ImageCopyMerge($imgBlur, $gdimg, 0, 1, 0, 0, $w, $h, 16.666667); // down
+ ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 0, $w, $h, 50.000000); // center
+ ImageCopy ($gdimg, $imgBlur, 0, 0, 0, 0, $w, $h);
+ }
- // Move copies of the image around one pixel at the time and merge them with weight
- // according to the matrix. The same matrix is simply repeated for higher radii.
- for ($i = 0; $i < $radius; $i++) {
- ImageCopy ($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1); // up left
- ImageCopyMerge($imgBlur, $gdimg, 1, 1, 0, 0, $w, $h, 50.00000); // down right
- ImageCopyMerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h, 33.33333); // down left
- ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 1, $w, $h - 1, 25.00000); // up right
- ImageCopyMerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h, 33.33333); // left
- ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 0, $w, $h, 25.00000); // right
- ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 1, $w, $h - 1, 20.00000); // up
- ImageCopyMerge($imgBlur, $gdimg, 0, 1, 0, 0, $w, $h, 16.666667); // down
- ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 0, $w, $h, 50.000000); // center
- ImageCopy ($gdimg, $imgBlur, 0, 0, 0, 0, $w, $h);
- }
- return true;
- }
- return false;
- }
+ return true;
+ }
+ return false;
+ }
- function BlurGaussian(&$gdimg) {
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- if (ImageFilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
- $this->DebugMessage('FAILED: phpthumb_filters::BlurGaussian($gdimg) [using phpthumb_filters::Blur() instead]', __FILE__, __LINE__);
- return phpthumb_filters::Blur($gdimg, 0.5);
- }
+ function BlurGaussian(&$gdimg) {
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ if (ImageFilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
+ $this->DebugMessage('FAILED: phpthumb_filters::BlurGaussian($gdimg) [using phpthumb_filters::Blur() instead]', __FILE__, __LINE__);
- function BlurSelective(&$gdimg) {
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- if (ImageFilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
- // currently not implemented "the hard way"
- $this->DebugMessage('FAILED: phpthumb_filters::BlurSelective($gdimg) [function not implemented]', __FILE__, __LINE__);
- return false;
- }
+ return phpthumb_filters::Blur($gdimg, 0.5);
+ }
- function Brightness(&$gdimg, $amount=0) {
- if ($amount == 0) {
- return true;
- }
- $amount = max(-255, min(255, $amount));
+ function BlurSelective(&$gdimg) {
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ if (ImageFilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
+ // currently not implemented "the hard way"
+ $this->DebugMessage('FAILED: phpthumb_filters::BlurSelective($gdimg) [function not implemented]', __FILE__, __LINE__);
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- if (ImageFilter($gdimg, IMG_FILTER_BRIGHTNESS, $amount)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_BRIGHTNESS, '.$amount.')', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
+ return false;
+ }
- $scaling = (255 - abs($amount)) / 255;
- $baseamount = (($amount > 0) ? $amount : 0);
- for ($x = 0; $x < ImageSX($gdimg); $x++) {
- for ($y = 0; $y < ImageSY($gdimg); $y++) {
- $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
- foreach ($OriginalPixel as $key => $value) {
- $NewPixel[$key] = round($baseamount + ($OriginalPixel[$key] * $scaling));
- }
- $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
- ImageSetPixel($gdimg, $x, $y, $newColor);
- }
- }
- return true;
- }
+ function Brightness(&$gdimg, $amount=0) {
+ if ($amount == 0) {
+ return true;
+ }
+ $amount = max(-255, min(255, $amount));
- function Contrast(&$gdimg, $amount=0) {
- if ($amount == 0) {
- return true;
- }
- $amount = max(-255, min(255, $amount));
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ if (ImageFilter($gdimg, IMG_FILTER_BRIGHTNESS, $amount)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_BRIGHTNESS, '.$amount.')', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- // ImageFilter(IMG_FILTER_CONTRAST) has range +100 to -100 (positive numbers make it darker!)
- $amount = ($amount / 255) * -100;
- if (ImageFilter($gdimg, IMG_FILTER_CONTRAST, $amount)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_CONTRAST, '.$amount.')', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
+ $scaling = (255 - abs($amount)) / 255;
+ $baseamount = (($amount > 0) ? $amount : 0);
+ for ($x = 0; $x < ImageSX($gdimg); $x++) {
+ for ($y = 0; $y < ImageSY($gdimg); $y++) {
+ $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+ foreach ($OriginalPixel as $key => $value) {
+ $NewPixel[$key] = round($baseamount + ($OriginalPixel[$key] * $scaling));
+ }
+ $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+ ImageSetPixel($gdimg, $x, $y, $newColor);
+ }
+ }
- if ($amount > 0) {
- $scaling = 1 + ($amount / 255);
- } else {
- $scaling = (255 - abs($amount)) / 255;
- }
- for ($x = 0; $x < ImageSX($gdimg); $x++) {
- for ($y = 0; $y < ImageSY($gdimg); $y++) {
- $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
- foreach ($OriginalPixel as $key => $value) {
- $NewPixel[$key] = min(255, max(0, round($OriginalPixel[$key] * $scaling)));
- }
- $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
- ImageSetPixel($gdimg, $x, $y, $newColor);
- }
- }
- }
+ return true;
+ }
- function Colorize(&$gdimg, $amount, $targetColor) {
- $amount = (is_numeric($amount) ? $amount : 25);
- $amountPct = $amount / 100;
- $targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'gray');
+ function Contrast(&$gdimg, $amount=0) {
+ if ($amount == 0) {
+ return true;
+ }
+ $amount = max(-255, min(255, $amount));
- if ($amount == 0) {
- return true;
- }
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ // ImageFilter(IMG_FILTER_CONTRAST) has range +100 to -100 (positive numbers make it darker!)
+ $amount = ($amount / 255) * -100;
+ if (ImageFilter($gdimg, IMG_FILTER_CONTRAST, $amount)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_CONTRAST, '.$amount.')', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- if ($targetColor == 'gray') {
- $targetColor = '808080';
- }
- $r = round($amountPct * hexdec(substr($targetColor, 0, 2)));
- $g = round($amountPct * hexdec(substr($targetColor, 2, 2)));
- $b = round($amountPct * hexdec(substr($targetColor, 4, 2)));
- if (ImageFilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
+ if ($amount > 0) {
+ $scaling = 1 + ($amount / 255);
+ } else {
+ $scaling = (255 - abs($amount)) / 255;
+ }
+ for ($x = 0; $x < ImageSX($gdimg); $x++) {
+ for ($y = 0; $y < ImageSY($gdimg); $y++) {
+ $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+ foreach ($OriginalPixel as $key => $value) {
+ $NewPixel[$key] = min(255, max(0, round($OriginalPixel[$key] * $scaling)));
+ }
+ $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+ ImageSetPixel($gdimg, $x, $y, $newColor);
+ }
+ }
+ }
- // overridden below for grayscale
- if ($targetColor != 'gray') {
- $TargetPixel['red'] = hexdec(substr($targetColor, 0, 2));
- $TargetPixel['green'] = hexdec(substr($targetColor, 2, 2));
- $TargetPixel['blue'] = hexdec(substr($targetColor, 4, 2));
- }
- for ($x = 0; $x < ImageSX($gdimg); $x++) {
- for ($y = 0; $y < ImageSY($gdimg); $y++) {
- $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
- if ($targetColor == 'gray') {
- $TargetPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
- }
- foreach ($TargetPixel as $key => $value) {
- $NewPixel[$key] = round(max(0, min(255, ($OriginalPixel[$key] * ((100 - $amount) / 100)) + ($TargetPixel[$key] * $amountPct))));
- }
- //$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue'], $OriginalPixel['alpha']);
- $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
- ImageSetPixel($gdimg, $x, $y, $newColor);
- }
- }
- return true;
- }
+ function Colorize(&$gdimg, $amount, $targetColor) {
+ $amount = (is_numeric($amount) ? $amount : 25);
+ $amountPct = $amount / 100;
+ $targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'gray');
+ if ($amount == 0) {
+ return true;
+ }
- function Crop(&$gdimg, $left=0, $right=0, $top=0, $bottom=0) {
- if (!$left && !$right && !$top && !$bottom) {
- return true;
- }
- $oldW = ImageSX($gdimg);
- $oldH = ImageSY($gdimg);
- if (($left > 0) && ($left < 1)) { $left = round($left * $oldW); }
- if (($right > 0) && ($right < 1)) { $right = round($right * $oldW); }
- if (($top > 0) && ($top < 1)) { $top = round($top * $oldH); }
- if (($bottom > 0) && ($bottom < 1)) { $bottom = round($bottom * $oldH); }
- $right = min($oldW - $left - 1, $right);
- $bottom = min($oldH - $top - 1, $bottom);
- $newW = $oldW - $left - $right;
- $newH = $oldH - $top - $bottom;
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ if ($targetColor == 'gray') {
+ $targetColor = '808080';
+ }
+ $r = round($amountPct * hexdec(substr($targetColor, 0, 2)));
+ $g = round($amountPct * hexdec(substr($targetColor, 2, 2)));
+ $b = round($amountPct * hexdec(substr($targetColor, 4, 2)));
+ if (ImageFilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
- if ($imgCropped = ImageCreateTrueColor($newW, $newH)) {
- ImageCopy($imgCropped, $gdimg, 0, 0, $left, $top, $newW, $newH);
- if ($gdimg = ImageCreateTrueColor($newW, $newH)) {
- ImageCopy($gdimg, $imgCropped, 0, 0, 0, 0, $newW, $newH);
- ImageDestroy($imgCropped);
- return true;
- }
- ImageDestroy($imgCropped);
- }
- return false;
- }
+ // overridden below for grayscale
+ if ($targetColor != 'gray') {
+ $TargetPixel['red'] = hexdec(substr($targetColor, 0, 2));
+ $TargetPixel['green'] = hexdec(substr($targetColor, 2, 2));
+ $TargetPixel['blue'] = hexdec(substr($targetColor, 4, 2));
+ }
+ for ($x = 0; $x < ImageSX($gdimg); $x++) {
+ for ($y = 0; $y < ImageSY($gdimg); $y++) {
+ $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+ if ($targetColor == 'gray') {
+ $TargetPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
+ }
+ foreach ($TargetPixel as $key => $value) {
+ $NewPixel[$key] = round(max(0, min(255, ($OriginalPixel[$key] * ((100 - $amount) / 100)) + ($TargetPixel[$key] * $amountPct))));
+ }
+ //$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue'], $OriginalPixel['alpha']);
+ $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+ ImageSetPixel($gdimg, $x, $y, $newColor);
+ }
+ }
- function Desaturate(&$gdimg, $amount, $color='') {
- if ($amount == 0) {
- return true;
- }
- return phpthumb_filters::Colorize($gdimg, $amount, (phpthumb_functions::IsHexColor($color) ? $color : 'gray'));
- }
+ return true;
+ }
- function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $alpha) {
- if (phpthumb_functions::gd_version() < 2) {
- return false;
- }
- $distance = ($distance ? $distance : 10);
- $width = ($width ? $width : 10);
- $hexcolor = ($hexcolor ? $hexcolor : '000000');
- $angle = ($angle ? $angle : 225) % 360;
- $alpha = max(0, min(100, ($alpha ? $alpha : 100)));
+ function Crop(&$gdimg, $left=0, $right=0, $top=0, $bottom=0) {
+ if (!$left && !$right && !$top && !$bottom) {
+ return true;
+ }
+ $oldW = ImageSX($gdimg);
+ $oldH = ImageSY($gdimg);
+ if (($left > 0) && ($left < 1)) { $left = round($left * $oldW); }
+ if (($right > 0) && ($right < 1)) { $right = round($right * $oldW); }
+ if (($top > 0) && ($top < 1)) { $top = round($top * $oldH); }
+ if (($bottom > 0) && ($bottom < 1)) { $bottom = round($bottom * $oldH); }
+ $right = min($oldW - $left - 1, $right);
+ $bottom = min($oldH - $top - 1, $bottom);
+ $newW = $oldW - $left - $right;
+ $newH = $oldH - $top - $bottom;
- if ($alpha <= 0) {
- // invisible shadow, nothing to do
- return true;
- }
- if ($distance <= 0) {
- // shadow completely obscured by source image, nothing to do
- return true;
- }
+ if ($imgCropped = ImageCreateTrueColor($newW, $newH)) {
+ ImageCopy($imgCropped, $gdimg, 0, 0, $left, $top, $newW, $newH);
+ if ($gdimg = ImageCreateTrueColor($newW, $newH)) {
+ ImageCopy($gdimg, $imgCropped, 0, 0, 0, 0, $newW, $newH);
+ ImageDestroy($imgCropped);
- $width_shadow = cos(deg2rad($angle)) * ($distance + $width);
- $height_shadow = sin(deg2rad($angle)) * ($distance + $width);
+ return true;
+ }
+ ImageDestroy($imgCropped);
+ }
- $scaling = min(ImageSX($gdimg) / (ImageSX($gdimg) + abs($width_shadow)), ImageSY($gdimg) / (ImageSY($gdimg) + abs($height_shadow)));
+ return false;
+ }
- for ($i = 0; $i < $width; $i++) {
- $WidthAlpha[$i] = (abs(($width / 2) - $i) / $width);
- $Offset['x'] = cos(deg2rad($angle)) * ($distance + $i);
- $Offset['y'] = sin(deg2rad($angle)) * ($distance + $i);
- }
- $tempImageWidth = ImageSX($gdimg) + abs($Offset['x']);
- $tempImageHeight = ImageSY($gdimg) + abs($Offset['y']);
+ function Desaturate(&$gdimg, $amount, $color='') {
+ if ($amount == 0) {
+ return true;
+ }
- if ($gdimg_dropshadow_temp = phpthumb_functions::ImageCreateFunction($tempImageWidth, $tempImageHeight)) {
+ return phpthumb_filters::Colorize($gdimg, $amount, (phpthumb_functions::IsHexColor($color) ? $color : 'gray'));
+ }
- ImageAlphaBlending($gdimg_dropshadow_temp, false);
- ImageSaveAlpha($gdimg_dropshadow_temp, true);
- $transparent1 = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_dropshadow_temp, 0, 0, 0, 127);
- ImageFill($gdimg_dropshadow_temp, 0, 0, $transparent1);
- for ($x = 0; $x < ImageSX($gdimg); $x++) {
- for ($y = 0; $y < ImageSY($gdimg); $y++) {
- $PixelMap[$x][$y] = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
- }
- }
- for ($x = 0; $x < $tempImageWidth; $x++) {
- for ($y = 0; $y < $tempImageHeight; $y++) {
- //for ($i = 0; $i < $width; $i++) {
- for ($i = 0; $i < 1; $i++) {
- if (!isset($PixelMap[$x][$y]['alpha']) || ($PixelMap[$x][$y]['alpha'] > 0)) {
- if (isset($PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha']) && ($PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha'] < 127)) {
- $thisColor = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor, false, $PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha']);
- ImageSetPixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
- }
- }
- }
- }
- }
+ function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $alpha) {
+ if (phpthumb_functions::gd_version() < 2) {
+ return false;
+ }
+ $distance = ($distance ? $distance : 10);
+ $width = ($width ? $width : 10);
+ $hexcolor = ($hexcolor ? $hexcolor : '000000');
+ $angle = ($angle ? $angle : 225) % 360;
+ $alpha = max(0, min(100, ($alpha ? $alpha : 100)));
- ImageAlphaBlending($gdimg_dropshadow_temp, true);
- for ($x = 0; $x < ImageSX($gdimg); $x++) {
- for ($y = 0; $y < ImageSY($gdimg); $y++) {
- if ($PixelMap[$x][$y]['alpha'] < 127) {
- $thisColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_dropshadow_temp, $PixelMap[$x][$y]['red'], $PixelMap[$x][$y]['green'], $PixelMap[$x][$y]['blue'], $PixelMap[$x][$y]['alpha']);
- ImageSetPixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
- }
- }
- }
+ if ($alpha <= 0) {
+ // invisible shadow, nothing to do
+ return true;
+ }
+ if ($distance <= 0) {
+ // shadow completely obscured by source image, nothing to do
+ return true;
+ }
- ImageSaveAlpha($gdimg, true);
- ImageAlphaBlending($gdimg, false);
- //$this->is_alpha = true;
- $transparent2 = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 0, 0, 0, 127);
- ImageFilledRectangle($gdimg, 0, 0, ImageSX($gdimg), ImageSY($gdimg), $transparent2);
- ImageCopyResampled($gdimg, $gdimg_dropshadow_temp, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg), ImageSX($gdimg_dropshadow_temp), ImageSY($gdimg_dropshadow_temp));
+ $width_shadow = cos(deg2rad($angle)) * ($distance + $width);
+ $height_shadow = sin(deg2rad($angle)) * ($distance + $width);
- ImageDestroy($gdimg_dropshadow_temp);
- }
- return true;
- }
+ $scaling = min(ImageSX($gdimg) / (ImageSX($gdimg) + abs($width_shadow)), ImageSY($gdimg) / (ImageSY($gdimg) + abs($height_shadow)));
+ for ($i = 0; $i < $width; $i++) {
+ $WidthAlpha[$i] = (abs(($width / 2) - $i) / $width);
+ $Offset['x'] = cos(deg2rad($angle)) * ($distance + $i);
+ $Offset['y'] = sin(deg2rad($angle)) * ($distance + $i);
+ }
- function EdgeDetect(&$gdimg) {
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- if (ImageFilter($gdimg, IMG_FILTER_EDGEDETECT)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_EDGEDETECT)', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
- // currently not implemented "the hard way"
- $this->DebugMessage('FAILED: phpthumb_filters::EdgeDetect($gdimg) [function not implemented]', __FILE__, __LINE__);
- return false;
- }
+ $tempImageWidth = ImageSX($gdimg) + abs($Offset['x']);
+ $tempImageHeight = ImageSY($gdimg) + abs($Offset['y']);
+ if ($gdimg_dropshadow_temp = phpthumb_functions::ImageCreateFunction($tempImageWidth, $tempImageHeight)) {
- function Elipse($gdimg) {
- if (phpthumb_functions::gd_version() < 2) {
- return false;
- }
- // generate mask at twice desired resolution and downsample afterwards for easy antialiasing
- if ($gdimg_elipsemask_double = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg) * 2, ImageSY($gdimg) * 2)) {
- if ($gdimg_elipsemask = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg), ImageSY($gdimg))) {
+ ImageAlphaBlending($gdimg_dropshadow_temp, false);
+ ImageSaveAlpha($gdimg_dropshadow_temp, true);
+ $transparent1 = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_dropshadow_temp, 0, 0, 0, 127);
+ ImageFill($gdimg_dropshadow_temp, 0, 0, $transparent1);
- $color_transparent = ImageColorAllocate($gdimg_elipsemask_double, 255, 255, 255);
- ImageFilledEllipse($gdimg_elipsemask_double, ImageSX($gdimg), ImageSY($gdimg), (ImageSX($gdimg) - 1) * 2, (ImageSY($gdimg) - 1) * 2, $color_transparent);
- ImageCopyResampled($gdimg_elipsemask, $gdimg_elipsemask_double, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg), ImageSX($gdimg) * 2, ImageSY($gdimg) * 2);
+ for ($x = 0; $x < ImageSX($gdimg); $x++) {
+ for ($y = 0; $y < ImageSY($gdimg); $y++) {
+ $PixelMap[$x][$y] = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+ }
+ }
+ for ($x = 0; $x < $tempImageWidth; $x++) {
+ for ($y = 0; $y < $tempImageHeight; $y++) {
+ //for ($i = 0; $i < $width; $i++) {
+ for ($i = 0; $i < 1; $i++) {
+ if (!isset($PixelMap[$x][$y]['alpha']) || ($PixelMap[$x][$y]['alpha'] > 0)) {
+ if (isset($PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha']) && ($PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha'] < 127)) {
+ $thisColor = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor, false, $PixelMap[$x + $Offset['x']][$y + $Offset['y']]['alpha']);
+ ImageSetPixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
+ }
+ }
+ }
+ }
+ }
- phpthumb_filters::ApplyMask($gdimg_elipsemask, $gdimg);
- ImageDestroy($gdimg_elipsemask);
- return true;
+ ImageAlphaBlending($gdimg_dropshadow_temp, true);
+ for ($x = 0; $x < ImageSX($gdimg); $x++) {
+ for ($y = 0; $y < ImageSY($gdimg); $y++) {
+ if ($PixelMap[$x][$y]['alpha'] < 127) {
+ $thisColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_dropshadow_temp, $PixelMap[$x][$y]['red'], $PixelMap[$x][$y]['green'], $PixelMap[$x][$y]['blue'], $PixelMap[$x][$y]['alpha']);
+ ImageSetPixel($gdimg_dropshadow_temp, $x, $y, $thisColor);
+ }
+ }
+ }
- } else {
- $this->DebugMessage('$gdimg_elipsemask = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
- }
- ImageDestroy($gdimg_elipsemask_double);
- } else {
- $this->DebugMessage('$gdimg_elipsemask_double = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
- }
- return false;
- }
+ ImageSaveAlpha($gdimg, true);
+ ImageAlphaBlending($gdimg, false);
+ //$this->is_alpha = true;
+ $transparent2 = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, 0, 0, 0, 127);
+ ImageFilledRectangle($gdimg, 0, 0, ImageSX($gdimg), ImageSY($gdimg), $transparent2);
+ ImageCopyResampled($gdimg, $gdimg_dropshadow_temp, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg), ImageSX($gdimg_dropshadow_temp), ImageSY($gdimg_dropshadow_temp));
+ ImageDestroy($gdimg_dropshadow_temp);
+ }
- function Emboss(&$gdimg) {
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- if (ImageFilter($gdimg, IMG_FILTER_EMBOSS)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_EMBOSS)', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
- // currently not implemented "the hard way"
- $this->DebugMessage('FAILED: phpthumb_filters::Emboss($gdimg) [function not implemented]', __FILE__, __LINE__);
- return false;
- }
+ return true;
+ }
- function Flip(&$gdimg, $x=false, $y=false) {
- if (!$x && !$y) {
- return false;
- }
- if ($tempImage = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg), ImageSY($gdimg))) {
- if ($x) {
- ImageCopy($tempImage, $gdimg, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg));
- for ($x = 0; $x < ImageSX($gdimg); $x++) {
- ImageCopy($gdimg, $tempImage, ImageSX($gdimg) - 1 - $x, 0, $x, 0, 1, ImageSY($gdimg));
- }
- }
- if ($y) {
- ImageCopy($tempImage, $gdimg, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg));
- for ($y = 0; $y < ImageSY($gdimg); $y++) {
- ImageCopy($gdimg, $tempImage, 0, ImageSY($gdimg) - 1 - $y, 0, $y, ImageSX($gdimg), 1);
- }
- }
- ImageDestroy($tempImage);
- }
- return true;
- }
+ function EdgeDetect(&$gdimg) {
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ if (ImageFilter($gdimg, IMG_FILTER_EDGEDETECT)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_EDGEDETECT)', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
+ // currently not implemented "the hard way"
+ $this->DebugMessage('FAILED: phpthumb_filters::EdgeDetect($gdimg) [function not implemented]', __FILE__, __LINE__);
+ return false;
+ }
- function Frame(&$gdimg, $frame_width, $edge_width, $hexcolor_frame, $hexcolor1, $hexcolor2) {
- $frame_width = ($frame_width ? $frame_width : 5);
- $edge_width = ($edge_width ? $edge_width : 1);
- $hexcolor_frame = ($hexcolor_frame ? $hexcolor_frame : 'CCCCCC');
- $hexcolor1 = ($hexcolor1 ? $hexcolor1 : 'FFFFFF');
- $hexcolor2 = ($hexcolor2 ? $hexcolor2 : '000000');
- $color_frame = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor_frame);
- $color1 = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor1);
- $color2 = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor2);
- for ($i = 0; $i < $edge_width; $i++) {
- // outer bevel
- ImageLine($gdimg, $i, $i, $i, ImageSY($gdimg) - $i, $color1); // left
- ImageLine($gdimg, $i, $i, ImageSX($gdimg) - $i, $i, $color1); // top
- ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i, ImageSX($gdimg) - $i, $i, $color2); // right
- ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i, $i, ImageSY($gdimg) - $i, $color2); // bottom
- }
- for ($i = 0; $i < $frame_width; $i++) {
- // actual frame
- ImageRectangle($gdimg, $edge_width + $i, $edge_width + $i, ImageSX($gdimg) - $edge_width - $i, ImageSY($gdimg) - $edge_width - $i, $color_frame);
- }
- for ($i = 0; $i < $edge_width; $i++) {
- // inner bevel
- ImageLine($gdimg, $frame_width + $edge_width + $i, $frame_width + $edge_width + $i, $frame_width + $edge_width + $i, ImageSY($gdimg) - $frame_width - $edge_width - $i, $color2); // left
- ImageLine($gdimg, $frame_width + $edge_width + $i, $frame_width + $edge_width + $i, ImageSX($gdimg) - $frame_width - $edge_width - $i, $frame_width + $edge_width + $i, $color2); // top
- ImageLine($gdimg, ImageSX($gdimg) - $frame_width - $edge_width - $i, ImageSY($gdimg) - $frame_width - $edge_width - $i, ImageSX($gdimg) - $frame_width - $edge_width - $i, $frame_width + $edge_width + $i, $color1); // right
- ImageLine($gdimg, ImageSX($gdimg) - $frame_width - $edge_width - $i, ImageSY($gdimg) - $frame_width - $edge_width - $i, $frame_width + $edge_width + $i, ImageSY($gdimg) - $frame_width - $edge_width - $i, $color1); // bottom
- }
- return true;
- }
+ function Elipse($gdimg) {
+ if (phpthumb_functions::gd_version() < 2) {
+ return false;
+ }
+ // generate mask at twice desired resolution and downsample afterwards for easy antialiasing
+ if ($gdimg_elipsemask_double = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg) * 2, ImageSY($gdimg) * 2)) {
+ if ($gdimg_elipsemask = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg), ImageSY($gdimg))) {
+ $color_transparent = ImageColorAllocate($gdimg_elipsemask_double, 255, 255, 255);
+ ImageFilledEllipse($gdimg_elipsemask_double, ImageSX($gdimg), ImageSY($gdimg), (ImageSX($gdimg) - 1) * 2, (ImageSY($gdimg) - 1) * 2, $color_transparent);
+ ImageCopyResampled($gdimg_elipsemask, $gdimg_elipsemask_double, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg), ImageSX($gdimg) * 2, ImageSY($gdimg) * 2);
- function Gamma(&$gdimg, $amount) {
- if (number_format($amount, 4) == '1.0000') {
- return true;
- }
- return ImageGammaCorrect($gdimg, 1.0, $amount);
- }
+ phpthumb_filters::ApplyMask($gdimg_elipsemask, $gdimg);
+ ImageDestroy($gdimg_elipsemask);
+ return true;
- function Grayscale(&$gdimg) {
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- if (ImageFilter($gdimg, IMG_FILTER_GRAYSCALE)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_GRAYSCALE)', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
- return phpthumb_filters::Colorize($gdimg, 100, 'gray');
- }
+ } else {
+ $this->DebugMessage('$gdimg_elipsemask = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
+ }
+ ImageDestroy($gdimg_elipsemask_double);
+ } else {
+ $this->DebugMessage('$gdimg_elipsemask_double = phpthumb_functions::ImageCreateFunction() failed', __FILE__, __LINE__);
+ }
+ return false;
+ }
- function HistogramAnalysis(&$gdimg, $calculateGray=false) {
- $ImageSX = ImageSX($gdimg);
- $ImageSY = ImageSY($gdimg);
- for ($x = 0; $x < $ImageSX; $x++) {
- for ($y = 0; $y < $ImageSY; $y++) {
- $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
- @$Analysis['red'][$OriginalPixel['red']]++;
- @$Analysis['green'][$OriginalPixel['green']]++;
- @$Analysis['blue'][$OriginalPixel['blue']]++;
- @$Analysis['alpha'][$OriginalPixel['alpha']]++;
- if ($calculateGray) {
- $GrayPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
- @$Analysis['gray'][$GrayPixel['red']]++;
- }
- }
- }
- $keys = array('red', 'green', 'blue', 'alpha');
- if ($calculateGray) {
- $keys[] = 'gray';
- }
- foreach ($keys as $dummy => $key) {
- ksort($Analysis[$key]);
- }
- return $Analysis;
- }
+ function Emboss(&$gdimg) {
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ if (ImageFilter($gdimg, IMG_FILTER_EMBOSS)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_EMBOSS)', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
+ // currently not implemented "the hard way"
+ $this->DebugMessage('FAILED: phpthumb_filters::Emboss($gdimg) [function not implemented]', __FILE__, __LINE__);
- function HistogramStretch(&$gdimg, $band='*', $method=0, $threshold=0.1) {
- // equivalent of "Auto Contrast" in Adobe Photoshop
- // method 0 stretches according to RGB colors. Gives a more conservative stretch.
- // method 1 band stretches according to grayscale which is color-biased (59% green, 30% red, 11% blue). May give a punchier / more aggressive stretch, possibly appearing over-saturated
- $Analysis = phpthumb_filters::HistogramAnalysis($gdimg, true);
- $keys = array('r'=>'red', 'g'=>'green', 'b'=>'blue', 'a'=>'alpha', '*'=>(($method == 0) ? 'all' : 'gray'));
- $band = substr($band, 0, 1);
- if (!isset($keys[$band])) {
- return false;
- }
- $key = $keys[$band];
+ return false;
+ }
- // If the absolute brightest and darkest pixels are used then one random
- // pixel in the image could throw off the whole system. Instead, count up/down
- // from the limit and allow <threshold> (default = 0.1%) of brightest/darkest
- // pixels to be clipped to min/max
- $threshold = floatval($threshold) / 100;
- $clip_threshold = ImageSX($gdimg) * ImageSX($gdimg) * $threshold;
- //if ($min >= 0) {
- // $range_min = min($min, 255);
- //} else {
- $countsum = 0;
- for ($i = 0; $i <= 255; $i++) {
- if ($method == 0) {
- $countsum = max(@$Analysis['red'][$i], @$Analysis['green'][$i], @$Analysis['blue'][$i]);
- } else {
- $countsum += @$Analysis[$key][$i];
- }
- if ($countsum >= $clip_threshold) {
- $range_min = $i - 1;
- break;
- }
- }
- $range_min = max($range_min, 0);
- //}
- //if ($max > 0) {
- // $range_max = max($max, 255);
- //} else {
- $countsum = 0;
- for ($i = 255; $i >= 0; $i--) {
- if ($method == 0) {
- $countsum = max(@$Analysis['red'][$i], @$Analysis['green'][$i], @$Analysis['blue'][$i]);
- } else {
- $countsum += @$Analysis[$key][$i];
- }
- if ($countsum >= $clip_threshold) {
- $range_max = $i + 1;
- break;
- }
- }
- $range_max = min($range_max, 255);
- //}
- $range_scale = (($range_max == $range_min) ? 1 : (255 / ($range_max - $range_min)));
- if (($range_min == 0) && ($range_max == 255)) {
- // no adjustment neccesary - don't waste CPU time!
- return true;
- }
- $ImageSX = ImageSX($gdimg);
- $ImageSY = ImageSY($gdimg);
- for ($x = 0; $x < $ImageSX; $x++) {
- for ($y = 0; $y < $ImageSY; $y++) {
- $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
- if ($band == '*') {
- $new['red'] = min(255, max(0, ($OriginalPixel['red'] - $range_min) * $range_scale));
- $new['green'] = min(255, max(0, ($OriginalPixel['green'] - $range_min) * $range_scale));
- $new['blue'] = min(255, max(0, ($OriginalPixel['blue'] - $range_min) * $range_scale));
- $new['alpha'] = min(255, max(0, ($OriginalPixel['alpha'] - $range_min) * $range_scale));
- } else {
- $new = $OriginalPixel;
- $new[$key] = min(255, max(0, ($OriginalPixel[$key] - $range_min) * $range_scale));
- }
- $newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $new['red'], $new['green'], $new['blue'], $new['alpha']);
- ImageSetPixel($gdimg, $x, $y, $newColor);
- }
- }
+ function Flip(&$gdimg, $x=false, $y=false) {
+ if (!$x && !$y) {
+ return false;
+ }
+ if ($tempImage = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg), ImageSY($gdimg))) {
+ if ($x) {
+ ImageCopy($tempImage, $gdimg, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg));
+ for ($x = 0; $x < ImageSX($gdimg); $x++) {
+ ImageCopy($gdimg, $tempImage, ImageSX($gdimg) - 1 - $x, 0, $x, 0, 1, ImageSY($gdimg));
+ }
+ }
+ if ($y) {
+ ImageCopy($tempImage, $gdimg, 0, 0, 0, 0, ImageSX($gdimg), ImageSY($gdimg));
+ for ($y = 0; $y < ImageSY($gdimg); $y++) {
+ ImageCopy($gdimg, $tempImage, 0, ImageSY($gdimg) - 1 - $y, 0, $y, ImageSX($gdimg), 1);
+ }
+ }
+ ImageDestroy($tempImage);
+ }
- return true;
- }
+ return true;
+ }
- function HistogramOverlay(&$gdimg, $bands='*', $colors='', $width=0.25, $height=0.25, $alignment='BR', $opacity=50, $margin_x=5, $margin_y=null) {
- $margin_y = (is_null($margin_y) ? $margin_x : $margin_y);
+ function Frame(&$gdimg, $frame_width, $edge_width, $hexcolor_frame, $hexcolor1, $hexcolor2) {
+ $frame_width = ($frame_width ? $frame_width : 5);
+ $edge_width = ($edge_width ? $edge_width : 1);
+ $hexcolor_frame = ($hexcolor_frame ? $hexcolor_frame : 'CCCCCC');
+ $hexcolor1 = ($hexcolor1 ? $hexcolor1 : 'FFFFFF');
+ $hexcolor2 = ($hexcolor2 ? $hexcolor2 : '000000');
- $Analysis = phpthumb_filters::HistogramAnalysis($gdimg, true);
- $histW = round(($width > 1) ? min($width, ImageSX($gdimg)) : ImageSX($gdimg) * $width);
- $histH = round(($width > 1) ? min($width, ImageSX($gdimg)) : ImageSX($gdimg) * $width);
- if ($gdHist = ImageCreateTrueColor($histW, $histH)) {
- $color_back = phpthumb_functions::ImageColorAllocateAlphaSafe($gdHist, 0, 0, 0, 127);
- ImageFilledRectangle($gdHist, 0, 0, $histW, $histH, $color_back);
- ImageAlphaBlending($gdHist, false);
- ImageSaveAlpha($gdHist, true);
+ $color_frame = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor_frame);
+ $color1 = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor1);
+ $color2 = phpthumb_functions::ImageHexColorAllocate($gdimg, $hexcolor2);
+ for ($i = 0; $i < $edge_width; $i++) {
+ // outer bevel
+ ImageLine($gdimg, $i, $i, $i, ImageSY($gdimg) - $i, $color1); // left
+ ImageLine($gdimg, $i, $i, ImageSX($gdimg) - $i, $i, $color1); // top
+ ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i, ImageSX($gdimg) - $i, $i, $color2); // right
+ ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i, $i, ImageSY($gdimg) - $i, $color2); // bottom
+ }
+ for ($i = 0; $i < $frame_width; $i++) {
+ // actual frame
+ ImageRectangle($gdimg, $edge_width + $i, $edge_width + $i, ImageSX($gdimg) - $edge_width - $i, ImageSY($gdimg) - $edge_width - $i, $color_frame);
+ }
+ for ($i = 0; $i < $edge_width; $i++) {
+ // inner bevel
+ ImageLine($gdimg, $frame_width + $edge_width + $i, $frame_width + $edge_width + $i, $frame_width + $edge_width + $i, ImageSY($gdimg) - $frame_width - $edge_width - $i, $color2); // left
+ ImageLine($gdimg, $frame_width + $edge_width + $i, $frame_width + $edge_width + $i, ImageSX($gdimg) - $frame_width - $edge_width - $i, $frame_width + $edge_width + $i, $color2); // top
+ ImageLine($gdimg, ImageSX($gdimg) - $frame_width - $edge_width - $i, ImageSY($gdimg) - $frame_width - $edge_width - $i, ImageSX($gdimg) - $frame_width - $edge_width - $i, $frame_width + $edge_width + $i, $color1); // right
+ ImageLine($gdimg, ImageSX($gdimg) - $frame_width - $edge_width - $i, ImageSY($gdimg) - $frame_width - $edge_width - $i, $frame_width + $edge_width + $i, ImageSY($gdimg) - $frame_width - $edge_width - $i, $color1); // bottom
+ }
- $HistogramTempWidth = 256;
- $HistogramTempHeight = 100;
- if ($gdHistTemp = ImageCreateTrueColor($HistogramTempWidth, $HistogramTempHeight)) {
- $color_back_temp = phpthumb_functions::ImageColorAllocateAlphaSafe($gdHistTemp, 255, 0, 255, 127);
- ImageAlphaBlending($gdHistTemp, false);
- ImageSaveAlpha($gdHistTemp, true);
- ImageFilledRectangle($gdHistTemp, 0, 0, ImageSX($gdHistTemp), ImageSY($gdHistTemp), $color_back_temp);
+ return true;
+ }
- $DefaultColors = array('r'=>'FF0000', 'g'=>'00FF00', 'b'=>'0000FF', 'a'=>'999999', '*'=>'FFFFFF');
- $Colors = explode(';', $colors);
- $BandsToGraph = array_unique(preg_split('##', $bands));
- $keys = array('r'=>'red', 'g'=>'green', 'b'=>'blue', 'a'=>'alpha', '*'=>'gray');
- foreach ($BandsToGraph as $key => $band) {
- if (!isset($keys[$band])) {
- continue;
- }
- $PeakValue = max($Analysis[$keys[$band]]);
- $thisColor = phpthumb_functions::ImageHexColorAllocate($gdHistTemp, phpthumb_functions::IsHexColor(@$Colors[$key]) ? $Colors[$key] : $DefaultColors[$band]);
- for ($x = 0; $x < $HistogramTempWidth; $x++) {
- ImageLine($gdHistTemp, $x, $HistogramTempHeight - 1, $x, $HistogramTempHeight - 1 - round(@$Analysis[$keys[$band]][$x] / $PeakValue * $HistogramTempHeight), $thisColor);
- }
- ImageLine($gdHistTemp, 0, $HistogramTempHeight - 1, $HistogramTempWidth - 1, $HistogramTempHeight - 1, $thisColor);
- ImageLine($gdHistTemp, 0, $HistogramTempHeight - 2, $HistogramTempWidth - 1, $HistogramTempHeight - 2, $thisColor);
- }
- ImageCopyResampled($gdHist, $gdHistTemp, 0, 0, 0, 0, ImageSX($gdHist), ImageSY($gdHist), ImageSX($gdHistTemp), ImageSY($gdHistTemp));
- ImageDestroy($gdHistTemp);
- } else {
- return false;
- }
- phpthumb_filters::WatermarkOverlay($gdimg, $gdHist, $alignment, $opacity, $margin_x, $margin_y);
- ImageDestroy($gdHist);
- return true;
- }
- return false;
- }
+ function Gamma(&$gdimg, $amount) {
+ if (number_format($amount, 4) == '1.0000') {
+ return true;
+ }
+ return ImageGammaCorrect($gdimg, 1.0, $amount);
+ }
- function ImageBorder(&$gdimg, $border_width, $radius_x, $radius_y, $hexcolor_border) {
- $border_width = ($border_width ? $border_width : 1);
- $radius_x = ($radius_x ? $radius_x : 0);
- $radius_y = ($radius_y ? $radius_y : 0);
- $output_width = ImageSX($gdimg);
- $output_height = ImageSY($gdimg);
+ function Grayscale(&$gdimg) {
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ if (ImageFilter($gdimg, IMG_FILTER_GRAYSCALE)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_GRAYSCALE)', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
- list($new_width, $new_height) = phpthumb_functions::ProportionalResize($output_width, $output_height, $output_width - max($border_width * 2, $radius_x), $output_height - max($border_width * 2, $radius_y));
- $offset_x = ($radius_x ? $output_width - $new_width - $radius_x : 0);
- $offset_y = ($radius_y ? $output_height - $new_height - $radius_y : 0);
+ return phpthumb_filters::Colorize($gdimg, 100, 'gray');
+ }
+
+ function HistogramAnalysis(&$gdimg, $calculateGray=false) {
+ $ImageSX = ImageSX($gdimg);
+ $ImageSY = ImageSY($gdimg);
+ for ($x = 0; $x < $ImageSX; $x++) {
+ for ($y = 0; $y < $ImageSY; $y++) {
+ $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+ @$Analysis['red'][$OriginalPixel['red']]++;
+ @$Analysis['green'][$OriginalPixel['green']]++;
+ @$Analysis['blue'][$OriginalPixel['blue']]++;
+ @$Analysis['alpha'][$OriginalPixel['alpha']]++;
+ if ($calculateGray) {
+ $GrayPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
+ @$Analysis['gray'][$GrayPixel['red']]++;
+ }
+ }
+ }
+ $keys = array('red', 'green', 'blue', 'alpha');
+ if ($calculateGray) {
+ $keys[] = 'gray';
+ }
+ foreach ($keys as $dummy => $key) {
+ ksort($Analysis[$key]);
+ }
+
+ return $Analysis;
+ }
+
+
+ function HistogramStretch(&$gdimg, $band='*', $method=0, $threshold=0.1) {
+ // equivalent of "Auto Contrast" in Adobe Photoshop
+ // method 0 stretches according to RGB colors. Gives a more conservative stretch.
+ // method 1 band stretches according to grayscale which is color-biased (59% green, 30% red, 11% blue). May give a punchier / more aggressive stretch, possibly appearing over-saturated
+ $Analysis = phpthumb_filters::HistogramAnalysis($gdimg, true);
+ $keys = array('r'=>'red', 'g'=>'green', 'b'=>'blue', 'a'=>'alpha', '*'=>(($method == 0) ? 'all' : 'gray'));
+ $band = substr($band, 0, 1);
+ if (!isset($keys[$band])) {
+ return false;
+ }
+ $key = $keys[$band];
+
+ // If the absolute brightest and darkest pixels are used then one random
+ // pixel in the image could throw off the whole system. Instead, count up/down
+ // from the limit and allow <threshold> (default = 0.1%) of brightest/darkest
+ // pixels to be clipped to min/max
+ $threshold = floatval($threshold) / 100;
+ $clip_threshold = ImageSX($gdimg) * ImageSX($gdimg) * $threshold;
+ //if ($min >= 0) {
+ // $range_min = min($min, 255);
+ //} else {
+ $countsum = 0;
+ for ($i = 0; $i <= 255; $i++) {
+ if ($method == 0) {
+ $countsum = max(@$Analysis['red'][$i], @$Analysis['green'][$i], @$Analysis['blue'][$i]);
+ } else {
+ $countsum += @$Analysis[$key][$i];
+ }
+ if ($countsum >= $clip_threshold) {
+ $range_min = $i - 1;
+ break;
+ }
+ }
+ $range_min = max($range_min, 0...
[truncated message content] |
|
From: <be...@us...> - 2013-09-14 03:16:55
|
Revision: 12033
http://sourceforge.net/p/xoops/svn/12033
Author: beckmi
Date: 2013-09-14 03:16:44 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
removing php_closing_tag
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.cache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.ini.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.locale.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/object.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/xoopsart.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/textsanitizer/module.textsanitizer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/backend.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/banners.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/browse.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_xoops.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/apc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/memcache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/model.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xcache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.recaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image/scripts/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha/recaptchalib.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/class.tar.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/class.zipfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/criteria.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/database.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/databasefactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/downloader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/errorhandler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/folder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/xoopsfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/xoopslogger.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger_render.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.phpmailer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.pop3.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.smtp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/xoopsmultimailer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mimetypes.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/joint.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/read.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/stats.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/sync.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/write.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/pagenav.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/preload.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Config_File.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.assemble_plugin_filepath.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.assign_smarty_interface.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.create_dir_structure.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.display_debug_console.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.get_include_path.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.get_microtime.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.get_php_resource.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.is_secure.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.is_trusted.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.load_plugins.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.load_resource_plugin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.process_cached_inserts.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.process_compiled_include.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.read_cache_file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.rm_auto.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.rmdir.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.run_insert_handler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.smarty_include_php.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.write_cache_file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.write_compiled_include.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.write_compiled_resource.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.write_file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/block.textformat.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/compiler.assign.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.assign_debug_info.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.config_load.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.counter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.cycle.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.debug.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.eval.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.fetch.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_checkboxes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_options.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_radios.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_select_date.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_select_time.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_table.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.mailto.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.math.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.popup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.popup_init.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.capitalize.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.cat.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.count_characters.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.count_paragraphs.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.count_sentences.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.count_words.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.date_format.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.debug_print_var.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.default.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.escape.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.indent.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.lower.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.nl2br.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.regex_replace.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.replace.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.spacify.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.string_format.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.strip.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.strip_tags.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.truncate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.upper.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.wordwrap.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/shared.escape_special_chars.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/shared.make_timestamp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.includeq.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoAdminIcons.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoAdminNav.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoAppUrl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoImgUrl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons16.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIconsBookmarks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.block.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.xoops_link.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/modifier.debug_print_var.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/resource.db.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/snoopy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tardownloader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/template.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/censor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.custom.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/iframe/iframe.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/li/li.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mms/mms.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/rtsp/rtsp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/textfilter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/ul/ul.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wmp/wmp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/youtube/youtube.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme_blocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tree.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/uploader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/userutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/utility/xoopsutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/bloggerapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/metaweblogapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/movabletypeapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xmlrpcapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xmlrpcparser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xmlrpctag.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xoopsapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rss/xmlrss2parser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/saxparser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/themesetparser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/xmltaghandler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsblock.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopscomments.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/dhtmltextarea/language/english.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/textarea/editor_registry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/textarea/language/english.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/textarea/textarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formbutton.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formbuttontray.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelementtray.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formhidden.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formhiddentoken.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formlabel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formpassword.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradioyn.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectcheckgroup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectcountry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectgroup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectlang.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectmatchoption.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecttheme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecttimezone.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectuser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtext.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/grouppermform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/simpleform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/tableform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/themeform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsformloader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopskernel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopslists.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsload.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopslocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsmailer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsmodule.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsobject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopssecurity.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsstory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopstopic.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopstree.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsuser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/zipdownloader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/edituser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/footer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/imagemanager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/checklogin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_constants.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_delete.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_edit.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_form.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_new.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_post.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_reply.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_view.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/commentform.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/cp_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/cp_header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/defines.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/findusers.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/formdhtmltextarea_preview.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.encoding.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.legacy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/license.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/mimetypes.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_constants.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_select.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/old_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/old_theme_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/registerform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/searchform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/site-closed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoops13_header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopscodes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopslocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/class/dbmanager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/class/installwizard.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/class/pathcontroller.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/common.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/createconfigform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/license.dist.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/makedata.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/page.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/finish.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install2.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/support.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsave.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_dbconnection.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_dbsettings.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_langselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_modcheck.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_moduleinstaller.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_pathsettings.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_siteinit.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_start.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablescreate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablesfill.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_theme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/avatar.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/block.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/blockinstance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/comment.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configcategory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configitem.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configoption.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/group.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/groupperm.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/handlerregistry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imagecategory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imageset.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imagesetimg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/member.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/notification.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/object.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/online.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/privmessage.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/session.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/tplfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/tplset.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/lostpass.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/mainfile.dist.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/mainfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/misc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/class/message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/install.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/pmlite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/readpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/activate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/deactivate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/changemail.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/changepass.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/edituser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/footer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/install.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/lostpass.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/register.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/search.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/about.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/admin_menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/advisory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/center.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/blocks/blocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/module_icon.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/mytrustdirname.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/notification.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/notification_update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/oninstall.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/onuninstall.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/onupdate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/preloads/core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/search.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/avatars/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/avatars/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/banners/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/banners/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/blocksadmin/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/blocksadmin/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/comments/admin_header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/comments/comment_delete.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/comments/comment_edit.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/comments/comment_post.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/comments/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/comments/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groupperm.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groups/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groups/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/mailusers/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/mailusers/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/maintenance/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/maintenance/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/preferences/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/smilies/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/smilies/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/userrank/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/userrank/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/blocks/system_blocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/avatar.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/banner.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/bannerclient.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/bannerfinish.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/block.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/blocklinkmodule.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/breadcrumb.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/cookie.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/cpanel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/group.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/gui.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/smilies.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpThumb.config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpThumb.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.gif.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.ico.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/userrank.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/users.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/constants.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/include/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/preloads/core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/default.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/language/english/localsupport.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/legacy/cp_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/legacy/legacy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/thadmin/thadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/zetadigme/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/zetadigme/language/english/localsupport.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/zetadigme/menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/zetadigme/zetadigme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/notifications.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/pda.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/pmlite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/readpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/register.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/search.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/default/xo-info.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/extras/function.xoMemberInfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/language/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/xo-info.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/zetagenesis/language/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/zetagenesis/xo-info.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/userinfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/viewpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xmlrpc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_data/configs/xoopsconfig.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_data/data/secure.dist.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/advisory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/center.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/mymenu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin_menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/blocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/ProtectorFilter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/ProtectorMysqlDatabase.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/gtickets.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/protector.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/registry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/bruteforce_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/crawler_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/f5attack_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_deny_by_httpbl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_deny_by_rbl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4everyone.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4guest.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_need_multibyte.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_register_moratorium.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_register_insert_js_check.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_errorlog.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_redirection.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_bwlimit_errorlog.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_bwlimit_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/prepurge_exit_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/spamcheck_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_enabled/precommon_badip_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/include/install_extramodcheck.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/include/postcheck.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/include/postcheck_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/include/precheck.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/include/precheck_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/main/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/module_icon.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/notification.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/oninstall.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/onuninstall.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/onupdate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.admin.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.admin.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -74,4 +74,3 @@
echo $adminmenu_text;
}
endif;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.cache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.cache.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.cache.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -134,4 +134,3 @@
}
endif;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.config.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.config.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -110,4 +110,3 @@
}
endif;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.ini.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.ini.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.ini.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -31,12 +31,12 @@
{
if (empty($handler)) {
$handlerClass = "ArtObject";
- $fileName = "object.php";
+ $fileName = "object.php";
} else {
$handlerClass = "ArtObject".ucfirst($handler)."Handler";
- $fileName = "object.{$handler}.php";
+ $fileName = "object.{$handler}.php";
}
-
+
class_exists($handlerClass) || require_once FRAMEWORKS_ROOT_PATH . "/{$dirname}/{$fileName}";
return class_exists($handlerClass);
}
@@ -105,7 +105,7 @@
}
/**
- * Get localized string if it is defined
+ * Get localized string if it is defined
*
* @param string $name string to be localized
*/
@@ -125,7 +125,7 @@
}
/**
- * Get completed DB prefix if it is defined
+ * Get completed DB prefix if it is defined
*
* @param string $name string to be completed
* @param boolean $isRel relative - do not add XOOPS->DB prefix
@@ -140,7 +140,7 @@
}
/**
- * Display contents of a variable, an array or an object or an array of objects
+ * Display contents of a variable, an array or an object or an array of objects
*
* @param mixed $message variable/array/object
*/
@@ -153,7 +153,7 @@
elseif ($xoopsUser->isAdmin()) $level = 99;
else $level = 1;
if ($userlevel > $level) return;
-
+
echo "<div style=\"clear:both\"> </div>";
if (is_array($message) || is_object($message)) {
echo "<div><pre>";
@@ -211,7 +211,7 @@
// current dirname
($dirname == $_POST["dirname"] || $dirname == $_POST["module"])
&&
- // current op
+ // current op
("update_ok" == $_POST["op"] || "install_ok" == $_POST["op"] || "uninstall_ok" == $_POST["op"])
&&
// current action
@@ -221,4 +221,3 @@
}
endif;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.locale.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.locale.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.locale.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -1,9 +1,9 @@
<?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
+ 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.
@@ -26,4 +26,3 @@
xoops_load("XoopsLocal");
endif;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -13,7 +13,7 @@
if (defined('XOOPS_ART_FUNCTIONS')) return false;
define('XOOPS_ART_FUNCTIONS', true);
-
+
include_once dirname(__FILE__) . "/functions.ini.php";
load_functions("cache");
@@ -26,7 +26,7 @@
/**
* get MySQL server version
- *
+ *
* In some cases mysql_get_client_info is required instead
*
* @return string
@@ -42,5 +42,3 @@
}
return $mysql_version;
}
-
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.user.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.user.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.user.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -35,4 +35,3 @@
}
endif;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/object.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/object.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/object.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -113,4 +113,3 @@
}
}
//endif;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/xoops_version.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/xoops_version.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -11,4 +11,3 @@
*/
define("XOOPS_FRAMEWORKS_ART_VERSION", "1.0.0")
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/xoopsart.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/xoopsart.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/xoopsart.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -9,18 +9,18 @@
* @version $Id$
* @package Frameworks
*/
-
-class XoopsArt
+
+class XoopsArt
{
function __construct()
{
}
-
+
function XoopsArt()
{
$this->__construct();
}
-
+
/**
* Load a collective functions of Frameworks
*
@@ -32,4 +32,3 @@
return include_once FRAMEWORKS_ROOT_PATH . "/art/functions.{$group}" . (empty($group) ? "" : "." ) . "php";
}
}
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -22,7 +22,7 @@
var $_itemInfoBoxLine = array();
var $_itemConfigBoxLine = array();
var $_obj = array();
-
+
/**
* Constructor
*/
@@ -35,7 +35,7 @@
//$xoTheme->addStylesheet("Frameworks/moduleclasses/moduleadmin/css/admin.css");
$this -> loadLanguage();
}
-
+
function getInfo()
{
$infoArray = array();
@@ -61,7 +61,7 @@
$version = XOOPS_FRAMEWORKS_MODULEADMIN_VERSION;
return $version;
}
-
+
/**
* Return the Module Admin class release date
* return string version
@@ -75,7 +75,7 @@
$releasedate = XOOPS_FRAMEWORKS_MODULEADMIN_RELEASEDATE;
return $releasedate;
}
-
+
/**
* Return the available methods for the class
*
@@ -86,7 +86,7 @@
$myMethods = get_class_methods(__CLASS__);
return $myMethods;
}
-
+
//******************************************************************************************************************
// loadLanguage
//******************************************************************************************************************
@@ -165,7 +165,7 @@
$ret .= "<br /> <br /><br />";
return $ret;
}
-
+
function addItemButton($title, $link, $icon = 'add', $extra = '')
{
$ret['title'] = $title;
@@ -329,7 +329,7 @@
$ret .= $this -> _itemConfigBoxLine[$i];
$ret .= "<br />";
}
- }
+ }
$ret .= "</fieldset>\n";
$ret .= "</td>\n";
$ret .= "</tr>\n";
@@ -352,7 +352,7 @@
// addInfoBoxLine
//******************************************************************************************************************
// $label: title of InfoBox Line
- // $text:
+ // $text:
// $type: type of config: 1- "default": Just a line with value.
// 2- "information": check if this is an folder.
// 3- "chmod": check if this is the good chmod.
@@ -395,19 +395,19 @@
}
return $ret;
}
-
-
+
+
function renderAbout($paypal = '', $logo_xoops = true)
{
$path = XOOPS_URL . "/Frameworks/moduleclasses/icons/32/";
$ret = "<table>\n<tr>\n";
- $ret .= "<td width=\"50%\">\n";
+ $ret .= "<td width=\"50%\">\n";
$date = explode('/',$this->_obj->getInfo('release_date'));
$author = explode(',',$this->_obj->getInfo('author'));
$nickname = explode(',',$this->_obj->getInfo('nickname'));
- $release_date = formatTimestamp(mktime(0, 0, 0, $date[1], $date[2], $date[0]), 's');
- $module_info = '<div id="about"><label>' . _AM_MODULEADMIN_ABOUT_DESCRIPTION . '</label><text>' . $this->_obj->getInfo("description") . '</text><br />
+ $release_date = formatTimestamp(mktime(0, 0, 0, $date[1], $date[2], $date[0]), 's');
+ $module_info = '<div id="about"><label>' . _AM_MODULEADMIN_ABOUT_DESCRIPTION . '</label><text>' . $this->_obj->getInfo("description") . '</text><br />
<label>' . _AM_MODULEADMIN_ABOUT_UPDATEDATE . '</label><text class="bold">' . formatTimestamp($this->_obj->getVar("last_update"),"m") . '</text><br />
<label>' . _AM_MODULEADMIN_ABOUT_MODULESTATUS . '</label><text>' . $this->_obj->getInfo("module_status") . '</text><br />
<label>' . _AM_MODULEADMIN_ABOUT_WEBSITE . '</label><text><a class="tooltip" href="http://' . $this->_obj->getInfo("module_website_url") . '" rel="external" title="'. $this->_obj->getInfo("module_website_name") . ' - ' . $this->_obj->getInfo("module_website_url") . '">
@@ -423,11 +423,11 @@
$ret .= "by ";
foreach (array_keys($author) as $i) {
$ret .= $author[$i];
- if (isset($nickname[$i]) && $nickname[$i] !='') {
+ if (isset($nickname[$i]) && $nickname[$i] !='') {
$ret .= " (" . $nickname[$i] . "), ";
}else{
$ret .= ", ";
- }
+ }
}
$ret = substr($ret,0,-2);
$ret .= "</div>\n";
@@ -446,7 +446,7 @@
</form>';
}
$ret .= "</div>\n";
- $ret .= "</td>\n</tr>\n</table>\n";
+ $ret .= "</td>\n</tr>\n</table>\n";
$this -> addInfoBox(_AM_MODULEADMIN_ABOUT_MODULEINFO);
$this -> addInfoBoxLine(_AM_MODULEADMIN_ABOUT_MODULEINFO, $module_info, '', '', 'information');
$ret .= $this -> renderInfoBox();
@@ -469,7 +469,7 @@
if ( is_readable( $file ) ){
$ret .= utf8_encode(implode("<br />", file( $file ))) . "\n";
}
- }
+ }
$ret .= "</div>\n";
$ret .= "</fieldset>\n";
$ret .= "</td>\n";
@@ -482,7 +482,7 @@
}
return $ret;
}
-
+
function addNavigation($menu = '')
{
$ret = "";
@@ -505,4 +505,3 @@
return $ret;
}
}
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -16,4 +16,3 @@
define("XOOPS_FRAMEWORKS_MODULEADMIN_VERSION", "1.1");
define("XOOPS_FRAMEWORKS_MODULEADMIN_RELEASEDATE", "2011/08/01");
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/textsanitizer/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/textsanitizer/module.textsanitizer.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/textsanitizer/module.textsanitizer.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -3,4 +3,3 @@
class MyTextSanitizerExtended extends MyTextSanitizer
{
}
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/admin.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/admin.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -130,5 +130,3 @@
}
}
xoops_cp_footer();
-
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/backend.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/backend.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/backend.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -68,4 +68,3 @@
}
}
$tpl->display('db:system_rss.html');
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/banners.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/banners.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/banners.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -385,5 +385,3 @@
clientlogin();
break;
}
-
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/browse.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/browse.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/browse.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -94,4 +94,3 @@
echo $buffer;
}
fclose($handle);
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -99,5 +99,3 @@
return $ret;
}
}
-
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -115,5 +115,3 @@
return $userDN;
}
} // end class
-
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -281,5 +281,3 @@
return $xoopsUser;
}
} // end class
-
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php 2013-09-13 20:38:32 UTC (rev 12032)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php 2013-09-14 03:16:44 UTC (rev 12033)
@@ -202,5 +202,3 @@
...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-13 20:38:35
|
Revision: 12032
http://sourceforge.net/p/xoops/svn/12032
Author: luciorota
Date: 2013-09-13 20:38:32 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
submit.php refcatory
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-13 20:32:24 UTC (rev 12031)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-13 20:38:32 UTC (rev 12032)
@@ -394,7 +394,7 @@
$screenshot4 = '';
if ($lid == 0) {
- $notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) ? 1 : 0;
+ $notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == true);
$download->setVar('notifypub', $notifypub);
$download->setVar('ipaddress', $_SERVER['REMOTE_ADDR']);
@@ -429,7 +429,7 @@
exit();
} else {
if ($wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_DOWNLOAD || $wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_BOTH) {
- $notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) ? 1 : 0;
+ $notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == true);
$download->setVar('notifypub', $notifypub);
$download->setVar('ipaddress', $_SERVER['REMOTE_ADDR']);
$download->setVar('updated', time());
|
|
From: <luc...@us...> - 2013-09-13 20:32:27
|
Revision: 12031
http://sourceforge.net/p/xoops/svn/12031
Author: luciorota
Date: 2013-09-13 20:32:24 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
submit.php refactory
bugfix
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/object.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/xoopstree.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery-latest.js
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_disclaimer.html
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -55,7 +55,7 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $file = $wfdownloads->getConfig('uploaddir') . "/" . $download->getVar('filename');
+ $file = $wfdownloads->getConfig('uploaddir') . '/' . $download->getVar('filename');
if (is_file($file)) {
@chmod($file, 0777);
@unlink($file);
@@ -667,8 +667,8 @@
$offline = ($_POST['offline'] == 1) ? 1 : 0;
$download->setVar('offline', $offline);
- $approved = (isset($_POST['approved']) && $_POST['approved'] == 1) ? 1 : 0;
- $notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == 1);
+ $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
+ $notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == true);
$expiredate = 0;
if (!$lid) {
@@ -729,7 +729,7 @@
$entries[$fid][0] = "";
$owner = "";
}
- $owner_groups =& $member_handler->getGroupsByUser($owner, FALSE);
+ $owner_groups =& $member_handler->getGroupsByUser($owner, false);
$uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
$groups = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
$entries = handleSubmission($formulize_mgr, $entries, $uid, $owner, $fid, $owner_groups, $groups, "new"); // "new" causes xoops token check to be skipped, since WF-downloads should be doing that
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -25,19 +25,19 @@
switch ($op) {
case "image.upload" :
if ($_FILES['uploadfile']['name'] != "") {
- if (file_exists(XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'] . "/" . $_FILES['uploadfile']['name'])) {
+ if (file_exists(XOOPS_ROOT_PATH . '/' . $_POST['uploadpath'] . '/' . $_FILES['uploadfile']['name'])) {
redirect_header($currentFile, 2, _AM_WFD_DOWN_IMAGEEXIST);
}
$allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
$maxFileSize = $wfdownloads->getConfig('maxfilesize');
$maxImgWidth = $wfdownloads->getConfig('maximgwidth');
$maxImgHeight = $wfdownloads->getConfig('maximgheight');
- $uploadDir = XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'];
+ $uploadDir = XOOPS_ROOT_PATH . '/' . $_POST['uploadpath'];
$screenShot = strtolower($_FILES['uploadfile']['name']);
- wfdownloads_uploading($screenShot, XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'], $allowedMimetypes, $currentFile, 1, false, true);
+ wfdownloads_uploading($screenShot, XOOPS_ROOT_PATH . '/' . $_POST['uploadpath'], $allowedMimetypes, $currentFile, 1, false, true);
include_once WFDOWNLOADS_ROOT_PATH . '/class/img_uploader.php';
- $uploader = new XoopsMediaImgUploader($uploadDir . "/", $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
+ $uploader = new XoopsMediaImgUploader($uploadDir . '/', $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
redirect_header($currentFile, 2 , _AM_WFD_DOWN_IMAGEUPLOAD);
exit();
@@ -51,7 +51,7 @@
$ok = WfdownloadsRequest::getBool('ok', false, 'POST');
if ($ok == true) {
- $fileToDelete = XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'] . "/" . $_POST['downfile'];
+ $fileToDelete = XOOPS_ROOT_PATH . '/' . $_POST['uploadpath'] . '/' . $_POST['downfile'];
if (file_exists($fileToDelete)) {
chmod($fileToDelete, 0666);
if (@unlink($fileToDelete)) {
@@ -119,17 +119,17 @@
ob_end_clean();
if ($rootPath > 0) {
- $iform->addElement(new XoopsFormLabel(_AM_WFD_DOWN_FUPLOADPATH, XOOPS_ROOT_PATH . "/" . $dirArray[$rootPath]));
- $iform->addElement(new XoopsFormLabel(_AM_WFD_DOWN_FUPLOADURL, XOOPS_URL . "/" . $dirArray[$rootPath]));
+ $iform->addElement(new XoopsFormLabel(_AM_WFD_DOWN_FUPLOADPATH, XOOPS_ROOT_PATH . '/' . $dirArray[$rootPath]));
+ $iform->addElement(new XoopsFormLabel(_AM_WFD_DOWN_FUPLOADURL, XOOPS_URL . '/' . $dirArray[$rootPath]));
- $graph_array = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . "/" . $dirArray[$rootPath], $type = "images");
+ $graph_array = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $dirArray[$rootPath], $type = "images");
$indeximage_select = new XoopsFormSelect('', 'downfile', '');
$indeximage_select->addOptionArray($graph_array);
$indeximage_select->setExtra("onchange='showImgSelected(\"image\", \"downfile\", \"" . $dirArray[$rootPath] . "\", \"\", \"" . XOOPS_URL . "\")'");
$indeximage_tray = new XoopsFormElementTray(_AM_WFD_DOWN_FSHOWSELECTEDIMAGE, ' ');
$indeximage_tray->addElement($indeximage_select);
if (!empty($_REQUEST['downfile'])) {
- $indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/" . $dirArray[$rootPath] . "/" . $_REQUEST['downfile'] . "' name='image' id='image' alt='' title='image' />"));
+ $indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $dirArray[$rootPath] . '/' . $_REQUEST['downfile'] . "' name='image' id='image' alt='' title='image' />"));
} else {
$indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' name='image' id='image' alt='' title='image' />"));
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -60,14 +60,14 @@
$sform = new XoopsThemeForm(_AM_WFD_IPAGE_MODIFY, "op", xoops_getenv('PHP_SELF'));
$sform->addElement(new XoopsFormText(_AM_WFD_IPAGE_CTITLE, 'indexheading', 60, 60, $indexheading), false);
- $graph_array = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . "/" . $wfdownloads->getConfig('mainimagedir'), $type = "images");
+ $graph_array = WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('mainimagedir'), $type = "images");
$indeximage_select = new XoopsFormSelect('', 'indeximage', $indeximage);
$indeximage_select->addOptionArray($graph_array);
$indeximage_select->setExtra("onchange='showImgSelected(\"image\", \"indeximage\", \"" . $wfdownloads->getConfig('mainimagedir') . "\", \"\", \"" . XOOPS_URL . "\")'");
$indeximage_tray = new XoopsFormElementTray(_AM_WFD_IPAGE_CIMAGE, ' ');
$indeximage_tray->addElement($indeximage_select);
if (!empty($indeximage)) {
- $indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/".$wfdownloads->getConfig('mainimagedir')."/" . $indeximage . "' name='image' id='image' alt='' title='image' />"));
+ $indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/'.$wfdownloads->getConfig('mainimagedir').'/' . $indeximage . "' name='image' id='image' alt='' title='image' />"));
} else {
$indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' name='image' id='image' alt='' title='image' />"));
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -46,7 +46,7 @@
echo $adminMenu->renderButton();
echo "<fieldset>\n";
- echo "<legend style='font-weight: bold; color: #900;'>" . _AM_WFD_MIME_CREATEF . "/" . _AM_WFD_MIME_MODIFYF . "</legend>\n";
+ echo "<legend style='font-weight: bold; color: #900;'>" . _AM_WFD_MIME_CREATEF . '/' . _AM_WFD_MIME_MODIFYF . "</legend>\n";
echo "<div>" . _AM_WFD_MIME_INFOTEXT . "</div>\n";
echo "</fieldset>\n";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -103,22 +103,22 @@
break;
case "screenshot":
if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $wfdownloads->getConfig('screenshots') . "/" . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
+ $content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
case "screenshot2":
if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $wfdownloads->getConfig('screenshots') . "/" . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
+ $content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
case "screenshot3":
if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $wfdownloads->getConfig('screenshots') . "/" . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
+ $content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
case "screenshot4":
if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $wfdownloads->getConfig('screenshots') . "/" . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
+ $content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
case "features":
@@ -131,7 +131,7 @@
}
break;
case "dhistory":
- $content = $myts->displayTarea($content, 1, 0, 0, 0, 1);
+ $content = $myts->displayTarea($content, true, false, false, false, true);
break;
}
$sform->addElement(new XoopsFormLabel($lang_def, $content));
@@ -169,22 +169,22 @@
break;
case "screenshot":
if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $wfdownloads->getConfig('screenshots') . "/" . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
+ $content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
case "screenshot2":
if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $wfdownloads->getConfig('screenshots') . "/" . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
+ $content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
case "screenshot3":
if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $wfdownloads->getConfig('screenshots') . "/" . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
+ $content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
case "screenshot4":
if ($content != "") {
- $content = "<img src='" . XOOPS_URL . "/" . $wfdownloads->getConfig('screenshots') . "/" . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
+ $content = "<img src='" . XOOPS_URL . '/' . $wfdownloads->getConfig('screenshots') . '/' . $content . "' width='" . $wfdownloads->getConfig('shotwidth') . "' alt='' title='' />";
}
break;
case "features":
@@ -197,7 +197,7 @@
}
break;
case "dhistory":
- $content = $myts->displayTarea($content, 1, 0, 0, 0, 1);
+ $content = $myts->displayTarea($content, true, false, false, false, true);
break;
}
$sform->addElement(new XoopsFormLabel($lang_def, $content));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -101,14 +101,14 @@
$groups_up_select->setDescription(_AM_WFD_FCATEGORY_GROUPPROMPT_UP_DESC);
$form->addElement($groups_up_select);
- $graph_array = & WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . "/" . $this->wfdownloads->getConfig('catimage'), $type = "images");
+ $graph_array = & WfsLists::getListTypeAsArray(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('catimage'), $type = "images");
$indeximage_select = new XoopsFormSelect('', 'imgurl', $this->getVar('imgurl'));
$indeximage_select->addOptionArray($graph_array);
$indeximage_select->setExtra("onchange='showImgSelected(\"image\", \"imgurl\", \"" . $this->wfdownloads->getConfig('catimage') . "\", \"\", \"" . XOOPS_URL . "\")'");
$indeximage_tray = new XoopsFormElementTray(_AM_WFD_FCATEGORY_CIMAGE, ' ');
$indeximage_tray->addElement($indeximage_select);
if ($this->getVar('imgurl') != "") {
- $indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/" . $this->wfdownloads->getConfig('catimage') . "/" . $this->getVar('imgurl') . "' name='image' id='image' alt='' title='image' />"));
+ $indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('catimage') . '/' . $this->getVar('imgurl') . "' name='image' id='image' alt='' title='image' />"));
} else {
$indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' name='image' id='image' alt='' title='image' />"));
}
@@ -158,25 +158,25 @@
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('op', 'save'));
if ($this->isNew()) {
- $button_create = new XoopsFormButton('', '', _AM_WFD_BSAVE, 'submit');
+ $button_create = new XoopsFormButton('', '', _SAVE, 'submit');
$button_create->setExtra('onclick="this.form.elements.op.value=\'category.save\'"');
$button_tray->addElement($button_create);
- $button_reset = new XoopsFormButton('', '', _AM_WFD_BRESET, 'reset');
+ $button_reset = new XoopsFormButton('', '', _RESET, 'reset');
$button_tray->addElement($button_reset);
- $button_cancel = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'button');
+ $button_cancel = new XoopsFormButton('', '', _CANCEL, 'button');
$button_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement($button_cancel);
} else {
$form->addElement(new XoopsFormHidden('cid', $this->getVar('cid')));
- $button_create = new XoopsFormButton('', '', _AM_WFD_BMODIFY, 'submit');
+ $button_create = new XoopsFormButton('', '', _MODIFY, 'submit');
$button_create->setExtra('onclick="this.form.elements.op.value=\'category.save\'"');
$button_tray->addElement($button_create);
- $button_delete = new XoopsFormButton('', '', _AM_WFD_BDELETE, 'submit');
+ $button_delete = new XoopsFormButton('', '', _DELETE, 'submit');
$button_delete->setExtra('onclick="this.form.elements.op.value=\'category.delete\'"');
$button_tray->addElement($button_delete);
- $button_reset = new XoopsFormButton('', '', _AM_WFD_BRESET, 'reset');
+ $button_reset = new XoopsFormButton('', '', _RESET, 'reset');
$button_tray->addElement($button_reset);
- $button_cancel = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'button');
+ $button_cancel = new XoopsFormButton('', '', _CANCEL, 'button');
$button_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement($button_cancel);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -157,45 +157,45 @@
if ($this->getVar('screenshot')) {
$download['screenshot_full'] = $this->getVar('screenshot');
- if ($this->getVar('screenshot') && file_exists(XOOPS_ROOT_PATH . "/" . $this->wfdownloads->getConfig('screenshots') . "/" . xoops_trim($this->getVar('screenshot')))) {
+ if ($this->getVar('screenshot') && file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot')))) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb'] = wfdownloads_createThumb($download['screenshot_full'], $this->wfdownloads->getConfig('screenshots'), "thumbs", $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
$this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect'));
} else {
- $download['screenshot_thumb'] = XOOPS_URL . "/" . $this->wfdownloads->getConfig('screenshots') . "/" . xoops_trim($this->getVar('screenshot'));
+ $download['screenshot_thumb'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot'));
}
}
}
if ($this->getVar('screenshot2') && $this->wfdownloads->getConfig('max_screenshot') >= 2) {
$download['screenshot_full2'] = $this->getVar('screenshot2');
- if ($this->getVar('screenshot2') && file_exists(XOOPS_ROOT_PATH . "/" . $this->wfdownloads->getConfig('screenshots') . "/" . xoops_trim($this->getVar('screenshot2')))) {
+ if ($this->getVar('screenshot2') && file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot2')))) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb2'] = wfdownloads_createThumb($download['screenshot_full2'], $this->wfdownloads->getConfig('screenshots'), "thumbs", $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
$this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect'));
} else {
- $download['screenshot_thumb2'] = XOOPS_URL . "/" . $this->wfdownloads->getConfig('screenshots') . "/" . xoops_trim($this->getVar('screenshot2'));
+ $download['screenshot_thumb2'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot2'));
}
}
}
if ($this->getVar('screenshot3') && $this->wfdownloads->getConfig('max_screenshot') >= 3) {
$download['screenshot_full3'] = $this->getVar('screenshot3');
- if ($this->getVar('screenshot3') && file_exists(XOOPS_ROOT_PATH . "/" . $this->wfdownloads->getConfig('screenshots') . "/" . xoops_trim($this->getVar('screenshot3')))) {
+ if ($this->getVar('screenshot3') && file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot3')))) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb3'] = wfdownloads_createThumb($download['screenshot_full3'], $this->wfdownloads->getConfig('screenshots'), "thumbs", $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
$this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect'));
} else {
- $download['screenshot_thumb3'] = XOOPS_URL . "/" . $this->wfdownloads->getConfig('screenshots') . "/" . xoops_trim($this->getVar('screenshot3'));
+ $download['screenshot_thumb3'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot3'));
}
}
}
if ($this->getVar('screenshot4') && $this->wfdownloads->getConfig('max_screenshot') >= 4) {
$download['screenshot_full4'] = $this->getVar('screenshot4');
- if ($this->getVar('screenshot4') && file_exists(XOOPS_ROOT_PATH . "/" . $this->wfdownloads->getConfig('screenshots') . "/" . xoops_trim($this->getVar('screenshot4')))) {
+ if ($this->getVar('screenshot4') && file_exists(XOOPS_ROOT_PATH . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot4')))) {
if ($this->wfdownloads->getConfig('usethumbs') == true) {
$download['screenshot_thumb4'] = wfdownloads_createThumb($download['screenshot_full4'], $this->wfdownloads->getConfig('screenshots'), "thumbs", $this->wfdownloads->getConfig('shotwidth'), $this->wfdownloads->getConfig('shotheight'),
$this->wfdownloads->getConfig('imagequality'), $this->wfdownloads->getConfig('updatethumbs'), $this->wfdownloads->getConfig('keepaspect'));
} else {
- $download['screenshot_thumb4'] = XOOPS_URL . "/" . $this->wfdownloads->getConfig('screenshots') . "/" . xoops_trim($this->getVar('screenshot4'));
+ $download['screenshot_thumb4'] = XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . xoops_trim($this->getVar('screenshot4'));
}
}
}
@@ -237,7 +237,7 @@
// generate autosummary
$summaryLength = (int)$this->wfdownloads->getConfig('autosumlength');
$summaryDescription = stripslashes($this->getVar('description'));
- $download['summary'] = $myts->displayTarea($summaryDescription, 1);
+ $download['summary'] = $myts->displayTarea($summaryDescription, true);
if (strlen($summaryDescription) > $summaryLength) {
$download['summary'] = wfdownloads_truncateHtml($download['summary'], $summaryLength, '...', false, true);
} else {
@@ -265,7 +265,7 @@
$platformArray = $this->wfdownloads->getConfig('platform');
$download['platform'] = $myts->htmlSpecialChars($platformArray[$this->getVar('platform')]);
$history = $this->getVar('dhistory', 'n');
- $download['history'] = $myts->displayTarea($history, 1);
+ $download['history'] = $myts->displayTarea($history, true);
$download['features'] = '';
if ($this->getVar('features')) {
$downloadfeatures = explode('|', trim($this->getVar('features')));
@@ -447,24 +447,33 @@
$sform->addElement(new XoopsFormFile(_MD_WFD_DUPLOADSCRSHOT, 'screenshot4', 0), false);
}
}
- $option_tray = new XoopsFormElementTray(_MD_WFD_OPTIONS, '<br />');
- $notify_checkbox = new XoopsFormCheckBox('', 'notifypub');
- $notify_checkbox->addOption(1, _MD_WFD_NOTIFYAPPROVE);
- $option_tray->addElement($notify_checkbox);
+ $option_tray = new XoopsFormElementTray(_MD_WFD_OPTIONS, '<br />');
+ $notify_checkbox = new XoopsFormCheckBox('', 'notifypub');
+ $notify_checkbox->addOption(1, _MD_WFD_NOTIFYAPPROVE);
+ $option_tray->addElement($notify_checkbox);
$sform->addElement($option_tray);
// button tray
$button_tray = new XoopsFormElementTray('', '');
- if (!$this->isNew()) {
- $button_tray->addElement(new XoopsFormHidden('lid', (int)$this->getVar('lid', 'e')));
- }
- $button_submit = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
- $button_tray->addElement($button_submit);
+ if ($this->isNew()) {
+ $button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
+ $button_submit = new XoopsFormButton('', '', _SAVE, 'submit');
+ $button_submit->setExtra('onclick="this.form.elements.op.value=\'download.save\'"');
+ $button_tray->addElement($button_submit);
+ } else {
+ $button_tray->addElement(new XoopsFormHidden('lid', (int)$this->getVar('lid')));
+ $button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
+ $button_submit = new XoopsFormButton('', '', _MODIFY, 'submit');
+ $button_submit->setExtra('onclick="this.form.elements.op.value=\'download.save\'"');
+ $button_tray->addElement($button_submit);
+ }
$button_reset = new XoopsFormButton('', '', _RESET, 'reset');
$button_tray->addElement($button_reset);
$button_cancel = new XoopsFormButton('', '', _CANCEL, 'button');
$button_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement($button_cancel);
$sform->addElement($button_tray);
+
+
return $sform;
}
@@ -637,7 +646,7 @@
$indeximage_tray = new XoopsFormElementTray(_AM_WFD_FILE_SHOTIMAGE, ' ');
$indeximage_tray->addElement($indeximage_select);
if ($this->getVar('screenshot') != '') {
- $indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/" . $this->wfdownloads->getConfig('screenshots') . "/" . $this->getVar('screenshot', 'e') . "' id='image1' alt='' title='screenshot 1' />"));
+ $indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot', 'e') . "' id='image1' alt='' title='screenshot 1' />"));
} else {
$indeximage_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image1' alt='' title='' />"));
}
@@ -650,7 +659,7 @@
$indeximage_tray2 = new XoopsFormElementTray(_AM_WFD_FILE_SHOTIMAGE, ' ');
$indeximage_tray2->addElement($indeximage_select2);
if ($this->getVar('screenshot2') != '') {
- $indeximage_tray2->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . "/" . $this->getVar('screenshot2', 'e') . "' id='image2' alt='' title='screenshot 2' />"));
+ $indeximage_tray2->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot2', 'e') . "' id='image2' alt='' title='screenshot 2' />"));
} else {
$indeximage_tray2->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image2' alt='' title='' />"));
}
@@ -663,7 +672,7 @@
$indeximage_tray3 = new XoopsFormElementTray(_AM_WFD_FILE_SHOTIMAGE, ' ');
$indeximage_tray3->addElement($indeximage_select3);
if ($this->getVar('screenshot3') != '') {
- $indeximage_tray3->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . "/" . $this->getVar('screenshot3', 'e') . "' id='image3' alt='' title='screenshot 3' />"));
+ $indeximage_tray3->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot3', 'e') . "' id='image3' alt='' title='screenshot 3' />"));
} else {
$indeximage_tray3 -> addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image3' alt='' title='' />"));
}
@@ -676,7 +685,7 @@
$indeximage_tray4 = new XoopsFormElementTray(_AM_WFD_FILE_SHOTIMAGE, ' ');
$indeximage_tray4->addElement($indeximage_select4);
if ($this->getVar('screenshot4') != "") {
- $indeximage_tray4->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . "/" . $this->getVar('screenshot4', 'e') . "' id='image4' alt='' title='screenshot 4' />"));
+ $indeximage_tray4->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . '/' . $this->wfdownloads->getConfig('screenshots') . '/' . $this->getVar('screenshot4', 'e') . "' id='image4' alt='' title='screenshot 4' />"));
} else {
$indeximage_tray4->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' id='image4' alt='' title='' />"));
}
@@ -735,22 +744,22 @@
$button_tray->addElement(new XoopsFormHidden('status', 1));
$button_tray->addElement(new XoopsFormHidden('notifypub', $this->getVar('notifypub', 'e')));
$button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
- $button_tray->addElement(new XoopsFormButton('', '', _AM_WFD_BSAVE, 'submit'));
+ $button_tray->addElement(new XoopsFormButton('', '', _SAVE, 'submit'));
$button_reset = new XoopsFormButton('', '', _RESET, 'reset');
$button_tray->addElement($button_reset);
$button_cancel = new XoopsFormButton('', '', _CANCEL, 'button');
$button_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement($button_cancel);
} else {
+ $button_tray->addElement(new XoopsFormHidden('status', 2));
$button_tray->addElement(new XoopsFormHidden('lid', (int)$this->getVar('lid')));
- $button_tray->addElement(new XoopsFormHidden('status', 2));
$button_tray->addElement(new XoopsFormHidden('op', 'download.save'));
- $butt_dup = new XoopsFormButton('', '', _AM_WFD_BMODIFY, 'submit');
- $butt_dup->setExtra('onclick="this.form.elements.op.value=\'download.save\'"');
- $button_tray->addElement($butt_dup);
- $butt_dupct = new XoopsFormButton('', '', _DELETE, 'submit');
- $butt_dupct->setExtra('onclick="this.form.elements.op.value=\'download.delete\'"');
- $button_tray->addElement($butt_dupct);
+ $button_submit = new XoopsFormButton('', '', _MODIFY, 'submit');
+ $button_submit->setExtra('onclick="this.form.elements.op.value=\'download.save\'"');
+ $button_tray->addElement($butt_submit);
+ $button_delete = new XoopsFormButton('', '', _DELETE, 'submit');
+ $button_delete->setExtra('onclick="this.form.elements.op.value=\'download.delete\'"');
+ $button_tray->addElement($button_delete);
$butt_dupct2 = new XoopsFormButton('', '', _AM_WFD_BCANCEL, 'submit');
$butt_dupct2->setExtra('onclick="this.form.elements.op.value=\'downloadsConfigMenu\'"');
$button_tray->addElement($butt_dupct2);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/object.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/object.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/object.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -80,7 +80,7 @@
*
* @param mixed $id ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
* @param bool $as_object whether to return an object or an array
- * @return mixed reference to the object, FALSE if failed
+ * @return mixed reference to the object, false if failed
*/
function &get($id, $as_object = true) {
if (is_array($this->keyName)) {
@@ -263,7 +263,7 @@
*
* @param object $obj reference to the object to delete
* @param bool $force
- * @return bool FALSE if failed.
+ * @return bool false if failed.
*/
function delete(&$obj, $force = false)
{
@@ -294,7 +294,7 @@
* @param object $obj reference to the object
* @param bool $force whether to force the query execution despite security settings
* @param bool $checkObject check if the object is dirty and clean the attributes
- * @return bool FALSE if failed, TRUE if already present and unchanged or successful
+ * @return bool false if failed, true if already present and unchanged or successful
*/
function insert(&$obj, $force = false, $checkObject = true)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/xoopstree.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/xoopstree.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/xoopstree.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -135,7 +135,7 @@
list ($parentid, $name) = $this->db->fetchRow($result);
$myts = MyTextSanitizer::getInstance();
$name = $myts->htmlspecialchars($name);
- $path = "/" . $name . $path . "";
+ $path = '/' . $name . $path . "";
if ($parentid == 0) {
return $path;
}
@@ -217,7 +217,7 @@
return $path;
}
list ($parentid) = $this->db->fetchRow($result);
- $path = "/" . $sel_id . $path . "";
+ $path = '/' . $sel_id . $path . "";
if ($parentid == 0) {
return $path;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -166,7 +166,7 @@
* @param string $dir path to the directory to make
* @param int $perm mode
* @param bool $create_index if true create index.html
- * @return bool Returns TRUE on success or FALSE on failure
+ * @return bool Returns true on success or false on failure
*/
function wfdownloads_makeDir($dir, $perm = 0777, $create_index = true) {
if (!is_dir($dir)){
@@ -187,7 +187,7 @@
*
* @param string $source is the original directory
* @param string $destination is the destination directory
- * @return bool Returns TRUE on success or FALSE on failure
+ * @return bool Returns true on success or false on failure
*
*/
function wfdownloads_copyFile($source, $destination) {
@@ -202,7 +202,7 @@
*
* @param string $source is the original directory
* @param string $destination is the destination directory
- * @return bool Returns TRUE on success or FALSE on failure
+ * @return bool Returns true on success or false on failure
*
*/
function wfdownloads_copyDir($source, $destination) {
@@ -228,8 +228,8 @@
* Delete a empty/not empty directory
*
* @param string $dir path to the directory to delete
- * @param bool $if_not_empty if FALSE it delete directory only if false
- * @return bool Returns TRUE on success or FALSE on failure
+ * @param bool $if_not_empty if false it delete directory only if false
+ * @return bool Returns true on success or false on failure
*/
function wfdownloads_delDir($dir, $if_not_empty = true) {
if (!file_exists($dir)) return true;
@@ -463,7 +463,7 @@
*
* @param string $key
* @param string $value
- * @return bool TRUE if success, FALSE if failure
+ * @return bool true if success, false if failure
*
* @access public
* @author xhelp development team
@@ -986,10 +986,10 @@
$imagePath = XOOPS_ROOT_PATH . "/{$img_path}/{$imgName}";
$saveFile = "{$imgPath}/{$imgSavePath}/{$width}x{$height}_{$imgName}";
- $savePath = XOOPS_ROOT_PATH . "/" . $savefile;
+ $savePath = XOOPS_ROOT_PATH . '/' . $savefile;
// Return the image if no update and image exists
if ($update == 0 && file_exists($savePath)) {
- return XOOPS_URL . "/" . $saveFile;
+ return XOOPS_URL . '/' . $saveFile;
}
list($origWidth, $origHeight, $type, $attr) = getimagesize($imagePath, $info);
@@ -1058,7 +1058,7 @@
}
imagedestroy($img);
flush();
- return XOOPS_URL . "/" . $saveFile;
+ return XOOPS_URL . '/' . $saveFile;
}
@@ -1216,7 +1216,7 @@
redirect_header($redirectURL, 1 , _AM_WFD_UPLOADFILE);
} else {
if (is_file($uploader->savedDestination)) {
-// $file['url'] = XOOPS_URL . "/" . $uploadDirectory . "/";
+// $file['url'] = XOOPS_URL . '/' . $uploadDirectory . '/';
$file['filename'] = strtolower($uploader->savedFileName);
$file['filetype'] = $_FILES['userfile']['type'];
$file['size'] = filesize($uploadDirectory . strtolower($uploader->savedFileName));
@@ -1484,7 +1484,7 @@
$wfdownloads = WfdownloadsWfdownloads::getInstance();
$search_query = stripslashes($search_query);
- if(((strlen($search_query) > 2) && ($last_query != $search_query) ) && ($page == FALSE)) {
+ if(((strlen($search_query) > 2) && ($last_query != $search_query) ) && ($page == false)) {
//print "<BR>SEARCH!";
// Get the first word in $search_query and use it for the $summary_query.
$summary_query = str_replace("\""," ",$search_query);
@@ -1529,8 +1529,8 @@
// strip out all but the number of hits
$num_results = ereg_replace('# Number of hits: ', '', $num_line);
- //$table_header_flag = FALSE;
- //$disp_nff_flag = TRUE;
+ //$table_header_flag = false;
+ //$disp_nff_flag = true;
while ($line = @fgets($pipe_handler, 4096)) {
// loop through each line of the pipe result (i.e. swish-e output)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -123,14 +123,15 @@
$gperm_handler = xoops_gethandler('groupperm');
$category_handler = xoops_getmodulehandler('category', $module->dirname());
+
$cids = $category_handler->getIds();
if (count($cids) > 0) {
- echo "<br /><b>Adding upload permissions to categories</b><br />";
+ echo "<br /><B>Adding upload permissions to categories</B><br />";
foreach ($cids as $cid) {
- $allowedDownGroupsIds = $gperm_handler->getGroupIds('WFDownCatPerm', $cid, $module->mid());
- foreach ($allowedDownGroupsIds as $allowedDownGroupsId) {
+ $down_groups_ids = $gperm_handler->getGroupIds('WFDownCatPerm', $cid, $module->mid());
+ foreach ($down_groups_ids as $down_group_id) {
//$gperm_handler->deleteByModule($module->mid(), 'WFUpCatPerm', $cid);
- $gperm_handler->addRight('WFUpCatPerm', $cid, $allowedDownGroupsId, $module->mid());
+ $gperm_handler->addRight('WFUpCatPerm', $cid, $down_group_id, $module->mid());
}
}
} else {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -139,13 +139,13 @@
}
}
$isNewImage = wfdownloads_isNewImage($publishdate);
- if (($mainCategories[$i]->getVar('imgurl') != "") && is_file(XOOPS_ROOT_PATH . "/" . $wfdownloads->getConfig('catimage') . "/" . $mainCategories[$i]->getVar('imgurl'))) {
+ if (($mainCategories[$i]->getVar('imgurl') != "") && is_file(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage') . '/' . $mainCategories[$i]->getVar('imgurl'))) {
if ($wfdownloads->getConfig('usethumbs') && function_exists('gd_info')) {
$imageURL = wfdownloads_createThumb($mainCategories[$i]->getVar('imgurl'), $wfdownloads->getConfig('catimage'),
"thumbs", $wfdownloads->getConfig('cat_imgwidth'), $wfdownloads->getConfig('cat_imgheight'),
$wfdownloads->getConfig('imagequality'), $wfdownloads->getConfig('updatethumbs'), $wfdownloads->getConfig('keepaspect'));
} else {
- $imageURL = XOOPS_URL . "/" . $wfdownloads->getConfig('catimage') . "/" . $mainCategories[$i]->getVar('imgurl');
+ $imageURL = XOOPS_URL . '/' . $wfdownloads->getConfig('catimage') . '/' . $mainCategories[$i]->getVar('imgurl');
}
} else {
$imageURL = $isNewImage['image'];
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery-latest.js
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery-latest.js 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery-latest.js 2013-09-13 20:32:24 UTC (rev 12031)
@@ -1051,11 +1051,11 @@
// DEPRECATED
// And the / root expression
- } else if ( !t.indexOf("/") && !context.ownerDocument ) {
+ } else if ( !t.indexOf('/') && !context.ownerDocument ) {
context = context.documentElement;
t = t.substr(1,t.length);
- if ( t.indexOf("/") >= 1 )
- t = t.substr(t.indexOf("/"),t.length);
+ if ( t.indexOf('/') >= 1 )
+ t = t.substr(t.indexOf('/'),t.length);
}
// Initialize the search
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -59,7 +59,7 @@
// Making the category image and title available in the template
if (
($category->getVar('imgurl') != "") &&
- is_file(XOOPS_ROOT_PATH . "/" . $wfdownloads->getConfig('catimage') . "/" . $category->getVar('imgurl'))) {
+ is_file(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage') . '/' . $category->getVar('imgurl'))) {
if (
$wfdownloads->getConfig('usethumbs') &&
function_exists('gd_info')) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-12 20:30:39 UTC (rev 12030)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-13 20:32:24 UTC (rev 12031)
@@ -48,7 +48,7 @@
redirect_header('index.php', 5, _MD_WFD_NOTALLOWESTOSUBMIT);
}
-// If user is not an ADMIN check posts
+// Check posts if user is not an ADMIN
if (is_object($xoopsUser) && !$xoopsUser->isAdmin()) {
if ($xoopsUser->getVar('posts') < $wfdownloads->getConfig('upload_minposts')) {
redirect_header("index.php", 5, _MD_WFD_UPLOADMINPOSTS);
@@ -57,329 +57,19 @@
-if (!empty($_POST['submit'])) {
- $notify = !empty($_POST['notify']) ? true : false;
+$lid = WfdownloadsRequest::getInt('lid', 0);
+$cid = WfdownloadsRequest::getInt('cid', 0);
+$agreed = WfdownloadsRequest::getBool('agreed', false, 'POST');
+$op = WfdownloadsRequest::getString('op', 'download.form');
+$notify = WfdownloadsRequest::getBool('notify', false);
- $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
- if (empty($_FILES['userfile']['name'])) {
- if ($_POST['url'] && $_POST['url'] != '' && $_POST['url'] != "http://") {
- $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
- $filename = '';
- $filetype = '';
- } else {
- $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
- $filename = $_POST['filename'];
- $filetype = $_POST['filetype'];
- }
- $size = ((empty($_POST['size']) || !is_numeric($_POST['size']))) ? 0 : (int)$_POST['size'];
- $title = trim($_POST['title']);
- } else {
- $isAdmin = wfdownloads_userIsAdmin();
+if ($wfdownloads->getConfig('showdisclaimer') && ($op == 'download.form') && $agreed == false) {
+ $op = 'download.disclaimer';
+}
- $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', '', 0, false, $isAdmin);
-
- $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
- $size = $down['size'];
- $filename = $down['filename'];
- $filetype = $_FILES['userfile']['type'];
- $title = $_FILES['userfile']['name'];
- $title = rtrim(wfdownloads_strrrchr($title, "."), ".");
- $title = (isset($_POST['title_checkbox']) && $_POST['title_checkbox'] == 1) ? $title : trim($_POST['title']);
- }
- // Load screenshot
- include_once WFDOWNLOADS_ROOT_PATH . '/class/img_uploader.php';
- $allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
- $uploadDirectory = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('screenshots') . '/';
- // Load screenshot #1
- if (isset($_FILES['screenshot']['name']) && !empty($_FILES['screenshot']['name'])) {
- $screenshot = strtolower($_FILES['screenshot']['name']);
- $uploader = new XoopsMediaImgUploader($uploadDirectory, $allowedMimetypes, $wfdownloads->getConfig('maxfilesize'), $wfdownloads->getConfig('maximgwidth'), $wfdownloads->getConfig('maximgheight'));
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
- if (!$uploader->upload()) {
- $errors = $uploader->getErrors();
- @unlink($uploadDirectory . $screenshot);
- redirect_header($currentFile, 1, $errors);
- }
- } else {
- $errors = $uploader->getErrors();
- @unlink($uploadDirectory . $screenshot);
- redirect_header($currentFile, 1, $errors);
- }
- } else {
- $screenshot = '';
- }
- // Load screenshot #2
- if ($wfdownloads->getConfig('max_screenshot') >= 2) {
- if (isset($_FILES['screenshot2']['name']) && !empty($_FILES['screenshot2']['name'])) {
- $screenshot2 = strtolower($_FILES['screenshot2']['name']);
- $uploader = new XoopsMediaImgUploader($uploadDirectory, $allowedMimetypes, $wfdownloads->getConfig('maxfilesize'), $wfdownloads->getConfig('maximgwidth'), $wfdownloads->getConfig('maximgheight'));
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) {
- if (!$uploader->upload()) {
- $errors = $uploader->getErrors();
- @unlink($uploadDirectory . $screenshot2);
- redirect_header($currentFile, 1, $errors);
- }
- } else {
- $errors = $uploader->getErrors();
- @unlink($uploadDirectory . $screenshot2);
- redirect_header($currentFile, 1, $errors);
- }
- } else {
- $screenshot2 = '';
- }
- } else {
- $screenshot2 = '';
- }
- // Load screenshot #3
- if ($wfdownloads->getConfig('max_screenshot') >= 3) {
- if (isset($_FILES['screenshot3']['name']) && !empty($_FILES['screenshot3']['name'])) {
- $screenshot3 = strtolower($_FILES['screenshot3']['name']);
- $uploader = new XoopsMediaImgUploader($uploadDirectory, $allowedMimetypes, $wfdownloads->getConfig('maxfilesize'), $wfdownloads->getConfig('maximgwidth'), $wfdownloads->getConfig('maximgheight'));
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) {
- if (!$uploader->upload()) {
- $errors = $uploader->getErrors();
- @unlink($uploadDirectory . $screenshot3);
- redirect_header($currentFile, 1, $errors);
- }
- } else {
- $errors = $uploader->getErrors();
- @unlink($uploadDirectory . $screenshot3);
- redirect_header($currentFile, 1, $errors);
- }
- } else {
- $screenshot3 = '';
- }
- } else {
- $screenshot3 = '';
- }
- // Load screenshot #4
- if ($wfdownloads->getConfig('max_screenshot') >= 4) {
- if (isset($_FILES['screenshot4']['name']) && !empty($_FILES['screenshot4']['name'])) {
- $screenshot4 = strtolower($_FILES['screenshot4']['name']);
- $uploader = new XoopsMediaImgUploader($uploadDirectory, $allowedMimetypes, $wfdownloads->getConfig('maxfilesize'), $wfdownloads->getConfig('maximgwidth'), $wfdownloads->getConfig('maximgheight'));
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) {
- if (!$uploader->upload()) {
- $errors = $uploader->getErrors();
- @unlink($uploadDirectory . $screenshot4);
- redirect_header($currentFile, 1, $errors);
- }
- } else {
- $errors = $uploader->getErrors();
- @unlink($uploadDirectory . $screenshot4);
- redirect_header($currentFile, 1, $errors);
- }
- } else {
- $screenshot4 = '';
- }
- } else {
- $screenshot4 = '';
- }
-
- if ($lid > 0) {
- $thisIsANewRecord = false;
- if ($wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_DOWNLOAD || $wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_BOTH) {
- $download = $wfdownloads->getHandler('download')->get($lid);
- } else {
- $download = $wfdownloads->getHandler('modification')->create();
- $download->setVar('lid', $lid);
- }
- } else {
- $thisIsANewRecord = true;
- $download = $wfdownloads->getHandler('download')->create();
- if ($wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_DOWNLOAD || $wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_BOTH) {
- $download->setVar('published', time());
- $download->setVar('status', 1);
- } else {
- $download->setVar('published', false);
- $download->setVar('status', 0);
- }
- }
-
- // Added Formulize module support (2006/05/04) jpc - start
- if (wfdownloads_checkModule('formulize')) {
- // Now that the $download object has been instantiated, handle the Formulize part of the submission...
- $category = $wfdownloads->getHandler('category')->get($cid);
- $fid = $category->getVar('formulize_fid');
- if ($fid) {
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formread.php";
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
- if ($lid) {
- $entries[$fid][0] = $download->getVar('formulize_idreq');
- if ($entries[$fid][0]) {
- if (wfdownloads_checkModule('formulize') < 300)
- $owner = getEntryOwner($entries[$fid][0]);
- else
- $owner = getEntryOwner($entries[$fid][0], $fid);
- } else {
- $entries[$fid][0] = "";
- $owner = "";
- }
- $cid = $download->getVar('cid');
- } else {
- $entries[$fid][0] = "";
- $owner = "";
- }
- $owner_groups =& $member_handler->getGroupsByUser($owner, false);
- $uid = is_object($xoopsUser) ? (int)$xoopsUser->getVar('uid') : 0;
- $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $entries = handleSubmission($formulize_mgr, $entries, $uid, $owner, $fid, $owner_groups, $groups, "new"); // "new" causes xoops token check to be skipped, since WF-downloads should be doing that
- if (!$owner) {
- $id_req = $entries[$fid][0];
- $download->setVar('formulize_idreq', $id_req);
- }
- }
- }
- // Added Formulize module support (2006/05/04) jpc - end
-
- if (!empty($_POST['homepage']) || $_POST['homepage'] != "http://") {
- $download->setVar('homepage', formatURL(trim($_POST["homepage"])));
- $download->setVar('homepagetitle', trim($_POST["homepagetitle"]));
- }
- $download->setVar('title', $title);
- $download->setVar('url', $url);
- $download->setVar('cid', (int)$cid);
- $download->setVar('filename', $filename);
- $download->setVar('filetype', $filetype);
-
- /* Added by Lankford on 2007/3/21 */
- // Here, I want to know if:
- // a) Are they actually changing the value of version, or is it the same?
- // b) Are they actually modifying the record, or is this a new one?
- // If both conditions are true, then trigger all three notifications related to modified records.
- $version = !empty($_POST["version"]) ? trim($_POST["version"]) : 0;
-
- if (!$thisIsANewRecord and ($download->getVar('version') != $version)) {
- // Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $category = $wfdownloads->getHandler('category')->get($cid);
- $tags['FILE_VERSION'] = $version;
- $tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
-
- if ($wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_DOWNLOAD || $wfdownloads->getConfig('autoapprove') == _WFD_AUTOAPPROVE_BOTH) {
- // Then this change will be automatically approved, so the notification needs to go out.
- $notification_handler->triggerEvent('global', 0, 'filemodified', $tags);
- $notification_handler->triggerEvent('category', $cid, 'filemodified', $tags);
- $notification_handler->triggerEvent('file', $lid, 'filemodified', $tags);
- }
- }
- /* End add block */
-
- $download->setVar('version', $_POST['version']);
- $download->setVar('size', $size);
- $download->setVar('platform', $_POST['platform']);
- $download->setVar('screenshot', $screenshot);
- $download->setVar('screenshot2', $screenshot2);
- $download->setVar('screenshot3', $screenshot3);
- $download->setVar('screenshot4', $screenshot4);
- $download->setVar('summary', $_POST['summary']);
- $download->setVar('description', $_POST['description']);
- $submitter = is_object($xoopsUser) ? (int)$xoopsUser->getVar('uid') : 0;
- $download->setVar('submitter', $submitter);
- $download->setVar('publisher', trim($_POST['publisher']));
- $download->setVar('p...
[truncated message content] |
|
From: <des...@us...> - 2013-09-12 20:30:42
|
Revision: 12030
http://sourceforge.net/p/xoops/svn/12030
Author: designburo
Date: 2013-09-12 20:30:39 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
Updated template to match entries template
Modified Paths:
--------------
XoopsModules/weblog/trunk/weblog/templates/weblog_details.html
Modified: XoopsModules/weblog/trunk/weblog/templates/weblog_details.html
===================================================================
--- XoopsModules/weblog/trunk/weblog/templates/weblog_details.html 2013-09-12 20:24:48 UTC (rev 12029)
+++ XoopsModules/weblog/trunk/weblog/templates/weblog_details.html 2013-09-12 20:30:39 UTC (rev 12030)
@@ -1,3 +1,113 @@
+<<<<<<< .mine
+<div id="blog">
+ <div class="page">
+ <span class="title"><{$page_title}></span> - <span class="subtitle"><{$page_subtitle}></span>
+ <{if $rss_show eq 1}>
+ <div class="rss">
+ <a href="<{$rss_feeder}>"><img src="images/rss.gif" border="0" ></a>
+ <a href="<{$rdf_feeder}>"><img src="images/rdf.gif" border="0" ></a>
+ <span><{$lang_rss}></span>
+ </div>
+ <{/if}>
+ </div>
+
+ <{$rdf_desc}>
+ <div class="blogDate">
+ <{$created_date}>
+ </div>
+ <div class="blogEntry">
+
+ <div class="blogContents">
+ <span>
+ <div class="blogTitle">
+ <h2><{$title}></h2>
+ </div>
+ </span>
+ <{$contents}>
+ </div>
+ <div class="authorInfo">
+ <{if $use_avatar == 1}>
+ <img class="avatar" src="<{$avatar_img}>"><BR />
+ <{/if}>
+ @ <{$created_time}><BR />
+ <{$lang_author}>: <a href="<{$profileUri}>"><{$uname}></a><BR />
+ <a href="<{$weblog_topurl}>"><{$lang_category}></a>:</b> <{$category}>
+ </div>
+ <div class="blogFooter">
+ <{if $is_private eq 1}>
+ <b><i><{$private}>:</i></b>
+ <{/if}>
+ <{$read_users_blog}>
+ <{if $provide_edit_link eq 1}>
+ • <a href="post.php?blog_id=<{$blog_id}>&edit=1"><{$lang_edit}></a>
+ <{/if}>
+ • <{$lang_comments}> (<{$comments_num}>)
+ • <{$lang_trackbacks}> (<{$trackbacks}>)
+ • <{$lang_reads}> (<{$reads}>)
+ <div class="blogindicate">
+ <{if $prev_blogentry}><a href="<{$prev_blogentry}>"><{$prev}></a><{/if}> |
+ <{if $next_blogentry}><a href="<{$next_blogentry}>"><{$next}></a><{/if}>
+ </div>
+<!-- Trackbacks -->
+ <a name="trackback"></a>
+ <div class="blogTrackbackAnounce"><{$lang_trackback_anounce}>: <{$weblog_trackback_url}></div>
+<!-- <div class="blogShowTrackbackURL"><{$weblog_trackback_url}></div> -->
+
+ <{if $trackback_transmit}>
+ <div class="blogTrackbackTransmit"><{$lang_trackback_transmit}></div>
+ <{foreach from=$trackback_transmit item=trackback}>
+ <{if $trackback.title}><span class="blogTrackbackTitle"><a href="<{$trackback.link}>" target="_blank"><{$trackback.title}></a></span><{/if}>
+ <{if $trackback.description}><div class="blogTrackbackDescription"><{$trackback.description}><a href="<{$trackback.link}>" target="_blank">...more</a></div><{/if}>
+ <{if $trackback.blog_name}><div class="blogTrackbackBlogname"> -- <a href="<{$trackback.link}>"><{$trackback.blog_name}></a> -- </div><{/if}>
+ <div class="blogTrackbackURL"><a href="<{$trackback.tb_url}>" target="_blank"><{$trackback.tb_url}></a></div>
+ <div class="blogTrackbackCreated"><{$trackback.trackback_created}></div>
+ <{/foreach}>
+ <{/if}>
+
+ <{if $trackback_recieved}>
+ <div class="blogTrackbackRecieved"><{$lang_trackback_recieved}></div>
+ <{foreach from=$trackback_recieved item=trackback}>
+ <{if $trackback.title}><div class="blogTrackbackTitle"><a href="<{$trackback.tb_url}>" target="_blank"><{$trackback.title}></a></div><{/if}>
+ <{if $trackback.description}><div class="blogTrackbackDescription"><{$trackback.description}><a href="<{$trackback.tb_url}>" target="_blank">...more</a></div><{/if}>
+ <{if $trackback.blog_name}><div class="blogTrackbackBlogname"> -- <a href="<{$trackback.tb_url}>" target="_blank"><{$trackback.blog_name}></a> -- </div><{/if}><div class="blogTrackbackCreated"><{$trackback.trackback_created}></div>
+ <{/foreach}>
+ <{/if}>
+
+ </div>
+ </div>
+
+ <!-- printer and friend icons -->
+ <div style="padding: 5px; text-align: right;
+ margin-right:3px;">
+ <a href="<{$print_link}>"><img
+ src="images/print.gif" border="0"
+ alt="<{$lang_printerpage}>" /></a> <a target="_top"
+ href="<{$mail_link}>"><img src="images/friend.gif"
+ border="0" alt="<{$lang_sendstory}>" /></a>
+ </div>
+
+
+ <!-- Comments -->
+ <a name="comment"></a>
+ <div style="text-align: center; padding: 3px; margin: 3px;">
+ <{$commentsnav}>
+ <{$lang_notice}>
+ </div>
+
+ <div style="margin: 3px; padding: 3px;">
+ <!-- start comments loop -->
+ <{if $comment_mode == "flat"}>
+ <{include file="db:system_comments_flat.html"}>
+ <{elseif $comment_mode == "thread"}>
+ <{include file="db:system_comments_thread.html"}>
+ <{elseif $comment_mode == "nest"}>
+ <{include file="db:system_comments_nest.html"}>
+ <{/if}>
+ <!-- end comments loop -->
+ </div>
+
+ <{include file='db:system_notification_select.html'}>
+=======
<table cellspacing="0" width="100%">
<tr>
<td><b><{$page_title}> - <{$page_subtitle}></b><hr></td>
@@ -104,3 +214,4 @@
</div>
<{include file='db:system_notification_select.html'}>
+>>>>>>> .r12029
|
|
From: <des...@us...> - 2013-09-12 20:24:53
|
Revision: 12029
http://sourceforge.net/p/xoops/svn/12029
Author: designburo
Date: 2013-09-12 20:24:48 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
Added style for detail page
Modified Paths:
--------------
XoopsModules/weblog/trunk/weblog/styles.css
Modified: XoopsModules/weblog/trunk/weblog/styles.css
===================================================================
--- XoopsModules/weblog/trunk/weblog/styles.css 2013-09-12 16:17:55 UTC (rev 12028)
+++ XoopsModules/weblog/trunk/weblog/styles.css 2013-09-12 20:24:48 UTC (rev 12029)
@@ -70,8 +70,10 @@
}
+.blogindicate{
+ float:left;
+ }
-
/* div.blogEntry {margin-left: 30px; margin-top: 10px; margin-bottom: 10px;} */
div.blogDate {font-family: Verdana; margin-bottom: 10px;margin-top: 10px; font-style: normal; font-weight: bold;}
/* div.blogTitle {font-family: Verdana; margin-left: 0px; margin-bottom: 0px; font-size: 130%;font-weight: bold;}*/
@@ -132,7 +134,7 @@
border-bottom-color: #990000;
border-left-color: #990000;
}
-.blogindicate{margin-right: 5px; margin-top: 2px; margin-bottom: 2px; text-align: right ;}
+
.blogTrackbackBlogname {margin-right: 15px; margin-top: 4px; margin-bottom: 4px; text-align: right ;}
.blogTrackbackCreated { margin-right:15px; font-family: Verdana;margin-top: 4px; margin-bottom: 8px; font-size: 80%; font-weight: normal; text-align: right; vertical-align: top;}
.blogHeader {margin: 0px; border: 0px; padding: 4px;}
|
|
From: <luc...@us...> - 2013-09-12 16:17:58
|
Revision: 12028
http://sourceforge.net/p/xoops/svn/12028
Author: luciorota
Date: 2013-09-12 16:17:55 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
fixed submit error when formulize module is present but not installed/active
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_disclaimer.html
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -319,8 +319,8 @@
$report_array['submitter_uname'] = $xoopsConfig['anonymous'];
}
$sender = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')] : "";
- $report_array['sender_email'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('email') : "";
- $report_array['sender_uname'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
+ $report_array['reporter_email'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('email') : "";
+ $report_array['reporter_uname'] = isset($users[$report->getVar('sender')]) ? $users[$report->getVar('sender')]->getVar('uname') : $xoopsConfig['anonymous'];
$report_array['formatted_date'] = formatTimestamp($report->getVar('date'), _DATESTRING);
$GLOBALS['xoopsTpl']->append('reports', $report_array);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -101,17 +101,17 @@
$start_waiting = WfdownloadsRequest::getInt('start_waiting', 0);
$start_published = WfdownloadsRequest::getInt('start_published', 0);
- $criteria_waiting = new Criteria("submit", 0); // false
- $waiting_count = $wfdownloads->getHandler('review')->getCount();
- $criteria_waiting->setSort("date");
+ $criteria_waiting = new Criteria('submit', 0); // false
+ $waiting_count = $wfdownloads->getHandler('review')->getCount($criteria_waiting);
+ $criteria_waiting->setSort('date');
$criteria_waiting->setOrder('DESC');
$criteria_waiting->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria_waiting->setStart($start_waiting);
$reviews_waiting = $wfdownloads->getHandler('review')->getObjects($criteria_waiting);
- $criteria_published = new Criteria("submit", 1); // true
- $published_count = $wfdownloads->getHandler('review')->getCount();
- $criteria_published->setSort("date");
+ $criteria_published = new Criteria('submit', 1); // true
+ $published_count = $wfdownloads->getHandler('review')->getCount($criteria_published);
+ $criteria_published->setSort('date');
$criteria_published->setOrder('DESC');
$criteria_published->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria_published->setStart($start_published);
@@ -130,22 +130,24 @@
$uids_waiting[] = $review_waiting->getVar('uid');
}
if (isset($lids_waiting)){
- $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids_waiting)) . ")", "IN"), true, false);
+ $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria('lid', '(' . implode(',', array_unique($lids_waiting)) . ')', 'IN'), true, false);
}
if (isset($uids_waiting)){
- $users = $member_handler->getUserList(new Criteria("uid", "(" . implode(',', $uids_waiting) . ")"));
+ $users = $member_handler->getUserList(new Criteria('uid', '(' . implode(',', $uids_waiting) . ')'));
}
foreach ($reviews_waiting as $review_waiting) {
$review_waiting_array = $review_waiting->toArray();
- $review_waiting_array['download_title'] = isset($downloads[$review_waiting->getVar('lid')]) ? $downloads[$review_waiting->getVar('lid')]['title'] : "";
- $review_waiting_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($review_waiting->getVar('uid'));
+ $review_waiting_array['download_title'] = isset($downloads[$review_waiting->getVar('lid')]) ? $downloads[$review_waiting->getVar('lid')]['title'] : '';
+ $review_waiting_array['reviewer_uname'] = XoopsUserUtility::getUnameFromId($review_waiting->getVar('uid'));
+ $reviewer = $member_handler->getUser($review_waiting->getVar('uid'));
+ $review_waiting_array['reviewer_email'] = is_object($reviewer) ? $reviewer->email() : '';
$review_waiting_array['formatted_date'] = formatTimestamp($review_waiting->getVar('date'), _DATESTRING);
$GLOBALS['xoopsTpl']->append('reviews_waiting', $review_waiting_array);
}
//Include page navigation
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav_waiting = new XoopsPageNav($waiting_count, $wfdownloads->getConfig('admin_perpage') , $start_waiting, 'start_waiting');
- $GLOBALS['xoopsTpl']->assign('reviews_waiting_pagenav', $pagenav_waiting -> renderNav());
+ $GLOBALS['xoopsTpl']->assign('reviews_waiting_pagenav', $pagenav_waiting->renderNav());
}
if ($published_count > 0) {
@@ -154,15 +156,17 @@
$uids_published[] = $review_published->getVar('uid');
}
if (isset($lids_published)){
- $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids_published)) . ")", "IN"), true, false);
+ $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria('lid', '(' . implode(',', array_unique($lids_published)) . ')', 'IN'), true, false);
}
if (isset($uids_published)){
- $users = $member_handler->getUserList(new Criteria("uid", "(" . implode(',', $uids_published) . ")"));
+ $users = $member_handler->getUserList(new Criteria('uid', '(' . implode(',', $uids_published) . ')'));
}
foreach ($reviews_published as $review_published) {
$review_published_array = $review_published->toArray();
- $review_published_array['download_title'] = isset($downloads[$review_published->getVar('lid')]) ? $downloads[$review_published->getVar('lid')]['title'] : "";
- $review_published_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($review_published->getVar('uid'));
+ $review_published_array['download_title'] = isset($downloads[$review_published->getVar('lid')]) ? $downloads[$review_published->getVar('lid')]['title'] : '';
+ $review_published_array['reviewer_uname'] = XoopsUserUtility::getUnameFromId($review_published->getVar('uid'));
+ $reviewer = $member_handler->getUser($review_published->getVar('uid'));
+ $review_published_array['reviewer_email'] = is_object($reviewer) ? $reviewer->email() : '';
$review_published_array['formatted_date'] = formatTimestamp($review_published->getVar('date'), _DATESTRING);
$GLOBALS['xoopsTpl']->append('reviews_published', $review_published_array);
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -362,7 +362,7 @@
}
// changed - start - March 4 2006 - jpc
- if(file_exists(XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php')) {
+ if(wfdownloads_checkModule('formulize')) {
$sform->addElement(new XoopsFormHidden('cid', $this->getVar('cid', 'e')));
} else {
$categories = $this->wfdownloads->getHandler('category')->getUserUpCategories();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -123,15 +123,14 @@
$gperm_handler = xoops_gethandler('groupperm');
$category_handler = xoops_getmodulehandler('category', $module->dirname());
-
$cids = $category_handler->getIds();
if (count($cids) > 0) {
- echo "<br /><B>Adding upload permissions to categories</B><br />";
+ echo "<br /><b>Adding upload permissions to categories</b><br />";
foreach ($cids as $cid) {
- $down_groups_ids = $gperm_handler->getGroupIds('WFDownCatPerm', $cid, $module->mid());
- foreach ($down_groups_ids as $down_group_id) {
+ $allowedDownGroupsIds = $gperm_handler->getGroupIds('WFDownCatPerm', $cid, $module->mid());
+ foreach ($allowedDownGroupsIds as $allowedDownGroupsId) {
//$gperm_handler->deleteByModule($module->mid(), 'WFUpCatPerm', $cid);
- $gperm_handler->addRight('WFUpCatPerm', $cid, $down_group_id, $module->mid());
+ $gperm_handler->addRight('WFUpCatPerm', $cid, $allowedDownGroupsId, $module->mid());
}
}
} else {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -165,7 +165,7 @@
define("_AM_WFD_MINDEX_AUTOEXPIRE","Auto expire downloads");
define("_AM_WFD_MINDEX_OFFLINEDOWN","Offline downloads");
define("_AM_WFD_MINDEX_ID","ID");
-define("_AM_WFD_MINDEX_TITLE","File title");
+define("_AM_WFD_MINDEX_TITLE","Download title");
define("_AM_WFD_MINDEX_POSTER","Poster");
define("_AM_WFD_MINDEX_SUBMITTED","Submission date");
define("_AM_WFD_MINDEX_ONLINESTATUS","Online status");
@@ -317,10 +317,10 @@
//Reviews defines
define("_AM_WFD_REV_SNEWMNAMEDESC","Approve review");
define("_AM_WFD_REV_ID","ID");
-define("_AM_WFD_REV_TITLE","Title");
+define("_AM_WFD_REV_TITLE","Download title");
define("_AM_WFD_REV_REVIEWTITLE","Review title");
-define("_AM_WFD_REV_POSTER","Submitter");
-define("_AM_WFD_REV_SUBMITDATE","Submitted");
+define("_AM_WFD_REV_POSTER","Reviewer");
+define("_AM_WFD_REV_SUBMITDATE","Date");
define("_AM_WFD_REV_FTITLE","Review title");
define("_AM_WFD_REV_FRATING","Review rating");
define("_AM_WFD_REV_FDESCRIPTION","Review description");
@@ -417,10 +417,10 @@
define("_AM_WFD_BROKEN_CONFIRM_ALT","Confirm state of broken file report");
define("_AM_WFD_BROKEN_ID","ID");
-define("_AM_WFD_BROKEN_TITLE","Title");
+define("_AM_WFD_BROKEN_TITLE","Dowonload title");
define("_AM_WFD_BROKEN_REPORTER","Reporter");
-define("_AM_WFD_BROKEN_FILESUBMITTER","Submitter");
-define("_AM_WFD_BROKEN_DATESUBMITTED","Submit date");
+define("_AM_WFD_BROKEN_FILESUBMITTER","Download submitter");
+define("_AM_WFD_BROKEN_DATESUBMITTED","Report date");
define("_AM_WFD_BROKEN_ACTION","Action");
define("_AM_WFD_BROKEN_NOFILEMATCH","There are no broken reports that match this criteria");
define("_AM_WFD_BROKENFILEDELETED","Download description removed from database and broken report removed");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -48,13 +48,15 @@
redirect_header('index.php', 5, _MD_WFD_NOTALLOWESTOSUBMIT);
}
-// Check posts if user is not an ADMIN
+// If user is not an ADMIN check posts
if (is_object($xoopsUser) && !$xoopsUser->isAdmin()) {
if ($xoopsUser->getVar('posts') < $wfdownloads->getConfig('upload_minposts')) {
redirect_header("index.php", 5, _MD_WFD_UPLOADMINPOSTS);
}
}
+
+
if (!empty($_POST['submit'])) {
$notify = !empty($_POST['notify']) ? true : false;
@@ -374,7 +376,10 @@
redirect_header('index.php', 2, _MD_WFD_THANKSFORINFO);
}
} else {
- if ($wfdownloads->getConfig('showdisclaimer') && !isset($_GET['agree'])) {
+ $lid = WfdownloadsRequest::getInt('lid', 0);
+ $cid = WfdownloadsRequest::getInt('cid', 0);
+
+ if ($wfdownloads->getConfig('showdisclaimer') && !isset($_POST['agree'])) {
// Show disclaimers
$xoopsOption['template_main'] = 'wfdownloads_disclaimer.html';
include XOOPS_ROOT_PATH . '/header.php';
@@ -403,79 +408,79 @@
$xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agree=1&lid={$lid}");
}
+ $xoopsTpl->assign('lid', $lid);
+ $xoopsTpl->assign('cid', $cid);
+
$xoopsTpl->assign('categoryPath', _MD_WFD_DISCLAIMERAGREEMENT);
$xoopsTpl->assign('module_home', wfdownloads_module_home(true));
include XOOPS_ROOT_PATH . '/footer.php';
exit();
- }
- // Show submit form
- if (isset($_REQUEST['lid']) && is_object($xoopsUser)) {
- $user_id = $xoopsUser->uid();
- $lid = WfdownloadsRequest::getInt('lid');
- $download = $wfdownloads->getHandler('download')->get($lid);
- if ($user_id !== $download->getVar('submitter')) {
- redirect_header('index.php', 5, _MD_WFD_NOTALLOWEDTOMOD);
+ } else {
+ // Show submit form
+ if ($lid != 0) {
+ $download = $wfdownloads->getHandler('download')->get($lid);
+ // Check if current user is the download submitter
+ if ($xoopsUser->uid() != $download->getVar('submitter')) {
+ redirect_header('index.php', 5, _MD_WFD_NOTALLOWEDTOMOD);
+ }
+ $cid = $download->getVar('cid');
+ } else {
+ $download = $wfdownloads->getHandler('download')->create();
+ $cid = WfdownloadsRequest::getInt('cid', 0);
+ $download->setVar('cid', $cid);
}
- $cid = $download->getVar('cid');
- } else {
- $lid = 0;
- $download = $wfdownloads->getHandler('download')->create();
- $cid = !empty($_POST['cid']) ? (int)$_POST['cid'] : 0;
- $download->setVar('cid', $cid);
- }
- if (!empty($_GET['cid'])) {
- $download->setVar('cid', (int)$_GET['cid']);
- } //Added by Lankford on 2008/2/20.
-
- if (isset($_POST['submit_category']) && !empty($_POST['submit_category'])) {
- $category = $wfdownloads->getHandler('category')->get($cid);
- $fid = $category->getVar('formulize_fid');
- $customArray = array();
- if (wfdownloads_checkModule('formulize') && $fid) {
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
- include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $customArray['fid'] = $fid;
- $customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
- $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues($download->getVar('formulize_idreq'), $customArray['formulize_mgr'], $customArray['groups'], $fid);
- $customArray['entry'] = $download->getVar('formulize_idreq');
- $customArray['go_back'] = '';
- $customArray['parentLinks'] = '';
- if (wfdownloads_checkModule('formulize') < 300)
- $owner = getEntryOwner($entry);
- else
- $owner = getEntryOwner($entry, $fid);
- $owner_groups = $member_handler->getGroupsByUser($owner, FALSE);
- $customArray['owner_groups'] = $owner_groups;
+ if (isset($_POST['submit_category']) && !empty($_POST['submit_category'])) {
+ $category = $wfdownloads->getHandler('category')->get($cid);
+ $fid = $category->getVar('formulize_fid');
+ $customArray = array();
+ if (wfdownloads_checkModule('formulize') && $fid) {
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $customArray['fid'] = $fid;
+ $customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
+ $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $customArray['prevEntry'] = getEntryValues($download->getVar('formulize_idreq'), $customArray['formulize_mgr'], $customArray['groups'], $fid);
+ $customArray['entry'] = $download->getVar('formulize_idreq');
+ $customArray['go_back'] = '';
+ $customArray['parentLinks'] = '';
+ // Check formulize version
+ if (wfdownloads_checkModule('formulize') < 300)
+ $owner = getEntryOwner($entry);
+ else
+ $owner = getEntryOwner($entry, $fid);
+ $owner_groups = $member_handler->getGroupsByUser($owner, FALSE);
+ $customArray['owner_groups'] = $owner_groups;
+ }
+ $sform = $download->getForm($customArray);
+ } elseif (wfdownloads_checkModule('formulize')) {
+ $sform = $download->getCategoryForm();
+ } else {
+ $sform = $download->getForm();
}
- $sform = $download->getForm($customArray);
- } elseif (wfdownloads_checkModule('formulize')) {
- $sform = $download->getCategoryForm();
- } else {
- $sform = $download->getForm();
- }
- $xoopsOption['template_main'] = 'wfdownloads_submit.html';
- include XOOPS_ROOT_PATH . '/header.php';
+ $xoopsOption['template_main'] = 'wfdownloads_submit.html';
+ include XOOPS_ROOT_PATH . '/header.php';
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
- $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
+ $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
+ $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
+ $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
- $catarray['imageheader'] = wfdownloads_headerImage();
+ $catarray['imageheader'] = wfdownloads_headerImage();
- // Breadcrumb
- $breadcrumb = new WfdownloadsBreadcrumb();
- $breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
- $breadcrumb->addLink(_MD_WFD_SUBMITDOWNLOAD, '');
- $xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
+ // Breadcrumb
+ $breadcrumb = new WfdownloadsBreadcrumb();
+ $breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
+ $breadcrumb->addLink(_MD_WFD_SUBMITDOWNLOAD, '');
+ $xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
- $xoopsTpl -> assign('catarray', $catarray);
- $xoopsTpl->assign('categoryPath', _MD_WFD_SUBMITDOWNLOAD);
- $xoopsTpl->assign('module_home', wfdownloads_module_home(true));
- $xoopsTpl -> assign('submit_form' , $sform->render());
+ $xoopsTpl->assign('catarray', $catarray);
+ $xoopsTpl->assign('categoryPath', _MD_WFD_SUBMITDOWNLOAD);
+ $xoopsTpl->assign('module_home', wfdownloads_module_home(true));
+ $xoopsTpl->assign('submit_form' , $sform->render());
- include XOOPS_ROOT_PATH . '/footer.php';
+ include XOOPS_ROOT_PATH . '/footer.php';
+ exit();
+ }
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-09-12 16:17:55 UTC (rev 12028)
@@ -49,7 +49,7 @@
<td> </td>
<td> </td>
<td align='center'>
- <input id='submit' class='formButton' type='submit' title='<{$smarty.const._AM_WFD_SEARCH}>' value='<{$smarty.const._AM_WFD_SEARCH}>' name='submit'>
+ <input id='submit' class='formButton' type='submit' title='<{$smarty.const._AM_WFD_FILTER}>' value='<{$smarty.const._AM_WFD_FILTER}>' name='submit'>
</td>
</tr>
<input id='op' type='hidden' value='downloads.filter' name='op'>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-09-12 16:17:55 UTC (rev 12028)
@@ -26,37 +26,37 @@
<table class='outer'>
<tr>
<th><{$smarty.const._AM_WFD_BROKEN_ID}></th>
+ <th><{$smarty.const._AM_WFD_BROKEN_DATESUBMITTED}></th>
+ <th><{$smarty.const._AM_WFD_BROKEN_REPORTER}></th>
<th><{$smarty.const._AM_WFD_BROKEN_TITLE}></th>
- <th><{$smarty.const._AM_WFD_BROKEN_REPORTER}></th>
<th><{$smarty.const._AM_WFD_BROKEN_FILESUBMITTER}></th>
- <th><{$smarty.const._AM_WFD_BROKEN_DATESUBMITTED}></th>
<th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
</tr>
<{foreach item=report from=$reports}>
<tr class="<{cycle values='even, odd'}>">
<td><{$report.reportid}></td>
+ <td><{$report.formatted_date}></td>
<td>
- <{if ($report.download_lid) == false}>
- <{$smarty.const._AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS}>
+ <{if ($report.reporter_email) == ''}>
+ <{$report.reporter_uname}> (<{$report.ip}>)
<{else}>
- <a href='" . WFDOWNLOADS_URL . "/singlefile.php?cid=<{$report.download_cid}>&lid=<{$report.download_lid}>' target='_blank'><{$report.download_title}></a>
+ <a href='mailto:<{$report.reporter_email}>'><{$report.reporter_uname}></a> (<{$report.ip}>)
<{/if}>
</td>
<td>
- <{if ($report.sender_email) == ''}>
- <{$report.sender_uname}> (<{$report.ip}>)
+ <{if ($report.download_lid) == false}>
+ <{$smarty.const._AM_WFD_BROKEN_DOWNLOAD_DONT_EXISTS}>
<{else}>
- <a href='mailto:<{$report.sender_email}>'><{$report.sender_uname}></a> (<{$report.ip}>)
+ <a href='" . WFDOWNLOADS_URL . "/singlefile.php?cid=<{$report.download_cid}>&lid=<{$report.download_lid}>' target='_blank'><{$report.download_title}></a>
<{/if}>
</td>
<td>
<{if ($report.submitter_email) == ''}>
<{$report.submitter_uname}>
<{else}>
- <a href='mailto:<{$report.sender_email}>'><{$report.submitter_uname}></a>
+ <a href='mailto:<{$report.submitter_email}>'><{$report.submitter_uname}></a>
<{/if}>
</td>
- <td><{$report.formatted_date}></td>
<td align='center'>
<a href='?op=report.ignore&lid=' alt='' title=''>
<img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_BROKEN_IGNOREDESC}>" alt="<{$smarty.const._AM_WFD_BROKEN_IGNOREDESC}>" />
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-09-12 16:17:55 UTC (rev 12028)
@@ -33,16 +33,22 @@
</tr>
<{foreach item=review_waiting from=$reviews_waiting}>
<tr class="<{cycle values='even, odd'}>">
- <td class='head'><{$review_waiting.review_id}></td>
- <td class='even'>
+ <td><{$review_waiting.review_id}></td>
+ <td>
<a href='download.php?op=download.edit&lid=<{$review_waiting.lid}>'><{$review_waiting.download_title}></a>
</td>
- <td class='even'>
+ <td>
<a href='?op=review.edit&review_id=<{$review_waiting.review_id}>'><{$review_waiting.title}></a>
</td>
- <td class='even'><{$review_waiting.submitter_uname}></td>
- <td class='even'><{$review_waiting.formatted_date}></td>
- <td class='even' align='center'>
+ <td>
+ <{if ($review_waiting.reviewer_email) == ''}>
+ <{$review_waiting.reviewer_uname}>
+ <{else}>
+ <a href='mailto:<{$report.submitter_email}>'><{$review_waiting.reviewer_uname}></a>
+ <{/if}>
+ </td>
+ <td><{$review_waiting.formatted_date}></td>
+ <td align='center'>
<a href='?op=review.approve&review_id=<{$review_waiting.review_id}>'><img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" /></a>
<a href='?op=review.edit&review_id=<{$review_waiting.review_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" /></a>
<a href='?op=review.delete&review_id=<{$review_waiting.review_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" /></a>
@@ -72,16 +78,22 @@
</tr>
<{foreach item=review_published from=$reviews_published}>
<tr class="<{cycle values='even, odd'}>">
- <td class='head'><{$review_published.review_id}></td>
- <td class='even'>
+ <td><{$review_published.review_id}></td>
+ <td>
<a href='download.php?op=download.edit&lid=<{$review_published.lid}>'><{$review_published.download_title}></a>
</td>
- <td class='even'>
+ <td>
<a href='?op=review.edit&review_id=<{$review_published.review_id}>'><{$review_published.title}></a>
</td>
- <td class='even'><{$review_published.submitter_uname}></td>
- <td class='even'><{$review_published.formatted_date}></td>
- <td class='even' align='center'>
+ <td>
+ <{if ($review_published.reviewer_email) == ''}>
+ <{$review_published.reviewer_uname}>
+ <{else}>
+ <a href='mailto:<{$review_published.reviewer_email}>'><{$review_published.reviewer_uname}></a>
+ <{/if}>
+ </td>
+ <td><{$review_published.formatted_date}></td>
+ <td align='center'>
<a href='?op=review.edit&review_id=<{$review_published.review_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" /></a>
<a href='?op=review.delete&review_id=<{$review_published.review_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_DELETE}>" /></a>
</td>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_disclaimer.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_disclaimer.html 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_disclaimer.html 2013-09-12 16:17:55 UTC (rev 12028)
@@ -21,13 +21,12 @@
<b><{$smarty.const._MD_WFD_DOYOUAGREE}></b>
<br />
<br />
- <input type='button' onclick='location="<{$agree_location}>"' class='formButton' value='<{$smarty.const._MD_WFD_AGREE}>' alt='<{$smarty.const._MD_WFD_AGREE}>' />
+ <input type='submit' class='formButton' value='<{$smarty.const._MD_WFD_AGREE}>' alt='<{$smarty.const._MD_WFD_AGREE}>' />
<input type='button' onclick='javascript:history.go(-1)' class='formButton' value='<{$smarty.const._CANCEL}>' alt='<{$smarty.const._CANCEL}>' />
- <{if $down_disclaimer == true}>
- <input type='hidden' name='lid' value='1' />
- <input type='hidden' name='cid' value='1' />
- <{/if}>
+ <input type='hidden' name='lid' value='<{$lid}>' />
+ <input type='hidden' name='cid' value='<{$cid}>' />
+ <input type='hidden' name='agree' value='1' />
</div>
</form>
<br />
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-11 18:58:29 UTC (rev 12027)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-12 16:17:55 UTC (rev 12028)
@@ -47,10 +47,10 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-09-10';
-$modversion['release_date'] = '2013/09/10';
-$modversion['releasedate'] = "2013-09-10";
-$modversion['status'] = "BETA";
+$modversion['date'] = '2013-09-11';
+$modversion['release_date'] = '2013/09/11';
+$modversion['releasedate'] = '2013-09-11';
+$modversion['status'] = 'BETA';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
//about
@@ -58,7 +58,7 @@
$modversion["module_website_name"] = "XOOPS";
$modversion["module_status"] = "BETA";
$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = "2.5.5";
+$modversion['min_xoops'] = '2.5.5';
$modversion['min_admin'] = '1.1';
$modversion['min_db'] = array(
'mysql' => '5.0.7',
|
|
From: <des...@us...> - 2013-09-11 18:58:33
|
Revision: 12027
http://sourceforge.net/p/xoops/svn/12027
Author: designburo
Date: 2013-09-11 18:58:29 +0000 (Wed, 11 Sep 2013)
Log Message:
-----------
Added style to accompany changes in entries template
Modified Paths:
--------------
XoopsModules/weblog/trunk/weblog/styles.css
Modified: XoopsModules/weblog/trunk/weblog/styles.css
===================================================================
--- XoopsModules/weblog/trunk/weblog/styles.css 2013-09-11 18:52:45 UTC (rev 12026)
+++ XoopsModules/weblog/trunk/weblog/styles.css 2013-09-11 18:58:29 UTC (rev 12027)
@@ -1,13 +1,84 @@
/* $Id: styles.css,v 1.8 2005/06/18 17:56:01 tohokuaiki Exp $ */
-div.blogEntry {margin-left: 30px; margin-top: 10px; margin-bottom: 10px;}
+#blog {
+ width:100%;
+}
+
+#blog div.page {
+ border-bottom:1px solid #aaa;
+ margin-bottom:20px;
+}
+#blog div.page span.title {
+ font-size:1.3em;
+ font-weight:bold;
+
+}
+#blog div.rss {
+display:inline-block;
+float:right;
+font-size:.8em;
+}
+#blog div.rss span {
+ display:block;
+ margin-top:10px;
+}
+div.blogEntry {
+ border-left:solid 5px #eee;
+ border-radius:10px;
+ padding-left:30px;
+
+}
+
+.blogTitle h2 {
+ margin-bottom:40px
+}
+.blogTitle h2 {
+ font-style:normal;
+ text-decoration:none;;
+ font-variant:normal;
+ text-transform:none;
+}
+.blogTitle h2:hover {
+ text-decoration:underline;
+}
+.authorInfo img {
+
+ box-shadow:1px 1px 4px 5px #ddd;
+ margin-bottom:20px;
+
+
+}
+.authorInfo {
+ display:inline-block;
+ vertical-align:top;
+ text-align:right;
+ float:right;
+
+}
+.blogContents {
+ width:75%;
+ display:inline-block;
+
+ }
+div.blogFooter {
+ margin-top:15px;
+ padding: 10px 10px 10px 0;
+ font-size: 80%;
+ text-align: right;
+ border-top:dashed 1px #aaa;
+ border-bottom:dashed 1px #aaa;
+ border-radius:10px;
+
+}
+
+
+
+/* div.blogEntry {margin-left: 30px; margin-top: 10px; margin-bottom: 10px;} */
div.blogDate {font-family: Verdana; margin-bottom: 10px;margin-top: 10px; font-style: normal; font-weight: bold;}
-div.blogTitle {font-family: Verdana; margin-left: 0px; margin-bottom: 0px; font-size: 130%;font-weight: bold;}
-div.blogTitle a {font-family: Verdana;}
+/* div.blogTitle {font-family: Verdana; margin-left: 0px; margin-bottom: 0px; font-size: 130%;font-weight: bold;}*/
+/* div.blogTitle a {font-family: Verdana;}*/
div.blogCategory {margin-left: 0px; font-size: 80%;font-weight: normal;}
div.blogShoulder {margin-top: 0px; margin-bottom: 0px; font-size: 80%; font-weight: normal; text-align: right; vertical-align: top;}
-div.blogContents {font-family: Verdana; margin: 0px;}
div.blogContents:first-letter {}
-div.blogFooter {margin-top: 10px; margin-left: 0px; font-size: 80%; text-align: right;}
div.blogTrackbackAnounce {margin-top: 10px; margin-left: 0px; font-size: 80%; text-align: right;}
.blogShowTrackbackURL {margin-top: 10px; margin-left: 0px; font-size: 80%; text-align: right; text-decoration: underline;}
.blogTrackbackTransmit {color: #888888;
@@ -64,7 +135,7 @@
.blogindicate{margin-right: 5px; margin-top: 2px; margin-bottom: 2px; text-align: right ;}
.blogTrackbackBlogname {margin-right: 15px; margin-top: 4px; margin-bottom: 4px; text-align: right ;}
.blogTrackbackCreated { margin-right:15px; font-family: Verdana;margin-top: 4px; margin-bottom: 8px; font-size: 80%; font-weight: normal; text-align: right; vertical-align: top;}
-blogHeader {margin: 0px; border: 0px; padding: 4px;}
+.blogHeader {margin: 0px; border: 0px; padding: 4px;}
/* calendar and archives */
|
|
From: <des...@us...> - 2013-09-11 18:52:52
|
Revision: 12026
http://sourceforge.net/p/xoops/svn/12026
Author: designburo
Date: 2013-09-11 18:52:45 +0000 (Wed, 11 Sep 2013)
Log Message:
-----------
Added layout styles and check if recententries != page_subtitle
Modified Paths:
--------------
XoopsModules/weblog/trunk/weblog/templates/weblog_entries.html
Modified: XoopsModules/weblog/trunk/weblog/templates/weblog_entries.html
===================================================================
--- XoopsModules/weblog/trunk/weblog/templates/weblog_entries.html 2013-09-10 22:17:14 UTC (rev 12025)
+++ XoopsModules/weblog/trunk/weblog/templates/weblog_entries.html 2013-09-11 18:52:45 UTC (rev 12026)
@@ -1,17 +1,17 @@
-<table cellspacing="0" width="100%">
- <tr>
- <td><b><{$page_title}> - <{$page_subtitle}></b><hr></td>
- </tr>
- <{if $rss_show eq 1}>
- <tr>
- <td valign="middle" align="right">
- <a href="<{$rss_feeder}>"><img src="images/rss.gif" border="0" ></a>
- <a href="<{$rdf_feeder}>"><img src="images/rdf.gif" border="0" ></a>
- <{$lang_rss}></td>
- </tr>
- <{/if}>
-</table><br />
+<div id="blog">
+ <div class="page">
+ <span class="title"><{$page_title}></span> - <span class="subtitle"><{$page_subtitle}></span>
+ <{if $rss_show eq 1}>
+ <div class="rss">
+ <a href="<{$rss_feeder}>"><img src="images/rss.gif" border="0" ></a>
+ <a href="<{$rdf_feeder}>"><img src="images/rdf.gif" border="0" ></a>
+ <span><{$lang_rss}></span>
+ </div>
+ <{/if}>
+ </div>
+
+
<{if $show_category_list}>
<b><{$lang_categories}></b>
<div class="blogCategory"><{$cat_url}></div>
@@ -37,44 +37,47 @@
<{/if}>
<br /><br />
<{/if}>
+ <{if $lang_recententries !== $page_subtitle }>
+ <b><{$lang_recententries}></b>
+ <{/if}>
+ <!-- start loop -->
+ <{foreach item=entry from=$entries}>
+ <{$entry.rdf_desc}>
+ <div class="blogDate">
+ <{$entry.created_date}>
+ </div>
+ <div class="blogEntry">
+ <div class="blogContents">
+ <span>
+ <a class="blogTitle" href="details.php?blog_id=<{$entry.blog_id}>"><h2><{$entry.title}></h2></a>
+ </span>
+ <{$entry.contents}>
+ </div>
+ <div class="authorInfo">
+ <{if $entry.use_avatar == 1}>
+ <img class="avatar" src="<{$entry.avatar_img}>"><BR />
+ <{/if}>
+ @ <{$entry.created_time}><BR />
+ <{$entry.lang_author}>: <a href="<{$entry.profileUri}>"><{$entry.uname}></a><BR />
+ <{$entry.lang_category}>:</b> <{$entry.category}>
+ </div>
+ <div class="blogFooter">
+ <{if $entry.is_private eq 1}>
+ <b><i><{$entry.private}>:</i></b>
+ <{/if}>
+ <{$entry.read_users_blog}>
+ <{if $entry.provide_edit_link eq 1}>
+ • <a href="post.php?blog_id=<{$entry.blog_id}>&edit=1"><{$lang_edit}></a>
+ <{/if}>
+ • <a href="<{$entry.comlink}>"><{$entry.lang_comments}> (<{$entry.comments}>)</a>
+ • <a href="<{$entry.tracklink}>"><{$entry.lang_trackbacks}> (<{$entry.trackbacks}>)</a>
+ • <{$entry.lang_reads}> (<{$entry.reads}>)
+
+ </div>
+ </div>
+ <{/foreach}>
+</div>
-<b><{$lang_recententries}></b>
-<hr>
-<!-- start loop -->
-<{foreach item=entry from=$entries}>
-<{$entry.rdf_desc}>
-<div class="blogDate"><{$entry.created_date}></div>
-<div class="blogEntry">
-<table class="blogHeader">
-<tr>
-<{if $entry.use_avatar == 1}>
-<td width="5%"><img src="<{$entry.avatar_img}>"/></td>
-<{/if}>
-<td>
-<div class="blogTitle"><a href="details.php?blog_id=<{$entry.blog_id}>"><{$entry.title}></a></div>
-<div class="blogCategory"><b><{$entry.lang_category}>:</b> <{$entry.category}></div>
-<hr>
-<div class="blogShoulder"><{$entry.lang_author}>: <a href="<{$entry.profileUri}>"><{$entry.uname}></a> (<{$entry.created_time}>)</div>
-</td>
-</tr>
-</table>
-<table>
-<tr><td><div class="blogContents"><{$entry.contents}></div></td></tr>
-</table>
-<div class="blogFooter">
-<{if $entry.is_private eq 1}>
-<b><i><{$entry.private}>:</i></b>
-<{/if}>
-<{$entry.read_users_blog}>
-<{if $entry.provide_edit_link eq 1}>
- | <a href="post.php?blog_id=<{$entry.blog_id}>&edit=1"><{$lang_edit}></a>
-<{/if}>
- | <a href="<{$entry.comlink}>"><{$entry.lang_comments}> (<{$entry.comments}>)</a>
- | <a href="<{$entry.tracklink}>"><{$entry.lang_trackbacks}> (<{$entry.trackbacks}>)</a>
- | <{$entry.lang_reads}> (<{$entry.reads}>)
-</div>
-</div>
-<{/foreach}>
<!-- end loop -->
<p>
|
|
From: <wis...@us...> - 2013-09-10 22:17:35
|
Revision: 12025
http://sourceforge.net/p/xoops/svn/12025
Author: wishcraft
Date: 2013-09-10 22:17:14 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Xortify Client 4.15 for XOOPS 2.5.6 & 2.6 & The XOOPS Client 2 Series for XOOPS 2.5 & 2.6 (Production Copy)
Added Paths:
-----------
XoopsModules/xortify/trunk/PHP 5.x/
XoopsModules/xortify/trunk/PHP 5.x/class/
XoopsModules/xortify/trunk/PHP 5.x/class/auth/
XoopsModules/xortify/trunk/PHP 5.x/class/cache/
XoopsModules/xortify/trunk/PHP 5.x/data/
XoopsModules/xortify/trunk/PHP 5.x/docs/
XoopsModules/xortify/trunk/PHP 5.x/docs/html/
XoopsModules/xortify/trunk/PHP 5.x/docs/html/search/
XoopsModules/xortify/trunk/PHP 5.x/docs/latex/
XoopsModules/xortify/trunk/PHP 5.x/docs/man/
XoopsModules/xortify/trunk/PHP 5.x/docs/man/man3/
XoopsModules/xortify/trunk/PHP 5.x/docs/rtf/
XoopsModules/xortify/trunk/PHP 5.x/docs/xml/
XoopsModules/xortify/trunk/PHP 5.x/images/
XoopsModules/xortify/trunk/PHP 5.x/include/
XoopsModules/xortify/trunk/PHP 5.x/poll/
XoopsModules/xortify/trunk/PHP 5.x/providers/
XoopsModules/xortify/trunk/PHP 5.x/providers/projecthoneypot.org/
XoopsModules/xortify/trunk/PHP 5.x/providers/stopforumspam.com/
XoopsModules/xortify/trunk/PHP 5.x/providers/xortify/
XoopsModules/xortify/trunk/XOOPS 2.5/
XoopsModules/xortify/trunk/XOOPS 2.5/docs/
XoopsModules/xortify/trunk/XOOPS 2.5/docs/INSTALL
XoopsModules/xortify/trunk/XOOPS 2.5/docs/UPGRADE
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/annotated.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/bc_s.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/bdwn.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_c_u_r_l_x_m_l_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_c_u_r_l_x_m_l_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_c_u_r_l_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_c_u_r_l_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_j_s_o_n_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_j_s_o_n_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_minimumcloud_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_minimumcloud_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_providers-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_providers.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___c_u_r_l_x_m_l_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___c_u_r_l_x_m_l_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___c_u_r_l_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___c_u_r_l_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___j_s_o_n_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___j_s_o_n_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___w_g_e_t_x_m_l_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_r_e_s_t___w_g_e_t_x_m_l_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_s_o_a_p_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_s_o_a_p_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_services___j_s_o_n-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_services___j_s_o_n.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_system_xortify_preload-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_system_xortify_preload.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_system_xortify_preload.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_w_g_e_t_x_m_l_xortify_exchange-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_w_g_e_t_x_m_l_xortify_exchange.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curl-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curl.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curl.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curl_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curl_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curlserialised-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curlserialised.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curlserialised.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curlserialised_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curlserialised_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curlxml-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curlxml.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curlxml.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curlxml_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_curlxml_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_json-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_json.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_json.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_json_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_json_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_minimum_cloud-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_minimum_cloud.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_minimum_cloud.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_minimum_cloud_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_minimum_cloud_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curl-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curl.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curl.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curl_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curl_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curlserialised-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curlserialised.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curlserialised.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curlserialised_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curlserialised_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curlxml-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curlxml.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curlxml.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curlxml_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___curlxml_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___json-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___json.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___json.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___json_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___json_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___wgetserialised-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___wgetserialised.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___wgetserialised.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___wgetserialised_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___wgetserialised_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___wgetxml-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___wgetxml.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___wgetxml.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___wgetxml_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_rest___wgetxml_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_soap-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_soap.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_soap.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_soap_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_soap_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_wgetserialised-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_wgetserialised.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_wgetserialised.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_wgetserialised_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_wgetserialised_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_wgetxml-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_wgetxml.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_wgetxml.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_wgetxml_provisionning-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_auth_wgetxml_provisionning.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_bans_preload-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_bans_preload.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_bans_preload.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_core_preload-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_core_preload.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_core_preload.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails__links-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails__links.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails__links.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails__links_handler-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails__links_handler.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails__links_handler.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails_handler-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails_handler.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_emails_handler.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_log-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_log.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_log.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_log_handler-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_log_handler.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_log_handler.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_markonline_preload-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_markonline_preload.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_markonline_preload.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_php_preload-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_php_preload.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_php_preload.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_servers-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_servers.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_servers.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_servers_handler-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_servers_handler.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_servers_handler.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_servers_preload-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_servers_preload.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_servers_preload.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_sfs_preload-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_sfs_preload.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_sfs_preload.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_unbanner_preload-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_unbanner_preload.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_unbanner_preload.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_unbans_preload-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_unbans_preload.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_unbans_preload.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_usercrawl_preload-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_usercrawl_preload.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_usercrawl_preload.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_users_preload-members.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_users_preload.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/class_xortify_users_preload.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/classes.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/closed.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_015233fc46d28c80347978c6046262be.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_0d5d07b7bd7399319cb4536a8ec55e97.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_1126a250ef12dabc2052788dbd995ce5.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_2065e404e01a016cf87443ef81e90029.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_370194428f404877ed129766ba2a60c8.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_400a2e12f0cabfadf6eb2918580a6611.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_4634a6faccb78c8e98f11bf5f96d9d63.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_5997b33639604a5f5fd2c1b504a5cfbf.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_69425d7b5bc0574eb271fbe1f89a89e9.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_6c589e4c45971eb549f2fd9f31bad2cf.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_6d75b99057874a6598749a656817d085.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_70f4514109e467720458f600198c02a9.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_7f72a419f44f8f30b57afeeef3c6c78f.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_885cc87fac2d91e269af0a5a959fa5f6.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_88c7bb227758a73a7c2fc3bb21dc64f7.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_9a47a34d3d52f7c6ba18f534f262314f.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_9a7fdfdecdf75b91e78cfa14ca4a0281.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_af1848d891fa8ddbb7ae455c9df09464.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_b3e561b7f37d611865cc8452995c6e5d.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_c7a042b432695503036698ef32f8fe35.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_cbfc774f938a7729fadc75e4b19ccd60.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_e389cb2f32172a16a7a64a27fbc6f23b.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_e8eda94e532543011d5c7eaf1708b03b.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_eee9bd93fe97b2df1e3faa9c10293ecf.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_f86e91a93dba6f76eebe58c5b2044584.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dir_f89ef3af49397356f20e72cc8249f658.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/doxygen.css
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/doxygen.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/dynsections.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2blank.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2cl.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2doc.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2folderclosed.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2folderopen.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2lastnode.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2link.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2mlastnode.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2mnode.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2mo.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2node.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2ns.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2plastnode.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2pnode.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2splitbar.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/ftv2vertline.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_0x63.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_0x64.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_0x65.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_0x67.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_0x69.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_0x6e.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_0x72.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_0x73.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_0x75.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_0x76.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_0x78.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func_0x63.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func_0x64.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func_0x65.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func_0x67.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func_0x69.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func_0x6e.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func_0x72.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func_0x73.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func_0x75.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func_0x76.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/functions_func_0x78.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/hierarchy.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/jquery.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/namespace_services___j_s_o_n.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/namespacekernel.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/namespaces.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/namespacesystem.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/namespacexortify.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/nav_f.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/nav_g.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/nav_h.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/open.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/pages.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_61.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_61.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_63.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_63.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_64.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_64.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_65.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_65.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_67.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_67.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_69.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_69.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_6a.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_6a.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_6b.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_6b.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_6d.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_6d.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_6e.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_6e.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_70.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_70.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_72.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_72.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_73.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_73.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_74.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_74.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_75.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_75.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_76.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_76.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_77.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_77.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_78.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/all_78.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_63.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_63.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_6a.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_6a.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_6d.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_6d.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_70.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_70.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_72.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_72.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_73.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_73.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_77.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_77.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_78.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/classes_78.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/close.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_61.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_61.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_63.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_63.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_64.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_64.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_65.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_65.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_67.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_67.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_69.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_69.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_6e.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_6e.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_72.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_72.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_73.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_73.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_75.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_75.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_76.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_76.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_78.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/functions_78.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/mag_sel.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/namespaces_6b.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/namespaces_6b.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/namespaces_73.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/namespaces_73.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/namespaces_78.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/namespaces_78.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/nomatches.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/pages_74.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/pages_74.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/search.css
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/search.js
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/search_l.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/search_m.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/search/search_r.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/sync_off.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/sync_on.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/tab_a.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/tab_b.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/tab_h.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/tab_s.png
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/tabs.css
XoopsModules/xortify/trunk/XOOPS 2.5/docs/html/todo.html
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/Makefile
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/annotated.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_c_u_r_l_x_m_l_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_c_u_r_l_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_j_s_o_n_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_minimumcloud_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_providers.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_r_e_s_t___c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_r_e_s_t___c_u_r_l_x_m_l_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_r_e_s_t___c_u_r_l_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_r_e_s_t___j_s_o_n_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_r_e_s_t___w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_r_e_s_t___w_g_e_t_x_m_l_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_s_o_a_p_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_services___j_s_o_n.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_system_xortify_preload.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_system_xortify_preload.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_w_g_e_t_x_m_l_xortify_exchange.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_curl.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_curl.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_curl_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_curlserialised.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_curlserialised.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_curlserialised_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_curlxml.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_curlxml.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_curlxml_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_json.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_json.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_json_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_minimum_cloud.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_minimum_cloud.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_minimum_cloud_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___curl.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___curl.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___curl_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___curlserialised.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___curlserialised.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___curlserialised_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___curlxml.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___curlxml.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___curlxml_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___json.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___json.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___json_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___wgetserialised.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___wgetserialised.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___wgetserialised_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___wgetxml.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___wgetxml.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_rest___wgetxml_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_soap.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_soap.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_soap_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_wgetserialised.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_wgetserialised.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_wgetserialised_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_wgetxml.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_wgetxml.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_auth_wgetxml_provisionning.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_bans_preload.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_bans_preload.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_core_preload.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_core_preload.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_emails.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_emails.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_emails__links.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_emails__links.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_emails__links_handler.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_emails__links_handler.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_emails_handler.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_emails_handler.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_log.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_log.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_log_handler.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_log_handler.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_markonline_preload.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_markonline_preload.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_php_preload.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_php_preload.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_servers.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_servers.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_servers_handler.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_servers_handler.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_servers_preload.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_servers_preload.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_sfs_preload.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_sfs_preload.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_unbanner_preload.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_unbanner_preload.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_unbans_preload.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_unbans_preload.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_usercrawl_preload.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_usercrawl_preload.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_users_preload.eps
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/class_xortify_users_preload.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_015233fc46d28c80347978c6046262be.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_0d5d07b7bd7399319cb4536a8ec55e97.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_1126a250ef12dabc2052788dbd995ce5.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_2065e404e01a016cf87443ef81e90029.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_370194428f404877ed129766ba2a60c8.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_400a2e12f0cabfadf6eb2918580a6611.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_4634a6faccb78c8e98f11bf5f96d9d63.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_5997b33639604a5f5fd2c1b504a5cfbf.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_69425d7b5bc0574eb271fbe1f89a89e9.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_6c589e4c45971eb549f2fd9f31bad2cf.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_6d75b99057874a6598749a656817d085.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_70f4514109e467720458f600198c02a9.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_7f72a419f44f8f30b57afeeef3c6c78f.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_885cc87fac2d91e269af0a5a959fa5f6.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_88c7bb227758a73a7c2fc3bb21dc64f7.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_9a47a34d3d52f7c6ba18f534f262314f.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_9a7fdfdecdf75b91e78cfa14ca4a0281.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_af1848d891fa8ddbb7ae455c9df09464.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_b3e561b7f37d611865cc8452995c6e5d.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_c7a042b432695503036698ef32f8fe35.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_cbfc774f938a7729fadc75e4b19ccd60.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_e389cb2f32172a16a7a64a27fbc6f23b.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_e8eda94e532543011d5c7eaf1708b03b.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_eee9bd93fe97b2df1e3faa9c10293ecf.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_f86e91a93dba6f76eebe58c5b2044584.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/dir_f89ef3af49397356f20e72cc8249f658.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/doxygen.sty
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/hierarchy.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/make.bat
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/namespace_services___j_s_o_n.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/namespacekernel.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/namespaces.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/namespacesystem.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/namespacexortify.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/refman.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/latex/todo.tex
XoopsModules/xortify/trunk/XOOPS 2.5/docs/licence.txt
XoopsModules/xortify/trunk/XOOPS 2.5/extras/
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.5/
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.5/class/
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.5/class/xoopsform/
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.5/class/xoopsform/formdhtmltextarea.php
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.5/class/xoopsform/formeditor.php
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.5/class/xoopsform/formtextarea.php
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.x/
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.x/htdocs/
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.x/htdocs/header.php
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.x/htdocs/modules/
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.x/htdocs/modules/xortify/
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.x/htdocs/modules/xortify/preloads/
XoopsModules/xortify/trunk/XOOPS 2.5/extras/2.5.x/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/banned.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/class/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/class/xoopsform/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/class/xoopsform/formeditor.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/class/xoopsform/formtextarea.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/system/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/system/preloads/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/system/preloads/xortify.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/admin/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/admin/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/admin/index.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/admin/menu.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/blocks/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/blocks/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/blocks/spoof.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_curl.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_curlserialised_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_curlxml.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_curlxml_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_json.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_json_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_minimumcloud.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_minimumcloud_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_curl.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_curl_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_curlserialised.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_curlserialised_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_curlxml.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_curlxml_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_json.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_json_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_wgetserialised.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_wgetserialised_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_wgetxml.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_rest_wgetxml_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_soap.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_soap_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_wgetserialised_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_wgetxml.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/auth_wgetxml_provisionning.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/authfactory.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/auth/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/curl.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/curlserialised.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/curlxml.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/emails.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/emails_links.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/json.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/log.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/minimumcloud.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/rest_curl.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/rest_curlserialised.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/rest_curlxml.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/rest_json.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/rest_wgetserialised.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/rest_wgetxml.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/servers.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/soap.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/wgetserialised.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/class/wgetxml.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/cron/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/cron/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/cron/serverup.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/cron/unbanner.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/docs/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/docs/changelog.txt
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/docs/credits.txt
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/docs/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/docs/install.txt
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/docs/lang_diff.txt
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/docs/licence.txt
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/docs/readme.txt
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/accessdenied.png
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/arck.png
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/chronolabs.png
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/16/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/16/access.list.png
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/16/current.bans.png
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/16/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/16/xortify.log.png
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/32/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/32/access.list.png
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/32/current.bans.png
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/32/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/32/xortify.log.png
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/icons/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/left_both.gif
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/right_both.gif
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/images/xortify_slogo.png
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/JSON.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/forms.objects.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/forms.xortify.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/functions.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/install.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/instance.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/post.footer.end.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/post.header.addmeta.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/post.header.endcache.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/post.loader.mainfile.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/pre.loader.mainfile.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/uninstall.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/include/update.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/language/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/language/english/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/language/english/admin.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/language/english/ban.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/language/english/help/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/language/english/help/help.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/language/english/help/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/language/english/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/language/english/main.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/language/english/modinfo.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/language/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/plugin/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/plugin/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/plugin/projecthoneypot.org.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/plugin/protector.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/plugin/spiders.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/plugin/stopforumspam.com.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/plugin/xortify.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/poll/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/poll/index.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/bans.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/markonline.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/php.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/servers.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/sfs.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/unbanner.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/unbans.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/usercrawl.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/preloads/users.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/projecthoneypot.org/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/projecthoneypot.org/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/protector/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/protector/footer.post.loader.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/protector/header.post.loader.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/protector/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/providers.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/spiders/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/spiders/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/spiders/post.loader.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/stopforumspam.com/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/stopforumspam.com/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/xortify/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/xortify/footer.post.loader.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/xortify/header.post.loader.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/xortify/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/xortify/post.loader.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/providers/xortify/pre.loader.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/sql/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/sql/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/sql/mysql.sql
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/blocks/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/blocks/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/blocks/xortify_block_spoof.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/xortify_banning_notice.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/xortify_cpanel_bans.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/xortify_cpanel_log.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/xortify_cpanel_signup_form.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/xortify_cpanel_signup_nocommunication.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/xortify_instance_key.php.txt
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/xortify_spamming_notice.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/templates/xortify_words_notice.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/modules/xortify/xoops_version.php
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/xoops_lib/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/xoops_lib/modules/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/xoops_lib/modules/index.html
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/xoops_lib/modules/protector/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/xoops_lib/modules/protector/include/
XoopsModules/xortify/trunk/XOOPS 2.5/htdocs/xoops_lib/modules/protector/include/precheck.inc.php
XoopsMo...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-10 21:05:15
|
Revision: 12024
http://sourceforge.net/p/xoops/svn/12024
Author: luciorota
Date: 2013-09-10 21:05:12 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-10 20:26:14 UTC (rev 12023)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-10 21:05:12 UTC (rev 12024)
@@ -140,8 +140,8 @@
$filter_category_title_condition = WfdownloadsRequest::getString('filter_category_title_condition', '=');
$filter_category_title = WfdownloadsRequest::getString('filter_category_title', '');
$filter_poster = WfdownloadsRequest::getArray('filter_poster', null);
- //$filter_date = WfdownloadsRequest::getArray('filter_date', null);
- //$filter_date_condition = WfdownloadsRequest::getString('filter_date_condition', '<');
+ $filter_date = WfdownloadsRequest::getArray('filter_date', null);
+ $filter_date_condition = WfdownloadsRequest::getString('filter_date_condition', '<');
if ($op == 'downloads.filter') {
if ($filter_title == '' && $filter_category_title == '' && is_null($filter_poster)) $op = 'downloads.list';
@@ -193,9 +193,14 @@
$criteria->add(new Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'));
}
}
+ // Evaluate poster criteria
if (!is_null($filter_poster)) {
$criteria->add(new Criteria('poster', '(' . implode(',', $filter_poster) . ')', 'IN'));
}
+ // Evaluate date criteria
+ if (!empty($filter_date)) {
+ // IN PROGRESS
+ }
}
$criteria->setSort('published');
@@ -221,11 +226,11 @@
$GLOBALS['xoopsTpl']->assign('filter_title_condition', $filter_title_condition);
$GLOBALS['xoopsTpl']->assign('filter_category_title', $filter_category_title);
$GLOBALS['xoopsTpl']->assign('filter_category_title_condition', $filter_category_title_condition);
- $poster_select = new XoopsFormSelectUser(null, 'filter_poster', true, $filter_poster, 2, true);
+ $poster_select = new XoopsFormSelectUser(null, 'filter_poster', true, $filter_poster, 2, true);
$GLOBALS['xoopsTpl']->assign('filter_poster_select', $poster_select->render());
- //$date_select = new XoopsFormDateTime (null, 'filter_date', 15, time(), false);
- //$GLOBALS['xoopsTpl']->assign('filter_date_select', $date_select->render());
- //$GLOBALS['xoopsTpl']->assign('filter_date_condition', $filter_date_condition);
+ $date_select = new XoopsFormDateTime (null, 'filter_date', 15, time(), false);
+ $GLOBALS['xoopsTpl']->assign('filter_date_select', $date_select->render());
+ $GLOBALS['xoopsTpl']->assign('filter_date_condition', $filter_date_condition);
// New Downloads
@@ -535,6 +540,9 @@
global $xoopsUser, $currentFile;
$wfdownloads = WfdownloadsWfdownloads::getInstance();
+ $member_handler = xoops_gethandler('member');
+ $notification_handler = xoops_gethandler('notification');
+
$lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
$cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$status = WfdownloadsRequest::getInt('status', 2, 'POST');
@@ -733,7 +741,7 @@
}
// Added Formulize module support (2006/05/04) jpc - end
$wfdownloads->getHandler('download')->insert($download);
- $newid = intval($download->getVar('lid'));
+ $newid = (int)$download->getVar('lid');
/**
* Send notifications
*/
@@ -743,8 +751,8 @@
$tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
$tags['CATEGORY_NAME'] = $category->getVar('title');
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
- $notification_handler -> triggerEvent('global', 0, 'new_file', $tags);
- $notification_handler -> triggerEvent('category', $cid, 'new_file', $tags);
+ $notification_handler->triggerEvent('global', 0, 'new_file', $tags);
+ $notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
}
if ($lid && $approved && $notifypub) {
$tags = array();
@@ -753,9 +761,9 @@
$category = $wfdownloads->getHandler('category')->get($cid);
$tags['CATEGORY_NAME'] = $category->getVar('title');
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
- $notification_handler -> triggerEvent('global', 0, 'new_file', $tags);
- $notification_handler -> triggerEvent('category', $cid, 'new_file', $tags);
- $notification_handler -> triggerEvent('file', $lid, 'approve', $tags);
+ $notification_handler->triggerEvent('global', 0, 'new_file', $tags);
+ $notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
+ $notification_handler->triggerEvent('file', $lid, 'approve', $tags);
}
$message = (!$lid) ? _AM_WFD_FILE_NEWFILEUPLOAD : _AM_WFD_FILE_FILEMODIFIEDUPDATE ;
$message = ($lid && !$_POST['was_published'] && $approved) ? _AM_WFD_FILE_FILEAPPROVED : $message;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-09-10 20:26:14 UTC (rev 12023)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-09-10 21:05:12 UTC (rev 12024)
@@ -1162,7 +1162,7 @@
}
$mimetypes = $wfdownloads->getHandler('mimetype')->getObjects($criteria);
$mimetype = $mimetypes[0];
- $ret = explode(' ', $mimetypeObject->getVar('mime_types'));
+ $ret = explode(' ', $mimetype->getVar('mime_types'));
return $ret;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html 2013-09-10 20:26:14 UTC (rev 12023)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html 2013-09-10 21:05:12 UTC (rev 12024)
@@ -11,7 +11,8 @@
<{foreach item=sorted_category from=$sorted_categories}>
<tr class="<{cycle values='even, odd'}>">
<td>
- <{section name=indent loop=$sorted_category.level-1 step=1}}>-<{/section}><{$sorted_category.category.title}>
+ <{section name=indent loop=$sorted_category.level-1 step=1}}>-<{/section}>
+ <a href='../viewcat.php?cid=<{$sorted_category.category.cid}>'><{$sorted_category.category.title}></a>
</td>
<td>
<input type="text" name="new_weights[<{$sorted_category.category.cid}>]" size="5" maxlength="5" value="<{$sorted_category.category.weight}>" />
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-09-10 20:26:14 UTC (rev 12023)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-09-10 21:05:12 UTC (rev 12024)
@@ -58,8 +58,12 @@
<{foreach item=download from=$published_downloads}>
<tr class="<{cycle values='even, odd'}>">
<td align='center'><{$download.lid}></td>
- <td><a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a></td>
- <td><{$download.category_title}></td>
+ <td>
+ <a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a>
+ </td>
+ <td>
+ <a href='../viewcat.php?cid=<{$download.cid}>'><{$download.category_title}></a>
+ </td>
<td><{$download.submitter_uname}></td>
<td><{$download.published_timestamp}></td>
<td align='center'>
|
|
From: <wis...@us...> - 2013-09-10 20:26:16
|
Revision: 12023
http://sourceforge.net/p/xoops/svn/12023
Author: wishcraft
Date: 2013-09-10 20:26:14 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Xortify Client 4.15 for XOOPS 2.5.6 & 2.6 & The XOOPS Client 2 Series for XOOPS 2.5 & 2.6 (Production Copy)
Modified Paths:
--------------
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/cron/serverup.php
XoopsModules/xortify/releases/XOOPS 2.6/4.15/htdocs/modules/xortify/cron/serverup.php
Modified: XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/cron/serverup.php
===================================================================
--- XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/cron/serverup.php 2013-09-10 20:19:43 UTC (rev 12022)
+++ XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/cron/serverup.php 2013-09-10 20:26:14 UTC (rev 12023)
@@ -34,36 +34,42 @@
include_once dirname(dirname(dirname(dirname(__FILE__)))).'/mainfile.php';
include_once dirname(dirname(__FILE__)).'/include/functions.php';
- function xortify_getURLData($URI, $curl=false) {
+ function xortify_getURLData($URI, $search='', $curl=false) {
$ret = '';
- try {
- switch ($curl) {
- case true:
- if (!$ch = curl_init($URI)) {
- trigger_error('Could not intialise CURL file: '.$url);
- return false;
+ foreach(array('http://'=>'https://', 'https://'=>'http://') as $prot => $protto) {
+ $URI = str_replace($prot, $protto, $uri);
+ try {
+ switch ($curl) {
+ case true:
+ if (!$ch = curl_init($URI)) {
+ trigger_error('Could not intialise CURL file: '.$url);
+ return false;
+ }
+ $cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/croncurl_'.md5($URI).'.cookie';
+
+ curl_setopt($ch, CURLOPT_HEADER, 0);
+ curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['curl_connecttimeout']);
+ curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['curl_timeout']);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
+ $ret = curl_exec($ch);
+ curl_close($ch);
+ break;
+ case false:
+ $ret = file_get_contents($uri);
+ break;
+
}
- $cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/croncurl_'.md5($URI).'.cookie';
-
- curl_setopt($ch, CURLOPT_HEADER, 0);
- curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
- curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['curl_connecttimeout']);
- curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['curl_timeout']);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
- $ret = curl_exec($ch);
- curl_close($ch);
- break;
- case false:
- $ret = file_get_contents($uri);
- break;
+ } catch(Exception $e) {
+ echo 'Exception: "'.$e."\n";
}
- }
- catch(Exception $e) {
- echo 'Exception: "'.$e."\n";
+ if ($found = (strpos(strtolower($ret), strtolower($search))>0)) {
+ return array('value'=>$ret, 'prot'=>$protto, 'protwas'=>$prot, 'found'=>$found);
+ }
}
- return $ret;
+ return array('value'=>$ret, 'prot'=>$protto, 'protwas'=>$prot, 'found'=>$found);
}
foreach (get_loaded_extensions() as $ext){
@@ -119,6 +125,12 @@
define("SERIAL", 'serial/');
define("XML", 'xml/');
define("REST", 'api/');
+ define("XREST", "xrest/");
+ define("XSOAP", 'xsoap/');
+ define("XCURL", 'xcurl/');
+ define("XJSON", 'xjson/');
+ define("XSERIAL", 'xserial/');
+ define("XXML", 'xxml/');
include_once $xoops->path('class/cache/xoopscache.php');
@@ -137,49 +149,49 @@
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $config_handler->getConfigList($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid'));
if ($servers = $GLOBALS['xoopsCache']->read('server_list_xortify')) {
foreach($servers as $sid => $server) {
- $source = xortify_getURLData($server['server'], $nativecurl);
- if (strpos(strtolower($source), strtolower($server['search']))>0) {
+ $source = xortify_getURLData($server['server'], $server['search'], $nativecurl);
+ if ($source['found']==true) {
$serverup=true;
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urisoap'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], SOAP, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XSOAP, $server['server']):str_replace($server['replace'], SOAP, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_uricurl'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], CURL, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XCURL, $server['server']):str_replace($server['replace'], CURL, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urijson'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], JSON, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XJSON, $server['server']):str_replace($server['replace'], JSON, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_uriserial'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], SERIAL, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XSERIAL, $server['server']):str_replace($server['replace'], SERIAL, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urixml'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], XML, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XXML, $server['server']):str_replace($server['replace'], XML, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urirest'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], REST, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XREST, $server['server']):str_replace($server['replace'], REST, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
}
Modified: XoopsModules/xortify/releases/XOOPS 2.6/4.15/htdocs/modules/xortify/cron/serverup.php
===================================================================
--- XoopsModules/xortify/releases/XOOPS 2.6/4.15/htdocs/modules/xortify/cron/serverup.php 2013-09-10 20:19:43 UTC (rev 12022)
+++ XoopsModules/xortify/releases/XOOPS 2.6/4.15/htdocs/modules/xortify/cron/serverup.php 2013-09-10 20:26:14 UTC (rev 12023)
@@ -43,36 +43,42 @@
/*
* Retrieve URL Source for Data and analysis
*/
- function xortify_getURLData($URI, $curl=false) {
+ function xortify_getURLData($URI, $search='', $curl=false) {
$ret = '';
- try {
- switch ($curl) {
- case true:
- if (!$ch = curl_init($URI)) {
- trigger_error('Could not intialise CURL file: '.$url);
- return false;
+ foreach(array('http://'=>'https://', 'https://'=>'http://') as $prot => $protto) {
+ $URI = str_replace($prot, $protto, $uri);
+ try {
+ switch ($curl) {
+ case true:
+ if (!$ch = curl_init($URI)) {
+ trigger_error('Could not intialise CURL file: '.$url);
+ return false;
+ }
+ $cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/croncurl_'.md5($URI).'.cookie';
+
+ curl_setopt($ch, CURLOPT_HEADER, 0);
+ curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['curl_connecttimeout']);
+ curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['curl_timeout']);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
+ $ret = curl_exec($ch);
+ curl_close($ch);
+ break;
+ case false:
+ $ret = file_get_contents($uri);
+ break;
+
}
- $cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/croncurl_'.md5($URI).'.cookie';
-
- curl_setopt($ch, CURLOPT_HEADER, 0);
- curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xoops']->getModuleConfig('curl_connecttimeout', 'xortify'));
- curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xoops']->getModuleConfig('curl_timeout', 'xortify'));
- curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
- $ret = curl_exec($ch);
- curl_close($ch);
- break;
- case false:
- $ret = file_get_contents($uri);
- break;
+ } catch(Exception $e) {
+ echo 'Exception: "'.$e."\n";
}
- }
- catch(Exception $e) {
- echo 'Exception: "'.$e."\n";
+ if ($found = (strpos(strtolower($ret), strtolower($search))>0)) {
+ return array('value'=>$ret, 'prot'=>$protto, 'protwas'=>$prot, 'found'=>$found);
+ }
}
- return $ret;
+ return array('value'=>$ret, 'prot'=>$protto, 'protwas'=>$prot, 'found'=>$found);
}
if (!isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['_preloader']))
@@ -104,18 +110,18 @@
include_once XOOPS_ROOT_PATH . DS . 'include' . DS . 'version.php';
}
- define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (PHP - '.PHP_VERSION.') '.(defined('XOOPS_VERSION')?constant('XOOPS_VERSION').' ':'').'- Xortify 4.02');
- define("SERVER1", 'http://xortify.com/unban/?op=unban');
- define("SERVER2", 'http://xortify.xoops.org/unban/?op=unban');
- define("SERVER3", 'http://xortify.chronolabs.coop/unban/?op=unban');
- define("REPLACE", 'unban/?op=unban');
- define("SEARCHFOR", 'Solve Puzzel:');
define("SOAP", 'soap/');
define("CURL", 'curl/');
define("JSON", 'json/');
define("SERIAL", 'serial/');
define("XML", 'xml/');
define("REST", 'api/');
+ define("XREST", "xrest/");
+ define("XSOAP", 'xsoap/');
+ define("XCURL", 'xcurl/');
+ define("XJSON", 'xjson/');
+ define("XSERIAL", 'xserial/');
+ define("XXML", 'xxml/');
include_once $xoops->path('class/cache/xoopscache.php');
@@ -134,50 +140,49 @@
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $config_handler->getConfigList($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid'));
if ($servers = XoopsCache::read('server_list_xortify')) {
foreach($servers as $sid => $server) {
- $source = xortify_getURLData($server['server'], $nativecurl);
- if (strpos(strtolower($source), strtolower($server['search']))>0) {
+ $source = xortify_getURLData($server['server'], $server['search'], $nativecurl);
+ if ($source['found']==true) {
$serverup=true;
- echo 'Server '.$sid.' is UP - check @ '.$server['server'];
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urisoap'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], SOAP, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XSOAP, $server['server']):str_replace($server['replace'], SOAP, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_uricurl'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], CURL, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XCURL, $server['server']):str_replace($server['replace'], CURL, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urijson'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], JSON, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XJSON, $server['server']):str_replace($server['replace'], JSON, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_uriserial'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], SERIAL, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XSERIAL, $server['server']):str_replace($server['replace'], SERIAL, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urixml'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], XML, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XXML, $server['server']):str_replace($server['replace'], XML, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urirest'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], REST, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XREST, $server['server']):str_replace($server['replace'], REST, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
}
|
|
From: <wis...@us...> - 2013-09-10 20:19:45
|
Revision: 12022
http://sourceforge.net/p/xoops/svn/12022
Author: wishcraft
Date: 2013-09-10 20:19:43 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Xortify Client 4.15 for XOOPS 2.5.6 & 2.6 & The XOOPS Client 2 Series for XOOPS 2.5 & 2.6 (Production Copy)
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php
Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php 2013-09-10 20:15:20 UTC (rev 12021)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php 2013-09-10 20:19:43 UTC (rev 12022)
@@ -43,36 +43,42 @@
/*
* Retrieve URL Source for Data and analysis
*/
- function xortify_getURLData($URI, $curl=false) {
+ function xortify_getURLData($URI, $search='', $curl=false) {
$ret = '';
- try {
- switch ($curl) {
- case true:
- if (!$ch = curl_init($URI)) {
- trigger_error('Could not intialise CURL file: '.$url);
- return false;
+ foreach(array('http://'=>'https://', 'https://'=>'http://') as $prot => $protto) {
+ $URI = str_replace($prot, $protto, $uri);
+ try {
+ switch ($curl) {
+ case true:
+ if (!$ch = curl_init($URI)) {
+ trigger_error('Could not intialise CURL file: '.$url);
+ return false;
+ }
+ $cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/croncurl_'.md5($URI).'.cookie';
+
+ curl_setopt($ch, CURLOPT_HEADER, 0);
+ curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['curl_connecttimeout']);
+ curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['curl_timeout']);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
+ $ret = curl_exec($ch);
+ curl_close($ch);
+ break;
+ case false:
+ $ret = file_get_contents($uri);
+ break;
+
}
- $cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/croncurl_'.md5($URI).'.cookie';
-
- curl_setopt($ch, CURLOPT_HEADER, 0);
- curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xoops']->getModuleConfig('curl_connecttimeout', 'xortify'));
- curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xoops']->getModuleConfig('curl_timeout', 'xortify'));
- curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
- $ret = curl_exec($ch);
- curl_close($ch);
- break;
- case false:
- $ret = file_get_contents($uri);
- break;
+ } catch(Exception $e) {
+ echo 'Exception: "'.$e."\n";
}
- }
- catch(Exception $e) {
- echo 'Exception: "'.$e."\n";
+ if ($found = (strpos(strtolower($ret), strtolower($search))>0)) {
+ return array('value'=>$ret, 'prot'=>$protto, 'protwas'=>$prot, 'found'=>$found);
+ }
}
- return $ret;
+ return array('value'=>$ret, 'prot'=>$protto, 'protwas'=>$prot, 'found'=>$found);
}
if (!isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['_preloader']))
@@ -104,18 +110,18 @@
include_once XOOPS_ROOT_PATH . DS . 'include' . DS . 'version.php';
}
- define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (PHP - '.PHP_VERSION.') '.(defined('XOOPS_VERSION')?constant('XOOPS_VERSION').' ':'').'- Xortify 4.02');
- define("SERVER1", 'http://xortify.com/unban/?op=unban');
- define("SERVER2", 'http://xortify.xoops.org/unban/?op=unban');
- define("SERVER3", 'http://xortify.chronolabs.coop/unban/?op=unban');
- define("REPLACE", 'unban/?op=unban');
- define("SEARCHFOR", 'Solve Puzzel:');
define("SOAP", 'soap/');
define("CURL", 'curl/');
define("JSON", 'json/');
define("SERIAL", 'serial/');
define("XML", 'xml/');
define("REST", 'api/');
+ define("XREST", "xrest/");
+ define("XSOAP", 'xsoap/');
+ define("XCURL", 'xcurl/');
+ define("XJSON", 'xjson/');
+ define("XSERIAL", 'xserial/');
+ define("XXML", 'xxml/');
include_once $xoops->path('class/cache/xoopscache.php');
@@ -134,50 +140,49 @@
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $config_handler->getConfigList($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid'));
if ($servers = XoopsCache::read('server_list_xortify')) {
foreach($servers as $sid => $server) {
- $source = xortify_getURLData($server['server'], $nativecurl);
- if (strpos(strtolower($source), strtolower($server['search']))>0) {
+ $source = xortify_getURLData($server['server'], $server['search'], $nativecurl);
+ if ($source['found']==true) {
$serverup=true;
- echo 'Server '.$sid.' is UP - check @ '.$server['server'];
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urisoap'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], SOAP, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XSOAP, $server['server']):str_replace($server['replace'], SOAP, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_uricurl'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], CURL, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XCURL, $server['server']):str_replace($server['replace'], CURL, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urijson'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], JSON, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XJSON, $server['server']):str_replace($server['replace'], JSON, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_uriserial'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], SERIAL, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XSERIAL, $server['server']):str_replace($server['replace'], SERIAL, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urixml'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], XML, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XXML, $server['server']):str_replace($server['replace'], XML, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
$criteria->add(new Criteria('conf_name', 'xortify_urirest'));
$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
- $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], REST, $server['server']));
+ $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XREST, $server['server']):str_replace($server['replace'], REST, $server['server']))));
$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
}
}
|
|
From: <wis...@us...> - 2013-09-10 20:15:22
|
Revision: 12021
http://sourceforge.net/p/xoops/svn/12021
Author: wishcraft
Date: 2013-09-10 20:15:20 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Xortify Client 4.15 for XOOPS 2.5.6 & 2.6 & The XOOPS Client 2 Series for XOOPS 2.5 & 2.6 (Production Copy)
Added Paths:
-----------
XoopsModules/xortify/marketing/What is happening with Xortify.docx
XoopsModules/xortify/marketing/Xortify 4.docx
Added: XoopsModules/xortify/marketing/What is happening with Xortify.docx
===================================================================
(Binary files differ)
Index: XoopsModules/xortify/marketing/What is happening with Xortify.docx
===================================================================
--- XoopsModules/xortify/marketing/What is happening with Xortify.docx 2013-09-10 20:12:08 UTC (rev 12020)
+++ XoopsModules/xortify/marketing/What is happening with Xortify.docx 2013-09-10 20:15:20 UTC (rev 12021)
Property changes on: XoopsModules/xortify/marketing/What is happening with Xortify.docx
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xortify/marketing/Xortify 4.docx
===================================================================
(Binary files differ)
Index: XoopsModules/xortify/marketing/Xortify 4.docx
===================================================================
--- XoopsModules/xortify/marketing/Xortify 4.docx 2013-09-10 20:12:08 UTC (rev 12020)
+++ XoopsModules/xortify/marketing/Xortify 4.docx 2013-09-10 20:15:20 UTC (rev 12021)
Property changes on: XoopsModules/xortify/marketing/Xortify 4.docx
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
|
|
From: <wis...@us...> - 2013-09-10 20:12:32
|
Revision: 12020
http://sourceforge.net/p/xoops/svn/12020
Author: wishcraft
Date: 2013-09-10 20:12:08 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Xortify Client 4.15 for XOOPS 2.5.6 & 2.6 & The XOOPS Client 2 Series for XOOPS 2.5 & 2.6 (Production Copy)
Added Paths:
-----------
XoopsModules/xortify/releases/XOOPS 2.5/4.15/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/INSTALL
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/UPGRADE
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/annotated.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/bc_s.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/bdwn.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_c_u_r_l_x_m_l_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_c_u_r_l_x_m_l_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_c_u_r_l_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_c_u_r_l_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_j_s_o_n_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_j_s_o_n_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_minimumcloud_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_minimumcloud_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_providers-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_providers.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___c_u_r_l_x_m_l_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___c_u_r_l_x_m_l_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___c_u_r_l_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___c_u_r_l_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___j_s_o_n_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___j_s_o_n_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___w_g_e_t_x_m_l_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_r_e_s_t___w_g_e_t_x_m_l_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_s_o_a_p_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_s_o_a_p_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_services___j_s_o_n-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_services___j_s_o_n.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_system_xortify_preload-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_system_xortify_preload.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_system_xortify_preload.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_w_g_e_t_x_m_l_xortify_exchange-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_w_g_e_t_x_m_l_xortify_exchange.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curl-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curl.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curl.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curl_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curl_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curlserialised-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curlserialised.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curlserialised.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curlserialised_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curlserialised_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curlxml-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curlxml.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curlxml.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curlxml_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_curlxml_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_json-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_json.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_json.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_json_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_json_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_minimum_cloud-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_minimum_cloud.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_minimum_cloud.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_minimum_cloud_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_minimum_cloud_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curl-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curl.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curl.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curl_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curl_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curlserialised-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curlserialised.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curlserialised.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curlserialised_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curlserialised_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curlxml-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curlxml.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curlxml.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curlxml_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___curlxml_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___json-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___json.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___json.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___json_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___json_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___wgetserialised-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___wgetserialised.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___wgetserialised.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___wgetserialised_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___wgetserialised_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___wgetxml-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___wgetxml.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___wgetxml.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___wgetxml_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_rest___wgetxml_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_soap-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_soap.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_soap.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_soap_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_soap_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_wgetserialised-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_wgetserialised.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_wgetserialised.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_wgetserialised_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_wgetserialised_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_wgetxml-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_wgetxml.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_wgetxml.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_wgetxml_provisionning-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_auth_wgetxml_provisionning.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_bans_preload-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_bans_preload.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_bans_preload.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_core_preload-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_core_preload.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_core_preload.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails__links-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails__links.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails__links.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails__links_handler-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails__links_handler.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails__links_handler.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails_handler-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails_handler.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_emails_handler.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_log-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_log.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_log.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_log_handler-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_log_handler.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_log_handler.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_markonline_preload-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_markonline_preload.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_markonline_preload.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_php_preload-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_php_preload.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_php_preload.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_servers-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_servers.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_servers.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_servers_handler-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_servers_handler.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_servers_handler.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_servers_preload-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_servers_preload.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_servers_preload.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_sfs_preload-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_sfs_preload.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_sfs_preload.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_unbanner_preload-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_unbanner_preload.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_unbanner_preload.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_unbans_preload-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_unbans_preload.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_unbans_preload.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_usercrawl_preload-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_usercrawl_preload.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_usercrawl_preload.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_users_preload-members.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_users_preload.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/class_xortify_users_preload.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/classes.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/closed.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_015233fc46d28c80347978c6046262be.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_0d5d07b7bd7399319cb4536a8ec55e97.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_1126a250ef12dabc2052788dbd995ce5.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_2065e404e01a016cf87443ef81e90029.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_370194428f404877ed129766ba2a60c8.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_400a2e12f0cabfadf6eb2918580a6611.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_4634a6faccb78c8e98f11bf5f96d9d63.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_5997b33639604a5f5fd2c1b504a5cfbf.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_69425d7b5bc0574eb271fbe1f89a89e9.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_6c589e4c45971eb549f2fd9f31bad2cf.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_6d75b99057874a6598749a656817d085.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_70f4514109e467720458f600198c02a9.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_7f72a419f44f8f30b57afeeef3c6c78f.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_885cc87fac2d91e269af0a5a959fa5f6.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_88c7bb227758a73a7c2fc3bb21dc64f7.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_9a47a34d3d52f7c6ba18f534f262314f.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_9a7fdfdecdf75b91e78cfa14ca4a0281.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_af1848d891fa8ddbb7ae455c9df09464.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_b3e561b7f37d611865cc8452995c6e5d.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_c7a042b432695503036698ef32f8fe35.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_cbfc774f938a7729fadc75e4b19ccd60.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_e389cb2f32172a16a7a64a27fbc6f23b.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_e8eda94e532543011d5c7eaf1708b03b.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_eee9bd93fe97b2df1e3faa9c10293ecf.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_f86e91a93dba6f76eebe58c5b2044584.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dir_f89ef3af49397356f20e72cc8249f658.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/doxygen.css
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/doxygen.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/dynsections.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2blank.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2cl.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2doc.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2folderclosed.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2folderopen.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2lastnode.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2link.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2mlastnode.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2mnode.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2mo.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2node.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2ns.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2plastnode.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2pnode.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2splitbar.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/ftv2vertline.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_0x63.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_0x64.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_0x65.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_0x67.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_0x69.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_0x6e.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_0x72.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_0x73.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_0x75.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_0x76.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_0x78.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func_0x63.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func_0x64.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func_0x65.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func_0x67.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func_0x69.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func_0x6e.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func_0x72.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func_0x73.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func_0x75.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func_0x76.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/functions_func_0x78.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/hierarchy.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/jquery.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/namespace_services___j_s_o_n.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/namespacekernel.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/namespaces.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/namespacesystem.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/namespacexortify.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/nav_f.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/nav_g.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/nav_h.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/open.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/pages.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_61.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_61.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_63.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_63.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_64.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_64.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_65.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_65.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_67.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_67.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_69.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_69.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_6a.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_6a.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_6b.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_6b.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_6d.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_6d.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_6e.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_6e.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_70.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_70.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_72.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_72.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_73.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_73.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_74.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_74.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_75.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_75.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_76.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_76.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_77.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_77.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_78.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/all_78.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_63.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_63.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_6a.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_6a.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_6d.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_6d.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_70.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_70.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_72.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_72.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_73.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_73.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_77.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_77.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_78.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/classes_78.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/close.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_61.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_61.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_63.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_63.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_64.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_64.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_65.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_65.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_67.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_67.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_69.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_69.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_6e.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_6e.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_72.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_72.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_73.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_73.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_75.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_75.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_76.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_76.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_78.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/functions_78.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/mag_sel.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/namespaces_6b.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/namespaces_6b.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/namespaces_73.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/namespaces_73.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/namespaces_78.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/namespaces_78.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/nomatches.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/pages_74.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/pages_74.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/search.css
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/search.js
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/search_l.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/search_m.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/search/search_r.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/sync_off.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/sync_on.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/tab_a.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/tab_b.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/tab_h.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/tab_s.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/tabs.css
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/html/todo.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/Makefile
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/annotated.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_c_u_r_l_x_m_l_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_c_u_r_l_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_j_s_o_n_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_minimumcloud_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_providers.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_r_e_s_t___c_u_r_l_s_e_r_i_a_l_i_s_e_d_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_r_e_s_t___c_u_r_l_x_m_l_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_r_e_s_t___c_u_r_l_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_r_e_s_t___j_s_o_n_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_r_e_s_t___w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_r_e_s_t___w_g_e_t_x_m_l_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_s_o_a_p_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_services___j_s_o_n.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_system_xortify_preload.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_system_xortify_preload.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_w_g_e_t_s_e_r_i_a_l_i_s_e_d_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_w_g_e_t_x_m_l_xortify_exchange.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_curl.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_curl.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_curl_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_curlserialised.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_curlserialised.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_curlserialised_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_curlxml.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_curlxml.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_curlxml_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_json.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_json.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_json_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_minimum_cloud.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_minimum_cloud.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_minimum_cloud_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___curl.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___curl.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___curl_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___curlserialised.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___curlserialised.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___curlserialised_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___curlxml.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___curlxml.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___curlxml_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___json.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___json.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___json_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___wgetserialised.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___wgetserialised.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___wgetserialised_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___wgetxml.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___wgetxml.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_rest___wgetxml_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_soap.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_soap.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_soap_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_wgetserialised.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_wgetserialised.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_wgetserialised_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_wgetxml.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_wgetxml.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_auth_wgetxml_provisionning.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_bans_preload.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_bans_preload.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_core_preload.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_core_preload.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_emails.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_emails.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_emails__links.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_emails__links.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_emails__links_handler.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_emails__links_handler.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_emails_handler.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_emails_handler.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_log.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_log.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_log_handler.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_log_handler.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_markonline_preload.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_markonline_preload.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_php_preload.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_php_preload.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_servers.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_servers.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_servers_handler.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_servers_handler.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_servers_preload.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_servers_preload.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_sfs_preload.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_sfs_preload.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_unbanner_preload.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_unbanner_preload.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_unbans_preload.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_unbans_preload.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_usercrawl_preload.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_usercrawl_preload.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_users_preload.eps
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/class_xortify_users_preload.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_015233fc46d28c80347978c6046262be.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_0d5d07b7bd7399319cb4536a8ec55e97.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_1126a250ef12dabc2052788dbd995ce5.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_2065e404e01a016cf87443ef81e90029.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_370194428f404877ed129766ba2a60c8.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_400a2e12f0cabfadf6eb2918580a6611.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_4634a6faccb78c8e98f11bf5f96d9d63.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_5997b33639604a5f5fd2c1b504a5cfbf.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_69425d7b5bc0574eb271fbe1f89a89e9.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_6c589e4c45971eb549f2fd9f31bad2cf.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_6d75b99057874a6598749a656817d085.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_70f4514109e467720458f600198c02a9.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_7f72a419f44f8f30b57afeeef3c6c78f.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_885cc87fac2d91e269af0a5a959fa5f6.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_88c7bb227758a73a7c2fc3bb21dc64f7.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_9a47a34d3d52f7c6ba18f534f262314f.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_9a7fdfdecdf75b91e78cfa14ca4a0281.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_af1848d891fa8ddbb7ae455c9df09464.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_b3e561b7f37d611865cc8452995c6e5d.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_c7a042b432695503036698ef32f8fe35.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_cbfc774f938a7729fadc75e4b19ccd60.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_e389cb2f32172a16a7a64a27fbc6f23b.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_e8eda94e532543011d5c7eaf1708b03b.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_eee9bd93fe97b2df1e3faa9c10293ecf.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_f86e91a93dba6f76eebe58c5b2044584.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/dir_f89ef3af49397356f20e72cc8249f658.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/doxygen.sty
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/hierarchy.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/make.bat
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/namespace_services___j_s_o_n.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/namespacekernel.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/namespaces.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/namespacesystem.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/namespacexortify.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/refman.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/latex/todo.tex
XoopsModules/xortify/releases/XOOPS 2.5/4.15/docs/licence.txt
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.5/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.5/class/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.5/class/xoopsform/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.5/class/xoopsform/formdhtmltextarea.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.5/class/xoopsform/formeditor.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.5/class/xoopsform/formtextarea.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.x/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.x/htdocs/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.x/htdocs/header.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.x/htdocs/modules/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.x/htdocs/modules/xortify/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.x/htdocs/modules/xortify/preloads/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/extras/2.5.x/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/banned.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/class/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/class/xoopsform/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/class/xoopsform/formeditor.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/class/xoopsform/formtextarea.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/system/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/system/preloads/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/system/preloads/xortify.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/admin/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/admin/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/admin/index.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/admin/menu.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/blocks/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/blocks/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/blocks/spoof.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_curl.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_curlserialised.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_curlserialised_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_curlxml.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_curlxml_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_json.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_json_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_minimumcloud.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_minimumcloud_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_curl.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_curl_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_curlserialised.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_curlserialised_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_curlxml.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_curlxml_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_json.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_json_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_wgetserialised.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_wgetserialised_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_wgetxml.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_rest_wgetxml_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_soap.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_soap_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_wgetserialised.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_wgetserialised_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_wgetxml.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/auth_wgetxml_provisionning.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/authfactory.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/auth/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/curl.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/curlserialised.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/curlxml.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/emails.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/emails_links.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/json.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/log.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/minimumcloud.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/rest_curl.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/rest_curlserialised.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/rest_curlxml.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/rest_json.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/rest_wgetserialised.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/rest_wgetxml.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/servers.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/soap.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/wgetserialised.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/class/wgetxml.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/cron/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/cron/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/cron/serverup.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/cron/unbanner.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/docs/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/docs/changelog.txt
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/docs/credits.txt
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/docs/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/docs/install.txt
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/docs/lang_diff.txt
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/docs/licence.txt
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/docs/readme.txt
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/accessdenied.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/arck.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/chronolabs.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/16/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/16/access.list.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/16/current.bans.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/16/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/16/xortify.log.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/32/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/32/access.list.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/32/current.bans.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/32/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/32/xortify.log.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/icons/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/left_both.gif
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/right_both.gif
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/images/xortify_slogo.png
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/JSON.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/forms.objects.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/forms.xortify.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/functions.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/install.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/instance.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/post.footer.end.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/post.header.addmeta.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/post.header.endcache.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/post.loader.mainfile.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/pre.loader.mainfile.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/uninstall.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/include/update.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/language/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/language/english/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/language/english/admin.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/language/english/ban.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/language/english/help/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/language/english/help/help.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/language/english/help/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/language/english/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/language/english/main.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/language/english/modinfo.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/language/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/plugin/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/plugin/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/plugin/projecthoneypot.org.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/plugin/protector.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/plugin/spiders.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/plugin/stopforumspam.com.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/plugin/xortify.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/poll/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/poll/index.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/preloads/
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/preloads/bans.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/preloads/core.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/preloads/index.html
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/preloads/markonline.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/preloads/php.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/preloads/servers.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/preloads/sfs.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/preloads/unbanner.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/preloads/unbans.php
XoopsModules/xortify/releases/XOOPS 2.5/4.15/htdocs/modules/xortify/preloads/usercrawl.php
XoopsModule...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-10 16:09:14
|
Revision: 12019
http://sourceforge.net/p/xoops/svn/12019
Author: luciorota
Date: 2013-09-10 16:09:10 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
bugfix: late night typing errors
refactoring: removed unused functions, rename functions
added: adminside, filter in downloads list
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-10 15:16:57 UTC (rev 12018)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-09-10 16:09:10 UTC (rev 12019)
@@ -23,9 +23,9 @@
$op = WfdownloadsRequest::getString('op', 'downloads.list');
switch ($op) {
- case "download.edit":
- case "download.add":
- case "Download":
+ case "download.edit" :
+ case "download.add" :
+ case "Download" :
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
@@ -38,12 +38,12 @@
include 'admin_footer.php';
break;
- case "download.save":
- case "addDownload":
+ case "download.save" :
+ case "addDownload" :
saveDownload();
break;
- case "download.delete":
+ case "download.delete" :
$lid = WfdownloadsRequest::getInt('lid', 0);
$ok = WfdownloadsRequest::getBool('ok', false, 'POST');
if (!$download = $wfdownloads->getHandler('download')->get($lid)) {
@@ -72,8 +72,8 @@
}
break;
- case "vote.delete":
- case "delVote":
+ case "vote.delete" :
+ case "delVote" :
$rating = $wfdownloads->getHandler('rating')->get($_GET['rid']);
if ($wfdownloads->getHandler('rating')->delete($rating, true)) {
wfdownloads_updateRating(intval($rating->getVar('lid')));
@@ -82,7 +82,7 @@
break;
// Added Formulize module support (2006/05/04) jpc - start
- case "patch_formulize":
+ case "patch_formulize" :
if (wfdownloads_checkModule('formulize')) {
if(!isset($_POST['patch_formulize'])) {
print "<form action=\"{$currentFile}?op=patch_formulize\" method=post>";
@@ -101,8 +101,8 @@
break;
// Added Formulize module support (2006/05/04) jpc - end
- case "newdownload.approve":
- case "approve":
+ case "newdownload.approve" :
+ case "approve" :
$lid = WfdownloadsRequest::getInt('lid', 0);
if (!$download = $wfdownloads->getHandler('download')->get($lid)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_DOWNLOADNOTFOUND);
@@ -132,8 +132,21 @@
redirect_header($currentFile, 1, _AM_WFD_SUB_NEWFILECREATED);
break;
- case "downloads.list":
+ case "downloads.list" :
+ case "downloads.filter" :
default :
+ $filter_title_condition = WfdownloadsRequest::getString('filter_title_condition', '=');
+ $filter_title = WfdownloadsRequest::getString('filter_title', '');
+ $filter_category_title_condition = WfdownloadsRequest::getString('filter_category_title_condition', '=');
+ $filter_category_title = WfdownloadsRequest::getString('filter_category_title', '');
+ $filter_poster = WfdownloadsRequest::getArray('filter_poster', null);
+ //$filter_date = WfdownloadsRequest::getArray('filter_date', null);
+ //$filter_date_condition = WfdownloadsRequest::getString('filter_date_condition', '<');
+
+ if ($op == 'downloads.filter') {
+ if ($filter_title == '' && $filter_category_title == '' && is_null($filter_poster)) $op = 'downloads.list';
+ }
+
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$categories = $wfdownloads->getHandler('category')->getObjects();
@@ -161,6 +174,30 @@
if ($totalDownloadsCount > 0) {
// Published Downloads
$criteria = new CriteriaCompo();
+ if ($op == 'downloads.filter') {
+ // Evaluate title criteria
+ if ($filter_title != '') {
+ if ($filter_title_condition == 'LIKE') {
+ $criteria->add(new Criteria('title', "%{$filter_title}%", 'LIKE'));
+ } else {
+ $criteria->add(new Criteria('title', $filter_title, '='));
+ }
+ }
+ // Evaluate cid criteria
+ if ($filter_category_title != '') {
+ if ($filter_category_title_condition == 'LIKE') {
+ $cids = $wfdownloads->getHandler('category')->getIds(new Criteria('title', "%{$filter_category_title}%", 'LIKE'));
+ $criteria->add(new Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'));
+ } else {
+ $cids = $wfdownloads->getHandler('category')->getIds(new Criteria('title', $filter_category_title, '='));
+ $criteria->add(new Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'));
+ }
+ }
+ if (!is_null($filter_poster)) {
+ $criteria->add(new Criteria('poster', '(' . implode(',', $filter_poster) . ')', 'IN'));
+ }
+ }
+
$criteria->setSort('published');
$criteria->setOrder('DESC');
$criteria->setStart($start_published);
@@ -180,7 +217,16 @@
}
$pagenav = new XoopsPageNav($publishedDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_published, 'start_published');
- $GLOBALS['xoopsTpl']->assign('published_downloads_pagenav', $pagenav->renderNav());
+ $GLOBALS['xoopsTpl']->assign('filter_title', $filter_title);
+ $GLOBALS['xoopsTpl']->assign('filter_title_condition', $filter_title_condition);
+ $GLOBALS['xoopsTpl']->assign('filter_category_title', $filter_category_title);
+ $GLOBALS['xoopsTpl']->assign('filter_category_title_condition', $filter_category_title_condition);
+ $poster_select = new XoopsFormSelectUser(null, 'filter_poster', true, $filter_poster, 2, true);
+ $GLOBALS['xoopsTpl']->assign('filter_poster_select', $poster_select->render());
+ //$date_select = new XoopsFormDateTime (null, 'filter_date', 15, time(), false);
+ //$GLOBALS['xoopsTpl']->assign('filter_date_select', $date_select->render());
+ //$GLOBALS['xoopsTpl']->assign('filter_date_condition', $filter_date_condition);
+
// New Downloads
$criteria = new CriteriaCompo();
@@ -235,10 +281,10 @@
// Expired downloads
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria("expired", time(), "<"), 'AND');
- $criteria->add(new Criteria("expired", 0, "<>"), 'AND');
- $criteria->setSort("expired");
- $criteria->setOrder("ASC");
+ $criteria->add(new Criteria('expired', time(), '<'), 'AND');
+ $criteria->add(new Criteria('expired', 0, '<>'), 'AND');
+ $criteria->setSort('expired');
+ $criteria->setOrder('ASC');
$criteria->setStart($start_expired);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
$expired_downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
@@ -260,7 +306,7 @@
// Offline downloads
$criteria = new Criteria("offline", 1);
$criteria->setSort('published');
- $criteria->setOrder("ASC");
+ $criteria->setOrder('ASC');
$criteria->setStart($start_offline);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
$offlineDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
@@ -516,7 +562,7 @@
$download->setVar('filename', $filename);
$download->setVar('filetype', $filetype);
} else {
- $down = wfd_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, 0);
+ $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
$url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
$size = $down['size'];
$title = $_FILES['userfile']['name'];
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-09-10 15:16:57 UTC (rev 12018)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-09-10 16:09:10 UTC (rev 12019)
@@ -34,7 +34,7 @@
$maxImgHeight = $wfdownloads->getConfig('maximgheight');
$uploadDir = XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'];
$screenShot = strtolower($_FILES['uploadfile']['name']);
- wfd_uploading($screenShot, XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'], $allowedMimetypes, "images.php", 1, 0, true);
+ wfdownloads_uploading($screenShot, XOOPS_ROOT_PATH . "/" . $_POST['uploadpath'], $allowedMimetypes, $currentFile, 1, false, true);
include_once WFDOWNLOADS_ROOT_PATH . '/class/img_uploader.php';
$uploader = new XoopsMediaImgUploader($uploadDir . "/", $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
@@ -83,9 +83,21 @@
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
- $dirArray = array(1 => $wfdownloads->getConfig('catimage'), 2 => $wfdownloads->getConfig('screenshots'), 3 => $wfdownloads->getConfig('mainimagedir'));
- $nameArray = array(1 => _AM_WFD_DOWN_CATIMAGE , 2 => _AM_WFD_DOWN_SCREENSHOTS, 3 => _AM_WFD_DOWN_MAINIMAGEDIR);
- $listArray = array(1 => _AM_WFD_DOWN_FCATIMAGE , 2 => _AM_WFD_DOWN_FSCREENSHOTS, 3 => _AM_WFD_DOWN_FMAINIMAGEDIR);
+ $dirArray = array(
+ 1 => $wfdownloads->getConfig('catimage'),
+ 2 => $wfdownloads->getConfig('screenshots'),
+ 3 => $wfdownloads->getConfig('mainimagedir')
+ );
+ $nameArray = array(
+ 1 => _AM_WFD_DOWN_CATIMAGE ,
+ 2 => _AM_WFD_DOWN_SCREENSHOTS,
+ 3 => _AM_WFD_DOWN_MAINIMAGEDIR
+ );
+ $listArray = array(
+ 1 => _AM_WFD_DOWN_FCATIMAGE ,
+ 2 => _AM_WFD_DOWN_FSCREENSHOTS,
+ 3 => _AM_WFD_DOWN_FMAINIMAGEDIR
+ );
$pathList = (isset($listArray[$rootPath])) ? $nameArray[$rootPath] : '';
$nameList = (isset($listArray[$rootPath])) ? $nameArray[$rootPath] : '';
@@ -93,9 +105,16 @@
$iform = new XoopsThemeForm(_AM_WFD_DOWN_FUPLOADIMAGETO . $pathList, "op", xoops_getenv('PHP_SELF'));
$iform->setExtra('enctype="multipart/form-data"');
+ $iform->addElement(new XoopsFormHidden('dir', $rootPath));
ob_start();
- $iform->addElement(new XoopsFormHidden('dir', $rootPath));
- wfd_getDirSelectOption($nameList, $dirArray, $nameArray);
+
+ echo "<select size='1' name='workd' onchange='location.href=\"{$currentFile}?rootpath=\"+this.options[this.selectedIndex].value'>";
+ echo "<option value=''>" . _AM_WFD_DOWN_FOLDERSELECTION . "</option>";
+ foreach($nameArray as $namearray => $workd) {
+ $opt_selected = ($workd == $nameList) ? 'selected' : '';
+ echo "<option value='" . htmlspecialchars($namearray, ENT_QUOTES) . "' {$opt_selected}>{$workd}</option>";
+ }
+ echo "</select>";
$iform->addElement(new XoopsFormLabel(_AM_WFD_DOWN_FOLDERSELECTION, ob_get_contents()));
ob_end_clean();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-10 15:16:57 UTC (rev 12018)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-09-10 16:09:10 UTC (rev 12019)
@@ -353,8 +353,8 @@
$criteria = new Criteria('mime_user', true);
}
$mimetypes = $this->wfdownloads->getHandler('mimetype')->getList($criteria);
- $allowMimetypes = implode(' | ', $mimetypes);
- $userfile_file->setDescription(sprintf(_MD_WFD_UPLOAD_FILEC_DESC, $maxFileSize, $this->wfdownloads->getConfig('maximgwidth'), $this->wfdownloads->getConfig('maximgheight'), $allowMimetypes));
+ $allowedExtensions = implode(' | ', $mimetypes);
+ $userfile_file->setDescription(sprintf(_MD_WFD_UPLOAD_FILEC_DESC, $maxFileSize, $this->wfdownloads->getConfig('maximgwidth'), $this->wfdownloads->getConfig('maximgheight'), $allowedExtensions, substr($allowedExtensions, 0, 40) . '...'));
$sform->addElement($userfile_file, false);
}
if ($use_mirrors !== true) {
@@ -519,10 +519,10 @@
$userfile_file = new XoopsFormFile(_MD_WFD_UPLOAD_FILEC, 'userfile', 0);
$maxFileSize = wfdownloads_bytesToSize1024($this->wfdownloads->getConfig('maxfilesize'));
- $criteria = new Criteria("mime_admin", true);
+ $criteria = new Criteria('mime_admin', true);
$mimetypes = $this->wfdownloads->getHandler('mimetype')->getList($criteria);
- $allowMimetypes = implode(' | ', $mimetypes);
- $userfile_file->setDescription(sprintf(_MD_WFD_UPLOAD_FILEC_DESC, $maxFileSize, $this->wfdownloads->getConfig('maximgwidth'), $this->wfdownloads->getConfig('maximgheight'), $allowMimetypes));
+ $allowedExtensions = implode(' | ', $mimetypes);
+ $userfile_file->setDescription(sprintf(_MD_WFD_UPLOAD_FILEC_DESC, $maxFileSize, $this->wfdownloads->getConfig('maximgwidth'), $this->wfdownloads->getConfig('maximgheight'), $allowedExtensions, substr($allowedExtensions, 0, 40) . '...'));
$sform->addElement($userfile_file, false);
// changed - start - March 4 2006 - jpc
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-10 15:16:57 UTC (rev 12018)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-09-10 16:09:10 UTC (rev 12019)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta (2013-09-09)</u></b>
+<b><u>=> Version 3.23 Beta (2013-09-10)</u></b>
- module standardization: header.php, admin/admin_header.php, xoops_version.php
- module standardization: standardize directories/files names/structures
- module standardization: standardize code headers
@@ -11,6 +11,7 @@
- fixed: deprecated "XoopsTree" (luciorota)
- fixed: html errors in templates (luciorota)
- fixed: deprecated XoopsTree (mamba)
+- added: admin side downloads filter (luciorota)
- added: breadcrumb class (luciorota)
- added: html tags compatible autosummary generator (luciorota)
- added: sort subcategories by cid or title or weight (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-09-10 15:16:57 UTC (rev 12018)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-09-10 16:09:10 UTC (rev 12019)
@@ -943,7 +943,7 @@
$showImage = "<a href='{$href}'>";
}
// checks to see if the file is valid else displays default blank image
- if (!is_dir(XOOPS_ROOT_PATH . '/'' . $imgSource . '/'' . $image) && file_exists(XOOPS_ROOT_PATH . "/" . $imgSource . "/" . $image)) {
+ if (!is_dir(XOOPS_ROOT_PATH . "/{$imgSource}/{$image}") && file_exists(XOOPS_ROOT_PATH . "/{$imgSource}/{$image}")) {
$showImage .= "<img src='" . XOOPS_URL . "/{$imgSource}/{$image}' border='0' alt='{$altText}' />";
} else {
if ($xoopsUser && $xoopsUser->isAdmin($wfdownloads->getModule()->mid())) {
@@ -1149,50 +1149,46 @@
-function wfd_retmime($fileName, $userType = 1)
+function wfdownloads_allowedMimetypes($fileName, $isAdmin = true)
{
$wfdownloads = WfdownloadsWfdownloads::getInstance();
$ext = ltrim(strrchr($fileName, '.'), '.');
$criteria = new CriteriaCompo(new Criteria('mime_ext', strtolower($ext)));
- if ($userType == 1) {
- $criteria->add(new Criteria('mime_admin', '1'));
+ if ($isAdmin == true) {
+ $criteria->add(new Criteria('mime_admin', true));
} else {
- $criteria->add(new Criteria('mime_user', '1'));
+ $criteria->add(new Criteria('mime_user', true));
}
- $mimetypeObjects = $wfdownloads->getHandler('mimetype')->getObjects($criteria);
- $mimetypeObject = $mimetypeObjects[0];
- $mimetypes = explode(' ', $mimetypeObject->getVar('mime_types'));
- return $mimetypes;
+ $mimetypes = $wfdownloads->getHandler('mimetype')->getObjects($criteria);
+ $mimetype = $mimetypes[0];
+ $ret = explode(' ', $mimetypeObject->getVar('mime_types'));
+ return $ret;
}
-function wfd_getDirSelectOption($selected, $dirarray, $namearray)
+/**
+ * wfdownloads_uploading()
+ *
+ * @param string $filename
+ * @param string $uploadDirectory
+ * @param array $allowedMimetypes
+ * @param string $redirectURL
+ * @param integer $num
+ * @param bool $redirect
+ * @param bool $isAdmin
+ * @param bool $onlyImages
+ * @return array
+ **/
+function wfdownloads_uploading($filename, $uploadDirectory = 'uploads', $allowedMimetypes = array(), $redirectURL = 'index.php', $num = 0, $redirect = false, $isAdmin = true, $onlyImages = false)
{
- echo "<select size='1' name='workd' onchange='location.href=\"images.php?rootpath=\"+this.options[this.selectedIndex].value'>";
- echo "<option value=''>--------------------------------------</option>";
- foreach($namearray as $namearray => $workd) {
- if ($workd === $selected) {
- $opt_selected = 'selected';
- } else {
- $opt_selected = '';
- }
- echo "<option value='" . htmlspecialchars($namearray, ENT_QUOTES) . "' {$opt_selected}>{$workd}</option>";
- }
- echo "</select>";
-}
-
-
-
-function wfd_uploading($filename, $uploadDirectory = 'uploads', $allowedMimetypes = '', $redirectURL = 'index.php', $num = 0, $redirect = false, $userType = 1, $onlyImages = false)
-{
$wfdownloads = WfdownloadsWfdownloads::getInstance();
$file = array();
if (empty($allowedMimetypes)) {
- $allowedMimetypes = wfd_retmime($_FILES['userfile']['name'], $userType);
+ $allowedMimetypes = wfdownloads_allowedMimetypes($_FILES['userfile']['name'], $isAdmin);
}
$uploadDirectory = $uploadDirectory . '/';
$file_name = $_FILES['userfile']['name'];
@@ -1202,10 +1198,10 @@
$maxImageHeight = $wfdownloads->getConfig('maximgheight');
if ($onlyImages) {
- include_once XOOPS_ROOT_PATH . "/modules/wfdownloads/class/img_uploader.php";
+ include_once XOOPS_ROOT_PATH . '/modules/wfdownloads/class/img_uploader.php';
$uploader = new XoopsMediaImgUploader($uploadDirectory, $allowedMimetypes, $maxFileSize, $maxImageWidth, $maxImageHeight);
} else {
- include_once XOOPS_ROOT_PATH . "/modules/wfdownloads/class/uploader.php";
+ include_once XOOPS_ROOT_PATH . '/modules/wfdownloads/class/uploader.php';
$uploader = new XoopsMediaUploader($uploadDirectory, $allowedMimetypes, $maxFileSize, $maxImageWidth, $maxImageHeight);
}
$uploader->noAdminSizeCheck(1);
@@ -1237,23 +1233,23 @@
-function wfd_download($filePath, $isBinary = true, $retBytes = true)
+function wfdownloads_download($filePath, $isBinary = true, $retBytes = true)
{
$chunkSize = 1*(1024*1024); // how many bytes per chunk
$buffer = '';
- $cnt =0;
+ $cnt = 0;
if ($isBinary == true) {
- $handle = fopen($filePath, 'rb');
+ $handler = fopen($filePath, 'rb');
} else {
- $handle = fopen($filePath, 'r');
+ $handler = fopen($filePath, 'r');
}
- if ($handle === false) {
+ if ($handler === false) {
return false;
}
- while (!feof($handle)) {
- $buffer = fread($handle, $chunkSize);
+ while (!feof($handler)) {
+ $buffer = fread($handler, $chunkSize);
echo $buffer;
ob_flush();
flush();
@@ -1261,7 +1257,7 @@
$cnt += strlen($buffer);
}
}
- $status = fclose($handle);
+ $status = fclose($handler);
if ($retBytes && $status) {
return $cnt; // return num. bytes delivered like readfile() does.
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-10 15:16:57 UTC (rev 12018)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-09-10 16:09:10 UTC (rev 12019)
@@ -633,3 +633,11 @@
define('_AM_WFD_DIRNOTCREATED','The directory can not be created');
define('_AM_WFD_PERMSET','The permission has been set');
define('_AM_WFD_PERMNOTSET','The permission can not be set');
+
+// admin/downloads.php
+define('_AM_WFD_SEARCH','Search');
+define('_AM_WFD_FILTER','Filter');
+define('_AM_WFD_SEARCH_EQUAL','=');
+define('_AM_WFD_SEARCH_GREATERTHAN','>');
+define('_AM_WFD_SEARCH_LESSTHAN','<');
+define('_AM_WFD_SEARCH_CONTAINS','contains');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-09-10 15:16:57 UTC (rev 12018)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-09-10 16:09:10 UTC (rev 12019)
@@ -303,7 +303,7 @@
define("_MD_WFD_KEYFEATURESC_DESC","Separate each key feature with a |");
define("_MD_WFD_REQUIREMENTSC_DESC","Separate each requirement with |");
define("_MD_WFD_HISTORYD_DESC","The submit date will automatically be added to this.");
-define("_MD_WFD_UPLOAD_FILEC_DESC","Max file size: %s<br />Max image width: %dpx<br />Max image height: %dpx<br />Allowed extensions: %s");
+define("_MD_WFD_UPLOAD_FILEC_DESC","Max file size: %s<br />Max image width: %dpx<br />Max image height: %dpx<br /><span title='%s'>Allowed extensions:<br />%s</span>");
define("_MD_WFD_SUMMARY_DESC","You can leave this blank<br />A summary will be autocreated if empty.");
define("_MD_WFD_SUMMARY_DESC_AUTOSUMMARY_ON","Warning: summary field is disabled.<br />The "Download autosummary" module preference is enabled.<br />A summary will be autocreated using "Description" field content.");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-10 15:16:57 UTC (rev 12018)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-09-10 16:09:10 UTC (rev 12019)
@@ -74,12 +74,9 @@
$size = ((empty($_POST['size']) || !is_numeric($_POST['size']))) ? 0 : (int)$_POST['size'];
$title = trim($_POST['title']);
} else {
- $userType = 0;
- if (is_object($xoopsUser) && $xoopsUser->isAdmin()) {
- $userType = 1;
- }
+ $isAdmin = wfdownloads_userIsAdmin();
- $down = wfd_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', '', 0, 0, $userType);
+ $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', '', 0, false, $isAdmin);
$url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
$size = $down['size'];
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-09-10 15:16:57 UTC (rev 12018)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-09-10 16:09:10 UTC (rev 12019)
@@ -16,6 +16,45 @@
<th><{$smarty.const._AM_WFD_MINDEX_LOG}></th>
<th><{$smarty.const._AM_WFD_MINDEX_ACTION}></th>
</tr>
+
+ <form id='form_filter' enctype='multipart/form-data' method='post' action='' name='form_filter'>
+ <tr>
+ <td> </td>
+ <td>
+ <select id='filter_title_condition' title='<{$smarty.const._AM_WFD_SEARCH}>' name='filter_title_condition' size='1'>
+ <option value='=' <{if $filter_title_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFD_SEARCH_EQUAL}></option>
+ <option value='LIKE' <{if $filter_title_condition == 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFD_SEARCH_CONTAINS}></option>
+ </select>
+ <input id='filter_title' type='text' value='<{$filter_title}>' maxlength='100' size='15' title='' name='filter_title'>
+ </td>
+ <td>
+ <select id='filter_category_title_condition' title='<{$smarty.const._AM_WFD_SEARCH}>' name='filter_category_title_condition' size='1'>
+ <option value='=' <{if $filter_category_title_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFD_SEARCH_EQUAL}></option>
+ <option value='LIKE' <{if $filter_category_title_condition == 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFD_SEARCH_CONTAINS}></option>
+ </select>
+ <input id='filter_category_title' type='text' value='<{$filter_category_title}>' maxlength='100' size='15' title='' name='filter_category_title'>
+ </td>
+ <td><{$filter_poster_select}></td>
+ <td>
+ <{*
+ <select id='filter_date_condition' title='<{$smarty.const._AM_WFD_SEARCH}>' name='filter_date_condition' size='1'>
+ <option value='=' <{if $filter_date_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFD_SEARCH_EQUAL}></option>
+ <option value='>' <{if $filter_date_condition == '>'}>selected='selected'<{/if}>><{$smarty.const._AM_WFD_SEARCH_GREATERTHAN}></option>
+ <option value='<' <{if $filter_date_condition == '<'}>selected='selected'<{/if}>><{$smarty.const._AM_WFD_SEARCH_LESSTHAN}></option>
+ </select>
+ <{$filter_date_select}>
+ *}>
+ </td>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ <td align='center'>
+ <input id='submit' class='formButton' type='submit' title='<{$smarty.const._AM_WFD_SEARCH}>' value='<{$smarty.const._AM_WFD_SEARCH}>' name='submit'>
+ </td>
+ </tr>
+ <input id='op' type='hidden' value='downloads.filter' name='op'>
+ </form>
+
<{foreach item=download from=$published_downloads}>
<tr class="<{cycle values='even, odd'}>">
<td align='center'><{$download.lid}></td>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-09-10 15:16:57 UTC (rev 12018)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-09-10 16:09:10 UTC (rev 12019)
@@ -167,9 +167,9 @@
header("Content-Disposition: attachment; filename=" . $header_file);
if(isset($mimeType) && strstr($mimeType, "text/")) {
- wfd_download($filePath, false, true);
+ wfdownloads_download($filePath, false, true);
} else {
- wfd_download($filePath, true, true);
+ wfdownloads_download($filePath, true, true);
}
exit();
} else {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-10 15:16:57 UTC (rev 12018)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-09-10 16:09:10 UTC (rev 12019)
@@ -47,9 +47,9 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-09-09';
-$modversion['release_date'] = '2013/09/09';
-$modversion['releasedate'] = "2013-09-09";
+$modversion['date'] = '2013-09-10';
+$modversion['release_date'] = '2013/09/10';
+$modversion['releasedate'] = "2013-09-10";
$modversion['status'] = "BETA";
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
|
8 messages has been excluded from this view by a project administrator.
