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-08-14 11:33:11
|
Revision: 11918
http://sourceforge.net/p/xoops/svn/11918
Author: beckmi
Date: 2013-08-14 11:33:08 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Fixing preg_replace /e for PHP 5.5.x
Modified Paths:
--------------
XoopsModules/xoopspoll/branches/zyspec/class/request.php
XoopsModules/xoopspoll/branches/zyspec/xoops_version.php
Modified: XoopsModules/xoopspoll/branches/zyspec/class/request.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/class/request.php 2013-08-14 10:29:47 UTC (rev 11917)
+++ XoopsModules/xoopspoll/branches/zyspec/class/request.php 2013-08-14 11:33:08 UTC (rev 11918)
@@ -932,9 +932,14 @@
}
$source = strtr($source, $ttr);
// convert decimal
- $source = preg_replace('/&#(\d+);/me', "chr(\\1)", $source); // decimal notation
+// $source = preg_replace('/&#(\d+);/me', "chr(\\1)", $source); // decimal notation
+ $source = preg_replace_callback('/&#(\d+);/m', create_function('$matches',"return chr(\$matches[1]);"),$source);
+
+
// convert hex
- $source = preg_replace('/&#x([a-f0-9]+);/mei', "chr(0x\\1)", $source); // hex notation
+// $source = preg_replace('/&#x([a-f0-9]+);/mei', "chr(0x\\1)", $source); // hex notation
+ $source = preg_replace_callback('/&#x([a-f0-9]+);/mi', create_function('$matches',"return chr('0x'.\$matches[1]);"),$source);
+
return $source;
}
}
\ No newline at end of file
Modified: XoopsModules/xoopspoll/branches/zyspec/xoops_version.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/xoops_version.php 2013-08-14 10:29:47 UTC (rev 11917)
+++ XoopsModules/xoopspoll/branches/zyspec/xoops_version.php 2013-08-14 11:33:08 UTC (rev 11918)
@@ -51,7 +51,7 @@
$modversion['official'] = 1; // 0 = 3rd party module, 1 = supported by XOOPS Community
$modversion['image'] = 'images'
. DIRECTORY_SEPARATOR . 'xoopspoll_slogo.png';
-$modversion['dirname'] = 'xoopspoll';
+$modversion['dirname'] = basename(dirname(__FILE__));
$modversion['dirmoduleadmin'] = 'Frameworks'
. DIRECTORY_SEPARATOR . 'moduleclasses'
. DIRECTORY_SEPARATOR . 'moduleadmin';
|
|
From: <be...@us...> - 2013-08-14 10:29:49
|
Revision: 11917
http://sourceforge.net/p/xoops/svn/11917
Author: beckmi
Date: 2013-08-14 10:29:47 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
adding missing instance
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-08-14 10:16:36 UTC (rev 11916)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-08-14 10:29:47 UTC (rev 11917)
@@ -295,6 +295,7 @@
global $xoopsUser;
include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
include_once(XOOPS_ROOT_PATH . "/class/tree.php");
+ $wfdownloads = WfdownloadsWfdownloads::getInstance();
$groups = $xoopsUser->getGroups();
|
|
From: <be...@us...> - 2013-08-14 10:16:41
|
Revision: 11916
http://sourceforge.net/p/xoops/svn/11916
Author: beckmi
Date: 2013-08-14 10:16:36 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Updating icons and centering them
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mimetypeslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html 2013-08-14 09:31:37 UTC (rev 11915)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html 2013-08-14 10:16:36 UTC (rev 11916)
@@ -17,7 +17,7 @@
<input type="text" name="new_weights[<{$sorted_category.category.cid}>]" size="5" maxlength="5" value="<{$sorted_category.category.weight}>" />
</td>
<td><{$sorted_category.category.description}></td>
- <td>
+ <td align='center'>
<a href="?op=category.edit&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href="?op=category.delete&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
<a href="?op=category.move&cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._AM_WFD_BMOVE}>"><img src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFD_BMOVE}>" alt="<{$smarty.const._AM_WFD_BMOVE}>" /></a>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-08-14 09:31:37 UTC (rev 11915)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2013-08-14 10:16:36 UTC (rev 11916)
@@ -18,29 +18,29 @@
</tr>
<{foreach item=download from=$published_downloads}>
<tr class="<{cycle values='even, odd'}>">
- <td><{$download.lid}></td>
+ <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><{$download.submitter_uname}></td>
<td><{$download.published_timestamp}></td>
- <td>
+ <td align='center'>
<{if $download.offline}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{/if}>
</td>
- <td>
+ <td align='center'>
<{if $download.published}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{/if}>
</td>
<td>
<a href='ip_logs.php?lid=<{$download.lid}>' title="<{$smarty.const._AM_WFD_IP_LOGS}>"><{$smarty.const._AM_WFD_IP_LOGS}></a>
</td>
- <td>
+ <td align='center'>
<a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href='?op=download.delete&lid=<{$download.lid}>' title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
</td>
@@ -74,8 +74,8 @@
<td><{$new_download.category_title}></td>
<td><{$new_download.submitter_uname}></td>
<td><{$new_download.date_timestamp}></td>
- <td>
- <a href='?op=newdownload.approve&lid=<{$new_download.lid}>' title="<{$smarty.const._AM_WFD_BAPPROVE}>"><img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_BAPPROVE}>" alt="<{$smarty.const._AM_WFD_BAPPROVE}>" /></a>
+ <td align='center'>
+ <a href='?op=newdownload.approve&lid=<{$new_download.lid}>' title="<{$smarty.const._AM_WFD_BAPPROVE}>"><img src="<{xoModuleIcons16 1.png}>" title="<{$smarty.const._AM_WFD_BAPPROVE}>" alt="<{$smarty.const._AM_WFD_BAPPROVE}>" /></a>
<a href='?op=download.edit&lid=<{$new_download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href='?op=download.delete&lid=<{$new_download.lid}>' title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
</td>
@@ -113,22 +113,22 @@
<td><{$download.category_title}></td>
<td><{$download.submitter_uname}></td>
<td><{$download.published_timestamp}></td>
- <td>
+ <td align='center'>
<{if $download.offline}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{/if}>
</td>
- <td>
+ <td align='center'>
<{if $download.published}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{/if}>
</td>
<td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFD_IP_LOGS}></a></td>
- <td>
+ <td align='center'>
<a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href='?op=download.delete&lid=<{$download.lid}>' title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
</td>
@@ -166,22 +166,22 @@
<td><{$download.category_title}></td>
<td><{$download.submitter_uname}></td>
<td><{$download.published_timestamp}></td>
- <td>
+ <td align='center'>
<{if $download.offline}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{/if}>
</td>
- <td>
+ <td align='center'>
<{if $download.published}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{/if}>
</td>
<td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFD_IP_LOGS}></a></td>
- <td>
+ <td align='center'>
<a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href='?op=download.delete&lid=<{$download.lid}>' title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
</td>
@@ -219,22 +219,22 @@
<td><{$download.category_title}></td>
<td><{$download.submitter_uname}></td>
<td><{$download.published_timestamp}></td>
- <td>
+ <td align='center'>
<{if $download.offline}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{/if}>
</td>
- <td>
+ <td align='center'>
<{if $download.published}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{/if}>
</td>
<td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFD_IP_LOGS}></a></td>
- <td>
+ <td align='center'>
<a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href='?op=download.delete&lid=<{$download.lid}>' title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
</td>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mimetypeslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mimetypeslist.html 2013-08-14 09:31:37 UTC (rev 11915)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mimetypeslist.html 2013-08-14 10:16:36 UTC (rev 11916)
@@ -46,26 +46,26 @@
<tr class="<{cycle values='even, odd'}>">
<td class='head'><{$mimetype.mime_id}></td>
<td class='even'><{$mimetype.mime_name}></td>
- <td class='even'>.<{$mimetype.mime_ext}></td>
- <td class='even'>
+ <td class='even' align='center'>.<{$mimetype.mime_ext}></td>
+ <td class='even' align='center' align='center'>
<a href='?op=mimetype.update&admin=1&mime_id=<{$mimetype.mime_id}>&start=<{$start}>'>
<{if ($mimetype.mime_admin == 1)}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{/if}>
</a>
</td>
- <td class='even'>
+ <td class='even' align='center'>
<a href='?op=mimetype.update&user=1&mime_id=<{$mimetype.mime_id}>&start=<{$start}>'>
<{if ($mimetype.mime_user == 1)}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{/if}>
</a>
</td>
- <td class='even'>
+ <td class='even' align='center'>
<a href='?op=mimetype.edit&mime_id=<{$mimetype.mime_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href='?op=mimetype.delete&mime_id=<{$mimetype.mime_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
</td>
@@ -75,13 +75,13 @@
<td> </td>
<td> </td>
<td> </td>
- <td>
- <a href='?op=mimetypes.update&admin=1&type_all=1'><img src="<{xoModuleIcons16 on.png}>" /></a>
- <a href='?op=mimetypes.update&admin=1&type_all=0'><img src="<{xoModuleIcons16 off.png}>" /></a>
+ <td align='center'>
+ <a href='?op=mimetypes.update&admin=1&type_all=1'><img src="<{xoModuleIcons16 1.png}>" /></a>
+ <a href='?op=mimetypes.update&admin=1&type_all=0'><img src="<{xoModuleIcons16 0.png}>" /></a>
</td>
- <td>
- <a href='?op=mimetypes.update&user=1&type_all=1'><img src="<{xoModuleIcons16 on.png}>" /></a>
- <a href='?op=mimetypes.update&user=1&type_all=0'><img src="<{xoModuleIcons16 off.png}>" /></a>
+ <td align='center'>
+ <a href='?op=mimetypes.update&user=1&type_all=1'><img src="<{xoModuleIcons16 1.png}>" /></a>
+ <a href='?op=mimetypes.update&user=1&type_all=0'><img src="<{xoModuleIcons16 0.png}>" /></a>
</td>
<td> </td>
</tr>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html 2013-08-14 09:31:37 UTC (rev 11915)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html 2013-08-14 10:16:36 UTC (rev 11916)
@@ -6,7 +6,7 @@
<{$smarty.const._AM_WFD_MIRROR_MIRROR_TOTAL}>: <{$mirrors_published_count}>
</p>
<p>
- <img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" /> <{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>
+ <img src="<{xoModuleIcons16 1.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" /> <{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>
<br />
<img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" /> <{$smarty.const._AM_WFD_AMIRRORS_EDIT}>
<br />
@@ -37,8 +37,8 @@
</td>
<td class='even'><{$mirror_waiting.submitter_uname}></td>
<td class='even'><{$mirror_waiting.formatted_date}></td>
- <td class='even'>
- <a href='?op=mirror.approve&mirror_id=<{$mirror_waiting.mirror_id}>'><img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_BAPPROVE}>" alt="<{$smarty.const._AM_WFD_BAPPROVE}>" /></a>
+ <td class='even' align='center'>
+ <a href='?op=mirror.approve&mirror_id=<{$mirror_waiting.mirror_id}>'><img src="<{xoModuleIcons16 1.png}>" title="<{$smarty.const._AM_WFD_BAPPROVE}>" alt="<{$smarty.const._AM_WFD_BAPPROVE}>" /></a>
<a href='?op=mirror.edit&mirror_id=<{$mirror_waiting.mirror_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href='?op=mirror.delete&mirror_id=<{$mirror_waiting.mirror_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
</td>
@@ -72,7 +72,7 @@
</td>
<td class='even'><{$mirror_published.submitter_uname}></td>
<td class='even'><{$mirror_published.formatted_date}></td>
- <td class='even'>
+ <td class='even' align='center'>
<a href='?op=mirror.edit&mirror_id=<{$mirror_published.mirror_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
<a href='?op=mirror.delete&mirror_id=<{$mirror_published.mirror_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
</td>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html 2013-08-14 09:31:37 UTC (rev 11915)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html 2013-08-14 10:16:36 UTC (rev 11916)
@@ -34,9 +34,9 @@
<td class='even'><{$rating.submitter_uname}></td>
<td class='even'><{$rating.ratinghostname}></td>
<td class='even'><{$rating.download_title}></td>
- <td class='even'><{$rating.rating}></td>
+ <td class='even' align='center'><{$rating.rating}></td>
<td class='even'><{$rating.formatted_date}></td>
- <td class='even'>
+ <td class='even' align='center'>
<a href='?op=vote.delete&lid=<{$rating.lid}>&rid=<{$rating.rid}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
</td>
</tr>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-08-14 09:31:37 UTC (rev 11915)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-08-14 10:16:36 UTC (rev 11916)
@@ -4,15 +4,15 @@
<{$smarty.const._AM_WFD_BROKEN_REPORTSNO}>: <{$reports_count}>
</p>
<p>
- <img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_BROKEN_IGNOREDESC}>" alt="<{$smarty.const._AM_WFD_BROKEN_IGNOREDESC}>" /> <{$smarty.const._AM_WFD_BROKEN_IGNOREDESC}>
+ <img src="<{xoModuleIcons16 1.png}>" title="<{$smarty.const._AM_WFD_BROKEN_IGNOREDESC}>" alt="<{$smarty.const._AM_WFD_BROKEN_IGNOREDESC}>" /> <{$smarty.const._AM_WFD_BROKEN_IGNOREDESC}>
<br />
<img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_BROKEN_EDITDESC}>" alt="<{$smarty.const._AM_WFD_BROKEN_EDITDESC}>" /> <{$smarty.const._AM_WFD_BROKEN_EDITDESC}>
<br />
<img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_BROKEN_DELETEDESC}>" alt="<{$smarty.const._AM_WFD_BROKEN_DELETEDESC}>" /> <{$smarty.const._AM_WFD_BROKEN_DELETEDESC}>
<br />
- <img src="<{xoModuleIcons16 on.png}>" /> <{$smarty.const._AM_WFD_BROKEN_ACKDESC}>
+ <img src="<{xoModuleIcons16 1.png}>" /> <{$smarty.const._AM_WFD_BROKEN_ACKDESC}>
<br />
- <img src="<{xoModuleIcons16 on.png}>" /> <{$smarty.const._AM_WFD_BROKEN_CONFIRMDESC}>
+ <img src="<{xoModuleIcons16 1.png}>" /> <{$smarty.const._AM_WFD_BROKEN_CONFIRMDESC}>
</p>
</fieldset>
@@ -57,7 +57,7 @@
<{/if}>
</td>
<td><{$report.formatted_date}></td>
- <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}>" />
</a>
@@ -69,16 +69,16 @@
</a>
<a href='?op=reports.update&lid=<{$report.download_lid}>&ack=<{$report.acknowledged}>' alt='<{$smarty.const._AM_WFD_BROKEN_ACK_ALT}>' title='<{$smarty.const._AM_WFD_BROKEN_ACK_ALT}>'>
<{if ($report.acknowledged)}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{/if}>
</a>
<a href='?op=reports.update&lid=<{$report.download_lid}>&con=<{$report.confirmed}>' alt='<{$smarty.const._AM_WFD_BROKEN_CONFIRM_ALT}>' title='<{$smarty.const._AM_WFD_BROKEN_CONFIRM_ALT}>'>
<{if ($report.confirmed)}>
- <img src="<{xoModuleIcons16 on.png}>" />
+ <img src="<{xoModuleIcons16 1.png}>" />
<{else}>
- <img src="<{xoModuleIcons16 off.png}>" />
+ <img src="<{xoModuleIcons16 0.png}>" />
<{/if}>
</a>
</td>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-08-14 09:31:37 UTC (rev 11915)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-08-14 10:16:36 UTC (rev 11916)
@@ -7,7 +7,7 @@
<{$smarty.const._AM_WFD_REV_REVIEW_TOTAL}>: <{$reviews_published_count}>
</p>
<p>
- <img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" /> <{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>
+ <img src="<{xoModuleIcons16 1.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>" /> <{$smarty.const._AM_WFD_AREVIEWS_APPROVE}>
<br />
<img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" alt="<{$smarty.const._AM_WFD_AREVIEWS_EDIT}>" /> <{$smarty.const._AM_WFD_AREVIEWS_EDIT}>
<br />
@@ -42,7 +42,7 @@
</td>
<td class='even'><{$review_waiting.submitter_uname}></td>
<td class='even'><{$review_waiting.formatted_date}></td>
- <td class='even'>
+ <td class='even' 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>
@@ -81,7 +81,7 @@
</td>
<td class='even'><{$review_published.submitter_uname}></td>
<td class='even'><{$review_published.formatted_date}></td>
- <td class='even'>
+ <td class='even' 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>
|
|
From: <be...@us...> - 2013-08-14 09:31:40
|
Revision: 11915
http://sourceforge.net/p/xoops/svn/11915
Author: beckmi
Date: 2013-08-14 09:31:37 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
fixing bug in folder link
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-08-14 08:04:08 UTC (rev 11914)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-08-14 09:31:37 UTC (rev 11915)
@@ -21,7 +21,7 @@
if (!defined("XOOPS_ROOT_PATH")) {
die("XOOPS root path not defined");
}
-include_once dirname(__FILE__) . '/include/common.php';
+include_once dirname(__FILE__) . '/common.php';
/**
|
|
From: <be...@us...> - 2013-08-14 08:04:11
|
Revision: 11914
http://sourceforge.net/p/xoops/svn/11914
Author: beckmi
Date: 2013-08-14 08:04:08 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
restructuring folders
Removed Paths:
-------------
XoopsModules/rw_banner/trunk/rw_banner/
|
|
From: <be...@us...> - 2013-08-14 07:51:42
|
Revision: 11913
http://sourceforge.net/p/xoops/svn/11913
Author: beckmi
Date: 2013-08-14 07:51:40 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
restructuring folders
Added Paths:
-----------
XoopsModules/rw_banner/trunk/rwbanner/
|
|
From: <be...@us...> - 2013-08-14 07:47:53
|
Revision: 11912
http://sourceforge.net/p/xoops/svn/11912
Author: beckmi
Date: 2013-08-14 07:47:47 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Updating to 1.51 Beta 2
Modified Paths:
--------------
XoopsModules/rw_banner/trunk/rw_banner/admin/about2.php
XoopsModules/rw_banner/trunk/rw_banner/admin/admin.php
XoopsModules/rw_banner/trunk/rw_banner/admin/admin_footer.php
XoopsModules/rw_banner/trunk/rw_banner/admin/admin_header.php
XoopsModules/rw_banner/trunk/rw_banner/admin/admin_header2.php
XoopsModules/rw_banner/trunk/rw_banner/admin/blocksadmin.php
XoopsModules/rw_banner/trunk/rw_banner/admin/exibe.php
XoopsModules/rw_banner/trunk/rw_banner/admin/import.php
XoopsModules/rw_banner/trunk/rw_banner/admin/inser.php
XoopsModules/rw_banner/trunk/rw_banner/admin/insercateg.php
XoopsModules/rw_banner/trunk/rw_banner/admin/insertag.php
XoopsModules/rw_banner/trunk/rw_banner/admin/main.php
XoopsModules/rw_banner/trunk/rw_banner/admin/menu.php
XoopsModules/rw_banner/trunk/rw_banner/admin/myblockform.php
XoopsModules/rw_banner/trunk/rw_banner/admin/myblocksadmin.php
XoopsModules/rw_banner/trunk/rw_banner/admin/mygroupperm.php
XoopsModules/rw_banner/trunk/rw_banner/admin/mygrouppermform.php
XoopsModules/rw_banner/trunk/rw_banner/admin/perm.php
XoopsModules/rw_banner/trunk/rw_banner/admin/permissions.php
XoopsModules/rw_banner/trunk/rw_banner/admin/permissions2.php
XoopsModules/rw_banner/trunk/rw_banner/admin/upgrade.php
XoopsModules/rw_banner/trunk/rw_banner/blocks/ajaxbanner.php
XoopsModules/rw_banner/trunk/rw_banner/blocks/banner.php
XoopsModules/rw_banner/trunk/rw_banner/blocks/dropinbanner.php
XoopsModules/rw_banner/trunk/rw_banner/blocks/estatisticas.php
XoopsModules/rw_banner/trunk/rw_banner/blocks/lightboxbanner.php
XoopsModules/rw_banner/trunk/rw_banner/blocks/popadbanner.php
XoopsModules/rw_banner/trunk/rw_banner/class/FlashHeader.php
XoopsModules/rw_banner/trunk/rw_banner/class/about.php
XoopsModules/rw_banner/trunk/rw_banner/class/class.banner.php
XoopsModules/rw_banner/trunk/rw_banner/class/class.categoria.php
XoopsModules/rw_banner/trunk/rw_banner/class/class.tags.php
XoopsModules/rw_banner/trunk/rw_banner/class/mimetypes.inc.php
XoopsModules/rw_banner/trunk/rw_banner/conta_click.php
XoopsModules/rw_banner/trunk/rw_banner/docs/LEIAME (2).TXT
XoopsModules/rw_banner/trunk/rw_banner/docs/LEIAME.TXT
XoopsModules/rw_banner/trunk/rw_banner/docs/LISEZMOI.TXT
XoopsModules/rw_banner/trunk/rw_banner/docs/README (2).TXT
XoopsModules/rw_banner/trunk/rw_banner/docs/changelog.txt
XoopsModules/rw_banner/trunk/rw_banner/docs/credits.txt
XoopsModules/rw_banner/trunk/rw_banner/docs/function_bbcode_xoops2015.txt
XoopsModules/rw_banner/trunk/rw_banner/docs/function_bbcode_xoops2015_french.txt
XoopsModules/rw_banner/trunk/rw_banner/docs/header.php_com_hack_rwbanner.txt
XoopsModules/rw_banner/trunk/rw_banner/docs/header.php_com_hack_rwbanner_french.txt
XoopsModules/rw_banner/trunk/rw_banner/docs/install.txt
XoopsModules/rw_banner/trunk/rw_banner/docs/readme.txt
XoopsModules/rw_banner/trunk/rw_banner/include/bbcode.php
XoopsModules/rw_banner/trunk/rw_banner/include/blocksadmin.inc.php
XoopsModules/rw_banner/trunk/rw_banner/include/functions.php
XoopsModules/rw_banner/trunk/rw_banner/include/getajaxbanner.php
XoopsModules/rw_banner/trunk/rw_banner/include/gtickets.php
XoopsModules/rw_banner/trunk/rw_banner/include/maketags.php
XoopsModules/rw_banner/trunk/rw_banner/index.php
XoopsModules/rw_banner/trunk/rw_banner/inser.php
XoopsModules/rw_banner/trunk/rw_banner/language/english/admin.php
XoopsModules/rw_banner/trunk/rw_banner/language/english/blocks.php
XoopsModules/rw_banner/trunk/rw_banner/language/english/help/help.html
XoopsModules/rw_banner/trunk/rw_banner/language/english/main.php
XoopsModules/rw_banner/trunk/rw_banner/language/english/modinfo.php
XoopsModules/rw_banner/trunk/rw_banner/sql/mysql.sql
XoopsModules/rw_banner/trunk/rw_banner/templates/blocks/block_ajax_banner.html
XoopsModules/rw_banner/trunk/rw_banner/templates/blocks/block_banner.html
XoopsModules/rw_banner/trunk/rw_banner/templates/blocks/block_dropin_banner.html
XoopsModules/rw_banner/trunk/rw_banner/templates/blocks/block_lightbox_banner.html
XoopsModules/rw_banner/trunk/rw_banner/templates/blocks/block_popad_banner.html
XoopsModules/rw_banner/trunk/rw_banner/xoops_version.php
Added Paths:
-----------
XoopsModules/rw_banner/trunk/rw_banner/blocks/index.html
XoopsModules/rw_banner/trunk/rw_banner/class/index.html
XoopsModules/rw_banner/trunk/rw_banner/css/index.html
XoopsModules/rw_banner/trunk/rw_banner/images/icon/16/index.html
XoopsModules/rw_banner/trunk/rw_banner/images/icon/32/index.html
XoopsModules/rw_banner/trunk/rw_banner/images/icon/index.html
XoopsModules/rw_banner/trunk/rw_banner/images/index.html
XoopsModules/rw_banner/trunk/rw_banner/images/slogo.png
XoopsModules/rw_banner/trunk/rw_banner/include/index.html
XoopsModules/rw_banner/trunk/rw_banner/js/index.html
XoopsModules/rw_banner/trunk/rw_banner/language/index.html
XoopsModules/rw_banner/trunk/rw_banner/preloads/
XoopsModules/rw_banner/trunk/rw_banner/preloads/core.php
XoopsModules/rw_banner/trunk/rw_banner/preloads/index.html
XoopsModules/rw_banner/trunk/rw_banner/sql/index.html
XoopsModules/rw_banner/trunk/rw_banner/templates/blocks/index.html
XoopsModules/rw_banner/trunk/rw_banner/templates/index.html
Removed Paths:
-------------
XoopsModules/rw_banner/trunk/rw_banner/images/slogo.gif
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/about2.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/about2.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/about2.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -23,16 +23,14 @@
// along with this program; if not, write to the Free Software //
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------- //
-// Author: Rodrigo Pereira Lima (BrInfo - Solu\xE7\xF5es Web) //
+// Author: Rodrigo Pereira Lima (BrInfo - Soluções Web) //
// Site: http://www.brinfo.com.br //
// Project: RW-Banner //
-// Descri\xE7\xE3o: Sistema de gerenciamento de m\xEDdias publicit\xE1rias //
+// Descrição: Sistema de gerenciamento de mídias publicitárias //
// ------------------------------------------------------------------------- //
include_once("admin_header.php");
-include_once(XOOPS_ROOT_PATH."/modules/rw_banner/class/about.php");
+include_once("../class/about.php");
$aboutObj = new RwbannerAbout(_AM_RWBANNER_ABOUT);
$aboutObj->render();
-
-?>
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/admin.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/admin.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/admin.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -23,10 +23,10 @@
// along with this program; if not, write to the Free Software //
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------- //
-// Author: Rodrigo Pereira Lima (BrInfo - Solu\xE7\xF5es Web) //
+// Author: Rodrigo Pereira Lima (BrInfo - Soluções Web) //
// Site: http://www.brinfo.com.br //
// Project: RW-Banner //
-// Descri\xE7\xE3o: Sistema de gerenciamento de m\xEDdias publicit\xE1rias //
+// Descrição: Sistema de gerenciamento de mídias publicitárias //
// ------------------------------------------------------------------------- //
$admin_mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
@@ -46,12 +46,12 @@
if (is_object($xoopsUser)) {
$xoopsModule =& XoopsModule::getByDirname("system");
if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
- redirect_header(XOOPS_URL.'/user.php',3,_NOPERM);
+ redirect_header(XOOPS_URL.'/user.php',3,_MD_RWBANNER_NOPERM);
exit();
}
$admintest=1;
} else {
- redirect_header(XOOPS_URL.'/user.php',3,_NOPERM);
+ redirect_header(XOOPS_URL.'/user.php',3,_MD_RWBANNER_NOPERM);
exit();
}
@@ -152,5 +152,3 @@
echo '</tr></table>';
xoops_cp_footer();
}
-
-?>
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/admin_footer.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/admin_footer.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/admin_footer.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -1,5 +1,5 @@
<?php
-
+global $pathIcon32;
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/admin_header.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/admin_header.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/admin_header.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -9,41 +9,59 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* @copyright The XOOPS Project (http://www.xoops.org)
- * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @author XOOPS Development Team
- * @version $Id $
+ * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
+ * @author XOOPS Development Team
+ * @version $Id $
**/
$path = dirname(dirname(dirname(dirname(__FILE__))));
include_once $path . '/mainfile.php';
+include_once $path . '/header.php';
include_once $path . '/include/cp_functions.php';
require_once $path . '/include/cp_header.php';
-include_once $path ."/kernel/module.php";
-include_once $path ."/class/xoopstree.php";
-include_once $path ."/class/xoopslists.php";
-include_once $path ."/class/xoopsformloader.php";
-include_once $path .'/class/pagenav.php';
+include_once $path . "/kernel/module.php";
+include_once $path . "/class/xoopstree.php";
+include_once $path . "/class/xoopslists.php";
+include_once $path . "/class/xoopsformloader.php";
+include_once $path . '/class/pagenav.php';
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+if (is_object($xoopsUser)) {
+ $xoopsModule = XoopsModule::getByDirname($dirname);
+ if (!$xoopsUser->isAdmin($xoopsModule->mid())) {
+ redirect_header(XOOPS_URL . "/", 1, _MD_RWBANNER_NOPERM);
+ exit();
+ }
+} else {
+ redirect_header(XOOPS_URL . "/", 1, _MD_RWBANNER_NOPERM);
+ exit();
+}
+
global $xoopsModule;
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+//$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
//if functions.php file exist
require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+$myts =& MyTextSanitizer::getInstance();
+//$xoopsTpl->assign('module_dir', $module->getVar('dirname'));
+
// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
+xoops_loadLanguage('admin', $dirname);
+xoops_loadLanguage('modinfo', $dirname);
+xoops_loadLanguage('main', $dirname);
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
- }
\ No newline at end of file
+if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) {
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+} else {
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+}
\ No newline at end of file
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/admin_header2.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/admin_header2.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/admin_header2.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -23,32 +23,35 @@
// along with this program; if not, write to the Free Software //
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------- //
-// Author: Rodrigo Pereira Lima (BrInfo - Solu\xE7\xF5es Web) //
+// Author: Rodrigo Pereira Lima (BrInfo - Soluções Web) //
// Site: http://www.brinfo.com.br //
// Project: RW-Banner //
-// Descri\xE7\xE3o: Sistema de gerenciamento de m\xEDdias publicit\xE1rias //
+// Descrição: Sistema de gerenciamento de mídias publicitárias //
// ------------------------------------------------------------------------- //
-include("../../../mainfile.php");
-include '../../../include/cp_header.php';
-include_once XOOPS_ROOT_PATH."/kernel/module.php";
-include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
-include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
-include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_header.php';
+include_once $path ."/kernel/module.php";
+include_once $path ."/class/xoopstree.php";
+include_once $path ."/class/xoopslists.php";
+include_once $path ."/class/xoopsformloader.php";
+include_once $path .'/class/pagenav.php';
if (is_object($xoopsUser)){
- $xoopsModule = XoopsModule::getByDirname("rw_banner");
- if (!$xoopsUser->isAdmin($xoopsModule->mid())){
- redirect_header(XOOPS_URL."/",1,_NOPERM);
+ $dirname = basename(dirname(dirname(__FILE__)));
+ $module_handler = xoops_gethandler('module');
+ $module = $module_handler->getByDirname($dirname);
+ if (!$xoopsUser->isAdmin($module->mid())){
+ redirect_header(XOOPS_URL."/",1,_MD_RWBANNER_NOPERM);
exit();
}
}else{
- redirect_header(XOOPS_URL."/",1,_NOPERM);
+ redirect_header(XOOPS_URL."/",1,_MD_RWBANNER_NOPERM);
exit();
}
-include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/include/functions.php";
+include_once XOOPS_ROOT_PATH."/modules/".$module->dirname()."/include/functions.php";
if ( file_exists("../language/".$xoopsConfig['language']."/modinfo.php") ) {
include("../language/".$xoopsConfig['language']."/modinfo.php");
@@ -57,4 +60,3 @@
}
$myts =& MyTextSanitizer::getInstance();
-?>
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/blocksadmin.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/blocksadmin.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/blocksadmin.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -1,11 +1,11 @@
<?php
### =============================================================
-### Mastop InfoDigital - Paix\xE3o por Internet
+### Mastop InfoDigital - Paixão por Internet
### =============================================================
-### Manuten\xE7\xE3o Individual de Blocos e Grupos
+### Manutenção Individual de Blocos e Grupos
### =============================================================
### Developer: Fernando Santos (topet05), fer...@ma...
-### Copyright: Mastop InfoDigital \xA9 2003-2007
+### Copyright: Mastop InfoDigital © 2003-2007
### -------------------------------------------------------------
### www.mastop.com.br
### =============================================================
@@ -13,7 +13,7 @@
### =============================================================
include_once("admin_header.php");
if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
- exit(MPU_ADM_403);
+ exit(MPU_ADM2_403);
}
if ($xoopsUser->isAdmin($xoopsModule->mid())) {
include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
@@ -352,7 +352,7 @@
}
}
}
- redirect_header($_SERVER['PHP_SELF'], 1, MPU_ADM_SUCESS2);
+ redirect_header($_SERVER['PHP_SELF'], 1, MPU_ADM2_SUCESS2);
exit();
}
if ($op == 'clone') {
@@ -363,5 +363,5 @@
clone_block_ok($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options);
}
} else {
- echo MPU_ADM_403;
+ echo MPU_ADM2_403;
}
\ No newline at end of file
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/exibe.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/exibe.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/exibe.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -23,10 +23,10 @@
// along with this program; if not, write to the Free Software //
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------- //
-// Author: Rodrigo Pereira Lima (BrInfo - Solu\xE7\xF5es Web) //
+// Author: Rodrigo Pereira Lima (BrInfo - Soluções Web) //
// Site: http://www.brinfo.com.br //
// Project: RW-Banner //
-// Descri\xE7\xE3o: Sistema de gerenciamento de m\xEDdias publicit\xE1rias //
+// Descrição: Sistema de gerenciamento de mídias publicitárias //
// ------------------------------------------------------------------------- //
include_once("admin_header.php");
@@ -51,5 +51,3 @@
echo '<div align="center" style="margin:0px; padding:0px"><img src="'.$banner->getGrafico().'" width="'.$banner->getLargura().'" height="'.$banner->getAltura().'" border="0"></div><br><br>';
}
}
-
-?>
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/import.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/import.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/import.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -18,7 +18,7 @@
{
global $xoopsConfig, $xoopsModule;
$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
- include "admin_header.php";
+// include "admin_header.php";
// xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('import.php');
@@ -63,13 +63,13 @@
echo '<form name="formimport" id="formimport" method="post" action="" onsubmit="return pega();">';
- echo "<div style='text-align:center'><b>"._AM_IMPORT_TITLE."</b></div><br />
+ echo "<div style='text-align:center'><b>"._AM_RWBANNER_IMPORT_TITLE."</b></div><br />
<table width='100%' border='0' class='outer'><tr>
- <th align='center'>"._ADM_TITLE2."</td>
- <th align='center'>"._AM_IMPORT_TITLE1."</td>
- <th align='center'>"._ADM_TITLE3."</td>
- <th align='center'>"._AM_IMPORT_TITLE2."</td>
- <th align='center'>"._AM_IMPORT_TITLE3."</td>";
+ <th align='center'>"._AM_RWBANNER_TITLE2."</td>
+ <th align='center'>"._AM_RWBANNER_IMPORT_TITLE1."</td>
+ <th align='center'>"._AM_RWBANNER_TITLE3."</td>
+ <th align='center'>"._AM_RWBANNER_IMPORT_TITLE2."</td>
+ <th align='center'>"._AM_RWBANNER_IMPORT_TITLE3."</td>";
echo "</tr>";
$result = $xoopsDB->query("SELECT bid, cid FROM ".$xoopsDB->prefix("banner")." ORDER BY bid");
$myts = MyTextSanitizer::getInstance();
@@ -81,14 +81,14 @@
$class = "even";
$result2 = $xoopsDB->query("SELECT cid, name FROM ".$xoopsDB->prefix("bannerclient")." WHERE cid=$cid");
list($cid, $name) = $xoopsDB->fetchRow($result2);
- $name = $myts->makeTboxData4Show($name);
+ $name = $myts->htmlSpecialChars($name);
if ( $impmade == 0 ) {
$percent = 0;
} else {
$percent = substr(100 * $clicks / $impmade, 0, 5);
}
if ( $imptotal == 0 ) {
- $left = ""._AM_UNLIMIT."";
+ $left = ""._AM_RWBANNER_UNLIMIT."";
} else {
$left = $imptotal-$impmade;
}
@@ -153,8 +153,7 @@
$errors++;
}
if($errors)
- redirect_header('index.php',2,_AM_FAIL_IMPORT);
+ redirect_header('index.php',2,_AM_RWBANNER_FAIL_IMPORT);
else
- redirect_header('index.php',2,_AM_SUCCESS_IMPORT);
+ redirect_header('index.php',2,_AM_RWBANNER_SUCCESS_IMPORT);
}
-?>
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/inser.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/inser.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/inser.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -23,10 +23,10 @@
// along with this program; if not, write to the Free Software //
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------- //
-// Author: Rodrigo Pereira Lima (BrInfo - Solu\xE7\xF5es Web) //
+// Author: Rodrigo Pereira Lima (BrInfo - Soluções Web) //
// Site: http://www.brinfo.com.br //
// Project: RW-Banner //
-// Descri\xE7\xE3o: Sistema de gerenciamento de m\xEDdias publicit\xE1rias //
+// Descrição: Sistema de gerenciamento de mídias publicitárias //
// ------------------------------------------------------------------------- //
include( "admin_header.php" );
@@ -46,18 +46,18 @@
if (isset($_POST['form']))
$form = $_POST['form'];
-global $xoopsDB;
+global $xoopsDB,$XoopsModule;
switch ($op){
case 'grava':
$data = date("y:m:d h:i:s");
if ($form['grafico'] == ''){
//Inicio da rotina de upload de arquivo
$maxfilesize = 500000;
- $uploader = new XoopsMediaUploader($local_folder, include_once XOOPS_ROOT_PATH.'/modules/rw_banner/include/mimetypes.inc.php', $maxfilesize);
+ $uploader = new XoopsMediaUploader($local_folder, include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/include/mimetypes.inc.php', $maxfilesize);
for ($i = 0; $i <= count($_POST["xoops_upload_file"]); $i++){
if ($uploader->fetchMedia($_POST["xoops_upload_file"][$i])) {
if (!$uploader->upload()) {
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/index.php',2,$uploader->getErrors());
+ redirect_header('index.php',2,$uploader->getErrors());
} else {
$file_name = $uploader->getSavedFileName();
}
@@ -76,37 +76,37 @@
$banner = new RWbanners($form);
- if ($_POST['post'] == _ADM_BTN_OP1){
+ if ($_POST['post'] == _AM_RWBANNER_BTN_OP1){
if($banner->grava())
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/index.php',1,_ADM_MSG8);
+ redirect_header('index.php',1,_AM_RWBANNER_MSG8);
else
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/index.php',1,_ADM_MSG10);
- }elseif ($_POST['post'] == _ADM_BTN_OP2){
+ redirect_header('index.php',1,_AM_RWBANNER_MSG10);
+ }elseif ($_POST['post'] == _AM_RWBANNER_BTN_OP2){
if ($banner->getStatus() == 2 && $banner->getCategoria() != 0)
$banner->setStatus(1);
if($banner->edita())
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/index.php',1,_ADM_MSG2);
+ redirect_header('index.php',1,_AM_RWBANNER_MSG2);
else
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/index.php',1,_ADM_MSG11);
+ redirect_header('index.php',1,_AM_RWBANNER_MSG11);
}
break;
case 'editar':
xoops_cp_header();
- // rwbanner_adminMenu('',_ADM_TITLE21.' '.$id);
+ // rwbanner_adminMenu('',_AM_RWBANNER_TITLE21.' '.$id);
$sql = 'SELECT * FROM '.$xoopsDB->prefix('rw_banner').' WHERE codigo='.$id;
$query = $xoopsDB->query($sql);
$form = $xoopsDB->fetchArray($query);
//echo '<br><br><br><br><br><br>';
- monta_form(_ADM_BTN_OP2);
+ monta_form(_AM_RWBANNER_BTN_OP2);
xoops_cp_footer();
break;
default:
xoops_cp_header();
- // rwbanner_adminMenu(3,_ADM_VALUE_BTN1);
+ // rwbanner_adminMenu(3,_AM_RWBANNER_VALUE_BTN1);
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('inser.php');
//echo '<br><br><br><br><br><br>';
- monta_form(_ADM_BTN_OP1);
+ monta_form(_AM_RWBANNER_BTN_OP1);
xoops_cp_footer();
break;
}
@@ -126,14 +126,14 @@
</script>
';
- $banner_form = new XoopsThemeForm(_ADM_VALUE_BTN1, "form", "inser.php", "post", false);
+ $banner_form = new XoopsThemeForm(_AM_RWBANNER_VALUE_BTN1, "form", "inser.php", "post", false);
$banner_form->setExtra('enctype="multipart/form-data"');
- $user_selbox = new XoopsFormSelectUser(_ADM_TITLE22, 'form[idcliente]', false, $form['idcliente']);
- $categ_selbox = new XoopsFormSelect(_ADM_TITLE23, 'form[categoria]', $form['categoria']);
+ $user_selbox = new XoopsFormSelectUser(_AM_RWBANNER_TITLE22, 'form[idcliente]', false, $form['idcliente']);
+ $categ_selbox = new XoopsFormSelect(_AM_RWBANNER_TITLE23, 'form[categoria]', $form['categoria']);
$categ_selbox->addOption('rodrigo', '--------');
$js = 'var campo = document.getElementById("form[categoria]");
if (campo.value == \'rodrigo\'){
- alert("Voc\xEA precisa selecionar uma categoria.");
+ alert("Você precisa selecionar uma categoria.");
campo.focus();
return false;
}';
@@ -146,7 +146,7 @@
}
if ($form['maxexib'] == 0){
- $exibe = _ADM_BANNER_EXIBREST;
+ $exibe = _AM_RWBANNER_BANNER_EXIBREST;
$check = 'checked';
$disa = 'disabled';
}else{
@@ -154,7 +154,7 @@
$check = '';
$disa = '';
}
- $label = new XoopsFormElementTray(_ADM_TITLE24,'');
+ $label = new XoopsFormElementTray(_AM_RWBANNER_TITLE24,'');
$max = new XoopsFormText('', "form[maxexibe]", 10, 255, $exibe);
$max->setExtra($disa);
echo '
@@ -162,7 +162,7 @@
function checa(){
if (document.getElementById(\'form[maxexibe]\').disabled == false){
document.getElementById(\'form[maxexibe]\').disabled = true;
- document.getElementById(\'form[maxexibe]\').value = "'._ADM_BTN_OP3.'";
+ document.getElementById(\'form[maxexibe]\').value = "'._AM_RWBANNER_BTN_OP3.'";
}else{
document.getElementById(\'form[maxexibe]\').disabled = false;
document.getElementById(\'form[maxexibe]\').value = "";
@@ -171,11 +171,11 @@
}
</script>
';
- $ilimitado = new XoopsFormCheckBox('',_ADM_BTN_OP3);
+ $ilimitado = new XoopsFormCheckBox('',_AM_RWBANNER_BTN_OP3);
$ilimitado->setExtra('onClick="javascript:checa();" '.$check);
- $ilimitado->addOption(1,_ADM_BTN_OP3);
+ $ilimitado->addOption(1,_AM_RWBANNER_BTN_OP3);
if ($form['maxclick'] == 0){
- $exibe1 = _ADM_BANNER_EXIBREST;
+ $exibe1 = _AM_RWBANNER_BANNER_EXIBREST;
$check1 = 'checked';
$disa1 = 'disabled';
}else{
@@ -183,7 +183,7 @@
$check1 = '';
$disa1 = '';
}
- $label1 = new XoopsFormElementTray(_ADM_TITLE500,'');
+ $label1 = new XoopsFormElementTray(_AM_RWBANNER_TITLE500,'');
$maxclick = new XoopsFormText('', "form[maxclick]", 10, 255, $exibe1);
$maxclick->setExtra($disa1);
echo '
@@ -191,7 +191,7 @@
function checa1(){
if (document.getElementById(\'form[maxclick]\').disabled == false){
document.getElementById(\'form[maxclick]\').disabled = true;
- document.getElementById(\'form[maxclick]\').value = "'._ADM_BTN_OP3.'";
+ document.getElementById(\'form[maxclick]\').value = "'._AM_RWBANNER_BTN_OP3.'";
}else{
document.getElementById(\'form[maxclick]\').disabled = false;
document.getElementById(\'form[maxclick]\').value = "";
@@ -200,11 +200,11 @@
}
</script>
';
- $ilimitado1 = new XoopsFormCheckBox('',_ADM_BTN_OP3);
+ $ilimitado1 = new XoopsFormCheckBox('',_AM_RWBANNER_BTN_OP3);
$ilimitado1->setExtra('onClick="javascript:checa1();" '.$check1);
- $ilimitado1->addOption(1,_ADM_BTN_OP3);
+ $ilimitado1->addOption(1,_AM_RWBANNER_BTN_OP3);
if ($form['periodo'] == 0){
- $exibe2 = _ADM_BANNER_EXIBREST;
+ $exibe2 = _AM_RWBANNER_BANNER_EXIBREST;
$check2 = 'checked';
$disa2 = 'disabled';
}else{
@@ -212,7 +212,7 @@
$check2 = '';
$disa2 = '';
}
- $label2 = new XoopsFormElementTray(_ADM_TITLE5001,'');
+ $label2 = new XoopsFormElementTray(_AM_RWBANNER_TITLE5001,'');
$periodo = new XoopsFormText('', "form[periodo]", 10, 255, $exibe2);
$periodo->setExtra($disa2);
echo '
@@ -220,7 +220,7 @@
function checa2(){
if (document.getElementById(\'form[periodo]\').disabled == false){
document.getElementById(\'form[periodo]\').disabled = true;
- document.getElementById(\'form[periodo]\').value = "'._ADM_BTN_OP3.'";
+ document.getElementById(\'form[periodo]\').value = "'._AM_RWBANNER_BTN_OP3.'";
}else{
document.getElementById(\'form[periodo]\').disabled = false;
document.getElementById(\'form[periodo]\').value = "";
@@ -229,25 +229,25 @@
}
</script>
';
- $ilimitado2 = new XoopsFormCheckBox('',_ADM_BTN_OP3);
+ $ilimitado2 = new XoopsFormCheckBox('',_AM_RWBANNER_BTN_OP3);
$ilimitado2->setExtra('onClick="javascript:checa2();" '.$check2);
- $ilimitado2->addOption(1,_ADM_BTN_OP3);
- $imagem = new XoopsFormText(_ADM_TITLE25, "form[grafico]", 45, 255, $form['grafico']);
+ $ilimitado2->addOption(1,_AM_RWBANNER_BTN_OP3);
+ $imagem = new XoopsFormText(_AM_RWBANNER_TITLE25, "form[grafico]", 45, 255, $form['grafico']);
$js = '
var campo = document.getElementById("form[grafico]");
var campo1 = document.getElementById("banner");
if (campo.value == \'\' && campo1.value == \'\'){
- alert("Voc\xEA precisa definir uma imagem para o banner. Coloque a url de uma no campo imagem ou fa\xE7a o upload.");
+ alert("Você precisa definir uma imagem para o banner. Coloque a url de uma no campo imagem ou faça o upload.");
campo.focus();
return false;
}';
if (method_exists( $imagem, 'getEspecValid' ))
$imagem->setEspecValid($js);
$max_size = 5000000;
- $file_box = new XoopsFormFile(_ADM_TITLE51_ED, "banner", $max_size);
+ $file_box = new XoopsFormFile(_AM_RWBANNER_TITLE51_ED, "banner", $max_size);
$file_box->setExtra('size ="45" onChange="vai();"') ;
$file_box->setDescription($file_name);
- $link = new XoopsFormText(_ADM_TITLE26, "form[url]", 45, 255, $form['url']);
+ $link = new XoopsFormText(_AM_RWBANNER_TITLE26, "form[url]", 45, 255, $form['url']);
echo '
<script>
function checar(){
@@ -260,26 +260,26 @@
}
</script>
';
- $usarhtml = new XoopsFormCheckBox(_ADM_TITLE27,'form[usarhtml]',$form['usarhtml']);
+ $usarhtml = new XoopsFormCheckBox(_AM_RWBANNER_TITLE27,'form[usarhtml]',$form['usarhtml']);
$usarhtml->setExtra('onClick="javascript:checar();"');
- $usarhtml->addOption(1,'Sim');
- $htmlcode = new XoopsFormTextArea(_ADM_TITLE28,'form[htmlcode]', $form['htmlcode']);
+ $usarhtml->addOption(1,_MI_RWBANNER_YES);
+ $htmlcode = new XoopsFormTextArea(_AM_RWBANNER_TITLE28,'form[htmlcode]', $form['htmlcode']);
if ($form['usarhtml'] != 1)
$htmlcode->setExtra('disabled');
- $target_selbox = new XoopsFormSelect(_ADM_TITLE29, 'form[target]', $form['target']);
+ $target_selbox = new XoopsFormSelect(_AM_RWBANNER_TITLE29, 'form[target]', $form['target']);
$target_selbox->addOption('_blank', '_blank');
$target_selbox->addOption('_self', '_self');
$target_selbox->addOption('_parent', '_parent');
$target_selbox->addOption('_top', '_top');
$button_tray = new XoopsFormElementTray('' ,'');
- if ($value == _ADM_BTN_OP2){
+ if ($value == _AM_RWBANNER_BTN_OP2){
$id = new XoopsFormHidden('form[codigo]',$form['codigo']);
$status = new XoopsFormHidden('form[status]',$form['status']);
}
$submit_btn = new XoopsFormButton('', 'post', $value, 'submit');
- if ($value == _ADM_BTN_OP2 && $form['status'] == 2){
- $obs = new XoopsFormTextArea(_ADM_TITLE5000,'form[obs]', $form['obs']);
- $obs->setDescription(_ADM_TITLE5000_DESC);
+ if ($value == _AM_RWBANNER_BTN_OP2 && $form['status'] == 2){
+ $obs = new XoopsFormTextArea(_AM_RWBANNER_TITLE5000,'form[obs]', $form['obs']);
+ $obs->setDescription(_AM_RWBANNER_TITLE5000_DESC);
}
$banner_form->addElement($user_selbox);
$banner_form->addElement($categ_selbox);
@@ -302,7 +302,7 @@
$banner_form->addElement($usarhtml);
$banner_form->addElement($htmlcode);
$banner_form->addElement($target_selbox);
- if ($value == _ADM_BTN_OP2 && $form['status'] == 2)
+ if ($value == _AM_RWBANNER_BTN_OP2 && $form['status'] == 2)
$banner_form->addElement($obs);
$button_tray->addElement($submit_btn);
$banner_form->addElement($button_tray);
@@ -310,4 +310,3 @@
$banner_form->addElement($status);
$banner_form->display();
}
-?>
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/insercateg.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/insercateg.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/insercateg.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -23,10 +23,10 @@
// along with this program; if not, write to the Free Software //
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------- //
-// Author: Rodrigo Pereira Lima (BrInfo - Solu\xE7\xF5es Web) //
+// Author: Rodrigo Pereira Lima (BrInfo - Soluções Web) //
// Site: http://www.brinfo.com.br //
// Project: RW-Banner //
-// Descri\xE7\xE3o: Sistema de gerenciamento de m\xEDdias publicit\xE1rias //
+// Descrição: Sistema de gerenciamento de mídias publicitárias //
// ------------------------------------------------------------------------- //
include( "admin_header.php" );
@@ -45,55 +45,56 @@
global $xoopsDB;
switch ($op){
case 'grava':
- if ($_POST['post'] == _ADM_BTN_OP1){
+ if ($_POST['post'] == _AM_RWBANNER_BTN_OP1){
$cat = new Categoria($form);
if($cat->grava())
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/main.php',1,_ADM_MSG5);
+ redirect_header('main.php',1,_AM_RWBANNER_MSG5);
else
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/index.php',1,_ADM_MSG6.'<br />'.$cat->getError());
- }elseif ($_POST['post'] == _ADM_BTN_OP2){
+ redirect_header('index.php',1,_AM_RWBANNER_MSG6.'<br />'.$cat->getError());
+ }elseif ($_POST['post'] == _AM_RWBANNER_BTN_OP2){
$cat = new Categoria($form);
if($cat->edita())
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/main.php',1,_ADM_MSG4);
+ redirect_header('main.php',1,_AM_RWBANNER_MSG4);
else
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/index.php',1,_ADM_MSG7.'<br />'.$cat->getError());
+ redirect_header('index.php',1,_AM_RWBANNER_MSG7.'<br />'.$cat->getError());
}
break;
case 'editar_categ':
xoops_cp_header();
- // rwbanner_adminMenu('','Editando Categoria c\xF3digo: '.$id);
+ // rwbanner_adminMenu('','Editando Categoria codigo: '.$id);
$cat = new Categoria(null,$id);
$cat->clearDB();
foreach($cat as $key=>$value){
$form[$key] = $value;
}
//echo '<br><br><br><br><br><br>';
- monta_form(_ADM_BTN_OP2);
+ monta_form(_AM_RWBANNER_BTN_OP2);
xoops_cp_footer();
break;
default:
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('insercateg.php');
- // rwbanner_adminMenu(2,_ADM_VALUE_BTN5);
+ // rwbanner_adminMenu(2,_AM_RWBANNER_VALUE_BTN5);
//echo '<br><br><br><br><br><br>';
- monta_form(_ADM_BTN_OP1);
+ monta_form(_AM_RWBANNER_BTN_OP1);
xoops_cp_footer();
break;
}
function monta_form($value){
- global $xoopsDB, $form;
+ global $form;
+ $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
- $banner_form = new XoopsThemeForm(_ADM_TITLE38, "form", "insercateg.php", "post", false);
+ $banner_form = new XoopsThemeForm(_AM_RWBANNER_TITLE38, "form", "insercateg.php", "post", false);
$banner_form->setExtra('enctype="multipart/form-data"');
- $titulo = new XoopsFormText(_ADM_TITLE31, "form[titulo]", 50, 255, (isset($form['titulo']) ? $form['titulo'] : ''));
- $largura = new XoopsFormText(_ADM_TITLE32, "form[larg]", 10, 255, (isset($form['larg']) ? $form['larg'] : ''));
- $altura = new XoopsFormText(_ADM_TITLE33, "form[alt]", 10, 255, (isset($form['alt']) ? $form['alt'] : ''));
+ $titulo = new XoopsFormText(_AM_RWBANNER_TITLE31, "form[titulo]", 50, 255, (isset($form['titulo']) ? $form['titulo'] : ''));
+ $largura = new XoopsFormText(_AM_RWBANNER_TITLE32, "form[larg]", 10, 255, (isset($form['larg']) ? $form['larg'] : ''));
+ $altura = new XoopsFormText(_AM_RWBANNER_TITLE33, "form[alt]", 10, 255, (isset($form['alt']) ? $form['alt'] : ''));
$button_tray = new XoopsFormElementTray('' ,'');
- if ($value == _ADM_BTN_OP2) // bug fix - luciorota
+ if ($value == _AM_RWBANNER_BTN_OP2) // bug fix - luciorota
$id = new XoopsFormHidden('form[cod]',$form['cod']);
$submit_btn = new XoopsFormButton('', 'post', $value, 'submit');
@@ -105,4 +106,3 @@
$banner_form->addElement($id);
$banner_form->display();
}
-?>
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/insertag.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/insertag.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/insertag.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -23,10 +23,10 @@
// along with this program; if not, write to the Free Software //
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------- //
-// Author: Rodrigo Pereira Lima (BrInfo - Solu\xE7\xF5es Web) //
+// Author: Rodrigo Pereira Lima (BrInfo - Soluções Web) //
// Site: http://www.brinfo.com.br //
// Project: RW-Banner //
-// Descri\xE7\xE3o: Sistema de gerenciamento de m\xEDdias publicit\xE1rias //
+// Descrição: Sistema de gerenciamento de mídias publicitárias //
// ------------------------------------------------------------------------- //
include( "admin_header.php" );
@@ -45,20 +45,20 @@
global $xoopsDB;
switch ($op){
case 'grava':
- if ($_POST['post'] == _ADM_BTN_OP1){
+ if ($_POST['post'] == _AM_RWBANNER_BTN_OP1){
$form['modid'] = serialize($form['modid']);
$tag = new RWTag($form);
if($tag->grava())
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/index.php',1,_ADM_MSG22);
+ redirect_header('index.php',1,_AM_RWBANNER_MSG22);
else
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/index.php',1,_ADM_MSG23);
- }elseif ($_POST['post'] == _ADM_BTN_OP2){
+ redirect_header('index.php',1,_AM_RWBANNER_MSG23);
+ }elseif ($_POST['post'] == _AM_RWBANNER_BTN_OP2){
$form['modid'] = serialize($form['modid']);
$tag = new RWTag($form);
if($tag->edita())
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/index.php',1,_ADM_MSG24);
+ redirect_header('index.php',1,_AM_RWBANNER_MSG24);
else
- redirect_header(XOOPS_URL.'/modules/rw_banner/admin/index.php',1,_ADM_MSG25.'<br />'.$tag->getError());
+ redirect_header('index.php',1,_AM_RWBANNER_MSG25.'<br />'.$tag->getError());
}
break;
case 'editar_tag':
@@ -70,16 +70,16 @@
$form[$key] = $value;
}
//echo '<br><br><br><br><br><br>';
- monta_form(_ADM_BTN_OP2);
+ monta_form(_AM_RWBANNER_BTN_OP2);
xoops_cp_footer();
break;
default:
xoops_cp_header();
- // rwbanner_adminMenu(5,_ADM_VALUE_BTN12);
+ // rwbanner_adminMenu(5,_AM_RWBANNER_VALUE_BTN12);
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('insertag.php');
//echo '<br><br><br><br><br><br>';
- monta_form(_ADM_BTN_OP1);
+ monta_form(_AM_RWBANNER_BTN_OP1);
xoops_cp_footer();
break;
}
@@ -88,42 +88,47 @@
global $xoopsDB, $form;
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
- $banner_form = new XoopsThemeForm(_ADM_TAG_TITLE08, "form", "insertag.php", "post", false);
+ $banner_form = new XoopsThemeForm(_AM_RWBANNER_TAG_TITLE08, "form", "insertag.php", "post", false);
- $title = new XoopsFormText(_ADM_TAG_TITLE09, "form[title]", 50, 255, (isset($form['title']) ? $form['title'] : ''));
- $name1 = new XoopsFormText(_ADM_TAG_TITLE14, "form[name]", 50, 255, (isset($form['name']) ? $form['name'] : ''));
- $name1->setDescription(_ADM_TAG_TITLE15);
- $codbanner = new XoopsFormText(_ADM_TAG_TITLE22, "form[codbanner]", 10, 255, (isset($form['codbanner']) ? $form['codbanner'] : ''));
- $codbanner->setDescription(_ADM_TAG_TITLE23);
- $categ = new XoopsFormSelect(_ADM_TAG_TITLE10, 'form[categ]', (isset($form['categ']) ? $form['categ'] : ''));
- $categ->addOption(0, _ADM_TAG_TITLE13);
- $query = "SELECT titulo,cod FROM ".$xoopsDB->prefix("rw_categorias");
+ $title = new XoopsFormText(_AM_RWBANNER_TAG_TITLE09, "form[title]", 50, 255, (isset($form['title']) ? $form['title'] : ''));
+ $name1 = new XoopsFormText(_AM_RWBANNER_TAG_TITLE14, "form[name]", 50, 255, (isset($form['name']) ? $form['name'] : ''));
+ $name1->setDescription(_AM_RWBANNER_TAG_TITLE15);
+ $codbanner = new XoopsFormText(_AM_RWBANNER_TAG_TITLE22, "form[codbanner]", 10, 255, (isset($form['codbanner']) ? $form['codbanner'] : ''));
+ $codbanner->setDescription(_AM_RWBANNER_TAG_TITLE23);
+ $categ = new XoopsFormSelect(_AM_RWBANNER_TAG_TITLE10, 'form[categ]', (isset($form['categ']) ? $form['categ'] : ''));
+ $categ->addOption(0, _AM_RWBANNER_TAG_TITLE13);
+//mb ---------------------------
+$db =& XoopsDatabaseFactory::getDatabaseConnection();
+
+$myDB = $db->prefix("rw_categorias");
+// $query = "SELECT titulo,cod FROM ".$xoopsDB->prefix("rw_categorias");
+ $query = "SELECT titulo,cod FROM ".$myDB;
$consulta = $xoopsDB->queryF($query);
while (list($titulo,$cod) = $xoopsDB->fetchRow($consulta)) {
$categ->addOption($cod, $titulo);
}
$form['modid'] = unserialize((isset($form['modid']) ? $form['modid'] : ''));
- $mid_selbox = new XoopsFormSelect(_ADM_TAG_TITLE16, 'form[modid]', $form['modid'], 5, true);
- $mid_selbox->addOption(0, _ADM_TAG_TITLE17);
+ $mid_selbox = new XoopsFormSelect(_AM_RWBANNER_TAG_TITLE16, 'form[modid]', $form['modid'], 5, true);
+ $mid_selbox->addOption(0, _AM_RWBANNER_TAG_TITLE17);
$query = $xoopsDB->queryF('SELECT mid,name FROM '.$xoopsDB->prefix("modules").' WHERE (hasmain="1" or mid="1") and isactive="1" and (weight!="0" or mid="1") ORDER BY name');
while(list($mid,$name) = $xoopsDB->fetchRow($query)){
$mid_selbox->addOption($mid, $name);
}
- $mid_selbox->setDescription(_ADM_TITLE37);
+ $mid_selbox->setDescription(_AM_RWBANNER_TITLE37);
- $qtde = new XoopsFormText(_ADM_TAG_TITLE11, "form[qtde]", 10, 255, (isset($form['qtde']) ? $form['qtde'] : ''));
- $cols = new XoopsFormText(_ADM_TAG_TITLE12, "form[cols]", 10, 255, (isset($form['cols']) ? $form['cols'] : ''));
+ $qtde = new XoopsFormText(_AM_RWBANNER_TAG_TITLE11, "form[qtde]", 10, 255, (isset($form['qtde']) ? $form['qtde'] : ''));
+ $cols = new XoopsFormText(_AM_RWBANNER_TAG_TITLE12, "form[cols]", 10, 255, (isset($form['cols']) ? $form['cols'] : ''));
- $obs = new XoopsFormTextArea(_ADM_TAG_TITLE20, "form[obs]", (isset($form['obs']) ? $form['obs'] : ''));
- $obs->setDescription(_ADM_TAG_TITLE21);
+ $obs = new XoopsFormTextArea(_AM_RWBANNER_TAG_TITLE20, "form[obs]", (isset($form['obs']) ? $form['obs'] : ''));
+ $obs->setDescription(_AM_RWBANNER_TAG_TITLE21);
- $status = new XoopsFormSelect(_ADM_TAG_TITLE18, 'form[status]', (isset($form['status']) ? $form['status'] : ''));
- $status->addOption(1, _ADM_TAG_STATUS1);
- $status->addOption(0, _ADM_TAG_STATUS2);
+ $status = new XoopsFormSelect(_AM_RWBANNER_TAG_TITLE18, 'form[status]', (isset($form['status']) ? $form['status'] : ''));
+ $status->addOption(1, _AM_RWBANNER_TAG_STATUS1);
+ $status->addOption(0, _AM_RWBANNER_TAG_STATUS2);
$button_tray = new XoopsFormElementTray('' ,'');
- if ($value == _ADM_BTN_OP2) // bug fix - luciorota
+ if ($value == _AM_RWBANNER_BTN_OP2) // bug fix - luciorota
$id = new XoopsFormHidden('form[id]',$form['id']);
$submit_btn = new XoopsFormButton('', 'post', $value, 'submit');
@@ -141,4 +146,3 @@
$banner_form->addElement($id);
$banner_form->display();
}
-?>
Modified: XoopsModules/rw_banner/trunk/rw_banner/admin/main.php
===================================================================
--- XoopsModules/rw_banner/trunk/rw_banner/admin/main.php 2013-08-14 06:41:43 UTC (rev 11911)
+++ XoopsModules/rw_banner/trunk/rw_banner/admin/main.php 2013-08-14 07:47:47 UTC (rev 11912)
@@ -23,10 +23,10 @@
// along with this program; if not, write to the Free Software //
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------- //
-// Author: Rodrigo Pereira Lima (BrInfo - Solu\xE7\xF5es Web) //
+// Author: Rodrigo Pereira Lima (BrInfo - Soluções Web) //
// Site: http://www.brinfo.com.br //
// Project: RW-Banner //
-// Descri\xE7\xE3o: Sistema de gerenciamento de m\xEDdias publicit\xE1rias //
+// Descrição: Sistema de gerenciamento de mídias publicitárias //
// ------------------------------------------------------------------------- //
include( "admin_header.php" );
@@ -70,7 +70,7 @@
$id = (isset($_GET['id']))?$_GET['id']:'';
$banner = new RWbanners(null,$id);
if ($banner->mudaStatus())
- redirect_header('main.php',2,_ADM_MSG1);
+ redirect_header('main.php',2,_AM_RWBANNER_MSG1);
else
redirect_header('index.php',2,$banner->getError());
break;
@@ -78,57 +78,57 @@
$id = (isset($_GET['id']))?$_GET['id']:'';
$tag = new RWTag(null,$id);
if ($tag->mudaStatus())
- redirect_header('main.php',2,_ADM_MSG1);
+ redirect_header('main.php',2,_AM_RWBANNER_MSG1);
else
redirect_header('index.php',2,$tag->getError());
break;
case 'deletar':
$id = (isset($_GET['id']))?$_GET['id']:'';
xoops_cp_header();
- xoops_confirm(array( 'id' => $id, 'op'=>'deletar_ok'),'main.php', _ADM_MSG19);
+ xoops_confirm(array( 'id' => $id, 'op'=>'deletar_ok'),'main.php', _AM_RWBANNER_MSG19);
xoops_cp_footer();
break;
case 'deletar_ok':
$id = (isset($_POST['id']))?$_POST['id']:'';
$banner = new RWbanners(null,$id);
if ($banner->exclui())
- redirect_header('main.php',2,_ADM_MSG101);
+ redirect_header('main.php',2,_AM_RWBANNER_MSG101);
else
redirect_header('index.php',2,$banner->getError());
break;
case 'deletar_categ':
$id = (isset($_GET['id']))?$_GET['id']:'';
xoops_cp_header();
- xoops_confirm(array( 'id' => $id, 'op'=>'deletar_categ_ok'),'main.php', _ADM_MSG3);
+ xoops_confirm(array( 'id' => $id, 'op'=>'deletar_categ_ok'),'main.php', _AM_RWBANNER_MSG3);
xoops_cp_footer();
break;
case 'deletar_categ_ok':
$id = (isset($_POST['id']))?$_POST['id']:'';
$categ = new Categoria(null,$id);
if ($categ->exclui())
- redirect_header('main.php',2,_ADM_MSG102);
+ redirect_header('main.php',2,_AM_RWBANNER_MSG102);
else
redirect_header('index.php',2,$categ->getError());
break;
case 'deletar_tag':
$id = (isset($_GET['id']))?$_GET['id']:'';
xoops_cp_header();
- xoops_confirm(array( 'id' => $id, 'op'=>'deletar_tag_ok'),'main.php', _ADM_MSG20);
+ xoops_confirm(array( 'id' => $id, 'op'=>'deletar_tag_ok'),'main.php', _AM_RWBANNER_MSG20);
xoops_cp_footer();
break;
case 'deletar_tag_ok':
$id = (isset($_POST['id']))?$_POST['id']:'';
$tag = new RWTag(null,$id);
if ($tag->exclui())
- redirect_header('main.php',2,_ADM_MSG21);
+ redirect_header('main.php',2,_AM_RWBANNER_MSG21);
else
redirect_header('index.php',2,$tag->getError());
break;
case 'criardir':
if (mkdir($dir,0777))
- $msg = _ADM_MSG17;
+ $msg = _AM_RWBANNER_MSG17;
else
- $msg = _ADM_MSG18;
+ $msg = _AM_RWBANNER_MSG18;
redirect_header('index.php',2,$msg);
break;
}
@@ -163,30 +163,30 @@
echo '
<table style="font-size:10px;" width="100%" class="outer">
<tr class="head">
- <td align="center"><a href="main.php?order=codigo&seq='.$seq.$extra_sel.'">'._ADM_TITLE2.$img_cod.'</a></td>
- <td align="center"><a href="main.php?order=idcliente&seq='.$seq.$extra_sel.'">'._ADM_TITLE3.$img_cli.'</a></td>
- <td align="center"><a href="main.php?order=categoria&seq='.$seq.$extra_sel.'">'._ADM_TITLE4.$img_cat.'</a></td>
- <td align="center"><a href="main.php?order=exibicoes&seq='.$seq.$extra_sel.'">'._ADM_TITLE5.$img_exib.'</a></td>
- <td align="center">'._ADM_TITLE6.'</td>
- <td align="center"><a href="main.php?order=clicks&seq='.$seq.$extra_sel.'">'._ADM_TITLE7.$img_click.'</a></td>
- <td align="center">'._ADM_TITLE39.'</td>
- <td align="center">'._ADM_TITLE8.'</td>
- <td align="center"><a href="main.php?order=data&seq='.$seq.$extra_sel.'">'._ADM_TITLE9.$img_dat.'</a></td>
- <td align="center">'._ADM_TITLE99.'</td>
- <td align="center"><a href="main.php?order=status&seq='.$seq.$extra_sel.'">'._ADM_TITLE10.$img_sts.'</a></td>
- <td align="center" width="12%">'._ADM_TITLE11.'</td>
+ <td align="center"><a href="main.php?order=codigo&seq='.$seq.$extra_sel.'">'._AM_RWBANNER_TITLE2.$img_cod.'</a></td>
+ <td align="center"><a href="main.php?order=idcliente&seq='.$seq.$extra_sel.'">'._AM_RWBANNER_TITLE3.$img_cli.'</a></td>
+ <td align="center"><a href="main.php?order=categoria&seq='.$seq.$extra_sel.'">'._AM_RWBANNER_TITLE4.$img_cat.'</a></td>
+ <td align="center"><a href="main.php?order=exibicoes&seq='.$seq.$extra_sel.'">'._AM_RWBANNER_TITLE5.$img_exib.'</a></td>
+ <td align="center">'._AM_RWBANNER_TITLE6.'</td>
+ <td align="center"><a href="main.php?order=clicks&seq='.$seq.$extra_sel.'">'._AM_RWBANNER_TITLE7.$img_click.'</a></td>
+ <td align="center">'._AM_RWBANNER_TITLE39.'</td>
+ <td align="center">'._AM_RWBANNER_TITLE8.'</td>
+ <td align="center"><a href="main.php?order=data&seq='.$seq.$extra_sel.'">'._AM_RWBANNER_TITLE9.$img_dat.'</a></td>
+ <td align="center">'._AM_RWBANNER_TITLE99.'</td>
+ <td align="center"><a href="main.php?order=status&seq='.$seq.$extra_sel.'">'._AM_RWBANNER_TITLE10.$img_sts.'</a></td>
+ <td align="center" width="12%">'._AM_RWBANNER_TITLE11.'</td>
</tr>
';
$class = "even";
for ($i = 0; $i <= count($lista_banners)-1; $i++){
if ($lista_banners[$i]->getStatus() == 1) {
- $status = '<img src='. $pathIcon16 .'/green.gif'.' width="16" height="16" border="0" alt="'._ADM_BANNER_STATUS1.'" title="'._ADM_BANNER_STATUS1.'">';
+ $status = '<img src='. $pathIcon16 .'/green.gif'.' width="16" height="16" border="0" alt="'._AM_RWBANNER_BANNER_STATUS1.'" title="'._AM_RWBANNER_BANNER_STATUS1.'">';
$estilo = '';
}elseif ($lista_banners[$i]->getStatus() == 2) {
- $status = '<img src="../images/wait.gif" width="20" height="20" border="0" alt="'._ADM_BANNER_STATUS3.'" title="'._ADM_BANNER_STATUS3.'">';
+ $status = '<img src="../images/wait.gif" width="20" height="20" border="0" alt="'._AM_RWBANNER_BANNER_STATUS3.'" title="'._AM_RWBANNER_BANNER_STATUS3.'">';
$estilo = '';
} else {
- $status = '<img src='. $pathIcon16 .'/red.gif'.' width="16" height="16" border="0" alt="'._ADM_BANNER_STATUS2.'" title="'._ADM_BANNER_STATUS2.'">';
+ $status = '<img src='. $pathIcon16 .'/red.gif'.' width="16" height="16" border="0" alt="'._AM_RWBANNER_BANNER_STATUS2.'" title="'._AM_RWBANNER_BANNER_STATUS2.'">';
$estilo = 'style="color:red;"';
}
if ($class == "even")
@@ -194,12 +194,12 @@
else
$class = "even";
if ($lista_banners[$i]->getMaxexib() == 0){
- $exibrest = _ADM_BANNER_EXIBREST;
+ $exibrest = _AM_RWBANNER_BANNER_EXIBREST;
}else{
$exibrest = round($lista_banners[$i]->getMaxexib()-$lista_banners[$i]->getExibicoes());
}
if ($lista_banners[$i]->getMaxclick() == 0){
- $exibrestclick = _ADM_BANNER_EXIBREST;
+ $exibrestclick = _AM_RWBANNER_BANNER_EXIBREST;
}else{
$exibrestclick = round($lista_banners[$i]->getMaxclick()-$lista_banners[$i]->getClicks());
}
@@ -212,11 +212,11 @@
$periodo = $lista_banners[$i]->getPeriodo();
$maxdata = somaData($data,$periodo);
if ($periodo == 0){
- $periodo = _ADM_BANNER_EXIBREST;
+ $periodo = _AM_RWBANNER_BANNER_EXIBREST;
}else{
$periodo = converte($maxdata,'BR',0);
}
- $titulo = ($lista_banners[$i]->getBannnerCategName() != '')?$lista_banners[$i]->getBannnerCategName():_ADM_NO_CATEG;
+ $titulo = ($lista_banners[$i]->getBannnerCategName() != '')?$lista_banners[$i]->getBannnerCategName():_AM_RWBANNER_NO_CATEG;
$cliente = $lista_banners[$i]->getBannnerClientName();
$lista_banners[$i]->clearDb();
$data_cad = converte($lista_banners[$i]->getData(),'BR',0);
@@ -235,9 +235,9 @@
<td align="center"><a href="main.php?op=mudastatus&id='.$lista_banners[$i]->getCodigo().'">'.$status.'</a></td>';
echo '
<td align="center" width="10%">
- <a href="javascript:;" onClick="javascript: window.open(\'exibe.php?id='.$lista_banners[$i]->getCodigo().'\',\'editar\',\'width='.($lista_banners[$i]->getLargura()+20).',height='.$lista_banners[$i]->getAltura().',toolbar=no\');"><img src='. $pathIcon16 .'/search.png'.' width="16" height="16" border="0" alt="'._ADM_VALUE_BTN2.'" title="'._ADM_VALUE_BTN2.'"></a>
- <a href="inser.php?id='.$lista_banners[$i]->getCodigo().'&op=editar"><img src='. $pathIcon16 .'/edit.png'.' width="16" height="16" border="0" alt="'._ADM_VALUE_BTN3.'" title="'._ADM_VALUE_BTN3.'"></a>
- <a href="main.php?id='.$lista_banners[$i]->getCodigo().'&op=deletar"><img src='. $pathIcon16 .'/delete.png'.' width="16" height="16" border="0" alt="'._ADM_VALUE_BTN4.'" title="'._ADM_VALUE_BTN4.'"></a>
+ <a href="javascript:;" onClick="javascript: window.open(\'exibe.php?id='.$lista_banners[$i]->getCodigo().'\',\'editar\',\'width='.($lista_banners[$i]->getLargura()+20).',height='.$lista_banners[$i]->getAltura().',toolbar=no\');"><img src='. $pathIcon16 .'/search.png'.' width="16" height="16" border="0" alt="'._AM_RWBANNER_VALUE_BTN2.'" title="'._AM_RWBANNER_VALUE_BTN2.'"></a>
+ <a href="inser.php?id='.$lista_banners[$i]->getCodigo().'&op=editar"><img src='. $pathIcon16 .'/edit.png'.' width="16" height="16" border="0" alt="'._AM_RWBANNER_VALUE_BTN3.'" title="'._AM_RWBANNER_VALUE_BTN3.'"></a>
+ <a href="main.php?id='.$lista_banners[$i]->getCodigo().'&op=deletar"><img src='. $pathIcon16 .'/delete.png'.' width="16" height="16" border="0" alt="'._AM_RWBANNER_VALUE_BTN4.'" title="'._AM_RWBANNER_VALUE_BTN4.'"></a>
</td>
</tr>';
}
@@ -255,7 +255,7 @@
$pagenav = new XoopsPageNav($total, $limit, $start, 'start', $extra_pag);
$pag = $pagenav->renderNav();
echo' <tr class="head">';
- echo' <td align="left" colspan="12" nowrap="nowrap">'._ADM_TOTAL_BANNER_LEG.' '.$total.'<br><div align="center">'.$pag.'</div></td>';
+ echo' <td align="left" colspan="12" nowrap="nowrap">'._AM_RWBANNER_TOTAL_BANNER_LEG.' '.$total.'<br><div align="center">'.$pag.'</div></td>';
echo' </tr>';
echo'</table> ';
echo '</div><br />';
@@ -276,10 +276,10 @@
echo '
<table style="font-size:10px;" width="100%" class="outer">
<tr class="head">
- <td align="center">'._ADM_TITLE2.'</td>
- <td align="center">'._ADM_TITLE13.'</td>
- <td align="center">'._ADM_TITLE14.'</td>
- <td align="center">'._ADM_TITLE11.'</td>
+ <td align="center">'._AM_RWBANNER_TITLE2.'</td>
+ <td align="center">'._AM_RWBANNER_TITLE13.'</td>
+ <td align="center">'._AM_RWBANNER_TITLE14.'</td>
+ <td align="center">'._AM_RWBANNER_TITLE11.'</td>
</tr>
';
$class = "even";
@@ -299,8 +299,8 @@
<td align="center">'.$qtde.'</td>';
echo '
<td align="center" width="10%">
- <a href="insercateg.php?id='.$lista_categs[$i]->getCod().'&op=editar_categ"><img src='. $pathIcon16 .'/edit.png'.' width="16" height="16" border="0" alt="'._ADM_VALUE_BTN6.'" title="'._ADM_VALUE_BTN6.'"></a>
- <a href="main.php?id='.$lista_categs[$i]->getCod().'&op=deletar_categ"><img src='. $pathIcon16 .'/delete.png'.' width="16" height="16" border="0" alt="'._ADM_VALUE_BTN7.'" title="'._ADM_VALUE_BTN7.'"></a>
+ <a href="insercateg.php?id='.$lista_categs[$i]->getCod().'&op=editar_categ"><img src='. $pathIcon16 .'/edit.png'.' width="16" height="16" border="0" alt="'._AM_RWBANNER_VALUE_BTN6.'" title="'._AM_RWBANNER_VALUE_BTN6.'"></a>
+ <a href="main.php?id='.$lista_categs[$i]->getCod().'&op=deletar_categ"><img src='. $pathIcon16 .'/delete.png'.' width="16" height="16" border="0" alt="'._AM_RWBANNER_VALUE_BTN7.'" title="'._AM_RWBANNER_VALUE_BTN7.'"></a>
</td>
</tr>';
}
@@ -322,15 +322,15 @@
echo '
<table style="font-size:10px;" widt...
[truncated message content] |
|
From: <be...@us...> - 2013-08-14 06:41:45
|
Revision: 11911
http://sourceforge.net/p/xoops/svn/11911
Author: beckmi
Date: 2013-08-14 06:41:43 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Correcting release version
Modified Paths:
--------------
XoopsModules/planet/trunk/planet/xoops_version.php
Modified: XoopsModules/planet/trunk/planet/xoops_version.php
===================================================================
--- XoopsModules/planet/trunk/planet/xoops_version.php 2013-08-14 06:37:13 UTC (rev 11910)
+++ XoopsModules/planet/trunk/planet/xoops_version.php 2013-08-14 06:41:43 UTC (rev 11911)
@@ -49,10 +49,10 @@
$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2013/07/11';
+$modversion['release_date'] = '2013/08/12';
$modversion["module_website_url"] = "www.xoops.org";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Final";
+$modversion["module_status"] = "Beta 1";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5.6";
$modversion['min_admin'] = '1.1';
|
|
From: <be...@us...> - 2013-08-14 06:37:18
|
Revision: 11910
http://sourceforge.net/p/xoops/svn/11910
Author: beckmi
Date: 2013-08-14 06:37:13 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Converted to XOOPS 2.5.6 Admin GUI
Modified Paths:
--------------
XoopsModules/planet/trunk/planet/action.article.php
XoopsModules/planet/trunk/planet/action.blog.php
XoopsModules/planet/trunk/planet/action.bookmark.php
XoopsModules/planet/trunk/planet/action.rate.php
XoopsModules/planet/trunk/planet/admin/about.php
XoopsModules/planet/trunk/planet/admin/admin.article.php
XoopsModules/planet/trunk/planet/admin/admin.blog.php
XoopsModules/planet/trunk/planet/admin/admin.category.php
XoopsModules/planet/trunk/planet/admin/header.php
XoopsModules/planet/trunk/planet/admin/index.php
XoopsModules/planet/trunk/planet/admin/menu.php
XoopsModules/planet/trunk/planet/blocks/block.php
XoopsModules/planet/trunk/planet/class/article.php
XoopsModules/planet/trunk/planet/class/blog.php
XoopsModules/planet/trunk/planet/class/bookmark.php
XoopsModules/planet/trunk/planet/class/category.php
XoopsModules/planet/trunk/planet/class/feedcreator.class.php
XoopsModules/planet/trunk/planet/class/rate.php
XoopsModules/planet/trunk/planet/class/xml.php
XoopsModules/planet/trunk/planet/class/xmlparser.php
XoopsModules/planet/trunk/planet/class/xmlpc.php
XoopsModules/planet/trunk/planet/comment_delete.php
XoopsModules/planet/trunk/planet/comment_edit.php
XoopsModules/planet/trunk/planet/comment_new.php
XoopsModules/planet/trunk/planet/comment_post.php
XoopsModules/planet/trunk/planet/comment_reply.php
XoopsModules/planet/trunk/planet/counter.php
XoopsModules/planet/trunk/planet/footer.php
XoopsModules/planet/trunk/planet/header.php
XoopsModules/planet/trunk/planet/images/logo.png
XoopsModules/planet/trunk/planet/include/action.module.php
XoopsModules/planet/trunk/planet/include/comment.inc.php
XoopsModules/planet/trunk/planet/include/form.blog.php
XoopsModules/planet/trunk/planet/include/functions.ini.php
XoopsModules/planet/trunk/planet/include/functions.php
XoopsModules/planet/trunk/planet/include/search.inc.php
XoopsModules/planet/trunk/planet/include/vars.php
XoopsModules/planet/trunk/planet/index.php
XoopsModules/planet/trunk/planet/language/english/admin.php
XoopsModules/planet/trunk/planet/pdf.php
XoopsModules/planet/trunk/planet/print.php
XoopsModules/planet/trunk/planet/search.php
XoopsModules/planet/trunk/planet/templates/planet_index.html
XoopsModules/planet/trunk/planet/trackback.php
XoopsModules/planet/trunk/planet/update.php
XoopsModules/planet/trunk/planet/view.archive.php
XoopsModules/planet/trunk/planet/view.article.php
XoopsModules/planet/trunk/planet/view.blogs.php
XoopsModules/planet/trunk/planet/xml.php
XoopsModules/planet/trunk/planet/xoops_version.php
Added Paths:
-----------
XoopsModules/planet/trunk/planet/admin/admin_footer.php
XoopsModules/planet/trunk/planet/admin/admin_header.php
XoopsModules/planet/trunk/planet/admin/main.php
XoopsModules/planet/trunk/planet/docs/
XoopsModules/planet/trunk/planet/docs/changelog.txt
XoopsModules/planet/trunk/planet/docs/credits.txt
XoopsModules/planet/trunk/planet/docs/index.html
XoopsModules/planet/trunk/planet/docs/install.txt
XoopsModules/planet/trunk/planet/docs/lang_diff.txt
XoopsModules/planet/trunk/planet/docs/license.txt
XoopsModules/planet/trunk/planet/docs/readme.clone.txt
XoopsModules/planet/trunk/planet/docs/readme.txt
XoopsModules/planet/trunk/planet/images/index.html
XoopsModules/planet/trunk/planet/include/index.html
XoopsModules/planet/trunk/planet/language/english/help/
XoopsModules/planet/trunk/planet/language/english/help/help.html
XoopsModules/planet/trunk/planet/language/english/help/index.html
XoopsModules/planet/trunk/planet/language/english/mail_template/index.html
XoopsModules/planet/trunk/planet/templates/blocks/index.html
Removed Paths:
-------------
XoopsModules/planet/trunk/planet/admin/admin.block.php
XoopsModules/planet/trunk/planet/changelog.txt
XoopsModules/planet/trunk/planet/gpl.txt
XoopsModules/planet/trunk/planet/readme.clone.txt
XoopsModules/planet/trunk/planet/readme.html
Modified: XoopsModules/planet/trunk/planet/action.article.php
===================================================================
--- XoopsModules/planet/trunk/planet/action.article.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/action.article.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/action.blog.php
===================================================================
--- XoopsModules/planet/trunk/planet/action.blog.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/action.blog.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/action.bookmark.php
===================================================================
--- XoopsModules/planet/trunk/planet/action.bookmark.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/action.bookmark.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/action.rate.php
===================================================================
--- XoopsModules/planet/trunk/planet/action.rate.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/action.rate.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/admin/about.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/about.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/about.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -1,99 +1,30 @@
-<?php
-// $Id$
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
-// Project: Article Project //
-// ------------------------------------------------------------------------ //
-include( "header.php" );
-
-xoops_cp_header();
-planet_adminmenu(5);
-
-$versioninfo =& $module_handler->get( $xoopsModule->getVar( 'mid' ) );
-echo "
- <style type=\"text/css\">
- label,text {
- display: block;
- float: left;
- margin-bottom: 2px;
- }
- label {
- text-align: right;
- width: 150px;
- padding-right: 20px;
- }
- br {
- clear: left;
- }
- </style>
-";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . $xoopsModule->getVar("name"). "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<img src='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/" . $versioninfo->getInfo( 'image' ) . "' alt='' hspace='10' vspace='0' /></a>\n";
-echo "<div style='padding: 5px;'><strong>" . $versioninfo->getInfo( 'name' ) . " version " . $versioninfo->getInfo( 'version' ) . "</strong></div>\n";
-echo "<label>" . planet_constant("AM_ABOUT_RELEASEDATE") . ":</label><text>" . $versioninfo->getInfo( 'release' ) . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_AUTHOR") . ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_CREDITS") . ":</label><text>" . $versioninfo->getInfo( 'credits' ) . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_LICENSE") . ":</label><text><a href=\"".$versioninfo->getInfo( 'license_file' )."\" target=\"_blank\" >" . $versioninfo->getInfo( 'license' ) . "</a></text>\n";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_ABOUT_MODULE_INFO") . "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" . planet_constant("AM_ABOUT_MODULE_STATUS") . ":</label><text>" . $versioninfo->getInfo( 'module_status' ) . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_WEBSITE") . ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'module_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'module_website_name' ) . "</a>" . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_MODULE_TEAM") . ":</label><text>" . $versioninfo->getInfo( 'module_team' ) . "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_ABOUT_AUTHOR_INFO") . "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" . planet_constant("AM_ABOUT_AUTHOR_NAME") . ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_WEBSITE") . ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'author_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'author_website_name' ) . "</a>" . "</text><br />";
-echo "<label>" . planet_constant("AM_ABOUT_AUTHOR_WORD") . ":</label><text>" . $versioninfo->getInfo( 'author_word' ) . "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_ABOUT_DISCLAIMER") . "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<div>". planet_constant("AM_ABOUT_DISCLAIMER_TEXT") . "</div>";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-
-$file = XOOPS_ROOT_PATH. "/modules/" . $GLOBALS["moddirname"] . "/changelog.txt";
-if ( is_readable( $file ) ){
- echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_ABOUT_CHANGELOG") . "</legend>";
- echo "<div style='padding: 8px;'>";
- echo "<div>". implode("<br />", file( $file )) . "</div>";
- echo "</div>";
- echo "</fieldset>";
- echo "<br clear=\"all\" />";
-}
-
-xoops_cp_footer();
-?>
\ No newline at end of file
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author XOOPS Development Team
+ * @version $Id $
+ */
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
+include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/planet/trunk/planet/admin/admin.article.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin.article.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/admin.article.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,12 +21,14 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
-include("header.php");
+include( "admin_header.php" );
xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('admin.article.php');
/*
* To restore basic parameters in case cloned modules are installed
* reported by programfan
@@ -35,7 +37,7 @@
* it is expected to have a better solution in article 1.0
*/
require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
-planet_adminmenu(3);
+//planet_adminmenu(3);
$article_handler =& xoops_getmodulehandler("article", $GLOBALS["moddirname"]);
if(!empty($xoopsModuleConfig["article_expire"])){
Deleted: XoopsModules/planet/trunk/planet/admin/admin.block.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin.block.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/admin.block.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -1,29 +0,0 @@
-<?php
-// $Id$
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
-// Project: Article Project //
-// ------------------------------------------------------------------------ //
-include('header.php');
-header("Location: ".XOOPS_URL."/modules/system/admin.php?fct=blocksadmin&selmod=".$xoopsModule->getVar("mid"));
-?>
\ No newline at end of file
Modified: XoopsModules/planet/trunk/planet/admin/admin.blog.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin.blog.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/admin.blog.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,13 +21,15 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
-include("header.php");
+include( "admin_header.php" );
require_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('admin.blog.php');
/*
* To restore basic parameters in case cloned modules are installed
* reported by programfan
@@ -36,7 +38,7 @@
* it is expected to have a better solution in article 1.0
*/
require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
-planet_adminmenu(2);
+//planet_adminmenu(2);
$op = !empty($_POST["op"])?$_POST["op"]:(!empty($_GET["op"])?$_GET["op"]:"");
$blog_id = !empty($_POST["blog"])?$_POST["blog"]:(!empty($_GET["blog"])?$_GET["blog"]:0);
@@ -276,25 +278,26 @@
echo "<form name='list' id='list' method='post' action='".xoops_getenv("PHP_SELF")."'>";
echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
echo "<tr align='center'>";
- echo "<td class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox' onclick=\"xoopsCheckAll('list', 'blog_check');\" /></td>";
- echo "<td class='bg3' width='5%'>" . _EDIT . "</td>";
- echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
- echo "<td class='bg3' width='5%'>" . planet_constant("MD_EMPTY_BLOG") . "</td>";
- echo "<td class='bg3'>" . planet_constant("AM_TITLE") . "</td>";
- echo "<td class='bg3' width='5%'>" . planet_constant("AM_STATUS") . "</td>";
- echo "<td class='bg3' width='40%'>" . planet_constant("AM_FEED") . "</td>";
+ echo "<th class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox' onclick=\"xoopsCheckAll('list', 'blog_check');\" /></td>";
+ echo "<th class='bg3'>" . planet_constant("AM_TITLE") . "</td>";
+ echo "<th class='bg3' width='5%'>" . planet_constant("AM_STATUS") . "</td>";
+ echo "<th class='bg3' width='40%'>" . planet_constant("AM_FEED") . "</td>";
+// echo "<th class='bg3' width='5%'>" . _EDIT . "</td>";
+// echo "<th class='bg3' width='5%'>" . _DELETE . "</td>";
+ echo "<th class='bg3' width='10%'>" . planet_constant("AM_ACTIONS") . "</td>";
echo "</tr>";
$status = array("0"=>planet_constant("MD_PENDING"), "1"=>planet_constant("MD_ACTIVE"), "2"=>planet_constant("MD_FEATURED"));
foreach(array_keys($blog_objs) as $bid){
echo "<tr class='odd' align='left'>";
- echo "<td><input name='blog[]' value='".$bid."' type='checkbox' /></td>";
- echo "<td><a href='admin.blog.php?op=edit&blog=".$bid."' title='"._EDIT."' />"._EDIT."</a></td>";
- echo "<td><a href='admin.blog.php?op=del&blog=".$bid."' title='"._DELETE."' />"._DELETE."</a></td>";
- echo "<td><a href='admin.blog.php?op=empty&blog=".$bid."' title='".planet_constant("MD_EMPTY_BLOG")."' />".planet_constant("MD_EMPTY_BLOG")."</a></td>";
+ echo "<td align='center'><input name='blog[]' value='".$bid."' type='checkbox' /></td>";
echo "<td><a href='".XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php".URL_DELIMITER."b".$bid."'>".$blog_objs[$bid]->getVar("blog_title")."</a></td>";
- echo "<td>".$status[$blog_objs[$bid]->getVar("blog_status")]."</td>";
+ echo "<td align='center'>".$status[$blog_objs[$bid]->getVar("blog_status")]."</td>";
echo "<td>".$blog_objs[$bid]->getVar("blog_feed")."</td>";
+ echo "<td align='center'><a href='admin.blog.php?op=edit&blog=".$bid. "' title='"._EDIT."'><img src='". $pathIcon16 ."/edit.png '". "alt='" . _EDIT . " title='" ._EDIT." </a>
+ <a href='admin.blog.php?op=del&blog=".$bid. "' title='"._DELETE."'><img src='". $pathIcon16 ."/delete.png '"." alt='" . _EDIT . " title='"._DELETE." </a>
+ <a href='admin.blog.php?op=empty&blog=".$bid."' title='".planet_constant("MD_EMPTY_BLOG")."'><img src='". $pathIcon16 ."/empty.png '"." alt='" . _EDIT . " title='".planet_constant("MD_EMPTY_BLOG")."</a></td>";
+
echo "</tr>";
}
echo "<tr class='even' align='center'>";
Modified: XoopsModules/planet/trunk/planet/admin/admin.category.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin.category.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/admin.category.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,15 +21,17 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
-include("header.php");
+include( "admin_header.php" );
require_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('admin.category.php');
require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
-planet_adminmenu(1);
+//planet_adminmenu(1);
$op = !empty($_POST["op"])?$_POST["op"]:(!empty($_GET["op"])?$_GET["op"]:"");
$cat_id = !empty($_POST["category"])?$_POST["category"]:(!empty($_GET["category"])?$_GET["category"]:0);
@@ -119,11 +121,12 @@
echo "<form name='list' method='post'>";
echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
echo "<tr align='center'>";
- echo "<td class='bg3' width='5%'>" . planet_constant("AM_ORDER") . "</td>";
- echo "<td class='bg3' width='5%'>" . _EDIT . "</td>";
- echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
- echo "<td class='bg3' width='80%'>" . planet_constant("AM_TITLE") . "</td>";
- echo "<td class='bg3' width='5%'>" . planet_constant("AM_BLOGCOUNT") . "</td>";
+ echo "<th class='bg3' width='5%'>" . planet_constant("AM_ORDER") . "</td>";
+ echo "<th align='left' class='bg3' width='80%'>" . planet_constant("AM_TITLE") . "</td>";
+ echo "<th class='bg3' width='5%'>" . planet_constant("AM_BLOGCOUNT") . "</td>";
+ echo "<th class='bg3' width='5%'>" . planet_constant("AM_ACTIONS") . "</td>";
+// echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
+
echo "</tr>";
$ii = 0;
@@ -131,10 +134,11 @@
echo "<tr class='odd' align='left'>";
echo "<td><input type='hidden' name='cat[]' value='".$cid."' />";
echo "<input type='text' name='cat_order[]' value='".($ii*10)."' /></td>";
- echo "<td><a href='admin.category.php?op=edit&category=".$cid."' title='"._EDIT."' />"._EDIT."</a></td>";
- echo "<td><a href='admin.category.php?op=del&category=".$cid."' title='"._DELETE."' />"._DELETE."</a></td>";
echo "<td>".$categories[$cid]."</td>";
- echo "<td>".@$blog_counts[$cid]."</td>";
+ echo "<td align='center'>".@$blog_counts[$cid]."</td>";
+
+ echo "<td align='center'><a href='admin.category.php?op=edit &category='".$cid."' title='"._EDIT."'><img src='". $pathIcon16 ."/edit.png '". "alt='" . _EDIT . "' title='" ._EDIT."' </a>
+ <a href='admin.category.php?op=del &category='".$cid."' title='"._DELETE."'><img src='". $pathIcon16 ."/delete.png '"." alt='" . _EDIT . "' title='"._DELETE."' </a></td>";
echo "</tr>";
$ii++;
}
Added: XoopsModules/planet/trunk/planet/admin/admin_footer.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin_footer.php (rev 0)
+++ XoopsModules/planet/trunk/planet/admin/admin_footer.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -0,0 +1,28 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author XOOPS Development Team
+ * @version $Id $
+ */
+
+echo "<div class='adminfooter'>\n"
+ ." <div style='text-align: center;'>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+ ."</div>";
+
+xoops_cp_footer();
\ No newline at end of file
Property changes on: XoopsModules/planet/trunk/planet/admin/admin_footer.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/planet/trunk/planet/admin/admin_header.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/admin_header.php (rev 0)
+++ XoopsModules/planet/trunk/planet/admin/admin_header.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -0,0 +1,55 @@
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author XOOPS Development Team
+ * @version $Id $
+ */
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
+
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+//if functions.php file exist
+//require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+
+
+require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
+require_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/functions.php");
+include_once(XOOPS_ROOT_PATH."/Frameworks/art/functions.admin.php");
+
+// include the default language file for the admin interface
+if(!@include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/" . $xoopsConfig['language'] . "/main.php")){
+ include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/english/main.php");
+}
+
+planet_define_url_delimiter();
+$myts =& MyTextSanitizer::getInstance();
Property changes on: XoopsModules/planet/trunk/planet/admin/admin_header.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/planet/trunk/planet/admin/header.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/header.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/header.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/admin/index.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/index.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/index.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -1,113 +1,32 @@
-<?php
-// $Id$
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
-// Project: Article Project //
-// ------------------------------------------------------------------------ //
-include('header.php');
-
-xoops_cp_header();
-
-planet_adminmenu(0);
-
-echo "
- <style type=\"text/css\">
- label,text {
- display: block;
- float: left;
- margin-bottom: 2px;
- }
- label {
- text-align: right;
- width: 150px;
- padding-right: 20px;
- }
- br {
- clear: left;
- }
- </style>
-";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_PREFERENCES") . "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" . "<strong>PHP Version:</strong>" . ":</label><text>" . phpversion() . "</text><br />";
-echo "<label>" . "<strong>MySQL Version:</strong>" . ":</label><text>" . mysql_get_server_info() . "</text><br />";
-echo "<label>" . "<strong>XOOPS Version:</strong>" . ":</label><text>" . XOOPS_VERSION . "</text><br />";
-echo "<label>" . "<strong>Module Version:</strong>" . ":</label><text>" . $xoopsModule->getInfo('version') . "</text><br />";
-echo "</div>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" . planet_constant("AM_SAFEMODE") . ":</label><text>";
-echo ( ini_get( 'safe_mode' ) ) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_REGISTERGLOBALS") . ":</label><text>";
-echo ( ini_get( 'register_globals' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_MAGICQUOTESGPC") . ":</label><text>";
-echo ( ini_get( 'magic_quotes_gpc' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_MAXPOSTSIZE") .":</label><text>". ini_get( 'post_max_size' );
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_MAXINPUTTIME") .":</label><text>". ini_get( 'max_input_time' );
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_OUTPUTBUFFERING") .":</label><text>". ini_get( 'output_buffering' );
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_XML_EXTENSION") .":</label><text>";
-echo ( extension_loaded( 'xml' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_MB_EXTENSION") .":</label><text>";
-echo ( extension_loaded( 'mbstring' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_CURL") .":</label><text>";
-echo ( function_exists('curl_init')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_FSOCKOPEN") .":</label><text>";
-echo ( function_exists('fsockopen')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_URLFOPEN") .":</label><text>";
-echo ( ini_get('allow_url_fopen')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
-echo "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_STATS") . "</legend>";
-echo "<div style='padding: 8px;'>";
-$category_handler =& xoops_getmodulehandler('category', $GLOBALS["moddirname"]);
-$category_count = $category_handler->getCount();
-$blog_handler =& xoops_getmodulehandler("blog", $GLOBALS["moddirname"]);
-$blog_count = $blog_handler->getCount();
-$article_handler =& xoops_getmodulehandler('article', $GLOBALS["moddirname"]);
-$article_count = $article_handler->getCount();
-$criteria = new Criteria("blog_status", 0);
-$blog_count_pending = $blog_handler->getCount($criteria);
-echo "<label>" . planet_constant("AM_TOTAL_CATEGORIES") .":</label><text>". $category_count;
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_TOTAL_BLOGS") .":</label><text>". $blog_count;
-if($blog_count_pending>0) echo " (<font color=\"red\">". $blog_count_pending."</font>)";
-echo "</text><br />";
-echo "<label>" . planet_constant("AM_TOTAL_ARTICLES") .":</label><text>".$article_count;
-echo "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-
-xoops_cp_footer();
-?>
\ No newline at end of file
+<?php
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author XOOPS Development Team
+ * @version $Id $
+ */
+
+
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+ $indexAdmin = new ModuleAdmin();
+
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+
+include "admin_footer.php";
\ No newline at end of file
Added: XoopsModules/planet/trunk/planet/admin/main.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/main.php (rev 0)
+++ XoopsModules/planet/trunk/planet/admin/main.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -0,0 +1,115 @@
+<?php
+// $Id$
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: phppp (D.J., in...@gm...) //
+// URL: http://xoops.org //
+// Project: Article Project //
+// ------------------------------------------------------------------------ //
+include( "admin_header.php" );
+
+xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('main.php');
+
+//planet_adminmenu(0);
+
+echo "
+ <style type=\"text/css\">
+ label,text {
+ display: block;
+ float: left;
+ margin-bottom: 2px;
+ }
+ label {
+ text-align: right;
+ width: 150px;
+ padding-right: 20px;
+ }
+ br {
+ clear: left;
+ }
+ </style>
+";
+
+echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_PREFERENCES") . "</legend>";
+echo "<div style='padding: 8px;'>";
+echo "<label>" . "<strong>PHP Version:</strong>" . ":</label><text>" . phpversion() . "</text><br />";
+echo "<label>" . "<strong>MySQL Version:</strong>" . ":</label><text>" . mysql_get_server_info() . "</text><br />";
+echo "<label>" . "<strong>XOOPS Version:</strong>" . ":</label><text>" . XOOPS_VERSION . "</text><br />";
+echo "<label>" . "<strong>Module Version:</strong>" . ":</label><text>" . $xoopsModule->getInfo('version') . "</text><br />";
+echo "</div>";
+echo "<div style='padding: 8px;'>";
+echo "<label>" . planet_constant("AM_SAFEMODE") . ":</label><text>";
+echo ( ini_get( 'safe_mode' ) ) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_REGISTERGLOBALS") . ":</label><text>";
+echo ( ini_get( 'register_globals' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_MAGICQUOTESGPC") . ":</label><text>";
+echo ( ini_get( 'magic_quotes_gpc' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_MAXPOSTSIZE") .":</label><text>". ini_get( 'post_max_size' );
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_MAXINPUTTIME") .":</label><text>". ini_get( 'max_input_time' );
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_OUTPUTBUFFERING") .":</label><text>". ini_get( 'output_buffering' );
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_XML_EXTENSION") .":</label><text>";
+echo ( extension_loaded( 'xml' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_MB_EXTENSION") .":</label><text>";
+echo ( extension_loaded( 'mbstring' )) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_CURL") .":</label><text>";
+echo ( function_exists('curl_init')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_FSOCKOPEN") .":</label><text>";
+echo ( function_exists('fsockopen')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_URLFOPEN") .":</label><text>";
+echo ( ini_get('allow_url_fopen')) ? planet_constant("AM_ON") : planet_constant("AM_OFF");
+echo "</text><br />";
+echo "</div>";
+echo "</fieldset>";
+
+echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant("AM_STATS") . "</legend>";
+echo "<div style='padding: 8px;'>";
+$category_handler =& xoops_getmodulehandler('category', $GLOBALS["moddirname"]);
+$category_count = $category_handler->getCount();
+$blog_handler =& xoops_getmodulehandler("blog", $GLOBALS["moddirname"]);
+$blog_count = $blog_handler->getCount();
+$article_handler =& xoops_getmodulehandler('article', $GLOBALS["moddirname"]);
+$article_count = $article_handler->getCount();
+$criteria = new Criteria("blog_status", 0);
+$blog_count_pending = $blog_handler->getCount($criteria);
+echo "<label>" . planet_constant("AM_TOTAL_CATEGORIES") .":</label><text>". $category_count;
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_TOTAL_BLOGS") .":</label><text>". $blog_count;
+if($blog_count_pending>0) echo " (<font color=\"red\">". $blog_count_pending."</font>)";
+echo "</text><br />";
+echo "<label>" . planet_constant("AM_TOTAL_ARTICLES") .":</label><text>".$article_count;
+echo "</text><br />";
+echo "</div>";
+echo "</fieldset>";
+
+xoops_cp_footer();
+?>
\ No newline at end of file
Property changes on: XoopsModules/planet/trunk/planet/admin/main.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/planet/trunk/planet/admin/menu.php
===================================================================
--- XoopsModules/planet/trunk/planet/admin/menu.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/admin/menu.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,25 +21,59 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
if (!defined('XOOPS_ROOT_PATH')){ exit(); }
-global $adminmenu;
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
$adminmenu = array();
+$i=0;
+$adminmenu[$i]["title"] = _AM_MODULEADMIN_HOME;
+$adminmenu[$i]['link'] = "admin/index.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
+$i++;
+$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_INDEX");
+$adminmenu[$i]['link'] = "admin/main.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/manage.png';
-$adminmenu[]= array("link"=>"admin/index.php",
- "title"=>planet_constant("MI_ADMENU_INDEX"));
-$adminmenu[]= array("link"=>"admin/admin.category.php",
- "title"=>planet_constant("MI_ADMENU_CATEGORY"));
-$adminmenu[]= array("link"=>"admin/admin.blog.php",
- "title"=>planet_constant("MI_ADMENU_BLOG"));
-$adminmenu[]= array("link"=>"admin/admin.article.php",
- "title"=>planet_constant("MI_ADMENU_ARTICLE"));
-$adminmenu[]= array("link"=>"admin/admin.block.php",
- "title"=>planet_constant("MI_ADMENU_BLOCK"));
-$adminmenu[]= array("link"=>"admin/about.php",
- "title"=>planet_constant("MI_ADMENU_ABOUT"));
-?>
\ No newline at end of file
+$i++;
+$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_CATEGORY");
+$adminmenu[$i]['link'] = "admin/admin.category.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png';
+$i++;
+$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_BLOG");
+$adminmenu[$i]['link'] = "admin/admin.blog.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/translations.png';
+$i++;
+$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_ARTICLE");
+$adminmenu[$i]['link'] = "admin/admin.article.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/content.png';
+//$i++;
+//$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_BLOCK");
+//$adminmenu[$i]['link'] = "admin/admin.block.php";
+//$adminmenu[$i]["icon"] = $pathIcon32 . '/manage.png';
+$i++;
+$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png';
Modified: XoopsModules/planet/trunk/planet/blocks/block.php
===================================================================
--- XoopsModules/planet/trunk/planet/blocks/block.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/blocks/block.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
@@ -60,6 +60,7 @@
global $xoopsDB;
planet_define_url_delimiter();
+ $blogs = array();
$block = array();
$select = "art_id";
$disp_tag = "";
@@ -264,8 +265,9 @@
$blogs[] = $_art;
unset($blog, $_art);
}
+if (isset($block["blogs"])) {
$block["blogs"] = $blogs;
-
+ }
$block["dirname"] = $GLOBALS["moddirname"];
return $block;
}
Deleted: XoopsModules/planet/trunk/planet/changelog.txt
===================================================================
--- XoopsModules/planet/trunk/planet/changelog.txt 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/changelog.txt 2013-08-14 06:37:13 UTC (rev 11910)
@@ -1,24 +0,0 @@
-Changelog 2.02
-Oct 29th, 2006
-==============
-Bugfix for URLs in template
-Made clonable
-
-
-Changelog 2.0
-July 9th, 2006
-=============
-Validated with XOOPS 2.0.14
-
-Jan 29th, 2006
-=============
-Compatible with XOOPS 2.0, 2.2, 2.3
-
-2005-11-18
-Planet 1.01 release
-1. bugfixes
-2. "empty blog" for admin
-3. known issue: archive view having problem with missing language definition and disabled
-
-2005-11-15
-Planet 1.00 release
\ No newline at end of file
Modified: XoopsModules/planet/trunk/planet/class/article.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/article.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/article.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
/**
@@ -75,7 +75,7 @@
$this->initVar("dosmiley", XOBJ_DTYPE_INT, 1);
$this->initVar("doxcode", XOBJ_DTYPE_INT, 1);
$this->initVar("doimage", XOBJ_DTYPE_INT, 1);
- $this->initVar("dobr", XOBJ_DTYPE_INT, 0);
+ $this->initVar("dobr", XOBJ_DTYPE_INT, 1);
}
/**
@@ -338,7 +338,7 @@
$ret[$myrow[$this->keyName]] = $object;
}else{
foreach($myrow as $key=>$val){
- $ret[$myrow[$this->keyName]][$key] = $val;
+ $ret[$myrow[$this->keyName]][$key] = ($object->vars[$key]["changed"])?$object->getVar($key):$val;
}
}
unset($object);
Modified: XoopsModules/planet/trunk/planet/class/blog.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/blog.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/blog.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
/**
@@ -247,7 +247,9 @@
/* parse items */
$res = $this->parse($content, $blog->getVar("blog_charset"), array("items"));
+ //xoops_message($res);
$items = $res["items"];
+ //xoops_message($items);
$blog_time = 0;
$crit = $blog->getVar("blog_time");
$articles = array();
@@ -318,10 +320,11 @@
}
require_once XOOPS_ROOT_PATH."/modules/".$GLOBALS["moddirname"]."/class/xmlparser.php";
- $parser = new XmlParser( $content, $charset, empty($xlanguage["charset_base"]) ? _CHARSET : $xlanguage["charset_base"], $tags );
+ $parser = new XmlParser( $content, $charset, _CHARSET, $tags );
if (!$parser) {
return $res;
}
+ //xoops_message($parser);
foreach($tags as $tag){
$res[$tag] = $parser->{$tag};
}
Modified: XoopsModules/planet/trunk/planet/class/bookmark.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/bookmark.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/bookmark.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
/**
Modified: XoopsModules/planet/trunk/planet/class/category.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/category.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/category.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
/**
Modified: XoopsModules/planet/trunk/planet/class/feedcreator.class.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/feedcreator.class.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/feedcreator.class.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
@@ -66,11 +66,11 @@
added a switch to select an external stylesheet (thanks to Pascal Van Hecke)
changed default content-type to application/xml
added character encoding setting
- fixed numerous smaller bugs (thanks to S\xF6ren Fuhrmann of golem.de)
+ fixed numerous smaller bugs (thanks to S�ren Fuhrmann of golem.de)
improved changing ATOM versions handling (thanks to August Trometer)
- improved the UniversalFeedCreator's useCached method (thanks to S\xF6ren Fuhrmann of golem.de)
- added charset output in HTTP headers (thanks to S\xF6ren Fuhrmann of golem.de)
- added Slashdot namespace to RSS 1.0 (thanks to S\xF6ren Fuhrmann of golem.de)
+ improved the UniversalFeedCreator's useCached method (thanks to S�ren Fuhrmann of golem.de)
+ added charset output in HTTP headers (thanks to S�ren Fuhrmann of golem.de)
+ added Slashdot namespace to RSS 1.0 (thanks to S�ren Fuhrmann of golem.de)
v1.6 05-10-04
added stylesheet to RSS 1.0 feeds
@@ -88,7 +88,7 @@
considered beta due to some internal changes
v1.5.1 01-27-04
- fixed some RSS 1.0 glitches (thanks to St\xE9phane Vanpoperynghe)
+ fixed some RSS 1.0 glitches (thanks to St�phane Vanpoperynghe)
fixed some inconsistencies between documentation and code (thanks to Timothy Martin)
v1.5 01-06-04
Modified: XoopsModules/planet/trunk/planet/class/rate.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/rate.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/rate.php 2013-08-14 06:37:13 UTC (rev 11910)
@@ -21,7 +21,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
// Author: phppp (D.J., in...@gm...) //
-// URL: http://xoopsforge.com, http://xoops.org.cn //
+// URL: http://xoops.org //
// Project: Article Project //
// ------------------------------------------------------------------------ //
Modified: XoopsModules/planet/trunk/planet/class/xml.php
===================================================================
--- XoopsModules/planet/trunk/planet/class/xml.php 2013-08-14 06:26:06 UTC (rev 11909)
+++ XoopsModules/planet/trunk/planet/class/xml.php 2013-08-14 06:37:13 UTC (rev 11910)
...
[truncated message content] |
|
From: <be...@us...> - 2013-08-14 06:26:09
|
Revision: 11909
http://sourceforge.net/p/xoops/svn/11909
Author: beckmi
Date: 2013-08-14 06:26:06 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
tagging old release 2.02
Added Paths:
-----------
XoopsModules/planet/releases/2.02/planet/
|
|
From: <be...@us...> - 2013-08-14 06:24:17
|
Revision: 11908
http://sourceforge.net/p/xoops/svn/11908
Author: beckmi
Date: 2013-08-14 06:24:14 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Adding folder for an old release 2.02
Added Paths:
-----------
XoopsModules/planet/releases/2.02/
|
|
From: <be...@us...> - 2013-08-14 06:09:20
|
Revision: 11907
http://sourceforge.net/p/xoops/svn/11907
Author: beckmi
Date: 2013-08-14 06:09:14 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
added: breaks in HTML code for bettel look of categories (edipinho)
Modified Paths:
--------------
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_categories.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_categories.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_categories.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_categories.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo_in_list.html
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt 2013-08-14 06:09:14 UTC (rev 11907)
@@ -6,7 +6,8 @@
- fix: missing Smarty variables (mamba)
- fix: blocks when there is no Tag module (mamba)
- fix: missing variables in blocks (mamba)
-- added: delete icons in photo views
+- added: delete icons in photo views (mamba)
+- added: breaks in HTML code for bettel look of categories (edipinho)
2012-06-26 v3.06
- fixed many bugs (cesag/black_beard)
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_categories.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_categories.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_categories.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -8,7 +8,7 @@
</a>
<{else}>
<a href="<{$mod_url}>/viewcat.php?cid=<{$cat.cid}>">
- <img src="<{$mod_url}>/images/folder32.gif" width="32" height="32" border="0" alt="" />
+ <img src="<{xoModuleIcons32 category.png}>" width="32" height="32" border="0" alt="" />
</a>
<{/if}>
</td>
@@ -17,9 +17,9 @@
<br />
<{foreach from=$cat.subcategories item=subcat}>
<{if $subcat.number_of_subcat}>
- <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{$mod_url}>/images/folder16.gif" width="16" height="16" alt="" /><{$subcat.title}><img src='<{$mod_url}>/images/subcat.gif' width='15' height='15' /></a>
+ <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{xoModuleIcons16 topic.png}>" width="16" height="16" alt="" /><{$subcat.title}><img src='<{$mod_url}>/images/subcat.gif' width='15' height='15' /></a>
<{else}>
- <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{$mod_url}>/images/folder16.gif" width="16" height="16" alt="" /><{$subcat.title}></a> (<{$subcat.photo_small_sum}>)
+ <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{xoModuleIcons16 topic.png}>" width="16" height="16" alt="" /><{$subcat.title}></a> (<{$subcat.photo_small_sum}>)
<{/if}>
<{/foreach}>
</td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -76,7 +76,7 @@
<{* CATEGORY *}>
<{if $photo.cat_title}>
- <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{$mod_url}>/images/folder16.gif' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
+ <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{xoModuleIcons16 topic.png}>' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
<{/if}>
<{* LAST UPDATED *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -67,7 +67,7 @@
<{* CATEGORY *}>
<{if $photo.cat_title}>
- <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{$mod_url}>/images/folder16.gif' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
+ <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{xoModuleIcons16 topic.png}>' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
<{/if}>
<{* LAST UPDATED *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_categories.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_categories.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_categories.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -8,7 +8,7 @@
</a>
<{else}>
<a href="<{$mod_url}>/viewcat.php?cid=<{$cat.cid}>">
- <img src="<{$mod_url}>/images/folder32.gif" width="32" height="32" border="0" alt="" />
+ <img src="<{xoModuleIcons32 category.png}>" width="32" height="32" border="0" alt="" />
</a>
<{/if}>
</td>
@@ -17,9 +17,9 @@
<br />
<{foreach from=$cat.subcategories item=subcat}>
<{if $subcat.number_of_subcat}>
- <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{$mod_url}>/images/folder16.gif" width="16" height="16" alt="" /><{$subcat.title}><img src='<{$mod_url}>/images/subcat.gif' width='15' height='15' /></a>
+ <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{xoModuleIcons16 topic.png}>" width="16" height="16" alt="" /><{$subcat.title}><img src='<{$mod_url}>/images/subcat.gif' width='15' height='15' /></a>
<{else}>
- <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{$mod_url}>/images/folder16.gif" width="16" height="16" alt="" /><{$subcat.title}></a> (<{$subcat.photo_small_sum}>)
+ <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{xoModuleIcons16 topic.png}>" width="16" height="16" alt="" /><{$subcat.title}></a> (<{$subcat.photo_small_sum}>)
<{/if}>
<{/foreach}>
</td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -76,7 +76,7 @@
<{* CATEGORY *}>
<{if $photo.cat_title}>
- <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{$mod_url}>/images/folder16.gif' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
+ <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{xoModuleIcons16 topic.png}>' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
<{/if}>
<{* LAST UPDATED *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -67,7 +67,7 @@
<{* CATEGORY *}>
<{if $photo.cat_title}>
- <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{$mod_url}>/images/folder16.gif' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
+ <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{xoModuleIcons16 topic.png}>' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
<{/if}>
<{* LAST UPDATED *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_categories.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_categories.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_categories.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -8,7 +8,7 @@
</a>
<{else}>
<a href="<{$mod_url}>/viewcat.php?cid=<{$cat.cid}>">
- <img src="<{$mod_url}>/images/folder32.gif" width="32" height="32" border="0" alt="" />
+ <img src="<{xoModuleIcons32 category.png}>" width="32" height="32" border="0" alt="" />
</a>
<{/if}>
</td>
@@ -17,9 +17,9 @@
<br />
<{foreach from=$cat.subcategories item=subcat}>
<{if $subcat.number_of_subcat}>
- <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{$mod_url}>/images/folder16.gif" width="16" height="16" alt="" /><{$subcat.title}><img src='<{$mod_url}>/images/subcat.gif' width='15' height='15' /></a>
+ <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{xoModuleIcons16 topic.png}>" width="16" height="16" alt="" /><{$subcat.title}><img src='<{$mod_url}>/images/subcat.gif' width='15' height='15' /></a>
<{else}>
- <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{$mod_url}>/images/folder16.gif" width="16" height="16" alt="" /><{$subcat.title}></a> (<{$subcat.photo_small_sum}>)
+ <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{xoModuleIcons16 topic.png}>" width="16" height="16" alt="" /><{$subcat.title}></a> (<{$subcat.photo_small_sum}>)
<{/if}>
<{/foreach}>
</td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -76,7 +76,7 @@
<{* CATEGORY *}>
<{if $photo.cat_title}>
- <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{$mod_url}>/images/folder16.gif' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
+ <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{xoModuleIcons16 topic.png}>' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
<{/if}>
<{* LAST UPDATED *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -67,7 +67,7 @@
<{* CATEGORY *}>
<{if $photo.cat_title}>
- <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{$mod_url}>/images/folder16.gif' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
+ <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{xoModuleIcons16 topic.png}>' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
<{/if}>
<{* LAST UPDATED *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_categories.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_categories.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_categories.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -8,7 +8,7 @@
</a>
<{else}>
<a href="<{$mod_url}>/viewcat.php?cid=<{$cat.cid}>">
- <img src="<{$mod_url}>/images/folder32.gif" width="32" height="32" border="0" alt="" />
+ <img src="<{xoModuleIcons32 category.png}>" width="32" height="32" border="0" alt="" />
</a>
<{/if}>
</td>
@@ -17,12 +17,12 @@
<br />
<{foreach from=$cat.subcategories item=subcat}>
<{if $subcat.number_of_subcat}>
- <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{$mod_url}>/images/folder16.gif" width="16" height="16" alt="" /><{$subcat.title}><img src='<{$mod_url}>/images/subcat.gif' width='15' height='15' /></a>
+ <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{xoModuleIcons16 topic.png}>" width="16" height="16" alt="" /><{$subcat.title}><img src='<{$mod_url}>/images/subcat.gif' width='15' height='15' /></a> <br />
<{else}>
- <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{$mod_url}>/images/folder16.gif" width="16" height="16" alt="" /><{$subcat.title}></a> (<{$subcat.photo_small_sum}>)
+ <a href="<{$mod_url}>/viewcat.php?cid=<{$subcat.cid}>"><img src="<{xoModuleIcons16 topic.png}>" width="16" height="16" alt="" /><{$subcat.title}></a> (<{$subcat.photo_small_sum}>) <br />
<{/if}>
<{/foreach}>
- </td>
+ </td><br />
<{if ($count+1) is div by 3}>
</tr><tr>
<{/if}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -82,7 +82,7 @@
<{* CATEGORY *}>
<{if $photo.cat_title}>
- <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{$mod_url}>/images/folder16.gif' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
+ <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{xoModuleIcons16 topic.png}>' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
<{/if}>
<{* LAST UPDATED *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo_in_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo_in_list.html 2013-08-14 05:54:12 UTC (rev 11906)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo_in_list.html 2013-08-14 06:09:14 UTC (rev 11907)
@@ -72,7 +72,7 @@
<{* CATEGORY *}>
<{if $photo.cat_title}>
- <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{$mod_url}>/images/folder16.gif' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
+ <a href='<{$mod_url}>/viewcat.php?cid=<{$photo.cid}>'><img src='<{xoModuleIcons16 topic.png}>' width='16' height='16' alt='<{$lang_category}>' title='<{$lang_category}>' border='0' /><{$photo.cat_title}></a>
<{/if}>
<{* LAST UPDATED *}>
|
|
From: <be...@us...> - 2013-08-14 05:54:15
|
Revision: 11906
http://sourceforge.net/p/xoops/svn/11906
Author: beckmi
Date: 2013-08-14 05:54:12 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
fixing some minor issues (see changelog.txt), updating to 2.32 Beta 1
Modified Paths:
--------------
XoopsModules/tag/trunk/tag/admin/about.php
XoopsModules/tag/trunk/tag/admin/admin.tag.php
XoopsModules/tag/trunk/tag/class/tag.php
XoopsModules/tag/trunk/tag/docs/changelog.txt
XoopsModules/tag/trunk/tag/docs/lang_diff.txt
XoopsModules/tag/trunk/tag/language/english/admin.php
XoopsModules/tag/trunk/tag/view.tag.php
XoopsModules/tag/trunk/tag/xoops_version.php
Added Paths:
-----------
XoopsModules/tag/trunk/tag/include/index.html
XoopsModules/tag/trunk/tag/plugin/index.html
XoopsModules/tag/trunk/tag/plugin/myalbum.php
XoopsModules/tag/trunk/tag/plugin/myalbum0.php
XoopsModules/tag/trunk/tag/plugin/myalbum1.php
XoopsModules/tag/trunk/tag/plugin/myalbum2.php
XoopsModules/tag/trunk/tag/templates/blocks/index.html
Modified: XoopsModules/tag/trunk/tag/admin/about.php
===================================================================
--- XoopsModules/tag/trunk/tag/admin/about.php 2013-08-14 05:25:33 UTC (rev 11905)
+++ XoopsModules/tag/trunk/tag/admin/about.php 2013-08-14 05:54:12 UTC (rev 11906)
@@ -10,7 +10,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* @copyright The XOOPS Project (http://www.xoops.org)
- * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
+ * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html)
* @package Tag
* @since 2.5.0
* @author Mage, Mamba
Modified: XoopsModules/tag/trunk/tag/admin/admin.tag.php
===================================================================
--- XoopsModules/tag/trunk/tag/admin/admin.tag.php 2013-08-14 05:25:33 UTC (rev 11905)
+++ XoopsModules/tag/trunk/tag/admin/admin.tag.php 2013-08-14 05:54:12 UTC (rev 11906)
@@ -30,14 +30,20 @@
//echo function_exists("loadModuleAdminMenu") ? loadModuleAdminMenu(1) : "";
echo $indexAdmin->addNavigation('admin.tag.php');
-$limit = 10;
+global $xoopsModuleConfig;
+
+$limit = $xoopsModuleConfig['items_perpage'];
$modid = intval( empty($_GET['modid']) ? @$_POST['modid'] : $_GET['modid'] );
$start = intval( empty($_GET['start']) ? @$_POST['start'] : $_GET['start'] );
-$status = intval( empty($_GET['status']) ? @$_POST['status'] : $_GET['status'] );
+//$status = intval( empty($_GET['status']) ? @$_POST['status'] : $_GET['status']);
+$status = intval( (isset($_GET['status']) && $_GET['status'] >-1) ? $_GET['status'] : -1);
+
+
$tag_handler =& xoops_getmodulehandler("tag", $xoopsModule->getVar("dirname"));
if (!empty($_POST['tags'])) {
+ $msgDBUpdated='';
foreach ($_POST['tags'] as $tag => $tag_status) {
$tag_obj =& $tag_handler->get($tag);
if (!is_object($tag_obj) || !$tag_obj->getVar("tag_id")) continue;
@@ -46,9 +52,10 @@
} elseif ($tag_status != $tag_obj->getVar("tag_status")) {
$tag_obj->setVar("tag_status", $tag_status);
$tag_handler->insert($tag_obj);
+ $msgDBUpdated = _AM_TAG_DB_UPDATED;
}
}
- redirect_header("admin.tag.php?modid={$modid}&start={$start}&status={$status}", 2);
+ redirect_header("admin.tag.php?modid={$modid}&start={$start}&status={$status}", 2, $msgDBUpdated);
exit();
}
@@ -79,8 +86,8 @@
$tray->addElement($mod_select);
$status_select = new XoopsFormRadio("", 'status', $status);
$status_select->addOption(-1, _ALL);
-$status_select->addOption(0, TAG_AM_ACTIVE);
-$status_select->addOption(1, TAG_AM_INACTIVE);
+$status_select->addOption(1, TAG_AM_ACTIVE);
+$status_select->addOption(0, TAG_AM_INACTIVE);
$tray->addElement($status_select);
$tray->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
$opform->addElement($tray);
@@ -102,10 +109,10 @@
$form_tags = "<form name='tags' method='post' action='" . xoops_getenv("PHP_SELF") . "'>";
$form_tags .= "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
$form_tags .= "<tr align='center'>";
-$form_tags .= "<td class='bg3'>" . TAG_AM_TERM . "</td>";
-$form_tags .= "<td class='bg3' width='10%'>" . TAG_AM_ACTIVE . "</td>";
-$form_tags .= "<td class='bg3' width='10%'>" . TAG_AM_INACTIVE . "</td>";
-$form_tags .= "<td class='bg3' width='10%'>" . _DELETE . "</td>";
+$form_tags .= "<th class='bg3'>" . TAG_AM_TERM . "</td>";
+$form_tags .= "<th class='bg3' width='10%'>" . TAG_AM_ACTIVE . "</td>";
+$form_tags .= "<th class='bg3' width='10%'>" . TAG_AM_INACTIVE . "</td>";
+$form_tags .= "<th class='bg3' width='10%'>" . _DELETE . "</td>";
$form_tags .= "</tr>";
if (empty($tags)) {
$form_tags .= "<tr><td colspan='4'>" . _NONE . "</td></tr>";
@@ -115,8 +122,8 @@
foreach (array_keys($tags) as $key) {
$form_tags .= "<tr class='" . $class_tr[(++$i) % 2] . "'>";
$form_tags .= "<td>" . $tags[$key]["term"] . "</td>";
- $form_tags .= "<td align='center'><input type='radio' name='tags[{$key}]' value='0' " . ( $tags[$key]["status"] ? "" : " 'checked' ") . "></td>";
- $form_tags .= "<td align='center'><input type='radio' name='tags[{$key}]' value='1' " . ( $tags[$key]["status"] ? " 'checked' " : "") . "></td>";
+ $form_tags .= "<td align='center'><input type='radio' name='tags[{$key}]' value='1' " . ( $tags[$key]["status"] ? "checked" : " '' ") . "></td>";
+ $form_tags .= "<td align='center'><input type='radio' name='tags[{$key}]' value='0' " . ( $tags[$key]["status"] ? " '' " : "checked") . "></td>";
$form_tags .= "<td align='center'><input type='radio' name='tags[{$key}]' value='-1'></td>";
$form_tags .= "</tr>";
}
@@ -140,4 +147,3 @@
echo $form_tags;
include "admin_footer.php";
-//xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/tag/trunk/tag/class/tag.php
===================================================================
--- XoopsModules/tag/trunk/tag/class/tag.php 2013-08-14 05:25:33 UTC (rev 11905)
+++ XoopsModules/tag/trunk/tag/class/tag.php 2013-08-14 05:54:12 UTC (rev 11906)
@@ -316,39 +316,36 @@
$order = strtoupper($order);
$sort = strtolower($sort);
- switch($sort) {
- case "a":
- case "alphabet":
- $order = ("DESC" != $order) ? "ASC" : "DESC";
- $sql .= " ORDER BY o.tag_term {$order}";
- break;
- case "id":
- case "time":
- $order = ("ASC" != $order) ? "DESC" : "ASC";
- $sql .= " ORDER BY o.{$this->keyName} {$order}";
- break;
- case "c":
- case "count":
- default:
- $order = ("ASC" != $order) ? "DESC" : "ASC";
- $sql .= " ORDER BY count {$order}";
- break;
+ switch ($sort) {
+ case "a":
+ case "alphabet":
+ $order = ("DESC" != $order) ? "ASC" : "DESC";
+ $sql .= " ORDER BY o.tag_term {$order}";
+ break;
+ case "id":
+ case "time":
+ $order = ("ASC" != $order) ? "DESC" : "ASC";
+ $sql .= " ORDER BY o.{$this->keyName} {$order}";
+ break;
+ case "c":
+ case "count":
+ default:
+ $order = ("ASC" != $order) ? "DESC" : "ASC";
+ $sql .= " ORDER BY count {$order}";
+ break;
}
-
- if ( ($result = $this->db->query($sql, $limit, $start)) == false) {
+
+ if (($result = $this->db->query($sql, $limit, $start)) == false) {
//xoops_error($this->db->error());
return null;
}
- while($myrow = $this->db->fetchArray($result)) {
- $ret[$myrow[$this->keyName]] = array(
- "id" => $myrow[$this->keyName],
- "term" => htmlspecialchars($myrow["tag_term"]),
- "status"=> $myrow["tag_status"],
- "modid" => $myrow["tag_modid"],
- "count" => intval($myrow["count"]),
- );
+ while ($myrow = $this->db->fetchArray($result)) {
+ $ret[$myrow[$this->keyName]] = array("id" => $myrow[$this->keyName],
+ "term" => htmlspecialchars($myrow["tag_term"]),
+ "status" => $myrow["tag_status"], "modid" => $myrow["tag_modid"],
+ "count" => intval($myrow["count"]),);
}
-
+
return $ret;
}
Modified: XoopsModules/tag/trunk/tag/docs/changelog.txt
===================================================================
--- XoopsModules/tag/trunk/tag/docs/changelog.txt 2013-08-14 05:25:33 UTC (rev 11905)
+++ XoopsModules/tag/trunk/tag/docs/changelog.txt 2013-08-14 05:54:12 UTC (rev 11906)
@@ -1,8 +1,15 @@
-2.31 Final (Dec. 12, 2011)
+2.32 Beta 1 (2013-08-12)
=========================
++ fixed pagination (mamba)
++ fixed updates and refresh of links in admin (mamba)
++ Items per page taken now from Preferences (mamba)
++ standardized look of the table in Tag Admin
+
+
+2.31 Final (Dec. 12, 2012)
+=========================
+ small code adjustments
-
2.31 Beta (July 10, 2011)
=================================
- removed all icon files and point them to /Frameworks/moduleclasses (Mamba)
Modified: XoopsModules/tag/trunk/tag/docs/lang_diff.txt
===================================================================
--- XoopsModules/tag/trunk/tag/docs/lang_diff.txt 2013-08-14 05:25:33 UTC (rev 11905)
+++ XoopsModules/tag/trunk/tag/docs/lang_diff.txt 2013-08-14 05:54:12 UTC (rev 11906)
@@ -1,4 +1,16 @@
LANGUAGE DIFFERENCES
=====================
-Below are language differences from a version to next version.
\ No newline at end of file
+Below are language differences from a version to next version.
+
+Legend :
++ Added
+- Removed
+* Modified
+
+2.32
+==============
+
+main.php:
+
++ define('_AM_TAG_DB_UPDATED', 'Database Updated Successfully');
Added: XoopsModules/tag/trunk/tag/include/index.html
===================================================================
--- XoopsModules/tag/trunk/tag/include/index.html (rev 0)
+++ XoopsModules/tag/trunk/tag/include/index.html 2013-08-14 05:54:12 UTC (rev 11906)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/tag/trunk/tag/language/english/admin.php
===================================================================
--- XoopsModules/tag/trunk/tag/language/english/admin.php 2013-08-14 05:25:33 UTC (rev 11905)
+++ XoopsModules/tag/trunk/tag/language/english/admin.php 2013-08-14 05:54:12 UTC (rev 11906)
@@ -55,4 +55,8 @@
//define('_AM_TAG_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
// Text for Admin footer
-define("_AM_TAG_FOOTER","<div class='center smallsmall italic pad5'>Tag Module is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
+define("_AM_TAG_FOOTER","<div class='center smallsmall italic pad5'>Tag Module is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
+
+//2.32
+define('_AM_TAG_DB_UPDATED', 'Database Updated Successfully');
+
Added: XoopsModules/tag/trunk/tag/plugin/index.html
===================================================================
--- XoopsModules/tag/trunk/tag/plugin/index.html (rev 0)
+++ XoopsModules/tag/trunk/tag/plugin/index.html 2013-08-14 05:54:12 UTC (rev 11906)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/tag/trunk/tag/plugin/myalbum.php
===================================================================
--- XoopsModules/tag/trunk/tag/plugin/myalbum.php (rev 0)
+++ XoopsModules/tag/trunk/tag/plugin/myalbum.php 2013-08-14 05:54:12 UTC (rev 11906)
@@ -0,0 +1,112 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 1.0.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ * @package tag
+ */
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
+
+/**
+ * Get item fields:
+ * title
+ * content
+ * time
+ * link
+ * uid
+ * uname
+ * tags
+ *
+ * @var array $items associative array of items: [modid][catid][itemid]
+ *
+ * @return boolean
+ *
+ */
+function myalbum_tag_iteminfo(&$items)
+{
+ if (empty($items) || !is_array($items)) {
+ return false;
+ }
+
+ $items_id = array();
+ foreach (array_keys($items) as $cat_id) {
+ // Some handling here to build the link upon catid
+ // catid is not used in myalbum, so just skip it
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ // In myalbum, the item_id is "topic_id"
+ $items_id[] = intval($item_id);
+ }
+ }
+ $item_handler =& xoops_getmodulehandler('photos', 'myalbum');
+ $text_handler =& xoops_getmodulehandler('text', 'myalbum');
+ $items_obj = $item_handler->getObjects(new Criteria("lid", "(" . implode(", ", $items_id) . ")", "IN"), true);
+
+ foreach (array_keys($items) as $cat_id) {
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ $item_obj =& $items_obj[$item_id];
+ $text = $text_handler->get($item_id);
+ $items[$cat_id][$item_id] = array(
+ "title" => $item_obj->getVar("title"),
+ "uid" => $item_obj->getVar("submitter"),
+ "link" => "photo.php?lid={$item_id}&cid=".$item_obj->getVar("cid"),
+ "time" => $item_obj->getVar("date"),
+ "tags" => tag_parse_tag($item_obj->getVar("tags", "n")),
+ "content" => $GLOBALS['myts']->displayTarea($text->getVar('description'),1,1,1,1,1,1),
+ );
+ }
+ }
+ unset($items_obj);
+}
+
+/**
+ * Remove orphan tag-item links
+ *
+ * @return boolean
+ *
+ */
+function myalbum_tag_synchronization($mid)
+{
+ $item_handler =& xoops_getmodulehandler("photos", "myalbum");
+ $link_handler =& xoops_getmodulehandler("link", "tag");
+
+ /* clear tag-item links */
+ if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
+ $sql = " DELETE FROM {$link_handler->table}" .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( tag_itemid NOT IN " .
+ " ( SELECT DISTINCT {$item_handler->keyName} " .
+ " FROM {$item_handler->table} " .
+ " WHERE {$item_handler->table}.approved > 0" .
+ " ) " .
+ " )";
+ else:
+ $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" .
+ " LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( aa.{$item_handler->keyName} IS NULL" .
+ " OR aa.approved < 1" .
+ " )";
+ endif;
+ if (!$result = $link_handler->db->queryF($sql)) {
+ //xoops_error($link_handler->db->error());
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/tag/trunk/tag/plugin/myalbum.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/tag/trunk/tag/plugin/myalbum0.php
===================================================================
--- XoopsModules/tag/trunk/tag/plugin/myalbum0.php (rev 0)
+++ XoopsModules/tag/trunk/tag/plugin/myalbum0.php 2013-08-14 05:54:12 UTC (rev 11906)
@@ -0,0 +1,112 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 1.0.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ * @package tag
+ */
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
+
+/**
+ * Get item fields:
+ * title
+ * content
+ * time
+ * link
+ * uid
+ * uname
+ * tags
+ *
+ * @var array $items associative array of items: [modid][catid][itemid]
+ *
+ * @return boolean
+ *
+ */
+function myalbum0_tag_iteminfo(&$items)
+{
+ if (empty($items) || !is_array($items)) {
+ return false;
+ }
+
+ $items_id = array();
+ foreach (array_keys($items) as $cat_id) {
+ // Some handling here to build the link upon catid
+ // catid is not used in myalbum0, so just skip it
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ // In myalbum0, the item_id is "topic_id"
+ $items_id[] = intval($item_id);
+ }
+ }
+ $item_handler =& xoops_getmodulehandler('photos', 'myalbum0');
+ $text_handler =& xoops_getmodulehandler('text', 'myalbum0');
+ $items_obj = $item_handler->getObjects(new Criteria("lid", "(" . implode(", ", $items_id) . ")", "IN"), true);
+
+ foreach (array_keys($items) as $cat_id) {
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ $item_obj =& $items_obj[$item_id];
+ $text = $text_handler->get($item_id);
+ $items[$cat_id][$item_id] = array(
+ "title" => $item_obj->getVar("title"),
+ "uid" => $item_obj->getVar("submitter"),
+ "link" => "photo.php?lid={$item_id}&cid=".$item_obj->getVar("cid"),
+ "time" => $item_obj->getVar("date"),
+ "tags" => tag_parse_tag($item_obj->getVar("tags", "n")),
+ "content" => $GLOBALS['myts']->displayTarea($text->getVar('description'),1,1,1,1,1,1),
+ );
+ }
+ }
+ unset($items_obj);
+}
+
+/**
+ * Remove orphan tag-item links
+ *
+ * @return boolean
+ *
+ */
+function myalbum0_tag_synchronization($mid)
+{
+ $item_handler =& xoops_getmodulehandler("photos", "myalbum0");
+ $link_handler =& xoops_getmodulehandler("link", "tag");
+
+ /* clear tag-item links */
+ if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
+ $sql = " DELETE FROM {$link_handler->table}" .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( tag_itemid NOT IN " .
+ " ( SELECT DISTINCT {$item_handler->keyName} " .
+ " FROM {$item_handler->table} " .
+ " WHERE {$item_handler->table}.approved > 0" .
+ " ) " .
+ " )";
+ else:
+ $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" .
+ " LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( aa.{$item_handler->keyName} IS NULL" .
+ " OR aa.approved < 1" .
+ " )";
+ endif;
+ if (!$result = $link_handler->db->queryF($sql)) {
+ //xoops_error($link_handler->db->error());
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/tag/trunk/tag/plugin/myalbum0.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/tag/trunk/tag/plugin/myalbum1.php
===================================================================
--- XoopsModules/tag/trunk/tag/plugin/myalbum1.php (rev 0)
+++ XoopsModules/tag/trunk/tag/plugin/myalbum1.php 2013-08-14 05:54:12 UTC (rev 11906)
@@ -0,0 +1,112 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 1.0.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ * @package tag
+ */
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
+
+/**
+ * Get item fields:
+ * title
+ * content
+ * time
+ * link
+ * uid
+ * uname
+ * tags
+ *
+ * @var array $items associative array of items: [modid][catid][itemid]
+ *
+ * @return boolean
+ *
+ */
+function myalbum1_tag_iteminfo(&$items)
+{
+ if (empty($items) || !is_array($items)) {
+ return false;
+ }
+
+ $items_id = array();
+ foreach (array_keys($items) as $cat_id) {
+ // Some handling here to build the link upon catid
+ // catid is not used in myalbum1, so just skip it
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ // In myalbum1, the item_id is "topic_id"
+ $items_id[] = intval($item_id);
+ }
+ }
+ $item_handler =& xoops_getmodulehandler('photos', 'myalbum1');
+ $text_handler =& xoops_getmodulehandler('text', 'myalbum1');
+ $items_obj = $item_handler->getObjects(new Criteria("lid", "(" . implode(", ", $items_id) . ")", "IN"), true);
+
+ foreach (array_keys($items) as $cat_id) {
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ $item_obj =& $items_obj[$item_id];
+ $text = $text_handler->get($item_id);
+ $items[$cat_id][$item_id] = array(
+ "title" => $item_obj->getVar("title"),
+ "uid" => $item_obj->getVar("submitter"),
+ "link" => "photo.php?lid={$item_id}&cid=".$item_obj->getVar("cid"),
+ "time" => $item_obj->getVar("date"),
+ "tags" => tag_parse_tag($item_obj->getVar("tags", "n")),
+ "content" => $GLOBALS['myts']->displayTarea($text->getVar('description'),1,1,1,1,1,1),
+ );
+ }
+ }
+ unset($items_obj);
+}
+
+/**
+ * Remove orphan tag-item links
+ *
+ * @return boolean
+ *
+ */
+function myalbum1_tag_synchronization($mid)
+{
+ $item_handler =& xoops_getmodulehandler("photos", "myalbum1");
+ $link_handler =& xoops_getmodulehandler("link", "tag");
+
+ /* clear tag-item links */
+ if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
+ $sql = " DELETE FROM {$link_handler->table}" .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( tag_itemid NOT IN " .
+ " ( SELECT DISTINCT {$item_handler->keyName} " .
+ " FROM {$item_handler->table} " .
+ " WHERE {$item_handler->table}.approved > 0" .
+ " ) " .
+ " )";
+ else:
+ $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" .
+ " LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( aa.{$item_handler->keyName} IS NULL" .
+ " OR aa.approved < 1" .
+ " )";
+ endif;
+ if (!$result = $link_handler->db->queryF($sql)) {
+ //xoops_error($link_handler->db->error());
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/tag/trunk/tag/plugin/myalbum1.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/tag/trunk/tag/plugin/myalbum2.php
===================================================================
--- XoopsModules/tag/trunk/tag/plugin/myalbum2.php (rev 0)
+++ XoopsModules/tag/trunk/tag/plugin/myalbum2.php 2013-08-14 05:54:12 UTC (rev 11906)
@@ -0,0 +1,112 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 1.0.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ * @package tag
+ */
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
+
+/**
+ * Get item fields:
+ * title
+ * content
+ * time
+ * link
+ * uid
+ * uname
+ * tags
+ *
+ * @var array $items associative array of items: [modid][catid][itemid]
+ *
+ * @return boolean
+ *
+ */
+function myalbum2_tag_iteminfo(&$items)
+{
+ if (empty($items) || !is_array($items)) {
+ return false;
+ }
+
+ $items_id = array();
+ foreach (array_keys($items) as $cat_id) {
+ // Some handling here to build the link upon catid
+ // catid is not used in myalbum2, so just skip it
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ // In myalbum2, the item_id is "topic_id"
+ $items_id[] = intval($item_id);
+ }
+ }
+ $item_handler =& xoops_getmodulehandler('photos', 'myalbum2');
+ $text_handler =& xoops_getmodulehandler('text', 'myalbum2');
+ $items_obj = $item_handler->getObjects(new Criteria("lid", "(" . implode(", ", $items_id) . ")", "IN"), true);
+
+ foreach (array_keys($items) as $cat_id) {
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ $item_obj =& $items_obj[$item_id];
+ $text = $text_handler->get($item_id);
+ $items[$cat_id][$item_id] = array(
+ "title" => $item_obj->getVar("title"),
+ "uid" => $item_obj->getVar("submitter"),
+ "link" => "photo.php?lid={$item_id}&cid=".$item_obj->getVar("cid"),
+ "time" => $item_obj->getVar("date"),
+ "tags" => tag_parse_tag($item_obj->getVar("tags", "n")),
+ "content" => $GLOBALS['myts']->displayTarea($text->getVar('description'),1,1,1,1,1,1),
+ );
+ }
+ }
+ unset($items_obj);
+}
+
+/**
+ * Remove orphan tag-item links
+ *
+ * @return boolean
+ *
+ */
+function myalbum2_tag_synchronization($mid)
+{
+ $item_handler =& xoops_getmodulehandler("photos", "myalbum2");
+ $link_handler =& xoops_getmodulehandler("link", "tag");
+
+ /* clear tag-item links */
+ if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
+ $sql = " DELETE FROM {$link_handler->table}" .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( tag_itemid NOT IN " .
+ " ( SELECT DISTINCT {$item_handler->keyName} " .
+ " FROM {$item_handler->table} " .
+ " WHERE {$item_handler->table}.approved > 0" .
+ " ) " .
+ " )";
+ else:
+ $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" .
+ " LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( aa.{$item_handler->keyName} IS NULL" .
+ " OR aa.approved < 1" .
+ " )";
+ endif;
+ if (!$result = $link_handler->db->queryF($sql)) {
+ //xoops_error($link_handler->db->error());
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/tag/trunk/tag/plugin/myalbum2.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/tag/trunk/tag/templates/blocks/index.html
===================================================================
--- XoopsModules/tag/trunk/tag/templates/blocks/index.html (rev 0)
+++ XoopsModules/tag/trunk/tag/templates/blocks/index.html 2013-08-14 05:54:12 UTC (rev 11906)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/tag/trunk/tag/view.tag.php
===================================================================
--- XoopsModules/tag/trunk/tag/view.tag.php 2013-08-14 05:25:33 UTC (rev 11905)
+++ XoopsModules/tag/trunk/tag/view.tag.php 2013-08-14 05:54:12 UTC (rev 11906)
@@ -139,7 +139,7 @@
$items_data[] = $item;
$uids[$item["uid"]] = 1;
}
-xoops_load("UserUtility");
+xoops_load('xoopsuserutility');
$users = XoopsUserUtility::getUnameFromIds(array_keys($uids));
foreach (array_keys($items_data) as $key) {
@@ -167,9 +167,9 @@
$xoopsTpl->assign("module_name", $GLOBALS["xoopsModule"]->getVar("name"));
$xoopsTpl->assign("tag_id", $tag_id);
-$xoopsTpl->assign("tag_term", urlencode($tag_term));
+$xoopsTpl->assign("tag_term", urlencode($tag_term));
$xoopsTpl->assign("tag_title", htmlspecialchars($tag_term));
-$xoopsTpl->assign("tag_page_title", $page_title);
+$xoopsTpl->assign("tag_page_title", $page_title);
$xoopsTpl->assign_by_ref("tag_addon", $tag_addon);
$xoopsTpl->assign_by_ref("tag_articles", $items_data);
$xoopsTpl->assign_by_ref("pagenav", $pagenav);
@@ -177,7 +177,7 @@
// Loading module meta data, NOT THE RIGHT WAY DOING IT
$xoopsTpl -> assign("xoops_pagetitle", $xoopsOption["xoops_pagetitle"]);
$xoopsTpl -> assign("xoops_module_header", $xoopsOption["xoops_module_header"]);
-$xoopsTpl -> assign("xoops_meta_description", $xoopsOption["xoops_pagetitle"]);
+$xoopsTpl -> assign("xoops_meta_description", $xoopsOption["xoops_pagetitle"]);
include_once dirname(__FILE__) . "/footer.php";
?>
\ No newline at end of file
Modified: XoopsModules/tag/trunk/tag/xoops_version.php
===================================================================
--- XoopsModules/tag/trunk/tag/xoops_version.php 2013-08-14 05:25:33 UTC (rev 11905)
+++ XoopsModules/tag/trunk/tag/xoops_version.php 2013-08-14 05:54:12 UTC (rev 11906)
@@ -27,7 +27,7 @@
$modversion = array();
$modversion["name"] = TAG_MI_NAME;
-$modversion["version"] = 2.31;
+$modversion["version"] = 2.32;
$modversion["description"] = TAG_MI_DESC;
$modversion["image"] = "images/logoTag.png";
$modversion["dirname"] = "tag";
@@ -45,14 +45,14 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion["release_date"] = "2011/12/12";
+$modversion["release_date"] = "2013/08/12";
$modversion["demo_site_url"] = "";
$modversion["demo_site_name"] = "";
$modversion["module_website_url"] = "http://xoops.org";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Final";
+$modversion["module_status"] = "Beta 1";
$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = "2.5.5";
+$modversion['min_xoops'] = "2.5.6";
$modversion['min_admin']='1.1';
$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
|
|
From: <be...@us...> - 2013-08-14 05:25:35
|
Revision: 11905
http://sourceforge.net/p/xoops/svn/11905
Author: beckmi
Date: 2013-08-14 05:25:33 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Adding missing plugins
Added Paths:
-----------
XoopsModules/myalbum/trunk/htdocs/modules/sitemap/
XoopsModules/myalbum/trunk/htdocs/modules/sitemap/plugin/
XoopsModules/myalbum/trunk/htdocs/modules/sitemap/plugin/myalbum.php
XoopsModules/myalbum/trunk/htdocs/modules/tag/
XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/
XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum.php
XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum0.php
XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum1.php
XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum2.php
Added: XoopsModules/myalbum/trunk/htdocs/modules/sitemap/plugin/myalbum.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/sitemap/plugin/myalbum.php (rev 0)
+++ XoopsModules/myalbum/trunk/htdocs/modules/sitemap/plugin/myalbum.php 2013-08-14 05:25:33 UTC (rev 11905)
@@ -0,0 +1,22 @@
+<?php
+
+if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
+
+$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+if( ! preg_match( '/^(\D+)(\d*)$/' , $mydirname , $regs ) ) echo ( "invalid dirname: " . htmlspecialchars( $mydirname ) ) ;
+$mydirnumber = $regs[2] === '' ? '' : intval( $regs[2] ) ;
+
+eval( '
+
+function b_sitemap_'.$mydirname.'(){
+ $xoopsDB =& Database::getInstance();
+
+ $block = sitemap_get_categoires_map($xoopsDB->prefix("myalbum'.$mydirnumber.'_cat"), "cid", "pid", "title", "viewcat.php?cid=", "title");
+
+ return $block;
+}
+
+' ) ;
+
+
+?>
\ No newline at end of file
Property changes on: XoopsModules/myalbum/trunk/htdocs/modules/sitemap/plugin/myalbum.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum.php (rev 0)
+++ XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum.php 2013-08-14 05:25:33 UTC (rev 11905)
@@ -0,0 +1,112 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 1.0.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ * @package tag
+ */
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
+
+/**
+ * Get item fields:
+ * title
+ * content
+ * time
+ * link
+ * uid
+ * uname
+ * tags
+ *
+ * @var array $items associative array of items: [modid][catid][itemid]
+ *
+ * @return boolean
+ *
+ */
+function myalbum_tag_iteminfo(&$items)
+{
+ if (empty($items) || !is_array($items)) {
+ return false;
+ }
+
+ $items_id = array();
+ foreach (array_keys($items) as $cat_id) {
+ // Some handling here to build the link upon catid
+ // catid is not used in myalbum, so just skip it
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ // In myalbum, the item_id is "topic_id"
+ $items_id[] = intval($item_id);
+ }
+ }
+ $item_handler =& xoops_getmodulehandler('photos', 'myalbum');
+ $text_handler =& xoops_getmodulehandler('text', 'myalbum');
+ $items_obj = $item_handler->getObjects(new Criteria("lid", "(" . implode(", ", $items_id) . ")", "IN"), true);
+
+ foreach (array_keys($items) as $cat_id) {
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ $item_obj =& $items_obj[$item_id];
+ $text = $text_handler->get($item_id);
+ $items[$cat_id][$item_id] = array(
+ "title" => $item_obj->getVar("title"),
+ "uid" => $item_obj->getVar("submitter"),
+ "link" => "photo.php?lid={$item_id}&cid=".$item_obj->getVar("cid"),
+ "time" => $item_obj->getVar("date"),
+ "tags" => tag_parse_tag($item_obj->getVar("tags", "n")),
+ "content" => $GLOBALS['myts']->displayTarea($text->getVar('description'),1,1,1,1,1,1),
+ );
+ }
+ }
+ unset($items_obj);
+}
+
+/**
+ * Remove orphan tag-item links
+ *
+ * @return boolean
+ *
+ */
+function myalbum_tag_synchronization($mid)
+{
+ $item_handler =& xoops_getmodulehandler("photos", "myalbum");
+ $link_handler =& xoops_getmodulehandler("link", "tag");
+
+ /* clear tag-item links */
+ if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
+ $sql = " DELETE FROM {$link_handler->table}" .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( tag_itemid NOT IN " .
+ " ( SELECT DISTINCT {$item_handler->keyName} " .
+ " FROM {$item_handler->table} " .
+ " WHERE {$item_handler->table}.approved > 0" .
+ " ) " .
+ " )";
+ else:
+ $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" .
+ " LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( aa.{$item_handler->keyName} IS NULL" .
+ " OR aa.approved < 1" .
+ " )";
+ endif;
+ if (!$result = $link_handler->db->queryF($sql)) {
+ //xoops_error($link_handler->db->error());
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum0.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum0.php (rev 0)
+++ XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum0.php 2013-08-14 05:25:33 UTC (rev 11905)
@@ -0,0 +1,112 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 1.0.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ * @package tag
+ */
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
+
+/**
+ * Get item fields:
+ * title
+ * content
+ * time
+ * link
+ * uid
+ * uname
+ * tags
+ *
+ * @var array $items associative array of items: [modid][catid][itemid]
+ *
+ * @return boolean
+ *
+ */
+function myalbum0_tag_iteminfo(&$items)
+{
+ if (empty($items) || !is_array($items)) {
+ return false;
+ }
+
+ $items_id = array();
+ foreach (array_keys($items) as $cat_id) {
+ // Some handling here to build the link upon catid
+ // catid is not used in myalbum0, so just skip it
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ // In myalbum0, the item_id is "topic_id"
+ $items_id[] = intval($item_id);
+ }
+ }
+ $item_handler =& xoops_getmodulehandler('photos', 'myalbum0');
+ $text_handler =& xoops_getmodulehandler('text', 'myalbum0');
+ $items_obj = $item_handler->getObjects(new Criteria("lid", "(" . implode(", ", $items_id) . ")", "IN"), true);
+
+ foreach (array_keys($items) as $cat_id) {
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ $item_obj =& $items_obj[$item_id];
+ $text = $text_handler->get($item_id);
+ $items[$cat_id][$item_id] = array(
+ "title" => $item_obj->getVar("title"),
+ "uid" => $item_obj->getVar("submitter"),
+ "link" => "photo.php?lid={$item_id}&cid=".$item_obj->getVar("cid"),
+ "time" => $item_obj->getVar("date"),
+ "tags" => tag_parse_tag($item_obj->getVar("tags", "n")),
+ "content" => $GLOBALS['myts']->displayTarea($text->getVar('description'),1,1,1,1,1,1),
+ );
+ }
+ }
+ unset($items_obj);
+}
+
+/**
+ * Remove orphan tag-item links
+ *
+ * @return boolean
+ *
+ */
+function myalbum0_tag_synchronization($mid)
+{
+ $item_handler =& xoops_getmodulehandler("photos", "myalbum0");
+ $link_handler =& xoops_getmodulehandler("link", "tag");
+
+ /* clear tag-item links */
+ if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
+ $sql = " DELETE FROM {$link_handler->table}" .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( tag_itemid NOT IN " .
+ " ( SELECT DISTINCT {$item_handler->keyName} " .
+ " FROM {$item_handler->table} " .
+ " WHERE {$item_handler->table}.approved > 0" .
+ " ) " .
+ " )";
+ else:
+ $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" .
+ " LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( aa.{$item_handler->keyName} IS NULL" .
+ " OR aa.approved < 1" .
+ " )";
+ endif;
+ if (!$result = $link_handler->db->queryF($sql)) {
+ //xoops_error($link_handler->db->error());
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum0.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum1.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum1.php (rev 0)
+++ XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum1.php 2013-08-14 05:25:33 UTC (rev 11905)
@@ -0,0 +1,112 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 1.0.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ * @package tag
+ */
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
+
+/**
+ * Get item fields:
+ * title
+ * content
+ * time
+ * link
+ * uid
+ * uname
+ * tags
+ *
+ * @var array $items associative array of items: [modid][catid][itemid]
+ *
+ * @return boolean
+ *
+ */
+function myalbum1_tag_iteminfo(&$items)
+{
+ if (empty($items) || !is_array($items)) {
+ return false;
+ }
+
+ $items_id = array();
+ foreach (array_keys($items) as $cat_id) {
+ // Some handling here to build the link upon catid
+ // catid is not used in myalbum1, so just skip it
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ // In myalbum1, the item_id is "topic_id"
+ $items_id[] = intval($item_id);
+ }
+ }
+ $item_handler =& xoops_getmodulehandler('photos', 'myalbum1');
+ $text_handler =& xoops_getmodulehandler('text', 'myalbum1');
+ $items_obj = $item_handler->getObjects(new Criteria("lid", "(" . implode(", ", $items_id) . ")", "IN"), true);
+
+ foreach (array_keys($items) as $cat_id) {
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ $item_obj =& $items_obj[$item_id];
+ $text = $text_handler->get($item_id);
+ $items[$cat_id][$item_id] = array(
+ "title" => $item_obj->getVar("title"),
+ "uid" => $item_obj->getVar("submitter"),
+ "link" => "photo.php?lid={$item_id}&cid=".$item_obj->getVar("cid"),
+ "time" => $item_obj->getVar("date"),
+ "tags" => tag_parse_tag($item_obj->getVar("tags", "n")),
+ "content" => $GLOBALS['myts']->displayTarea($text->getVar('description'),1,1,1,1,1,1),
+ );
+ }
+ }
+ unset($items_obj);
+}
+
+/**
+ * Remove orphan tag-item links
+ *
+ * @return boolean
+ *
+ */
+function myalbum1_tag_synchronization($mid)
+{
+ $item_handler =& xoops_getmodulehandler("photos", "myalbum1");
+ $link_handler =& xoops_getmodulehandler("link", "tag");
+
+ /* clear tag-item links */
+ if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
+ $sql = " DELETE FROM {$link_handler->table}" .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( tag_itemid NOT IN " .
+ " ( SELECT DISTINCT {$item_handler->keyName} " .
+ " FROM {$item_handler->table} " .
+ " WHERE {$item_handler->table}.approved > 0" .
+ " ) " .
+ " )";
+ else:
+ $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" .
+ " LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( aa.{$item_handler->keyName} IS NULL" .
+ " OR aa.approved < 1" .
+ " )";
+ endif;
+ if (!$result = $link_handler->db->queryF($sql)) {
+ //xoops_error($link_handler->db->error());
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum1.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum2.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum2.php (rev 0)
+++ XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum2.php 2013-08-14 05:25:33 UTC (rev 11905)
@@ -0,0 +1,112 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS tag management module
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 1.0.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ * @package tag
+ */
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
+
+/**
+ * Get item fields:
+ * title
+ * content
+ * time
+ * link
+ * uid
+ * uname
+ * tags
+ *
+ * @var array $items associative array of items: [modid][catid][itemid]
+ *
+ * @return boolean
+ *
+ */
+function myalbum2_tag_iteminfo(&$items)
+{
+ if (empty($items) || !is_array($items)) {
+ return false;
+ }
+
+ $items_id = array();
+ foreach (array_keys($items) as $cat_id) {
+ // Some handling here to build the link upon catid
+ // catid is not used in myalbum2, so just skip it
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ // In myalbum2, the item_id is "topic_id"
+ $items_id[] = intval($item_id);
+ }
+ }
+ $item_handler =& xoops_getmodulehandler('photos', 'myalbum2');
+ $text_handler =& xoops_getmodulehandler('text', 'myalbum2');
+ $items_obj = $item_handler->getObjects(new Criteria("lid", "(" . implode(", ", $items_id) . ")", "IN"), true);
+
+ foreach (array_keys($items) as $cat_id) {
+ foreach (array_keys($items[$cat_id]) as $item_id) {
+ $item_obj =& $items_obj[$item_id];
+ $text = $text_handler->get($item_id);
+ $items[$cat_id][$item_id] = array(
+ "title" => $item_obj->getVar("title"),
+ "uid" => $item_obj->getVar("submitter"),
+ "link" => "photo.php?lid={$item_id}&cid=".$item_obj->getVar("cid"),
+ "time" => $item_obj->getVar("date"),
+ "tags" => tag_parse_tag($item_obj->getVar("tags", "n")),
+ "content" => $GLOBALS['myts']->displayTarea($text->getVar('description'),1,1,1,1,1,1),
+ );
+ }
+ }
+ unset($items_obj);
+}
+
+/**
+ * Remove orphan tag-item links
+ *
+ * @return boolean
+ *
+ */
+function myalbum2_tag_synchronization($mid)
+{
+ $item_handler =& xoops_getmodulehandler("photos", "myalbum2");
+ $link_handler =& xoops_getmodulehandler("link", "tag");
+
+ /* clear tag-item links */
+ if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
+ $sql = " DELETE FROM {$link_handler->table}" .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( tag_itemid NOT IN " .
+ " ( SELECT DISTINCT {$item_handler->keyName} " .
+ " FROM {$item_handler->table} " .
+ " WHERE {$item_handler->table}.approved > 0" .
+ " ) " .
+ " )";
+ else:
+ $sql = " DELETE {$link_handler->table} FROM {$link_handler->table}" .
+ " LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
+ " WHERE " .
+ " tag_modid = {$mid}" .
+ " AND " .
+ " ( aa.{$item_handler->keyName} IS NULL" .
+ " OR aa.approved < 1" .
+ " )";
+ endif;
+ if (!$result = $link_handler->db->queryF($sql)) {
+ //xoops_error($link_handler->db->error());
+ }
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/myalbum/trunk/htdocs/modules/tag/plugin/myalbum2.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
|
|
From: <be...@us...> - 2013-08-14 04:48:35
|
Revision: 11904
http://sourceforge.net/p/xoops/svn/11904
Author: beckmi
Date: 2013-08-14 04:48:30 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Updating deprecated xoops_load("userutility")
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/user.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/user.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/user.php 2013-08-14 01:24:59 UTC (rev 11903)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/user.php 2013-08-14 04:48:30 UTC (rev 11904)
@@ -116,7 +116,7 @@
} elseif ( $user->isNew() ) {
$password = $vpass = '';
}
- xoops_load("userUtility");
+ xoops_load('xoopsuserutility');
$stop = XoopsUserUtility::validate($user, $password, $vpass);
$errors = array();
|
|
From: <be...@us...> - 2013-08-14 01:25:02
|
Revision: 11903
http://sourceforge.net/p/xoops/svn/11903
Author: beckmi
Date: 2013-08-14 01:24:59 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Updating to 1.31 Final
Modified Paths:
--------------
XoopsModules/portfolio/trunk/portfolio/admin/admin_footer.php
XoopsModules/portfolio/trunk/portfolio/admin/admin_header.php
XoopsModules/portfolio/trunk/portfolio/blocks/portfolio_recent.php
XoopsModules/portfolio/trunk/portfolio/categos.php
XoopsModules/portfolio/trunk/portfolio/class/object.class.php
XoopsModules/portfolio/trunk/portfolio/class/table.class.php
XoopsModules/portfolio/trunk/portfolio/class/work.class.php
XoopsModules/portfolio/trunk/portfolio/docs/changelog.txt
XoopsModules/portfolio/trunk/portfolio/footer.php
XoopsModules/portfolio/trunk/portfolio/index.php
XoopsModules/portfolio/trunk/portfolio/language/english/admin.php
XoopsModules/portfolio/trunk/portfolio/templates/portfolio_view.html
XoopsModules/portfolio/trunk/portfolio/view.php
XoopsModules/portfolio/trunk/portfolio/xoops_version.php
Modified: XoopsModules/portfolio/trunk/portfolio/admin/admin_footer.php
===================================================================
--- XoopsModules/portfolio/trunk/portfolio/admin/admin_footer.php 2013-08-13 23:10:43 UTC (rev 11902)
+++ XoopsModules/portfolio/trunk/portfolio/admin/admin_footer.php 2013-08-14 01:24:59 UTC (rev 11903)
@@ -1,12 +1,12 @@
-<?php
-
-global $pathIcon32;
-
-echo "<div class='adminfooter'>\n"
- ." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
- ." </div>\n"
- ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
- ."</div>";
-
+<?php
+
+global $pathIcon32;
+
+echo "<div class='adminfooter'>\n"
+ ." <div style='text-align: center;'>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+ ."</div>";
+
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/portfolio/trunk/portfolio/admin/admin_header.php
===================================================================
--- XoopsModules/portfolio/trunk/portfolio/admin/admin_header.php 2013-08-13 23:10:43 UTC (rev 11902)
+++ XoopsModules/portfolio/trunk/portfolio/admin/admin_header.php 2013-08-14 01:24:59 UTC (rev 11903)
@@ -1,40 +1,40 @@
-<?php
-
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-include_once $path . '/mainfile.php';
-include_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
-require_once $path . '/class/xoopsformloader.php';
-
-//include_once dirname(dirname(__FILE__)) . '/include/common.php';
-//include_once dirname(__FILE__) . '/admin_functions.php';
-
-if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once XOOPS_ROOT_PATH . '/class/template.php';
- $xoopsTpl = new XoopsTpl();
-}
-
-global $xoopsModule;
-
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-
-$mc =& $xoopsModuleConfig;
-$db =& $xoopsDB;
-$myts =& MyTextSanitizer::getInstance();
-
-include 'admin.func.php';
-
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
-
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
-$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+<?php
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
+require_once $path . '/class/xoopsformloader.php';
+
+//include_once dirname(dirname(__FILE__)) . '/include/common.php';
+//include_once dirname(__FILE__) . '/admin_functions.php';
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once XOOPS_ROOT_PATH . '/class/template.php';
+ $xoopsTpl = new XoopsTpl();
+}
+
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+$mc =& $xoopsModuleConfig;
+$db =& $xoopsDB;
+$myts =& MyTextSanitizer::getInstance();
+
+include 'admin.func.php';
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+ }else{
+ redirect_header("../../../admin.php", 5, _AM_PORTFOLIO_MODULEADMIN_MISSING, false);
}
\ No newline at end of file
Modified: XoopsModules/portfolio/trunk/portfolio/blocks/portfolio_recent.php
===================================================================
--- XoopsModules/portfolio/trunk/portfolio/blocks/portfolio_recent.php 2013-08-13 23:10:43 UTC (rev 11902)
+++ XoopsModules/portfolio/trunk/portfolio/blocks/portfolio_recent.php 2013-08-14 01:24:59 UTC (rev 11903)
@@ -1,128 +1,128 @@
-<?php
-/*******************************************************************
-* $Id: portfolio_recent.php,v 1.0.2 24/05/2006 00:39 BitC3R0 Exp $ *
-* ----------------------------------------------------------- *
-* RMSOFT MyFolder 1.0 *
-* M\xF3dulo para el manejo de un portafolio profesional *
-* CopyRight \xA9 2006. RMSOFT *
-* Autor: BitC3R0 *
-* http://www.redmexico.com.mx *
-* http://www.xoops-mexico.net *
-* -------------------------------------------- *
-* This program is free software; you can redistribute it and/or *
-* modify it under the terms of the GNU General Public License as *
-* published by the Free Software Foundation; either version 2 of *
-* the License, or (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public *
-* License along with this program; if not, write to the Free *
-* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, *
-* MA 02111-1307 USA *
-* *
-* ----------------------------------------------------------- *
-* portfolio_recent.php: *
-* Bloques del M\xF3dulo. *
-* Trabajos recientes, destacados y comentarios *
-* de clientes *
-* ----------------------------------------------------------- *
-* @copyright: \xA9 2006. BitC3R0. *
-* @autor: BitC3R0 *
-* @paquete: RMSOFT MyFolder v1.0 *
-* @version: 1.0.2 *
-* @modificado: 24/05/2006 12:39:48 a.m. *
-*******************************************************************/
-
-function portfolio_bk_recent($options){
-
- $db =& XoopsDatabaseFactory::getDatabaseConnection();
- $myts =& MyTextSanitizer::getInstance();
-
- include_once XOOPS_ROOT_PATH.'/modules/portfolio/blocks/functions.php';
-
- $dir = portfolio_get_config('storedir');
- if (substr($dir, strlen($dir) - 1, 1)!='/'){
- $dir .= '/';
- }
- $dir = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, $dir);
-
- $result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." ORDER BY id_w DESC LIMIT 0,$options[0]");
- $block = array();
- while ($row = $db->fetchArray($result)){
- $rtn = array();
- $rtn['id'] = $row['id_w'];
- $rtn['titulo'] = $row['titulo'];
- $rtn['img'] = $dir .'ths/'.$row['imagen'];
- $rtn['desc'] = $myts->makeTareaData4Show($row['short']);
- $block['works'][] = $rtn;
- }
- return $block;
-}
-
-function portfolio_bk_recent_edit($options){
- $form = _BK_PORTFOLIO_NUMWORKS."<br /><input type='text' size='5' name='options[]' value='$options[0]' />";
- return $form;
-}
-
-/**
- * Mostramos los comentarios de los clientes
- **/
-function portfolio_bk_comments($options){
- $db =& XoopsDatabaseFactory::getDatabaseConnection();
- $myts =& MyTextSanitizer::getInstance();
- $result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." ORDER BY id_w DESC LIMIT 0,$options[0]");
- $block = array();
- while ($row = $db->fetchArray($result)){
- $rtn = array();
- $rtn['id'] = $row['id_w'];
- $rtn['titulo'] = $row['titulo'];
- $rtn['texto'] = $myts->makeTareaData4Show($row['comentario']);
- $rtn['cliente'] = $row['cliente'];
- $block['works'][] = $rtn;
- }
- return $block;
-}
-
-function portfolio_bk_comments_edit($options){
- $form = _BK_PORTFOLIO_NUMCOMMS."<br /><input type='text' size='5' name='options[]' value='$options[0]' />";
- return $form;
-}
-
-/**
- * Mostramos trabajos resaltados
- */
-function portfolio_bk_featured($options){
-
- $db =& XoopsDatabaseFactory::getDatabaseConnection();
- $myts =& MyTextSanitizer::getInstance();
-
- include_once XOOPS_ROOT_PATH.'/modules/portfolio/blocks/functions.php';
-
- $dir = portfolio_get_config('storedir');
- if (substr($dir, strlen($dir) - 1, 1)!='/'){
- $dir .= '/';
- }
- $dir = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, $dir);
-
- $result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." WHERE resaltado='1' ORDER BY id_w DESC LIMIT 0,$options[0]");
- $block = array();
- while ($row = $db->fetchArray($result)){
- $rtn = array();
- $rtn['id'] = $row['id_w'];
- $rtn['titulo'] = $row['titulo'];
- $rtn['img'] = $dir .'ths/'.$row['imagen'];
- $rtn['desc'] = $myts->makeTareaData4Show($row['short']);
- $block['works'][] = $rtn;
- }
- return $block;
-}
-
-function portfolio_bk_featured_edit($options){
- $form = _BK_PORTFOLIO_NUMWORKS."<br /><input type='text' size='5' name='options[]' value='$options[0]' />";
- return $form;
-}
+<?php
+/*******************************************************************
+* $Id: portfolio_recent.php,v 1.0.2 24/05/2006 00:39 BitC3R0 Exp $ *
+* ----------------------------------------------------------- *
+* RMSOFT MyFolder 1.0 *
+* M\xF3dulo para el manejo de un portafolio profesional *
+* CopyRight \xA9 2006. RMSOFT *
+* Autor: BitC3R0 *
+* http://www.redmexico.com.mx *
+* http://www.xoops-mexico.net *
+* -------------------------------------------- *
+* This program is free software; you can redistribute it and/or *
+* modify it under the terms of the GNU General Public License as *
+* published by the Free Software Foundation; either version 2 of *
+* the License, or (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU General Public *
+* License along with this program; if not, write to the Free *
+* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, *
+* MA 02111-1307 USA *
+* *
+* ----------------------------------------------------------- *
+* portfolio_recent.php: *
+* Bloques del M\xF3dulo. *
+* Trabajos recientes, destacados y comentarios *
+* de clientes *
+* ----------------------------------------------------------- *
+* @copyright: \xA9 2006. BitC3R0. *
+* @autor: BitC3R0 *
+* @paquete: RMSOFT MyFolder v1.0 *
+* @version: 1.0.2 *
+* @modificado: 24/05/2006 12:39:48 a.m. *
+*******************************************************************/
+
+function portfolio_bk_recent($options){
+
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
+ $myts =& MyTextSanitizer::getInstance();
+
+ include_once XOOPS_ROOT_PATH.'/modules/portfolio/blocks/functions.php';
+
+ $dir = portfolio_get_config('storedir');
+ if (substr($dir, strlen($dir) - 1, 1)!='/'){
+ $dir .= '/';
+ }
+ $dir = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, $dir);
+
+ $result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." ORDER BY id_w DESC LIMIT 0,$options[0]");
+ $block = array();
+ while ($row = $db->fetchArray($result)){
+ $rtn = array();
+ $rtn['id'] = $row['id_w'];
+ $rtn['titulo'] = $row['titulo'];
+ $rtn['img'] = $dir .'ths/'.$row['imagen'];
+ $rtn['desc'] = $myts->displayTarea($row['short']);
+ $block['works'][] = $rtn;
+ }
+ return $block;
+}
+
+function portfolio_bk_recent_edit($options){
+ $form = _BK_PORTFOLIO_NUMWORKS."<br /><input type='text' size='5' name='options[]' value='$options[0]' />";
+ return $form;
+}
+
+/**
+ * Mostramos los comentarios de los clientes
+ **/
+function portfolio_bk_comments($options){
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
+ $myts =& MyTextSanitizer::getInstance();
+ $result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." ORDER BY id_w DESC LIMIT 0,$options[0]");
+ $block = array();
+ while ($row = $db->fetchArray($result)){
+ $rtn = array();
+ $rtn['id'] = $row['id_w'];
+ $rtn['titulo'] = $row['titulo'];
+ $rtn['texto'] = $myts->displayTarea($row['comentario']);
+ $rtn['cliente'] = $row['cliente'];
+ $block['works'][] = $rtn;
+ }
+ return $block;
+}
+
+function portfolio_bk_comments_edit($options){
+ $form = _BK_PORTFOLIO_NUMCOMMS."<br /><input type='text' size='5' name='options[]' value='$options[0]' />";
+ return $form;
+}
+
+/**
+ * Mostramos trabajos resaltados
+ */
+function portfolio_bk_featured($options){
+
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
+ $myts =& MyTextSanitizer::getInstance();
+
+ include_once XOOPS_ROOT_PATH.'/modules/portfolio/blocks/functions.php';
+
+ $dir = portfolio_get_config('storedir');
+ if (substr($dir, strlen($dir) - 1, 1)!='/'){
+ $dir .= '/';
+ }
+ $dir = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, $dir);
+
+ $result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." WHERE resaltado='1' ORDER BY id_w DESC LIMIT 0,$options[0]");
+ $block = array();
+ while ($row = $db->fetchArray($result)){
+ $rtn = array();
+ $rtn['id'] = $row['id_w'];
+ $rtn['titulo'] = $row['titulo'];
+ $rtn['img'] = $dir .'ths/'.$row['imagen'];
+ $rtn['desc'] = $myts->displayTarea($row['short']);
+ $block['works'][] = $rtn;
+ }
+ return $block;
+}
+
+function portfolio_bk_featured_edit($options){
+ $form = _BK_PORTFOLIO_NUMWORKS."<br /><input type='text' size='5' name='options[]' value='$options[0]' />";
+ return $form;
+}
?>
\ No newline at end of file
Modified: XoopsModules/portfolio/trunk/portfolio/categos.php
===================================================================
--- XoopsModules/portfolio/trunk/portfolio/categos.php 2013-08-13 23:10:43 UTC (rev 11902)
+++ XoopsModules/portfolio/trunk/portfolio/categos.php 2013-08-14 01:24:59 UTC (rev 11903)
@@ -1,105 +1,105 @@
-<?php
-/*******************************************************************
-* $Id: view.php,v 1.0.4 24/05/2006 00:52 BitC3R0 Exp $ *
-* ---------------------------------------------------- *
-* RMSOFT MyFolder 1.0 *
-* Módulo para el manejo de un portafolio profesional *
-* CopyRight © 2006. Red México Soft *
-* Autor: BitC3R0 *
-* http://www.redmexico.com.mx *
-* http://www.xoops-mexico.net *
-* -------------------------------------------- *
-* This program is free software; you can redistribute it and/or *
-* modify it under the terms of the GNU General Public License as *
-* published by the Free Software Foundation; either version 2 of *
-* the License, or (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public *
-* License along with this program; if not, write to the Free *
-* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, *
-* MA 02111-1307 USA *
-* *
-* ---------------------------------------------------- *
-* view.php: *
-* Información completa de un trabajo *
-* ---------------------------------------------------- *
-* @copyright: © 2006. BitC3R0. *
-* @autor: BitC3R0 *
-* @paquete: RMSOFT GS 2.0 *
-* @version: 1.0.4 *
-* @modificado: 24/05/2006 12:52:24 a.m. *
-*******************************************************************/
-
-include 'header.php';
-
-$id = isset($_GET['id']) ? $_GET['id'] : 0;
-
-if ($id<=0){ header('location: index.php'); die(); }
-
-$xoopsOption['template_main'] = "portfolio_categos.html";
-
-// Cargo las categorias
-$result = $db->query("SELECT * FROM ".$db->prefix("portfolio_categos")." WHERE parent='$id' ORDER BY orden");
-while ($row=$db->fetchArray($result)){
- $tpl->append('categos', array('id'=>$row['id_cat'],'nombre'=>$row['nombre'],'desc'=>$myts->makeTareaData4Show($row['desc'])));
-}
-
-$tpl->assign('lang_works', _PORTFOLIO_WORKS);
-$tpl->assign('lang_view', _PORTFOLIO_VIEWINFO);
-$tpl->assign('lang_categos', _PORTFOLIO_CATEGOS);
-$tpl->assign('lang_featured', _PORTFOLIO_FEATURED);
-$tpl->assign('lang_recent', _PORTFOLIO_RECENTS);
-
-// Cargo los trabajos en la categoria
-$limit = $mc['results'];
-$pag = isset($_GET['pag']) ? $_GET['pag'] : (isset($_POST['pag']) ? $_POST['pag'] : 0);
-if ($pag > 0){ $pag -= 1; }
-$start = $pag * $limit;
-list($num) = $db->fetchRow($db->query("SELECT COUNT(*) FROM ".$db->prefix("portfolio_works")." WHERE catego='$id'"));
-$rtotal = $num;
-$tpages = (int)($num / $limit);
-if (($num % $limit) > 0){ $tpages++; }
-$pactual = $pag + 1;
-
-if ($pactual>$tpages){
- $rest = $pactual - $tpages;
- $pactual = $pactual - $rest + 1;
- $start = ($pactual - 1) * $limit;
-}
-
-
-$result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." WHERE catego='$id' ORDER BY id_w DESC LIMIT $start,$limit");
-while ($row=$db->fetchArray($result)){
- $tpl->append('works', array('id'=>$row['id_w'],'titulo'=>$row['titulo'],'desc'=>$myts->makeTareaData4Show($row['short']),'img'=>$row['imagen']));
-}
-
-for ($i=1;$i<=$tpages;$i++){
- $nav .= "<a href='?pag=$i&id=$id'>$i</a>| ";
-}
-
-$tpl->assign('pages', $nav);
-$tpl->assign('lang_pages', _PORTFOLIO_PAGES);
-
-// Cargo los trabajos destacados
-$result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." WHERE catego='$id' AND resaltado='1' ORDER BY id_w DESC LIMIT 0,$mc[featured]");
-while ($row=$db->fetchArray($result)){
- $tpl->append('destacados', array('id'=>$row['id_w'],'titulo'=>$row['titulo'],'desc'=>$myts->makeTareaData4Show($row['short']),'img'=>$row['imagen']));
-}
-
-$result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." WHERE catego='$id' ORDER BY id_w DESC LIMIT 0,$mc[recents]");
-while ($row=$db->fetchArray($result)){
- $tpl->append('recientes', array('id'=>$row['id_w'],'titulo'=>$row['titulo'],'desc'=>$myts->makeTareaData4Show($row['short']),'img'=>$row['imagen']));
-}
-
-$tpl->assign('footer', portfolio_make_footer(false));
-
-// Creamos la barra de navegacion
-$tpl->assign('localize_bar', ":: <a href='index.php'>$mc[title]</a>" . portfolio_localize($id, 0));
-
-include 'footer.php';
+<?php
+/*******************************************************************
+* $Id: view.php,v 1.0.4 24/05/2006 00:52 BitC3R0 Exp $ *
+* ---------------------------------------------------- *
+* RMSOFT MyFolder 1.0 *
+* Módulo para el manejo de un portafolio profesional *
+* CopyRight © 2006. Red México Soft *
+* Autor: BitC3R0 *
+* http://www.redmexico.com.mx *
+* http://www.xoops-mexico.net *
+* -------------------------------------------- *
+* This program is free software; you can redistribute it and/or *
+* modify it under the terms of the GNU General Public License as *
+* published by the Free Software Foundation; either version 2 of *
+* the License, or (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU General Public *
+* License along with this program; if not, write to the Free *
+* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, *
+* MA 02111-1307 USA *
+* *
+* ---------------------------------------------------- *
+* view.php: *
+* Información completa de un trabajo *
+* ---------------------------------------------------- *
+* @copyright: © 2006. BitC3R0. *
+* @autor: BitC3R0 *
+* @paquete: RMSOFT GS 2.0 *
+* @version: 1.0.4 *
+* @modificado: 24/05/2006 12:52:24 a.m. *
+*******************************************************************/
+
+$xoopsOption['template_main'] = 'portfolio_categos.html';
+include 'header.php';
+
+$id = isset($_GET['id']) ? $_GET['id'] : 0;
+
+if ($id<=0){ header('location: index.php'); die(); }
+
+// Cargo las categorias
+$result = $db->query("SELECT * FROM ".$db->prefix("portfolio_categos")." WHERE parent='$id' ORDER BY orden");
+while ($row=$db->fetchArray($result)){
+ $tpl->append('categos', array('id'=>$row['id_cat'],'nombre'=>$row['nombre'],'desc'=>$myts->displayTarea($row['desc'],1,1,1,1,1)));
+}
+
+$tpl->assign('lang_works', _PORTFOLIO_WORKS);
+$tpl->assign('lang_view', _PORTFOLIO_VIEWINFO);
+$tpl->assign('lang_categos', _PORTFOLIO_CATEGOS);
+$tpl->assign('lang_featured', _PORTFOLIO_FEATURED);
+$tpl->assign('lang_recent', _PORTFOLIO_RECENTS);
+
+$nav = 0;
+// Cargo los trabajos en la categoria
+$limit = $mc['results'];
+$pag = isset($_GET['pag']) ? $_GET['pag'] : (isset($_POST['pag']) ? $_POST['pag'] : 0);
+if ($pag > 0){ $pag -= 1; }
+$start = $pag * $limit;
+list($num) = $db->fetchRow($db->query("SELECT COUNT(*) FROM ".$db->prefix("portfolio_works")." WHERE catego='$id'"));
+$rtotal = $num;
+$tpages = (int)($num / $limit);
+if (($num % $limit) > 0){ $tpages++; }
+$pactual = $pag + 1;
+
+if ($pactual>$tpages){
+ $rest = $pactual - $tpages;
+ $pactual = $pactual - $rest + 1;
+ $start = ($pactual - 1) * $limit;
+}
+
+
+$result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." WHERE catego='$id' ORDER BY id_w DESC LIMIT $start,$limit");
+while ($row=$db->fetchArray($result)){
+ $tpl->append('works', array('id'=>$row['id_w'],'titulo'=>$row['titulo'],'desc'=>$myts->displayTarea($row['short']),'img'=>$row['imagen']));
+}
+
+for ($i=1;$i<=$tpages;$i++){
+ $nav .= "<a href='?pag=$i&id=$id'>$i</a>| ";
+}
+
+$tpl->assign('pages', $nav);
+$tpl->assign('lang_pages', _PORTFOLIO_PAGES);
+
+// Cargo los trabajos destacados
+$result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." WHERE catego='$id' AND resaltado='1' ORDER BY id_w DESC LIMIT 0,$mc[featured]");
+while ($row=$db->fetchArray($result)){
+ $tpl->append('destacados', array('id'=>$row['id_w'],'titulo'=>$row['titulo'],'desc'=>$myts->displayTarea($row['short']),'img'=>$row['imagen']));
+}
+
+$result = $db->query("SELECT * FROM ".$db->prefix("portfolio_works")." WHERE catego='$id' ORDER BY id_w DESC LIMIT 0,$mc[recents]");
+while ($row=$db->fetchArray($result)){
+ $tpl->append('recientes', array('id'=>$row['id_w'],'titulo'=>$row['titulo'],'desc'=>$myts->displayTarea($row['short']),'img'=>$row['imagen']));
+}
+
+$tpl->assign('footer', portfolio_make_footer(false));
+
+// Creamos la barra de navegacion
+$tpl->assign('localize_bar', ":: <a href='index.php'>$mc[title]</a>" . portfolio_localize($id, 0));
+
+include 'footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/portfolio/trunk/portfolio/class/object.class.php
===================================================================
--- XoopsModules/portfolio/trunk/portfolio/class/object.class.php 2013-08-13 23:10:43 UTC (rev 11902)
+++ XoopsModules/portfolio/trunk/portfolio/class/object.class.php 2013-08-14 01:24:59 UTC (rev 11903)
@@ -1,148 +1,148 @@
-<?php
-/*******************************************************************
-* $Id: object.class.php,v 1.0.4 24/05/2006 00:41 BitC3R0 Exp $ *
-* ------------------------------------------------------------ *
-* RMSOFT MyFolder 1.0 *
-* M\xF3dulo para el manejo de un portafolio profesional *
-* CopyRight \xA9 2006. RMSOFT *
-* Autor: BitC3R0 *
-* http://www.redmexico.com.mx *
-* http://www.xoops-mexico.net *
-* -------------------------------------------- *
-* This program is free software; you can redistribute it and/or *
-* modify it under the terms of the GNU General Public License as *
-* published by the Free Software Foundation; either version 2 of *
-* the License, or (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public *
-* License along with this program; if not, write to the Free *
-* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, *
-* MA 02111-1307 USA *
-* *
-* ------------------------------------------------------------ *
-* object.class.php: *
-* Clase base para los objetos del m\xF3dulo *
-* ------------------------------------------------------------ *
-* @copyright: \xA9 2006. BitC3R0. *
-* @autor: BitC3R0 *
-* @paquete: RMSOFT MyFolder v1.0 *
-* @version: 1.0.4 *
-* @modificado: 24/05/2006 12:41:41 a.m. *
-*******************************************************************/
-
-class MFObject
-{
- var $vars = array();
- var $db = null;
- var $_isNew = false;
- var $_errors = array();
-
- /**
- * Inicializa variables
- */
- function initVar($name,$value=null,$required=false)
- {
- $this->vars[$name] = array('value'=>$value,'required'=>$required);
- }
- /**
- * Establece el valor de una variable
- */
- function setVar($name, $value){
- if (isset($this->vars[$name])){
- $this->vars[$name]['value'] = $value;
- }
- }
- /**
- * Establece varias variables de una vez
- */
- function setVars($arrVars){
- if (!is_array($arrVars)) return;
-
- foreach ($arrVars as $k => $v){
- $this->setVar($k, $v);
- }
- }
- /**
- * Devuelve una variable de nuestro array de variables
- * @param int $value_type Indica el formato del tipo a devolver
- * 0 = Valor normal, 1 = Cadena filtrada
- */
- function getVar($name, $value_type = 0){
- if (!isset($this->vars[$name])){ return ; }
- switch ($value_type){
- case 1: // Formateado
- $myts =& MyTextSanitizer::getInstance();
- return $myts->makeTareaData4Show($this->vars[$name]['value']);
- case 2: // Para guardare
- $myts =& MyTextSanitizer::getInstance();
- return $myts->makeTareaData4Save($this->vars[$name]['value']);
- case 3: // Plano, sin HTML no XoopsCode
- $myts =& MyTextSanitizer::getInstance();
- return $myts->makeTareaData4Show($this->vars[$name]['value'], 0 ,0);
- case 4: // Para editar
- $myts =& MyTextSanitizer::getInstance();
- return $myts->makeTareaData4Edit($this->vars[$name]['value'], 0 ,0);
- case 0:
- default:
- return $this->vars[$name]['value'];
- break;
- }
- }
- /**
- * Devuelve un array asociativo con los valores
- * de las variables
- */
- function getVars(){
- return $this->vars;
- }
- /**
- * Inicializamos un objeto nuevo
- */
- function setNew(){
- $this->_isNew = true;
- }
- function unsetNew(){
- $this->_isNew = false;
- }
- function isNew(){
- return $this->_isNew;
- }
- /**
- * Creamos los errores
- */
- function addError($text){
- $this->_errors[] = $text;
- }
- /**
- * Obtenemos los errores
- */
- function errors($html=true){
- $ret = '';
-
- if (count($this->_errors)<=0){ return; }
-
- if ($html){
-
- $ret .= "<div class='outer' style='padding: 1px;'>";
- foreach ($this->_errors as $k){
- $ret .= "<div class='odd'>$k</div>";
- }
- $ret .= "</div>";
-
- } else {
-
- foreach ($this->_errors as $k){
- $ret .= $k."<br />";
- }
-
- }
-
- return $ret;
- }
-}
+<?php
+/*******************************************************************
+* $Id: object.class.php,v 1.0.4 24/05/2006 00:41 BitC3R0 Exp $ *
+* ------------------------------------------------------------ *
+* RMSOFT MyFolder 1.0 *
+* M�dulo para el manejo de un portafolio profesional *
+* CopyRight � 2006. RMSOFT *
+* Autor: BitC3R0 *
+* http://www.redmexico.com.mx *
+* http://www.xoops-mexico.net *
+* -------------------------------------------- *
+* This program is free software; you can redistribute it and/or *
+* modify it under the terms of the GNU General Public License as *
+* published by the Free Software Foundation; either version 2 of *
+* the License, or (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU General Public *
+* License along with this program; if not, write to the Free *
+* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, *
+* MA 02111-1307 USA *
+* *
+* ------------------------------------------------------------ *
+* object.class.php: *
+* Clase base para los objetos del m�dulo *
+* ------------------------------------------------------------ *
+* @copyright: � 2006. BitC3R0. *
+* @autor: BitC3R0 *
+* @paquete: RMSOFT MyFolder v1.0 *
+* @version: 1.0.4 *
+* @modificado: 24/05/2006 12:41:41 a.m. *
+*******************************************************************/
+
+class MFObject extends XoopsObject
+{
+ var $vars = array();
+ var $db = null;
+ var $_isNew = false;
+ var $_errors = array();
+
+ /**
+ * Inicializa variables
+ */
+ function initVar($name,$value=null,$required=false)
+ {
+ $this->vars[$name] = array('value'=>$value,'required'=>$required);
+ }
+ /**
+ * Establece el valor de una variable
+ */
+ function setVar($name, $value){
+ if (isset($this->vars[$name])){
+ $this->vars[$name]['value'] = $value;
+ }
+ }
+ /**
+ * Establece varias variables de una vez
+ */
+ function setVars($arrVars){
+ if (!is_array($arrVars)) return;
+
+ foreach ($arrVars as $k => $v){
+ $this->setVar($k, $v);
+ }
+ }
+ /**
+ * Devuelve una variable de nuestro array de variables
+ * @param int $value_type Indica el formato del tipo a devolver
+ * 0 = Valor normal, 1 = Cadena filtrada
+ */
+ function getVar($name, $value_type = 0){
+ if (!isset($this->vars[$name])){ return ; }
+ switch ($value_type){
+ case 1: // Formateado
+ $myts =& MyTextSanitizer::getInstance();
+ return $myts->displayTarea($this->vars[$name]['value']);
+ case 2: // Para guardare
+ $myts =& MyTextSanitizer::getInstance();
+ return $myts->makeTareaData4Save($this->vars[$name]['value']);
+ case 3: // Plano, sin HTML no XoopsCode
+ $myts =& MyTextSanitizer::getInstance();
+ return $myts->displayTarea($this->vars[$name]['value'], 0 ,0);
+ case 4: // Para editar
+ $myts =& MyTextSanitizer::getInstance();
+ return $myts->makeTareaData4Edit($this->vars[$name]['value'], 0 ,0);
+ case 0:
+ default:
+ return $this->vars[$name]['value'];
+ break;
+ }
+ }
+ /**
+ * Devuelve un array asociativo con los valores
+ * de las variables
+ */
+ function getVars(){
+ return $this->vars;
+ }
+ /**
+ * Inicializamos un objeto nuevo
+ */
+ function setNew(){
+ $this->_isNew = true;
+ }
+ function unsetNew(){
+ $this->_isNew = false;
+ }
+ function isNew(){
+ return $this->_isNew;
+ }
+ /**
+ * Creamos los errores
+ */
+ function addError($text){
+ $this->_errors[] = $text;
+ }
+ /**
+ * Obtenemos los errores
+ */
+ function errors($html=true){
+ $ret = '';
+
+ if (count($this->_errors)<=0){ return; }
+
+ if ($html){
+
+ $ret .= "<div class='outer' style='padding: 1px;'>";
+ foreach ($this->_errors as $k){
+ $ret .= "<div class='odd'>$k</div>";
+ }
+ $ret .= "</div>";
+
+ } else {
+
+ foreach ($this->_errors as $k){
+ $ret .= $k."<br />";
+ }
+
+ }
+
+ return $ret;
+ }
+}
?>
\ No newline at end of file
Modified: XoopsModules/portfolio/trunk/portfolio/class/table.class.php
===================================================================
--- XoopsModules/portfolio/trunk/portfolio/class/table.class.php 2013-08-13 23:10:43 UTC (rev 11902)
+++ XoopsModules/portfolio/trunk/portfolio/class/table.class.php 2013-08-14 01:24:59 UTC (rev 11903)
@@ -1,226 +1,226 @@
-<?php
-/*******************************************************************
-* $Id: table.class.php,v 1.0.2 24/05/2006 00:42 BitC3R0 Exp $ *
-* ----------------------------------------------------------- *
-* RMSOFT MyFolder 1.0 *
-* M\xF3dulo para el manejo de un portafolio profesional *
-* CopyRight \xA9 2006. RMSOFT *
-* Autor: BitC3R0 *
-* http://www.redmexico.com.mx *
-* http://www.xoops-mexico.net *
-* -------------------------------------------- *
-* This program is free software; you can redistribute it and/or *
-* modify it under the terms of the GNU General Public License as *
-* published by the Free Software Foundation; either version 2 of *
-* the License, or (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public *
-* License along with this program; if not, write to the Free *
-* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, *
-* MA 02111-1307 USA *
-* *
-* ----------------------------------------------------------- *
-* table.class.php: *
-* Clase para el manejo de tablas HTML *
-* ----------------------------------------------------------- *
-* @copyright: \xA9 2006. BitC3R0. *
-* @autor: BitC3R0 *
-* @paquete: RMSOFT MyFolder v1.0 *
-* @version: 1.0.2 *
-* @modificado: 24/05/2006 12:42:03 a.m. *
-*******************************************************************/
-
-include_once XOOPS_ROOT_PATH.'/modules/portfolio/class/object.class.php';
-
-class MFTable extends MFObject
-{
- var $_rows = array();
- var $_current = array();
- var $_display = false;
-
- function MFTable($display = false){
- $this->initVar('style_table','');
- $this->initVar('style_row','');
- $this->initVar('style_cell','');
- $this->initVar('tbl_class','');
- $this->initVar('row_class','');
- $this->initVar('cell_class','');
- $this->initVar('cycle_cell','');
- $this->initVar('cycle_row','');
-
- $this->setTableClass('outer');
- $this->setRowClass('even,odd',true);
- $this->setCellClass('',false);
- $this->_display = $display;
- $this->_current[0] = 0;
- $this->_current[1] = 0;
- }
-
- /**
- * Modificamos el estilo de la tabla
- */
- function setTableStyle($style){
- $this->setVar('style_table', $style);
- }
- function getTableStyle(){
- return $this->getVar('style_table');
- }
- /**
- * Modificamos el estilo de la fila
- */
- function setRowStyle($style){
- $this->setVar('style_row', $style);
- }
- function getRowStyle(){
- return $this->getVar('style_row');
- }
- /**
- * Modificamos el estilo de la celda
- */
- function setCellStyle($style){
- $this->setVar('style_cell', $style);
- }
- function getCellStyle(){
- return $this->getVar('style_cell');
- }
- /**
- * Modificamos la clase de los elementos
- */
- function setTableClass($class){
- $this->setVar('tbl_class',$class);
- }
- function getTableClass(){
- return $this->getVar('tbl_class');
- }
- /**
- * Modificamos la clase de los elementos
- * @param string $class Nombre de la clase. Puede ser una lista de nombres
- * delimitados por comas
- * @param boolean $cycle Establece si las clases se intercalan
- */
- function setRowClass($class, $cycle=false){
- $this->setVar('row_class',$class);
- $this->setVar('cycle_row', $cycle);
- }
- function getRowClass(){
- return $this->getVar('tbl_class');
- }
- /**
- * Modificamos la clase de los elementos
- * @param string $class Nombre de la clase. Puede ser una lista de nombres
- * delimitados por comas
- * @param boolean $cycle Establece si las clases se intercalan
- */
- function setCellClass($class, $cycle=false){
- $this->setVar('cell_class',$class);
- $this->setVar('cycle_cell', $cycle);
- }
- function getCellClass($class){
- return $this->getVar('cell_class');
- }
- /**
- * Abrimos una tabla
- */
- function openTbl($width = "100%", $align = "center", $spacing = "1", $padding = "0", $border = "0"){
- $rtn = "<table ";
- if ($this->getVar('tbl_class')!=''){
- $rtn .= "class='".$this->getVar('tbl_class')."' ";
- }
- if ($this->getVar('style_table')!=''){
- $rtn .= 'style="'.$this->getVar('style_table').'" ';
- }
- if ($width!=''){ $rtn .= 'width="'.$width.'" '; }
- if ($align!=''){ $rtn .= 'align="'.$align.'" '; }
- if ($spacing!=''){ $rtn .= 'cellspacing="'.$spacing.'" '; }
- if ($padding!=''){ $rtn .= 'cellpadding="'.$padding.'" '; }
- if ($border!=''){ $rtn .= 'border="'.$border.'" '; }
- $rtn .= '>';
- if ($this->_display){
- echo $rtn;
- } else {
- return $rtn;
- }
- }
- /**
- * Cerramos una tabla
- */
- function closeTbl(){
- if ($this->_display){
- echo "</table>";
- } else {
- return "</table>";
- }
- }
- /**
- * Abrimos una celda
- */
- function openRow($align=''){
- $rtn = '<tr';
- if ($align!=''){ $rtn .= ' align="'.$align.'"'; }
- if ($this->getVar('style_row')!=''){ $rtn .= ' style="'.$this->getVar('style_row').'"'; }
- $rtn .= $this->generateClass(0) .">";
- if ($this->_display){
- echo $rtn;
- } else {
- return $rtn;
- }
- }
- function closeRow(){
- if ($this->_display){
- echo "</tr>";
- } else {
- return "</tr>";
- }
- }
- /**
- * Abrimos una celda
- */
- function addCell($texto, $type=0,$colspan='',$align='left',$valign='middle',$width=''){
- $rtn = '';
- if ($type==0){ $rtn = '<td '; } else { $rtn .= '<th '; }
- if ($colspan!=''){ $rtn .= 'colspan="'.$colspan.'" '; }
- if ($align!=''){ $rtn .= 'align="'.$align.'" '; }
- if ($valign!=''){ $rtn .= 'valign="'.$valign.'" '; }
- if ($width!=''){ $rtn .= 'width="'.$width.'" '; }
- if ($this->getVar('style_cell')!=''){ $rtn .= 'style="'.$this->getVar('style_cell').'" '; }
- $rtn .= $this->generateClass(1) .">$texto</td>";
-
- if ($this->_display){
- echo $rtn;
- } else {
- return $rtn;
- }
- }
- /**
- * Generamos la clase para un elemento
- * @param int $q 0 = fila, 1 = celda
- */
- function generateClass($q){
- if ($q==0){
- $cc = $this->getVar('row_class');
- $cy = $this->getVar('cycle_row');
- } else {
- $cc = $this->getVar('cell_class');
- $cy = $this->getVar('cycle_cell');
- }
- if ($cc==''){ return; }
-
- if (!$cy){ return ' class="'.$cc.'"'; }
-
- $class = explode(",",$cc);
- if (count($class)==1){ return $cc; }
- if ($this->_current[$q] >= count($class) - 1){
- $this->_current[$q] = 0;
- } else {
- $this->_current[$q]++;
- }
- return ' class="'.$class[$this->_current[$q]].'"';
- }
-
-}
+<?php
+/*******************************************************************
+* $Id: table.class.php,v 1.0.2 24/05/2006 00:42 BitC3R0 Exp $ *
+* ----------------------------------------------------------- *
+* RMSOFT MyFolder 1.0 *
+* M�dulo para el manejo de un portafolio profesional *
+* CopyRight � 2006. RMSOFT *
+* Autor: BitC3R0 *
+* http://www.redmexico.com.mx *
+* http://www.xoops-mexico.net *
+* -------------------------------------------- *
+* This program is free software; you can redistribute it and/or *
+* modify it under the terms of the GNU General Public License as *
+* published by the Free Software Foundation; either version 2 of *
+* the License, or (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU General Public *
+* License along with this program; if not, write to the Free *
+* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, *
+* MA 02111-1307 USA *
+* *
+* ----------------------------------------------------------- *
+* table.class.php: *
+* Clase para el manejo de tablas HTML *
+* ----------------------------------------------------------- *
+* @copyright: � 2006. BitC3R0. *
+* @autor: BitC3R0 *
+* @paquete: RMSOFT MyFolder v1.0 *
+* @version: 1.0.2 *
+* @modificado: 24/05/2006 12:42:03 a.m. *
+*******************************************************************/
+
+include_once XOOPS_ROOT_PATH.'/modules/portfolio/class/object.class.php';
+
+class MFTable extends MFObject
+{
+ var $_rows = array();
+ var $_current = array();
+ var $_display = false;
+
+ function MFTable($display = false){
+ $this->initVar('style_table','');
+ $this->initVar('style_row','');
+ $this->initVar('style_cell','');
+ $this->initVar('tbl_class','');
+ $this->initVar('row_class','');
+ $this->initVar('cell_class','');
+ $this->initVar('cycle_cell','');
+ $this->initVar('cycle_row','');
+
+ $this->setTableClass('outer');
+ $this->setRowClass('even,odd',true);
+ $this->setCellClass('',false);
+ $this->_display = $display;
+ $this->_current[0] = 0;
+ $this->_current[1] = 0;
+ }
+
+ /**
+ * Modificamos el estilo de la tabla
+ */
+ function setTableStyle($style){
+ $this->setVar('style_table', $style);
+ }
+ function getTableStyle(){
+ return $this->getVar('style_table');
+ }
+ /**
+ * Modificamos el estilo de la fila
+ */
+ function setRowStyle($style){
+ $this->setVar('style_row', $style);
+ }
+ function getRowStyle(){
+ return $this->getVar('style_row');
+ }
+ /**
+ * Modificamos el estilo de la celda
+ */
+ function setCellStyle($style){
+ $this->setVar('style_cell', $style);
+ }
+ function getCellStyle(){
+ return $this->getVar('style_cell');
+ }
+ /**
+ * Modificamos la clase de los elementos
+ */
+ function setTableClass($class){
+ $this->setVar('tbl_class',$class);
+ }
+ function getTableClass(){
+ return $this->getVar('tbl_class');
+ }
+ /**
+ * Modificamos la clase de los elementos
+ * @param string $class Nombre de la clase. Puede ser una lista de nombres
+ * delimitados por comas
+ * @param boolean $cycle Establece si las clases se intercalan
+ */
+ function setRowClass($class, $cycle=false){
+ $this->setVar('row_class',$class);
+ $this->setVar('cycle_row', $cycle);
+ }
+ function getRowClass(){
+ return $this->getVar('tbl_class');
+ }
+ /**
+ * Modificamos la clase de los elementos
+ * @param string $class Nombre de la clase. Puede ser una lista de nombres
+ * delimitados por comas
+ * @param boolean $cycle Establece si las clases se intercalan
+ */
+ function setCellClass($class, $cycle=false){
+ $this->setVar('cell_class',$class);
+ $this->setVar('cycle_cell', $cycle);
+ }
+ function getCellClass($class){
+ return $this->getVar('cell_class');
+ }
+ /**
+ * Abrimos una tabla
+ */
+ function openTbl($width = "100%", $align = "center", $spacing = "1", $padding = "0", $border = "0"){
+ $rtn = "<table ";
+ if ($this->getVar('tbl_class')!=''){
+ $rtn .= "class='".$this->getVar('tbl_class')."' ";
+ }
+ if ($this->getVar('style_table')!=''){
+ $rtn .= 'style="'.$this->getVar('style_table').'" ';
+ }
+ if ($width!=''){ $rtn .= 'width="'.$width.'" '; }
+ if ($align!=''){ $rtn .= 'align="'.$align.'" '; }
+ if ($spacing!=''){ $rtn .= 'cellspacing="'.$spacing.'" '; }
+ if ($padding!=''){ $rtn .= 'cellpadding="'.$padding.'" '; }
+ if ($border!=''){ $rtn .= 'border="'.$border.'" '; }
+ $rtn .= '>';
+ if ($this->_display){
+ echo $rtn;
+ } else {
+ return $rtn;
+ }
+ }
+ /**
+ * Cerramos una tabla
+ */
+ function closeTbl(){
+ if ($this->_display){
+ echo "</table>";
+ } else {
+ return "</table>";
+ }
+ }
+ /**
+ * Abrimos una celda
+ */
+ function openRow($align=''){
+ $rtn = '<tr';
+ if ($align!=''){ $rtn .= ' align="'.$align.'"'; }
+ if ($this->getVar('style_row')!=''){ $rtn .= ' style="'.$this->getVar('style_row').'"'; }
+ $rtn .= $this->generateClass(0) .">";
+ if ($this->_display){
+ echo $rtn;
+ } else {
+ return $rtn;
+ }
+ }
+ function closeRow(){
+ if ($this->_display){
+ echo "</tr>";
+ } else {
+ return "</tr>";
+ }
+ }
+ /**
+ * Abrimos una celda
+ */
+ function addCell($texto, $type=0,$colspan='',$align='left',$valign='middle',$width=''){
+ $rtn = '';
+ if ($type==0){ $rtn = '<td '; } else { $rtn .= '<th '; }
+ if ($colspan!=''){ $rtn .= 'colspan="'.$colspan.'" '; }
+ if ($align!=''){ $rtn .= 'align="'.$align.'" '; }
+ if ($valign!=''){ $rtn .= 'valign="'.$valign.'" '; }
+ if ($width!=''){ $rtn .= 'width="'.$width.'" '; }
+ if ($this->getVar('style_cell')!=''){ $rtn .= 'style="'.$this->getVar('style_cell').'" '; }
+ $rtn .= $this->generateClass(1) .">$texto</td>";
+
+ if ($this->_display){
+ echo $rtn;
+ } else {
+ return $rtn;
+ }
+ }
+ /**
+ * Generamos la clase para un elemento
+ * @param int $q 0 = fila, 1 = celda
+ */
+ function generateClass($q){
+ if ($q==0){
+ $cc = $this->getVar('row_class');
+ $cy = $this->getVar('cycle_row');
+ } else {
+ $cc = $this->getVar('cell_class');
+ $cy = $this->getVar('cycle_cell');
+ }
+ if ($cc==''){ return; }
+
+ if (!$cy){ return ' class="'.$cc.'"'; }
+
+ $class = explode(",",$cc);
+ if (count($class)==1){ return $cc; }
+ if ($this->_current[$q] >= count($class) - 1){
+ $this->_current[$q] = 0;
+ } else {
+ $this->_current[$q]++;
+ }
+ return ' class="'.$class[$this->_current[$q]].'"';
+ }
+
+}
?>
\ No newline at end of file
Modified: XoopsModules/portfolio/trunk/portfolio/class/work.class.php
===================================================================
--- XoopsModules/portfolio/trunk/portfolio/class/work.class.php 2013-08-13 23:10:43 UTC (rev 11902)
+++ XoopsModules/portfolio/trunk/portfolio/class/work.class.php 2013-08-14 01:24:59 UTC (rev 11903)
@@ -1,81 +1,81 @@
-<?php
-/*******************************************************************
-* $Id: work.class.php,v 1.0.3 24/05/2006 00:42 BitC3R0 Exp $ *
-* ---------------------------------------------------------- *
-* RMSOFT MyFolder 1.0 *
-* M\xF3dulo para el manejo de un portafolio profesional *
-* CopyRight \xA9 2006. RMSOFT *
-* Autor: BitC3R0 *
-* http://www.redmexico.com.mx *
-* http://www.xoops-mexico.net *
-* -------------------------------------------- *
-* This program is free software; you can redistribute it and/or *
-* modify it under the terms of the GNU General Public License as *
-* published by the Free Software Foundation; either version 2 of *
-* the License, or (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public *
-* License along with this program; if not, write to the Free *
-* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, *
-* MA 02111-1307 USA *
-* *
-* ---------------------------------------------------------- *
-* work.class.php: *
-* Clase para el manejo de trabajos *
-* ---------------------------------------------------------- *
-* @copyright: \xA9 2006. BitC3R0. *
-* @autor: BitC3R0 *
-* @paquete: RMSOFT MyFolder v1.0 *
-* @version: 1.0.3 *
-* @modificado: 24/05/2006 12:42:37 a.m. *
-*******************************************************************/
-
-include_once XOOPS_ROOT_PATH.'/modules/portfolio/class/object.class.php';
-
-class MFWork extends MFObject
-{
- var $_tbl = '';
-
- function MFWork($id=null){
-
- $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-
- if (is_null($id)){ return; }
-
- $this->_tbl = $this->db->prefix("portfolio_works");
-
- $result = $this->db->query("SELECT * FROM $this->_tbl WHERE id_w='$id'");
- if ($this->db->getRowsNum($result)<=0){ $this->initVar('found', false); return; }
-
- $row = $this->db->fetchArray($result);
-
- foreach ($row as $k => $v){
- $this->initVar($k, $v);
- }
-
- $this->initVar('found',true);
- $this->initVar('images', $this->getImages());
-
- }
-
- /**
- * Obtenemos las im\xE1genes
- */
- function getImages(){
- $result = $this->db->query("SELECT * FROM ".$this->db->prefix("portfolio_images")." WHERE work='".$this->getVar('id_w')."'");
- $this->initVar('total_images', $this->db->getRowsNum($result));
- $images = array();
- while ($row=$this->db->fetchArray($result)){
- $images[] = $row;
- }
-
- return $images;
- }
-}
-
+<?php
+/*******************************************************************
+* $Id: work.class.php,v 1.0.3 24/05/2006 00:42 BitC3R0 Exp $ *
+* ---------------------------------------------------------- *
+* RMSOFT MyFolder 1.0 *
+* M�dulo para el manejo de un portafolio profesional *
+* CopyRight � 2006. RMSOFT *
+* Autor: BitC3R0 *
+* http://www.redmexico.com.mx *
+* http://www.xoops-mexico.net *
+* -------------------------------------------- *
+* This program is free software; you can redistribute it and/or *
+* modify it under the terms of the GNU General Public License as *
+* published by the Free Software Foundation; either version 2 of *
+* the License, or (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU General Public *
+* License along with this program; if not, write to the Free *
+* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, *
+* MA 02111-1307 USA *
+* *
+* ---------------------------------------------------------- *
+* work.class.php: *
+* Clase para el manejo de trabajos *
+* ---------------------------------------------------------- *
+* @copyright: � 2006. BitC3R0. *
+* @autor: BitC3R0 *
+* @paquete: RMSOFT MyFolder v1.0 *
+* @version: 1.0.3 *
+* @modificado: 24/05/2006 12:42:37 a.m. *
+*******************************************************************/
+
+include_once XOOPS_ROOT_PATH.'/modules/portfolio/class/object.class.php';
+
+class MFWork extends MFObject
+{
+ var $_tbl = '';
+
+ function __construct($id=null){
+
+ $this->db = XoopsDatabaseFactory::getDatabaseConnection();
+
+ if (is_null($id)){ return; }
+
+ $this->_tbl = $this->db->prefix("portfolio_works");
+
+ $result = $this->db->query("SELECT * FROM $this->_tbl WHERE id_w='$id'");
+ if ($this->db->getRowsNum($result)<=0){ $this->initVar('found', false); return; }
+
+ $row = $this->db->fetchArray($result);
+
+ foreach ($row as $k => $v){
+ $this->initVar($k, $v);
+ }
+
+ $this->initVar('found',true);
+ $this->initVar('images', $this->getImages());
+
+ }
+
+ /**
+ * Obtenemos las im�genes
+ */
+ function getImages(){
+ $result = $this->db->query("SELECT * FROM ".$this->db->prefix("portfolio_images")." WHERE work='".$this->getVar('id_w')."'");
+ $this->initVar('total_images', $this->db->getRowsNum($result));
+ $images = array();
+ while ($row=$this->db->fetchArray($result)){
+ $images[] = $row;
+ }
+
+ return $images;
+ }
+}
+
?>
\ No newline at end of file
Modified: XoopsModules/portfolio/trunk/portfolio/docs/changelog.txt
===================================================================
--- XoopsModules/po...
[truncated message content] |
|
From: <be...@us...> - 2013-08-13 23:10:47
|
Revision: 11902
http://sourceforge.net/p/xoops/svn/11902
Author: beckmi
Date: 2013-08-13 23:10:43 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Updating to 3.07 RC3 (see changelog.txt)
Modified Paths:
--------------
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/photomanager.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_block_tag.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_rphoto.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_tophits.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_topnews.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/myalbum.textsanitizer.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/photos.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/editphoto.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/imagemanager.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/assign_globals.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/draw_functions.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/functions.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/main.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/modinfo.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/photo.php
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_cpanel_admission.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_imagemanager.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_index.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_table.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_cpanel_admission.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_imagemanager.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_index.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_table.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_imagemanager.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_index.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_viewcat_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_viewcat_table.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_cpanel_admission.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_imagemanager.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_index.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_photo_in_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_viewcat_list.html
XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum_viewcat_table.html
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/admission.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -8,14 +8,14 @@
// GET vars
$pos = empty( $_GET[ 'pos' ] ) ? 0 : intval( $_GET[ 'pos' ] ) ;
-$num = empty( $_GET[ 'num' ] ) ? 20 : intval( $_GET[ 'num' ] ) ;
+$num = empty( $_GET[ 'num' ] ) ? 10 : intval( $_GET[ 'num' ] ) ;
$txt = empty( $_GET[ 'txt' ] ) ? '' : $GLOBALS['myts']->stripSlashesGPC( trim( $_GET[ 'txt' ] ) ) ;
if( ! empty( $_POST['action'] ) && $_POST['action'] == 'admit' && isset( $_POST['ids'] ) && is_array( $_POST['ids'] ) ) {
- $photosHandler = xoops_getmodulehandler('photos', $GLOBALS['mydirname']);
- @$photosHandler->setStatus($_POST[ 'ids' ], 1);
+ $photosHandler = xoops_getmodulehandler('photos');
+ @$photosHandler->setStatus($_POST[ 'ids' ], 1);
redirect_header( 'admission.php' , 2 , _ALBM_AM_ADMITTING ) ;
exit ;
@@ -26,7 +26,7 @@
// Double check for anti-CSRF
if( ! xoops_refcheck() ) die( "XOOPS_URL is not included in your REFERER" ) ;
- $photosHandler = xoops_getmodulehandler('photos', $GLOBALS['mydirname']);
+ $photosHandler = xoops_getmodulehandler('photos');
@$photosHandler->deletePhotos($_POST[ 'ids' ]);
redirect_header( "admission.php" , 2 , _ALBM_DELETINGPHOTO ) ;
@@ -57,9 +57,16 @@
// query for listing count
$numrows = $photosHandler->getCount($criteria);
+
+// Page Navigation
$nav = new XoopsPageNav( $numrows , $num , $pos , 'pos' , "num=$num&txt=" . urlencode($txt) ) ;
-$GLOBALS['xoopsTpl']->assign('nav_html', $nav->renderNav( 10 ));
+$nav_html = $nav->renderNav( 10 ) ;
+$GLOBALS['xoopsTpl']->assign('nav_html', $nav_html);
+$criteria = new Criteria('`status`', '0', '<=');
+$criteria->setStart($pos);
+$criteria->setLimit($num);
+
foreach( $photosHandler->getObjects($criteria, true) as $lid => $photo) {
$GLOBALS['xoopsTpl']->append('photos', $photo->toArray());
}
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/export.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -31,7 +31,7 @@
list( $imgcat_storetype,$imgcat_maxsize ) = $xoopsDB->fetchRow( $crs ) ;
// mime type look up
- $mime_types = array( 'gif' => 'image/gif' , 'png' => 'image/png' , 'jpg' => 'image/jpeg' , 'jpg' => 'image/jpeg' ) ;
+ $mime_types = array( 'gif' => 'image/gif' , 'png' => 'image/png' , 'jpg' => 'image/jpeg' , 'jpeg' => 'image/jpeg' ) ;
// INSERT loop
$srs = $xoopsDB->query( "SELECT lid,ext,title,date,status FROM $src_table_photos WHERE cid='$src_cid'" ) ;
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/photomanager.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/photomanager.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/admin/photomanager.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -170,7 +170,7 @@
</form>
<p align='center' style='margin:0px;'>
$photonavinfo
- <a href='../submit.php?cid=$cid'><img src='../images/pictadd.gif' width='18' height='15' alt='"._AM_CAT_LINK_ADDPHOTOS."' title='"._AM_CAT_LINK_ADDPHOTOS."' /></a>
+ <a href='../submit.php?cid=$cid'><img src='" . $pathIcon16."/add.png' width='18' height='15' alt='"._AM_CAT_LINK_ADDPHOTOS."' title='"._AM_CAT_LINK_ADDPHOTOS."' /></a>
</p>
<form name='MainForm' action='?num=$num&cid=$cid' method='POST' style='margin-top:0px;'>
<table width='100%' border='0' cellspacing='0' cellpadding='4'>
@@ -196,7 +196,7 @@
$bgcolor = $status ? "#FFFFFF" : "#FFEEEE" ;
- $editbutton = "<a href='".XOOPS_URL."/modules/$mydirname/editphoto.php?lid=$lid' target='_blank'><img src='".XOOPS_URL."/modules/$mydirname/images/editicon.gif' border='0' alt='"._ALBM_EDITTHISPHOTO."' title='"._ALBM_EDITTHISPHOTO."' /></a> ";
+ $editbutton = "<a href='".XOOPS_URL."/modules/$mydirname/editphoto.php?lid=$lid' target='_blank'><img src='" . $pathIcon16."/edit.png' border='0' alt='"._ALBM_EDITTHISPHOTO."' title='"._ALBM_EDITTHISPHOTO."' /></a> ";
$deadlinkbutton = is_readable( "$photos_dir/{$lid}.{$ext}" ) ? "" : "<img src='".XOOPS_URL."/modules/$mydirname/images/deadlink.gif' border='0' alt='"._ALBM_AM_DEADLINKMAINPHOTO."' title='"._ALBM_AM_DEADLINKMAINPHOTO."' />" ;
if( $col == 0 ) echo "\t<tr>\n" ;
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_block_tag.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_block_tag.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_block_tag.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,22 +1,34 @@
<?php
+
+
function myalbum_tag_block_cloud_show($options)
{
+ if (file_exists($fileinc = XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php")) {
+ global $module_dirname;
include_once XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php";
return tag_block_cloud_show($options, $module_dirname);
+ }
}
function myalbum_tag_block_cloud_edit($options)
{
+ if (file_exists($fileinc = XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php")) {
include_once XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php";
return tag_block_cloud_edit($options);
+ }
}
function myalbum_tag_block_top_show($options)
{
+ if (file_exists($fileinc = XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php")) {
+ global $module_dirname;
include_once XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php";
return tag_block_top_show($options, $module_dirname);
+ }
}
function myalbum_tag_block_top_edit($options)
{
+ if (file_exists($fileinc = XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php")) {
include_once XOOPS_ROOT_PATH . "/modules/tag/blocks/block.php";
return tag_block_top_edit($options);
+ }
}
-?>
\ No newline at end of file
+
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_rphoto.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_rphoto.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_rphoto.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -6,7 +6,7 @@
function b_myalbum_rphoto_show( $options )
{
- global $xoopsDB ;
+ global $xoopsDB, $mod_url ,$table_photos, $myalbum_normal_exts;
// For myAlbum-P < 2.70
if( strncmp( $options[0] , 'myalbum' , 7 ) != 0 ) {
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_tophits.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_tophits.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_tophits.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -6,7 +6,7 @@
function b_myalbum_tophits_show( $options )
{
- global $xoopsDB ;
+ global $xoopsDB, $table_photos, $mod_url, $myalbum_normal_exts, $myts ;
// For myAlbum-P < 2.70
if( strncmp( $options[0] , 'myalbum' , 7 ) != 0 ) {
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_topnews.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_topnews.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/blocks/myalbum_topnews.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -6,7 +6,7 @@
function b_myalbum_topnews_show( $options )
{
- global $xoopsDB ;
+ global $xoopsDB, $mod_url ,$table_photos,$myalbum_normal_exts ;
// For myAlbum-P < 2.70
if( strncmp( $options[0] , 'myalbum' , 7 ) != 0 ) {
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/myalbum.textsanitizer.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/myalbum.textsanitizer.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/myalbum.textsanitizer.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -19,7 +19,7 @@
*
* @todo Sofar, this does nuttin' ;-)
*/
- function MyAlbumTextSanitizer()
+ function __construct()
{
}
@@ -32,7 +32,7 @@
* @static
* @staticvar object
*/
- function &getInstance()
+ static function &getInstance()
{
static $instance;
if (!isset($instance)) {
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/photos.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/photos.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/class/photos.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -119,7 +119,7 @@
$catHandler = xoops_getmodulehandler('cat');
$textHandler = xoops_getmodulehandler('text');
$userHandler = xoops_gethandler('user');
- $statusHandler = xoops_getmodulehandler('status');
+//mb $statusHandler = xoops_getmodulehandler('status');
$ret['photo'] = parent::toArray();
$cat = $catHandler->get($this->getVar('cid'));
@@ -134,7 +134,8 @@
}
$user = $userHandler->get($this->getVar('submitter'));
- $ret['status'] = $statusHandler->get($this->getVar('status'));
+//mb $ret['status'] = $statusHandler->get($this->getVar('status'));
+ $ret['status'] = $this->getVar('status'); //mb
$ret['user'] = $user->toArray();
return $ret;
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/docs/changelog.txt 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,7 +1,12 @@
2013-08-08 v3.07 RC 3
-- fixed: image is not sized properly (mamba)
-- fixed: in PhotoManagement, MyAlbum deletes all pictures, regardless which were selected (mamba)
+- fix: image is not sized properly (mamba)
+- fix: in PhotoManagement, MyAlbum deletes all pictures, regardless which were selected (mamba)
- updated to XOOPS Admin GUI (mamba)
+- fix: pagination in front, as well as in Submitted Photos tab (mamba)
+- fix: missing Smarty variables (mamba)
+- fix: blocks when there is no Tag module (mamba)
+- fix: missing variables in blocks (mamba)
+- added: delete icons in photo views
2012-06-26 v3.06
- fixed many bugs (cesag/black_beard)
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/editphoto.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/editphoto.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/editphoto.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -92,19 +92,25 @@
$submitter = intval( $_POST['submitter'] ) ;
}
- // status change
- if( $isadmin ) {
- $valid = empty( $_POST['valid'] ) ? 0 : intval( $_POST['valid'] ) ;
- if( empty( $_POST['old_status'] ) ) {
- if( $valid == 0 ) $valid = null ;
- else $valid = 1 ;
- } else {
- if( $valid == 0 ) $valid = 0 ;
- else $valid = 2 ;
- }
- } else {
- $valid = 2 ;
- }
+ // status change
+ if ($isadmin) {
+ $valid = empty($_POST['valid']) ? 0 : intval($_POST['valid']);
+ if (empty($_POST['old_status'])) {
+ if ($valid == 0) {
+ $valid = null;
+ } else {
+ $valid = 1;
+ }
+ } else {
+ if ($valid == 0) {
+ $valid = 1;
+ } else {
+ $valid = 2;
+ }
+ }
+ } else {
+ $valid = 2;
+ }
$cid = empty( $_POST['cid'] ) ? 0 : intval( $_POST['cid'] ) ;
@@ -166,11 +172,12 @@
$title = $GLOBALS['myts']->stripSlashesGPC( $_POST["title"] ) ;
$desc_text = $GLOBALS['myts']->stripSlashesGPC( $_POST["desc_text"] ) ;
$cid = intval( $_POST['cid'] ) ;
+ $ext = $_POST['ext'] ;
if ($GLOBALS['myalbumModuleConfig']['tag']) {
$tag_handler = xoops_getmodulehandler('tag', 'tag');
$tag_handler->updateByItem($_POST["tags"], $lid, $GLOBALS['myalbumModule']->getVar("dirname"), $cid);
}
- myalbum_update_photo( $lid , $cid , $title , $desc_text , $valid ) ;
+ myalbum_update_photo( $lid , $cid , $title , $desc_text , $valid ) ;
exit ;
}
@@ -269,5 +276,3 @@
myalbum_footer() ;
include( XOOPS_ROOT_PATH . "/footer.php" ) ;
-
-?>
\ No newline at end of file
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/imagemanager.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/imagemanager.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/imagemanager.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -119,6 +119,7 @@
'nicename' => $GLOBALS['myts']->htmlSpecialChars( $title ) ,
'src' => "$thumbs_url/{$lid}.{$image_ext}" ,
'can_edit' => ( ( $global_perms & GPERM_EDITABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
+ 'can_delete' => ( ( $global_perms & GPERM_DELETABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
'width_spec' => $width_spec ,
'xcodel' => $xcodel ,
'xcodec' => $xcodec ,
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/assign_globals.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/assign_globals.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/assign_globals.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -17,6 +17,7 @@
'lang_popular' => _ALBM_POPULAR ,
'lang_ratethisphoto' => _ALBM_RATETHISPHOTO ,
'lang_editthisphoto' => _ALBM_EDITTHISPHOTO ,
+ 'lang_deletethisphoto' => _ALBM_DELETE_THIS_PHOTO ,
'lang_guestname' => _ALBM_CAPTION_GUESTNAME ,
'lang_category' => _ALBM_CAPTION_CATEGORY ,
'lang_nomatch' => _ALBM_NOMATCH ,
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/draw_functions.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/draw_functions.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/draw_functions.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -66,7 +66,8 @@
extract($photo->toArray(true));
$text = $text_handler->get($photo->getVar('lid'));
$cat = $cat_handler->get($photo->getVar('cid'));
-
+ $ext = $photo->vars['ext']['value'];
+
if( in_array( strtolower( $ext ) , $myalbum_normal_exts ) ) {
$imgsrc_thumb = $photo->getThumbsURL() ;
$imgsrc_photo = $photo->getPhotoURL() ;
@@ -144,6 +145,7 @@
'ahref_photo' => $ahref_photo ,
'width_spec' => $width_spec ,
'can_edit' => ( ( $global_perms & GPERM_EDITABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
+ 'can_delete' => ( ( $global_perms & GPERM_DELETABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
'submitter' => $submitter ,
'submitter_name' => $submitter_name ,
'hits' => $hits ,
@@ -218,6 +220,7 @@
'imgsrc_photo' => $imgsrc_photo ,
'width_spec' => $width_spec ,
'can_edit' => ( ( $global_perms & GPERM_EDITABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
+ 'can_delete' => ( ( $global_perms & GPERM_DELETABLE ) && ( $my_uid == $submitter || $isadmin ) ) ,
'hits' => $hits ,
'rating' => $rating ,
'rank' => floor( $rating - 0.001 ) ,
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/functions.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/functions.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/include/functions.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -248,7 +248,7 @@
return 2 ;
}
echo __LINE__.'<br/>';
- if( $bundled_2 ) {
+ if( !$bundled_2 ) {
$dst_img = imagecreate( $new_w , $new_h ) ;
imagecopyresampled( $dst_img , $src_img , 0 , 0 , 0 , 0 , $new_w , $new_h , $width , $height ) ;
} else {
@@ -698,9 +698,17 @@
$photo->setVar('cid', $cid);
$photo->setVar('title', $title);
- $photo->setVar('ext', $ext);
- $photo->setVar('res_x', $dim[0]);
- $photo->setVar('res_y', $dim[1]);
+
+if ($ext !='') $photo->setVar('ext', $ext);
+if ($x !='') $photo->setVar('res_x', $x);
+if ($y !='') $photo->setVar('res_y', $y);
+
+
+
+$cid = empty( $_POST['cid'] ) ? 0 : intval( $_POST['cid'] ) ;
+
+
+
if ($photos_handler->insert($photo, true)) {
$text->setVar('description', $desc);
@$text_handler->insert($text, true);
@@ -799,6 +807,7 @@
$html = $GLOBALS['myts']->displayTarea($html, 1, 1, 1, 1, 1, 1, 1);
$ret = '';
$i=0;
+ if ($html != "") {
if ($i<4) {
foreach(explode('.',strip_tags($html)) as $raw) {
if ($i<4) {
@@ -817,6 +826,7 @@
} else continue;
}
} else continue;
+ }
return trim($ret);
}
?>
\ No newline at end of file
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/main.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/main.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/main.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -10,7 +10,7 @@
define( "_ALBM_BTN_SELECTALL","Select All");
define( "_ALBM_BTN_SELECTNONE","Select None");
define( "_ALBM_BTN_SELECTRVS","Select Reverse");
-define( "_ALBM_FMT_PHOTONUM","%s every a page");
+define( "_ALBM_FMT_PHOTONUM","%s per page");
define( "_ALBM_AM_ADMISSION","Admit Photos");
define( "_ALBM_AM_ADMITTING","Admitted photo(s)");
define( "_ALBM_AM_LABEL_ADMIT","Admit the photos you checked");
@@ -99,6 +99,7 @@
define("_ALBM_LIDDESC","Record Number (Smaller is latter)");
define("_ALBM_NOSHOTS","No Screenshots Available");
define("_ALBM_EDITTHISPHOTO","Edit This Photo");
+define("_ALBM_DELETE_THIS_PHOTO","Delete This Photo");
define("_ALBM_DESCRIPTIONC","Description");
define("_ALBM_EMAILC","Email");
define("_ALBM_CATEGORYC","Category");
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/modinfo.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/modinfo.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/language/english/modinfo.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -116,5 +116,6 @@
define("_ALBM_CFG_DESCENDOFURL","If you change this you will have to modify .htaccess SEO (see /docs)");
define("_ALBM_CFG_ENDOFRSS","End of URL for .htaccess SEO (RSS output)");
define("_ALBM_CFG_DESCENDOFRSS","If you change this you will have to modify .htaccess SEO (see /docs)");
+define("_ALBM_ACTION","Actions");
}
?>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/photo.php
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/photo.php 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/photo.php 2013-08-13 23:10:43 UTC (rev 11902)
@@ -10,6 +10,42 @@
$lid = empty( $_GET['lid'] ) ? 0 : intval( $_GET['lid'] ) ;
$cid = empty( $_GET['cid'] ) ? 0 : intval( $_GET['cid'] ) ;
+if(isset($_GET['op'])) {
+ $op = $_GET['op'];
+} else {
+ $op = 'default';
+}
+
+// Switch operations
+
+function deleteImage($lid)
+{
+ global $global_perms;
+ $photos_handler = xoops_getmodulehandler('photos', $GLOBALS['mydirname']);
+ $photo_obj = $photos_handler->get($lid);
+
+ if (!($global_perms & GPERM_DELETABLE)) {
+ redirect_header("photo.php", 3, _NOPERM);
+ exit;
+ }
+
+ // anti-CSRF
+ if( ! xoopsSecurity::checkReferer() ) die( "XOOPS_URL is not included in your REFERER" ) ;
+
+ // get and check lid is valid
+ if( $lid < 1 ) die( "Invalid photo id." ) ;
+
+ $photos_handler->delete($photo_obj) ;
+
+redirect_header( "index.php" , 2 , _ALBM_DBUPDATED ) ;
+}
+
+switch ($op) {
+ case "delete":
+ deleteImage($lid);
+ case "default":
+ default:
+
myalbum_updaterating( $lid ) ;
$photos_handler = xoops_getmodulehandler('photos', $GLOBALS['mydirname']);
@@ -147,4 +183,4 @@
include( $GLOBALS['xoops']->path("footer.php") ) ;
-?>
\ No newline at end of file
+}
\ No newline at end of file
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_cpanel_admission.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_cpanel_admission.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_cpanel_admission.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -5,7 +5,7 @@
<input type='hidden' name='num' value='<{$num}>'>
<input type='text' name='txt' value='<{$txt}>'>
<input type='submit' value='<{$smarty.const._ALBM_AM_BUTTON_EXTRACT}>' />
- <{$nav_html}>
+ <{$nav_html}>
</form>
<form name='MainForm' action='' method='POST' style='margin-top:0px;'>
<input type='hidden' name='action' value='' />
@@ -23,7 +23,7 @@
<tr class="<{cycle value='even,odd'}>">
<td><img src='<{$thumbs_url}>/<{$photo.photo.lid}>.<{$photo.photo.ext}>'/></td>
<td><input type='checkbox' name='ids[]' value='<{$photo.photo.lid}>' /></td>
- <td><a href='<{$xoops_url}>/modules/<{$mydirname}>/editphoto.php?lid=$photo.photo.lid' target='_blank'><img src='<{$xoops_url}>/modules/<{$mydirname}>/images/editicon.gif' border='0' alt='<{$smarty.const._ALBM_EDITTHISPHOTO}>' title='<{$smarty.const._ALBM_EDITTHISPHOTO}>' /></a></td>
+ <td><a href='<{$xoops_url}>/modules/<{$mydirname}>/editphoto.php?lid=$photo.photo.lid' target='_blank'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$smarty.const._ALBM_EDITTHISPHOTO}>' title='<{$smarty.const._ALBM_EDITTHISPHOTO}>' /></a></td>
<td><{$photo.user.uname}></td>
<td><a href='<{$photos_url}>/<{$photo.lid}>.<{$photo.ext}>' target='_blank'><{$photo.photo.title}></a></td>
<td width='100%'><{$photo.text.description}></td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_imagemanager.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_imagemanager.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_imagemanager.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -84,7 +84,7 @@
<td>
<input type="hidden" name="photo_id[]" value="<{$photo.lid}>" />
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='' /></a>
<{/if}>
<{$photo.nicename}>
</td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_index.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_index.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_index.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -14,7 +14,7 @@
<{$category_options}>
</select>
<{$photo_global_sum}>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</form>
</td>
</tr>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -10,7 +10,7 @@
<span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}> <{$photo.title}></span>
</td>
<td align='right'>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</td>
</tr>
</table>
@@ -36,7 +36,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_photo_in_list.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -27,7 +27,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_list.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_list.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,37 +1,37 @@
-<{strip}>
-<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
-<table width="100%" cellspacing="0" class="outer">
- <tr>
- <td class="even">
- <br />
- <{include file="db:myalbum0_header.html"}>
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
- <td align='left'>
- <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
- </td>
- <td align='right'>
- <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
- </td>
- </tr>
- </table>
- <{if count( $subcategories ) > 0 }>
- <hr />
- <{include file="db:myalbum0_categories.html"}>
- <{/if}>
- </td>
- </tr>
-</table>
-<br />
+<{strip}>
+<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
+<table width="100%" cellspacing="0" class="outer">
+ <tr>
+ <td class="even">
+ <br />
+ <{include file="db:myalbum0_header.html"}>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
+ <td align='left'>
+ <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
+ </td>
+ <td align='right'>
+ <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ </td>
+ </tr>
+ </table>
+ <{if count( $subcategories ) > 0 }>
+ <hr />
+ <{include file="db:myalbum0_categories.html"}>
+ <{/if}>
+ </td>
+ </tr>
+</table>
+<br />
<{if $photo_small_sum < 1 }>
<div align="center">
<{$lang_nomatch}>
</div>
<{else}>
- <table width="100%" cellspacing="0" class="outer">
- <tr>
+ <table width="100%" cellspacing="0" class="outer">
+ <tr>
<td class="even" align="left">
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<div align="center">
<{$lang_sortby}>
<{$lang_title}> (<a href="viewcat.php?cid=<{$category_id}>&uid=<{$uid}>&orderby=titleA"><img src="images/up.gif" border="0" align="middle" alt="" /></a><a href="viewcat.php?cid=<{$category_id}>&uid=<{$uid}>&orderby=titleD"><img src="images/down.gif" border="0" align="middle" alt="" /></a>)
@@ -44,16 +44,16 @@
<b><{$lang_cursortedby}></b>
<br />
<br />
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<hr />
<{/if}>
@@ -64,19 +64,19 @@
<{/foreach}>
</table>
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<hr />
<div align="center">
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<{/if}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_table.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_table.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum0_viewcat_table.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,38 +1,38 @@
-<{strip}>
-<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
-<table width="100%" cellspacing="0" class="outer">
- <tr>
- <td class="even">
- <br />
- <{include file="db:myalbum0_header.html"}>
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
- <td align='left'>
- <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
- </td>
- <td align='right'>
- <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
- </td>
- </tr>
- </table>
- <{if count( $subcategories ) > 0 }>
- <hr />
- <{include file="db:myalbum0_categories.html"}>
- <{/if}>
- </td>
- </tr>
-</table>
-<br />
+<{strip}>
+<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
+<table width="100%" cellspacing="0" class="outer">
+ <tr>
+ <td class="even">
+ <br />
+ <{include file="db:myalbum0_header.html"}>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
+ <td align='left'>
+ <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
+ </td>
+ <td align='right'>
+ <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ </td>
+ </tr>
+ </table>
+ <{if count( $subcategories ) > 0 }>
+ <hr />
+ <{include file="db:myalbum0_categories.html"}>
+ <{/if}>
+ </td>
+ </tr>
+</table>
+<br />
<{if $photo_small_sum < 1 }>
<div align="center">
<{$lang_nomatch}>
</div>
<{else}>
- <table width="100%" cellspacing="0" class="outer">
- <tr>
+ <table width="100%" cellspacing="0" class="outer">
+ <tr>
<td class="even" align="left">
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<div align="center">
<{$lang_sortby}>
<{$lang_title}> (<a href="viewcat.php?cid=<{$category_id}>&orderby=titleA"><img src="images/up.gif" border="0" align="middle" alt="" /></a><a href="viewcat.php?cid=<{$category_id}>&orderby=titleD"><img src="images/down.gif" border="0" align="middle" alt="" /></a>)
@@ -45,16 +45,16 @@
<b><{$lang_cursortedby}></b>
<br />
<br />
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<hr />
<{/if}>
@@ -73,19 +73,19 @@
</tr>
</table>
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<hr />
<div align="center">
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<{/if}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_cpanel_admission.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_cpanel_admission.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_cpanel_admission.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -23,7 +23,7 @@
<tr class="<{cycle value='even,odd'}>">
<td><img src='<{$thumbs_url}>/<{$photo.photo.lid}>.<{$photo.photo.ext}>'/></td>
<td><input type='checkbox' name='ids[]' value='<{$photo.photo.lid}>' /></td>
- <td><a href='<{$xoops_url}>/modules/<{$mydirname}>/editphoto.php?lid=$photo.photo.lid' target='_blank'><img src='<{$xoops_url}>/modules/<{$mydirname}>/images/editicon.gif' border='0' alt='<{$smarty.const._ALBM_EDITTHISPHOTO}>' title='<{$smarty.const._ALBM_EDITTHISPHOTO}>' /></a></td>
+ <td><a href='<{$xoops_url}>/modules/<{$mydirname}>/editphoto.php?lid=$photo.photo.lid' target='_blank'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$smarty.const._ALBM_EDITTHISPHOTO}>' title='<{$smarty.const._ALBM_EDITTHISPHOTO}>' /></a></td>
<td><{$photo.user.uname}></td>
<td><a href='<{$photos_url}>/<{$photo.lid}>.<{$photo.ext}>' target='_blank'><{$photo.photo.title}></a></td>
<td width='100%'><{$photo.text.description}></td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_imagemanager.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_imagemanager.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_imagemanager.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -84,7 +84,7 @@
<td>
<input type="hidden" name="photo_id[]" value="<{$photo.lid}>" />
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='' /></a>
<{/if}>
<{$photo.nicename}>
</td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_index.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_index.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_index.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -14,7 +14,7 @@
<{$category_options}>
</select>
<{$photo_global_sum}>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</form>
</td>
</tr>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -10,7 +10,7 @@
<span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}> <{$photo.title}></span>
</td>
<td align='right'>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</td>
</tr>
</table>
@@ -36,7 +36,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_photo_in_list.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -27,7 +27,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_list.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_list.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,37 +1,37 @@
-<{strip}>
-<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
-<table width="100%" cellspacing="0" class="outer">
- <tr>
- <td class="even">
- <br />
- <{include file="db:myalbum1_header.html"}>
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
- <td align='left'>
- <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
- </td>
- <td align='right'>
- <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
- </td>
- </tr>
- </table>
- <{if count( $subcategories ) > 0 }>
- <hr />
- <{include file="db:myalbum1_categories.html"}>
- <{/if}>
- </td>
- </tr>
-</table>
-<br />
+<{strip}>
+<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
+<table width="100%" cellspacing="0" class="outer">
+ <tr>
+ <td class="even">
+ <br />
+ <{include file="db:myalbum1_header.html"}>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
+ <td align='left'>
+ <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
+ </td>
+ <td align='right'>
+ <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ </td>
+ </tr>
+ </table>
+ <{if count( $subcategories ) > 0 }>
+ <hr />
+ <{include file="db:myalbum1_categories.html"}>
+ <{/if}>
+ </td>
+ </tr>
+</table>
+<br />
<{if $photo_small_sum < 1 }>
<div align="center">
<{$lang_nomatch}>
</div>
<{else}>
- <table width="100%" cellspacing="0" class="outer">
- <tr>
+ <table width="100%" cellspacing="0" class="outer">
+ <tr>
<td class="even" align="left">
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<div align="center">
<{$lang_sortby}>
<{$lang_title}> (<a href="viewcat.php?cid=<{$category_id}>&uid=<{$uid}>&orderby=titleA"><img src="images/up.gif" border="0" align="middle" alt="" /></a><a href="viewcat.php?cid=<{$category_id}>&uid=<{$uid}>&orderby=titleD"><img src="images/down.gif" border="0" align="middle" alt="" /></a>)
@@ -44,16 +44,16 @@
<b><{$lang_cursortedby}></b>
<br />
<br />
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<hr />
<{/if}>
@@ -64,19 +64,19 @@
<{/foreach}>
</table>
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<hr />
<div align="center">
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<{/if}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_table.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_table.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum1_viewcat_table.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -1,38 +1,38 @@
-<{strip}>
-<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
-<table width="100%" cellspacing="0" class="outer">
- <tr>
- <td class="even">
- <br />
- <{include file="db:myalbum1_header.html"}>
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
- <td align='left'>
- <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
- </td>
- <td align='right'>
- <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
- </td>
- </tr>
- </table>
- <{if count( $subcategories ) > 0 }>
- <hr />
- <{include file="db:myalbum1_categories.html"}>
- <{/if}>
- </td>
- </tr>
-</table>
-<br />
+<{strip}>
+<div style="float:right;"><a href="<{$rss}>"><img border='0' src='<{$xoops_url}>/modules/<{$mydirname}>/images/rss.gif'/></a></div>
+<table width="100%" cellspacing="0" class="outer">
+ <tr>
+ <td class="even">
+ <br />
+ <{include file="db:myalbum1_header.html"}>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
+ <td align='left'>
+ <span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}></span> <{$lang_total}><{$photo_total_sum}>
+ </td>
+ <td align='right'>
+ <{if $lang_add_photo}><a href="submit.php?cid=<{$category_id}>"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ </td>
+ </tr>
+ </table>
+ <{if count( $subcategories ) > 0 }>
+ <hr />
+ <{include file="db:myalbum1_categories.html"}>
+ <{/if}>
+ </td>
+ </tr>
+</table>
+<br />
<{if $photo_small_sum < 1 }>
<div align="center">
<{$lang_nomatch}>
</div>
<{else}>
- <table width="100%" cellspacing="0" class="outer">
- <tr>
+ <table width="100%" cellspacing="0" class="outer">
+ <tr>
<td class="even" align="left">
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<div align="center">
<{$lang_sortby}>
<{$lang_title}> (<a href="viewcat.php?cid=<{$category_id}>&orderby=titleA"><img src="images/up.gif" border="0" align="middle" alt="" /></a><a href="viewcat.php?cid=<{$category_id}>&orderby=titleD"><img src="images/down.gif" border="0" align="middle" alt="" /></a>)
@@ -45,16 +45,16 @@
<b><{$lang_cursortedby}></b>
<br />
<br />
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<hr />
<{/if}>
@@ -73,19 +73,19 @@
</tr>
</table>
- <{if $photo_small_sum > 1 }>
+ <{if $photo_small_sum > 1 }>
<hr />
<div align="center">
- <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
- <tr>
+ <table broder='0' cellpadding='0' cellspacing='0' width='100%'>
+ <tr>
<td align='left'>
- <{$photonavinfo}>
- </td>
+ <{$photonavinfo}>
+ </td>
<td align='right'>
- <{$photonav}>
- </td>
- </tr>
- </table>
+ <{$photonav}>
+ </td>
+ </tr>
+ </table>
</div>
<{/if}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_imagemanager.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_imagemanager.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_imagemanager.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -84,7 +84,7 @@
<td>
<input type="hidden" name="photo_id[]" value="<{$photo.lid}>" />
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>' target='_blank'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='' /></a>
<{/if}>
<{$photo.nicename}>
</td>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_index.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_index.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_index.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -14,7 +14,7 @@
<{$category_options}>
</select>
<{$photo_global_sum}>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</form>
</td>
</tr>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -10,7 +10,7 @@
<span style="font-weight:bold;"><a href='index.php'><{$lang_album_main}></a> : <{$album_sub_title}> <{$photo.title}></span>
</td>
<td align='right'>
- <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{$mod_url}>/images/pictadd.gif" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
+ <{if $lang_add_photo}><a href="submit.php"><{$lang_add_photo}><img src="<{xoModuleIcons16 add.png}>" border="0" alt="<{$lang_add_photo}>" title="<{$lang_add_photo}>" /></a><{/if}>
</td>
</tr>
</table>
@@ -36,7 +36,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html
===================================================================
--- XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html 2013-08-13 16:14:26 UTC (rev 11901)
+++ XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_photo_in_list.html 2013-08-13 23:10:43 UTC (rev 11902)
@@ -27,7 +27,7 @@
<{* EDIT ICON *}>
<{if $photo.can_edit}>
- <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{$mod_url}>/images/editicon.gif' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
+ <a href='<{$mod_url}>/editphoto.php?lid=<{$photo.lid}>'><img src='<{xoModuleIcons16 edit.png}>' border='0' alt='<{$lang_editthisphoto}>' title='<{$lang_editthisphoto}>' /></a>
<{/if}>
<{* PHOTO'S SUBJECT *}>
Modified: XoopsModules/myalbum/trunk/htdocs/modules/myalbum/templates/myalbum2_viewcat_list.html
====================================...
[truncated message content] |
|
From: <be...@us...> - 2013-08-13 16:14:30
|
Revision: 11901
http://sourceforge.net/p/xoops/svn/11901
Author: beckmi
Date: 2013-08-13 16:14:26 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Updating to 5.01 Final
Modified Paths:
--------------
XoopsModules/shoutbox/trunk/shoutbox/docs/changelog.txt
XoopsModules/shoutbox/trunk/shoutbox/language/english/modinfo.php
XoopsModules/shoutbox/trunk/shoutbox/online.php
XoopsModules/shoutbox/trunk/shoutbox/xoops_version.php
Added Paths:
-----------
XoopsModules/shoutbox/trunk/shoutbox/images/guestavatars/index.html
XoopsModules/shoutbox/trunk/shoutbox/sql/index.html
Modified: XoopsModules/shoutbox/trunk/shoutbox/docs/changelog.txt
===================================================================
--- XoopsModules/shoutbox/trunk/shoutbox/docs/changelog.txt 2013-08-12 23:08:07 UTC (rev 11900)
+++ XoopsModules/shoutbox/trunk/shoutbox/docs/changelog.txt 2013-08-13 16:14:26 UTC (rev 11901)
@@ -1,4 +1,9 @@
---------------------------------------
+5.01 Final 2013-08-10
+---------------------------------------
+- cosmetic changes in Preferences (mamba)
+
+---------------------------------------
5.01 Beta 1 2012-07-30
---------------------------------------
Added: XoopsModules/shoutbox/trunk/shoutbox/images/guestavatars/index.html
===================================================================
--- XoopsModules/shoutbox/trunk/shoutbox/images/guestavatars/index.html (rev 0)
+++ XoopsModules/shoutbox/trunk/shoutbox/images/guestavatars/index.html 2013-08-13 16:14:26 UTC (rev 11901)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/shoutbox/trunk/shoutbox/language/english/modinfo.php
===================================================================
--- XoopsModules/shoutbox/trunk/shoutbox/language/english/modinfo.php 2013-08-12 23:08:07 UTC (rev 11900)
+++ XoopsModules/shoutbox/trunk/shoutbox/language/english/modinfo.php 2013-08-13 16:14:26 UTC (rev 11901)
@@ -15,51 +15,47 @@
define("_MI_SHOUTBOX_BLOCK","Shoutbox");
// Categories
-define("_MI_SHOUTBOX_CAT1","--- Global Settings ---");
-define("_MI_SHOUTBOX_PREF_CAT1","Global Settings");
-define("_MI_SHOUTBOX_CAT2","--- Block Settings ---");
-define("_MI_SHOUTBOX_PREF_CAT2","Block Settings");
-define("_MI_SHOUTBOX_CAT3","--- PopUp Settings ---");
-define("_MI_SHOUTBOX_PREF_CAT3","PopUp Settings");
-define("_MI_SHOUTBOX_CAT4","--- Text Input Settings ---");
-define("_MI_SHOUTBOX_PREF_CAT4","Text Input Settings");
+define('_MI_SHOUTBOX_CAT1','<font color="#FF0000" size="6"><b>--- Global Settings ---</b></font> ');
+define('_MI_SHOUTBOX_CAT2','<font color="#FF0000" size="6"><b>--- Block Settings ---</b></font> ');
+define('_MI_SHOUTBOX_CAT3','<font color="#FF0000" size="6"><b>--- PopUp Settings ---</b></font> ');
+define('_MI_SHOUTBOX_CAT4','<font color="#FF0000" size="6"><b>--- Text Input Settings ---</b></font> ');
// Config language definitions...
-define("_MI_SHOUTBOX_TITLE1","May guests post?");
-define("_MI_SHOUTBOX_TITLE2","May guests choose a name?");
-define("_MI_SHOUTBOX_DESC2","If guests may post, may they choose an own name?");
-define("_MI_SHOUTBOX_TITLE3","Allow bbcode");
-define("_MI_SHOUTBOX_DESC3","Allow users to use bbcode? Ex [b], [url=], etc..");
-define("_MI_SHOUTBOX_TITLE4","Timestamp Format");
-define("_MI_SHOUTBOX_DESC4","In what format should the time of the shout be formatted? (<a href='http://www.php.net/manual/en/function.date.php' target='_blank'>Manual</a>)");
-define("_MI_SHOUTBOX_TITLE5","Trimming");
-define("_MI_SHOUTBOX_DESC5","Maximum shouts before trimming takes place. (0 = no trimming, be cautious!!!)");
-define("_MI_SHOUTBOX_TITLE6","Max Shouts");
-define("_MI_SHOUTBOX_DESC6","How many shouts should be displayed?");
-define("_MI_SHOUTBOX_TITLE7","Storage");
-define("_MI_SHOUTBOX_DESC7","Define where the shouts should be stored");
-define("_MI_SHOUTBOX_TITLE8","User Real Name");
-define("_MI_SHOUTBOX_DESC8","Should we show user Real name? If 'NO', login name will be used");
-define("_MI_SHOUTBOX_OP7_F","File [csv]");
-define("_MI_SHOUTBOX_OP7_D","Database [mysql]");
+define("_MI_SHOUTBOX_TITLE1", "May guests post?");
+define("_MI_SHOUTBOX_TITLE2", "May guests choose a name?");
+define("_MI_SHOUTBOX_DESC2", "If guests may post, may they choose an own name?");
+define("_MI_SHOUTBOX_TITLE3", "Allow bbcode");
+define("_MI_SHOUTBOX_DESC3", "Allow users to use bbcode? Ex [b], [url=], etc..");
+define("_MI_SHOUTBOX_TITLE4", "Timestamp Format");
+define("_MI_SHOUTBOX_DESC4", "In what format should the time of the shout be formatted? (<a href='http://www.php.net/manual/en/function.date.php' target='_blank'>Manual</a>)");
+define("_MI_SHOUTBOX_TITLE5", "Trimming");
+define("_MI_SHOUTBOX_DESC5", "Maximum shouts before trimming takes place. (0 = no trimming, be cautious!!!)");
+define("_MI_SHOUTBOX_TITLE6", "Max Shouts");
+define("_MI_SHOUTBOX_DESC6", "How many shouts should be displayed?");
+define("_MI_SHOUTBOX_TITLE7", "Storage");
+define("_MI_SHOUTBOX_DESC7", "Define where the shouts should be stored");
+define("_MI_SHOUTBOX_TITLE8", "User Real Name");
+define("_MI_SHOUTBOX_DESC8", "Should we show user Real name? If 'NO', login name will be used");
+define("_MI_SHOUTBOX_OP7_F", "File [csv]");
+define("_MI_SHOUTBOX_OP7_D", "Database [mysql]");
define("_MI_SHOUTBOX_TITLE11","Show smiley bar in block?");
-define("_MI_SHOUTBOX_TITLE12","Shout Message Block IFrame width");
-define("_MI_SHOUTBOX_DESC12","The width of the iframe in the block.");
-define("_MI_SHOUTBOX_TITLE13","Shout Message Block IFrame height");
-define("_MI_SHOUTBOX_DESC13","The height of the iframe in the block.");
-define("_MI_SHOUTBOX_TITLE14","Shout Message IFrame border width");
-define("_MI_SHOUTBOX_TITLE15","PopUp Window Enable");
-define("_MI_SHOUTBOX_DESC15","May users use the block?");
-define("_MI_SHOUTBOX_TITLE16","Auto-refresh Options Display");
-define("_MI_SHOUTBOX_DESC16","Auto-refresh option display in block");
-define("_MI_SHOUTBOX_OP16_BA0","Do not display auto-refresh option");
-define("_MI_SHOUTBOX_OP16_BA1","Display auto-refresh option");
-define("_MI_SHOUTBOX_TITLE17","Shout Message Wordwrap Setting");
-define("_MI_SHOUTBOX_DESC17","This value imposes a limit on the number of characters to display per line in the ShoutBox block frame. Setting this value to 0 disables forced wordwrapping.");
-define("_MI_SHOUTBOX_TITLE18","Avatar Display");
-define("_MI_SHOUTBOX_DESC18","Determines if avatars are displayed in ShoutBox block");
-define("_MI_SHOUTBOX_TITLE19","Guest Avatar");
-define("_MI_SHOUTBOX_DESC19","<table><tr>
+define("_MI_SHOUTBOX_TITLE12", "Shout Message Block IFrame width");
+define("_MI_SHOUTBOX_DESC12", "The width of the iframe in the block.");
+define("_MI_SHOUTBOX_TITLE13", "Shout Message Block IFrame height");
+define("_MI_SHOUTBOX_DESC13", "The height of the iframe in the block.");
+define("_MI_SHOUTBOX_TITLE14", "Shout Message IFrame border width");
+define("_MI_SHOUTBOX_TITLE15", "PopUp Window Enable");
+define("_MI_SHOUTBOX_DESC15", "May users use the block?");
+define("_MI_SHOUTBOX_TITLE16", "Auto-refresh Options Display");
+define("_MI_SHOUTBOX_DESC16", "Auto-refresh option display in block");
+define("_MI_SHOUTBOX_OP16_BA0", "Do not display auto-refresh option");
+define("_MI_SHOUTBOX_OP16_BA1", "Display auto-refresh option");
+define("_MI_SHOUTBOX_TITLE17", "Shout Message Wordwrap Setting");
+define("_MI_SHOUTBOX_DESC17", "This value imposes a limit on the number of characters to display per line in the ShoutBox block frame. Setting this value to 0 disables forced wordwrapping.");
+define("_MI_SHOUTBOX_TITLE18", "Avatar Display");
+define("_MI_SHOUTBOX_DESC18", "Determines if avatars are displayed in ShoutBox block");
+define("_MI_SHOUTBOX_TITLE19", "Guest Avatar");
+define("_MI_SHOUTBOX_DESC19", "<table><tr>
<td><img src=\"".XOOPS_URL."/modules/shoutbox/images/guestavatars/guest1.gif\" width=60></td>
<td><img src=\"".XOOPS_URL."/modules/shoutbox/images/guestavatars/guest2.gif\" width=60></td>
<td><img src=\"".XOOPS_URL."/modules/shoutbox/images/guestavatars/guest3.gif\" width=60></td>
@@ -72,46 +68,46 @@
<td>guest4</td>
<td>guest5</td>
</tr></table>");
-define("_MI_SHOUTBOX_OP19_GA0","None");
-define("_MI_SHOUTBOX_OP19_GA1","guest1");
-define("_MI_SHOUTBOX_OP19_GA2","guest2");
-define("_MI_SHOUTBOX_OP19_GA3","guest3");
-define("_MI_SHOUTBOX_OP19_GA4","guest4");
-define("_MI_SHOUTBOX_OP19_GA5","guest5");
+define("_MI_SHOUTBOX_OP19_GA0", "None");
+define("_MI_SHOUTBOX_OP19_GA1", "guest1");
+define("_MI_SHOUTBOX_OP19_GA2", "guest2");
+define("_MI_SHOUTBOX_OP19_GA3", "guest3");
+define("_MI_SHOUTBOX_OP19_GA4", "guest4");
+define("_MI_SHOUTBOX_OP19_GA5", "guest5");
-define("_MI_SHOUTBOX_TITLE31","Show 'Who's online'");
-define("_MI_SHOUTBOX_DESC31","Show in the popup who's on-line. Warning: Who's on-line block has to be activated!");
-define("_MI_SHOUTBOX_TITLE32","Show smiley bar in PopUp");
-define("_MI_SHOUTBOX_TITLE33","Play sound on new message?");
-define("_MI_SHOUTBOX_TITLE34","May guests use popup?");
-define("_MI_SHOUTBOX_DESC34","If the popup is activated, may guests use it?");
-define("_MI_SHOUTBOX_TITLE35","IRC-a-like");
-define("_MI_SHOUTBOX_DESC35","Enable IRC commands. At this time only /quit and /nick are supported.");
-define("_MI_SHOUTBOX_TITLE36","Auto-focus");
-define("_MI_SHOUTBOX_DESC36","Automaticly focus the popup window when there comes a new message.");
-define("_MI_SHOUTBOX_TITLE37","PopUp Width");
-define("_MI_SHOUTBOX_DESC37","Default popup width (in pixels)");
-define("_MI_SHOUTBOX_TITLE38","PopUp Height");
-define("_MI_SHOUTBOX_DESC38","Default popup height (in pixels)");
-define("_MI_SHOUTBOX_TITLE40","Shout Text Input Type");
-define("_MI_SHOUTBOX_DESC40","Shout text entry form selection");
-define("_MI_SHOUTBOX_OP40_TL","Single Line Text");
-define("_MI_SHOUTBOX_OP40_TA","Multi-line Text Area");
-define("_MI_SHOUTBOX_TITLE41","Text Area Rows");
-define("_MI_SHOUTBOX_DESC41","Height of text area in rows<br />Only applicable when Shout Text Entry Form Selection = Multi-line Text Area");
-define("_MI_SHOUTBOX_TITLE42","Text Area Columns");
-define("_MI_SHOUTBOX_DESC42","Width of text area in columns<br />Only applicable when Shout Text Entry Form Selection = Multi-line Text Area");
-define("_MI_SHOUTBOX_TITLE43","Text Line Length");
-define("_MI_SHOUTBOX_DESC43","Width of single line text entry in characters");
-define("_MI_SHOUTBOX_TITLE44","Text Max Characters");
-define("_MI_SHOUTBOX_DESC44","Maximum length of text entry");
-define("_MI_SHOUTBOX_TITLE45","Text Input Maximum Alerts");
-define("_MI_SHOUTBOX_DESC45","Enables alert messages when approaching and reaching maximum text entry limit");
-define("_MI_SHOUTBOX_TITLE46","Captcha Enable");
-define("_MI_SHOUTBOX_DESC46","Enables captcha confirmation code requirement (anti-spam measure)");
-define("_MI_SHOUTBOX_OP46_A","Disabled - Frameworks/captcha not found");
-define("_MI_SHOUTBOX_OP46_B","Disable Captcha");
-define("_MI_SHOUTBOX_OP46_C","Enable Frameworks Captcha");
-define("_MI_SHOUTBOX_OP46_D","Enable Core Captcha");
-define('_MI_SHOUTBOX_EMPTY','');
+define("_MI_SHOUTBOX_TITLE31", "Show 'Who's online'");
+define("_MI_SHOUTBOX_DESC31", "Show in the popup who's on-line. Warning: Who's on-line block has to be activated!");
+define("_MI_SHOUTBOX_TITLE32", "Show smiley bar in PopUp");
+define("_MI_SHOUTBOX_TITLE33", "Play sound on new message?");
+define("_MI_SHOUTBOX_TITLE34", "May guests use popup?");
+define("_MI_SHOUTBOX_DESC34", "If the popup is activated, may guests use it?");
+define("_MI_SHOUTBOX_TITLE35", "IRC-a-like");
+define("_MI_SHOUTBOX_DESC35", "Enable IRC commands. At this time only /quit and /nick are supported.");
+define("_MI_SHOUTBOX_TITLE36", "Auto-focus");
+define("_MI_SHOUTBOX_DESC36", "Automaticly focus the popup window when there comes a new message.");
+define("_MI_SHOUTBOX_TITLE37", "PopUp Width");
+define("_MI_SHOUTBOX_DESC37", "Default popup width (in pixels)");
+define("_MI_SHOUTBOX_TITLE38", "PopUp Height");
+define("_MI_SHOUTBOX_DESC38", "Default popup height (in pixels)");
+define("_MI_SHOUTBOX_TITLE40", "Shout Text Input Type");
+define("_MI_SHOUTBOX_DESC40", "Shout text entry form selection");
+define("_MI_SHOUTBOX_OP40_TL", "Single Line Text");
+define("_MI_SHOUTBOX_OP40_TA", "Multi-line Text Area");
+define("_MI_SHOUTBOX_TITLE41", "Text Area Rows");
+define("_MI_SHOUTBOX_DESC41", "Height of text area in rows<br />Only applicable when Shout Text Entry Form Selection = Multi-line Text Area");
+define("_MI_SHOUTBOX_TITLE42", "Text Area Columns");
+define("_MI_SHOUTBOX_DESC42", "Width of text area in columns<br />Only applicable when Shout Text Entry Form Selection = Multi-line Text Area");
+define("_MI_SHOUTBOX_TITLE43", "Text Line Length");
+define("_MI_SHOUTBOX_DESC43", "Width of single line text entry in characters");
+define("_MI_SHOUTBOX_TITLE44", "Text Max Characters");
+define("_MI_SHOUTBOX_DESC44", "Maximum length of text entry");
+define("_MI_SHOUTBOX_TITLE45", "Text Input Maximum Alerts");
+define("_MI_SHOUTBOX_DESC45", "Enables alert messages when approaching and reaching maximum text entry limit");
+define("_MI_SHOUTBOX_TITLE46", "Captcha Enable");
+define("_MI_SHOUTBOX_DESC46", "Enables captcha confirmation code requirement (anti-spam measure)");
+define("_MI_SHOUTBOX_OP46_A", "Disabled - Frameworks/captcha not found");
+define("_MI_SHOUTBOX_OP46_B", "Disable Captcha");
+define("_MI_SHOUTBOX_OP46_C", "Enable Frameworks Captcha");
+define("_MI_SHOUTBOX_OP46_D", "Enable Core Captcha");
+define('_MI_SHOUTBOX_EMPTY', '');
?>
\ No newline at end of file
Modified: XoopsModules/shoutbox/trunk/shoutbox/online.php
===================================================================
--- XoopsModules/shoutbox/trunk/shoutbox/online.php 2013-08-12 23:08:07 UTC (rev 11900)
+++ XoopsModules/shoutbox/trunk/shoutbox/online.php 2013-08-13 16:14:26 UTC (rev 11901)
@@ -69,5 +69,4 @@
$xoopsTpl->assign('online_total', $online_total);
$xoopsTpl->xoops_setCaching(0);
-$xoopsTpl->display('db:shoutbox_online.html');
-?>
\ No newline at end of file
+$xoopsTpl->display('db:shoutbox_online.html');
\ No newline at end of file
Added: XoopsModules/shoutbox/trunk/shoutbox/sql/index.html
===================================================================
--- XoopsModules/shoutbox/trunk/shoutbox/sql/index.html (rev 0)
+++ XoopsModules/shoutbox/trunk/shoutbox/sql/index.html 2013-08-13 16:14:26 UTC (rev 11901)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/shoutbox/trunk/shoutbox/xoops_version.php
===================================================================
--- XoopsModules/shoutbox/trunk/shoutbox/xoops_version.php 2013-08-12 23:08:07 UTC (rev 11900)
+++ XoopsModules/shoutbox/trunk/shoutbox/xoops_version.php 2013-08-13 16:14:26 UTC (rev 11901)
@@ -29,22 +29,22 @@
$modversion['credits'] = "The XOOPS Project";
$modversion['help'] = 'page=help';
$modversion['license'] = 'GNU GPL 2.0 or later';
-$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html";
$modversion['official'] = 0;
$modversion['image'] = "images/module_logo.png";
-$modversion['dirname'] = "shoutbox";
+$modversion['dirname'] = basename(dirname(__FILE__));
$modversion['author'] = 'Tank, Trabis';
$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2012/05/09';
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion['release_date'] = '2013/08/10';
+$modversion["module_website_url"] = "www.xoops.org";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC 1";
+$modversion["module_status"] = "Final";
$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = "2.5.5";
+$modversion['min_xoops'] = "2.5.6";
$modversion['min_admin'] = '1.1';
$modversion['min_db'] = array(
'mysql' => '5.0.7', 'mysqli' => '5.0.7'
@@ -89,263 +89,265 @@
// Config settings
// Global settings:
-$modversion['config'][0]['name'] = 'global_settings';
-$modversion['config'][0]['title'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][0]['description'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][0]['formtype'] = 'select';
-$modversion['config'][0]['valuetype'] = 'text';
-$modversion['config'][0]['options'] = array('_MI_SHOUTBOX_CAT1' => '1');
+$i=0;
+$modversion['config'][$i]['name'] = 'logfile';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_CAT1';
+$modversion['config'][$i]['description'] = '_MI_USERLOG_CONFCAT_LOGFILE_DSC';
+$modversion['config'][$i]['formtype'] = 'line_break';
+$modversion['config'][$i]['valuetype'] = 'textbox';
+$modversion['config'][$i]['default'] = 'odd';
+$i++;
+$modversion['config'][$i]['name'] = 'guests_may_post';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE1';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_EMPTY';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'guests_may_chname';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE2';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC2';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 0;
+$i++;
+$modversion['config'][$i]['name'] = 'allow_bbcode';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE3';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC3';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'stamp_format';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE4';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC4';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = 'h:i a';
+$i++;
+$modversion['config'][$i]['name'] = 'maxshouts_trim';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE5';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC5';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = '20';
+$i++;
+$modversion['config'][$i]['name'] = 'maxshouts_view';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE6';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC6';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = '20';
+$i++;
+$modversion['config'][$i]['name'] = 'storage_type';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE7';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC7';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['options'] = array('_MI_SHOUTBOX_OP7_F' => 'file', '_MI_SHOUTBOX_OP7_D' => 'database');
+$modversion['config'][$i]['default'] = 'file';
+$i++;
+$modversion['config'][$i]['name'] = 'user_realname';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE8';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC8';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 0;
-$modversion['config'][1]['name'] = 'guests_may_post';
-$modversion['config'][1]['title'] = '_MI_SHOUTBOX_TITLE1';
-$modversion['config'][1]['description'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][1]['formtype'] = 'yesno';
-$modversion['config'][1]['valuetype'] = 'int';
-$modversion['config'][1]['default'] = 1;
-
-$modversion['config'][2]['name'] = 'guests_may_chname';
-$modversion['config'][2]['title'] = '_MI_SHOUTBOX_TITLE2';
-$modversion['config'][2]['description'] = '_MI_SHOUTBOX_DESC2';
-$modversion['config'][2]['formtype'] = 'yesno';
-$modversion['config'][2]['valuetype'] = 'int';
-$modversion['config'][2]['default'] = 0;
-
-$modversion['config'][3]['name'] = 'allow_bbcode';
-$modversion['config'][3]['title'] = '_MI_SHOUTBOX_TITLE3';
-$modversion['config'][3]['description'] = '_MI_SHOUTBOX_DESC3';
-$modversion['config'][3]['formtype'] = 'yesno';
-$modversion['config'][3]['valuetype'] = 'int';
-$modversion['config'][3]['default'] = 1;
-
-$modversion['config'][4]['name'] = 'stamp_format';
-$modversion['config'][4]['title'] = '_MI_SHOUTBOX_TITLE4';
-$modversion['config'][4]['description'] = '_MI_SHOUTBOX_DESC4';
-$modversion['config'][4]['formtype'] = 'textbox';
-$modversion['config'][4]['valuetype'] = 'text';
-$modversion['config'][4]['default'] = 'h:i a';
-
-$modversion['config'][5]['name'] = 'maxshouts_trim';
-$modversion['config'][5]['title'] = '_MI_SHOUTBOX_TITLE5';
-$modversion['config'][5]['description'] = '_MI_SHOUTBOX_DESC5';
-$modversion['config'][5]['formtype'] = 'textbox';
-$modversion['config'][5]['valuetype'] = 'int';
-$modversion['config'][5]['default'] = '20';
-
-$modversion['config'][6]['name'] = 'maxshouts_view';
-$modversion['config'][6]['title'] = '_MI_SHOUTBOX_TITLE6';
-$modversion['config'][6]['description'] = '_MI_SHOUTBOX_DESC6';
-$modversion['config'][6]['formtype'] = 'textbox';
-$modversion['config'][6]['valuetype'] = 'int';
-$modversion['config'][6]['default'] = '20';
-
-$modversion['config'][7]['name'] = 'storage_type';
-$modversion['config'][7]['title'] = '_MI_SHOUTBOX_TITLE7';
-$modversion['config'][7]['description'] = '_MI_SHOUTBOX_DESC7';
-$modversion['config'][7]['formtype'] = 'select';
-$modversion['config'][7]['valuetype'] = 'text';
-$modversion['config'][7]['options'] = array('_MI_SHOUTBOX_OP7_F' => 'file', '_MI_SHOUTBOX_OP7_D' => 'database');
-$modversion['config'][7]['default'] = 'file';
-
-$modversion['config'][8]['name'] = 'user_realname';
-$modversion['config'][8]['title'] = '_MI_SHOUTBOX_TITLE8';
-$modversion['config'][8]['description'] = '_MI_SHOUTBOX_DESC8';
-$modversion['config'][8]['formtype'] = 'yesno';
-$modversion['config'][8]['valuetype'] = 'int';
-$modversion['config'][8]['default'] = 0;
-
// Block Settings:
-$modversion['config'][10]['name'] = 'block_settings';
-$modversion['config'][10]['title'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][10]['description'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][10]['formtype'] = 'select';
-$modversion['config'][10]['valuetype'] = 'text';
-$modversion['config'][10]['options'] = array('_MI_SHOUTBOX_CAT2' => '1');
+$i++;
+$modversion['config'][$i]['name'] = 'logfile';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_CAT2';
+$modversion['config'][$i]['description'] = '_MI_USERLOG_CONFCAT_LOGFILE_DSC';
+$modversion['config'][$i]['formtype'] = 'line_break';
+$modversion['config'][$i]['valuetype'] = 'textbox';
+$modversion['config'][$i]['default'] = 'odd';
+$i++;
+$modversion['config'][$i]['name'] = 'show_smileybar';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE11';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_EMPTY';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'iframe_width';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE12';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC12';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '100%';
+$i++;
+$modversion['config'][$i]['name'] = 'iframe_height';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE13';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC13';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '150';
+$i++;
+$modversion['config'][$i]['name'] = 'iframe_border';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE14';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_EMPTY';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '0';
+$i++;
+$modversion['config'][$i]['name'] = 'popup';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE15';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC15';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'block_autorefresh';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE16';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC16';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['options'] = Array('_MI_SHOUTBOX_OP16_BA0' => 0, '_MI_SHOUTBOX_OP16_BA1' => 1);
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'wordwrap_setting';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE17';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC17';
+$modversion['config'][$i]['formtype'] = 'text';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 0;
+$i++;
+$modversion['config'][$i]['name'] = 'display_avatar';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE18';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC18';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'guest_avatar';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE19';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC19';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['options'] = array('_MI_SHOUTBOX_OP19_GA0' => 0, '_MI_SHOUTBOX_OP19_GA1' => 1, '_MI_SHOUTBOX_OP19_GA2' => 2, '_MI_SHOUTBOX_OP19_GA3' => 3, '_MI_SHOUTBOX_OP19_GA4' => 4, '_MI_SHOUTBOX_OP19_GA5' => 5);
+$modversion['config'][$i]['default'] = 1;
-$modversion['config'][11]['name'] = 'show_smileybar';
-$modversion['config'][11]['title'] = '_MI_SHOUTBOX_TITLE11';
-$modversion['config'][11]['description'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][11]['formtype'] = 'yesno';
-$modversion['config'][11]['valuetype'] = 'int';
-$modversion['config'][11]['default'] = 1;
-
-$modversion['config'][12]['name'] = 'iframe_width';
-$modversion['config'][12]['title'] = '_MI_SHOUTBOX_TITLE12';
-$modversion['config'][12]['description'] = '_MI_SHOUTBOX_DESC12';
-$modversion['config'][12]['formtype'] = 'textbox';
-$modversion['config'][12]['valuetype'] = 'text';
-$modversion['config'][12]['default'] = '100%';
-
-$modversion['config'][13]['name'] = 'iframe_height';
-$modversion['config'][13]['title'] = '_MI_SHOUTBOX_TITLE13';
-$modversion['config'][13]['description'] = '_MI_SHOUTBOX_DESC13';
-$modversion['config'][13]['formtype'] = 'textbox';
-$modversion['config'][13]['valuetype'] = 'text';
-$modversion['config'][13]['default'] = '150';
-
-$modversion['config'][14]['name'] = 'iframe_border';
-$modversion['config'][14]['title'] = '_MI_SHOUTBOX_TITLE14';
-$modversion['config'][14]['description'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][14]['formtype'] = 'textbox';
-$modversion['config'][14]['valuetype'] = 'text';
-$modversion['config'][14]['default'] = '0';
-
-$modversion['config'][15]['name'] = 'popup';
-$modversion['config'][15]['title'] = '_MI_SHOUTBOX_TITLE15';
-$modversion['config'][15]['description'] = '_MI_SHOUTBOX_DESC15';
-$modversion['config'][15]['formtype'] = 'yesno';
-$modversion['config'][15]['valuetype'] = 'int';
-$modversion['config'][15]['default'] = 1;
-
-$modversion['config'][16]['name'] = 'block_autorefresh';
-$modversion['config'][16]['title'] = '_MI_SHOUTBOX_TITLE16';
-$modversion['config'][16]['description'] = '_MI_SHOUTBOX_DESC16';
-$modversion['config'][16]['formtype'] = 'select';
-$modversion['config'][16]['valuetype'] = 'int';
-$modversion['config'][16]['options'] = Array('_MI_SHOUTBOX_OP16_BA0' => 0, '_MI_SHOUTBOX_OP16_BA1' => 1);
-$modversion['config'][16]['default'] = 1;
-
-$modversion['config'][17]['name'] = 'wordwrap_setting';
-$modversion['config'][17]['title'] = '_MI_SHOUTBOX_TITLE17';
-$modversion['config'][17]['description'] = '_MI_SHOUTBOX_DESC17';
-$modversion['config'][17]['formtype'] = 'text';
-$modversion['config'][17]['valuetype'] = 'int';
-$modversion['config'][17]['default'] = 0;
-
-$modversion['config'][18]['name'] = 'display_avatar';
-$modversion['config'][18]['title'] = '_MI_SHOUTBOX_TITLE18';
-$modversion['config'][18]['description'] = '_MI_SHOUTBOX_DESC18';
-$modversion['config'][18]['formtype'] = 'yesno';
-$modversion['config'][18]['valuetype'] = 'int';
-$modversion['config'][18]['default'] = 1;
-
-$modversion['config'][19]['name'] = 'guest_avatar';
-$modversion['config'][19]['title'] = '_MI_SHOUTBOX_TITLE19';
-$modversion['config'][19]['description'] = '_MI_SHOUTBOX_DESC19';
-$modversion['config'][19]['formtype'] = 'select';
-$modversion['config'][19]['valuetype'] = 'int';
-$modversion['config'][19]['options'] = array('_MI_SHOUTBOX_OP19_GA0' => 0, '_MI_SHOUTBOX_OP19_GA1' => 1, '_MI_SHOUTBOX_OP19_GA2' => 2, '_MI_SHOUTBOX_OP19_GA3' => 3, '_MI_SHOUTBOX_OP19_GA4' => 4, '_MI_SHOUTBOX_OP19_GA5' => 5);
-$modversion['config'][19]['default'] = 1;
-
// PopUp:
-$modversion['config'][30]['name'] = 'popup_settings';
-$modversion['config'][30]['title'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][30]['description'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][30]['formtype'] = 'select';
-$modversion['config'][30]['valuetype'] = 'text';
-$modversion['config'][30]['options'] = array('_MI_SHOUTBOX_CAT3' => '1');
+$i++;
+$modversion['config'][$i]['name'] = 'logfile';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_CAT3';
+$modversion['config'][$i]['description'] = '_MI_USERLOG_CONFCAT_LOGFILE_DSC';
+$modversion['config'][$i]['formtype'] = 'line_break';
+$modversion['config'][$i]['valuetype'] = 'textbox';
+$modversion['config'][$i]['default'] = 'odd';
+$i++;
+$modversion['config'][$i]['name'] = 'popup_whoisonline';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE31';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC31';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'popup_show_smileybar';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE32';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_EMPTY';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'popup_sound';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE33';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_EMPTY';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'popup_guests';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE34';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC34';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 0;
+$i++;
+$modversion['config'][$i]['name'] = 'popup_irc';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE35';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC35';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'popup_autofocus';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE36';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC36';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'popup_width';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE37';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC37';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '500';
+$i++;
+$modversion['config'][$i]['name'] = 'popup_height';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE38';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC38';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '340';
-$modversion['config'][31]['name'] = 'popup_whoisonline';
-$modversion['config'][31]['title'] = '_MI_SHOUTBOX_TITLE31';
-$modversion['config'][31]['description'] = '_MI_SHOUTBOX_DESC31';
-$modversion['config'][31]['formtype'] = 'yesno';
-$modversion['config'][31]['valuetype'] = 'int';
-$modversion['config'][31]['default'] = 1;
-
-$modversion['config'][32]['name'] = 'popup_show_smileybar';
-$modversion['config'][32]['title'] = '_MI_SHOUTBOX_TITLE32';
-$modversion['config'][32]['description'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][32]['formtype'] = 'yesno';
-$modversion['config'][32]['valuetype'] = 'int';
-$modversion['config'][32]['default'] = 1;
-
-$modversion['config'][33]['name'] = 'popup_sound';
-$modversion['config'][33]['title'] = '_MI_SHOUTBOX_TITLE33';
-$modversion['config'][33]['description'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][33]['formtype'] = 'yesno';
-$modversion['config'][33]['valuetype'] = 'int';
-$modversion['config'][33]['default'] = 1;
-
-$modversion['config'][34]['name'] = 'popup_guests';
-$modversion['config'][34]['title'] = '_MI_SHOUTBOX_TITLE34';
-$modversion['config'][34]['description'] = '_MI_SHOUTBOX_DESC34';
-$modversion['config'][34]['formtype'] = 'yesno';
-$modversion['config'][34]['valuetype'] = 'int';
-$modversion['config'][34]['default'] = 0;
-
-$modversion['config'][35]['name'] = 'popup_irc';
-$modversion['config'][35]['title'] = '_MI_SHOUTBOX_TITLE35';
-$modversion['config'][35]['description'] = '_MI_SHOUTBOX_DESC35';
-$modversion['config'][35]['formtype'] = 'yesno';
-$modversion['config'][35]['valuetype'] = 'int';
-$modversion['config'][35]['default'] = 1;
-
-$modversion['config'][36]['name'] = 'popup_autofocus';
-$modversion['config'][36]['title'] = '_MI_SHOUTBOX_TITLE36';
-$modversion['config'][36]['description'] = '_MI_SHOUTBOX_DESC36';
-$modversion['config'][36]['formtype'] = 'yesno';
-$modversion['config'][36]['valuetype'] = 'int';
-$modversion['config'][36]['default'] = 1;
-
-$modversion['config'][37]['name'] = 'popup_width';
-$modversion['config'][37]['title'] = '_MI_SHOUTBOX_TITLE37';
-$modversion['config'][37]['description'] = '_MI_SHOUTBOX_DESC37';
-$modversion['config'][37]['formtype'] = 'textbox';
-$modversion['config'][37]['valuetype'] = 'text';
-$modversion['config'][37]['default'] = '500';
-
-$modversion['config'][38]['name'] = 'popup_height';
-$modversion['config'][38]['title'] = '_MI_SHOUTBOX_TITLE38';
-$modversion['config'][38]['description'] = '_MI_SHOUTBOX_DESC38';
-$modversion['config'][38]['formtype'] = 'textbox';
-$modversion['config'][38]['valuetype'] = 'text';
-$modversion['config'][38]['default'] = '340';
-
// Text Input:
-$modversion['config'][39]['name'] = 'textinput_settings';
-$modversion['config'][39]['title'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][39]['description'] = '_MI_SHOUTBOX_EMPTY';
-$modversion['config'][39]['formtype'] = 'select';
-$modversion['config'][39]['valuetype'] = 'text';
-$modversion['config'][39]['options'] = Array('_MI_SHOUTBOX_CAT4' => '1');
-
-$modversion['config'][40]['name'] = 'input_type';
-$modversion['config'][40]['title'] = '_MI_SHOUTBOX_TITLE40';
-$modversion['config'][40]['description'] = '_MI_SHOUTBOX_DESC40';
-$modversion['config'][40]['formtype'] = 'select';
-$modversion['config'][40]['valuetype'] = 'int';
-$modversion['config'][40]['options'] = Array('_MI_SHOUTBOX_OP40_TL' => 0, '_MI_SHOUTBOX_OP40_TA' => 1);
-$modversion['config'][40]['default'] = 1;
-
-$modversion['config'][41]['name'] = 'textarea_rows';
-$modversion['config'][41]['title'] = '_MI_SHOUTBOX_TITLE41';
-$modversion['config'][41]['description'] = '_MI_SHOUTBOX_DESC41';
-$modversion['config'][41]['formtype'] = 'textbox';
-$modversion['config'][41]['valuetype'] = 'text';
-$modversion['config'][41]['default'] = '4';
-
-$modversion['config'][42]['name'] = 'textarea_cols';
-$modversion['config'][42]['title'] = '_MI_SHOUTBOX_TITLE42';
-$modversion['config'][42]['description'] = '_MI_SHOUTBOX_DESC42';
-$modversion['config'][42]['formtype'] = 'textbox';
-$modversion['config'][42]['valuetype'] = 'text';
-$modversion['config'][42]['default'] = '75';
-
-$modversion['config'][43]['name'] = 'text_linelength';
-$modversion['config'][43]['title'] = '_MI_SHOUTBOX_TITLE43';
-$modversion['config'][43]['description'] = '_MI_SHOUTBOX_DESC43';
-$modversion['config'][43]['formtype'] = 'textbox';
-$modversion['config'][43]['valuetype'] = 'text';
-$modversion['config'][43]['default'] = '75';
-
-$modversion['config'][44]['name'] = 'text_maxchars';
-$modversion['config'][44]['title'] = '_MI_SHOUTBOX_TITLE44';
-$modversion['config'][44]['description'] = '_MI_SHOUTBOX_DESC44';
-$modversion['config'][44]['formtype'] = 'textbox';
-$modversion['config'][44]['valuetype'] = 'text';
-$modversion['config'][44]['default'] = '300';
-
-$modversion['config'][45]['name'] = 'input_alerts';
-$modversion['config'][45]['title'] = '_MI_SHOUTBOX_TITLE45';
-$modversion['config'][45]['description'] = '_MI_SHOUTBOX_DESC45';
-$modversion['config'][45]['formtype'] = 'yesno';
-$modversion['config'][45]['valuetype'] = 'int';
-$modversion['config'][45]['default'] = 0;
-
-$modversion['config'][46]['name'] = 'captcha_enable';
-$modversion['config'][46]['title'] = '_MI_SHOUTBOX_TITLE46';
-$modversion['config'][46]['description'] = '_MI_SHOUTBOX_DESC46';
-$modversion['config'][46]['formtype'] = 'yesno';
-$modversion['config'][46]['valuetype'] = 'int';
-$modversion['config'][46]['default'] = 1;
-
-?>
\ No newline at end of file
+$i++;
+$modversion['config'][$i]['name'] = 'logfile';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_CAT4';
+$modversion['config'][$i]['description'] = '_MI_USERLOG_CONFCAT_LOGFILE_DSC';
+$modversion['config'][$i]['formtype'] = 'line_break';
+$modversion['config'][$i]['valuetype'] = 'textbox';
+$modversion['config'][$i]['default'] = 'odd';
+$i++;
+$modversion['config'][$i]['name'] = 'input_type';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE40';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC40';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['options'] = Array('_MI_SHOUTBOX_OP40_TL' => 0, '_MI_SHOUTBOX_OP40_TA' => 1);
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'textarea_rows';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE41';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC41';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '4';
+$i++;
+$modversion['config'][$i]['name'] = 'textarea_cols';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE42';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC42';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '75';
+$i++;
+$modversion['config'][$i]['name'] = 'text_linelength';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE43';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC43';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '75';
+$i++;
+$modversion['config'][$i]['name'] = 'text_maxchars';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE44';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC44';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '300';
+$i++;
+$modversion['config'][$i]['name'] = 'input_alerts';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE45';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC45';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 0;
+$i++;
+$modversion['config'][$i]['name'] = 'captcha_enable';
+$modversion['config'][$i]['title'] = '_MI_SHOUTBOX_TITLE46';
+$modversion['config'][$i]['description'] = '_MI_SHOUTBOX_DESC46';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
\ No newline at end of file
|
|
From: <be...@us...> - 2013-08-12 23:08:09
|
Revision: 11900
http://sourceforge.net/p/xoops/svn/11900
Author: beckmi
Date: 2013-08-12 23:08:07 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
added .jpeg extension, update to 1.12 Beta 1
Modified Paths:
--------------
XoopsModules/extgallery/trunk/modules/extgallery/admin/photo.php
XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt
XoopsModules/extgallery/trunk/modules/extgallery/public-download.php
XoopsModules/extgallery/trunk/modules/extgallery/xoops_version.php
Modified: XoopsModules/extgallery/trunk/modules/extgallery/admin/photo.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/admin/photo.php 2013-08-11 23:49:58 UTC (rev 11899)
+++ XoopsModules/extgallery/trunk/modules/extgallery/admin/photo.php 2013-08-12 23:08:07 UTC (rev 11900)
@@ -96,7 +96,7 @@
$dir = opendir($batchRep);
while ($f = readdir($dir)) {
if(is_file($batchRep.$f)) {
- if(preg_match("/.*gif/",strtolower($f)) || preg_match("/.*jpg/",strtolower($f)) || preg_match("/.*png/",strtolower($f))) {
+ if(preg_match("/.*gif/",strtolower($f)) || preg_match("/.*jpg/",strtolower($f)) || preg_match("/.*jpeg/",strtolower($f)) ||preg_match("/.*png/",strtolower($f))) {
$photos[] = $f;
}
}
@@ -583,7 +583,7 @@
}
// For xoops tag
if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../../tag'))){
- require_once XOOPS_ROOT_PATH.'/modules/tag/include/formtag.php';
+ require_once XOOPS_ROOT_PATH.'/modules/tag/include/formtag.php';
$form->addElement(new XoopsFormTag('tag', 60, 255, '', 0));
}
$form->addElement(new XoopsFormHidden("op", 'add_photo'));
@@ -598,7 +598,7 @@
$dir = opendir($rep);
while ($f = readdir($dir)) {
if(is_file($rep.$f)) {
- if(preg_match("/.*gif/",strtolower($f)) || preg_match("/.*jpg/",strtolower($f)) || preg_match("/.*png/",strtolower($f))) {
+ if(preg_match("/.*gif/",strtolower($f)) || preg_match("/.*jpg/",strtolower($f)) || preg_match("/.*jpeg/",strtolower($f)) ||preg_match("/.*png/",strtolower($f))) {
$nbPhotos++;
}
}
Modified: XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt 2013-08-11 23:49:58 UTC (rev 11899)
+++ XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt 2013-08-12 23:08:07 UTC (rev 11900)
@@ -1,4 +1,9 @@
============================
+2013-08-12: Version 1.12 Beta 1
+============================
+- added .jpeg extension
+
+============================
2012-12-18: Version 1.11
============================
- Updated PEAR
Modified: XoopsModules/extgallery/trunk/modules/extgallery/public-download.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/public-download.php 2013-08-11 23:49:58 UTC (rev 11899)
+++ XoopsModules/extgallery/trunk/modules/extgallery/public-download.php 2013-08-12 23:08:07 UTC (rev 11900)
@@ -1,66 +1,67 @@
-<?php
-/**
- * ExtGallery User area
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Zoullou (http://www.zoullou.net)
- * @package ExtGallery
- * @version $Id$
- */
-
-
-require '../../mainfile.php';
-include_once XOOPS_ROOT_PATH.'/modules/extgallery/class/publicPerm.php';
-
-if(!isset($_GET['id'])) {
- $photoId = 0;
-} else {
- $photoId = intval($_GET['id']);
-}
-
-$photoHandler = xoops_getmodulehandler('publicphoto', 'extgallery');
-$photo = $photoHandler->get($photoId);
-
-$permHandler = ExtgalleryPublicPermHandler::getHandler();
-if(!$permHandler->isAllowed($xoopsUser, 'public_download', $photo->getVar('cat_id'))) {
- redirect_header("index.php");
- exit;
-}
-
-switch(strtolower(strrchr($photo->getVar('photo_name'), "."))) {
- case ".png": $type = "image/png"; break;
- case ".gif": $type = "image/gif"; break;
- case ".jpg": $type = "image/jpeg"; break;
- default: $type = "application/octet-stream"; break;
-}
-
-header("Content-Type: ".$type."");
-header("Content-Disposition: attachment; filename=\"".$photo->getVar('photo_name')."\"");
-
-if($photo->getVar('photo_havelarge')) {
- if($permHandler->isAllowed($xoopsUser, 'public_download_original', $photo->getVar('cat_id')) && $photo->getVar('photo_orig_name') != "") {
- $photoName = "original/".$photo->getVar('photo_orig_name');
- } else {
- $photoName = "large/large_".$photo->getVar('photo_name');
- }
-} else {
- $photoName = "medium/".$photo->getVar('photo_name');
-}
-
-$photoHandler->updateDownload($photoId);
-
-if($photo->getVar('photo_serveur') == "") {
- readfile(XOOPS_ROOT_PATH."/uploads/extgallery/public-photo/".$photoName);
-} else {
- readfile($photo->getVar('photo_serveur').$photoName);
-}
-
+<?php
+/**
+ * ExtGallery User area
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Zoullou (http://www.zoullou.net)
+ * @package ExtGallery
+ * @version $Id$
+ */
+
+
+require '../../mainfile.php';
+include_once XOOPS_ROOT_PATH.'/modules/extgallery/class/publicPerm.php';
+
+if(!isset($_GET['id'])) {
+ $photoId = 0;
+} else {
+ $photoId = intval($_GET['id']);
+}
+
+$photoHandler = xoops_getmodulehandler('publicphoto', 'extgallery');
+$photo = $photoHandler->get($photoId);
+
+$permHandler = ExtgalleryPublicPermHandler::getHandler();
+if(!$permHandler->isAllowed($xoopsUser, 'public_download', $photo->getVar('cat_id'))) {
+ redirect_header("index.php");
+ exit;
+}
+
+switch(strtolower(strrchr($photo->getVar('photo_name'), "."))) {
+ case ".png": $type = "image/png"; break;
+ case ".gif": $type = "image/gif"; break;
+ case ".jpg": $type = "image/jpeg"; break;
+ case ".jpeg": $type = "image/jpeg"; break;
+ default: $type = "application/octet-stream"; break;
+}
+
+header("Content-Type: ".$type."");
+header("Content-Disposition: attachment; filename=\"".$photo->getVar('photo_name')."\"");
+
+if($photo->getVar('photo_havelarge')) {
+ if($permHandler->isAllowed($xoopsUser, 'public_download_original', $photo->getVar('cat_id')) && $photo->getVar('photo_orig_name') != "") {
+ $photoName = "original/".$photo->getVar('photo_orig_name');
+ } else {
+ $photoName = "large/large_".$photo->getVar('photo_name');
+ }
+} else {
+ $photoName = "medium/".$photo->getVar('photo_name');
+}
+
+$photoHandler->updateDownload($photoId);
+
+if($photo->getVar('photo_serveur') == "") {
+ readfile(XOOPS_ROOT_PATH."/uploads/extgallery/public-photo/".$photoName);
+} else {
+ readfile($photo->getVar('photo_serveur').$photoName);
+}
+
?>
\ No newline at end of file
Modified: XoopsModules/extgallery/trunk/modules/extgallery/xoops_version.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/xoops_version.php 2013-08-11 23:49:58 UTC (rev 11899)
+++ XoopsModules/extgallery/trunk/modules/extgallery/xoops_version.php 2013-08-12 23:08:07 UTC (rev 11900)
@@ -17,7 +17,7 @@
*/
$modversion['name'] = _MI_EXTGAL_NAME;
-$modversion['version'] = 1.11;
+$modversion['version'] = 1.12;
$modversion['description'] = _MI_EXTGAL_DESC;
$modversion['credits'] = "http://www.zoullou.net/";
$modversion['author'] = "Zoullou";
@@ -25,7 +25,7 @@
$modversion['license'] = "GPL see LICENSE";
$modversion['official'] = 0;
$modversion['image'] = "images/extgallery_logo.png";
-$modversion['dirname'] = "extgallery";
+$modversion['dirname'] = basename(dirname(__FILE__));
$modversion['onInstall'] = 'include/install_function.php';
$modversion['onUpdate'] = 'include/update_function.php';
$modversion['min_php'] = '5.2';
@@ -33,7 +33,7 @@
$modversion['min_admin']='1.1';
$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
-$modversion["module_status"] = "Final";
+$modversion["module_status"] = "Beta 1";
// Admin menu
// Set to 1 if you want to display menu generated by system module
|
|
From: <red...@us...> - 2013-08-11 23:50:06
|
Revision: 11899
http://sourceforge.net/p/xoops/svn/11899
Author: redheadedrod
Date: 2013-08-11 23:49:58 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0_redheadedrod/
XoopsCore/branches/2.6.x/2.6.0_redheadedrod/class/
XoopsCore/branches/2.6.x/2.6.0_redheadedrod/class/database/
XoopsCore/branches/2.6.x/2.6.0_redheadedrod/class/database/mysqldatabase.php
XoopsCore/branches/2.6.x/2.6.0_redheadedrod/class/moduleadmin.php
Added: XoopsCore/branches/2.6.x/2.6.0_redheadedrod/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_redheadedrod/class/database/mysqldatabase.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_redheadedrod/class/database/mysqldatabase.php 2013-08-11 23:49:58 UTC (rev 11899)
@@ -0,0 +1,408 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * MySQL access
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package class
+ * @subpackage database
+ * @since 1.0.0
+ * @author Kazumi Ono <on...@xo...>
+ * @version $Id: mysqldatabase.php 10328 2012-12-07 00:56:07Z trabis $
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ * connection to a mysql database
+ *
+ * @abstract
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package class
+ * @subpackage database
+ */
+class XoopsMySQLDatabase extends XoopsDatabase
+{
+
+ /**
+ * connect to the database
+ *
+ * @param bool $selectdb select the database now?
+ * @return bool successful?
+ */
+ public function connect($selectdb = true)
+ {
+ static $db_charset_set;
+
+ if (!extension_loaded('mysql')) {
+ trigger_error('notrace:mysql extension not loaded', E_USER_ERROR);
+ return false;
+ }
+
+ $this->allowWebChanges = ($_SERVER['REQUEST_METHOD'] != 'GET');
+
+ if (XOOPS_DB_PCONNECT == 1) {
+ $this->conn = @mysql_pconnect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+ } else {
+ $this->conn = @mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+ }
+
+ if (!$this->conn) {
+ $xoopsPreload = XoopsPreload::getInstance();
+ $xoopsPreload->triggerEvent('core.database.noconn', array($this));
+ return false;
+ }
+ if ($selectdb != false) {
+ if (!mysql_select_db(XOOPS_DB_NAME)) {
+ $xoopsPreload = XoopsPreload::getInstance();
+ $xoopsPreload->triggerEvent('core.database.nodb');
+ return false;
+ }
+ }
+ if (!isset($db_charset_set) && defined('XOOPS_DB_CHARSET') && XOOPS_DB_CHARSET) {
+ $this->queryF("SET NAMES '" . XOOPS_DB_CHARSET . "'");
+ }
+ $db_charset_set = 1;
+ $this->queryF("SET SQL_BIG_SELECTS = 1");
+ return true;
+ }
+
+ /**
+ * Return information about the database server in use
+ *
+ * This is a new function added for 2.5.7 and later to allow support for other databases.
+ *
+ * @return will return version of server in use
+ */
+ function getServerVersion()
+ {
+ return mysql_get_server_info();
+ }
+
+ /**
+ * generate an ID for a new row
+ *
+ * This is for compatibility only. Will always return 0, because MySQL supports
+ * autoincrement for primary keys.
+ *
+ * @param string $sequence name of the sequence from which to get the next ID
+ * @return int always 0, because mysql has support for autoincrement
+ */
+ public function genId($sequence)
+ {
+ return 0; // will use auto_increment
+ }
+
+ /**
+ * Get a result row as an enumerated array
+ *
+ * @param resource $result
+ * @return array
+ */
+ public function fetchRow($result)
+ {
+ return @mysql_fetch_row($result);
+ }
+
+ /**
+ * Fetch a result row as an associative array
+ *
+ * @param resource $result
+ * @return array
+ */
+ public function fetchArray($result)
+ {
+ return @mysql_fetch_assoc($result);
+ }
+
+ /**
+ * Fetch a result row as an associative array
+ *
+ * @param resource $result
+ * @return array
+ */
+ public function fetchBoth($result)
+ {
+ return @mysql_fetch_array($result, MYSQL_BOTH);
+ }
+
+ /**
+ * XoopsMySQLDatabase::fetchObjected()
+ *
+ * @param resource $result
+ * @return object|stdClass
+ */
+ public function fetchObject($result)
+ {
+ return @mysql_fetch_object($result);
+ }
+
+ /**
+ * Get the ID generated from the previous INSERT operation
+ *
+ * @return int
+ */
+ public function getInsertId()
+ {
+ return mysql_insert_id($this->conn);
+ }
+
+ /**
+ * Get number of rows in result
+ *
+ * @param resource $result
+ * @return int
+ */
+ public function getRowsNum($result)
+ {
+ return @mysql_num_rows($result);
+ }
+
+ /**
+ * Get number of affected rows
+ *
+ * @return int
+ */
+ public function getAffectedRows()
+ {
+ return mysql_affected_rows($this->conn);
+ }
+
+ /**
+ * Close MySQL connection
+ *
+ * @return void
+ */
+ public function close()
+ {
+ mysql_close($this->conn);
+ }
+
+ /**
+ * will free all memory associated with the result identifier result.
+ *
+ * @param resource $result query result
+ * @return bool TRUE on success or FALSE on failure.
+ */
+ public function freeRecordSet($result)
+ {
+ return mysql_free_result($result);
+ }
+
+ /**
+ * Returns the text of the error message from previous MySQL operation
+ *
+ * @return bool Returns the error text from the last MySQL function, or '' (the empty string) if no error occurred.
+ */
+ public function error()
+ {
+ return @mysql_error();
+ }
+
+ /**
+ * Returns the numerical value of the error message from previous MySQL operation
+ *
+ * @return int Returns the error number from the last MySQL function, or 0 (zero) if no error occurred.
+ */
+ public function errno()
+ {
+ return @mysql_errno();
+ }
+
+ /**
+ * Returns escaped string text with single quotes around it to be safely stored in database
+ *
+ * @param string $str unescaped string text
+ * @return string escaped string text with single quotes around
+ */
+ public function quoteString($str)
+ {
+ return $this->quote($str);
+ }
+
+ /**
+ * Quotes a string for use in a query.
+ *
+ * @param $string
+ * @return string
+ */
+ public function quote($string)
+ {
+ return "'" . str_replace("\\\"", '"', str_replace("\\"", '"', mysql_real_escape_string($string, $this->conn))) . "'";
+ }
+
+ /**
+ * perform a query on the database
+ *
+ * @param string $sql a valid MySQL query
+ * @param int $limit number of records to return
+ * @param int $start offset of first record to return
+ * @return bool|resource query result or FALSE if successful
+ * or TRUE if successful and no result
+ */
+ public function queryF($sql, $limit = 0, $start = 0)
+ {
+ if (!empty($limit)) {
+ if (empty($start)) {
+ $start = 0;
+ }
+ $sql = $sql . ' LIMIT ' . (int) $start . ', ' . (int) $limit;
+ }
+ $xoopsPreload = XoopsPreload::getInstance();
+ $xoopsPreload->triggerEvent('core.database.query.start');
+ $result = mysql_query($sql, $this->conn);
+ $xoopsPreload->triggerEvent('core.database.query.end');
+
+ if ($result) {
+ $xoopsPreload->triggerEvent('core.database.query.success', (array($sql)));
+ return $result;
+ } else {
+ $xoopsPreload->triggerEvent('core.database.query.failure', (array($sql, $this)));
+ return false;
+ }
+ }
+
+ /**
+ * perform a query
+ *
+ * This method is empty and does nothing! It should therefore only be
+ * used if nothing is exactly what you want done! ;-)
+ *
+ * @param string $sql a valid MySQL query
+ * @param int $limit number of records to return
+ * @param int $start offset of first record to return
+ * @abstract
+ */
+ public function query($sql, $limit = 0, $start = 0)
+ {
+ }
+
+ /**
+ * perform queries from SQL dump file in a batch
+ *
+ * @param string $file file path to an SQL dump file
+ * @return bool FALSE if failed reading SQL file or TRUE if the file has been read and queries executed
+ */
+ public function queryFromFile($file)
+ {
+ if (false !== ($fp = fopen($file, 'r'))) {
+ $sql_queries = trim(fread($fp, filesize($file)));
+ SqlUtility::splitMySqlFile($pieces, $sql_queries);
+ foreach ($pieces as $query) {
+ // [0] contains the prefixed query
+ // [4] contains unprefixed table name
+ $prefixed_query = SqlUtility::prefixQuery(trim($query), $this->prefix());
+ if ($prefixed_query != false) {
+ $this->query($prefixed_query[0]);
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Get field name
+ *
+ * @param resource $result query result
+ * @param int $offset numerical field index
+ * @return string
+ */
+ public function getFieldName($result, $offset)
+ {
+ return mysql_field_name($result, $offset);
+ }
+
+ /**
+ * Get field type
+ *
+ * @param resource $result query result
+ * @param int $offset numerical field index
+ * @return string
+ */
+ public function getFieldType($result, $offset)
+ {
+ return mysql_field_type($result, $offset);
+ }
+
+ /**
+ * Get number of fields in result
+ *
+ * @param resource $result query result
+ * @return int
+ */
+ public function getFieldsNum($result)
+ {
+ return mysql_num_fields($result);
+ }
+}
+
+/**
+ * Safe Connection to a MySQL database.
+ *
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsMySQLDatabaseSafe extends XoopsMySQLDatabase
+{
+ /**
+ * perform a query on the database
+ *
+ * @param string $sql a valid MySQL query
+ * @param int $limit number of records to return
+ * @param int $start offset of first record to return
+ * @return resource query result or FALSE if successful
+ * or TRUE if successful and no result
+ */
+ public function query($sql, $limit = 0, $start = 0)
+ {
+ return $this->queryF($sql, $limit, $start);
+ }
+}
+
+/**
+ * Read-Only connection to a MySQL database.
+ *
+ * This class allows only SELECT queries to be performed through its
+ * {@link query()} method for security reasons.
+ *
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsMySQLDatabaseProxy extends XoopsMySQLDatabase
+{
+ /**
+ * perform a query on the database
+ *
+ * this method allows only SELECT queries for safety.
+ *
+ * @param string $sql a valid MySQL query
+ * @param int $limit number of records to return
+ * @param int $start offset of first record to return
+ * @return resource query result or FALSE if unsuccessful
+ */
+ public function query($sql, $limit = 0, $start = 0)
+ {
+ $sql = ltrim($sql);
+ if (!$this->allowWebChanges && strtolower(substr($sql, 0, 6)) != 'select') {
+ trigger_error('Database updates are not allowed during processing of a GET request', E_USER_WARNING);
+ return false;
+ }
+ return $this->queryF($sql, $limit, $start);
+ }
+}
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0_redheadedrod/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_redheadedrod/class/moduleadmin.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_redheadedrod/class/moduleadmin.php 2013-08-11 23:49:58 UTC (rev 11899)
@@ -0,0 +1,537 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * Xoops Moduleadmin Classes
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package class
+ * @since 2.6.0
+ * @author Mage Grégory (AKA Mage)
+ * @version $Id: moduleadmin.php 10677 2013-01-06 01:12:16Z trabis $
+ */
+
+class XoopsModuleAdmin
+{
+ /**
+ * Set module directory
+ *
+ * @var string
+ */
+ public $_tplModule = 'system';
+
+ /**
+ * Template call for each render parts
+ *
+ * @var array
+ */
+ public $_tplFile = array(
+ 'index' => 'admin_index.html', 'about' => 'admin_about.html', 'infobox' => 'admin_infobox.html',
+ 'bread' => 'admin_breadcrumb.html', 'button' => 'admin_buttons.html', 'tips' => 'admin_tips.html',
+ 'nav' => 'admin_navigation.html'
+ );
+
+ /**
+ * Tips to display in admin page
+ *
+ * @var string
+ */
+ private $_tips = '';
+
+ /**
+ * List of button
+ *
+ * @var array
+ */
+ private $_itemButton = array();
+
+ /**
+ * List of Info Box
+ *
+ * @var array
+ */
+ private $_itemInfoBox = array();
+
+ /**
+ * List of line of an Info Box
+ *
+ * @var array
+ */
+ private $_itemConfigBoxLine = array();
+
+ /**
+ * Breadcrumb data
+ *
+ * @var array
+ */
+ private $_bread = array();
+
+ /**
+ * Current module object
+ *
+ * @var XoopsModule $_obj
+ */
+ private $_obj = null;
+
+ /**
+ * Constructor
+ */
+ public function __construct()
+ {
+ $xoops = Xoops::getInstance();
+ $this->_obj = $xoops->module;
+ $xoops->theme()->addStylesheet('media/xoops/css/moduladmin.css');
+ }
+
+ /**
+ * Add breadcrumb menu
+ *
+ * @param string $title
+ * @param string $link
+ * @param bool $home
+ */
+ public function addBreadcrumbLink($title = '', $link = '', $home = false)
+ {
+ if ($title != '') {
+ $this->_bread[] = array(
+ 'link' => $link, 'title' => $title, 'home' => $home
+ );
+ }
+ }
+
+ /**
+ * Add config line
+ *
+ * @param string $value
+ * @param string $type
+ *
+ * @return bool
+ */
+ public function addConfigBoxLine($value = '', $type = 'default')
+ {
+ switch ($type) {
+ default:
+ case "default":
+ $this->_itemConfigBoxLine[] = array('type' => $type, 'text' => $value);
+ break;
+
+ case "folder":
+ if (!is_dir($value)) {
+ $this->_itemConfigBoxLine[] = array(
+ 'type' => 'error', 'text' => sprintf(_AM_MODULEADMIN_CONFIG_FOLDERKO, $value)
+ );
+ } else {
+ $this->_itemConfigBoxLine[] = array(
+ 'type' => 'accept', 'text' => sprintf(_AM_MODULEADMIN_CONFIG_FOLDEROK, $value)
+ );
+ }
+ break;
+
+ case "chmod":
+ if (is_dir($value[0])) {
+ if (substr(decoct(fileperms($value[0])), 2) != $value[1]) {
+ $this->_itemConfigBoxLine[] = array(
+ 'type' => 'error',
+ 'text' => sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])), 2))
+ );
+ } else {
+ $this->_itemConfigBoxLine[] = array(
+ 'type' => 'accept',
+ 'text' => sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])), 2))
+ );
+ }
+ }
+ break;
+
+ case "extension":
+ $xoops = Xoops::getInstance();
+ if (is_array($value)) {
+ $text = $value[0];
+ $type = $value[1];
+ } else {
+ $text = $value;
+ $type = 'error';
+ }
+ if ($xoops->isActiveModule($text) == false) {
+ $this->_itemConfigBoxLine[] = array(
+ 'type' => $type, 'text' => sprintf(_AM_MODULEADMIN_CONFIG_EXTENSIONKO, $text)
+ );
+ } else {
+ $this->_itemConfigBoxLine[] = array(
+ 'type' => 'accept', 'text' => sprintf(_AM_MODULEADMIN_CONFIG_EXTENSIONOK, $text)
+ );
+ }
+ break;
+
+ case "module":
+ $xoops = Xoops::getInstance();
+ if (is_array($value)) {
+ $text = $value[0];
+ $type = $value[1];
+ } else {
+ $text = $value;
+ $type = 'error';
+ }
+ if ($xoops->isActiveModule($text) == false) {
+ $this->_itemConfigBoxLine[] = array(
+ 'type' => $type, 'text' => sprintf(_AM_MODULEADMIN_CONFIG_MODULEKO, $text)
+ );
+ } else {
+ $this->_itemConfigBoxLine[] = array(
+ 'type' => 'accept', 'text' => sprintf(_AM_MODULEADMIN_CONFIG_MODULEOK, $text)
+ );
+ }
+ break;
+ }
+ return true;
+ }
+
+ /**
+ * Add Info box
+ *
+ * @param $title
+ * @param string $type
+ * @param string $extra
+ *
+ * @return bool
+ */
+ public function addInfoBox($title, $type = 'default', $extra = '')
+ {
+ $ret['title'] = $title;
+ $ret['type'] = $type;
+ $ret['extra'] = $extra;
+ $this->_itemInfoBox[] = $ret;
+ return true;
+ }
+
+ /**
+ * Add line to the info box
+ *
+ * @param string $text
+ * @param string $type
+ * @param string $color
+ *
+ * @return bool
+ */
+ public function addInfoBoxLine($text = '', $type = 'default', $color = 'inherit')
+ {
+ $ret = array();
+ $ret['text'] = $text;
+ $ret['color'] = $color;
+
+ foreach (array_keys($this->_itemInfoBox) as $i) {
+ if ($this->_itemInfoBox[$i]['type'] == $type) {
+ $this->_itemInfoBox[$i]['line'][] = $ret;
+ unset($ret);
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Add Item button
+ *
+ * @param $title
+ * @param $link
+ * @param string $icon
+ * @param string $extra
+ *
+ * @return bool
+ */
+ public function addItemButton($title, $link, $icon = 'add', $extra = '')
+ {
+ $ret['title'] = $title;
+ $ret['link'] = $link;
+ $ret['icon'] = $icon;
+ $ret['extra'] = $extra;
+ $this->_itemButton[] = $ret;
+ return true;
+ }
+
+ /**
+ * Add a tips
+ *
+ * @param string $text
+ */
+ public function addTips($text = '')
+ {
+ $this->_tips = $text;
+ }
+
+ /**
+ * Construct template path
+ *
+ * @param string $type
+ *
+ * @return string
+ */
+ private function getTplPath($type = '')
+ {
+ return 'admin:' . $this->_tplModule . '|' . $this->_tplFile[$type];
+ }
+
+ public function renderBreadcrumb()
+ {
+ $xoops = Xoops::getInstance();
+ $xoops->tpl()->assign('xo_admin_breadcrumb', $this->_bread);
+ return $xoops->tpl()->fetch($this->getTplPath('bread'));
+ }
+
+ public function displayBreadcrumb()
+ {
+ echo $this->renderBreadcrumb();
+ }
+
+ /**
+ * Render all items buttons
+ *
+ * @param string $position
+ * @param string $delimiter
+ *
+ * @return string
+ */
+ public function renderButton($position = "floatright", $delimiter = " ")
+ {
+ $xoops = Xoops::getInstance();
+
+ $xoops->tpl()->assign('xo_admin_buttons_position', $position);
+ $xoops->tpl()->assign('xo_admin_buttons_delim', $delimiter);
+ $xoops->tpl()->assign('xo_admin_buttons', $this->_itemButton);
+ return $xoops->tpl()->fetch($this->getTplPath('button'));
+ }
+
+ /**
+ * @param string $position
+ * @param string $delimiter
+ */
+ public function displayButton($position = "floatright", $delimiter = " ")
+ {
+ echo $this->renderButton($position, $delimiter);
+ }
+
+ /**
+ * Render InfoBox
+ */
+ public function renderInfoBox()
+ {
+ $xoops = Xoops::getInstance();
+ $xoops->tpl()->assign('xo_admin_box', $this->_itemInfoBox);
+ return $xoops->tpl()->fetch($this->getTplPath('infobox'));
+ }
+
+ public function displayInfoBox()
+ {
+ echo $this->renderInfoBox();
+ }
+
+ /**
+ * Render index page for admin
+ */
+ public function renderIndex()
+ {
+ $xoops = Xoops::getInstance();
+ $this->_obj->loadAdminMenu();
+ foreach (array_keys($this->_obj->adminmenu) as $i) {
+ if (XoopsLoad::fileExists($xoops->path("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']))) {
+ $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+ } else {
+ $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/modules/" . $xoops->module->dirname() . "/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+ }
+ $xoops->tpl()->append('xo_admin_index_menu', $this->_obj->adminmenu[$i]);
+ }
+ if ($this->_obj->getInfo('help')) {
+ $help = array();
+ $help['link'] = '../system/help.php?mid=' . $this->_obj->getVar('mid', 's') . "&" . $this->_obj->getInfo('help');
+ $help['icon'] = $xoops->url("/media/xoops/images/icons/32/help.png");
+ $help['title'] = _AM_SYSTEM_HELP;
+ $xoops->tpl()->append('xo_admin_index_menu', $help);
+ }
+ $xoops->tpl()->assign('xo_admin_box', $this->_itemInfoBox);
+
+ // If you use a config label
+ if ($this->_obj->getInfo('min_php') || $this->_obj->getInfo('min_xoops') || !empty($this->_itemConfigBoxLine)) {
+ // PHP version
+ if ($this->_obj->getInfo('min_php')) {
+ if (phpversion() < $this->_obj->getInfo('min_php')) {
+ $this->addConfigBoxLine(sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()), 'error');
+ } else {
+ $this->addConfigBoxLine(sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()), 'accept');
+ }
+ }
+ // Database version
+ $dbarray = $this->_obj->getInfo('min_db');
+ if ($dbarray[XOOPS_DB_TYPE]) {
+ global $xoopsDB;
+ $dbCurrentVersion= $xoopsDB->getServerVersion();
+ $currentVerParts = explode('.', (string)$dbCurrentVersion);
+ $iCurrentVerParts = array_map('intval', $currentVerParts);
+ $dbRequiredVersion = $dbarray[XOOPS_DB_TYPE];
+ $reqVerParts = explode('.', (string)$dbRequiredVersion);
+ $iReqVerParts = array_map('intval', $reqVerParts);
+ $icount = $j = count($iReqVerParts);
+ $reqVer = $curVer = 0;
+ for ($i = 0; $i < $icount; $i++) {
+ $j--;
+ $reqVer += $iReqVerParts[$i] * pow(10, $j);
+ if (isset($iCurrentVerParts[$i])) {
+ $curVer += $iCurrentVerParts[$i] * pow(10, $j);
+ } else {
+ $curVer = $curVer * pow(10, $j);
+ }
+ }
+ if ($reqVer > $curVer) {
+ $this->addConfigBoxLine(sprintf(strtoupper(XOOPS_DB_TYPE) . ' ' . _AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion), 'error');
+ } else {
+ $this->addConfigBoxLine(sprintf(strtoupper(XOOPS_DB_TYPE) . ' ' . _AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion), 'accept');
+ }
+ }
+
+ // xoops version
+ if ($this->_obj->getInfo('min_xoops')) {
+ if (substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION) - 6) < $this->_obj->getInfo('min_xoops')) {
+ $this->addConfigBoxLine(sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION) - 6)), 'error');
+ } else {
+ $this->addConfigBoxLine(sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION) - 6)), 'accept');
+ }
+ }
+ $xoops->tpl()->assign('xo_admin_index_config', $this->_itemConfigBoxLine);
+ }
+ return $xoops->tpl()->fetch($this->getTplPath('index'));
+ }
+
+ public function displayIndex()
+ {
+ echo $this->renderIndex();
+ }
+
+ /**
+ * Render navigation to admin page
+ *
+ * @param string $menu
+ *
+ * @return array
+ */
+ public function renderNavigation($menu = '')
+ {
+ $xoops = Xoops::getInstance();
+ $ret = array();
+
+ $this->_obj->loadAdminMenu();
+ foreach (array_keys($this->_obj->adminmenu) as $i) {
+ if ($this->_obj->adminmenu[$i]['link'] == "admin/" . $menu) {
+ if (XoopsLoad::fileExists($xoops->path("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']))) {
+ $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+ } else {
+ $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/modules/" . $xoops->module->dirname() . "/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+ }
+ $xoops->tpl()->assign('xo_sys_navigation', $this->_obj->adminmenu[$i]);
+ $ret[] = $xoops->tpl()->fetch($this->getTplPath('nav'));
+ }
+ }
+ return $ret;
+ }
+
+ /**
+ * @param string $menu
+ */
+ public function displayNavigation($menu = '')
+ {
+ $items = $this->renderNavigation($menu);
+ foreach ($items as $item) {
+ echo $item;
+ }
+ }
+
+ /**
+ * Render tips to admin page
+ */
+ public function renderTips()
+ {
+ $xoops = Xoops::getInstance();
+ $xoops->tpl()->assign('xo_admin_tips', $this->_tips);
+ return $xoops->tpl()->fetch($this->getTplPath('tips'));
+ }
+
+ public function displayTips()
+ {
+ echo $this->renderTips();
+ }
+
+ /**
+ * Render about page
+ *
+ * @param bool $logo_xoops
+ *
+ * @return bool|mixed|string
+ */
+ public function renderAbout($logo_xoops = true)
+ {
+ $xoops = Xoops::getInstance();
+
+ $date = explode('/', $this->_obj->getInfo('release_date'));
+ $author = explode(',', $this->_obj->getInfo('author'));
+ $nickname = explode(',', $this->_obj->getInfo('nickname'));
+ $release_date = XoopsLocal::formatTimestamp(mktime(0, 0, 0, $date[1], $date[2], $date[0]), 's');
+
+ $author_list = '';
+ foreach (array_keys($author) as $i) {
+ $author_list .= $author[$i];
+ if (isset($nickname[$i]) && $nickname[$i] != '') {
+ $author_list .= " (" . $nickname[$i] . "), ";
+ } else {
+ $author_list .= ", ";
+ }
+ }
+ $changelog = '';
+ $language = $xoops->getConfig('language');
+ if (!is_file(XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/language/" . $language . "/changelog.txt")) {
+ $language = 'english';
+ }
+ $language = empty($language) ? $xoops->getConfig('language') : $language;
+ $file = XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/language/" . $language . "/changelog.txt";
+ if (is_readable($file)) {
+ $changelog = utf8_encode(implode("<br />", file($file))) . "\n";
+ } else {
+ $file = XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/docs/changelog.txt";
+ if (is_readable($file)) {
+ $changelog = utf8_encode(implode("<br />", file($file))) . "\n";
+ }
+ }
+ $author_list = substr($author_list, 0, -2);
+
+ $this->_obj->setInfo('release_date', $release_date);
+ $this->_obj->setInfo('author_list', $author_list);
+ if (is_array($this->_obj->getInfo('paypal'))) {
+ $this->_obj->setInfo('paypal', $this->_obj->getInfo('paypal'));
+ }
+ $this->_obj->setInfo('changelog', $changelog);
+ $xoops->tpl()->assign('module', $this->_obj);
+
+ $this->addInfoBox(_AM_MODULEADMIN_ABOUT_MODULEINFO, 'info', 'id="xo-about"');
+ $this->addInfoBoxLine(_AM_MODULEADMIN_ABOUT_DESCRIPTION . ' ' . $this->_obj->getInfo("description"), 'info');
+ $this->addInfoBoxLine(_AM_MODULEADMIN_ABOUT_UPDATEDATE . ' <span class="bold">' . XoopsLocal::formatTimestamp($this->_obj->getVar("last_update"), "m") . '</span>', 'info');
+ $this->addInfoBoxLine(_AM_MODULEADMIN_ABOUT_WEBSITE . ' <a class="xo-tooltip" href="http://' . $this->_obj->getInfo("module_website_url") . '" rel="external" title="' . $this->_obj->getInfo("module_website_name") . ' - ' . $this->_obj->getInfo("module_website_url") . '">
+ ' . $this->_obj->getInfo("module_website_name") . '</a>', 'info');
+
+ $xoops->tpl()->assign('xoops_logo', $logo_xoops);
+ $xoops->tpl()->assign('xo_admin_box', $this->_itemInfoBox);
+ return $xoops->tpl()->fetch($this->getTplPath('about'));
+ }
+
+ /**
+ * @param bool $logo_xoops
+ */
+ public function displayAbout($logo_xoops = true)
+ {
+ echo $this->renderAbout($logo_xoops);
+ }
+}
\ No newline at end of file
|
|
From: <red...@us...> - 2013-08-11 23:26:27
|
Revision: 11898
http://sourceforge.net/p/xoops/svn/11898
Author: redheadedrod
Date: 2013-08-11 23:26:23 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7_redheadedrod/
XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/
XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/Frameworks/
XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/Frameworks/moduleclasses/
XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/Frameworks/moduleclasses/moduleadmin/
XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/class/
XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/class/database/
XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/class/database/mysqldatabase.php
Added: XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2013-08-11 23:26:23 UTC (rev 11898)
@@ -0,0 +1,514 @@
+<?php
+/**
+ * Frameworks Module Admin
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright Grégory Mage (Aka Mage)
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Grégory Mage (Aka Mage)
+ */
+
+class ModuleAdmin
+{
+
+ var $_itemButton = array();
+ var $_itemInfoBox = array();
+ var $_itemInfoBoxLine = array();
+ var $_itemConfigBoxLine = array();
+ var $_obj = array();
+
+ /**
+ * Constructor
+ */
+ function __construct()
+ {
+ //global $xoopsModule, $xoTheme;
+ global $xoopsModule;
+ $this->_obj =& $xoopsModule;
+ echo "<style type=\"text/css\" media=\"screen\">@import \"" . XOOPS_URL . "/Frameworks/moduleclasses/moduleadmin/css/admin.css\";</style>";
+ //$xoTheme->addStylesheet("Frameworks/moduleclasses/moduleadmin/css/admin.css");
+ $this -> loadLanguage();
+ }
+
+ function getInfo()
+ {
+ $infoArray = array();
+ if (!isset($infoArray) or empty($infoArray)) {
+ $infoArray = array();
+ $infoArray['version'] = $this->getVersion();
+ $infoArray['releasedate'] = $this->getReleaseDate();
+ $infoArray['methods'] = $this->getClassMethods();
+ }
+ return $infoArray;
+ }
+
+ /**
+ * Return the Module Admin class version number
+ * return string version
+ **/
+ function getVersion()
+ {
+ /**
+ * version is rev of this class
+ */
+ Include_once 'xoops_version.php';
+ $version = XOOPS_FRAMEWORKS_MODULEADMIN_VERSION;
+ return $version;
+ }
+
+ /**
+ * Return the Module Admin class release date
+ * return string version
+ **/
+ function getReleaseDate()
+ {
+ /**
+ * version is rev of this class
+ */
+ Include_once 'xoops_version.php';
+ $releasedate = XOOPS_FRAMEWORKS_MODULEADMIN_RELEASEDATE;
+ return $releasedate;
+ }
+
+ /**
+ * Return the available methods for the class
+ *
+ * @return array methods supported by this class
+ */
+ function getClassMethods()
+ {
+ $myMethods = get_class_methods(__CLASS__);
+ return $myMethods;
+ }
+
+ //******************************************************************************************************************
+ // loadLanguage
+ //******************************************************************************************************************
+ // Loaf the language file.
+ //******************************************************************************************************************
+ 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" )){
+ return false;
+ }
+ }
+ $ret = include_once $fileinc;
+ return $ret;
+ }
+ //******************************************************************************************************************
+ // renderMenuIndex
+ //******************************************************************************************************************
+ // Creating a menu icon in the index
+ //******************************************************************************************************************
+ function renderMenuIndex()
+ {
+ $path = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/";
+ $pathsystem = XOOPS_URL . "/modules/system/";
+ $this->_obj->loadAdminMenu();
+ $ret = "<div class=\"rmmenuicon\">\n";
+ foreach (array_keys( $this->_obj->adminmenu) as $i) {
+ if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php'){
+ $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>";
+ $ret .= "</a>";
+ }
+ }
+ if ($this->_obj->getInfo('help')) {
+ 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>";
+ $ret .= "</a>";
+ }
+ }
+ $ret .= "</div>\n<div style=\"clear: both;\"></div>\n";
+ return $ret;
+ }
+ //******************************************************************************************************************
+ // renderButton
+ //******************************************************************************************************************
+ // Creating button
+ //******************************************************************************************************************
+ function renderButton($position = "right", $delimeter = " ")
+ {
+ $path = XOOPS_URL . "/Frameworks/moduleclasses/icons/32/";
+ switch ($position)
+ {
+ default:
+ case "right":
+ $ret = "<div class=\"floatright\">\n";
+ break;
+
+ case "left":
+ $ret = "<div class=\"floatleft\">\n";
+ break;
+
+ case "center":
+ $ret = "<div class=\"aligncenter\">\n";
+ }
+ $ret .= "<div class=\"xo-buttons\">\n";
+ foreach (array_keys( $this -> _itemButton) as $i) {
+ $ret .= "<a class='ui-corner-all tooltip' href='" . $this -> _itemButton[$i]['link'] . "' title='" . $this -> _itemButton[$i]['title'] . "'>";
+ $ret .= "<img src='" . $path . $this -> _itemButton[$i]['icon'] . "' title='" . $this -> _itemButton[$i]['title'] . "' />" . $this -> _itemButton[$i]['title'] . ' ' . $this -> _itemButton[$i]['extra'];
+ $ret .= "</a>\n";
+ $ret .= $delimeter;
+ }
+ $ret .= "</div>\n</div>\n";
+ $ret .= "<br /> <br /><br />";
+ return $ret;
+ }
+
+ function addItemButton($title, $link, $icon = 'add', $extra = '')
+ {
+ $ret['title'] = $title;
+ $ret['link'] = $link;
+ $ret['icon'] = $icon . '.png';
+ $ret['extra'] = $extra;
+ $this -> _itemButton[] = $ret;
+ return true;
+
+ }
+ //******************************************************************************************************************
+ // addConfigBoxLine
+ //******************************************************************************************************************
+ // $value: value
+ // $type: type of config: 1- "default": Just a line with value.
+ // 2- "folder": check if this is an folder.
+ // 3- "chmod": check if this is the good chmod.
+ // For this type ("chmod"), the value is an array: array(path, chmod)
+ //******************************************************************************************************************
+ function addConfigBoxLine($value = '', $type = 'default')
+ {
+ $line = "";
+ $path = XOOPS_URL . "/Frameworks/moduleclasses/icons/16/";
+ switch ($type)
+ {
+ default:
+ case "default":
+ $line .= "<span>" . $value . "</span>";
+ break;
+
+ case "folder":
+ 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{
+ $line .= "<span style='color : green;'>";
+ $line .= "<img src='" . $path . "on.png' >";
+ $line .= sprintf(_AM_MODULEADMIN_CONFIG_FOLDEROK, $value);
+ $line .= "</span>\n";
+ }
+ break;
+
+ case "chmod":
+ if (is_dir($value[0])){
+ if (substr(decoct(fileperms($value[0])),2) != $value[1]) {
+ $line .= "<span style='color : red; font-weight : bold;'>";
+ $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{
+ $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));
+ $line .= "</span>\n";
+ }
+ }
+ break;
+ }
+ $this -> _itemConfigBoxLine[] = $line;
+ return true;
+ }
+ //******************************************************************************************************************
+ // renderIndex
+ //******************************************************************************************************************
+ // Creating an index
+ //******************************************************************************************************************
+ function renderIndex()
+ {
+ $ret = "<table>\n<tr>\n";
+ $ret .= "<td width=\"40%\">\n";
+ $ret .= $this -> renderMenuIndex();
+ $ret .= "</td>\n";
+ $ret .= "<td width=\"60%\">\n";
+ $ret .= $this -> renderInfoBox();
+ $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)){
+ $ret .= "<tr>\n";
+ $ret .= "<td colspan=\"2\">\n";
+ $ret .= "<fieldset><legend class=\"label\">";
+ $ret .= _AM_MODULEADMIN_CONFIG;
+ $ret .= "</legend>\n";
+
+ // php version
+ $path = XOOPS_URL . "/Frameworks/moduleclasses/icons/16/";
+ 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{
+ $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 />";
+ }
+
+ // Database version
+ $path = XOOPS_URL . "/Frameworks/moduleclasses/icons/16/";
+ $dbarray=$this->_obj->getInfo('min_db');
+ if ($dbarray[XOOPS_DB_TYPE]) {
+ global $xoopsDB; // new line added by redheadedrod
+ $dbCurrentVersion= $xoopsDB->getServerVersion(); // new line added by redheadedrod
+ /* Remove hard coded code... Replaced by lines above
+ * also need to add getServerVersion to database connector.
+ switch (XOOPS_DB_TYPE) {
+ case "mysql":
+ global $xoopsDB;
+ echo $xoopsDB->getServerInfo();
+ $dbCurrentVersion= $xoopsDB->getServerInfo();
+ break;
+ case "mysqli":
+ $dbCurrentVersion = mysqli_get_server_info();
+ break;
+ case "pdo":
+ global $xoopsDB;
+ $dbCurrentVersion = $xoopsDB->getAttribute(PDO::ATTR_SERVER_VERSION);
+ break;
+ default:
+ $dbCurrentVersion = '0';
+ break;
+ } */
+ $currentVerParts = explode('.', (string)$dbCurrentVersion);
+ $iCurrentVerParts = array_map('intval', $currentVerParts);
+ $dbRequiredVersion = $dbarray[XOOPS_DB_TYPE];
+ $reqVerParts = explode('.', (string)$dbRequiredVersion);
+ $iReqVerParts = array_map('intval', $reqVerParts);
+ $icount = $j = count($iReqVerParts);
+ $reqVer = $curVer = 0;
+ for ($i=0; $i<$icount; $i++) {
+ $j--;
+ $reqVer += $iReqVerParts[$i] * pow(10, $j);
+ if (isset($iCurrentVerParts[$i])) {
+ $curVer += $iCurrentVerParts[$i] * pow(10, $j);
+ } else {
+ $curVer = $curVer * pow(10, $j);
+ }
+ }
+ if ($reqVer > $curVer) {
+ $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf(XOOPS_DB_TYPE.' '._AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion) . "</span><br />\n";
+ } else {
+ $ret .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf(strtoupper(XOOPS_DB_TYPE).' '._AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion) . "</span><br />\n";
+ }
+ }
+
+ // xoops version
+ 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{
+ $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')){
+ $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{
+ $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)){
+ foreach (array_keys( $this -> _itemConfigBoxLine) as $i) {
+ $ret .= $this -> _itemConfigBoxLine[$i];
+ $ret .= "<br />";
+ }
+ }
+ $ret .= "</fieldset>\n";
+ $ret .= "</td>\n";
+ $ret .= "</tr>\n";
+ }
+ $ret .= "</table>\n";
+ return $ret;
+ }
+ //******************************************************************************************************************
+ // addInfoBox
+ //******************************************************************************************************************
+ // $title: title of an InfoBox
+ //******************************************************************************************************************
+ function addInfoBox($title)
+ {
+ $ret['title'] = $title;
+ $this -> _itemInfoBox[] = $ret;
+ return true;
+ }
+ //******************************************************************************************************************
+ // addInfoBoxLine
+ //******************************************************************************************************************
+ // $label: title of InfoBox Line
+ // $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.
+ // For this type ("chmod"), the value is an array: array(path, chmod)
+ //******************************************************************************************************************
+ function addInfoBoxLine($label, $text, $value = '', $color = 'inherit', $type = 'default')
+ {
+ $ret['label'] = $label;
+ $line = "";
+ switch ($type)
+ {
+ default:
+ case "default":
+ $line .= sprintf($text, "<span style='color : " . $color . "; font-weight : bold;'>" . $value . "</span>");
+ break;
+
+ case "information":
+ $line .= $text;
+ break;
+ }
+ $ret['line'] = $line;
+ $this -> _itemInfoBoxLine[] = $ret;
+ return true;
+ }
+ function renderInfoBox()
+ {
+ $ret = "";
+ foreach (array_keys( $this -> _itemInfoBox) as $i) {
+ $ret .= "<fieldset><legend class=\"label\">";
+ $ret .= $this -> _itemInfoBox[$i]['title'];
+ $ret .= "</legend>\n";
+ foreach (array_keys( $this -> _itemInfoBoxLine) as $k) {
+ if ($this -> _itemInfoBoxLine[$k]['label'] == $this -> _itemInfoBox[$i]['title']){
+ $ret .= $this -> _itemInfoBoxLine[$k]['line'];
+ $ret .= "<br />";
+ }
+ }
+ $ret .= "</fieldset>\n";
+ $ret .= "<br/>\n";
+ }
+ 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";
+ $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 />
+ <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") . '">
+ ' . $this->_obj->getInfo("module_website_name") . '</a></text></div>';
+ $ret .= "<table>\n<tr>\n<td width=\"100px\">\n";
+ $ret .= "<img src='" . XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/" . $this->_obj->getInfo('image') . "' alt='" . $this->_obj->getVar('name') . "' style='float: left; margin-right: 10px;' />\n";
+ $ret .= "</td><td>\n";
+ $ret .= "<div style='margin-top: 1px; margin-bottom: 4px; font-size: 18px; line-height: 18px; color: #2F5376; font-weight: bold;'>\n";
+ $ret .= $this->_obj->getInfo('name') . " " . $this->_obj->getInfo('version') . " " . $this->_obj->getInfo('module_status') . " (" . $release_date . ")\n";
+ $ret .= "<br />\n";
+ $ret .= "</div>\n";
+ $ret .= "<div style='line-height: 16px; font-weight: bold;'>\n";
+ $ret .= "by ";
+ foreach (array_keys($author) as $i) {
+ $ret .= $author[$i];
+ if (isset($nickname[$i]) && $nickname[$i] !='') {
+ $ret .= " (" . $nickname[$i] . "), ";
+ }else{
+ $ret .= ", ";
+ }
+ }
+ $ret = substr($ret,0,-2);
+ $ret .= "</div>\n";
+ $ret .= "<div style='line-height: 16px;'>\n";
+ $ret.= "<a href=\"http://" . $this->_obj->getInfo('license_url'). "\" target=\"_blank\" >" . $this->_obj->getInfo('license'). "</a>\n";
+ $ret .= "<br />\n";
+ $ret .= "<a href=\"http://" . $this->_obj->getInfo('website') . "\" target=\"_blank\" >" . $this->_obj->getInfo('website') . "</a>\n";
+ $ret .= "<br />\n";
+ $ret .= "<br />\n";
+ 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 . '">
+ <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+ <img alt="" border="0" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" width="1" height="1">
+ </form>';
+ }
+ $ret .= "</div>\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();
+ $ret .= "</td>\n";
+ $ret .= "<td width=\"50%\">\n";
+ $ret .= "<fieldset><legend class=\"label\">\n";
+ $ret .= _AM_MODULEADMIN_ABOUT_CHANGELOG;
+ $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" ) ){
+ $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 ) ){
+ $ret .= utf8_encode(implode("<br />", file( $file ))) . "\n";
+ }else{
+ $file = XOOPS_ROOT_PATH. "/modules/" . $this->_obj->getVar("dirname") . "/docs/changelog.txt";
+ if ( is_readable( $file ) ){
+ $ret .= utf8_encode(implode("<br />", file( $file ))) . "\n";
+ }
+ }
+ $ret .= "</div>\n";
+ $ret .= "</fieldset>\n";
+ $ret .= "</td>\n";
+ $ret .= "</tr>\n";
+ $ret .= "</table>\n";
+ 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;
+ }
+
+ function addNavigation($menu = '')
+ {
+ $ret = "";
+ $navigation = "";
+ $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){
+ $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{
+ $navigation .= "<a href = '../" . $this->_obj->adminmenu[$i]['link'] . "'>" . $this->_obj->adminmenu[$i]['title'] . "</a> | ";
+ }
+ }
+ 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;
+ }
+}
+?>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/class/database/mysqldatabase.php (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7_redheadedrod/htdocs/class/database/mysqldatabase.php 2013-08-11 23:26:23 UTC (rev 11898)
@@ -0,0 +1,417 @@
+<?php
+/**
+ * MySQL access
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package kernel
+ * @subpackage database
+ * @since 1.0.0
+ * @author Kazumi Ono <on...@xo...>
+ * @version $Id: mysqldatabase.php 10264 2012-11-21 04:52:11Z beckmi $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ *
+ * @package kernel
+ * @subpackage database
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ */
+
+/**
+ * base class
+ */
+include_once XOOPS_ROOT_PATH . '/class/database/database.php';
+// xoops_load( 'xoopsdatabase' );
+/**
+ * connection to a mysql database
+ *
+ * @abstract
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsMySQLDatabase extends XoopsDatabase
+{
+ /**
+ * Database connection
+ *
+ * @var resource
+ */
+ var $conn;
+
+ /**
+ * connect to the database
+ *
+ * @param bool $selectdb select the database now?
+ * @return bool successful?
+ */
+ function connect($selectdb = TRUE)
+ {
+ static $db_charset_set;
+
+ if (!extension_loaded('mysql')) {
+ trigger_error('notrace:mysql extension not loaded', E_USER_ERROR);
+ return FALSE;
+ }
+
+ $this->allowWebChanges = ($_SERVER['REQUEST_METHOD'] != 'GET');
+
+ if (XOOPS_DB_PCONNECT == 1) {
+ $this->conn = @mysql_pconnect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+ } else {
+ $this->conn = @mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
+ }
+
+ if (!$this->conn) {
+ $this->logger->addQuery('', $this->error(), $this->errno());
+ return FALSE;
+ }
+ if ($selectdb != FALSE) {
+ if (!mysql_select_db(XOOPS_DB_NAME)) {
+ $this->logger->addQuery('', $this->error(), $this->errno());
+ return FALSE;
+ }
+ }
+ if (!isset($db_charset_set) && defined('XOOPS_DB_CHARSET') && XOOPS_DB_CHARSET) {
+ $this->queryF("SET NAMES '" . XOOPS_DB_CHARSET . "'");
+ }
+ $db_charset_set = 1;
+ $this->queryF("SET SQL_BIG_SELECTS = 1");
+ return TRUE;
+ }
+
+ /**
+ * Return information about the database server in use
+ *
+ * This is a new function added for 2.5.7 and later to allow support for other databases.
+ *
+ * @return will return version of server in use
+ */
+ function getServerVersion()
+ {
+ return mysql_get_server_info();
+ }
+
+ /**
+ * generate an ID for a new row
+ *
+ * This is for compatibility only. Will always return 0, because MySQL supports
+ * autoincrement for primary keys.
+ *
+ * @param string $sequence name of the sequence from which to get the next ID
+ * @return int always 0, because mysql has support for autoincrement
+ */
+ function genId($sequence)
+ {
+ return 0; // will use auto_increment
+ }
+
+ /**
+ * Get a result row as an enumerated array
+ *
+ * @param resource $result
+ * @return array
+ */
+ function fetchRow($result)
+ {
+ return @mysql_fetch_row($result);
+ }
+
+ /**
+ * Fetch a result row as an associative array
+ *
+ * @return array
+ */
+ function fetchArray($result)
+ {
+ return @mysql_fetch_assoc($result);
+ }
+
+ /**
+ * Fetch a result row as an associative array
+ *
+ * @return array
+ */
+ function fetchBoth($result)
+ {
+ return @mysql_fetch_array($result, MYSQL_BOTH);
+ }
+
+ /**
+ * XoopsMySQLDatabase::fetchObjected()
+ *
+ * @param mixed $result
+ * @return
+ */
+ function fetchObject($result)
+ {
+ return @mysql_fetch_object($result);
+ }
+
+ /**
+ * Get the ID generated from the previous INSERT operation
+ *
+ * @return int
+ */
+ function getInsertId()
+ {
+ return mysql_insert_id($this->conn);
+ }
+
+ /**
+ * Get number of rows in result
+ *
+ * @param resource $ query result
+ * @return int
+ */
+ function getRowsNum($result)
+ {
+ return @mysql_num_rows($result);
+ }
+
+ /**
+ * Get number of affected rows
+ *
+ * @return int
+ */
+ function getAffectedRows()
+ {
+ return mysql_affected_rows($this->conn);
+ }
+
+ /**
+ * Close MySQL connection
+ */
+ function close()
+ {
+ mysql_close($this->conn);
+ }
+
+ /**
+ * will free all memory associated with the result identifier result.
+ *
+ * @param resource $ query result
+ * @return bool TRUE on success or FALSE on failure.
+ */
+ function freeRecordSet($result)
+ {
+ return mysql_free_result($result);
+ }
+
+ /**
+ * Returns the text of the error message from previous MySQL operation
+ *
+ * @return bool Returns the error text from the last MySQL function, or '' (the empty string) if no error occurred.
+ */
+ function error()
+ {
+ return @mysql_error();
+ }
+
+ /**
+ * Returns the numerical value of the error message from previous MySQL operation
+ *
+ * @return int Returns the error number from the last MySQL function, or 0 (zero) if no error occurred.
+ */
+ function errno()
+ {
+ return @mysql_errno();
+ }
+
+ /**
+ * Returns escaped string text with single quotes around it to be safely stored in database
+ *
+ * @param string $str unescaped string text
+ * @return string escaped string text with single quotes around
+ */
+ function quoteString($str)
+ {
+ return $this->quote($str);
+ }
+
+ /**
+ * Quotes a string for use in a query.
+ */
+ function quote($string)
+ {
+ return "'" . str_replace("\\\"", '"', str_replace("\\"", '"', mysql_real_escape_string($string, $this->conn))) . "'";
+ }
+
+ /**
+ * perform a query on the database
+ *
+ * @param string $sql a valid MySQL query
+ * @param int $limit number of records to return
+ * @param int $start offset of first record to return
+ * @return resource query result or FALSE if successful
+ * or TRUE if successful and no result
+ */
+ function queryF($sql, $limit = 0, $start = 0)
+ {
+ if (!empty($limit)) {
+ if (empty($start)) {
+ $start = 0;
+ }
+ $sql = $sql . ' LIMIT ' . (int) $start . ', ' . (int) $limit;
+ }
+ $this->logger->startTime('query_time');
+ $result = mysql_query($sql, $this->conn);
+ $this->logger->stopTime('query_time');
+ $query_time = $this->logger->dumpTime('query_time', TRUE);
+ if ($result) {
+ $this->logger->addQuery($sql, NULL, NULL, $query_time);
+ return $result;
+ } else {
+ $this->logger->addQuery($sql, $this->error(), $this->errno(), $query_time);
+ return FALSE;
+ }
+ }
+
+ /**
+ * perform a query
+ *
+ * This method is empty and does nothing! It should therefore only be
+ * used if nothing is exactly what you want done! ;-)
+ *
+ * @param string $sql a valid MySQL query
+ * @param int $limit number of records to return
+ * @param int $start offset of first record to return
+ * @abstract
+ */
+ function query($sql, $limit = 0, $start = 0)
+ {
+ }
+
+ /**
+ * perform queries from SQL dump file in a batch
+ *
+ * @param string $file file path to an SQL dump file
+ * @return bool FALSE if failed reading SQL file or TRUE if the file has been read and queries executed
+ */
+ function queryFromFile($file)
+ {
+ if (FALSE !== ($fp = fopen($file, 'r'))) {
+ include_once XOOPS_ROOT_PATH . '/class/database/sqlutility.php';
+ $sql_queries = trim(fread($fp, filesize($file)));
+ SqlUtility::splitMySqlFile($pieces, $sql_queries);
+ foreach ($pieces as $query) {
+ // [0] contains the prefixed query
+ // [4] contains unprefixed table name
+ $prefixed_query = SqlUtility::prefixQuery(trim($query), $this->prefix());
+ if ($prefixed_query != FALSE) {
+ $this->query($prefixed_query[0]);
+ }
+ }
+ return TRUE;
+ }
+ return FALSE;
+ }
+
+ /**
+ * Get field name
+ *
+ * @param resource $result query result
+ * @param int $ numerical field index
+ * @return string
+ */
+ function getFieldName($result, $offset)
+ {
+ return mysql_field_name($result, $offset);
+ }
+
+ /**
+ * Get field type
+ *
+ * @param resource $result query result
+ * @param int $offset numerical field index
+ * @return string
+ */
+ function getFieldType($result, $offset)
+ {
+ return mysql_field_type($result, $offset);
+ }
+
+ /**
+ * Get number of fields in result
+ *
+ * @param resource $result query result
+ * @return int
+ */
+ function getFieldsNum($result)
+ {
+ return mysql_num_fields($result);
+ }
+}
+
+/**
+ * Safe Connection to a MySQL database.
+ *
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsMySQLDatabaseSafe extends XoopsMySQLDatabase
+{
+ /**
+ * perform a query on the database
+ *
+ * @param string $sql a valid MySQL query
+ * @param int $limit number of records to return
+ * @param int $start offset of first record to return
+ * @return resource query result or FALSE if successful
+ * or TRUE if successful and no result
+ */
+ function query($sql, $limit = 0, $start = 0)
+ {
+ return $this->queryF($sql, $limit, $start);
+ }
+}
+
+/**
+ * Read-Only connection to a MySQL database.
+ *
+ * This class allows only SELECT queries to be performed through its
+ * {@link query()} method for security reasons.
+ *
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package kernel
+ * @subpackage database
+ */
+class XoopsMySQLDatabaseProxy extends XoopsMySQLDatabase
+{
+ /**
+ * perform a query on the database
+ *
+ * this method allows only SELECT queries for safety.
+ *
+ * @param string $sql a valid MySQL query
+ * @param int $limit number of records to return
+ * @param int $start offset of first record to return
+ * @return resource query result or FALSE if unsuccessful
+ */
+ function query($sql, $limit = 0, $start = 0)
+ {
+ $sql = ltrim($sql);
+ if (!$this->allowWebChanges && strtolower(substr($sql, 0, 6)) != 'select') {
+ trigger_error('Database updates are not allowed during processing of a GET request', E_USER_WARNING);
+ return FALSE;
+ }
+
+ return $this->queryF($sql, $limit, $start);
+ }
+}
+
+?>
\ No newline at end of file
|
|
From: <be...@us...> - 2013-08-11 20:46:59
|
Revision: 11897
http://sourceforge.net/p/xoops/svn/11897
Author: beckmi
Date: 2013-08-11 20:46:57 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Updating changelog.250.txt
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
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-08-11 20:44:42 UTC (rev 11896)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-08-11 20:46:57 UTC (rev 11897)
@@ -14,6 +14,7 @@
- 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)
===============================
2013/04/21: Version 2.5.6 Final
|
|
From: <be...@us...> - 2013-08-11 20:44:44
|
Revision: 11896
http://sourceforge.net/p/xoops/svn/11896
Author: beckmi
Date: 2013-08-11 20:44:42 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
added: check if 'date.timezone' is set in php.ini, set it to UTC, if not
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.png
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.png 2013-08-11 20:39:34 UTC (rev 11895)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.png 2013-08-11 20:44:42 UTC (rev 11896)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
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-08-11 20:39:34 UTC (rev 11895)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php 2013-08-11 20:44:42 UTC (rev 11896)
@@ -136,6 +136,10 @@
// $xoops_server_timezone .="+".$xoopsConfig["server_TZ"]; } else{
// $xoops_server_timezone .=$xoopsConfig["server_TZ"]; } date_default_timezone_set($xoops_server_timezone);
+//check if 'date.timezone' is set in php.ini
+if (!ini_get('date.timezone')) {
+ date_default_timezone_set('UTC');
+}
/**
* Enable Gzip compression, r
|
|
From: <be...@us...> - 2013-08-11 20:39:37
|
Revision: 11895
http://sourceforge.net/p/xoops/svn/11895
Author: beckmi
Date: 2013-08-11 20:39:34 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
fixing minor issues in blocks
Modified Paths:
--------------
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php
XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php
XoopsModules/mxDirectory/trunk/mxdirectory/docs/changelog.txt
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php 2013-08-10 14:28:46 UTC (rev 11894)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_cats.php 2013-08-11 20:39:34 UTC (rev 11895)
@@ -75,8 +75,8 @@
function b_xdir_cat_edit($options) {
//include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
-// $mydirname = basename ( dirname(dirname( __FILE__ ) ) ) ;
-// include_once XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
+ $mydirname = basename ( dirname(dirname( __FILE__ ) ) ) ;
+ include_once XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
global $xoopsDB, $xoopModuleConfig;
$mytree = new MxdirectoryTree($xoopsDB->prefix("xdir_cat"),"cid","pid");
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php 2013-08-10 14:28:46 UTC (rev 11894)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/blocks/xdir_coup.php 2013-08-11 20:39:34 UTC (rev 11895)
@@ -41,7 +41,8 @@
* $options[5] = Category to use
* Output : Returns the desired most recent or most popular links
******************************************************************************/
-function b_xdir_coup_show($options) {
+function b_xdir_coup_show($options)
+{
//include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
$mydirname = basename ( dirname(dirname( __FILE__ ) ) ) ;
include_once XOOPS_ROOT_PATH."/modules/" . $mydirname . "/class/mxdirectorytree.php";
@@ -81,8 +82,8 @@
for ($i=0;$i<count($block);$i++) {
$block[$i]['mydirname'] = $mydirname;
}
- if( empty($block) ) {
- $block = ($options[4] == 0) ? "" : array('id'=>'','cid'=>'','title'=>'');
+ if( empty($block) ) {
+ $block = ($options[5] == 0) ? "" : array('ld' => '', 'cid' => '', 'image' => '','mydirname' => '' ,'linkTitle' => '');
}
return $block;
}
Modified: XoopsModules/mxDirectory/trunk/mxdirectory/docs/changelog.txt
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/docs/changelog.txt 2013-08-10 14:28:46 UTC (rev 11894)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/docs/changelog.txt 2013-08-11 20:39:34 UTC (rev 11895)
@@ -2,6 +2,7 @@
3.02 Beta 1 2013-08-02
---------------------------------------
- Converted to XOOPS 2.5.6 Admin GUI (Mamba)
+- fix: missing variable is blocks
---------------------------------------
3.01 RC 1 2006-05-19
|
|
From: <luc...@us...> - 2013-08-10 14:28:52
|
Revision: 11894
http://sourceforge.net/p/xoops/svn/11894
Author: luciorota
Date: 2013-08-10 14:28:46 +0000 (Sat, 10 Aug 2013)
Log Message:
-----------
module standardization: use WfdownloadWfdownload object instead of $xoopsModule, $xoopsModuleConfig and xoops_getmodulehandler
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php
XoopsModules/wfdownloads/trunk/wfdownloads/comment_new.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/header.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/comment_functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/rss.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -67,17 +67,6 @@
xoops_loadLanguage('modinfo', $xoopsModule->dirname());
xoops_loadLanguage('main', $xoopsModule->dirname());
-// Load module handlers
-$category_handler = xoops_getmodulehandler('category', $xoopsModule->dirname());
-$download_handler = xoops_getmodulehandler('download', $xoopsModule->dirname());
-$review_handler = xoops_getmodulehandler('review', $xoopsModule->dirname());
-$mirror_handler = xoops_getmodulehandler('mirror', $xoopsModule->dirname());
-$mime_handler = xoops_getmodulehandler('mimetype', $xoopsModule->dirname());
-$report_handler = xoops_getmodulehandler('report', $xoopsModule->dirname());
-$modification_handler = xoops_getmodulehandler('modification', $xoopsModule->dirname());
-$ip_log_handler = xoops_getmodulehandler('ip_log', $xoopsModule->dirname());
-$rating_handler = xoops_getmodulehandler('rating', $xoopsModule->dirname());
-
// Load Xoops handlers
$member_handler = xoops_gethandler('member');
$notification_handler = &xoops_gethandler('notification');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -39,8 +39,7 @@
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$sform = new XoopsThemeForm(_AM_WFD_CCATEGORY_MOVE, "move", xoops_getenv('PHP_SELF'));
- $category_handler = xoops_getmodulehandler('category');
- $categories = $category_handler->getObjects();
+ $categories = $wfdownloads->getHandler('category')->getObjects();
$mytree = new XoopsObjectTree($categories, "cid", "pid");
$sform->addElement(new XoopsFormLabel(_AM_WFD_BMODIFY, $mytree->makeSelBox('target', 'title')));
$create_tray = new XoopsFormElementTray('', '');
@@ -65,8 +64,7 @@
if (!$target) {
redirect_header($currentFile . "?op=category.move&ok=0&cid={$source}", 5, _AM_WFD_CCATEGORY_MODIFY_FAILEDT);
}
- $download_handler = xoops_getmodulehandler('download');
- $result = $download_handler->updateAll("cid", $target, new Criteria("cid", $source), true);
+ $result = $wfdownloads->getHandler('download')->updateAll("cid", $target, new Criteria("cid", $source), true);
if (!$result) {
$error = _AM_WFD_DBERROR;
trigger_error($error, E_USER_ERROR);
@@ -93,12 +91,11 @@
$doimage = isset($_POST['doimage']);
$dobr = isset($_POST['dobr']);
- $category_handler = xoops_getmodulehandler('category');
if (!$cid) {
- $category = $category_handler->create();
+ $category = $wfdownloads->getHandler('category')->create();
} else {
- $category = $category_handler->get($cid);
- $childcats = $category_handler->getChildCats($category);
+ $category = $wfdownloads->getHandler('category')->get($cid);
+ $childcats = $wfdownloads->getHandler('category')->getChildCats($category);
if ($pid == $cid || in_array($pid, array_keys($childcats))) {
$category->setErrors(_AM_WFD_CCATEGORY_CHILDASPARENT);
}
@@ -122,7 +119,7 @@
// added - start - March 4 2006 - jpc
$category->setVar('formulize_fid', $formulize_fid);
// added - end - March 4 2006 - jpc
- $result = $category_handler->insert($category);
+ $result = $wfdownloads->getHandler('category')->insert($category);
if (!$result) {
echo $category->getHtmlErrors();
}
@@ -153,8 +150,7 @@
case "del" :
$cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
- $category_handler = xoops_getmodulehandler('category');
- $categories = $category_handler->getObjects();
+ $categories = $wfdownloads->getHandler('category')->getObjects();
$mytree = new XoopsObjectTree($categories, "cid", "pid");
if ($ok == true) {
// get all subcategories under the specified category
@@ -167,25 +163,21 @@
$criteria = new Criteria("cid", "(" . implode(',', $cids) . ")", "IN");
- $download_handler = xoops_getmodulehandler('download');
//get list of downloads in these subcategories
- $downloads = $download_handler->getList($criteria);
+ $downloads = $wfdownloads->getHandler('download')->getList($criteria);
$download_criteria = new Criteria("lid", "(" . implode(',', array_keys($downloads)) . ")", "IN");
- $rating_handler = xoops_getmodulehandler('rating');
- $report_handler = xoops_getmodulehandler('report');
-
// now for each download, delete the text data and vote data associated with the download
- $rating_handler->deleteAll($download_criteria);
- $report_handler->deleteAll($download_criteria);
- $download_handler->deleteAll($download_criteria);
+ $wfdownloads->getHandler('rating')->deleteAll($download_criteria);
+ $wfdownloads->getHandler('report')->deleteAll($download_criteria);
+ $wfdownloads->getHandler('download')->deleteAll($download_criteria);
foreach (array_keys($downloads) as $lid) {
xoops_comment_delete($xoopsModule->getVar('mid'), (int)$lid);
}
// all downloads for each category is deleted, now delete the category data
- $category_handler->deleteAll($criteria);
+ $wfdownloads->getHandler('category')->deleteAll($criteria);
$error = _AM_WFD_DBERROR;
foreach ($cids as $cid) {
@@ -215,9 +207,9 @@
echo $adminMenu->renderButton();
if (isset($_REQUEST['cid'])) {
- $category = $category_handler->get($_REQUEST['cid']);
+ $category = $wfdownloads->getHandler('category')->get($_REQUEST['cid']);
} else {
- $category = $category_handler->create();
+ $category = $wfdownloads->getHandler('category')->create();
}
$form = $category->getForm();
$form -> display();
@@ -258,9 +250,9 @@
$new_weights = $_POST['new_weights'];
$ids = array();
foreach ($new_weights as $cid => $new_weight ) {
- $category = $category_handler->get($cid);
+ $category = $wfdownloads->getHandler('category')->get($cid);
$category->setVar('weight', $new_weight);
- if (!$category_handler->insert($category)) {
+ if (!$wfdownloads->getHandler('category')->insert($category)) {
redirect_header($currentFile, 3, $category->getErrors());
}
unset($category);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -20,6 +20,7 @@
*/
$currentFile = basename(__FILE__);
include 'admin_header.php';
+
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
include_once WFDOWNLOADS_ROOT_PATH . '/class/wfd_lists.php';
@@ -52,7 +53,7 @@
case "download.delete" :
$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
- if (!$download = $download_handler->get($lid)) {
+ if (!$download = $wfdownloads->getHandler('download')->get($lid)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_DOWNLOADNOTFOUND);
exit();
}
@@ -61,12 +62,12 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $file = $xoopsModuleConfig['uploaddir'] . "/" . $download->getVar('filename');
+ $file = $wfdownloads->getConfig('uploaddir') . "/" . $download->getVar('filename');
if (is_file($file)) {
@chmod($file, 0777);
@unlink($file);
}
- if ($download_handler->delete($download)) {
+ if ($wfdownloads->getHandler('download')->delete($download)) {
redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $title));
} else {
echo $download->getHtmlErrors();
@@ -80,9 +81,8 @@
case "vote.delete" :
case "delVote" :
- $rating_handler = xoops_getmodulehandler('rating');
- $rating = $rating_handler->get($_GET['rid']);
- if ($rating_handler->delete($rating, true)) {
+ $rating = $wfdownloads->getHandler('rating')->get($_GET['rid']);
+ if ($wfdownloads->getHandler('rating')->delete($rating, true)) {
wfd_updaterating(intval($rating->getVar('lid')));
}
redirect_header($currentFile, 1, _AM_WFD_VOTE_VOTEDELETED);
@@ -109,28 +109,26 @@
case "newdownload.approve" :
case "approve":
$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
- $download_handler = xoops_getmodulehandler('download');
- if (!$download = $download_handler->get($lid)) {
+ if (!$download = $wfdownloads->getHandler('download')->get($lid)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_DOWNLOADNOTFOUND);
exit();
}
// Update the database
$download->setVar('published', time());
$download->setVar('status', 1);
- if (!$download_handler->insert($download, true)) {
+ if (!$wfdownloads->getHandler('download')->insert($download, true)) {
echo $download->getHtmlErrors();
exit();
}
// Trigger notify
$title = $download->getVar('title');
$cid = $download->getVar('cid');
- $category = $category_handler->get($cid);
+ $category = $wfdownloads->getHandler('category')->get($cid);
$tags = array();
$tags['FILE_NAME'] = $title;
$tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
$tags['CATEGORY_NAME'] = $category->getVar('title');
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
- $notification_handler = &xoops_gethandler('notification');
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
if ($download->getVar('notifypub')) {
@@ -143,7 +141,7 @@
default :
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $categories = $category_handler->getObjects();
+ $categories = $wfdownloads->getHandler('category')->getObjects();
$start_published = wfdownloads_CleanVars($_GET, 'start_published', 0, 'int');
$start_new = wfdownloads_CleanVars($_GET, 'start_new', 0, 'int');
@@ -152,14 +150,14 @@
$start_offline = wfdownloads_CleanVars($_GET, 'start_offline', 0, 'int');
$totalcats = wfd_totalcategory();
- $categories = $category_handler->getObjects(null, true, false);
+ $categories = $wfdownloads->getHandler('category')->getObjects(null, true, false);
- $totalbrokendownloads = $report_handler->getCount();
- $totalmodrequests = $modification_handler->getCount();
- $newreviews = $review_handler->getCount();
- $newmirrors = $mirror_handler->getCount();
- $totalnewdownloads = $download_handler->getCount(new Criteria("published", 0));
- $totaldownloads = $download_handler->getCount(new Criteria("published", 0, ">"));
+ $totalbrokendownloads = $wfdownloads->getHandler('report')->getCount();
+ $totalmodrequests = $wfdownloads->getHandler('modification')->getCount();
+ $newreviews = $wfdownloads->getHandler('review')->getCount();
+ $newmirrors = $wfdownloads->getHandler('mirror')->getCount();
+ $totalnewdownloads = $wfdownloads->getHandler('download')->getCount(new Criteria("published", 0));
+ $totaldownloads = $wfdownloads->getHandler('download')->getCount(new Criteria("published", 0, ">"));
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
@@ -176,9 +174,9 @@
$criteria->setSort("published");
$criteria->setOrder("DESC");
$criteria->setStart($start_published);
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $published_downloads = $download_handler->getActiveDownloads($criteria);
- $published_downloads_count = $download_handler->getActiveCount();
+ $criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
+ $published_downloads = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
+ $published_downloads_count = $wfdownloads->getHandler('download')->getActiveCount();
$GLOBALS['xoopsTpl']->assign('published_downloads_count', $published_downloads_count);
if ($published_downloads_count > 0) {
foreach ($published_downloads as $published_download) {
@@ -191,16 +189,16 @@
}
}
- $pagenav = new XoopsPageNav($published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_published, 'start_published');
+ $pagenav = new XoopsPageNav($published_downloads_count, $wfdownloads->getConfig('admin_perpage'), $start_published, 'start_published');
$GLOBALS['xoopsTpl']->assign('published_downloads_pagenav', $pagenav->renderNav());
// New Downloads
$criteria = new CriteriaCompo();
$criteria->add(new Criteria("published", 0));
$criteria->setStart($start_new);
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $new_downloads = $download_handler->getObjects($criteria);
- $new_downloads_count = $download_handler->getCount($criteria);
+ $criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
+ $new_downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $new_downloads_count = $wfdownloads->getHandler('download')->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('new_downloads_count', $new_downloads_count);
if ($new_downloads_count > 0) {
foreach ($new_downloads as $new_download) {
@@ -219,7 +217,7 @@
$GLOBALS['xoopsTpl']->append('new_downloads', $new_download_array);
}
}
- $pagenav = new XoopsPageNav($new_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_new, 'start_new');
+ $pagenav = new XoopsPageNav($new_downloads_count, $wfdownloads->getConfig('admin_perpage'), $start_new, 'start_new');
$GLOBALS['xoopsTpl']->assign('new_downloads_pagenav', $pagenav->renderNav());
// Auto Published Downloads
@@ -228,9 +226,9 @@
$criteria->setSort("published");
$criteria->setOrder("ASC");
$criteria->setStart($start_auto_published);
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $auto_published_downloads = $download_handler->getObjects($criteria);
- $auto_published_downloads_count = $download_handler->getCount($criteria);
+ $criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
+ $auto_published_downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $auto_published_downloads_count = $wfdownloads->getHandler('download')->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('auto_published_downloads_count', $auto_published_downloads_count);
if ($auto_published_downloads_count > 0) {
foreach ($auto_published_downloads as $auto_published_download) {
@@ -242,7 +240,7 @@
$GLOBALS['xoopsTpl']->append('auto_published_downloads', $auto_published_download_array);
}
}
- $pagenav = new XoopsPageNav($auto_published_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_auto_published, 'start_auto_published');
+ $pagenav = new XoopsPageNav($auto_published_downloads_count, $wfdownloads->getConfig('admin_perpage'), $start_auto_published, 'start_auto_published');
$GLOBALS['xoopsTpl']->assign('auto_published_downloads_pagenav', $pagenav->renderNav());
// Expired downloads
@@ -252,9 +250,9 @@
$criteria->setSort("expired");
$criteria->setOrder("ASC");
$criteria->setStart($start_expired);
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $expired_downloads = $download_handler->getObjects($criteria);
- $expired_downloads_count = $download_handler->getCount($criteria);
+ $criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
+ $expired_downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $expired_downloads_count = $wfdownloads->getHandler('download')->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expired_downloads_count);
if ($expired_downloads_count > 0) {
foreach ($expired_downloads as $expired_download) {
@@ -266,7 +264,7 @@
$GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
}
}
- $pagenav = new XoopsPageNav($expired_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_expired, 'start_expired');
+ $pagenav = new XoopsPageNav($expired_downloads_count, $wfdownloads->getConfig('admin_perpage'), $start_expired, 'start_expired');
$GLOBALS['xoopsTpl']->assign('expired_downloads_pagenav', $pagenav->renderNav());
// Offline downloads
@@ -274,10 +272,10 @@
$criteria->setSort("published");
$criteria->setOrder("ASC");
$criteria->setStart($start_offline);
- $criteria->setLimit($xoopsModuleConfig['admin_perpage']);
- $offline_downloads_count = $download_handler->getCount($criteria);
- $offline_downloads = $download_handler->getObjects($criteria);
- $offline_downloads_count = $download_handler->getCount($criteria);
+ $criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
+ $offline_downloads_count = $wfdownloads->getHandler('download')->getCount($criteria);
+ $offline_downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $offline_downloads_count = $wfdownloads->getHandler('download')->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('offline_downloads_count', $offline_downloads_count);
if ($offline_downloads_count > 0) {
foreach ($offline_downloads as $offline_download) {
@@ -290,7 +288,7 @@
$GLOBALS['xoopsTpl']->append('offline_downloads', $offline_download_array);
}
}
- $pagenav = new XoopsPageNav($offline_downloads_count, $xoopsModuleConfig['admin_perpage'], $start_offline, 'start_offline');
+ $pagenav = new XoopsPageNav($offline_downloads_count, $wfdownloads->getConfig('admin_perpage'), $start_offline, 'start_offline');
$GLOBALS['xoopsTpl']->assign('offline_downloads_pagenav', $pagenav->renderNav());
} else {
// NOP
@@ -306,39 +304,37 @@
function addDownload()
{
global $xoopsUser, $imagearray, $currentFile;
- $download_handler = xoops_getmodulehandler('download');
- $category_handler = xoops_getmodulehandler('category');
+ $wfdownloads = WfdownloadsWfdownloads::getInstance();
$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
- $numrows = $category_handler->getCount();
+ $numrows = $wfdownloads->getHandler('category')->getCount();
if ($numrows) {
// allowed mimetypes list
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_FILE_ALLOWEDAMIME . "</legend>\n";
echo "<div style='padding: 8px;'>\n";
- $mime_handler = xoops_getmodulehandler('mimetype');
$criteria = new Criteria("mime_admin", true);
- $mimetypes = $mime_handler->getList($criteria);
+ $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
$allowmimetypes = implode(' | ', $mimetypes);
echo $allowmimetypes;
echo "</div>\n";
echo "</fieldset><br />\n";
if ($lid) {
- if (!$download = $download_handler->get($lid)) {
+ if (!$download = $wfdownloads->getHandler('download')->get($lid)) {
redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
exit();
}
$cid = $download->getVar('cid');
- if(!$category = $category_handler->get($cid)) {
+ if(!$category = $wfdownloads->getHandler('category')->get($cid)) {
redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_CATEGORYNOTFOUND);
exit();
}
$title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_EDITDOWNLOADTITLE);
} else {
- $download = $download_handler->create();
+ $download = $wfdownloads->getHandler('download')->create();
$cid = wfdownloads_CleanVars($_POST, 'cid', 0, 'int');
- $category = $category_handler->get($cid);
+ $category = $wfdownloads->getHandler('category')->get($cid);
$download->setVar('cid', $cid);
$title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_DOWNLOADTITLE);
}
@@ -361,7 +357,6 @@
$customArray['parentLinks'] = "";
$owner = getEntryOwner($entry);
- $member_handler =& xoops_gethandler('member');
$owner_groups =& $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $owner_groups;
@@ -381,19 +376,18 @@
// Vote data list/manager
if ($lid) {
- $rating_handler = xoops_getmodulehandler('rating');
- $totalvotes = $rating_handler->getCount();
+ $totalvotes = $wfdownloads->getHandler('rating')->getCount();
$reg_criteria = new CriteriaCompo(new Criteria('lid', $lid));
$reg_criteria->add(new Criteria("ratinguser", 0, ">"));
- $votesreg = $rating_handler->getCount($reg_criteria);
+ $votesreg = $wfdownloads->getHandler('rating')->getCount($reg_criteria);
$reg_criteria->setSort("ratingtimestamp");
$reg_criteria->setOrder("DESC");
- $regvotes = $rating_handler->getObjects($reg_criteria);
+ $regvotes = $wfdownloads->getHandler('rating')->getObjects($reg_criteria);
$anon_criteria = new CriteriaCompo(new Criteria('lid', $lid));
$anon_criteria->add(new Criteria("ratinguser", 0, "="));
- $votesanon = $rating_handler->getCount($anon_criteria);
+ $votesanon = $wfdownloads->getHandler('rating')->getCount($anon_criteria);
$anon_criteria->setSort("ratingtimestamp");
$anon_criteria->setOrder("DESC");
@@ -429,7 +423,7 @@
$criteria = new Criteria("ratinguser", "(".implode(',', $uids).")", "IN");
$criteria->setGroupby("ratinguser");
- $userratings = $rating_handler->getUserAverage($criteria);
+ $userratings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
foreach (array_keys($regvotes) as $i) {
$formatted_date = formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), _DATESTRING);
@@ -468,8 +462,8 @@
echo "<tr><td colspan='7' class='even'><b>" . _AM_WFD_VOTE_NOUNREGVOTES . "</b></td></tr>";
} else {
$criteria = new Criteria("ratinguser", 0);
- $userratings = $rating_handler->getUserAverage($criteria);
- $anonvotes = $rating_handler->getObjects($anon_criteria);
+ $userratings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+ $anonvotes = $wfdownloads->getHandler('rating')->getObjects($anon_criteria);
foreach (array_keys($anonvotes) as $i) {
$formatted_date = formatTimestamp($anonvotes[$i]->getVar('ratingtimestamp'), _DATESTRING);
@@ -500,19 +494,19 @@
function saveDownload()
{
- global $xoopsUser, $xoopsModuleConfig, $currentFile, $_FILES;
+ global $xoopsUser, $currentFile;
+ $wfdownloads = WfdownloadsWfdownloads::getInstance();
$lid = (!empty($_POST['lid'])) ? intval($_POST['lid']) : 0;
$cid = (!empty($_POST['cid'])) ? intval($_POST['cid']) : 0;
$status = (!empty($_POST['status'])) ? intval($_POST['status']) : 2;
- $download_handler = xoops_getmodulehandler('download');
if ($lid > 0) {
$thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
- $download = $download_handler->get($lid);
+ $download = $wfdownloads->getHandler('download')->get($lid);
} else {
$thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
- $download = $download_handler->create();
+ $download = $wfdownloads->getHandler('download')->create();
}
/* Define URL */
if (empty($_FILES['userfile']['name'])) {
@@ -530,7 +524,7 @@
$download->setVar('filename', $filename);
$download->setVar('filetype', $filetype);
} else {
- $down = wfd_uploading($_FILES, $xoopsModuleConfig['uploaddir'], "", $currentFile, 0, 0);
+ $down = wfd_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), "", $currentFile, 0, 0);
$url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
$size = $down['size'];
$title = $_FILES['userfile']['name'];
@@ -563,17 +557,15 @@
// If both conditions are true, then trigger all three notifications related to modified records.
if (!$thisIsANewRecord and ($download->getVar('version') != $version)) {
// Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
- $notification_handler = &xoops_gethandler('notification');
$tags = array();
$tags['FILE_NAME'] = $title;
$tags['FILE_URL'] = WFDOWNLOADS_URL . '/singlefile.php?cid=' . $cid . '&lid=' . $lid;
- $category_handler = xoops_getmodulehandler('category');
- $category = $category_handler->get($cid);
+ $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 ($xoopsModuleConfig['autoapprove'] == 2 || $xoopsModuleConfig['autoapprove'] == 4) {
+ if ($wfdownloads->getConfig('autoapprove') == 2 || $wfdownloads->getConfig('autoapprove') == 4) {
// 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);
@@ -597,7 +589,7 @@
$download->setVar('submitter', trim($_POST["submitter"]));
$download->setVar('publisher', trim($_POST["publisher"]));
$download->setVar('price', trim($_POST["price"]));
- if (!$xoopsModuleConfig['enable_mirrors']) {
+ if (!$wfdownloads->getConfig('enable_mirrors')) {
$download->setVar('mirror', formatURL(trim($_POST["mirror"])));
}
$download->setVar('license', trim($_POST["license"]));
@@ -666,8 +658,7 @@
}
// added - start - March 4 2006 - jpc
- $category_handler = xoops_getmodulehandler('category');
- $category = $category_handler->get($cid);
+ $category = $wfdownloads->getHandler('category')->get($cid);
$fid = $category->getVar('formulize_fid');
if($fid) {
global $xoopsUser;
@@ -690,11 +681,10 @@
$entries[$fid][0] = "";
$owner = "";
}
- $member_handler =& xoops_gethandler('member');
$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
+ $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+ $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
+ $entries = handleSubmission($formulize_mgr, $entries, $uid, $owner, $fid, $owner_groups, $groups, "new"); // "new" causes xoops token check to be skipped, since WF-downloads should be doing that
//if (!$lid)
if(!$owner) {
@@ -703,7 +693,7 @@
}
}
// added - end - March 4 2006 - jpc
- $download_handler->insert($download);
+ $wfdownloads->getHandler('download')->insert($download);
$newid = intval($download->getVar('lid'));
/**
* Send notifications
@@ -712,10 +702,6 @@
$tags = array();
$tags['FILE_NAME'] = $title;
$tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
- // changed - start - March 4 2006 - jpc
- //$category_handler = xoops_getmodulehandler('category');
- //$category = $category_handler->get($cid);
- // changed - end - March 4 2006 - jpc
$tags['CATEGORY_NAME'] = $category->getVar('title');
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
$notification_handler = & xoops_gethandler('notification');
@@ -726,11 +712,9 @@
$tags = array();
$tags['FILE_NAME'] = $title;
$tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $category_handler = xoops_getmodulehandler('category');
- $category = $category_handler->get($cid);
+ $category = $wfdownloads->getHandler('category')->get($cid);
$tags['CATEGORY_NAME'] = $category->getVar('title');
$tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
- $notification_handler = & xoops_gethandler('notification');
$notification_handler -> triggerEvent('global', 0, 'new_file', $tags);
$notification_handler -> triggerEvent('category', $cid, 'new_file', $tags);
$notification_handler -> triggerEvent('file', $lid, 'approve', $tags);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -31,9 +31,9 @@
redirect_header($currentFile, 2, _AM_WFD_DOWN_IMAGEEXIST);
}
$allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
- $maxFileSize = $xoopsModuleConfig['maxfilesize'];
- $maxImgWidth = $xoopsModuleConfig['maximgwidth'];
- $maxImgHeight = $xoopsModuleConfig['maximgheight'];
+ $maxFileSize = $wfdownloads->getConfig('maxfilesize');
+ $maxImgWidth = $wfdownloads->getConfig('maximgwidth');
+ $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);
@@ -83,7 +83,7 @@
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
- $dirArray = array(1 => $xoopsModuleConfig['catimage'], 2 => $xoopsModuleConfig['screenshots'], 3 => $xoopsModuleConfig['mainimagedir']);
+ $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);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -28,20 +28,13 @@
$indexAdmin = new ModuleAdmin();
//--------------------------
-$report_handler = xoops_getmodulehandler('report');
-$review_handler = xoops_getmodulehandler('review');
-$mirror_handler = xoops_getmodulehandler('mirror');
-$modification_handler = xoops_getmodulehandler('modification');
-$download_handler = xoops_getmodulehandler('download');
-
-
$totalcats = wfd_totalcategory();
-$totalbrokendownloads = $report_handler->getCount();
-$totalmodrequests = $modification_handler->getCount();
-$newreviews = $review_handler->getCount();
-$newmirrors = $mirror_handler->getCount();
-$totalnewdownloads = $download_handler->getCount(new Criteria("published", 0));
-$totaldownloads = $download_handler->getCount(new Criteria("published", 0, ">"));
+$totalbrokendownloads = $wfdownloads->getHandler('report')->getCount();
+$totalmodrequests = $wfdownloads->getHandler('modification')->getCount();
+$newreviews = $wfdownloads->getHandler('review')->getCount();
+$newmirrors = $wfdownloads->getHandler('mirror')->getCount();
+$totalnewdownloads = $wfdownloads->getHandler('download')->getCount(new Criteria("published", 0));
+$totaldownloads = $wfdownloads->getHandler('download')->getCount(new Criteria("published", 0, ">"));
$indexAdmin->addInfoBox(_AM_WFD_MINDEX_DOWNSUMMARY);
// Categories
@@ -127,18 +120,18 @@
$indexAdmin->addConfigBoxLine('');
$redirectFile = $_SERVER['PHP_SELF'];
-$path = $xoopsModuleConfig['uploaddir'] . '/';
+$path = $wfdownloads->getConfig('uploaddir') . '/';
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path, 0777, $redirectFile));
$indexAdmin->addConfigBoxLine('');
-$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['mainimagedir'] . '/';
+$path = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('mainimagedir') . '/';
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path, 0777, $redirectFile));
$indexAdmin->addConfigBoxLine(FileChecker::getFileStatus($path . 'blank.gif', dirname(dirname(__FILE__)) . '/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine('');
-$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['screenshots'] . '/';
+$path = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('screenshots') . '/';
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path, 0777, $redirectFile));
$indexAdmin->addConfigBoxLine(FileChecker::getFileStatus($path . 'blank.gif', dirname(dirname(__FILE__)) . '/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path . 'thumbs' . '/', 0777, $redirectFile));
@@ -146,7 +139,7 @@
$indexAdmin->addConfigBoxLine('');
-$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['catimage'] . '/';
+$path = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage') . '/';
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path, 0777, $redirectFile));
$indexAdmin->addConfigBoxLine(FileChecker::getFileStatus($path . 'blank.gif', dirname(dirname(__FILE__)) . '/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path . 'thumbs' . '/', 0777, $redirectFile));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -22,12 +22,8 @@
$op = isset($_REQUEST['op']) ?$_REQUEST['op'] : "default";
-switch ($op)
-{
+switch ($op) {
case "save":
-
- global $xoopsDB;
-
$indexheading = $myts->addslashes($_POST['indexheading']);
$indexheader = $myts->addslashes($_POST['indexheader']);
$indexfooter = $myts->addslashes($_POST['indexfooter']);
@@ -47,12 +43,9 @@
break;
default:
-
include_once WFDOWNLOADS_ROOT_PATH . '/class/wfd_lists.php';
include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- global $xoopsModuleConfig, $xoopsDB;
-
$result = $xoopsDB->query("SELECT indeximage, indexheading, indexheader, indexfooter, nohtml, nosmiley, noxcodes, noimages, nobreak, indexheaderalign, indexfooteralign FROM " . $xoopsDB->prefix('wfdownloads_indexpage') . " ");
list($indeximage, $indexheading, $indexheader, $indexfooter, $nohtml, $nosmiley, $noxcodes, $noimages, $nobreak, $indexheaderalign, $indexfooteralign) = $xoopsDB->fetchrow($result);
@@ -66,14 +59,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 . "/" . $xoopsModuleConfig['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\", \"" . $xoopsModuleConfig['mainimagedir'] . "\", \"\", \"" . XOOPS_URL . "\")'");
+ $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 . "/".$xoopsModuleConfig['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' />"));
}
@@ -119,5 +112,4 @@
$sform->display();
break;
}
-//xoops_cp_footer();
include_once "admin_footer.php";
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -30,13 +30,13 @@
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation($currentFile);
-$download = $download_handler->get($lid);
+$download = $wfdownloads->getHandler('download')->get($lid);
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('lid', $lid));
$criteria->setSort('date');
$criteria->setOrder('DESC');
-$ip_logsObj = $ip_log_handler->getObjects($criteria);
+$ip_logsObj = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
unset($criteria);
$uidArray = array();
foreach($ip_logsObj as $ip_logObj) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -52,9 +52,9 @@
echo "</fieldset>\n";
if (isset($_REQUEST['mime_id'])) {
- $mimetype = $mime_handler->get($_REQUEST['mime_id']);
+ $mimetype = $wfdownloads->getHandler('mimetype')->get($_REQUEST['mime_id']);
} else {
- $mimetype = $mime_handler->create();
+ $mimetype = $wfdownloads->getHandler('mimetype')->create();
}
$form = $mimetype->getForm();
@@ -78,7 +78,7 @@
case 'mimetype.save':
$mime_id = wfdownloads_CleanVars($_POST, 'mime_id', 0, 'int');
- if (!$mimetype = $mime_handler->get($mime_id)) {
+ if (!$mimetype = $wfdownloads->getHandler('mimetype')->get($mime_id)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_MIMETYPENOTFOUND);
exit();
}
@@ -88,7 +88,7 @@
$mimetype->setVar('mime_types', $_POST['mime_type']);
$mimetype->setVar('mime_admin', (int)$_POST['mime_admin']);
$mimetype->setVar('mime_user', (int)$_POST['mime_user']);
- if (!$mime_handler->insert($mimetype)) {
+ if (!$wfdownloads->getHandler('mimetype')->insert($mimetype)) {
$error = "Could not update mimetype information";
trigger_error($error, E_USER_ERROR);
}
@@ -98,7 +98,7 @@
case 'mimetype.update';
$mime_id = wfdownloads_CleanVars($_REQUEST, 'mime_id', 0, 'int');
- if (!$mimetype = $mime_handler->get($mime_id)) {
+ if (!$mimetype = $wfdownloads->getHandler('mimetype')->get($mime_id)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_MIMETYPENOTFOUND);
exit();
}
@@ -117,7 +117,7 @@
$mimetype->setVar('mime_user', true);
}
}
- if (!$mime_handler->insert($mimetype, true)) {
+ if (!$wfdownloads->getHandler('mimetype')->insert($mimetype, true)) {
trigger_error($error, E_USER_ERROR);
}
redirect_header("{$currentFile}?start=" . intval($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
@@ -136,7 +136,7 @@
$criteria = new CriteriaCompo();
$criteria->setStart($start);
$criteria->setLimit(20);
- if (!$mime_handler->updateAll($field, $type_all, $criteria, true)) {
+ if (!$wfdownloads->getHandler('mimetype')->updateAll($field, $type_all, $criteria, true)) {
$error = "Could not update mimetype information";
trigger_error($error, E_USER_ERROR);
}
@@ -146,7 +146,7 @@
case "mimetype.delete":
$mime_id = wfdownloads_CleanVars($_REQUEST, 'mime_id', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
- if (!$mimetype = $mime_handler->get($mime_id)) {
+ if (!$mimetype = $wfdownloads->getHandler('mimetype')->get($mime_id)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_MIMETYPENOTFOUND);
exit();
}
@@ -154,7 +154,7 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- if ($mime_handler->delete($mimetype)) {
+ if ($wfdownloads->getHandler('mimetype')->delete($mimetype)) {
redirect_header($currentFile, 1, sprintf(_AM_WFD_MIME_MIMEDELETED, $mimetype->getVar('mime_name')));
exit();
} else {
@@ -176,8 +176,8 @@
$criteria->setSort("mime_name");
$criteria->setStart($start);
$criteria->setLimit(20);
- $mimetypes = $mime_handler->getObjects($criteria);
- $mime_num = $mime_handler->getCount();
+ $mimetypes = $wfdownloads->getHandler('mimetype')->getObjects($criteria);
+ $mime_num = $wfdownloads->getHandler('mimetype')->getCount();
wfdownloads_xoops_cp_header();
$indexAdmin = new ModuleAdmin();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -28,7 +28,7 @@
case "mirror.delete" :
$mirror_id = wfdownloads_CleanVars($_REQUEST, 'mirror_id', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
- if (!$mirror = $mirror_handler->get($mirror_id)) {
+ if (!$mirror = $wfdownloads->getHandler('mirror')->get($mirror_id)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_MIRRORNOTFOUND);
exit();
}
@@ -36,7 +36,7 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- if ($mirror_handler->delete($mirror)) {
+ if ($wfdownloads->getHandler('mirror')->delete($mirror)) {
redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $mirror->getVar('title')));
exit();
} else {
@@ -53,13 +53,13 @@
case "mirror.approve" :
$mirror_id = wfdownloads_CleanVars($_REQUEST, 'mirror_id', 0, 'int');
$ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
- if (!$mirror = $mirror_handler->get($mirror_id)) {
+ if (!$mirror = $wfdownloads->getHandler('mirror')->get($mirror_id)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_MIRRORNOTFOUND);
exit();
}
if ($ok == true) {
$mirror->setVar('submit', true);
- $mirror_handler->insert($mirror);
+ $wfdownloads->getHandler('mirror')->insert($mirror);
redirect_header($currentFile, 1, sprintf( _AM_WFD_MIRROR_MIRROR_UPDATED, $mirror->getVar('title')));
exit();
} else {
@@ -71,7 +71,7 @@
case "mirror.edit" :
$mirror_id = wfdownloads_CleanVars($_REQUEST, 'mirror_id', 0, 'int');
- if (!$mirror = $mirror_handler->get($mirror_id)) {
+ if (!$mirror = $wfdownloads->getHandler('mirror')->get($mirror_id)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_MIRRORNOTFOUND);
exit();
}
@@ -83,7 +83,7 @@
case "mirror.save" :
$mirror_id = wfdownloads_CleanVars($_REQUEST, 'mirror_id', 0, 'int');
- if (!$mirror = $mirror_handler->get($mirror_id)) {
+ if (!$mirror = $wfdownloads->getHandler('mirror')->get($mirror_id)) {
redirect_header($currentFile, 4, _AM_WFD_ERROR_MIRRORNOTFOUND);
exit();
}
@@ -93,7 +93,7 @@
$mirror->setVar('continent', trim($_POST['continent']));
$mirror->setVar('downurl', formatURL(trim($_POST['downurl'])));
$mirror->setVar('submit', (int)($_POST['approve']));
- $mirror_handler->insert($mirror);
+ $wfdownloads->getHandler('mirror')->insert($mirror);
redirect_header($currentFile, 1, _AM_WFD_MIRROR_MIRROR_UPDATED);
exit();
break;
@@ -108,20 +108,20 @@
$start_published = wfdownloads_CleanVars($_GET, 'start_published', 0, 'int');
$criteria_waiting = new Criteria("submit", 0); // false
- $waiting_count = $mirror_handler->getCount($criteria_waiting);
+ $waiting_count = $wfdownloads->getHandler('mirror')->getCount($criteria_waiting);
$criteria_waiting->setSort("date");
$criteria_waiting->setOrder("DESC");
- $criteria_waiting->setLimit($xoopsModuleConfig['admin_perpage']);
+ $criteria_waiting->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria_waiting->setStart($start_waiting);
- $mirrors_waiting = $mirror_handler->getObjects($criteria_waiting);
+ $mirrors_waiting = $wfdownloads->getHandler('mirror')->getObjects($criteria_waiting);
$criteria_published = new Criteria("submit", 1); // true
- $published_count = $mirror_handler->getCount($criteria_published);
+ $published_count = $wfdownloads->getHandler('mirror')->getCount($criteria_published);
$criteria_published->setSort("date");
$criteria_published->setOrder("DESC");
- $criteria_published->setLimit($xoopsModuleConfig['admin_perpage']);
+ $criteria_published->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria_published->setStart($start_published);
- $mirrors_published = $mirror_handler->getObjects($criteria_published);
+ $mirrors_published = $wfdownloads->getHandler('mirror')->getObjects($criteria_published);
$GLOBALS['xoopsTpl']->assign('mirrors_waiting_count', $waiting_count);
$GLOBALS['xoopsTpl']->assign('mirrors_published_count', $published_count);
@@ -131,7 +131,7 @@
$lids_waiting[] = $mirror_waiting->getVar('lid');
$uids_waiting[] = $mirror_waiting->getVar('uid');
}
- $downloads = $download_handler->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);
$users = $member_handler->getUserList(new Criteria("uid", "(" . implode(',', $uids_waiting) . ")"));
foreach ($mirrors_waiting as $mirror_waiting) {
$mirror_waiting_array = $mirror_waiting->toArray();
@@ -142,7 +142,7 @@
}
//Include page navigation
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav_waiting = new XoopsPageNav($waiting_count, $xoopsModuleConfig['admin_perpage'] , $start_waiting, 'start_waiting');
+ $pagenav_waiting = new XoopsPageNav($waiting_count, $wfdownloads->getConfig('admin_perpage') , $start_waiting, 'start_waiting');
$GLOBALS['xoopsTpl']->assign('mirrors_waiting_pagenav', $pagenav_waiting -> renderNav());
}
@@ -151,7 +151,7 @@
$lids_published[] = $mirror_published->getVar('lid');
$uids_published[] = $mirror_published->getVar('uid');
}
- $downloads = $download_handler->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);
$users = $member_handler->getUserList(new Criteria("uid", "(" . implode(',', $uids_published) . ")"));
foreach ($mirrors_published as $mirror_published) {
$mirror_published_array = $mirror_published->toArray();
@@ -162,7 +162,7 @@
}
//Include page navigation
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav_published = new XoopsPageNav($published_count, $xoopsModuleConfig['admin_perpage'] , $start_published, 'start_published');
+ $pagenav_published = new XoopsPageNav($published_count, $wfdownloads->getConfig('admin_perpage') , $start_published, 'start_published');
$GLOBALS['xoopsTpl']->assign('mirrors_published_pagenav', $pagenav_published -> renderNav());
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -21,11 +21,11 @@
$currentFile = basename(__FILE__);
include 'admin_header.php';
-if ($category_handler->getCount() == 0) {
+if ($wfdownloads->getHandler('category')->getCount() == 0) {
redirect_header('categories.php', 1, _AM_WFD_CCATEGORY_NOEXISTS);
exit();
}
-$categories = $category_handler->getObjects();
+$categories = $wfdownloads->getHandler('category')->getObjects();
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
$down_cat_form = new XoopsGroupPermForm(_AM_WFD_FCATEGORY_GROUPPROMPT, $xoopsModule->getVar('mid'), 'WFDownCatPerm', _AM_WFD_PERM_CSELECTPERMISSIONS, "admin/{$currentFile}", true);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -20,7 +20,6 @@
*/
$currentFile = basename(__FILE__);
include 'admin_header.php';
-$rating_handler = xoops_getmodulehandler('rating');
$op = wfdownloads_CleanVars($_REQUEST, 'op', 'votes.list', 'string');
@@ -28,7 +27,7 @@
case 'vote.delete' :
$rid = wfdownloads_CleanVars($_GET, 'rid', null, 'int');
$lid = wfdownloads_CleanVars($_GET, 'lid', null, 'int');
- $rating_handler->deleteAll(new Criteria("ratingid", $rid), true);
+ $wfdownloads->getHandler('rating')->deleteAll(new Criteria("ratingid", $rid), true);
wfd_updaterating($lid);
redirect_header($currentFile, 1, _AM_WFD_VOTEDELETED);
break;
@@ -40,15 +39,15 @@
$uservotes = '0';
$criteria = new CriteriaCompo();
- $votes = $rating_handler->getCount($criteria);
- $ratings_count = $rating_handler->getCount($criteria);
+ $votes = $wfdownloads->getHandler('rating')->getCount($criteria);
+ $ratings_count = $wfdownloads->getHandler('rating')->getCount($criteria);
$criteria->setSort('ratingtimestamp');
$criteria->setOrder("DESC");
$criteria->setStart($start);;
$criteria->setLimit(20);
- $ratings = $rating_handler->getObjects($criteria);
+ $ratings = $wfdownloads->getHandler('rating')->getObjects($criteria);
- $useravgrating = $rating_handler->getUserAverage();
+ $useravgrating = $wfdownloads->getHandler('rating')->getUserAverage();
$useravgrating = number_format($useravgrating["avg"], 2);
wfdownloads_xoops_cp_header();
@@ -62,8 +61,7 @@
foreach ($ratings as $rating) {
$lids[] = $rating->getVar('lid');
}
- $download_handler = xoops_getmodulehandler('download');
- $downloads = $download_handler->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids)) . ")", "IN"), true);
+ $downloads = $wfdownloads->getHandler('download')->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids)) . ")", "IN"), true);
foreach ($ratings as $rating) {
$rating_array = $rating->toArray();
$rating_array['formatted_date'] = formatTimestamp($rating->getVar('ratingtimestamp'), _DATESTRING);
@@ -74,7 +72,7 @@
}
//Include page navigation
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $ratings_pagenav = new XoopsPageNav($ratings_count, $xoopsModuleConfig['admin_perpage'], $start, 'start');
+ $ratings_pagenav = new XoopsPageNav($ratings_count, $wfdownloads->getConfig('admin_perpage'), $start, 'start');
$GLOBALS['xoopsTpl']->assign('ratings_pagenav', $ratings_pagenav->renderNav());
$GLOBALS['xoopsTpl']->display("db:" . $xoopsModule->dirname() . "_admin_ratingslist.html");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-08-09 20:19:06 UTC (rev 11893)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-08-10 14:28:46 UTC (rev 11894)
@@ -29,12 +29,12 @@
$criteria = new Criteria('lid', $lid);
if (isset($_GET['ack'])) {
$acknowledged = (isset($_GET['ack']) && $_GET['ack'] ...
[truncated message content] |
8 messages has been excluded from this view by a project administrator.
