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...> - 2014-04-23 22:44:20
|
Revision: 12467
http://sourceforge.net/p/xoops/svn/12467
Author: beckmi
Date: 2014-04-23 22:44:13 +0000 (Wed, 23 Apr 2014)
Log Message:
-----------
- moved all images, CSS, and JS files to /assets, renamed .html Smarty templates to .tpl (mamba)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/pmlite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/readpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/visibility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/changemail.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/changepass.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/edituser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/register.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/search.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/css/
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/css/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_notread.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_read.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/left_both.gif
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/logo.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/modadminbg.gif
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/pm.gif
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/read.gif
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/right_both.gif
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/js/
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/js/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_pmlite.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_readpmsg.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_viewpmsg.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/0.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/1.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/left_both.gif
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/logo.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/modadminbg.gif
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/no.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/right_both.gif
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/yes.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/js/
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/js/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_admin_categorylist.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_admin_fieldlist.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_admin_steplist.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_admin_visibility.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_avatar.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_breadcrumbs.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_changepass.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_editprofile.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_email.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_form.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_register.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_search.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userform.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl
Removed Paths:
-------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/images/
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_pmlite.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_readpmsg.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_viewpmsg.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/images/
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_admin_categorylist.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_admin_fieldlist.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_admin_steplist.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_admin_visibility.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_avatar.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_breadcrumbs.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_changepass.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_editprofile.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_email.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_form.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_register.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_search.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userform.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.html
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/css/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/css/index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/css/index.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_notread.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_notread.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_notread.png 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_notread.png 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_notread.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_read.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_read.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_read.png 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_read.png 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/email_read.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/index.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/left_both.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/left_both.gif
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/left_both.gif 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/left_both.gif 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/left_both.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/logo.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/logo.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/logo.png 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/logo.png 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/modadminbg.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/modadminbg.gif
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/modadminbg.gif 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/modadminbg.gif 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/modadminbg.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/pm.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/pm.gif
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/pm.gif 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/pm.gif 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/pm.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/read.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/read.gif
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/read.gif 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/read.gif 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/read.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/right_both.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/right_both.gif
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/right_both.gif 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/right_both.gif 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/images/right_both.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/index.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/js/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/js/index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/assets/js/index.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt 2014-04-23 22:44:13 UTC (rev 12467)
@@ -1,3 +1,8 @@
+Version 1.10
+-------------------
+- moved all images, CSS, and JS files to /assets (mamba)
+- renamed .html Smarty templates to .tpl (mamba)
+
Version 1.09
-------------------
- solved bug into readpmsg.php (escrime-info/slider84)
@@ -28,4 +33,4 @@
-------------------
- Improved preloads for reducing queries
- Security fix: In the readpmsg.php file the op parameter is not sanitized before
-output (thanks to secunia.com)
\ No newline at end of file
+output (thanks to secunia.com)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/pmlite.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/pmlite.php 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/pmlite.php 2014-04-23 22:44:13 UTC (rev 12467)
@@ -160,6 +160,6 @@
$cancel_send->setExtra("onclick='javascript:window.close();'");
$pmform->addElement($cancel_send);
$pmform->assign($GLOBALS['xoopsTpl']);
- $GLOBALS['xoopsTpl']->display("db:pm_pmlite.html");
+ $GLOBALS['xoopsTpl']->display("db:pm_pmlite.tpl");
}
xoops_footer();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/readpmsg.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/readpmsg.php 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/readpmsg.php 2014-04-23 22:44:13 UTC (rev 12467)
@@ -103,7 +103,7 @@
}
$start = !empty($_GET['start']) ? intval($_GET['start']) : 0;
$total_messages = !empty($_GET['total_messages']) ? intval($_GET['total_messages']) : 0;
-$xoopsOption['template_main'] = "pm_readpmsg.html";
+$xoopsOption['template_main'] = "pm_readpmsg.tpl";
include $GLOBALS['xoops']->path('header.php');
if (!is_object($pm)) {
Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_pmlite.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_pmlite.html 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_pmlite.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -1,42 +0,0 @@
-<{$pmform.javascript}>
-<form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}> >
- <table class='outer txtcenter width100'>
- <tr>
- <td class='head width30 txtright'><{$smarty.const._PM_TO}></td>
- <td class='even txtleft'><{if $pmform.elements.to_userid.hidden != 1}><{$pmform.elements.to_userid.body}><{/if}><{$to_username}></td>
- </tr>
- <tr>
- <td class='head width30 txtright'><{$smarty.const._PM_SUBJECTC}></td>
- <td class='even txtleft'><{$pmform.elements.subject.body}></td>
- </tr>
- <tr>
- <td class='head width30 txtright'><{$smarty.const._PM_SUBJECT_ICONS}></td>
- <td class='even txtleft'>
-
- <{foreachq item=icon from=$radio_icons}>
- <input type='radio' name='icon' id='<{$icon}>' value='<{$icon}>' /><label name='xolb_icon' for='<{$icon}>'><img src='<{xoAppUrl}>images/subject/<{$icon}>' alt="" /></label>
- <{/foreach}> </td>
- </tr>
- <tr class='aligntop'>
- <td class='head width30 txtright'><{$smarty.const._PM_MESSAGEC}></td>
- <td class='even txtleft'><{$pmform.elements.message.body}></td>
- </tr>
- <tr class='aligntop'>
- <td class='head width30'><{$smarty.const._PM_SAVEINOUTBOX}></td>
- <td class='even'><{$pmform.elements.savecopy.body}></td>
- </tr>
- <tr>
- <td class='head'> </td>
- <td class='even'>
- <{foreach item=element from=$pmform.elements}>
- <{if $element.hidden == 1}>
- <{$element.body}>
- <{/if}>
- <{/foreach}>
- <{$pmform.elements.submit.body}>
- <{$pmform.elements.reset.body}>
- <{$pmform.elements.cancel.body}>
- </td>
- </tr>
- </table>
-</form>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_pmlite.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_pmlite.tpl (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_pmlite.tpl 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1,42 @@
+<{$pmform.javascript}>
+<form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}> >
+ <table class='outer txtcenter width100'>
+ <tr>
+ <td class='head width30 txtright'><{$smarty.const._PM_TO}></td>
+ <td class='even txtleft'><{if $pmform.elements.to_userid.hidden != 1}><{$pmform.elements.to_userid.body}><{/if}><{$to_username}></td>
+ </tr>
+ <tr>
+ <td class='head width30 txtright'><{$smarty.const._PM_SUBJECTC}></td>
+ <td class='even txtleft'><{$pmform.elements.subject.body}></td>
+ </tr>
+ <tr>
+ <td class='head width30 txtright'><{$smarty.const._PM_SUBJECT_ICONS}></td>
+ <td class='even txtleft'>
+
+ <{foreachq item=icon from=$radio_icons}>
+ <input type='radio' name='icon' id='<{$icon}>' value='<{$icon}>' /><label name='xolb_icon' for='<{$icon}>'><img src='<{xoAppUrl}>images/subject/<{$icon}>' alt="" /></label>
+ <{/foreach}> </td>
+ </tr>
+ <tr class='aligntop'>
+ <td class='head width30 txtright'><{$smarty.const._PM_MESSAGEC}></td>
+ <td class='even txtleft'><{$pmform.elements.message.body}></td>
+ </tr>
+ <tr class='aligntop'>
+ <td class='head width30'><{$smarty.const._PM_SAVEINOUTBOX}></td>
+ <td class='even'><{$pmform.elements.savecopy.body}></td>
+ </tr>
+ <tr>
+ <td class='head'> </td>
+ <td class='even'>
+ <{foreach item=element from=$pmform.elements}>
+ <{if $element.hidden == 1}>
+ <{$element.body}>
+ <{/if}>
+ <{/foreach}>
+ <{$pmform.elements.submit.body}>
+ <{$pmform.elements.reset.body}>
+ <{$pmform.elements.cancel.body}>
+ </td>
+ </tr>
+ </table>
+</form>
\ No newline at end of file
Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_readpmsg.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_readpmsg.html 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_readpmsg.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -1,77 +0,0 @@
-<div>
- <h4><{$smarty.const._PM_PRIVATEMESSAGE}></h4>
-</div><br />
-<{if $op==out}>
- <a href='viewpmsg.php?op=out' title='<{$smarty.const._PM_OUTBOX}>'><{$smarty.const._PM_OUTBOX}></a>
-<{elseif $op == "save"}>
- <a href='viewpmsg.php?op=save' title='<{$smarty.const._PM_SAVEBOX}>'><{$smarty.const._PM_SAVEBOX}></a>
-<{else}>
- <a href='viewpmsg.php?op=in' title='<{$smarty.const._PM_INBOX}>'><{$smarty.const._PM_INBOX}></a>
-<{/if}>
-
-<{if $message}>
- <span class='bold'>»»</span> <{$message.subject}><br />
- <form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}> >
- <table cellpadding='4' cellspacing='1' class='outer bnone width100'>
- <tr>
- <th colspan='2'><{if $op==out}><{$smarty.const._PM_TO}><{else}><{$smarty.const._PM_FROM}><{/if}></th>
- </tr>
- <tr class='even'>
- <td class='aligntop'>
- <{if ( $poster != false ) }>
- <a href='<{$xoops_url}>/userinfo.php?uid=<{$poster->getVar("uid")}>'><{$poster->getVar("uname")}></a><br />
- <{if ( $poster->getVar("user_avatar") != "" ) }>
- <img src='<{$xoops_url}>/uploads/<{$poster->getVar("user_avatar")}>' alt='' /><br />
- <{/if}>
- <{if ( $poster->getVar("user_from") != "" ) }>
- <{$smarty.const._PM_FROMC}><{$poster->getVar("user_from")}><br /><br />
- <{/if}>
- <{if ( $poster->isOnline() ) }>
- <span class='bold red'><{$smarty.const._PM_ONLINE}></span><br /><br />
- <{/if}>
- <{else}>
- <{$anonymous}>
- <{/if}>
- </td>
- <td>
- <{if $message.msg_image != ""}>
- <img src='<{$xoops_url}>/images/subject/<{$message.msg_image}>' alt='' />
- <{/if}>
- <{$smarty.const._PM_SENTC}><{$message.msg_time}><br />
- <hr />
- <strong><{$message.subject}></strong><br />
- <br />
- <{$message.msg_text}><br />
- <br />
- </td>
- </tr>
- <tr class='foot'>
- <td class='width20 txtleft' colspan='2'>
- <{foreach item=element from=$pmform.elements}>
- <{$element.body}>
- <{/foreach}>
- </td>
- </tr>
- <tr>
- <td class='txtright' colspan='2'>
- <{if ( $previous >= 0 ) }>
- <a href='readpmsg.php?start=<{$previous}>&total_messages=<{$total_messages}>&op=<{$op}>' title='<{$smarty.const._PM_PREVIOUS}>'>
- <{$smarty.const._PM_PREVIOUS}>
- </a> |
- <{else}>
- <{$smarty.const._PM_PREVIOUS}> |
- <{/if}>
- <{if ( $next < $total_messages ) }>
- <a href='readpmsg.php?start=<{$next}>&total_messages=<{$total_messages}>&op=<{$op}>' title='<{$smarty.const._PM_NEXT}>'>
- <{$smarty.const._PM_NEXT}>
- </a>
- <{else}>
- <{$smarty.const._PM_NEXT}>
- <{/if}>
- </td>
- </tr>
- </table>
- </form>
-<{else}>
- <br /><br /><{$smarty.const._PM_YOUDONTHAVE}>
-<{/if}>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_readpmsg.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_readpmsg.tpl (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_readpmsg.tpl 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1,77 @@
+<div>
+ <h4><{$smarty.const._PM_PRIVATEMESSAGE}></h4>
+</div><br />
+<{if $op==out}>
+ <a href='viewpmsg.php?op=out' title='<{$smarty.const._PM_OUTBOX}>'><{$smarty.const._PM_OUTBOX}></a>
+<{elseif $op == "save"}>
+ <a href='viewpmsg.php?op=save' title='<{$smarty.const._PM_SAVEBOX}>'><{$smarty.const._PM_SAVEBOX}></a>
+<{else}>
+ <a href='viewpmsg.php?op=in' title='<{$smarty.const._PM_INBOX}>'><{$smarty.const._PM_INBOX}></a>
+<{/if}>
+
+<{if $message}>
+ <span class='bold'>»»</span> <{$message.subject}><br />
+ <form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}> >
+ <table cellpadding='4' cellspacing='1' class='outer bnone width100'>
+ <tr>
+ <th colspan='2'><{if $op==out}><{$smarty.const._PM_TO}><{else}><{$smarty.const._PM_FROM}><{/if}></th>
+ </tr>
+ <tr class='even'>
+ <td class='aligntop'>
+ <{if ( $poster != false ) }>
+ <a href='<{$xoops_url}>/userinfo.php?uid=<{$poster->getVar("uid")}>'><{$poster->getVar("uname")}></a><br />
+ <{if ( $poster->getVar("user_avatar") != "" ) }>
+ <img src='<{$xoops_url}>/uploads/<{$poster->getVar("user_avatar")}>' alt='' /><br />
+ <{/if}>
+ <{if ( $poster->getVar("user_from") != "" ) }>
+ <{$smarty.const._PM_FROMC}><{$poster->getVar("user_from")}><br /><br />
+ <{/if}>
+ <{if ( $poster->isOnline() ) }>
+ <span class='bold red'><{$smarty.const._PM_ONLINE}></span><br /><br />
+ <{/if}>
+ <{else}>
+ <{$anonymous}>
+ <{/if}>
+ </td>
+ <td>
+ <{if $message.msg_image != ""}>
+ <img src='<{$xoops_url}>/images/subject/<{$message.msg_image}>' alt='' />
+ <{/if}>
+ <{$smarty.const._PM_SENTC}><{$message.msg_time}><br />
+ <hr />
+ <strong><{$message.subject}></strong><br />
+ <br />
+ <{$message.msg_text}><br />
+ <br />
+ </td>
+ </tr>
+ <tr class='foot'>
+ <td class='width20 txtleft' colspan='2'>
+ <{foreach item=element from=$pmform.elements}>
+ <{$element.body}>
+ <{/foreach}>
+ </td>
+ </tr>
+ <tr>
+ <td class='txtright' colspan='2'>
+ <{if ( $previous >= 0 ) }>
+ <a href='readpmsg.php?start=<{$previous}>&total_messages=<{$total_messages}>&op=<{$op}>' title='<{$smarty.const._PM_PREVIOUS}>'>
+ <{$smarty.const._PM_PREVIOUS}>
+ </a> |
+ <{else}>
+ <{$smarty.const._PM_PREVIOUS}> |
+ <{/if}>
+ <{if ( $next < $total_messages ) }>
+ <a href='readpmsg.php?start=<{$next}>&total_messages=<{$total_messages}>&op=<{$op}>' title='<{$smarty.const._PM_NEXT}>'>
+ <{$smarty.const._PM_NEXT}>
+ </a>
+ <{else}>
+ <{$smarty.const._PM_NEXT}>
+ <{/if}>
+ </td>
+ </tr>
+ </table>
+ </form>
+<{else}>
+ <br /><br /><{$smarty.const._PM_YOUDONTHAVE}>
+<{/if}>
\ No newline at end of file
Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_viewpmsg.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_viewpmsg.html 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_viewpmsg.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -1,109 +0,0 @@
-<h4 class="txtcenter"><{$smarty.const._PM_PRIVATEMESSAGE}></h4>
-<{if $op}>
-<br />
-<div class="floatright txtright" style="width: 18%;">
- <{if $op == "out"}>
- <a href='viewpmsg.php?op=in' title='<{$smarty.const._PM_INBOX}>'><{$smarty.const._PM_INBOX}></a> | <a href='viewpmsg.php?op=save' title='<{$smarty.const._PM_SAVEBOX}>'><{$smarty.const._PM_SAVEBOX}></a>
- <{elseif $op == "save"}>
- <a href='viewpmsg.php?op=in' title='<{$smarty.const._PM_INBOX}>'><{$smarty.const._PM_INBOX}></a> | <a href='viewpmsg.php?op=out' title='<{$smarty.const._PM_OUTBOX}>'><{$smarty.const._PM_OUTBOX}></a>
- <{elseif $op == "in"}>
- <a href='viewpmsg.php?op=out' title='<{$smarty.const._PM_OUTBOX}>'><{$smarty.const._PM_OUTBOX}></a> | <a href='viewpmsg.php?op=save' title='<{$smarty.const._PM_SAVEBOX}>'><{$smarty.const._PM_SAVEBOX}></a>
- <{/if}>
-</div>
-<div class="floatleft width80">
- <{if $op == "out"}><{$smarty.const._PM_OUTBOX}>
- <{elseif $op == "save"}><{$smarty.const._PM_SAVEBOX}>
- <{else}><{$smarty.const._PM_INBOX}><{/if}>
-</div>
-<br />
-<br />
-<{if $msg}>
- <div class="confirmMsg"><{$msg}></div>
-<{/if}>
-<{if $errormsg}>
- <div class="errorMsg"><{$errormsg}></div>
-<{/if}>
-
-<{if $pagenav}>
- <div class="floatright txtright pad5">
- <{$pagenav}>
- </div>
- <br class="clear" />
-<{/if}>
-
-<form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}> >
- <table cellspacing='1' cellpadding='4' class='outer bnone width100'>
-
- <tr class='txtcenter alignmiddle'>
- <th><input name='allbox' id='allbox' onclick='xoopsCheckAll("<{$pmform.name}>", "allbox");' type='checkbox' value='Check All' /></th>
- <th><img class='bnone' src='<{xoAppUrl images/download.gif}>' alt=''/></th>
- <th> </th>
- <{if $op == "out"}>
- <th><{$smarty.const._PM_TO}></th>
- <{else}>
- <th><{$smarty.const._PM_FROM}></th>
- <{/if}>
- <th><{$smarty.const._PM_SUBJECT}></th>
- <th class='txtcenter'><{$smarty.const._PM_DATE}></th>
- </tr>
-
- <{if $total_messages == 0}>
- <tr>
- <td class='even txtcenter' colspan='6'><{$smarty.const._PM_YOUDONTHAVE}></td>
- </tr>
- <{/if}>
- <{foreach item=message from=$messages}>
- <tr class='<{cycle values="odd, even"}> txtleft'>
- <td class='aligntop txtcenter width2'>
- <input type='checkbox' id='msg_id_<{$message.msg_id}>' name='msg_id[]' value='<{$message.msg_id}>' />
- </td>
- <{if $message.read_msg == 1}>
- <td class='aligntop width5 txtcenter'><img src='<{xoModuleIcons16 mail_read.png}>' alt='<{$smarty.const._PM_READ}>' title='<{$smarty.const._PM_READ}>'/></td>
- <{else}>
- <td class='aligntop width5 txtcenter'><img src='<{xoModuleIcons16 mail_notread.png}>' alt='<{$smarty.const._PM_NOTREAD}>' title='<{$smarty.const._PM_NOTREAD}>'/></td>
- <{/if}>
- <td class='aligntop width5 txtcenter'>
- <{if $message.msg_image != ""}>
- <img src='<{$xoops_url}>/images/subject/<{$message.msg_image}>' alt='' />
- <{/if}>
- </td>
- <td class='alignmiddle width10'>
- <{if $message.postername != ""}>
- <a href='<{$xoops_url}>/userinfo.php?uid=<{$message.posteruid}>' title=''><{$message.postername}></a>
- <{else}>
- <{$anonymous}>
- <{/if}>
- </td>
- <td class='alignmiddle'>
- <a href='readpmsg.php?msg_id=<{$message.msg_id}>&start=<{$message.msg_no}>&total_messages=<{$total_messages}>&op=<{$op}>' title=''>
- <{$message.subject}>
- </a>
- </td>
- <td class='alignmiddle txtcenter width20'>
- <{$message.msg_time}>
- </td>
- </tr>
- <{/foreach}>
- <tr class='bg2 txtleft'>
- <td class='txtleft' colspan='6'>
- <{$pmform.elements.send.body}>
- <{if $display}>
- <{$pmform.elements.move_messages.body}>
- <{$pmform.elements.delete_messages.body}>
- <{$pmform.elements.empty_messages.body}>
- <{/if}>
- <{foreach item=element from=$pmform.elements}>
- <{if $element.hidden == 1}>
- <{$element.body}>
- <{/if}>
- <{/foreach}>
- </td>
- </tr>
- </table>
-</form>
-<{if $pagenav}>
-<div class="floatright txtright pad5">
-<{$pagenav}>
-</div>
-<{/if}>
-<{/if}>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_viewpmsg.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_viewpmsg.tpl (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/templates/pm_viewpmsg.tpl 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1,109 @@
+<h4 class="txtcenter"><{$smarty.const._PM_PRIVATEMESSAGE}></h4>
+<{if $op}>
+<br />
+<div class="floatright txtright" style="width: 18%;">
+ <{if $op == "out"}>
+ <a href='viewpmsg.php?op=in' title='<{$smarty.const._PM_INBOX}>'><{$smarty.const._PM_INBOX}></a> | <a href='viewpmsg.php?op=save' title='<{$smarty.const._PM_SAVEBOX}>'><{$smarty.const._PM_SAVEBOX}></a>
+ <{elseif $op == "save"}>
+ <a href='viewpmsg.php?op=in' title='<{$smarty.const._PM_INBOX}>'><{$smarty.const._PM_INBOX}></a> | <a href='viewpmsg.php?op=out' title='<{$smarty.const._PM_OUTBOX}>'><{$smarty.const._PM_OUTBOX}></a>
+ <{elseif $op == "in"}>
+ <a href='viewpmsg.php?op=out' title='<{$smarty.const._PM_OUTBOX}>'><{$smarty.const._PM_OUTBOX}></a> | <a href='viewpmsg.php?op=save' title='<{$smarty.const._PM_SAVEBOX}>'><{$smarty.const._PM_SAVEBOX}></a>
+ <{/if}>
+</div>
+<div class="floatleft width80">
+ <{if $op == "out"}><{$smarty.const._PM_OUTBOX}>
+ <{elseif $op == "save"}><{$smarty.const._PM_SAVEBOX}>
+ <{else}><{$smarty.const._PM_INBOX}><{/if}>
+</div>
+<br />
+<br />
+<{if $msg}>
+ <div class="confirmMsg"><{$msg}></div>
+<{/if}>
+<{if $errormsg}>
+ <div class="errorMsg"><{$errormsg}></div>
+<{/if}>
+
+<{if $pagenav}>
+ <div class="floatright txtright pad5">
+ <{$pagenav}>
+ </div>
+ <br class="clear" />
+<{/if}>
+
+<form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}> >
+ <table cellspacing='1' cellpadding='4' class='outer bnone width100'>
+
+ <tr class='txtcenter alignmiddle'>
+ <th><input name='allbox' id='allbox' onclick='xoopsCheckAll("<{$pmform.name}>", "allbox");' type='checkbox' value='Check All' /></th>
+ <th><img class='bnone' src='<{xoAppUrl images/download.gif}>' alt=''/></th>
+ <th> </th>
+ <{if $op == "out"}>
+ <th><{$smarty.const._PM_TO}></th>
+ <{else}>
+ <th><{$smarty.const._PM_FROM}></th>
+ <{/if}>
+ <th><{$smarty.const._PM_SUBJECT}></th>
+ <th class='txtcenter'><{$smarty.const._PM_DATE}></th>
+ </tr>
+
+ <{if $total_messages == 0}>
+ <tr>
+ <td class='even txtcenter' colspan='6'><{$smarty.const._PM_YOUDONTHAVE}></td>
+ </tr>
+ <{/if}>
+ <{foreach item=message from=$messages}>
+ <tr class='<{cycle values="odd, even"}> txtleft'>
+ <td class='aligntop txtcenter width2'>
+ <input type='checkbox' id='msg_id_<{$message.msg_id}>' name='msg_id[]' value='<{$message.msg_id}>' />
+ </td>
+ <{if $message.read_msg == 1}>
+ <td class='aligntop width5 txtcenter'><img src='<{xoModuleIcons16 mail_read.png}>' alt='<{$smarty.const._PM_READ}>' title='<{$smarty.const._PM_READ}>'/></td>
+ <{else}>
+ <td class='aligntop width5 txtcenter'><img src='<{xoModuleIcons16 mail_notread.png}>' alt='<{$smarty.const._PM_NOTREAD}>' title='<{$smarty.const._PM_NOTREAD}>'/></td>
+ <{/if}>
+ <td class='aligntop width5 txtcenter'>
+ <{if $message.msg_image != ""}>
+ <img src='<{$xoops_url}>/images/subject/<{$message.msg_image}>' alt='' />
+ <{/if}>
+ </td>
+ <td class='alignmiddle width10'>
+ <{if $message.postername != ""}>
+ <a href='<{$xoops_url}>/userinfo.php?uid=<{$message.posteruid}>' title=''><{$message.postername}></a>
+ <{else}>
+ <{$anonymous}>
+ <{/if}>
+ </td>
+ <td class='alignmiddle'>
+ <a href='readpmsg.php?msg_id=<{$message.msg_id}>&start=<{$message.msg_no}>&total_messages=<{$total_messages}>&op=<{$op}>' title=''>
+ <{$message.subject}>
+ </a>
+ </td>
+ <td class='alignmiddle txtcenter width20'>
+ <{$message.msg_time}>
+ </td>
+ </tr>
+ <{/foreach}>
+ <tr class='bg2 txtleft'>
+ <td class='txtleft' colspan='6'>
+ <{$pmform.elements.send.body}>
+ <{if $display}>
+ <{$pmform.elements.move_messages.body}>
+ <{$pmform.elements.delete_messages.body}>
+ <{$pmform.elements.empty_messages.body}>
+ <{/if}>
+ <{foreach item=element from=$pmform.elements}>
+ <{if $element.hidden == 1}>
+ <{$element.body}>
+ <{/if}>
+ <{/foreach}>
+ </td>
+ </tr>
+ </table>
+</form>
+<{if $pagenav}>
+<div class="floatright txtright pad5">
+<{$pagenav}>
+</div>
+<{/if}>
+<{/if}>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php 2014-04-23 22:44:13 UTC (rev 12467)
@@ -25,7 +25,7 @@
exit();
}
$xoopsConfig['module_cache'] = 0; //disable caching since the URL will be the same, but content different from one user to another
-$xoopsOption['template_main'] = "pm_viewpmsg.html";
+$xoopsOption['template_main'] = "pm_viewpmsg.tpl";
include $GLOBALS['xoops']->path('header.php');
$valid_op_requests = array('out', 'save', 'in');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php 2014-04-23 22:44:13 UTC (rev 12467)
@@ -24,26 +24,26 @@
*
*/
-$modversion = array();
-$modversion['name'] = _PM_MI_NAME;
-$modversion['version'] = 1.10;
-$modversion['description'] = _PM_MI_DESC;
-$modversion['author'] = "Jan Pedersen, Taiwen Jiang";
-$modversion['credits'] = "The XOOPS Project, Wanikoo";
-$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU GPL 2.0 or later';
-$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-$modversion['image'] = "images/logo.png";
-$modversion['dirname'] = "pm";
+$modversion = array();
+$modversion['name'] = _PM_MI_NAME;
+$modversion['version'] = 1.10;
+$modversion['description'] = _PM_MI_DESC;
+$modversion['author'] = "Jan Pedersen, Taiwen Jiang";
+$modversion['credits'] = "The XOOPS Project, Wanikoo";
+$modversion['help'] = 'page=help';
+$modversion['license'] = 'GNU GPL 2.0 or later';
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+$modversion['image'] = "assets/images/logo.png";
+$modversion['dirname'] = "pm";
$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2014/02/05';
+$modversion["module_status"] = "RC 2";
+$modversion['release_date'] = '2014/04/23';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC 2";
$modversion['min_php'] = '5.3.7';
$modversion['min_xoops'] = "2.5.7";
$modversion['min_admin'] = '1.1';
@@ -57,9 +57,9 @@
$modversion['system_menu'] = 1;
// Admin things
-$modversion['hasAdmin'] = 1;
+$modversion['hasAdmin'] = 1;
$modversion['adminindex'] = "admin/admin.php";
-$modversion['adminmenu'] = "admin/menu.php";
+$modversion['adminmenu'] = "admin/menu.php";
// Mysql file
//$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
@@ -69,51 +69,55 @@
// Scripts to run upon installation or update
$modversion['onInstall'] = "include/install.php";
-$modversion['onUpdate'] = "include/update.php";
+$modversion['onUpdate'] = "include/update.php";
// Templates
-$modversion['templates'] = array();
-$modversion['templates'][1]['file'] = 'pm_pmlite.html';
+$modversion['templates'] = array();
+$modversion['templates'][1]['file'] = 'pm_pmlite.tpl';
$modversion['templates'][1]['description'] = '';
-$modversion['templates'][2]['file'] = 'pm_readpmsg.html';
+$modversion['templates'][2]['file'] = 'pm_readpmsg.tpl';
$modversion['templates'][2]['description'] = '';
-$modversion['templates'][3]['file'] = 'pm_viewpmsg.html';
+$modversion['templates'][3]['file'] = 'pm_viewpmsg.tpl';
$modversion['templates'][3]['description'] = '';
-//$modversion['templates'][4]['file'] = 'pm_lookup.html';
+//$modversion['templates'][4]['file'] = 'pm_lookup.tpl';
//$modversion['templates'][4]['description'] = '';
// Menu
$modversion['hasMain'] = 1;
-$modversion['config'] = array();
-$modversion['config'][]=array(
- 'name' => 'perpage',
- 'title' => '_PM_MI_PERPAGE',
+$modversion['config'] = array();
+$modversion['config'][] = array(
+ 'name' => 'perpage',
+ 'title' => '_PM_MI_PERPAGE',
'description' => '_PM_MI_PERPAGE_DESC',
- 'formtype' => 'textbox',
- 'valuetype' => 'int',
- 'default' => 20);
+ 'formtype' => 'textbox',
+ 'valuetype' => 'int',
+ 'default' => 20
+);
-$modversion['config'][]=array(
- 'name' => 'max_save',
- 'title' => '_PM_MI_MAXSAVE',
+$modversion['config'][] = array(
+ 'name' => 'max_save',
+ 'title' => '_PM_MI_MAXSAVE',
'description' => '_PM_MI_MAXSAVE_DESC',
- 'formtype' => 'textbox',
- 'valuetype' => 'int',
- 'default' => 10);
+ 'formtype' => 'textbox',
+ 'valuetype' => 'int',
+ 'default' => 10
+);
-$modversion['config'][]=array(
- 'name' => 'prunesubject',
- 'title' => '_PM_MI_PRUNESUBJECT',
+$modversion['config'][] = array(
+ 'name' => 'prunesubject',
+ 'title' => '_PM_MI_PRUNESUBJECT',
'description' => '_PM_MI_PRUNESUBJECT_DESC',
- 'formtype' => 'textbox',
- 'valuetype' => 'text',
- 'default' => _PM_MI_PRUNESUBJECTDEFAULT);
+ 'formtype' => 'textbox',
+ 'valuetype' => 'text',
+ 'default' => _PM_MI_PRUNESUBJECTDEFAULT
+);
-$modversion['config'][]=array(
- 'name' => 'prunemessage',
- 'title' => '_PM_MI_PRUNEMESSAGE',
+$modversion['config'][] = array(
+ 'name' => 'prunemessage',
+ 'title' => '_PM_MI_PRUNEMESSAGE',
'description' => '_PM_MI_PRUNEMESSAGE_DESC',
- 'formtype' => 'textarea',
- 'valuetype' => 'text',
- 'default' => _PM_MI_PRUNEMESSAGEDEFAULT);
+ 'formtype' => 'textarea',
+ 'valuetype' => 'text',
+ 'default' => _PM_MI_PRUNEMESSAGEDEFAULT
+);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/category.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/category.php 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/category.php 2014-04-23 22:44:13 UTC (rev 12467)
@@ -47,7 +47,7 @@
$criteria->setSort('cat_weight');
$criteria->setOrder('ASC');
$GLOBALS['xoopsTpl']->assign('categories', $handler->getObjects($criteria, true, false) );
- $template_main = "profile_admin_categorylist.html";
+ $template_main = "profile_admin_categorylist.tpl";
break;
case "new":
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php 2014-04-23 22:44:13 UTC (rev 12467)
@@ -96,7 +96,7 @@
ksort($categories);
$GLOBALS['xoopsTpl']->assign('fieldcategories', $categories);
$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
- $template_main = "profile_admin_fieldlist.html";
+ $template_main = "profile_admin_fieldlist.tpl";
break;
case "new":
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php 2014-04-23 22:44:13 UTC (rev 12467)
@@ -31,7 +31,7 @@
switch ($op) {
case "list":
$GLOBALS['xoopsTpl']->assign('steps', $handler->getObjects(null, true, false) );
- $template_main = "profile_admin_steplist.html";
+ $template_main = "profile_admin_steplist.tpl";
break;
case "new":
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/visibility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/visibility.php 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/visibility.php 2014-04-23 22:44:13 UTC (rev 12467)
@@ -94,7 +94,7 @@
$add_form->addElement(new XoopsFormButton('', 'submit', _ADD, 'submit') );
$add_form->assign($GLOBALS['xoopsTpl']);
-$GLOBALS['xoopsTpl']->display("db:profile_admin_visibility.html");
+$GLOBALS['xoopsTpl']->display("db:profile_admin_visibility.tpl");
include 'admin_footer.php';
//xoops_cp_footer();
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/index.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/0.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/0.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/0.png 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/0.png 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/0.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/1.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/1.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/1.png 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/1.png 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/1.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/actions/index.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/index.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/left_both.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/left_both.gif
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/left_both.gif 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/left_both.gif 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/left_both.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/logo.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/logo.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/logo.png 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/logo.png 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/modadminbg.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/modadminbg.gif
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/modadminbg.gif 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/modadminbg.gif 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/modadminbg.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/no.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/no.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/no.png 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/no.png 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/no.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/right_both.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/right_both.gif
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/right_both.gif 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/right_both.gif 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/right_both.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/yes.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/yes.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/yes.png 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/yes.png 2014-04-23 22:44:13 UTC (rev 12467)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/images/yes.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/index.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/js/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/js/index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/js/index.html 2014-04-23 22:44:13 UTC (rev 12467)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/changemail.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/changemail.php 2014-04-23 04:58:51 UTC (rev 12466)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/changemail.php 2014-04-23 22:44:13 UTC (rev 12467)
@@ -26,7 +26,7 @@
redirect_header(XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule'...
[truncated message content] |
|
From: <be...@us...> - 2014-04-23 04:58:56
|
Revision: 12466
http://sourceforge.net/p/xoops/svn/12466
Author: beckmi
Date: 2014-04-23 04:58:51 +0000 (Wed, 23 Apr 2014)
Log Message:
-----------
updated XoopsMediaUploader to use system memory values from php.ini, and to offer random file names (mamba/luciorota)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/uploader.php
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-04-21 13:26:32 UTC (rev 12465)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-04-23 04:58:51 UTC (rev 12466)
@@ -3,10 +3,10 @@
===============================
2014/xx/xx: Version 2.5.7 Final
===============================
+- updated XoopsMediaUploader to use system memory values from php.ini, and to offer random file names (mamba/luciorota)
-
===============================
-2014/xx/xx: Version 2.5.7 RC 1
+2014/04/06: Version 2.5.7 RC 1
===============================
Bugfixes:
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/uploader.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/uploader.php 2014-04-21 13:26:32 UTC (rev 12465)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/uploader.php 2014-04-23 04:58:51 UTC (rev 12466)
@@ -101,6 +101,7 @@
14 => 'iff' ,
15 => 'wbmp' ,
16 => 'xbm');
+ var $randomFilename = false;
/**
* Constructor
@@ -111,10 +112,9 @@
* @param int $maxWidth
* @param int $maxHeight
*
- * @return bool
- * @internal param int $cmodvalue
*/
- function XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize = 0, $maxWidth = null, $maxHeight = null)
+
+ public function __construct($uploadDir, $allowedMimeTypes, $maxFileSize = 0, $maxWidth = null, $maxHeight = null, $randomFilename = false)
{
$this->extensionToMime = include $GLOBALS['xoops']->path('include/mimetypes.inc.php');
if (!is_array($this->extensionToMime)) {
@@ -126,20 +126,74 @@
$this->allowedMimeTypes =& $allowedMimeTypes;
}
$this->uploadDir = $uploadDir;
- $this->maxFileSize = intval($maxFileSize);
+
+ if (isset($maxFileSize) && $maxFileSize > 0) {
+ $maxFileSizeInBytes = $this->return_bytes($maxFileSize);
+ $maxUploadInBytes = $this->return_bytes(ini_get('upload_max_filesize'));
+ $maxPostInBytes = $this->return_bytes(ini_get('post_max_size'));
+ $memoryLimitInBytes = $this->return_bytes(ini_get('memory_limit'));
+ $newMaxFileSize = min($maxFileSizeInBytes, $maxUploadInBytes, $maxPostInBytes, $memoryLimitInBytes);
+ $this->maxFileSize = $newMaxFileSize;
+ } else {
+ $this->maxFileSize = $maxFileSize;
+ }
+
+
+
if (isset($maxWidth)) {
$this->maxWidth = intval($maxWidth);
}
if (isset($maxHeight)) {
$this->maxHeight = intval($maxHeight);
}
-
+ if (isset($randomFilename)) {
+ $this->randomFilename = $randomFilename;
+ }
if (!include_once $GLOBALS['xoops']->path('language/' . $GLOBALS['xoopsConfig']['language'] . '/uploader.php')) {
include_once $GLOBALS['xoops']->path('language/english/uploader.php');
}
}
+
/**
+ * Constructor
+ *
+ * @param string $uploadDir
+ * @param array $allowedMimeTypes
+ * @param int $maxFileSize
+ * @param int $maxWidth
+ * @param int $maxHeight
+ *
+ */
+
+
+ function XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize = 0, $maxWidth = 0, $maxHeight = null, $randomFilename = false) {
+
+ $this->__construct($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth, $maxHeight, $randomFilename );
+
+ }
+
+
+ /**
+ * converts memory/file sizes as defined in php.ini to bytes
+ *
+ * @param $size_str
+ *
+ * @return int
+ */
+ function return_bytes($size_str)
+ {
+ switch (substr ($size_str, -1))
+ {
+ case 'K': case 'k': return (int)$size_str * 1024;
+ case 'M': case 'm': return (int)$size_str * 1048576;
+ case 'G': case 'g': return (int)$size_str * 1073741824;
+ default: return $size_str;
+ }
+ }
+
+
+ /**
* Fetch the uploaded file
*
* @param string $media_name Name of the file field
@@ -160,6 +214,10 @@
} else if (is_array($_FILES[$media_name]['name']) && isset($index)) {
$index = intval($index);
$this->mediaName = (get_magic_quotes_gpc()) ? stripslashes($_FILES[$media_name]['name'][$index]) : $_FILES[$media_name]['name'][$index];
+ if ($this->randomFilename) {
+ $unique = uniqid(time());
+ $this->mediaName = '' . $unique . '--' . $this->mediaName;
+ }
$this->mediaType = $_FILES[$media_name]['type'][$index];
$this->mediaSize = $_FILES[$media_name]['size'][$index];
$this->mediaTmpName = $_FILES[$media_name]['tmp_name'][$index];
@@ -167,6 +225,10 @@
} else {
$media_name =& $_FILES[$media_name];
$this->mediaName = (get_magic_quotes_gpc()) ? stripslashes($media_name['name']) : $media_name['name'];
+ if ($this->randomFilename) {
+ $unique = uniqid(time());
+ $this->mediaName = '' . $unique . '--' . $this->mediaName;
+ }
$this->mediaType = $media_name['type'];
$this->mediaSize = $media_name['size'];
$this->mediaTmpName = $media_name['tmp_name'];
@@ -353,6 +415,10 @@
$this->savedFileName = strtolower($this->mediaName);
}
+ $this->savedFileName = iconv("UTF-8", "ASCII//TRANSLIT", $this->savedFileName);
+ $this->savedFileName = preg_replace('!\s+!', '_', $this->savedFileName);
+ $this->savedFileName = preg_replace("/[^a-zA-Z0-9\._-]/", "", $this->savedFileName);
+
$this->savedDestination = $this->uploadDir . '/' . $this->savedFileName;
if (!move_uploaded_file($this->mediaTmpName, $this->savedDestination)) {
$this->setErrors(sprintf(_ER_UP_FAILEDSAVEFILE, $this->savedDestination));
|
|
From: <txm...@us...> - 2014-04-21 13:26:38
|
Revision: 12465
http://sourceforge.net/p/xoops/svn/12465
Author: txmodxoops
Date: 2014-04-21 13:26:32 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Continuous integration
Added helper.php & request.php classes
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/functions.js
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/helper.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/request.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-04-20 09:47:08 UTC (rev 12464)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-04-21 13:26:32 UTC (rev 12465)
@@ -20,9 +20,9 @@
*/
include 'header.php';
$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
-
-if (isset($_REQUEST['mod_name'])) {
- $modules =& $modulesHandler->get($_REQUEST['mod_name']);
+$mname = TDMCreate_CleanVars( $_REQUEST, 'mod_name', '', 'string' );
+if ( $mname ) {
+ $modules =& $modulesHandler->get( $mname );
} else {
$modules =& $modulesHandler;
}
@@ -51,7 +51,7 @@
/*} else {
$GLOBALS['xoopsTpl']->assign('base_architecture', false);
}*/
- $mod_name = 'uploads/tdmcreate/modules/' . str_replace(' ', '', strtolower($modules->getVar('mod_name')));
+ $mod_name = 'uploads/tdmcreate/modules/' . str_replace(' ', '', strtolower($mod_name));
// Creation of the structure of folders and files
$GLOBALS['xoopsTpl']->assign('build_list', 'Under new construction - Temporary build only folders of this selected module "'.$mod_name.'/"');
if ( $modules->getVar('mod_install') == 1 ) {
@@ -67,13 +67,14 @@
$nb_modules = $modulesHandler->getObjects(null);
if ( $nb_modules == 0 ) {
redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
- }
+ }
+ unset($nb_modules);
// Redirect if there aren't tables
$nb_tables = $tablesHandler->getObjects(null);
if ($nb_tables == 0) {
redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES );
}
-
+ unset($nb_tables);
include_once TDMC_PATH . '/class/building.php';
$handler = TDMCreateBuilding::getInstance();
$form = $handler->getForm();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-20 09:47:08 UTC (rev 12464)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-21 13:26:32 UTC (rev 12465)
@@ -20,25 +20,38 @@
*/
include 'header.php';
// Recovered value of arguments op in the URL $
-$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
+//$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
+$tdmcreate = TDMCreate::getInstance();
+$op = TDMCreateRequest::getString('op', 'list');
// Get table Variables
$table_id = TDMCreate_CleanVars($_REQUEST, 'table_id');
$table_mid = TDMCreate_CleanVars($_REQUEST, 'table_mid');
$table_nbfields = TDMCreate_CleanVars($_REQUEST, 'table_nbfields');
$table_fieldname = TDMCreate_CleanVars($_REQUEST, 'table_fieldname', '', 'string');
+/*$table_id = TDMCreateRequest::getInt('table_id');
+$table_mid = TDMCreateRequest::getInt('table_mid');
+$table_nbfields = TDMCreateRequest::getInt('table_nbfields');
+$table_fieldname = TDMCreateRequest::getString('table_fieldname', '');*/
// Get field Variables
-$field_id = TDMCreate_CleanVars($_REQUEST, 'field_id');
+/*$field_id = TDMCreate_CleanVars($_REQUEST, 'field_id');
$field_mid = TDMCreate_CleanVars($_REQUEST, 'field_mid');
$field_tid = TDMCreate_CleanVars($_REQUEST, 'field_tid');
$field_numb = TDMCreate_CleanVars($_REQUEST, 'field_numb');
-$field_name = TDMCreate_CleanVars($_REQUEST, 'field_name', '', 'string');
+$field_name = TDMCreate_CleanVars($_REQUEST, 'field_name', '', 'string');*/
+$field_id = TDMCreateRequest::getInt('field_id');
+$field_mid = TDMCreateRequest::getInt('field_mid');
+$field_tid = TDMCreateRequest::getInt('field_tid');
+$field_numb = TDMCreateRequest::getInt('field_numb');
+$field_name = TDMCreateRequest::getString('field_name', '');
//
switch ($op)
{
case 'list':
default:
- $limit = $GLOBALS['xoopsModuleConfig']['fields_adminpager'];
- $start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
+ //$limit = $GLOBALS['xoopsModuleConfig']['fields_adminpager'];
+ //$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
+ $start = TDMCreateRequest::getInt('start', 0);
+ $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('fields_adminpager'));
// Define main template
$template_main = 'tdmcreate_fields.html';
$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/admin/style.css' );
@@ -54,7 +67,13 @@
$nb_modules = $modulesHandler->getObjects(null);
if ( $nb_modules == 0 ) {
redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
- }
+ }
+ unset($nb_modules);
+ $nb_tables = $tablesHandler->getObjects(null);
+ if ($nb_tables == 0) {
+ redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES );
+ }
+ unset($nb_tables);
// Get the list of tables
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('table_mid', $table_mid));
@@ -63,10 +82,7 @@
$criteria->setOrder('ASC');
$nb_tables = $tablesHandler->getCount($criteria);
$tables_arr = $tablesHandler->getAll($criteria);
- unset($criteria);
- if ($nb_tables == 0) {
- redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES );
- }
+ unset($criteria);
if ($nb_tables > 0)
{
foreach (array_keys($tables_arr) as $t)
@@ -169,8 +185,8 @@
'field_required' => (($_REQUEST['field_required'][$i] == 1) ? '1' : '0')
);
}
- foreach ($datas as $data => $value) {
- $obj->setVars(array($data, $value));
+ foreach ($datas as $value) {
+ $obj->setVars( $value );
$fieldsHandler->insert($obj);
}
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php 2014-04-20 09:47:08 UTC (rev 12464)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php 2014-04-21 13:26:32 UTC (rev 12465)
@@ -22,11 +22,13 @@
$criteria = new CriteriaCompo();
$count_modules = $modulesHandler->getCount($criteria);
$count_tables = $tablesHandler->getCount($criteria);
+$count_fields = $fieldsHandler->getCount($criteria);
unset($criteria);
$template_main = 'tdmcreate_index.html';
$adminMenu->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES) ;
$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' ._AM_TDMCREATE_THEREARE_NUMMODULES. '</label>', $count_modules, 'Green') ;
$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' ._AM_TDMCREATE_THEREARE_NUMTABLES. '</label>', $count_tables, 'Orange');
+$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' ._AM_TDMCREATE_THEREARE_NUMFIELDS. '</label>', $count_fields, 'Gray');
//$xoopsOption['template_main'] = 'tdmcreate_index.html';
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('index.php'));
$GLOBALS['xoopsTpl']->assign('index', $adminMenu->renderIndex());
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-04-20 09:47:08 UTC (rev 12464)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-04-21 13:26:32 UTC (rev 12465)
@@ -19,15 +19,22 @@
* @version $Id: 1.59 modules.php 11297 2013-03-24 10:58:10Z timgno $
*/
include 'header.php';
-// Recovered the value of the argument op in the URL $
-$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
-$mod_id = TDMCreate_CleanVars($_REQUEST, 'mod_id');
+// Recovered value of argument op in the URL $
+//$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
+//$mod_id = TDMCreate_CleanVars($_REQUEST, 'mod_id');
+$tdmcreate = TDMCreate::getInstance();
+$op = TDMCreateRequest::getString('op', 'list');
+//
+$mod_id = TDMCreateRequest::getInt('mod_id');
+//
switch ($op)
{
case 'list':
default:
- $limit = $GLOBALS['xoopsModuleConfig']['modules_adminpager'];
- $start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
+ //$limit = $GLOBALS['xoopsModuleConfig']['modules_adminpager'];
+ //$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
+ $start = TDMCreateRequest::getInt('start', 0);
+ $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
// Define main template
$template_main = 'tdmcreate_modules.html';
$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/admin/style.css' );
@@ -39,11 +46,15 @@
$criteria = new CriteriaCompo();
$criteria->setSort('mod_id ASC, mod_name');
$criteria->setOrder('ASC');
- $numrows = $modulesHandler->getCount();
+ $nb_modules = $modulesHandler->getCount();
$mods_arr = $modulesHandler->getAll( $criteria );
- unset($criteria);
+ unset($criteria);
+ // Redirect if there aren't modules
+ if ( $nb_modules == 0 ) {
+ redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
+ }
// Display modules list
- if ($numrows>0)
+ if ($nb_modules > 0)
{
foreach (array_keys($mods_arr) as $i)
{
@@ -62,9 +73,9 @@
$GLOBALS['xoopsTpl']->append('modules_list', $mod);
unset($mod);
}
- if ( $numrows > $limit ) {
+ if ( $nb_modules > $limit ) {
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit);
+ $pagenav = new XoopsPageNav($nb_modules, $limit, $start, 'start', 'op=list&limit=' . $limit);
$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
}
} else {
@@ -115,8 +126,8 @@
'mod_manual_file' => $_POST['mod_manual_file']));
//Form mod_image
include_once XOOPS_ROOT_PATH . '/class/uploader.php';
- $uploader = new XoopsMediaUploader(TDMC_UPLOAD_IMGMOD_PATH, $GLOBALS['xoopsModuleConfig']['mimetypes'],
- $GLOBALS['xoopsModuleConfig']['maxsize'], null, null);
+ $uploader = new XoopsMediaUploader(TDMC_UPLOAD_IMGMOD_PATH, $tdmcreate->getConfig('mimetypes'),
+ $tdmcreate->getConfig('maxsize'), null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attachedfile']['name']);
$name_img = $_GET['mod_name'].'_slogo.'.$extension;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-20 09:47:08 UTC (rev 12464)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-21 13:26:32 UTC (rev 12465)
@@ -20,20 +20,31 @@
*/
include 'header.php';
// Recovered value of arguments op in the URL $
-$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
+//$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
+$tdmcreate = TDMCreate::getInstance();
+$op = TDMCreateRequest::getString('op', 'list');
//
-$mod_id = TDMCreate_CleanVars($_REQUEST, 'mod_id');
+/*$mod_id = TDMCreate_CleanVars($_REQUEST, 'mod_id');
$table_id = TDMCreate_CleanVars($_REQUEST, 'table_id');
$table_mid = TDMCreate_CleanVars($_REQUEST, 'table_mid');
$table_nbfields = TDMCreate_CleanVars($_REQUEST, 'table_nbfields');
-$table_fieldname = TDMCreate_CleanVars($_REQUEST, 'table_fieldname', '', 'string');
+$table_fieldname = TDMCreate_CleanVars($_REQUEST, 'table_fieldname', '', 'string');*/
//
+$mod_id = TDMCreateRequest::getInt('mod_id');
+//
+$table_id = TDMCreateRequest::getInt('table_id');
+$table_mid = TDMCreateRequest::getInt('table_mid');
+$table_nbfields = TDMCreateRequest::getInt('table_nbfields');
+$table_fieldname = TDMCreateRequest::getString('table_fieldname', '');
+//
switch ($op)
{
case 'list':
default:
- $limit = $GLOBALS['xoopsModuleConfig']['tables_adminpager'];
- $start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
+ //$limit = $GLOBALS['xoopsModuleConfig']['tables_adminpager'];
+ //$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
+ $start = TDMCreateRequest::getInt('start', 0);
+ $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager'));
// Define main template
$template_main = 'tdmcreate_tables.html';
$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/admin/style.css' );
@@ -44,7 +55,7 @@
$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
$GLOBALS['xoopsTpl']->assign('tdmc_icons_url', TDMC_ICONS_URL);
$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
- //$GLOBALS['xoopsTpl']->assign('tdmc_upload_table_url', TDMC_UPLOAD_IMGTAB_URL);
+ //$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgtab_url', TDMC_UPLOAD_IMGTAB_URL);
$GLOBALS['xoopsTpl']->assign('pathIcon32', $pathIcon32);
// Get the list of modules
$criteria = new CriteriaCompo();
@@ -56,7 +67,12 @@
redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
}
$mods_arr = $modulesHandler->getAll($criteria);
- unset($criteria);
+ unset($criteria);
+ $nb_tables = $tablesHandler->getObjects(null);
+ if ($nb_tables == 0) {
+ redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES );
+ }
+ unset($nb_tables);
// Display modules list
if ( $nb_modules > 0 )
{
@@ -159,8 +175,8 @@
}else{
$uploaddir = TDMC_UPLOAD_PATH.'/images/tables';
}
- $uploader = new XoopsMediaUploader($uploaddir, xoops_getModuleOption('mimetypes'),
- xoops_getModuleOption('maxsize'), null, null);
+ $uploader = new XoopsMediaUploader($uploaddir, $tdmcreate->getConfig('mimetypes'),
+ $tdmcreate->getConfig('maxsize'), null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['table_image']['name']);
$name_img = $_GET['table_name'].'.'.$extension;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php 2014-04-20 09:47:08 UTC (rev 12464)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php 2014-04-21 13:26:32 UTC (rev 12465)
@@ -10,24 +10,33 @@
*/
/**
- * Xoops Javascript class
+ * TDMCreateBuilding class
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package media
+ * @package tdmcreate
* @since 2.5.x
* @author TDM TEAM DEV MODULE
- * @version $Id: modules.php 12209 2013-10-23 02:49:09Z beckmi $ modules.php 11114 2013-02-13 10:22:12Z timgno $
+ * @version $Id: modules.php 12425 2014-02-23 22:40:09Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
class TDMCreateBuilding extends XoopsObject
{
- // Constructor
+ /**
+ * @var mixed
+ */
+ private $tdmc = null;
+
+ /*
+ * @public function constructor class
+ * @param null
+ */
public function __construct()
{
- $this->XoopsObject();
+ $this->XoopsObject();
+ $this->tdmc = TDMCreate::getInstance();
}
/*
@@ -50,7 +59,7 @@
}
xoops_load('XoopsFormLoader');
$form = new XoopsThemeForm(_AM_TDMCREATE_ADMIN_CONST, 'buildform', $action, 'post', true);
- $modulesHandler =& xoops_getModuleHandler('modules', 'TDMCreate');
+ $modulesHandler =& $this->tdmc->getHandler('modules');
$mod_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_MODULES, 'mod_name', 'mod_name');
$mod_select->addOptionArray($modulesHandler->getList());
$form->addElement($mod_select, true);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-20 09:47:08 UTC (rev 12464)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-21 13:26:32 UTC (rev 12465)
@@ -99,7 +99,7 @@
$form->setExtra('enctype="multipart/form-data"');
$tablesHandler = xoops_getModuleHandler('tables');
- $fieldsHandler = xoops_getModuleHandler('fields');
+ //$fieldsHandler = xoops_getModuleHandler('fields');
$fieldelementsHandler =& xoops_getModuleHandler('fieldelements');
$fieldtypeHandler =& xoops_getModuleHandler('fieldtype');
$fieldattrsHandler =& xoops_getModuleHandler('fieldattributes');
@@ -122,7 +122,7 @@
$form->addElement(new TDMCreateFormLabel('</tr></thead>'));
$form->addElement(new TDMCreateFormLabel('<tbody>'));
- $fields = $fieldsHandler->getObjects(null);
+ //$fields = $fieldsHandler->getObjects(null);
$class = '';
for($i = 1; $i <= $field_numb; $i++)
@@ -132,8 +132,8 @@
// Index ID
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$i.'</td>'));
// Field Name
- $field_name = $isNew ? (!empty($f_name) ? $f_name . '_' : '') : $this->getVar('field_name');
- $field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$i.']', 15, 255, $field_name);
+ $this_field_name = $isNew ? (!empty($f_name) ? $f_name . '_' : '') : $this->getVar('field_name');
+ $field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$i.']', 15, 255, $this_field_name);
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
// Field Type
$fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$i.']', $this->getVar('field_type'));
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/helper.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/helper.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/helper.php 2014-04-21 13:26:32 UTC (rev 12465)
@@ -0,0 +1,173 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author trabis <lus...@gm...>
+ * @version $Id: tdmcreate.php 12258 2014-04-12 23:45:12Z timgno $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class TDMCreate
+{
+ /**
+ * @var string
+ */
+ private $dirname = null;
+ /**
+ * @var string
+ */
+ private $module = null;
+ /**
+ * @var string
+ */
+ private $handler = null;
+ /**
+ * @var string
+ */
+ private $config = null;
+ /**
+ * @var string
+ */
+ private $debug = null;
+ /**
+ * @var array
+ */
+ private $debugArray = array();
+ /*
+ * @protected function constructor class
+ * @param mixed $debug
+ */
+ protected function __construct($debug)
+ {
+ $this->debug = $debug;
+ $this->dirname = basename(dirname(dirname(__FILE__)));
+ }
+ /*
+ * @static function &getInstance
+ * @param mixed $debug
+ */
+ public static function &getInstance($debug = false)
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self($debug);
+ }
+ return $instance;
+ }
+ /*
+ * @static function getModule
+ * @param null
+ */
+ public function &getModule()
+ {
+ if ($this->module == null) {
+ $this->initModule();
+ }
+ return $this->module;
+ }
+ /*
+ * @static function getConfig
+ * @param string $name
+ */
+ public function getConfig($name = null)
+ {
+ if ($this->config == null) {
+ $this->initConfig();
+ }
+ if (!$name) {
+ $this->addLog("Getting all config");
+ return $this->config;
+ }
+ if (!isset($this->config[$name])) {
+ $this->addLog("ERROR :: CONFIG '{$name}' does not exist");
+ return null;
+ }
+ $this->addLog("Getting config '{$name}' : " . $this->config[$name]);
+ return $this->config[$name];
+ }
+ /*
+ * @static function setConfig
+ * @param string $name
+ * @param mixed $value
+ */
+ public function setConfig($name = null, $value = null)
+ {
+ if ($this->config == null) {
+ $this->initConfig();
+ }
+ $this->config[$name] = $value;
+ $this->addLog("Setting config '{$name}' : " . $this->config[$name]);
+ return $this->config[$name];
+ }
+ /*
+ * @static function getHandler
+ * @param string $name
+ */
+ public function &getHandler($name)
+ {
+ if (!isset($this->handler[$name . '_handler'])) {
+ $this->initHandler($name);
+ }
+ $this->addLog("Getting handler '{$name}'");
+ return $this->handler[$name . '_handler'];
+ }
+ /*
+ * @static function initModule
+ * @param null
+ */
+ public function initModule()
+ {
+ global $xoopsModule;
+ if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $this->dirname) {
+ $this->module = $xoopsModule;
+ } else {
+ $hModule = xoops_gethandler('module');
+ $this->module = $hModule->getByDirname($this->dirname);
+ }
+ $this->addLog('INIT MODULE');
+ }
+ /*
+ * @static function initConfig
+ * @param null
+ */
+ public function initConfig()
+ {
+ $this->addLog('INIT CONFIG');
+ $hModConfig = xoops_gethandler('config');
+ $this->config = $hModConfig->getConfigsByCat(0, $this->getModule()->getVar('mid'));
+ }
+ /*
+ * @static function initHandler
+ * @param string $name
+ */
+ public function initHandler($name)
+ {
+ $this->addLog('INIT ' . $name . ' HANDLER');
+ $this->handler[$name . '_handler'] = xoops_getModuleHandler($name, $this->dirname);
+ }
+ /*
+ * @static function addLog
+ * @param string $log
+ */
+ public function addLog($log)
+ {
+ if ($this->debug) {
+ if (is_object($GLOBALS['xoopsLogger'])) {
+ $GLOBALS['xoopsLogger']->addExtra($this->module->name(), $log);
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php 2014-04-20 09:47:08 UTC (rev 12464)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php 2014-04-21 13:26:32 UTC (rev 12465)
@@ -10,11 +10,11 @@
*/
/**
- * Xoops Javascript class
+ * modules class
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package media
+ * @package tdmcreate
* @since 2.5.x
* @author TDM TEAM DEV MODULE
* @version $Id: modules.php 12209 2013-10-23 02:49:09Z beckmi $
@@ -28,50 +28,56 @@
*/
class TDMCreateModules extends XoopsObject
{
+ /**
+ * Instance of TDMCreate class
+ *
+ * @var mixed
+ */
+ private $tdmcreate = null;
/*
* @public function constructor class
* @param null
*/
public function __construct()
{
- $this->XoopsObject();
+ $this->tdmcreate = TDMCreate::getInstance();
$this->initVar('mod_id',XOBJ_DTYPE_INT);
- $this->initVar('mod_name',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['name']);
- $this->initVar('mod_version',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['version']);
- $this->initVar('mod_since',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['since']);
- $this->initVar('mod_min_php',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['min_php']);
- $this->initVar('mod_min_xoops',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['min_xoops']);
- $this->initVar('mod_min_admin',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['min_admin']);
- $this->initVar('mod_min_mysql',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['min_mysql']);
- $this->initVar('mod_description',XOBJ_DTYPE_TXTAREA, $GLOBALS['xoopsModuleConfig']['description']);
- $this->initVar('mod_author',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['author']);
- $this->initVar('mod_author_mail',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['author_email']);
- $this->initVar('mod_author_website_url',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['author_website_url']);
- $this->initVar('mod_author_website_name',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['author_website_name']);
- $this->initVar('mod_credits',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['credits']);
- $this->initVar('mod_license',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['license']);
- $this->initVar('mod_release_info',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['release_info']);
- $this->initVar('mod_release_file',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['release_file']);
- $this->initVar('mod_manual',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['manual']);
- $this->initVar('mod_manual_file',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['manual_file']);
+ $this->initVar('mod_name',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('name'));
+ $this->initVar('mod_version',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('version'));
+ $this->initVar('mod_since',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('since'));
+ $this->initVar('mod_min_php',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('min_php'));
+ $this->initVar('mod_min_xoops',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('min_xoops'));
+ $this->initVar('mod_min_admin',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('min_admin'));
+ $this->initVar('mod_min_mysql',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('min_mysql'));
+ $this->initVar('mod_description',XOBJ_DTYPE_TXTAREA, $this->tdmcreate->getConfig('description'));
+ $this->initVar('mod_author',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('author'));
+ $this->initVar('mod_author_mail',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('author_email'));
+ $this->initVar('mod_author_website_url',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('author_website_url'));
+ $this->initVar('mod_author_website_name',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('author_website_name'));
+ $this->initVar('mod_credits',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('credits'));
+ $this->initVar('mod_license',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('license'));
+ $this->initVar('mod_release_info',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('release_info'));
+ $this->initVar('mod_release_file',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('release_file'));
+ $this->initVar('mod_manual',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('manual'));
+ $this->initVar('mod_manual_file',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('manual_file'));
$this->initVar('mod_image',XOBJ_DTYPE_TXTBOX, null);
- $this->initVar('mod_demo_site_url',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['demo_site_url']);
- $this->initVar('mod_demo_site_name',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['demo_site_name']);
- $this->initVar('mod_support_url',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['support_url']);
- $this->initVar('mod_support_name',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['support_name']);
- $this->initVar('mod_website_url',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['website_url']);
- $this->initVar('mod_website_name',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['website_name']);
- $this->initVar('mod_release',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['release_date']);
- $this->initVar('mod_status',XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['status']);
- $this->initVar('mod_admin',XOBJ_DTYPE_INT,$GLOBALS['xoopsModuleConfig']['display_admin']);
- $this->initVar('mod_user',XOBJ_DTYPE_INT, $GLOBALS['xoopsModuleConfig']['display_user']);
- $this->initVar('mod_search',XOBJ_DTYPE_INT, $GLOBALS['xoopsModuleConfig']['active_search']);
- $this->initVar('mod_comments',XOBJ_DTYPE_INT, $GLOBALS['xoopsModuleConfig']['active_comments']);
- $this->initVar('mod_notifications', XOBJ_DTYPE_INT, $GLOBALS['xoopsModuleConfig']['active_notifications']);
- $this->initVar('mod_permissions', XOBJ_DTYPE_INT, $GLOBALS['xoopsModuleConfig']['active_permissions']);
- $this->initVar('mod_install', XOBJ_DTYPE_INT, $GLOBALS['xoopsModuleConfig']['inroot_install']);
- $this->initVar('mod_donations', XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['donations']);
- $this->initVar('mod_subversion', XOBJ_DTYPE_TXTBOX, $GLOBALS['xoopsModuleConfig']['subversion']);
+ $this->initVar('mod_demo_site_url',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('demo_site_url'));
+ $this->initVar('mod_demo_site_name',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('demo_site_name'));
+ $this->initVar('mod_support_url',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('support_url'));
+ $this->initVar('mod_support_name',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('support_name'));
+ $this->initVar('mod_website_url',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('website_url'));
+ $this->initVar('mod_website_name',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('website_name'));
+ $this->initVar('mod_release',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('release_date'));
+ $this->initVar('mod_status',XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('status'));
+ $this->initVar('mod_admin',XOBJ_DTYPE_INT, $this->tdmcreate->getConfig('display_admin'));
+ $this->initVar('mod_user',XOBJ_DTYPE_INT, $this->tdmcreate->getConfig('display_user'));
+ $this->initVar('mod_search',XOBJ_DTYPE_INT, $this->tdmcreate->getConfig('active_search'));
+ $this->initVar('mod_comments',XOBJ_DTYPE_INT, $this->tdmcreate->getConfig('active_comments'));
+ $this->initVar('mod_notifications', XOBJ_DTYPE_INT, $this->tdmcreate->getConfig('active_notifications'));
+ $this->initVar('mod_permissions', XOBJ_DTYPE_INT, $this->tdmcreate->getConfig('active_permissions'));
+ $this->initVar('mod_install', XOBJ_DTYPE_INT, $this->tdmcreate->getConfig('inroot_install'));
+ $this->initVar('mod_donations', XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('donations'));
+ $this->initVar('mod_subversion', XOBJ_DTYPE_TXTBOX, $this->tdmcreate->getConfig('subversion'));
}
/*
@@ -159,7 +165,7 @@
$imgtray->addElement( new XoopsFormLabel( '', "<br /><img src='" . TDMC_UPLOAD_IMGMOD_URL . "/" . $mod_image . "' name='image3' id='image3' alt='' /><br />" ) );
$fileseltray = new XoopsFormElementTray('', '<br />');
- $fileseltray->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD, 'attachedfile', $GLOBALS['xoopsModuleConfig']['maxsize']));
+ $fileseltray->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD, 'attachedfile', $this->tdmcreate->getConfig('maxsize')));
$fileseltray->addElement(new XoopsFormLabel(''));
$imgtray->addElement($fileseltray);
$form->addElement($imgtray);
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/request.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/request.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/request.php 2014-04-21 13:26:32 UTC (rev 12465)
@@ -0,0 +1,941 @@
+<?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.
+ */
+/**
+ * Request class
+ *
+ * @copyright Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
+ * @license GNU/GPL, see LICENSE.php
+ * Joomla! is free software. This version may have been modified pursuant
+ * to the GNU General Public License, and as distributed it includes or
+ * is derivative of works licensed under the GNU General Public License or
+ * other free or open source software licenses.
+ * See COPYRIGHT.php for copyright notices and details.
+ * @package TDMCreate
+ * @since 1.0
+ * @author trabis <lus...@gm...>
+ * @version $Id: request.php 10374 2012-12-12 23:39:48Z trabis $
+ * @version $Id: request.php 12424 2014-04-18 22:11:14Z timgno $
+ */
+
+/**
+ * Set the available masks for cleaning variables
+ */
+define('TDMCREATE_REQUEST_NOTRIM', 1);
+define('TDMCREATE_REQUEST_ALLOWRAW', 2);
+define('TDMCREATE_REQUEST_ALLOWHTML', 4);
+
+/**
+ * TDMCreateRequest Class
+ * This class serves to provide a common interface to access
+ * request variables. This includes $_POST, $_GET, and naturally $_REQUEST. Variables
+ * can be passed through an input filter to avoid injection or returned raw.
+ */
+class TDMCreateRequest
+{
+
+ /**
+ * Gets the request method
+ *
+ * @return string
+ */
+ static function getOptions()
+ {
+ $method = strtoupper($_SERVER['REQUEST_METHOD']);
+ return $method;
+ }
+
+ /**
+ * Fetches and returns a given variable.
+ * The default behaviour is fetching variables depending on the
+ * current request method: GET and HEAD will result in returning
+ * an entry from $_GET, POST and PUT will result in returning an
+ * entry from $_POST.
+ * You can force the source by setting the $hash parameter:
+ * post $_POST
+ * get $_GET
+ * files $_FILES
+ * cookie $_COOKIE
+ * env $_ENV
+ * server $_SERVER
+ * method via current $_SERVER['REQUEST_METHOD']
+ * default $_REQUEST
+ *
+ * @static
+ *
+ * @param string $name Variable name
+ * @param string $default Default value if the variable does not exist
+ * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
+ * @param string $type Return type for the variable, for valid values see {@link JFilterInput::clean()}
+ * @param int $mask Filter mask for the variable
+ *
+ * @return mixed Requested variable
+ */
+ static function getVar($name, $default = null, $hash = 'default', $type = 'none', $mask = 0)
+ {
+ // Ensure hash and type are uppercase
+ $hash = strtoupper($hash);
+ if ($hash === 'METHOD') {
+ $hash = strtoupper($_SERVER['REQUEST_METHOD']);
+ }
+ $type = strtoupper($type);
+ // Get the input hash
+ switch ($hash) {
+ case 'GET' :
+ $input = & $_GET;
+ break;
+ case 'POST' :
+ $input = & $_POST;
+ break;
+ case 'FILES' :
+ $input = & $_FILES;
+ break;
+ case 'COOKIE' :
+ $input = & $_COOKIE;
+ break;
+ case 'ENV' :
+ $input = & $_ENV;
+ break;
+ case 'SERVER' :
+ $input = & $_SERVER;
+ break;
+ default:
+ $input = & $_REQUEST;
+ $hash = 'REQUEST';
+ break;
+ }
+ if (isset($input[$name]) && $input[$name] !== null) {
+ // Get the variable from the input hash and clean it
+ $var = TDMCreateRequest::_cleanVar($input[$name], $mask, $type);
+ // Handle magic quotes compatability
+ if (get_magic_quotes_gpc() && ($var != $default) && ($hash != 'FILES')) {
+ $var = TDMCreateRequest::_stripSlashesRecursive($var);
+ }
+ } else if ($default !== null) {
+ // Clean the default value
+ $var = TDMCreateRequest::_cleanVar($default, $mask, $type);
+ } else {
+ $var = $default;
+ }
+ return $var;
+ }
+
+ /**
+ * Fetches and returns a given filtered variable. The integer
+ * filter will allow only digits to be returned. This is currently
+ * only a proxy function for getVar().
+ * See getVar() for more in-depth documentation on the parameters.
+ *
+ * @static
+ *
+ * @param string $name Variable name
+ * @param int $default Default value if the variable does not exist
+ * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
+ *
+ * @return integer Requested variable
+ */
+ static function getInt($name, $default = 0, $hash = 'default')
+ {
+ return TDMCreateRequest::getVar($name, $default, $hash, 'int');
+ }
+
+ /**
+ * Fetches and returns a given filtered variable. The float
+ * filter only allows digits and periods. This is currently
+ * only a proxy function for getVar().
+ * See getVar() for more in-depth documentation on the parameters.
+ *
+ * @static
+ *
+ * @param string $name Variable name
+ * @param float $default Default value if the variable does not exist
+ * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
+ *
+ * @return float Requested variable
+ */
+ static function getFloat($name, $default = 0.0, $hash = 'default')
+ {
+ return TDMCreateRequest::getVar($name, $default, $hash, 'float');
+ }
+
+ /**
+ * Fetches and returns a given filtered variable. The bool
+ * filter will only return true/false bool values. This is
+ * currently only a proxy function for getVar().
+ * See getVar() for more in-depth documentation on the parameters.
+ *
+ * @static
+ *
+ * @param string $name Variable name
+ * @param bool $default Default value if the variable does not exist
+ * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
+ *
+ * @return bool Requested variable
+ */
+ static function getBool($name, $default = false, $hash = 'default')
+ {
+ return TDMCreateRequest::getVar($name, $default, $hash, 'bool');
+ }
+
+ /**
+ * Fetches and returns a given filtered variable. The word
+ * filter only allows the characters [A-Za-z_]. This is currently
+ * only a proxy function for getVar().
+ * See getVar() for more in-depth documentation on the parameters.
+ *
+ * @static
+ *
+ * @param string $name Variable name
+ * @param string $default Default value if the variable does not exist
+ * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
+ *
+ * @return string Requested variable
+ */
+ static function getWord($name, $default = '', $hash = 'default')
+ {
+ return TDMCreateRequest::getVar($name, $default, $hash, 'word');
+ }
+
+ /**
+ * Fetches and returns a given filtered variable. The cmd
+ * filter only allows the characters [A-Za-z0-9.-_]. This is
+ * currently only a proxy function for getVar().
+ * See getVar() for more in-depth documentation on the parameters.
+ *
+ * @static
+ *
+ * @param string $name Variable name
+ * @param string $default Default value if the variable does not exist
+ * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
+ *
+ * @return string Requested variable
+ */
+ static function getCmd($name, $default = '', $hash = 'default')
+ {
+ return TDMCreateRequest::getVar($name, $default, $hash, 'cmd');
+ }
+
+ /**
+ * Fetches and returns a given filtered variable. The string
+ * filter deletes 'bad' HTML code, if not overridden by the mask.
+ * This is currently only a proxy function for getVar().
+ * See getVar() for more in-depth documentation on the parameters.
+ *
+ * @static
+ *
+ * @param string $name Variable name
+ * @param string $default Default value if the variable does not exist
+ * @param string $hash Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
+ * @param int $mask Filter mask for the variable
+ *
+ * @return string Requested variable
+ */
+ static function getString($name, $default = '', $hash = 'default', $mask = 0)
+ {
+ // Cast to string, in case JREQUEST_ALLOWRAW was specified for mask
+ return (string)TDMCreateRequest::getVar($name, $default, $hash, 'string', $mask);
+ }
+
+ static function getArray($name, $default = array(), $hash = 'default')
+ {
+ return TDMCreateRequest::getVar($name, $default, $hash, 'array');
+ }
+
+ static function getText($name, $default = '', $hash = 'default')
+ {
+ return (string)TDMCreateRequest::getVar($name, $default, $hash, 'string', TDMCREATE_REQUEST_ALLOWRAW);
+ }
+
+ /**
+ * Set a variabe in on of the request variables
+ *
+ * @access public
+ *
+ * @param string $name Name
+ * @param string $value Value
+ * @param string $hash Hash
+ * @param boolean $overwrite Boolean
+ *
+ * @return string Previous value
+ */
+ static function setVar($name, $value = null, $hash = 'method', $overwrite = true)
+ {
+ //If overwrite is true, makes sure the variable hasn't been set yet
+ if (!$overwrite && array_key_exists($name, $_REQUEST)) {
+ return $_REQUEST[$name];
+ }
+ // Get the request hash value
+ $hash = strtoupper($hash);
+ if ($hash === 'METHOD') {
+ $hash = strtoupper($_SERVER['REQUEST_METHOD']);
+ }
+ $previous = array_key_exists($name, $_REQUEST) ? $_REQUEST[$name] : null;
+ switch ($hash) {
+ case 'GET' :
+ $_GET[$name] = $value;
+ $_REQUEST[$name] = $value;
+ break;
+ case 'POST' :
+ $_POST[$name] = $value;
+ $_REQUEST[$name] = $value;
+ break;
+ case 'COOKIE' :
+ $_COOKIE[$name] = $value;
+ $_REQUEST[$name] = $value;
+ break;
+ case 'FILES' :
+ $_FILES[$name] = $value;
+ break;
+ case 'ENV' :
+ $_ENV['name'] = $value;
+ break;
+ case 'SERVER' :
+ $_SERVER['name'] = $value;
+ break;
+ }
+ return $previous;
+ }
+
+ /**
+ * Fetches and returns a request array.
+ * The default behaviour is fetching variables depending on the
+ * current request method: GET and HEAD will result in returning
+ * $_GET, POST and PUT will result in returning $_POST.
+ * You can force the source by setting the $hash parameter:
+ * post $_POST
+ * get $_GET
+ * files $_FILES
+ * cookie $_COOKIE
+ * env $_ENV
+ * server $_SERVER
+ * method via current $_SERVER['REQUEST_METHOD']
+ * default $_REQUEST
+ *
+ * @static
+ *
+ * @param string $hash to get (POST, GET, FILES, METHOD)
+ * @param int $mask Filter mask for the variable
+ *
+ * @return mixed Request hash
+ */
+ static function get($hash = 'default', $mask = 0)
+ {
+ $hash = strtoupper($hash);
+ if ($hash === 'METHOD') {
+ $hash = strtoupper($_SERVER['REQUEST_METHOD']);
+ }
+ switch ($hash) {
+ case 'GET' :
+ $input = $_GET;
+ break;
+ case 'POST' :
+ $input = $_POST;
+ break;
+ case 'FILES' :
+ $input = $_FILES;
+ break;
+ case 'COOKIE' :
+ $input = $_COOKIE;
+ break;
+ case 'ENV' :
+ $input = & $_ENV;
+ break;
+ case 'SERVER' :
+ $input = & $_SERVER;
+ break;
+ default:
+ $input = $_REQUEST;
+ break;
+ }
+ $result = TDMCreateRequest::_cleanVar($input, $mask);
+ // Handle magic quotes compatability
+ if (get_magic_quotes_gpc() && ($hash != 'FILES')) {
+ $result = TDMCreateRequest::_stripSlashesRecursive($result);
+ }
+ return $result;
+ }
+
+ /**
+ * Sets a request variable
+ *
+ * @param array $array An associative array of key-value pairs
+ * @param string $hash The request variable to set (POST, GET, FILES, METHOD)
+ * @param boolean $overwrite If true and an existing key is found, the value is overwritten, otherwise it is ingored
+ */
+ static function set($array, $hash = 'default', $overwrite = true)
+ {
+ foreach ($array as $key => $value) {
+ TDMCreateRequest::setVar($key, $value, $hash, $overwrite);
+ }
+ }
+
+ /**
+ * Cleans the request from script injection.
+ *
+ * @static
+ * @return void
+ */
+ static function clean()
+ {
+ TDMCreateRequest::_cleanArray($_FILES);
+ TDMCreateRequest::_cleanArray($_ENV);
+ TDMCreateRequest::_cleanArray($_GET);
+ TDMCreateRequest::_cleanArray($_POST);
+ TDMCreateRequest::_cleanArray($_COOKIE);
+ TDMCreateRequest::_cleanArray($_SERVER);
+ if (isset($_SESSION)) {
+ TDMCreateRequest::_cleanArray($_SESSION);
+ }
+ $REQUEST = $_REQUEST;
+ $GET = $_GET;
+ $POST = $_POST;
+ $COOKIE = $_COOKIE;
+ $FILES = $_FILES;
+ $ENV = $_ENV;
+ $SERVER = $_SERVER;
+ if (isset ($_SESSION)) {
+ $SESSION = $_SESSION;
+ }
+ foreach ($GLOBALS as $key => $value) {
+ if ($key != 'GLOBALS') {
+ unset($GLOBALS[$key]);
+ }
+ }
+ $_REQUEST = $REQUEST;
+ $_GET = $GET;
+ $_POST = $POST;
+ $_COOKIE = $COOKIE;
+ $_FILES = $FILES;
+ $_ENV = $ENV;
+ $_SERVER = $SERVER;
+ if (isset($SESSION)) {
+ $_SESSION = $SESSION;
+ }
+ }
+
+ /**
+ * Adds an array to the GLOBALS array and checks that the GLOBALS variable is not being attacked
+ *
+ * @access protected
+ *
+ * @param array $array Array to clean
+ * @param boolean $globalise True if the array is to be added to the GLOBALS
+ */
+ static function _cleanArray(&$array, $globalise = false)
+ {
+ static $banned = array('_files', '_env', '_get', '_post', '_cookie', '_server', '_session', 'globals');
+ foreach ($array as $key => $value) {
+ // PHP GLOBALS injection bug
+ $failed = in_array(strtolower($key), $banned);
+ // PHP Zend_Hash_Del_Key_Or_Index bug
+ $failed |= is_numeric($key);
+ if ($failed) {
+ exit('Illegal variable <strong>' . implode('</strong> or <strong>', $banned) . '</strong> passed to script.');
+ }
+ if ($globalise) {
+ $GLOBALS[$key] = $value;
+ }
+ }
+ }
+
+ /**
+ * Clean up an input variable.
+ *
+ * @param mixed $var The input variable.
+ * @param int $mask Filter bit mask. 1=no trim: If this flag is cleared and the
+ * input is a string, the string will have leading and trailing whitespace
+ * trimmed. 2=allow_raw: If set, no more filtering is performed, higher bits
+ * are ignored. 4=allow_html: HTML is allowed, but passed through a safe
+ * HTML filter first. If set, no more filtering is performed. If no bits
+ * other than the 1 bit is set, a strict filter is applied.
+ * @param string $type The variable type {@see JFilterInput::clean()}.
+ *
+ * @return string
+ */
+ static function _cleanVar($var, $mask = 0, $type = null)
+ {
+ // Static input filters for specific settings
+ static $noHtmlFilter = null;
+ static $safeHtmlFilter = null;
+ // If the no trim flag is not set, trim the variable
+ if (!($mask & 1) && is_string($var)) {
+ $var = trim($var);
+ }
+ // Now we handle input filtering
+ if ($mask & 2) {
+ // If the allow raw flag is set, do not modify the variable
+ } else if ($mask & 4) {
+ // If the allow html flag is set, apply a safe html filter to the variable
+ if (is_null($safeHtmlFilter)) {
+ $safeHtmlFilter = TDMCreateFilterInput::getInstance(null, null, 1, 1);
+ }
+ $var = $safeHtmlFilter->clean($var, $type);
+ } else {
+ // Since no allow flags were set, we will apply the most strict filter to the variable
+ if (is_null($noHtmlFilter)) {
+ $noHtmlFilter = TDMCreateFilterInput::getInstance( /* $tags, $attr, $tag_method, $attr_method, $xss_auto */);
+ }
+ $var = $noHtmlFilter->clean($var, $type);
+ }
+ return $var;
+ }
+
+ /**
+ * Strips slashes recursively on an array
+ *
+ * @access protected
+ *
+ * @param array $value Array of (nested arrays of) strings
+ *
+ * @return array|string The input array with stripshlashes applied to it
+ */
+ protected function _stripSlashesRecursive($value)
+ {
+ $value = is_array($value) ? array_map(array('TDMCreateRequest', '_stripSlashesRecursive'), $value) : stripslashes($value);
+ return $value;
+ }
+}
+
+/**
+ * TDMCreateInput is a class for filtering input from any data source
+ * Forked from the php input filter library by: Daniel Morris <da...@ro...>
+ * Original Contributors: Gianpaolo Racca, Ghislain Picard, Marco Wandschneider, Chris Tobin and Andrew Eddie.
+ *
+ * @author Louis Landry <lou...@jo...>
+ */
+class TDMCreateFilterInput
+{
+ var $tagsArray; // default = empty array
+ var $attrArray; // default = empty array
+ var $tagsMethod; // default = 0
+ var $attrMethod; // default = 0
+ var $xssAuto; // default = 1
+ var $tagBlacklist = array('applet', 'body', 'bgsound', 'base', 'basefont', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml');
+ var $attrBlacklist = array('action', 'background', 'codebase', 'dynsrc', 'lowsrc'); // also will strip ALL event handlers
+ /**
+ * Constructor for inputFilter class. Only first parameter is required.
+ *
+ * @access protected
+ *
+ * @param array $tagsArray list of user-defined tags
+ * @param array $attrArray list of user-defined attributes
+ * @param int $tagsMethod WhiteList method = 0, BlackList method = 1
+ * @param int $attrMethod WhiteList method = 0, BlackList method = 1
+ * @param int $xssAuto Only auto clean essentials = 0, Allow clean blacklisted tags/attr = 1
+ */
+ public function __construct($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1)
+ {
+ // Make sure user defined arrays are in lowercase
+ $tagsArray = array_map('strtolower', (array)$tagsArray);
+ $attrArray = array_map('strtolower', (array)$attrArray);
+ // Assign member variables
+ $this->tagsArray = $tagsArray;
+ $this->attrArray = $attrArray;
+ $this->tagsMethod = $tagsMethod;
+ $this->attrMethod = $attrMethod;
+ $this->xssAuto = $xssAuto;
+ }
+
+ /**
+ * Returns a reference to an input filter object, only creating it if it doesn't already exist.
+ * This method must be invoked as:
+ * <pre> $filter = & TDMCreateFilterInput::getInstance();</pre>
+ *
+ * @static
+ *
+ * @param array $tagsArray list of user-defined tags
+ * @param array $attrArray list of user-defined attributes
+ * @param int $tagsMethod WhiteList method = 0, BlackList method = 1
+ * @param int $attrMethod WhiteList method = 0, BlackList method = 1
+ * @param int $xssAuto Only auto clean essentials = 0, Allow clean blacklisted tags/attr = 1
+ *
+ * @return object The TDMCreateFilterInput object.
+ * @since 1.5
+ */
+ public function & getInstance($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1)
+ {
+ static $instances;
+ $sig = md5(serialize(array($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto)));
+ if (!isset ($instances)) {
+ $instances = array();
+ }
+ if (empty ($instances[$sig])) {
+ $instances[$sig] = new TDMCreateFilterInput($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto);
+ }
+ return $instances[$sig];
+ }
+
+ /**
+ * Method to be called by another php script. Processes for XSS and
+ * specified bad code.
+ *
+ * @access public
+ *
+ * @param mixed $source Input string/array-of-string to be 'cleaned'
+ * @param string $type Return type for the variable (INT, FLOAT, BOOLEAN, WORD, ALNUM, CMD, BASE64, STRING, ARRAY, PATH, NONE)
+ *
+ * @return mixed 'Cleaned' version of input parameter
+ * @static
+ */
+ public function clean($source, $type = 'string')
+ {
+ // Handle the type constraint
+ switch (strtoupper($type)) {
+ case 'INT' :
+ case 'INTEGER' :
+ // Only use the first integer value
+ preg_match('/-?[0-9]+/', (string)$source, $matches);
+ $result = @ (int)$matches[0];
+ break;
+ case 'FLOAT' :
+ case 'DOUBLE' :
+ // Only use the first floating point value
+ preg_match('/-?[0-9]+(\.[0-9]+)?/', (string)$source, $matches);
+ $result = @ (float)$matches[0];
+ break;
+ case 'BOOL' :
+ case 'BOOLEAN' :
+ $result = (bool)$source;
+ break;
+ case 'WORD' :
+ $result = (string)preg_replace('/[^A-Z_]/i', '', $source);
+ break;
+ case 'ALNUM' :
+ $result = (string)preg_replace('/[^A-Z0-9]/i', '', $source);
+ break;
+ case 'CMD' :
+ $result = (string)preg_replace('/[^A-Z0-9_\.-]/i', '', $source);
+ $result = ltrim($result, '.');
+ break;
+ case 'BASE64' :
+ $result = (string)preg_replace('/[^A-Z0-9\/+=]/i', '', $source);
+ break;
+ case 'STRING' :
+ // Check for static usage and assign $filter the proper variable
+ if (isset($this) && is_a($this, 'TDMCreateFilterInput')) {
+ $filter =& $this;
+ } else {
+ $filter = TDMCreateFilterInput::getInstance();
+ }
+ $result = (string)$filter->_remove($filter->_decode((string)$source));
+ break;
+ case 'ARRAY' :
+ $result = (array)$source;
+ break;
+ case 'PATH' :
+ $pattern = '/^[A-Za-z0-9_-]+[A-Za-z0-9_\.-]*([\\\\\/][A-Za-z0-9_-]+[A-Za-z0-9_\.-]*)*$/';
+ preg_match($pattern, (string)$source, $matches);
+ $result = @ (string)$matches[0];
+ break;
+ case 'USERNAME' :
+ $result = (string)preg_replace('/[\x00-\x1F\x7F<>"\'%&]/', '', $source);
+ break;
+ default :
+ // Check for static usage and assign $filter the proper variable
+ if (is_object($this) && get_class($this) == 'TDMCreateFilterInput') {
+ $filter =& $this;
+ } else {
+ $filter = TDMCreateFilterInput::getInstance();
+ }
+ // Are we dealing with an array?
+ if (is_array($source)) {
+ foreach ($source as $key => $value) {
+ // filter element for XSS and other 'bad' code etc.
+ if (is_string($value)) {
+ $source[$key] = $filter->_remove($filter->_decode($value));
+ }
+ }
+ $result = $source;
+ } else {
+ // Or a string?
+ if (is_string($source) && !empty ($source)) {
+ // filter source for XSS and other 'bad' code etc.
+ $result = $filter->_remove($filter->_decode($source));
+ } else {
+ // Not an array or string.. return the passed parameter
+ $result = $source;
+ }
+ }
+ break;
+ }
+ return $result;
+ }
+
+ /**
+ * Function to determine if content...
[truncated message content] |
|
From: <be...@us...> - 2014-04-20 09:47:12
|
Revision: 12464
http://sourceforge.net/p/xoops/svn/12464
Author: beckmi
Date: 2014-04-20 09:47:08 +0000 (Sun, 20 Apr 2014)
Log Message:
-----------
Small changes
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/img_uploader.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/tips_tricks.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_download.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_singlefile.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_viewcat.tpl
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -78,7 +78,8 @@
$block['topcats'][$cid]['imgurl'] = $wfdownloads->getHandler('category')->allCategories[$cid]->getVar('imgurl');
}
- foreach ($block['downloads'] as $key => $value) {
+//mb foreach ($block['downloads'] as $key => $value) {
+ foreach ($block['downloads'] as $value) {
$block['topcats'][$allsubcats_linked_totop[$value['cid']]]['downloads'][] = $value;
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -345,7 +345,7 @@
if (!isset($this->topCategories[$topcid])) {
$this->topCategories[$topcid] = $topcid;
}
- foreach ($tree->getAllChild($topcid) as $key => $category) {
+ foreach ($tree->getAllChild($topcid) as /*$key =>*/ $category) {
$childrenids[] = $category->getVar('cid');
}
$childrenids = isset($childrenids) ? $childrenids : 0;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -96,7 +96,7 @@
* @param string $name name of the table
*
*/
- function WfdownloadsTable($name)
+ function __construct($name)
{
$this->_name = $name;
$this->_data = array();
@@ -511,7 +511,10 @@
class WfdownloadsDbupdater
{
- function WfdownloadsDbupdater()
+ /**
+ *
+ */
+ function __construct()
{
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/img_uploader.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/img_uploader.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/img_uploader.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -90,9 +90,9 @@
*
* @internal param int $cmodvalue
*/
- function XoopsMediaImgUploader($uploadDir, $allowedMimeTypes = 0, $maxFileSize, $maxWidth = 0, $maxHeight = 0)
+ function __construct($uploadDir, $allowedMimeTypes = 0, $maxFileSize, $maxWidth = 0, $maxHeight = 0)
{
- $this->XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth, $maxHeight);
+ parent::__construct($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth, $maxHeight);
$this->randomfilename = false;
}
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -42,7 +42,7 @@
* dir
*/
- function WfsLists($path = "uploads", $value = null, $selected = '', $size = 1, $emptyselect = 0, $type = 0, $prefix = '', $suffix = '')
+ function __construct($path = "uploads", $value = null, $selected = '', $size = 1, $emptyselect = 0, $type = 0, $prefix = '', $suffix = '')
{
$this->value = $value;
$this->selection = $selected;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-20 09:47:08 UTC (rev 12464)
@@ -1,5 +1,6 @@
-<b><u>=> Version 3.23 Beta (2014-04-19)</u></b>
-- replacing "or" with "||" (mamba)
+<b><u>=> Version 3.23 Beta (2014-04-20)</u></b>
+- small changes based on testing tool feedback (mamba)
+- replacing "or" with "||", and "and" with "&&" (mamba)
- replaced template extensions from .html to .tpl (mamba)
- replaced Thickbox with MagnificPopup (mamba)
- fixed: source code for HTML5/CSS3 (mamba)
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-20 09:47:08 UTC (rev 12464)
@@ -43,7 +43,7 @@
return @round(
$bytes / pow(1000, ($i = floor(log($bytes, 1000)))),
$precision
- ) . ' ' . $unit[$i];
+ ) . ' ' . $unit[(int)$i];
}
/**
@@ -60,7 +60,7 @@
return @round(
$bytes / pow(1024, ($i = floor(log($bytes, 1024)))),
$precision
- ) . ' ' . $unit[$i];
+ ) . ' ' . $unit[(int)$i];
}
/**
@@ -575,7 +575,8 @@
function wfdownloads_formatErrors($errors = array())
{
$ret = '';
- foreach ($errors as $key => $value) {
+//mb foreach ($errors as $key => $value) {
+ foreach ($errors as $value) {
$ret .= "<br /> - {$value}";
}
@@ -698,7 +699,7 @@
*/
function wfdownloads_serverStats()
{
- $wfdownloads = WfdownloadsWfdownloads::getInstance();
+//mb $wfdownloads = WfdownloadsWfdownloads::getInstance();
global $xoopsDB;
$html = "";
$sql = "SELECT metavalue";
@@ -1487,6 +1488,7 @@
flush();
}
if (connection_status() !== CONNECTION_NORMAL) {
+ //TODO traslation
echo "Connection aborted";
}
fclose($handle);
@@ -1496,9 +1498,11 @@
readfile($filePath);
}
} else {
+ //TODO traslation
echo 'File does not exist!';
}
} else {
+ //TODO traslation
echo 'There is no file to download!';
}
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help.html 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help.html 2014-04-20 09:47:08 UTC (rev 12464)
@@ -61,7 +61,6 @@
<h4 class="odd">Tutorial</h4>
<p class="even">
- You can see more info <a href="<{$xoops_url}>/modules/wfdownloads/docs/english/readme.html" title="Wfdownloads Detailed Help"
- alt="Wfdownloads Detailed Help"/> here</a>.
+ You can see more info <a href="<{$xoops_url}>/modules/wfdownloads/docs/english/readme.html" title="Wfdownloads Detailed Help" alt="Wfdownloads Detailed Help"/> here</a>.
</p>
</div>
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/tips_tricks.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/tips_tricks.html 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/tips_tricks.html 2014-04-20 09:47:08 UTC (rev 12464)
@@ -1,24 +1,22 @@
<div id="help-template" class="outer">
<h1 class="head">Help:
- <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/wfdownloads/admin/index.php" title="Back to the administration of Wfdownloads">
- Wfdownloads
- <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of Wfdownloads"/>
- </a>
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/wfdownloads/admin/index.php" title="Back to the administration of Wfdownloads">Wfdownloads<img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of Wfdownloads"/></a>
</h1>
<h4>Upload files</h4>
+
+ <div class="even">
+ <span style="font-weight: bold;">How set maximum upload file size limit?</span>
+ </div>
+ <div class="odd">
+ <p>Maximum upload file size limit is the mimimum value between:</p>
+ <ul>
+ <li>Max upload size permitted: <span style="font-weight: bold;">upload_max_filesize</span> directive in php.ini</li>
+ <li>Max post size permitted: <span style="font-weight: bold;">post_max_size</span> directive in php.ini</li>
+ <li>Memory limit: <span style="font-weight: bold;">memory_limit directive</span> in php.ini</li>
+ <li>Module preferences: <span style="font-weight: bold;">[upload files] Max file size (bytes)</span></li>
+ </ul>
<div class="even">
- <span style="font-weight: bold;">How set maximum upload file size limit?</span>
- </div>
- <div class="odd">
- <p>Maximum upload file size limit is the mimimum value between:</p>
- <ul>
- <li>Max upload size permitted: <span style="font-weight: bold;">upload_max_filesize</span> directive in php.ini</li>
- <li>Max post size permitted: <span style="font-weight: bold;">post_max_size</span> directive in php.ini</li>
- <li>Memory limit: <span style="font-weight: bold;">memory_limit directive</span> in php.ini</li>
- <li>Module preferences: <span style="font-weight: bold;">[upload files] Max file size (bytes)</span></li>
- </ul>
- <div class="even">
<span style="font-weight: bold;">How can I upload files bigger than maximum upload file size limit?</span>
</div>
<div class="odd">
@@ -27,18 +25,21 @@
<li>use an ftp client to upload file in <span style="font-weight: bold;">Module preferences > [upload files] Upload directory</span> directory</li>
<li>create a new Download and fill
<ul>
- <li><span style="font-weight: bold;">"Local file name"</span> field with the path relative to <span style="font-weight: bold;">Module preferences > [upload files] Upload directory</span></li>
+ <li><span style="font-weight: bold;">"Local file name"</span> field with the path relative to <span style="font-weight: bold;">Module preferences > [upload files] Upload directory</span>
+ </li>
<li><span style="font-weight: bold;">"File type"</span> field with the file mimetype</li>
</ul>
</li>
</ol>
</div>
- <h4>Download files</h4>
+ <h4>Download files</h4>
+
<div class="even">
<span style='font-weight: bold;'>Are there some limits in download file size?</span>
</div>
<div class="odd">
<p>No, this module split a big file and serve it chunk by chunk, to avoid errors by exceeding the memory_limit setting.</p>
</div>
+ </div>
</div>
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl 2014-04-20 09:47:08 UTC (rev 12464)
@@ -10,27 +10,23 @@
<th><{$smarty.const._AM_WFDOWNLOADS_ACTION}></th>
</tr>
<{foreach item=sorted_category from=$sorted_categories}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$sorted_category.category.cid}></td>
- <td>
- <{section name=indent loop=$sorted_category.level-1 step=1}}>-<{/section}>
- <a href='../viewcat.php?cid=<{$sorted_category.category.cid}>'><{$sorted_category.category.title}></a>
- </td>
- <td>
- <input type="text" name="new_weights[<{$sorted_category.category.cid}>]" size="5" maxlength="5"
- value="<{$sorted_category.category.weight}>"/>
- </td>
- <td><{$sorted_category.category.description}></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_WFDOWNLOADS_BMOVE}>"><img
- src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"
- alt="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"/></a>
- </td>
- </tr>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$sorted_category.category.cid}></td>
+ <td>
+ <{section name=indent loop=$sorted_category.level-1 step=1}>-<{/section}>
+ <a href='../viewcat.php?cid=<{$sorted_category.category.cid}>'><{$sorted_category.category.title}></a>
+ </td>
+ <td>
+ <input type="text" name="new_weights[<{$sorted_category.category.cid}>]" size="5" maxlength="5"
+ value="<{$sorted_category.category.weight}>"/>
+ </td>
+ <td><{$sorted_category.category.description}></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_WFDOWNLOADS_BMOVE}>"><img src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>" alt="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"/></a>
+ </td>
+ </tr>
<{/foreach}>
<tr>
<td colspan="1"> </td>
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl 2014-04-20 09:47:08 UTC (rev 12464)
@@ -2,326 +2,317 @@
<fieldset>
<legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHEDDOWN}></legend>
<{if ($published_downloads_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
+ <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
<{else}>
- <table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
-
- <form id='form_filter' enctype='multipart/form-data' method='post' action='' name='form_filter'>
+ <table class="outer">
<tr>
- <td> </td>
- <td>
- <select id='filter_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_title_condition' size='1'>
- <option value='='
- <{if $filter_title_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
- <option value='LIKE'
- <{if $filter_title_condition == 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
- </select>
- <input id='filter_title' type='text' value='<{$filter_title}>' maxlength='100' size='15' title='' name='filter_title'>
- </td>
- <td>
- <select id='filter_category_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>'
- name='filter_category_title_condition' size='1'>
- <option value='='
- <{if $filter_category_title_condition ==
- '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
- <option value='LIKE'
- <{if $filter_category_title_condition ==
- 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
- </select>
- <input id='filter_category_title' type='text' value='<{$filter_category_title}>' maxlength='100' size='15' title=''
- name='filter_category_title'>
- </td>
- <td><{$filter_submitter_select}></td>
- <td>
- <{*
- <select id='filter_date_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_date_condition' size='1'>
- <option value='='
- <{if $filter_date_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
- <option value='>'
- <{if $filter_date_condition == '>'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_GREATERTHAN}></option>
- <option value='<'
- <{if $filter_date_condition == '<'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_LESSTHAN}></option>
- </select>
- <{$filter_date_select}>
- *}>
- </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td align='center'>
- <input id='submit' class='formButton' type='submit' title='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>'
- value='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>' name='submit'>
- </td>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
</tr>
- <input id='op' type='hidden' value='downloads.filter' name='op'>
- </form>
- <{foreach item=download from=$published_downloads}>
- <tr class="<{cycle values='even, odd'}>">
- <td align='center'><{$download.lid}></td>
- <td>
- <a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a>
- </td>
- <td>
- <a href='../viewcat.php?cid=<{$download.cid}>'><{$download.category_title}></a>
- </td>
- <td><{$download.submitter_uname}></td>
- <td><{$download.published_timestamp}></td>
- <td align='center'>
- <{if $download.offline}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{else}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <{/if}>
- </td>
- <td align='center'>
- <{if $download.published}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <!--<{$download.published_timestamp}>-->
- <{else}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{/if}>
- </td>
- <td>
- <a href='?op=ip_logs.list&lid=<{$download.lid}>' title="<{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}>"><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a>
- </td>
- <td align='center'>
- <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
- title="<{$smarty.const._EDIT}>"
- alt="<{$smarty.const._EDIT}>"/></a>
- <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>
- </tr>
- <{/foreach}>
- </table>
- <{$published_downloads_pagenav}>
+ <form id='form_filter' enctype='multipart/form-data' method='post' action='' name='form_filter'>
+ <tr>
+ <td> </td>
+ <td>
+ <select id='filter_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_title_condition' size='1'>
+ <option value='='<{if $filter_title_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
+ <option value='LIKE'<{if $filter_title_condition == 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
+ </select>
+ <input id='filter_title' type='text' value='<{$filter_title}>' maxlength='100' size='15' title='' name='filter_title'>
+ </td>
+ <td>
+ <select id='filter_category_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_category_title_condition' size='1'>
+ <option value='='<{if $filter_category_title_condition =='='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
+ <option value='LIKE' <{if $filter_category_title_condition =='LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
+ </select>
+ <input id='filter_category_title' type='text' value='<{$filter_category_title}>' maxlength='100' size='15' title='' name='filter_category_title'>
+ </td>
+ <td><{$filter_submitter_select}></td>
+ <td>
+ <{*
+ <select id='filter_date_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_date_condition' size='1'>
+ <option value='='
+ <{if $filter_date_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
+ <option value='>'
+ <{if $filter_date_condition == '>'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_GREATERTHAN}></option>
+ <option value='<'
+ <{if $filter_date_condition == '<'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_LESSTHAN}></option>
+ </select>
+ <{$filter_date_select}>
+ *}>
+ </td>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ <td align='center'>
+ <input id='submit' class='formButton' type='submit' title='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>' value='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>' name='submit'>
+ </td>
+ </tr>
+ <input id='op' type='hidden' value='downloads.filter' name='op'>
+ </form>
+
+ <{foreach item=download from=$published_downloads}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td align='center'><{$download.lid}></td>
+ <td>
+ <a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a>
+ </td>
+ <td>
+ <a href='../viewcat.php?cid=<{$download.cid}>'><{$download.category_title}></a>
+ </td>
+ <td><{$download.submitter_uname}></td>
+ <td><{$download.published_timestamp}></td>
+ <td align='center'>
+ <{if $download.offline}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{else}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <{/if}>
+ </td>
+ <td align='center'>
+ <{if $download.published}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <!--<{$download.published_timestamp}>-->
+ <{else}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{/if}>
+ </td>
+ <td>
+ <a href='?op=ip_logs.list&lid=<{$download.lid}>' title="<{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}>"><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a>
+ </td>
+ <td align='center'>
+ <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
+ title="<{$smarty.const._EDIT}>"
+ alt="<{$smarty.const._EDIT}>"/></a>
+ <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>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$published_downloads_pagenav}>
<{/if}>
</fieldset>
-<br />
+<br/>
<fieldset>
<legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_NEWDOWN}></legend>
<{if ($new_downloads_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
+ <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
<{else}>
- <table class='outer'>
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
- <{foreach item=new_download from=$new_downloads}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$new_download.lid}></td>
- <td><{$new_download.title}></td>
- <td><{$new_download.category_title}></td>
- <td><{$new_download.submitter_uname}></td>
- <td><{$new_download.date_timestamp}></td>
- <td align='center'>
- <a href='?op=newdownload.approve&lid=<{$new_download.lid}>' title="<{$smarty.const._AM_WFDOWNLOADS_BAPPROVE}>"><img
- src="<{xoModuleIcons16 1.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BAPPROVE}>"
- alt="<{$smarty.const._AM_WFDOWNLOADS_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>
- </tr>
- <{/foreach}>
- </table>
- <{$newdownloads_pagenav}>
+ <table class='outer'>
+ <tr>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
+ </tr>
+ <{foreach item=new_download from=$new_downloads}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$new_download.lid}></td>
+ <td><{$new_download.title}></td>
+ <td><{$new_download.category_title}></td>
+ <td><{$new_download.submitter_uname}></td>
+ <td><{$new_download.date_timestamp}></td>
+ <td align='center'>
+ <a href='?op=newdownload.approve&lid=<{$new_download.lid}>' title="<{$smarty.const._AM_WFDOWNLOADS_BAPPROVE}>"><img
+ src="<{xoModuleIcons16 1.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BAPPROVE}>"
+ alt="<{$smarty.const._AM_WFDOWNLOADS_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>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$newdownloads_pagenav}>
<{/if}>
</fieldset>
-<br />
+<br/>
<fieldset>
<legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_AUTOPUBLISHEDDOWN}></legend>
- <br />
+ <br/>
<{if ($autopublished_downloads_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
+ <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
<{else}>
- <table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
- <{foreach item=download from=$autopublished_downloads}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$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 align='center'>
- <{if $download.offline}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{else}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <{/if}>
- </td>
- <td align='center'>
- <{if $download.published}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <!--<{$download.published_timestamp}>-->
- <{else}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{/if}>
- </td>
- <td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a></td>
- <td align='center'>
- <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
- title="<{$smarty.const._EDIT}>"
- alt="<{$smarty.const._EDIT}>"/></a>
- <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>
- </tr>
- <{/foreach}>
- </table>
- <{$autopublished_downloads_pagenav}>
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
+ </tr>
+ <{foreach item=download from=$autopublished_downloads}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$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 align='center'>
+ <{if $download.offline}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{else}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <{/if}>
+ </td>
+ <td align='center'>
+ <{if $download.published}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <!--<{$download.published_timestamp}>-->
+ <{else}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{/if}>
+ </td>
+ <td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a></td>
+ <td align='center'>
+ <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
+ title="<{$smarty.const._EDIT}>"
+ alt="<{$smarty.const._EDIT}>"/></a>
+ <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>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$autopublished_downloads_pagenav}>
<{/if}>
</fieldset>
-<br />
+<br/>
<fieldset>
<legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_EXPIREDDOWN}></legend>
- <br />
+ <br/>
<{if ($expired_downloads_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
+ <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
<{else}>
- <table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
- <{foreach item=download from=$expired_downloads}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$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 align='center'>
- <{if $download.offline}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{else}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <{/if}>
- </td>
- <td align='center'>
- <{if $download.published}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <!--<{$download.published_timestamp}>-->
- <{else}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{/if}>
- </td>
- <td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a></td>
- <td align='center'>
- <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
- title="<{$smarty.const._EDIT}>"
- alt="<{$smarty.const._EDIT}>"/></a>
- <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>
- </tr>
- <{/foreach}>
- </table>
- <{$expired_downloads_pagenav}>
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
+ </tr>
+ <{foreach item=download from=$expired_downloads}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$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 align='center'>
+ <{if $download.offline}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{else}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <{/if}>
+ </td>
+ <td align='center'>
+ <{if $download.published}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <!--<{$download.published_timestamp}>-->
+ <{else}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{/if}>
+ </td>
+ <td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a></td>
+ <td align='center'>
+ <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
+ title="<{$smarty.const._EDIT}>"
+ alt="<{$smarty.const._EDIT}>"/></a>
+ <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>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$expired_downloads_pagenav}>
<{/if}>
</fieldset>
-<br />
+<br/>
<fieldset>
<legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_OFFLINEDOWN}></legend>
<br/>
<{if ($offline_downloads_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
+ <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
<{else}>
- <table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
- <{foreach item=download from=$offline_downloads}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$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 align='center'>
- <{if $download.offline}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{else}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <{/if}>
- </td>
- <td align='center'>
- <{if $download.published}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <!--<{$download.published_timestamp}>-->
- <{else}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{/if}>
- </td>
- <td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a></td>
- <td align='center'>
- <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
- title="<{$smarty.const._EDIT}>"
- alt="<{$smarty.const._EDIT}>"/></a>
- <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>
- </tr>
- <{/foreach}>
- </table>
- <{$offline_downloads_pagenav}>
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
+ </tr>
+ <{foreach item=download from=$offline_downloads}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$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 align='center'>
+ <{if $download.offline}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{else}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <{/if}>
+ </td>
+ <td align='center'>
+ <{if $download.published}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <!--<{$download.published_timestamp}>-->
+ <{else}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{/if}>
+ </td>
+ <td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a></td>
+ <td align='center'>
+ <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
+ title="<{$smarty.const._EDIT}>"
+ alt="<{$smarty.const._EDIT}>"/></a>
+ <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>
+ </tr>
+ <{/foreach}>
+ </table>
+ <{$offline_downloads_pagenav}>
<{/if}>
</fieldset>
</form>
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.tpl
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.tpl 2014-04-19 23:21:34 UTC (rev 12463)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.tpl 2014-04-20 09:47:08 UTC (rev 12464)
@@ -1,5 +1,5 @@
<{if $use_brokenreports == false}>
-<div class="errorMsg"><{$smarty.const._AM_WFDOWNLOADS_BROKENREPORT_DISABLED}></div>
+ <div class="errorMsg"><{$smarty.const._AM_WFDOWNLOADS_BROKENREPORT_DISABLED}></div>
<{/if}>
<fieldset>
<legend style='font-weight: bold;'><{$smarty.const._AM_WFDOWNLOADS_BROKEN_REPORTINFO}></legend>
@@ -10,156 +10,157 @@
<p>
<img src="<{xoModuleIcons16 1.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_IGNOREDESC}>"
alt="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_IGNOREDESC}>"/> <{$smarty.const._AM_WFDOWNLOADS_BROKEN_IGNOREDESC}>
- <br />
+ <br/>
<img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_EDITDESC}>"
alt="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_EDITDESC}>"/> <{$smarty.const._AM_WFDOWNLOADS_BROKEN_EDITDESC}>
- <br />
+ <br/>
<img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_DELETEDESC}>"
alt="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_DELETEDESC}>"/> <{$smarty.const._AM_WFDOWNLOADS_BROKEN_DELETEDESC}>
- <br />
+ <br/>
<img src="<{xoModuleIcons16 1.png}>"/> <{$smarty.const._AM_WFDOWNLOADS_BROKEN_ACKDESC}>
- <br />
+ <br/>
<img src="<{xoModuleIcons16 1.png}>"/> <{$smarty.const._AM_WFDOWNLOADS_BROKEN_CONFIRMDESC}>
</p>
</fieldset>
-<br />
+<br/>
<fieldset>
<legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_BROKEN_REPORTS}></legend>
<{if ($reports_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_BROKEN_NOFILEMATCH}>
+ <{$smarty.const._AM_WFDOWNLOADS_BROKEN_NOFILEMATCH}>
<{else}>
- <table class='outer'>
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_BROKEN_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_BROKEN_DATESUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_BROKEN_REPORTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_BROKEN_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_BROKEN_FILESUBMITTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
- <{foreach item=report from=$reports}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$report.reportid}></td>
- <td><{$report.formatted_date}></td>
- <td>
- <{if ($report.reporter_email) == ''}>
- <{$report.reporter_uname}> (<{$report.ip}>)
- <{else}>
- <a href='mailto:<{$report.reporter_email}>'><{$report.reporter_uname}></a> (<{$report.ip}>)
- <{/if}>
- </td>
- <td>
- <{if ($report.download_lid) == false}>
- <{$smarty.const._AM_WFDOWNLOADS_BROKEN_DOWNLOAD_DONT_EXISTS}>
- <{else}>
- <a href='" . WFDOWNLOADS_URL . "/singlefile.php?cid=<{$report.download_cid}>&lid=<{$report.download_lid}>' target='_blank'><{$report.download_title}></a>
- <{/if}>
- </td>
- <td>
- <{if ($report.submitter_email) == ''}>
- <{$report.submitter_uname}>
- <{else}>
- <a href='mailto:<{$report.submitter_email}>'><{$report.submitter_uname}></a>
- <{/if}>
- </td>
- <td align='center'>
- <a href='?op=report.ignore&lid=' alt='' title=''>
- <img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_IGNOREDESC}>"
- alt="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_IGNOREDESC}>"/>
- </a>
- <a href='downloads.php?op=download.edit&lid=<{$report.download_lid}>' alt='' title=''>
- <img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_EDITDESC}>"
- alt="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_EDITDESC}>"/>
- </a>
- <a href='?op=report.delete&lid=<{$report.download_lid}>' alt='' title=''>
- <img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_DELETEDESC}>"
- alt="<{$smarty.const._AM_WFDOWNLOADS_BROKEN_DELETEDESC}>"/>
- </a>
- <a href='?op=reports.update&lid=<{$report.download_lid}>&ack=<{$report.acknowledged}>'
- alt='<{$smarty.const._AM_WFDOWNLOADS_BROKEN_ACK_ALT}>' title='<{$smarty.const._AM_WFDOWNLOADS_BROKEN_ACK_ALT}>'>
- <{if ($report.acknowledged)}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <{else}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{/if}>
- </a>
- <a href='?op=reports.update&lid=<{$report.download_lid}>&con=<{$report.confirmed}>'
- alt='<{$smarty.const._AM_WFDOWNLOADS_BROKEN_CONFIRM_ALT}>' title='<{$smarty.const._AM_WFDOWNLOADS_BROKEN_CONFIRM_ALT}>'>
- <{if ($report.confirmed)}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <{else}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{/if}>
- </a>
- </td>
- </tr>
- <{/foreach}>
- </table>
- <{$reports_pagenav}>
+ <table class='outer'>
+ <tr>
+ <th><{$smarty.const._AM_WFDOWNLOADS_BROKEN_ID}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_BROKEN_DATESUBMITTED}></th>...
[truncated message content] |
|
From: <be...@us...> - 2014-04-19 23:21:39
|
Revision: 12463
http://sourceforge.net/p/xoops/svn/12463
Author: beckmi
Date: 2014-04-19 23:21:34 +0000 (Sat, 19 Apr 2014)
Log Message:
-----------
Replacing Logical operators
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -300,7 +300,7 @@
// a) Are they actually changing the value of version, or is it the same?
// b) Are they actually modifying the record, or is this a new one?
// If both conditions are true, then trigger all three notifications related to modified records.
- if (!$thisIsANewRecord and ($download->getVar('version') != $version)) {
+ if (!$thisIsANewRecord && ($download->getVar('version') != $version)) {
// Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
$tags = array();
$tags['FILE_NAME'] = $title;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
$module_handler = xoops_gethandler('module');
$module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -27,7 +27,7 @@
* $options[1] = How many downloads are displayes
* Output : Returns the most recent or most popular downloads
*/
-defined("XOOPS_ROOT_PATH") or die('XOOPS root path not defined');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
* @param $options
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -27,7 +27,7 @@
* $options[1] = How many downloads are displayes
* Output : Returns the most recent or most popular downloads
*/
-defined("XOOPS_ROOT_PATH") or die('XOOPS root path not defined');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
* @param $options
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -25,7 +25,7 @@
* $breadcrumb->addLink( 'bread 3', 'index3.php' );
* echo $breadcrumb->render();
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
/**
* Class WfdownloadsBreadcrumb
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -38,7 +38,7 @@
* @author marcan <ma...@sm...>
* @link http://www.smartfactory.ca The SmartFactory
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
/**
* Class WfdownloadsTable
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
@@ -1311,8 +1311,8 @@
xoops_comment_delete((int) $this->wfdownloads->getModule()->mid(), (int) $download->getVar('lid'));
// Added Formulize module support (2006/05/04) jpc - start
- if (wfdownloads_checkModule('formulize')) {
- if (file_exists(XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php') AND $download->getVar('formulize_idreq') > 0) {
+ if (wfdownloads_checkModule('formulize')) { if (file_exists(XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php') && $download->getVar('formulize_idreq') > 0) {
+
include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
//deleteFormEntries(array($download->getVar('formulize_idreq')));
$category = $this->wfdownloads->getHandler('category')->get($download->getVar('cid'));
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -29,7 +29,7 @@
KEY mime_id (mime_id)
) ENGINE=MyISAM;
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
require_once XOOPS_ROOT_PATH . '/modules/wfdownloads/class/download.php';
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version $Id:$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
xoops_load('XoopsForm');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @author Harry Fuecks (PHP Anthology Volume II)
* @version $Id: session.php 10283 2012-11-28 13:39:36Z trabis $
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version $Id:$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once XOOPS_ROOT_PATH . '/class/tree.php';
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @author trabis <lus...@gm...>
* @version $Id:$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
/**
* Class WfdownloadsWfdownloads
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
/**
* Abstract base class for forms
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-19 23:21:34 UTC (rev 12463)
@@ -1,4 +1,5 @@
<b><u>=> Version 3.23 Beta (2014-04-19)</u></b>
+- replacing "or" with "||" (mamba)
- replaced template extensions from .html to .tpl (mamba)
- replaced Thickbox with MagnificPopup (mamba)
- fixed: source code for HTML5/CSS3 (mamba)
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__FILE__) . '/common.php';
// comment callback functions
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
// This must contain the name of the folder in which reside Wfdownloads
define("WFDOWNLOADS_DIRNAME", basename(dirname(dirname(__FILE__))));
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version svn:$id$
*/
-//defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+//defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
$mydirname = basename(dirname(dirname(__FILE__)));
@@ -98,7 +98,7 @@
{
$target = str_replace("..", "", $target);
// http://www.php.net/manual/en/function.mkdir.php
- return is_dir($target) or (self::createDirectory(dirname($target), $mode) and mkdir($target, $mode));
+ return is_dir($target) || (self::createDirectory(dirname($target), $mode) && mkdir($target, $mode));
}
/**
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version svn:$id$
*/
-//defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+//defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
$mydirname = basename(dirname(dirname(__FILE__)));
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(__FILE__) . '/common.php';
/**
@@ -1698,7 +1698,7 @@
// Create swish-e.conf
$file = "{$swisheDocPath}/swish-e.conf";
- $fp = fopen($file, 'w') or die("<BR><BR>Unable to open {$file}");
+ $fp = fopen($file, 'w') || die("<BR><BR>Unable to open {$file}");
$line = "IndexDir {$swisheDocPath}/\n";
fputs($fp, $line);
$line = "IndexFile {$swisheDocPath}/index.swish-e\n";
@@ -1784,7 +1784,7 @@
// Opens a pipe to swish-e
$pipe_handler = popen("{$swish} -w {$search_query} -f {$search_index} {$search_params}", "r")
- or die("The search request generated an error...Please try again.");
+ || die("The search request generated an error...Please try again.");
//print "$swish -w $search_query -f $search_index $search_params<BR>";
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/class/dbupdater.php");
include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/include/common.php");
@include_once(XOOPS_ROOT_PATH . "/modules/wfdownloads/language/" . $xoopsConfig['language'] . "/admin.php");
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -18,7 +18,7 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die('XOOPS root path not defined');
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
include_once dirname(dirname(__FILE__)) . '/include/common.php';
/**
* @param $queryArray
@@ -56,7 +56,7 @@
// because count() returns 1 even if a supplied variable
// is not an array, we must check if $querryarray is really an array
$queryArray_count = 0;
- if ((is_array($queryArray) && $queryArray_count = count($queryArray)) OR $userId != 0) {
+ if ((is_array($queryArray) && $queryArray_count = count($queryArray)) || $userId != 0) {
// $userId != 0 added August 13 2007 -- ACCOUNTS FOR CASES WHERE THERE ARE NO QUERY TERMS BUT A USER ID IS PASSED -- FREEFORM SOLUTIONS
if ($queryArray_count == 0) {
$queryArray_count
@@ -98,7 +98,7 @@
}
// Set criteria for the captions that the user can see if necessary
- if (is_array($fids) AND count($fids) > 0) {
+ if (is_array($fids) && count($fids) > 0) {
$formulizeElementCriteria = new CriteriaCompo();
$formulizeElementCriteria->add(new Criteria('ele_display', 1), 'OR');
foreach ($userGroups as $group) {
@@ -165,7 +165,7 @@
}
// Make a criteria object that includes the custom form ids that were found, if any
- if (count($saved_ids) > 0 AND is_array($saved_ids)) {
+ if (count($saved_ids) > 0 && is_array($saved_ids)) {
$subs_plus_custom = new CriteriaCompo(new Criteria('formulize_idreq', '(' . implode(',', $saved_ids) . ')', 'IN'));
$subs_plus_custom->add($allSubCriterias, 'OR');
$queryCriteria->add($subs_plus_custom);
@@ -220,10 +220,10 @@
$storedLids = array();
// foreach (array_keys($downloads) as $i)
- for ($x = $offset; ($i < $limit AND $x < count($limitOffsetIndex)); ++$x) {
+ for ($x = $offset; ($i < $limit && $x < count($limitOffsetIndex)); ++$x) {
$lid = $limitOffsetIndex[$x];
$obj = $downloads[$lid];
- if (is_object($obj) AND !isset($storedLids[$lid])) {
+ if (is_object($obj) && !isset($storedLids[$lid])) {
$storedLids[$lid] = true;
$ret[$i]['image'] = "assets/images/size2.gif";
$ret[$i]['link'] = "singlefile.php?cid=" . $obj->getVar('cid') . "&lid={$lid}";
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -172,7 +172,7 @@
// Foreach subcategory
foreach (array_keys($allSubcategories) as $k) {
if (in_array($allSubcategories[$k]->getVar('cid'), $allowedDownCategoriesIds)) {
- $publishdate = (isset($listings['published'][$allSubcategories[$k]->getVar('cid')]) AND
+ $publishdate = (isset($listings['published'][$allSubcategories[$k]->getVar('cid')]) &&
$listings['published'][$allSubcategories[$k]->getVar('cid')] > $publishdate)
? $listings['published'][$allSubcategories[$k]->getVar('cid')] : $publishdate;
}
@@ -214,7 +214,7 @@
if (in_array($allSubcategories[$k]->getVar('cid'), $allowedDownCategoriesIds)) {
$download_count += isset($listings['count'][$allSubcategories[$k]->getVar('cid')])
? $listings['count'][$allSubcategories[$k]->getVar('cid')] : 0;
- if ($wfdownloads->getConfig('subcats') == 1 AND $allSubcategories[$k]->getVar('pid') == $mainCategories[$i]->getVar('cid')) {
+ if ($wfdownloads->getConfig('subcats') == 1 && $allSubcategories[$k]->getVar('pid') == $mainCategories[$i]->getVar('cid')) {
// if we are collecting subcat info for displaying, and this subcat is a first level child...
$subcategories[] = array(
'id' => $allSubcategories[$k]->getVar('cid'), // this definition is not removed for backward compatibility issues
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -369,7 +369,7 @@
// If both conditions are true, then trigger all three notifications related to modified records.
$version = !empty($_POST["version"]) ? trim($_POST["version"]) : 0;
- if (!$isANewRecord and ($download->getVar('version') != $version)) {
+ if (!$isANewRecord && ($download->getVar('version') != $version)) {
// Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
$tags = array();
$tags['FILE_NAME'] = $title;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php 2014-04-19 19:30:53 UTC (rev 12462)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php 2014-04-19 23:21:34 UTC (rev 12463)
@@ -19,7 +19,7 @@
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
$modversion['name'] = _MI_WFDOWNLOADS_NAME;
$modversion['version'] = 3.23;
|
|
From: <be...@us...> - 2014-04-19 19:30:58
|
Revision: 12462
http://sourceforge.net/p/xoops/svn/12462
Author: beckmi
Date: 2014-04-19 19:30:53 +0000 (Sat, 19 Apr 2014)
Log Message:
-----------
replacing template extensions from .html to .tpl
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/newlist.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/rss.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/topten.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/viewcat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/visit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_mimetypeslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_permissions.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_new.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_top.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_top_by_cat.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_brokenfile.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_letterschoice.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_disclaimer.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_download.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_footer.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_header.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_index.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_mirrors.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_newlistindex.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_ratefile.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_reviews.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_singlefile.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_submit.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_topten.tpl
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_viewcat.tpl
Removed Paths:
-------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_mimetypeslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_permissions.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_new.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_top.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/blocks/wfdownloads_block_top_by_cat.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_brokenfile.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_letterschoice.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_disclaimer.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_download.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_footer.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_header.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_mirrors.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_newlistindex.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_ratefile.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_reviews.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_singlefile.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_submit.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_topten.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_viewcat.html
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -241,7 +241,7 @@
$sorted_categories = wfdownloads_sortCategories();
$GLOBALS['xoopsTpl']->assign('sorted_categories', $sorted_categories);
$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_categorieslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_categorieslist.tpl");
} else {
redirect_header("{$currentFile}?op=category.add", 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -794,7 +794,7 @@
} else {
// NOP
}
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_downloadslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_downloadslist.tpl");
include 'admin_footer.php';
break;
@@ -859,7 +859,7 @@
}
}
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_ip_logslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_ip_logslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -216,9 +216,7 @@
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path, 0777, $redirectFile));
$indexAdmin->addConfigBoxLine(FileChecker::getFileStatus($path . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path . 'thumbs' . '/', 0777, $redirectFile));
-$indexAdmin->addConfigBoxLine(
- FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile)
-);
+$indexAdmin->addConfigBoxLine(FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine('');
@@ -226,9 +224,7 @@
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path, 0777, $redirectFile));
$indexAdmin->addConfigBoxLine(FileChecker::getFileStatus($path . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path . 'thumbs' . '/', 0777, $redirectFile));
-$indexAdmin->addConfigBoxLine(
- FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile)
-);
+$indexAdmin->addConfigBoxLine(FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile));
//---------------------------
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -218,7 +218,7 @@
$GLOBALS['xoopsTpl']->assign('allowAdminMimetypes', $allowAdminMimetypes);
$GLOBALS['xoopsTpl']->assign('allowUserMimetypes', $allowUserMimetypes);
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_mimetypeslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_mimetypeslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -190,7 +190,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_mirrorslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_mirrorslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/permissions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/permissions.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/permissions.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -45,6 +45,6 @@
$GLOBALS['xoopsTpl']->assign('down_cat_form', $down_cat_form->render());
$GLOBALS['xoopsTpl']->assign('up_cat_form', $up_cat_form->render());
-$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_permissions.html");
+$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_permissions.tpl");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/ratings.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/ratings.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/ratings.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -83,7 +83,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_ratingslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_ratingslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -404,7 +404,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_reportsmodificationslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_reportsmodificationslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -202,7 +202,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_reviewslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_reviewslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -120,7 +120,7 @@
}
}
} else {
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_brokenfile.html";
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_brokenfile.tpl";
include XOOPS_ROOT_PATH . '/header.php';
// Begin Main page Heading etc
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -69,7 +69,7 @@
require_once $GLOBALS['xoops']->path('class/template.php');
$breadcrumbTpl = new XoopsTpl();
$breadcrumbTpl->assign('breadcrumb', $this->_bread);
- $html = $breadcrumbTpl->fetch("db:" . $this->dirname . "_common_breadcrumb.html");
+ $html = $breadcrumbTpl->fetch("db:" . $this->dirname . "_common_breadcrumb.tpl");
unset($breadcrumbTpl);
return $html;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -117,7 +117,7 @@
}
break;
case "html":
- $types = "[.htm|.html|.xhtml|.php|.php3|.phtml|.txt]";
+ $types = "[.htm|.html|.xhtml|.php|.php3|.phtml|.txt|.tpl]";
if ($noselection) {
$filelist[""] = "No Selection";
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-19 19:30:53 UTC (rev 12462)
@@ -1,4 +1,5 @@
-<b><u>=> Version 3.23 Beta (2014-04-14)</u></b>
+<b><u>=> Version 3.23 Beta (2014-04-19)</u></b>
+- replaced template extensions from .html to .tpl (mamba)
- replaced Thickbox with MagnificPopup (mamba)
- fixed: source code for HTML5/CSS3 (mamba)
- moved module.css, and /js and /images to /assets folder (mamba)
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -22,7 +22,8 @@
//defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-xoops_loadLanguage('directorychecker', 'wfdownloads');
+$mydirname = basename(dirname(dirname(__FILE__)));
+xoops_loadLanguage('directorychecker', $mydirname);
/**
* Class DirectoryChecker
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -22,7 +22,8 @@
//defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-xoops_loadLanguage('filechecker', 'wfdownloads');
+$mydirname = basename(dirname(dirname(__FILE__)));
+xoops_loadLanguage('filechecker', $mydirname);
/**
* Class FileChecker
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -364,7 +364,7 @@
$letterschoiceTpl = new XoopsTpl();
$letterschoiceTpl->caching = false; // Disable cache
$letterschoiceTpl->assign('alphabet', $alphabet_array);
- $html = $letterschoiceTpl->fetch("db:" . $wfdownloads->getModule()->dirname() . "_common_letterschoice.html");
+ $html = $letterschoiceTpl->fetch("db:" . $wfdownloads->getModule()->dirname() . "_common_letterschoice.tpl");
unset($letterschoiceTpl);
return $html;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -45,7 +45,7 @@
$allowedDownCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
$allowedUpCategoriesIds = $gperm_handler->getItemIds('WFUpCatPerm', $groups, $wfdownloads->getModule()->mid());
-$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_index.html";
+$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_index.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -68,7 +68,7 @@
case "list" : // this case is not removed for backward compatibility issues
$start = WfdownloadsRequest::getInt('start', 0);
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_mirrors.html";
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_mirrors.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/newlist.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/newlist.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/newlist.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -21,7 +21,7 @@
$currentFile = basename(__FILE__);
include 'header.php';
-$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_newlistindex.html";
+$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_newlistindex.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -116,7 +116,7 @@
echo $rating->getHtmlErrors();
}
} else {
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_ratefile.html";
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_ratefile.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -68,7 +68,7 @@
case "list" : // this care is not removed for backward compatibility issues
$start = WfdownloadsRequest::getInt('start', 0);
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_reviews.html";
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_reviews.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/rss.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/rss.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/rss.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -28,7 +28,7 @@
$feed_type = 'rss';
$contents = ob_get_clean();
header('Content-Type:text/xml; charset=utf-8');
-$xoopsOption['template_main'] = 'system_' . $feed_type . '.html';
+$xoopsOption['template_main'] = 'system_' . $feed_type . '.tpl';
error_reporting(0);
include_once(XOOPS_ROOT_PATH . "/class/template.php");
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -58,7 +58,7 @@
}
// Load Template
-$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_singlefile.html";
+$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_singlefile.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-19 19:30:53 UTC (rev 12462)
@@ -71,7 +71,7 @@
switch ($op) {
case "download.disclaimer" :
// Show disclaimers
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_disclaimer.html";
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_disclaimer.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
@@ -168,7 +168,7 @@
$sform = $download->getForm();
}
- $xoopsOption['template_main'] = 'wfdownloads_submit.html';
+ $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_submit.tpl";
include XOOPS_ROOT_PATH . '/header.php';
$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/index.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/index.html (rev 0)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/index.html 2014-04-19 19:30:53 UTC (rev 12462)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Deleted: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html 2014-04-19 19:30:53 UTC (rev 12462)
@@ -1,46 +0,0 @@
-<form action="categories.php" method="post" id="categoriesform">
- <fieldset>
- <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_CATEGORIES_LIST}></legend>
- <table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_WEIGHT}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_DESCRIPTION}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_ACTION}></th>
- </tr>
- <{foreach item=sorted_category from=$sorted_categories}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$sorted_category.category.cid}></td>
- <td>
- <{section name=indent loop=$sorted_category.level-1 step=1}}>-<{/section}>
- <a href='../viewcat.php?cid=<{$sorted_category.category.cid}>'><{$sorted_category.category.title}></a>
- </td>
- <td>
- <input type="text" name="new_weights[<{$sorted_category.category.cid}>]" size="5" maxlength="5"
- value="<{$sorted_category.category.weight}>"/>
- </td>
- <td><{$sorted_category.category.description}></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_WFDOWNLOADS_BMOVE}>"><img
- src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"
- alt="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"/></a>
- </td>
- </tr>
- <{/foreach}>
- <tr>
- <td colspan="1"> </td>
- <td>
- <{$token}>
- <input type="hidden" name="op" value="categories.reorder"/>
- <input type="submit" name="submit" value="<{$smarty.const._AM_WFDOWNLOADS_BUTTON_CATEGORIES_REORDER}>"/>
- </td>
- <td colspan="2"> </td>
- </tr>
- </table>
- </fieldset>
-</form>
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl (rev 0)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.tpl 2014-04-19 19:30:53 UTC (rev 12462)
@@ -0,0 +1,46 @@
+<form action="categories.php" method="post" id="categoriesform">
+ <fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_CATEGORIES_LIST}></legend>
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_ID}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_WEIGHT}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_DESCRIPTION}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_ACTION}></th>
+ </tr>
+ <{foreach item=sorted_category from=$sorted_categories}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td><{$sorted_category.category.cid}></td>
+ <td>
+ <{section name=indent loop=$sorted_category.level-1 step=1}}>-<{/section}>
+ <a href='../viewcat.php?cid=<{$sorted_category.category.cid}>'><{$sorted_category.category.title}></a>
+ </td>
+ <td>
+ <input type="text" name="new_weights[<{$sorted_category.category.cid}>]" size="5" maxlength="5"
+ value="<{$sorted_category.category.weight}>"/>
+ </td>
+ <td><{$sorted_category.category.description}></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_WFDOWNLOADS_BMOVE}>"><img
+ src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"
+ alt="<{$smarty.const._AM_WFDOWNLOADS_BMOVE}>"/></a>
+ </td>
+ </tr>
+ <{/foreach}>
+ <tr>
+ <td colspan="1"> </td>
+ <td>
+ <{$token}>
+ <input type="hidden" name="op" value="categories.reorder"/>
+ <input type="submit" name="submit" value="<{$smarty.const._AM_WFDOWNLOADS_BUTTON_CATEGORIES_REORDER}>"/>
+ </td>
+ <td colspan="2"> </td>
+ </tr>
+ </table>
+ </fieldset>
+</form>
Deleted: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2014-04-19 16:36:55 UTC (rev 12461)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html 2014-04-19 19:30:53 UTC (rev 12462)
@@ -1,327 +0,0 @@
-<form action="downloads.php" method="post" id="downloadsform">
-<fieldset>
- <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHEDDOWN}></legend>
- <{if ($published_downloads_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
- <{else}>
- <table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
-
- <form id='form_filter' enctype='multipart/form-data' method='post' action='' name='form_filter'>
- <tr>
- <td> </td>
- <td>
- <select id='filter_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_title_condition' size='1'>
- <option value='='
- <{if $filter_title_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
- <option value='LIKE'
- <{if $filter_title_condition == 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
- </select>
- <input id='filter_title' type='text' value='<{$filter_title}>' maxlength='100' size='15' title='' name='filter_title'>
- </td>
- <td>
- <select id='filter_category_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>'
- name='filter_category_title_condition' size='1'>
- <option value='='
- <{if $filter_category_title_condition ==
- '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
- <option value='LIKE'
- <{if $filter_category_title_condition ==
- 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
- </select>
- <input id='filter_category_title' type='text' value='<{$filter_category_title}>' maxlength='100' size='15' title=''
- name='filter_category_title'>
- </td>
- <td><{$filter_submitter_select}></td>
- <td>
- <{*
- <select id='filter_date_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_date_condition' size='1'>
- <option value='='
- <{if $filter_date_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
- <option value='>'
- <{if $filter_date_condition == '>'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_GREATERTHAN}></option>
- <option value='<'
- <{if $filter_date_condition == '<'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_LESSTHAN}></option>
- </select>
- <{$filter_date_select}>
- *}>
- </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td align='center'>
- <input id='submit' class='formButton' type='submit' title='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>'
- value='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>' name='submit'>
- </td>
- </tr>
- <input id='op' type='hidden' value='downloads.filter' name='op'>
- </form>
-
- <{foreach item=download from=$published_downloads}>
- <tr class="<{cycle values='even, odd'}>">
- <td align='center'><{$download.lid}></td>
- <td>
- <a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a>
- </td>
- <td>
- <a href='../viewcat.php?cid=<{$download.cid}>'><{$download.category_title}></a>
- </td>
- <td><{$download.submitter_uname}></td>
- <td><{$download.published_timestamp}></td>
- <td align='center'>
- <{if $download.offline}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{else}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <{/if}>
- </td>
- <td align='center'>
- <{if $download.published}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <!--<{$download.published_timestamp}>-->
- <{else}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{/if}>
- </td>
- <td>
- <a href='?op=ip_logs.list&lid=<{$download.lid}>' title="<{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}>"><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a>
- </td>
- <td align='center'>
- <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
- title="<{$smarty.const._EDIT}>"
- alt="<{$smarty.const._EDIT}>"/></a>
- <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>
- </tr>
- <{/foreach}>
- </table>
- <{$published_downloads_pagenav}>
- <{/if}>
-</fieldset>
-
-<br />
-
-<fieldset>
- <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_NEWDOWN}></legend>
- <{if ($new_downloads_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
- <{else}>
- <table class='outer'>
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
- <{foreach item=new_download from=$new_downloads}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$new_download.lid}></td>
- <td><{$new_download.title}></td>
- <td><{$new_download.category_title}></td>
- <td><{$new_download.submitter_uname}></td>
- <td><{$new_download.date_timestamp}></td>
- <td align='center'>
- <a href='?op=newdownload.approve&lid=<{$new_download.lid}>' title="<{$smarty.const._AM_WFDOWNLOADS_BAPPROVE}>"><img
- src="<{xoModuleIcons16 1.png}>" title="<{$smarty.const._AM_WFDOWNLOADS_BAPPROVE}>"
- alt="<{$smarty.const._AM_WFDOWNLOADS_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>
- </tr>
- <{/foreach}>
- </table>
- <{$newdownloads_pagenav}>
- <{/if}>
-</fieldset>
-
-<br />
-
-<fieldset>
- <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_AUTOPUBLISHEDDOWN}></legend>
- <br />
- <{if ($autopublished_downloads_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
- <{else}>
- <table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
- <{foreach item=download from=$autopublished_downloads}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$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 align='center'>
- <{if $download.offline}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{else}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <{/if}>
- </td>
- <td align='center'>
- <{if $download.published}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <!--<{$download.published_timestamp}>-->
- <{else}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{/if}>
- </td>
- <td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a></td>
- <td align='center'>
- <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
- title="<{$smarty.const._EDIT}>"
- alt="<{$smarty.const._EDIT}>"/></a>
- <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>
- </tr>
- <{/foreach}>
- </table>
- <{$autopublished_downloads_pagenav}>
- <{/if}>
-</fieldset>
-
-<br />
-
-<fieldset>
- <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_EXPIREDDOWN}></legend>
- <br />
- <{if ($expired_downloads_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
- <{else}>
- <table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
- <{foreach item=download from=$expired_downloads}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$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 align='center'>
- <{if $download.offline}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{else}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <{/if}>
- </td>
- <td align='center'>
- <{if $download.published}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <!--<{$download.published_timestamp}>-->
- <{else}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{/if}>
- </td>
- <td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a></td>
- <td align='center'>
- <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
- title="<{$smarty.const._EDIT}>"
- alt="<{$smarty.const._EDIT}>"/></a>
- <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>
- </tr>
- <{/foreach}>
- </table>
- <{$expired_downloads_pagenav}>
- <{/if}>
-</fieldset>
-
-<br />
-
-<fieldset>
- <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_OFFLINEDOWN}></legend>
- <br/>
- <{if ($offline_downloads_count == 0)}>
- <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
- <{else}>
- <table class="outer">
- <tr>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
- <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
- </tr>
- <{foreach item=download from=$offline_downloads}>
- <tr class="<{cycle values='even, odd'}>">
- <td><{$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 align='center'>
- <{if $download.offline}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{else}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <{/if}>
- </td>
- <td align='center'>
- <{if $download.published}>
- <img src="<{xoModuleIcons16 1.png}>"/>
- <!--<{$download.published_timestamp}>-->
- <{else}>
- <img src="<{xoModuleIcons16 0.png}>"/>
- <{/if}>
- </td>
- <td><a href='ip_logs.php?lid=<{$download.lid}>'><{$smarty.const._AM_WFDOWNLOADS_IP_LOGS}></a></td>
- <td align='center'>
- <a href='?op=download.add&lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>"
- title="<{$smarty.const._EDIT}>"
- alt="<{$smarty.const._EDIT}>"/></a>
- <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>
- </tr>
- <{/foreach}>
- </table>
- <{$offline_downloads_pagenav}>
- <{/if}>
-</fieldset>
-</form>
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl (rev 0)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.tpl 2014-04-19 19:30:53 UTC (rev 12462)
@@ -0,0 +1,327 @@
+<form action="downloads.php" method="post" id="downloadsform">
+<fieldset>
+ <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHEDDOWN}></legend>
+ <{if ($published_downloads_count == 0)}>
+ <{$smarty.const._AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND}>
+ <{else}>
+ <table class="outer">
+ <tr>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_PUBLISHED}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_LOG}></th>
+ <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ACTION}></th>
+ </tr>
+
+ <form id='form_filter' enctype='multipart/form-data' method='post' action='' name='form_filter'>
+ <tr>
+ <td> </td>
+ <td>
+ <select id='filter_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_title_condition' size='1'>
+ <option value='='
+ <{if $filter_title_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
+ <option value='LIKE'
+ <{if $filter_title_condition == 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
+ </select>
+ <input id='filter_title' type='text' value='<{$filter_title}>' maxlength='100' size='15' title='' name='filter_title'>
+ </td>
+ <td>
+ <select id='filter_category_title_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>'
+ name='filter_category_title_condition' size='1'>
+ <option value='='
+ <{if $filter_category_title_condition ==
+ '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
+ <option value='LIKE'
+ <{if $filter_category_title_condition ==
+ 'LIKE'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_CONTAINS}></option>
+ </select>
+ <input id='filter_category_title' type='text' value='<{$filter_category_title}>' maxlength='100' size='15' title=''
+ name='filter_category_title'>
+ </td>
+ <td><{$filter_submitter_select}></td>
+ <td>
+ <{*
+ <select id='filter_date_condition' title='<{$smarty.const._AM_WFDOWNLOADS_SEARCH}>' name='filter_date_condition' size='1'>
+ <option value='='
+ <{if $filter_date_condition == '='}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_EQUAL}></option>
+ <option value='>'
+ <{if $filter_date_condition == '>'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_GREATERTHAN}></option>
+ <option value='<'
+ <{if $filter_date_condition == '<'}>selected='selected'<{/if}>><{$smarty.const._AM_WFDOWNLOADS_SEARCH_LESSTHAN}></option>
+ </select>
+ <{$filter_date_select}>
+ *}>
+ </td>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ <td align='center'>
+ <input id='submit' class='formButton' type='submit' title='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>'
+ value='<{$smarty.const._AM_WFDOWNLOADS_FILTER}>' name='submit'>
+ </td>
+ </tr>
+ <input id='op' type='hidden' value='downloads.filter' name='op'>
+ </form>
+
+ <{foreach item=download from=$published_downloads}>
+ <tr class="<{cycle values='even, odd'}>">
+ <td align='center'><{$download.lid}></td>
+ <td>
+ <a href='../singlefile.php?cid=<{$download.cid}>&lid=<{$download.lid}>'><{$download.title}></a>
+ </td>
+ <td>
+ <a href='../viewcat.php?cid=<{$download.cid}>'><{$download.category_title}></a>
+ </td>
+ <td><{$download.submitter_uname}></td>
+ <td><{$download.published_timestamp}></td>
+ <td align='center'>
+ <{if $download.offline}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{else}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <{/if}>
+ </td>
+ <td align='center'>
+ <{if $download.published}>
+ <img src="<{xoModuleIcons16 1.png}>"/>
+ <!--<{$download.published_timestamp}>-->
+ <{else}>
+ <img src="<{xoModuleIcons16 0.png}>"/>
+ <{/if}>
+ </td>
+ <td>
+ <a href='?op=ip_logs.list&lid=<{$download.lid}>' title="<{$smarty.const._AM_WFDOWN...
[truncated message content] |
|
From: <txm...@us...> - 2014-04-19 16:37:01
|
Revision: 12461
http://sourceforge.net/p/xoops/svn/12461
Author: txmodxoops
Date: 2014-04-19 16:36:55 +0000 (Sat, 19 Apr 2014)
Log Message:
-----------
Updated
Pleace Mamba, Test for http://xoops.org/modules/newbb/viewtopic.php?post_id=357443
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -26,6 +26,7 @@
} else {
$modules =& $modulesHandler;
}
+$mod_name = $modules->getVar('mod_name');
$from_dir = TDMC_UPLOAD_MODULES_PATH.'/'.strtolower($mod_name);
$to_dir = XOOPS_ROOT_PATH.'/modules/'.strtolower($mod_name);
switch ($op) {
@@ -33,7 +34,9 @@
$template_main = 'tdmcreate_building.html';
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));
// Clear repertory of new module if there are
- TDMCreate_clearDir(TDMC_UPLOAD_MODULES_PATH . '/' . $modules->getVar('mod_name'));
+ TDMCreate_clearDir($from_dir);
+ // Clear repertory of new module if there are in root/modules
+ TDMCreate_clearDir($to_dir);
// Debut
/************************************************/
/*Structure*/
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -27,7 +27,7 @@
$table_nbfields = TDMCreate_CleanVars($_REQUEST, 'table_nbfields');
$table_fieldname = TDMCreate_CleanVars($_REQUEST, 'table_fieldname', '', 'string');
// Get field Variables
-$field_id = TDMCreate_CleanVars($_REQUEST, 'field_id', 0);
+$field_id = TDMCreate_CleanVars($_REQUEST, 'field_id');
$field_mid = TDMCreate_CleanVars($_REQUEST, 'field_mid');
$field_tid = TDMCreate_CleanVars($_REQUEST, 'field_tid');
$field_numb = TDMCreate_CleanVars($_REQUEST, 'field_numb');
@@ -58,6 +58,7 @@
// Get the list of tables
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('table_mid', $table_mid));
+ $criteria->add(new Criteria('table_id', $table_id));
$criteria->setSort('table_id ASC, table_name');
$criteria->setOrder('ASC');
$nb_tables = $tablesHandler->getCount($criteria);
@@ -85,7 +86,7 @@
$table['permissions'] = $tables_arr[$t]->getVar('table_permissions');
// Get the list of tables
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_mid', $field_mid));
+ $criteria->add(new Criteria('field_mid', $table_mid));
$criteria->add(new Criteria('field_tid', $t));
$criteria->setSort('field_id ASC, field_name');
$criteria->setOrder('ASC');
@@ -136,43 +137,49 @@
case 'save':
if ( !$GLOBALS['xoopsSecurity']->check() ) {
redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($field_id)) {
+ }
+
+ if (isset($field_id)) {
$obj =& $fieldsHandler->get($field_id);
} else {
$obj =& $fieldsHandler->create();
- }
- $datas = array();
- for( $i = 0; $i < $table_nbfields; $i++ ) {
- $datas = array('field_mid' => $table_mid[$i],
- 'field_tid' => $table_id[$i],
- 'field_numb' => $table_nbfields[$i],
- 'field_name' => $_POST['field_name'][$i],
- 'field_type' => $_POST['field_type'][$i],
- 'field_value' => $_POST['field_value'][$i],
- 'field_attribute' => $_POST['field_attribute'][$i],
- 'field_null' => $_POST['field_null'][$i],
- 'field_default' => $_POST['field_default'][$i],
- 'field_key' => $_POST['field_key'][$i],
- 'field_autoincrement' => (($_REQUEST['field_autoincrement'][$i] == 1) ? '1' : '0'),
- 'field_element' => $_POST['field_element'][$i],
- 'field_inlist' => (($_REQUEST['field_inlist'][$i] == 1) ? '1' : '0'),
- 'field_inform' => (($_REQUEST['field_inform'][$i] == 1) ? '1' : '0'),
- 'field_admin' => (($_REQUEST['field_admin'][$i] == 1) ? '1' : '0'),
- 'field_user' => (($_REQUEST['field_user'][$i] == 1) ? '1' : '0'),
- 'field_block' => (($_REQUEST['field_block'][$i] == 1) ? '1' : '0'),
- 'field_main' => (($i == $_REQUEST['field_main']) ? '1' : '0'),
- 'field_search' => (($_REQUEST['field_search'][$i] == 1) ? '1' : '0'),
- 'field_required' => (($_REQUEST['field_required'][$i] == 1) ? '1' : '0')
- );
-
- }
- foreach ($datas as $data => $value) {
- $obj->setVars(array($data, $value));
+ }
+ if ($table_nbfields > 0) {
+ $datas = array();
+ for( $i = 0; $i < $table_nbfields; $i++ ) {
+ $datas[$i] = array('field_mid' => $table_mid[$i],
+ 'field_tid' => $table_id[$i],
+ 'field_numb' => $table_nbfields[$i],
+ 'field_name' => $_POST['field_name'][$i],
+ 'field_type' => $_POST['field_type'][$i],
+ 'field_value' => $_POST['field_value'][$i],
+ 'field_attribute' => $_POST['field_attribute'][$i],
+ 'field_null' => $_POST['field_null'][$i],
+ 'field_default' => $_POST['field_default'][$i],
+ 'field_key' => $_POST['field_key'][$i],
+ 'field_autoincrement' => (($_REQUEST['field_autoincrement'][$i] == 1) ? '1' : '0'),
+ 'field_element' => $_POST['field_element'][$i],
+ 'field_inlist' => (($_REQUEST['field_inlist'][$i] == 1) ? '1' : '0'),
+ 'field_inform' => (($_REQUEST['field_inform'][$i] == 1) ? '1' : '0'),
+ 'field_admin' => (($_REQUEST['field_admin'][$i] == 1) ? '1' : '0'),
+ 'field_user' => (($_REQUEST['field_user'][$i] == 1) ? '1' : '0'),
+ 'field_block' => (($_REQUEST['field_block'][$i] == 1) ? '1' : '0'),
+ 'field_main' => (($i == $_REQUEST['field_main']) ? '1' : '0'),
+ 'field_search' => (($_REQUEST['field_search'][$i] == 1) ? '1' : '0'),
+ 'field_required' => (($_REQUEST['field_required'][$i] == 1) ? '1' : '0')
+ );
+ }
+ foreach ($datas as $data => $value) {
+ $obj->setVars(array($data, $value));
+ $fieldsHandler->insert($obj);
+ }
+ }
+ if ($obj->isNew()) {
+ redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_SAVED_OK, $_REQUEST['table_name']));
+ } else {
+ redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_UPDATED_OK, $_REQUEST['table_name']));
}
- if ($fieldsHandler->insert($obj)) {
- redirect_header('fields.php', 2, _AM_TDMCREATE_FORMOK);
- }
+ //
$GLOBALS['xoopsTpl']->assign('error', $obj->getHtmlErrors());
$form = $obj->getForm($field_mid, $field_tid, $field_numb, $field_name);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -137,7 +137,7 @@
} else {
$obj =& $tablesHandler->create();
}
- // Verification if name table exist
+ // Checking if table name exist
$table_name_search = $tablesHandler->getObjects(null);
foreach (array_keys($table_name_search) as $t)
{
@@ -188,9 +188,9 @@
if( $obj->isNew() ) {
$table_iid = $GLOBALS['xoopsDB']->getInsertId();
$table_action = '&field_mid='.$table_mid.'&field_tid='.$table_iid.'&field_numb='.$table_nbfields.'&field_name='.$table_fieldname;
- redirect_header('fields.php?op=new'.$table_action, 3, _AM_TDMCREATE_FORMOK);
+ redirect_header('fields.php?op=new'.$table_action, 3, sprintf(_AM_TDMCREATE_TABLE_FORM_SAVED_OK, $_POST['table_name']));
} else {
- redirect_header('tables.php', 3, _AM_TDMCREATE_FORMOK);
+ redirect_header('tables.php', 3, sprintf(_AM_TDMCREATE_TABLE_FORM_UPDATED_OK, $_POST['table_name']));
}
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -132,7 +132,7 @@
// Index ID
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$i.'</td>'));
// Field Name
- $field_name = $isNew ? $f_name . '_' : $this->getVar('field_name');
+ $field_name = $isNew ? (!empty($f_name) ? $f_name . '_' : '') : $this->getVar('field_name');
$field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$i.']', 15, 255, $field_name);
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
// Field Type
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -152,6 +152,8 @@
define('_AM_TDMCREATE_TABLE_PERMISSIONS', "Permissions for this table");
// v1.38
define('_AM_TDMCREATE_TABLE_IMAGE_DESC', "<span class='red bold'>WARNING</span>: If you want to choose a new image, is best to name it with the module name before and follow with the name of the image so as not to overwrite any images with the same name, in the <span class='bold'>Frameworks/moduleclasses/moduleadmin/icons/32/</span>. Otherwise an other solution, would be to insert the images in the module, a new folder is created, with the creation of the same module - <span class='bold'>images/32</span>.");
+define('_AM_TDMCREATE_TABLE_FORM_SAVED_OK', "The table <b class='green'>%s</b> is successfully saved");
+define('_AM_TDMCREATE_TABLE_FORM_UPDATED_OK', "The table <b class='green'>%s</b> is successfully updated");
//Form2
define('_AM_TDMCREATE_FIELD_ADD', "Add fields");
@@ -177,6 +179,9 @@
define('_AM_TDMCREATE_FIELD_REQUIRED', "Field: Required");
define('_AM_TDMCREATE_ADMIN_SUBMIT', "Send");
+define('_AM_TDMCREATE_FIELD_FORM_SAVED_OK', "Fields of table %s successfully saved");
+define('_AM_TDMCREATE_FIELD_FORM_UPDATED_OK', "Fields of table %s successfully updated");
+
//Modules.php
//Form
define('_AM_TDMCREATE_MODULES_ADD', "Add a new module");
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php 2014-04-18 16:11:12 UTC (rev 12460)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php 2014-04-19 16:36:55 UTC (rev 12461)
@@ -411,5 +411,5 @@
$modversion['config'][$i]['description'] = "";
$modversion['config'][$i]['formtype'] = "textbox";
$modversion['config'][$i]['valuetype'] = "text";
-$modversion['config'][$i]['default'] = '12443';
+$modversion['config'][$i]['default'] = '12458';
unset($i);
\ No newline at end of file
|
|
From: <luc...@us...> - 2014-04-18 16:11:15
|
Revision: 12460
http://sourceforge.net/p/xoops/svn/12460
Author: luciorota
Date: 2014-04-18 16:11:12 +0000 (Fri, 18 Apr 2014)
Log Message:
-----------
fixed bug when using formulize
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -99,7 +99,7 @@
$imgurl = (isset($_POST["imgurl"]) && $_POST["imgurl"] != "blank.png") ? $myts -> addslashes($_POST["imgurl"]) : "";
}
// Formulize module support (2006/05/04) jpc
- if (wfdownloads_checkModule('formulize') < 300) {
+ if (wfdownloads_checkModule('formulize')) {
$formulize_fid = (isset($_POST["formulize_fid"])) ? (int) $_POST["formulize_fid"] : 0;
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -84,7 +84,7 @@
$customArray['fid'] = $fid;
$customArray['formulize_mgr'] =& xoops_getmodulehandler('elements', 'formulize');
$customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues(
+ $customArray['prevEntry'] = getEntryValues( // is a 'formulize' function
$download->getVar('formulize_idreq'),
$customArray['formulize_mgr'],
$customArray['groups'],
@@ -94,9 +94,9 @@
$customArray['go_back'] = "";
$customArray['parentLinks'] = "";
if (wfdownloads_checkModule('formulize') < 300) {
- $owner = getEntryOwner($entry);
+ $owner = getEntryOwner($entry); // is a 'formulize' function
} else {
- $owner = getEntryOwner($entry, $fid);
+ $owner = getEntryOwner($entry, $fid); // is a 'formulize' function
}
$ownerGroups = $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $ownerGroups;
@@ -420,9 +420,9 @@
$entries[$fid][0] = $download->getVar('formulize_idreq');
if ($entries[$fid][0]) {
if (wfdownloads_checkModule('formulize') < 300) {
- $owner = getEntryOwner($entries[$fid][0]);
+ $owner = getEntryOwner($entries[$fid][0]); // is a 'formulize' function
} else {
- $owner = getEntryOwner($entries[$fid][0], $fid);
+ $owner = getEntryOwner($entries[$fid][0], $fid); // is a 'formulize' function
}
} else {
print "no idreq";
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -169,11 +169,11 @@
if (wfdownloads_checkModule('formulize')) {
if (file_exists(XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php")) {
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $fids = allowedForms();
+ $fids = allowedForms(); // is a 'formulize' function
$fids_select = array();
$fids_select[0] = _AM_WFDOWNLOADS_FFS_STANDARD_FORM;
foreach ($fids as $fid) {
- $fids_select[$fid] = getFormTitle($fid);
+ $fids_select[$fid] = getFormTitle($fid); // is a 'formulize' function
}
$formulize_forms = new XoopsFormSelect(_AM_WFDOWNLOADS_FFS_CUSTOM_FORM, "formulize_fid", $this->getVar('formulize_fid'));
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -625,17 +625,23 @@
true
);
$sform->addElement(new XoopsFormHidden('size', $this->getVar('size', 'e')));
- $sform = compileElements(
- $customArray['fid'],
- $sform,
- $customArray['formulize_mgr'],
- $customArray['prevEntry'],
- $customArray['entry'],
- $customArray['go_back'],
- $customArray['parentLinks'],
- $customArray['owner_groups'],
- $customArray['groups']
- );
+ if (wfdownloads_checkModule('formulize')) {
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $sform = compileElements( // is a 'formulize' function
+ $customArray['fid'],
+ $sform,
+ $customArray['formulize_mgr'],
+ $customArray['prevEntry'],
+ $customArray['entry'],
+ $customArray['go_back'],
+ $customArray['parentLinks'],
+ $customArray['owner_groups'],
+ $customArray['groups']
+ );
+ } else {
+ // IN PROGRESS... formulize module not installed!!!
+ }
}
// download: dhistory
$sform->addElement(new XoopsFormTextArea(_MD_WFDOWNLOADS_HISTORYC, 'dhistory', $this->getVar('dhistory', 'e'), 7, 60), false);
@@ -884,7 +890,6 @@
);
} else {
// if we are using a custom form, then add in the form's elements here
-
// download: description
$description_tray = new XoopsFormElementTray(_MD_WFDOWNLOADS_DESCRIPTION, '<br />');
$options['name'] = 'description';
@@ -900,17 +905,23 @@
$sform->addElement($description_tray);
// download: size
$sform->addElement(new XoopsFormHidden('size', $this->getVar('size', 'e')));
- $sform = compileElements(
- $customArray['fid'],
- $sform,
- $customArray['formulize_mgr'],
- $customArray['prevEntry'],
- $customArray['entry'],
- $customArray['go_back'],
- $customArray['parentLinks'],
- $customArray['owner_groups'],
- $customArray['groups']
- );
+ if (wfdownloads_checkModule('formulize')) {
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $sform = compileElements( // is a 'formulize' function
+ $customArray['fid'],
+ $sform,
+ $customArray['formulize_mgr'],
+ $customArray['prevEntry'],
+ $customArray['entry'],
+ $customArray['go_back'],
+ $customArray['parentLinks'],
+ $customArray['owner_groups'],
+ $customArray['groups']
+ );
+ } else {
+ // IN PROGRESS... formulize module not installed!!!
+ }
}
// download: dhistory
$sform->addElement(new XoopsFormTextArea(_AM_WFDOWNLOADS_FILE_HISTORY, 'dhistory', $this->getVar('dhistory', 'e'), 7, 60), false);
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -144,7 +144,7 @@
$customArray['fid'] = $fid;
$customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
$customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues(
+ $customArray['prevEntry'] = getEntryValues( // is a 'formulize' function
$download->getVar('formulize_idreq'),
$customArray['formulize_mgr'],
$customArray['groups'],
@@ -154,9 +154,9 @@
$customArray['go_back'] = '';
$customArray['parentLinks'] = '';
if (wfdownloads_checkModule('formulize') < 300) {
- $owner = getEntryOwner($entry);
+ $owner = getEntryOwner($entry); // is a 'formulize' function
} else {
- $owner = getEntryOwner($entry, $fid);
+ $owner = getEntryOwner($entry, $fid); // is a 'formulize' function
}
$owner_groups = $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $owner_groups;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html 2014-04-18 16:11:12 UTC (rev 12460)
@@ -12,6 +12,5 @@
<span class="delimiter">></span>
<{/if}>
<{/foreach}>
- <hr/>
</div>
</div>
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -42,9 +42,9 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2014-04-14';
-$modversion['release_date'] = '2014/04/14';
-$modversion['releasedate'] = '2014-04-14';
+$modversion['date'] = '2014-04-18';
+$modversion['release_date'] = '2014/04/18';
+$modversion['releasedate'] = '2014-04-18';
$modversion['status'] = 'RC1';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
|
|
From: <luc...@us...> - 2014-04-18 16:03:19
|
Revision: 12459
http://sourceforge.net/p/xoops/svn/12459
Author: luciorota
Date: 2014-04-18 16:03:16 +0000 (Fri, 18 Apr 2014)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php 2014-04-18 11:37:54 UTC (rev 12458)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php 2014-04-18 16:03:16 UTC (rev 12459)
@@ -25,10 +25,9 @@
* Version : $Id $
* ****************************************************************************
*/
-
+$currentFile = basename(__FILE__);
include "admin_header.php";
xoops_cp_header();
-//global $indexAdmin;
// We recovered the value of the argument op in the URL$
$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
@@ -43,14 +42,14 @@
$img_ok = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_ok.png' alt='" . _AM_XNEWSLETTER_OK . "' title='"._AM_XNEWSLETTER_OK . "' /> ";
$img_failed = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_failed.png' alt='" . _AM_XNEWSLETTER_FAILED . "' title='" . _AM_XNEWSLETTER_FAILED . "' /> ";
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->addNavigation($currentFile);
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, $currentFile, 'list');
echo $indexAdmin->renderButton();
if ($accounts_id == 0) {
- redirect_header("accounts.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+ redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
} else {
- $accountObj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ $accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
}
$mailhost = $accountObj->getVar("accounts_server_in");
@@ -75,42 +74,43 @@
$accounts_hardbox = $accountObj->getVar("accounts_hardbox"); $accounts_hardbox_ok = 0;
$accounts_softbox = $accountObj->getVar("accounts_softbox"); $accounts_softbox_ok = 0;
- $command = $mailhost.":".$port;
+ $command = $mailhost . ":" . $port;
if ($service !='') $command .= '/' . $service;
if ($service_option !='') $command .= '/' . $service_option;
- echo "<table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width5'></th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_INFO."</th>
- </tr>";
+ echo "
+ <table class='outer width100' cellspacing='1'>
+ <tr>
+ <th class='center width5'></th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_INFO . "</th>
+ </tr>";
$mbox = @imap_open("{" . $command . "}", $accounts_username, $accounts_password); // or die ("can't connect: " . imap_last_error());
- if ( $mbox === false ) {
+ if ($mbox === false) {
echo "<tr>";
- echo "<td class='center width5'>".$img_failed."</td>";
+ echo "<td class='center width5'>" . $img_failed . "</td>";
echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
- echo "<td class='left'>".imap_last_error()."</td>";
+ echo "<td class='left'>" . imap_last_error() . "</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>".$img_ok."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
+ echo "<td class='center width5'>" . $img_ok . "</td>";
+ echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
echo "<td class='left'></td>";
echo "</tr>";
$folders = imap_listmailbox($mbox, "{".$command."}", "*");
if ($folders == false) {
echo "<tr>";
- echo "<td class='center width5'>".$img_failed."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
- echo "<td class='left'>".imap_last_error()."</td>";
+ echo "<td class='center width5'>" . $img_failed . "</td>";
+ echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
+ echo "<td class='left'>" . imap_last_error() . "</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>".$img_ok."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
+ echo "<td class='center width5'>" . $img_ok . "</td>";
+ echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
echo "<td class='left'>";
if (is_array($folders)) {
reset ($folders);
@@ -118,15 +118,15 @@
$foldercreated = 0;
while (list( $key, $val) = each ($folders)) {
echo "($key) ";
- echo imap_utf7_decode (str_replace("{".$command."}","",$val)) . "<br>\n";
- if ("{".$command."}".$accounts_inbox == $val) $accounts_inbox_ok = 1;
- if ("{".$command."}".$accounts_hardbox == $val) {
+ echo imap_utf7_decode(str_replace("{" . $command . "}", "", $val)) . "<br>\n";
+ if ("{" . $command . "}" . $accounts_inbox == $val) $accounts_inbox_ok = 1;
+ if ("{" . $command . "}" . $accounts_hardbox == $val) {
$accounts_hardbox_ok = 1;
} else {
@imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_hardbox));
$foldercreated = 1;
}
- if ("{".$command."}".$accounts_softbox == $val) {
+ if ("{" . $command . "}" . $accounts_softbox == $val) {
$accounts_softbox_ok = 1;
} else {
@imap_createmailbox($mbox, imap_utf7_encode('{' . $command . '}' . $accounts_softbox));
@@ -135,9 +135,9 @@
}
if ($foldercreated == 1) {
$folders_recheck = imap_listmailbox($mbox, "{" . $command . "}", "*");
- while (list( $key, $val) = each ($folders_recheck)) {
- if ("{".$command."}".$accounts_hardbox == $val) $accounts_hardbox_ok = 1;
- if ("{".$command."}".$accounts_softbox == $val) $accounts_softbox_ok = 1;
+ while (list($key, $val) = each ($folders_recheck)) {
+ if ("{" . $command . "}" . $accounts_hardbox == $val) $accounts_hardbox_ok = 1;
+ if ("{" . $command . "}" . $accounts_softbox == $val) $accounts_softbox_ok = 1;
}
}
}
@@ -189,8 +189,8 @@
case "list":
default:
- echo $indexAdmin->addNavigation('accounts.php') ;
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
+ echo $indexAdmin->addNavigation($currentFile) ;
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, "{$currentFile}?op=new_account", 'add');
echo $indexAdmin->renderButton();
$limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
@@ -212,41 +212,42 @@
// View Table
if ($numrows > 0) {
- echo "<table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width2'>"._AM_XNEWSLETTER_ACCOUNTS_ID."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_TYPE."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_NAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURNAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURMAIL."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_DEFAULT."</th>
- <th class='center width10'>"._AM_XNEWSLETTER_FORMACTION."</th>
- </tr>";
+ echo "
+ <table class='outer width100' cellspacing='1'>
+ <tr>
+ <th class='center width2'>" . _AM_XNEWSLETTER_ACCOUNTS_ID . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_TYPE . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_NAME . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURNAME . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURMAIL . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_DEFAULT . "</th>
+ <th class='center width10'>" . _AM_XNEWSLETTER_FORMACTION . "</th>
+ </tr>";
$class = "odd";
foreach (array_keys($accounts_arr) as $i) {
- echo "<tr class='".$class."'>";
+ echo "<tr class='" . $class . "'>";
$class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>".$i."</td>";
+ echo "<td class='center'>" . $i . "</td>";
$arr_accounts_type=array(
_AM_ACCOUNTS_TYPE_VAL_PHP_MAIL=>_AM_ACCOUNTS_TYPE_PHPMAIL,
_AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL=>_AM_ACCOUNTS_TYPE_PHPSENDMAIL,
_AM_ACCOUNTS_TYPE_VAL_POP3=>_AM_ACCOUNTS_TYPE_POP3,
_AM_ACCOUNTS_TYPE_VAL_SMTP=>_AM_ACCOUNTS_TYPE_SMTP,
_AM_ACCOUNTS_TYPE_VAL_GMAIL=>_AM_ACCOUNTS_TYPE_GMAIL);
- echo "<td class='center'>". $arr_accounts_type[$accounts_arr[$i]->getVar("accounts_type")]."</td>";
- echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_name")."</td>";
- echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_yourname")."</td>";
- echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_yourmail")."</td>";
- $verif_accounts_default = ( $accounts_arr[$i]->getVar("accounts_default") == 1 ) ? _YES : _NO;
- echo "<td class='center'>".$verif_accounts_default."</td>";
+ echo "<td class='center'>" . $arr_accounts_type[$accounts_arr[$i]->getVar("accounts_type")] . "</td>";
+ echo "<td class='center'>" . $accounts_arr[$i]->getVar("accounts_name") . "</td>";
+ echo "<td class='center'>" . $accounts_arr[$i]->getVar("accounts_yourname") . "</td>";
+ echo "<td class='center'>" . $accounts_arr[$i]->getVar("accounts_yourmail") . "</td>";
+ $verif_accounts_default = ($accounts_arr[$i]->getVar("accounts_default") == 1) ? _YES : _NO;
+ echo "<td class='center'>" . $verif_accounts_default . "</td>";
echo "<td class='center width5'>";
- echo " <a href='accounts.php?op=edit_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>";
- echo " <a href='accounts.php?op=delete_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' /></a>";
+ echo " <a href='" . $currentFile . "?op=edit_account&accounts_id=" . $i . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>";
+ echo " <a href='" . $currentFile . "?op=delete_account&accounts_id=" . $i . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
if ($accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
- echo " <a href='accounts.php?op=check_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_check.png alt='"._AM_ACCOUNTS_TYPE_CHECK."' title='"._AM_ACCOUNTS_TYPE_CHECK."' /></a>";
+ echo " <a href='" . $currentFile . "?op=check_account&accounts_id=".$i."'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_check.png alt='" . _AM_ACCOUNTS_TYPE_CHECK . "' title='" . _AM_ACCOUNTS_TYPE_CHECK . "' /></a>";
}
echo "</td>";
echo "</tr>";
@@ -278,8 +279,8 @@
break;
case "new_account":
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->addNavigation($currentFile);
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, $currentFile, 'list');
echo $indexAdmin->renderButton();
$accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->create();
$accountObj = xNewsletter_setPost($accountObj, $_POST);
@@ -289,10 +290,10 @@
case "save_accounts":
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- $accountObj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ $accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
$_POST['accounts_id'] = $accounts_id;
$accountObj = xNewsletter_setPost($accountObj, $_POST);
@@ -316,9 +317,9 @@
if ($accountObj->getVar("accounts_yourmail") != "" && $accountObj->getVar("accounts_yourmail") != _AM_ACCOUNTS_TYPE_YOUREMAIL ) {
if ($xnewsletter->getHandler('xNewsletter_accounts')->insert($accountObj)) {
if ($save_and_check == 'none') {
- redirect_header("accounts.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
+ redirect_header($currentFile, 2, _AM_XNEWSLETTER_FORMOK);
} else {
- redirect_header("accounts.php?op=check_account&accounts_id={$accountObj->getVar("accounts_id")}", 2, _AM_XNEWSLETTER_FORMOK);
+ redirect_header("{$currentFile}?op=check_account&accounts_id={$accountObj->getVar("accounts_id")}", 2, _AM_XNEWSLETTER_FORMOK);
}
}
} else {
@@ -331,9 +332,9 @@
break;
case "edit_account":
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->addNavigation($currentFile);
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, "{$currentFile}?op=new_account", 'add');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, $currentFile, 'list');
echo $indexAdmin->renderButton();
$accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
if (!empty($_POST)) {
@@ -347,15 +348,15 @@
$accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
if (isset($_POST["ok"]) && $_POST["ok"] == "1") {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
if ($xnewsletter->getHandler('xNewsletter_accounts')->delete($accountObj)) {
- redirect_header("accounts.php", 3, _AM_XNEWSLETTER_FORMDELOK);
+ redirect_header($currentFile, 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
echo $accountObj->getHtmlErrors();
}
} else {
- xoops_confirm(array("ok" => 1, "accounts_id" => $accounts_id, "op" => "delete_account"), "accounts.php", sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $accountObj->getVar("accounts_name")));
+ xoops_confirm(array("ok" => 1, "accounts_id" => $accounts_id, "op" => "delete_account"), $currentFile, sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $accountObj->getVar("accounts_name")));
}
break;
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php 2014-04-18 11:37:54 UTC (rev 12458)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php 2014-04-18 16:03:16 UTC (rev 12459)
@@ -27,9 +27,9 @@
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-
xoops_load('XoopsLists');
+
$modversion['name'] = _MI_XNEWSLETTER_NAME;
$modversion['version'] = 1.3;
$modversion['description'] = _MI_XNEWSLETTER_DESC;
@@ -58,7 +58,7 @@
$modversion['module_status'] = "Alpha";
$modversion['release_info'] = "";
$modversion['release_file'] = XOOPS_URL . "/modules/{$modversion['dirname']}/docs/";
-$modversion['release_date'] = "2014/04/16";
+$modversion['release_date'] = "2014/04/18";
$modversion['manual'] = "xNewsletter.txt";
$modversion['manual_file'] = XOOPS_URL . "/modules/{$modversion['dirname']}/docs/";
|
|
From: <txm...@us...> - 2014-04-18 11:37:59
|
Revision: 12458
http://sourceforge.net/p/xoops/svn/12458
Author: txmodxoops
Date: 2014-04-18 11:37:54 +0000 (Fri, 18 Apr 2014)
Log Message:
-----------
Added function for copy directory of new module in root/modules
Updated -> refactoring
P.S: This is a pre-alpha, only for repository (NO TEST)
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/form_elements.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/themeform.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-04-17 21:19:14 UTC (rev 12457)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-04-18 11:37:54 UTC (rev 12458)
@@ -26,7 +26,8 @@
} else {
$modules =& $modulesHandler;
}
-
+$from_dir = TDMC_UPLOAD_MODULES_PATH.'/'.strtolower($mod_name);
+$to_dir = XOOPS_ROOT_PATH.'/modules/'.strtolower($mod_name);
switch ($op) {
case 'build':
$template_main = 'tdmcreate_building.html';
@@ -50,6 +51,9 @@
$mod_name = 'uploads/tdmcreate/modules/' . str_replace(' ', '', strtolower($modules->getVar('mod_name')));
// Creation of the structure of folders and files
$GLOBALS['xoopsTpl']->assign('build_list', 'Under new construction - Temporary build only folders of this selected module "'.$mod_name.'/"');
+ if ( $modules->getVar('mod_install') == 1 ) {
+ copyInRootModules($from_dir, $to_dir);
+ }
break;
case 'default':
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-17 21:19:14 UTC (rev 12457)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-18 11:37:54 UTC (rev 12458)
@@ -37,7 +37,7 @@
{
case 'list':
default:
- $limit = xoops_getModuleOption('fields_adminpager');
+ $limit = $GLOBALS['xoopsModuleConfig']['fields_adminpager'];
$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
// Define main template
$template_main = 'tdmcreate_fields.html';
@@ -155,7 +155,7 @@
'field_default' => $_POST['field_default'][$i],
'field_key' => $_POST['field_key'][$i],
'field_autoincrement' => (($_REQUEST['field_autoincrement'][$i] == 1) ? '1' : '0'),
- 'field_element' => $_REQUEST['fieldelement_name'][$i],
+ 'field_element' => $_POST['field_element'][$i],
'field_inlist' => (($_REQUEST['field_inlist'][$i] == 1) ? '1' : '0'),
'field_inform' => (($_REQUEST['field_inform'][$i] == 1) ? '1' : '0'),
'field_admin' => (($_REQUEST['field_admin'][$i] == 1) ? '1' : '0'),
@@ -188,7 +188,7 @@
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
$obj = $fieldsHandler->get($field_id);
- $form = $obj->getForm($field_mid, $field_tid, $field_numb, $field_name);
+ $form = $obj->getForm($field_mid, $field_tid, $field_numb);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-04-17 21:19:14 UTC (rev 12457)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-04-18 11:37:54 UTC (rev 12458)
@@ -26,7 +26,7 @@
{
case 'list':
default:
- $limit = xoops_getModuleOption('mod_adminpager');
+ $limit = $GLOBALS['xoopsModuleConfig']['modules_adminpager'];
$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
// Define main template
$template_main = 'tdmcreate_modules.html';
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-17 21:19:14 UTC (rev 12457)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-18 11:37:54 UTC (rev 12458)
@@ -32,7 +32,7 @@
{
case 'list':
default:
- $limit = xoops_getModuleOption('adminperpage');
+ $limit = $GLOBALS['xoopsModuleConfig']['tables_adminpager'];
$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
// Define main template
$template_main = 'tdmcreate_tables.html';
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-17 21:19:14 UTC (rev 12457)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-18 11:37:54 UTC (rev 12458)
@@ -16,7 +16,7 @@
* @package tdmcreate
* @since 2.5.0
* @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: fields.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
require_once 'simplelabel.php';
@@ -86,55 +86,54 @@
public function getForm($f_mid = null, $f_tid = null, $f_numb = null, $f_name = null, $action = false)
{
if ($action === false) {
- $action = $_SERVER['REQUEST_URI'];
+ $action = XOOPS_URL.'/modules/TDMCreate/admin/fields.php'; //$_SERVER['REQUEST_URI'];
}
+ $isNew = $this->isNew();
+ $title = $isNew ? sprintf(_AM_TDMCREATE_FIELD_ADD) : sprintf(_AM_TDMCREATE_FIELD_EDIT);
- $title = $this->isNew() ? sprintf(_AM_TDMCREATE_FIELD_ADD) : sprintf(_AM_TDMCREATE_FIELD_EDIT);
+ $field_mid = $isNew ? $f_mid : $this->getVar('field_mid');
+ $field_tid = $isNew ? $f_tid : $this->getVar('field_tid');
+ $field_numb = $isNew ? $f_numb : $this->getVar('field_numb');
- if ($this->isNew()) {
- $field_tid = $f_tid;
- $field_mid = $f_mid;
- $field_numb = $f_numb;
- } else {
- $field_mid = $this->getVar('field_mid');
- $field_tid = $this->getVar('field_tid');
- $field_numb = $this->getVar('field_numb');
- }
-
- $form = new TDMCreateThemeForm($title, 'form', $action, 'post', true);
+ $form = new TDMCreateThemeForm(null, 'form', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
$tablesHandler = xoops_getModuleHandler('tables');
+ $fieldsHandler = xoops_getModuleHandler('fields');
$fieldelementsHandler =& xoops_getModuleHandler('fieldelements');
$fieldtypeHandler =& xoops_getModuleHandler('fieldtype');
$fieldattrsHandler =& xoops_getModuleHandler('fieldattributes');
$fieldnullHandler =& xoops_getModuleHandler('fieldnull');
$fieldkeyHandler =& xoops_getModuleHandler('fieldkey');
// New Object HtmlTable
- $form->addElement(new TDMCreateFormLabel('<table class="outer">'));
- $form->addElement(new TDMCreateFormLabel('<thead class="center"><tr class="width5">'));
- $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_NUMBER.'</th>'));
- $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_NAME.'</th>'));
- $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_TYPE.'</th>'));
- $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_VALUE.'</th>'));
- $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_ATTRIBUTE.'</th>'));
- $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_NULL.'</th>'));
- $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_DEFAULT.'</th>'));
- $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_KEY.'</th>'));
- $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_PARAMETERS.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<table border="0" cellspacing="1" class="outer width100">'));
+ $form->addElement(new TDMCreateFormLabel('<thead class="center">'));
+ $form->addElement(new TDMCreateFormLabel('<tr class="head"><th colspan="9">'.$title.'</th></tr>'));
+ $form->addElement(new TDMCreateFormLabel('<tr class="head width5">'));
+ $form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_NUMBER.'</td>'));
+ $form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_NAME.'</td>'));
+ $form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_TYPE.'</td>'));
+ $form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_VALUE.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_ATTRIBUTE.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_NULL.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_DEFAULT.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_KEY.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<td>'._AM_TDMCREATE_FIELD_PARAMETERS.'</th>'));
$form->addElement(new TDMCreateFormLabel('</tr></thead>'));
- $form->addElement(new TDMCreateFormLabel('<tbody>'));
+ $form->addElement(new TDMCreateFormLabel('<tbody>'));
+
+ $fields = $fieldsHandler->getObjects(null);
- $class = 'even';
+ $class = '';
for($i = 1; $i <= $field_numb; $i++)
{
- $class = $class ? 'odd' : 'even';
+ $class = ($class == 'even') ? 'odd' : 'even';
$form->addElement(new TDMCreateFormLabel('<tr class="'.$class.'">'));
// Index ID
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$i.'</td>'));
- $field_name = $this->isNew() ? $f_name . '_' : $this->getVar('field_name');
- $field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$i.']', 15, 255, $field_name);
- // Field Name
+ // Field Name
+ $field_name = $isNew ? $f_name . '_' : $this->getVar('field_name');
+ $field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$i.']', 15, 255, $field_name);
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
// Field Type
$fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$i.']', $this->getVar('field_type'));
@@ -168,7 +167,7 @@
// Box header row
$parameters_tray = new XoopsFormElementTray('', '<br />');
// Field Elements
- $field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'fieldelement_name['.$i.']', $this->getVar('fieldelement_name'));
+ $field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element['.$i.']', $this->getVar('field_element'));
$field_elements_select->addOptionArray($fieldelementsHandler->getList());
$criteria = new CriteriaCompo(new Criteria('table_id', $f_tid));
$criteria->add(new Criteria('table_mid', $f_mid));
@@ -176,10 +175,10 @@
$criteria->setOrder('ASC');
$table_arr = $tablesHandler->getAll($criteria);
unset($criteria);
- foreach (array_keys($table_arr) as $j)
+ foreach (array_keys($table_arr) as $xft_other)
{
- $form_table_name = $table_arr[$j]->getVar('table_name');
- if ( $j[$i] == 'XoopsFormTables-'.$form_table_name ) {
+ $form_table_name = $table_arr[$xft_other]->getVar('table_name');
+ if ( $xft_other[$i] == 'XoopsFormTables-'.$form_table_name ) {
$field_elements_select->addOption('XoopsFormTables-'.$form_table_name, 'Table : '.$form_table_name);
}
}
@@ -210,7 +209,7 @@
$check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
$parameters_tray->addElement($check_field_block);
- $field_mnfield = $this->isNew() ? 0 : $this->getVar('field_main');
+ $field_mnfield = $this->isNew() ? 1 : $this->getVar('field_main');
$field_main = new XoopsFormRadio('', 'field_main['.$i.']', $field_mnfield);
$field_main->addOption( $i, _AM_TDMCREATE_FIELD_MAINFIELD );
$parameters_tray->addElement($field_main);
@@ -248,12 +247,12 @@
* @param null
*/
public function toArray() {
- $ret = parent::toArray();
- $f_tid = $this->table->getVar('table_id');
+ $ret = parent::toArray();
$f_mid = $this->table->getVar('table_mid');
+ $f_tid = $this->table->getVar('table_id');
$f_numb = $this->table->getVar('table_nbfields');
$f_name = $this->table->getVar('table_fieldname');
- $ret['edit_form'] = $this->getForm($f_tid, $f_mid, $f_numb, $f_name);
+ $ret['edit_form'] = $this->getForm($f_mid, $f_tid, $f_numb, $f_name);
return $ret;
}
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/form_elements.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/form_elements.php 2014-04-17 21:19:14 UTC (rev 12457)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/form_elements.php 2014-04-18 11:37:54 UTC (rev 12458)
@@ -18,27 +18,20 @@
* @author Txmod Xoops http://www.txmodxoops.org
* @version $Id: form_elements.php 12258 2014-01-02 09:33:29Z timgno $
*/
-if (!defined('XOOPS_ROOT_PATH')) {
- die('XOOPS root path not defined');
-}
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
class FormElements
{
/*
- * @var string
- */
- private $required = '';
- /*
* @public function constructor
* @param string $module
* @param array $table
* @param string $fields
*/
- public function __construct($module, $table, $fields, $required) {
+ public function __construct($module, $table, $fields) {
$this->setModule($module);
$this->setTable($table);
$this->setFields($fields);
- $this->required = $required;
}
/**
* @param string $method
@@ -63,36 +56,36 @@
}
/*
* @public function getXoopsFormText
- * @param string $lng_form
+ * @param string $language
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormText($lng_form, $field_name, $required = 'false') {
+ public function getXoopsFormText($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormText({$lng_form}, '{$field_name}', 50, 255, \$this->getVar('{$field_name}')), {$required});
+ \$form->addElement(new XoopsFormText({$language}, '{$field_name}', 50, 255, \$this->getVar('{$field_name}')), {$required});
EOT;
return $ret;
}
/*
* @public function getXoopsFormText
- * @param string $lng_form
+ * @param string $language
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormTextArea($lng_form, $field_name, $required = 'false') {
+ public function getXoopsFormTextArea($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormTextArea({$lng_form}, '{$field_name}', \$this->getVar('{$field_name}'), 4, 47), {$required});
+ \$form->addElement(new XoopsFormTextArea({$language}, '{$field_name}', \$this->getVar('{$field_name}'), 4, 47), {$required});
EOT;
return $ret;
}
/*
* @public function getXoopsFormDhtmlTextArea
- * @param string $lng_form
+ * @param string $language
* @param string $module_name
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormDhtmlTextArea($lng_form, $module_name, $field_name, $required = 'false') {
+ public function getXoopsFormDhtmlTextArea($language, $module_name, $field_name, $required = 'false') {
$ret = <<<EOT
\$editor_configs = array();
\$editor_configs['name'] = '{$field_name}';
@@ -102,20 +95,20 @@
\$editor_configs['width'] = '100%';
\$editor_configs['height'] = '400px';
\$editor_configs['editor'] = xoops_getModuleOption('{$module_name}_editor', '{$module_name}');
- \$form->addElement( new XoopsFormEditor({$lng_form}, '{$field_name}', \$editor_configs), {$required} );
+ \$form->addElement( new XoopsFormEditor({$language}, '{$field_name}', \$editor_configs), {$required} );
EOT;
return $ret;
}
/*
* @public function getXoopsFormCheckBox
- * @param string $lng_form
+ * @param string $language
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormCheckBox($lng_form, $field_name, $required = 'false') {
+ public function getXoopsFormCheckBox($language, $field_name, $required = 'false') {
$ret = <<<EOT
\${$field_name} = \$this->isNew() ? 0 : \$this->getVar('{$field_name}');
- \$check_{$field_name} = new XoopsFormCheckBox({$lng_form}, '{$field_name}', \${$field_name});
+ \$check_{$field_name} = new XoopsFormCheckBox({$language}, '{$field_name}', \${$field_name});
\$check_{$field_name}->addOption(1, " ");
\$form->addElement(\$check_{$field_name}, {$required});
EOT;
@@ -133,146 +126,188 @@
}
/*
* @public function getXoopsFormUploadFile
- * @param string $lng_form
+ * @param string $language
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormUploadFile($lng_form, $field_name, $required = 'false') {
+ public function getXoopsFormUploadFile($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormUploadFile({$lng_form}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});
+ \$form->addElement(new XoopsFormUploadFile({$language}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});
EOT;
return $ret;
}
/*
* @public function getXoopsFormUploadImage
- * @param string $lng_form
+ * @param string $language
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormUploadImage($lng_form, $field_name, $required = 'false') {
+ public function getXoopsFormUploadImage($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormUploadImage({$lng_form}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});
+ \$form->addElement(new XoopsFormUploadImage({$language}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});
EOT;
return $ret;
}
/*
* @public function getXoopsFormColorPicker
- * @param string $lng_form
+ * @param string $language
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormColorPicker($lng_form, $field_name, $required = 'false') {
+ public function getXoopsFormColorPicker($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormColorPicker({$lng_form}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});
+ \$form->addElement(new XoopsFormColorPicker({$language}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});
EOT;
return $ret;
}
/*
* @public function getXoopsFormSelectUser
- * @param string $lng_form
+ * @param string $language
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormSelectUser($lng_form, $field_name, $required = 'false') {
+ public function getXoopsFormSelectUser($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormSelectUser({$lng_form}, '{$field_name}', false, \$this->getVar('{$field_name}'), 1, false), {$required});
+ \$form->addElement(new XoopsFormSelectUser({$language}, '{$field_name}', false, \$this->getVar('{$field_name}'), 1, false), {$required});
EOT;
return $ret;
}
/*
* @public function getXoopsFormRadioYN
- * @param string $lng_form
+ * @param string $language
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormRadioYN($lng_form, $field_name, $required = 'false') {
+ public function getXoopsFormRadioYN($language, $field_name, $required = 'false') {
$ret = <<<EOT
${$field_name} = \$this->isNew() ? 0 : \$this->getVar('{$field_name}');
- \$form->addElement(new XoopsFormRadioYN({$lng_form}, '{$field_name}', ${$field_name}), {$required});
+ \$form->addElement(new XoopsFormRadioYN({$language}, '{$field_name}', ${$field_name}), {$required});
EOT;
return $ret;
}
/*
* @public function getXoopsFormTextDateSelect
- * @param string $lng_form
+ * @param string $language
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormTextDateSelect($lng_form, $field_name, $required = 'false') {
+ public function getXoopsFormTextDateSelect($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormTextDateSelect({$lng_form}, '{$field_name}', '', \$this->getVar('{$field_name}')), {$required});
+ \$form->addElement(new XoopsFormTextDateSelect({$language}, '{$field_name}', '', \$this->getVar('{$field_name}')), {$required});
EOT;
return $ret;
}
/*
- * @public function getXoopsFormTables
- * @param string $lng_form
+ * @public function getXoopsFormTable
+ * @param string $language
* @param string $module_name
* @param string $table_name
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormTables($lng_form, $module_name, $table_name, $field_name, $required = 'false') {
- $ret = <<<EOT
+ public function getXoopsFormTable($language, $module_name, $table_name, $field_name, $required = 'false') {
+ $ret = <<<XFT
\${$table_name}Handler =& xoops_getModuleHandler('{$table_name}', '{$module_name}');
- \${$field_name}_select = new XoopsFormSelect({$lng_form}, '{$field_name}', \$this->getVar('{$field_name}'));
+ \${$field_name}_select = new XoopsFormSelect({$language}, '{$field_name}', \$this->getVar('{$field_name}'));
\${$field_name}_select->addOptionArray(${$field_name}Handler->getList());
\$form->addElement(${$field_name}_select, {$required});
-EOT;
+XFT;
return $ret;
}
/*
+ * @public function getXoopsFormTopic
+ * @param string $language
+ * @param string $module_name
+ * @param string $table_name
+ * @param string $field_name
+ * @param string $required
+ */
+ public function getXoopsFormTopic($language, $module_name, $table_name, $fields, $required = 'false') {
+ //
+ //
+ // ========================== Da elaborare per field parent e field name ============================
+ //
+ //
+ if($fields->getVar('field_id') == 1) {
+ $field_id = $fields->getVar('field_name');
+ }
+ if($fields->getVar('field_main') == 1) {
+ $field_name = $fields->getVar('field_name');
+ }
+ if($fields->getVar('field_parent') == 1) {
+ $field_pid = $fields->getVar('field_name');
+ }
+ $ret = <<<XFT
+ include_once(XOOPS_ROOT_PATH . '/class/tree.php');
+ \${$table_name}Handler = xoops_getModuleHandler('{$table_name}', '\${$module_name}' );
+ \$criteria = new CriteriaCompo();
+ \${$table_name} = \${$table_name}Handler->getObjects( \$criteria );
+ if(\${$table_name}) {
+ \${$table_name}_tree = new XoopsObjectTree( \${$table_name}, '{$field_id}', '{$field_pid}' );
+ \${$field_pid} = \${$table_name}_tree->makeSelBox( '{$field_pid}', '{$field_name}','--', \$this->getVar('{$field_pid}', 'e' ), true );
+ \$form->addElement( new XoopsFormLabel ( {$language}, \${$field_pid} ) );
+ }
+XFT;
+ // ========================== Da elaborare per field parent e field name ============================
+ return $ret;
+ }
+ /*
* @public function render
* @param null
*/
public function renderElement() {
- $module = $this->getModule();
- $table_name = $this->getTable()->getVar('table_name');
- $fields = $this->getFields();
- $filename = $this->getFileName();
- $module_name = $module->getVar('module_name');
- $field_name = $fields->getVar('field_name');
+ $module = $this->getModule();
+ $module_name = $module->getVar('module_name');
+ $table = $this->getTable();
+ $table_name = $table->getVar('table_name');
+ $fields = $this->getFields();
+ $field_name = $fields->getVar('field_name');
+ $filename = $this->getFileName();
$language = $this->getLanguage('AM', '_');
- $lng_form = $language . strtoupper($table_name) . '_' . strtoupper($field_name);
+ $language = $language . strtoupper($table_name) . '_' . strtoupper($field_name);
$required = ( $fields->getVar('field_required') == 1 ) ? 'true' : 'false';
$ret = '';
switch($fields->getVar('field_element'))
{
case 1:
- $ret .= $this->getXoopsFormText($lng_form, $field_name, $required);
+ $ret .= $this->getXoopsFormText($language, $field_name, $required);
break;
case 2:
- $ret .= $this->getXoopsFormTextArea($lng_form, $field_name, $required);
+ $ret .= $this->getXoopsFormTextArea($language, $field_name, $required);
break;
case 3:
- $ret .= $this->getXoopsFormDhtmlTextArea($lng_form, $module_name, $field_name, $required);
+ $ret .= $this->getXoopsFormDhtmlTextArea($language, $module_name, $field_name, $required);
break;
case 4:
- $ret .= $this->getXoopsFormCheckBox($lng_form, $field_name, $required);
+ $ret .= $this->getXoopsFormCheckBox($language, $field_name, $required);
break;
case 5:
$ret .= $this->getXoopsFormHidden($field_name);
break;
case 6:
- $ret .= $this->getXoopsFormUploadFile($lng_form, $field_name, $required);
+ $ret .= $this->getXoopsFormUploadFile($language, $field_name, $required);
break;
case 7:
- $ret .= $this->getXoopsFormUploadImage($lng_form, $field_name, $required);
+ $ret .= $this->getXoopsFormUploadImage($language, $field_name, $required);
break;
case 8:
- $ret .= $this->getXoopsFormColorPicker($lng_form, $field_name, $required);
+ $ret .= $this->getXoopsFormColorPicker($language, $field_name, $required);
break;
case 9:
- $ret .= $this->getXoopsFormSelectUser($lng_form, $field_name, $required);
+ $ret .= $this->getXoopsFormSelectUser($language, $field_name, $required);
break;
case 10:
- $ret .= $this->getXoopsFormRadioYN($lng_form, $field_name, $required);
+ $ret .= $this->getXoopsFormRadioYN($language, $field_name, $required);
break;
case 11:
- $ret .= $this->getXoopsFormTextDateSelect($lng_form, $field_name, $required);
+ $ret .= $this->getXoopsFormTextDateSelect($language, $field_name, $required);
break;
default:
- $ret .= $this->getXoopsFormTables($lng_form, $module_name, $table_name, $field_name, $required);
+ if($table->getVar('table_category') == 0) {
+ $ret .= $this->getXoopsFormTable($language, $module_name, $table_name, $field_name, $required);
+ } else {
+ $ret .= $this->getXoopsFormTopic($language, $module_name, $table_name, $fields, $required);
+ }
break;
}
return $ret;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/themeform.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/themeform.php 2014-04-17 21:19:14 UTC (rev 12457)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/themeform.php 2014-04-18 11:37:54 UTC (rev 12458)
@@ -45,8 +45,8 @@
public function render()
{
$ele_name = $this->getName();
- $ret = ($this->getTitle() ? '<div class=" center head ">' . $this->getTitle() . '</div>' : '');
- $ret .= NWLINE . '<form name="' . $ele_name . '" id="' . $ele_name . '" action="' . $this->getAction() . '" method="' . $this->getMethod() . '" onsubmit="return xoopsFormValidate_' . $ele_name . '();"' . $this->getExtra() . '>' . NWLINE;
+ //$ret = ($this->getTitle() ? '<div class=" center head ">' . $this->getTitle() . '</div>' : '');
+ $ret = NWLINE . '<form name="' . $ele_name . '" id="' . $ele_name . '" action="' . $this->getAction() . '" method="' . $this->getMethod() . '" onsubmit="return xoopsFormValidate_' . $ele_name . '();"' . $this->getExtra() . '>' . NWLINE;
$hidden = '';
$class = 'even';
foreach ($this->getElements() as $ele) {
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php 2014-04-17 21:19:14 UTC (rev 12457)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php 2014-04-18 11:37:54 UTC (rev 12458)
@@ -16,7 +16,7 @@
* @package tdmcreate
* @since 2.5.5
* @author Txmod Xoops <su...@tx...>
- * @version $Id: 1.59 tables.php 11297 2013-03-24 10:58:10Z timgno $
+ * @version $Id: 1.91 tables.php 11297 2013-03-24 10:58:10Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
/*
@@ -50,7 +50,7 @@
$this->initVar('table_submenu',XOBJ_DTYPE_INT);
/*$this->initVar('table_status',XOBJ_DTYPE_INT);
$this->initVar('table_waiting',XOBJ_DTYPE_INT);
- $this->initVar('table_online',XOBJ_DTYPE_INT);*/
+ $this->initVar('table_display',XOBJ_DTYPE_INT);*/
$this->initVar('table_search',XOBJ_DTYPE_INT);
$this->initVar('table_comments',XOBJ_DTYPE_INT);
$this->initVar('table_notifications',XOBJ_DTYPE_INT);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php 2014-04-17 21:19:14 UTC (rev 12457)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php 2014-04-18 11:37:54 UTC (rev 12458)
@@ -86,7 +86,7 @@
// Deep copy directories
if (is_dir("$source/$entry") && ($dest !== "$source/$entry")) {
- copyr("$source/$entry", "$dest/$entry");
+ TDMCreate_copyr("$source/$entry", "$dest/$entry");
} else {
copy("$source/$entry", "$dest/$entry");
}
@@ -97,6 +97,29 @@
return true;
}
+// copy a directory and all subdirectories and files (recursive)
+// void dircpy( str 'source directory', str 'destination directory' [, bool 'overwrite existing files'] )
+function copyInRootModules($source, $dest, $overwrite = false) {
+ if($handle = opendir($source)){ // if the folder exploration is sucsessful, continue
+ while(false !== ($file = readdir($handle))){ // as long as storing the next file to $file is successful, continue
+ if($file != '.' && $file != '..') {
+ $path = $source . '/' . $file;
+ if(is_file($path)) {
+ if(!is_file($dest . '/' . $file) || $overwrite)
+ if(!@copy($path, $dest . '/' . $file)){
+ echo '<div class="red">File ('.$path.') could not be copied, likely a permissions problem.</div>';
+ }
+ } elseif(is_dir($path)){
+ if(!is_dir($dest . '/' . $file))
+ mkdir($dest . '/' . $file); // make subdirectory before subdirectory is copied
+ copyInRootModules($path, $dest . '/' . $file, $overwrite); //recurse!
+ }
+ }
+ }
+ closedir($handle);
+ }
+} // end of dircpy()
+
/*
if(function_exists(isset($_GET['f']))) { // get function name and parameter $_GET['f']($_GET["p"]);
include_once TDMC_PATH . '/class/modules.php';
|
|
From: <txm...@us...> - 2014-04-17 21:19:20
|
Revision: 12457
http://sourceforge.net/p/xoops/svn/12457
Author: txmodxoops
Date: 2014-04-17 21:19:14 +0000 (Thu, 17 Apr 2014)
Log Message:
-----------
To continue with stable versions but they have renewed and full of code refactoring
Step by step I hope to get a clean version with code much more readable and understandable for all users those who want to extend and expand this module
Test and let them know how it works
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.42/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/about.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/building.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/footer.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/header.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/includes.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/index.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/menu.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/class/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/class/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/class/logoGenerator.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/class/modules.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/class/structure.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/class/tables.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_admin_about.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_admin_footer.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_admin_header.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_admin_help.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_admin_index.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_admin_language.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_admin_menu.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_admin_pages.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_admin_permissions.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_blocks.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_blocks_language.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_blocks_templates.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_changelog.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_class.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_class_helper.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_class_module.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_class_request.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_css_style.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_header.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_help_language.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_include_comments.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_include_common.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_include_functions.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_include_functions_comments.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_include_install.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_include_jquery.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_include_notifications.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_include_search.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_js_jquery.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_languages.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_main_language.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_modinfo_language.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_sql.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_structure.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_templates.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_templates_admin_about.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_templates_admin_help.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_templates_footer.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_templates_header.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_templates_index.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_templates_pages.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_user_comments.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_user_footer.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_user_header.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_user_index.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_user_pages.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_waiting.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/const/const_xoopsversion.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/css/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/css/admin.css
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/css/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/docs/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/docs/changelog.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/docs/credits.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/docs/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/docs/install.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/docs/lang_diff.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/docs/license.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/docs/readme.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/16/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/16/arrow.gif
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/16/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/16/off.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/16/on.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/16/toggle.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/32/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/32/addmodule.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/32/addtable.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/32/builder.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/32/dashboard.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/32/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/arrow.gif
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/blank.gif
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/loading.gif
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/off.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/icons/on.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/loading.gif
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/logos/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/logos/VeraBd.ttf
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/logos/green.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/logos/red.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/logos/xoops2.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/module_logo.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/tdmcreate_slogo.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/txmodxoops_logo.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/modules/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/modules/Car_logo.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/modules/My Module_logo.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/modules/Test1Logo.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/modules/Test1_logo.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/modules/empty.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/modules/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/modules/mymodule_logo.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/modules/xcvLogo.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/tables/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/tables/blank.gif
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/uploads/tables/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/images/xoops2.png
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/include/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/include/common.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/include/functions.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/include/functions_const.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/include/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/include/install.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/include/jq.init.js
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/include/update.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/js/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/js/functions.js
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/js/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/english/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/english/help/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/english/help/help.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/english/help/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/english/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/english/modinfo.php
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/update language 1.0 to 1.1.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/update language 1.1 to 1.15.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/update language 1.1 to 1.37.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/update language 1.15 to 1.37.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/update language 1.37 to 1.38.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/language/update language 1.38 to 1.39.txt
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/modules/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/modules/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/sql/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/sql/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/sql/mysql.sql
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/templates/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/templates/admin/
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/templates/admin/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/templates/index.html
XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/xoops_version.php
Added: XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/about.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/about.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/about.php 2014-04-17 21:19:14 UTC (rev 12457)
@@ -0,0 +1,24 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: about.php 11084 2013-02-23 15:44:20Z timgno $
+ */
+include 'header.php';
+echo $adminMenu->addNavigation('about.php');
+echo $adminMenu->renderabout('6KJ7RW5DR3VTJ', false);
+include 'footer.php';
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/building.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/building.php 2014-04-17 21:19:14 UTC (rev 12457)
@@ -0,0 +1,269 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: building.php 11084 2013-02-23 15:44:20Z timgno $
+ */
+include 'header.php';
+$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
+
+if (isset($_REQUEST['mod_name'])) {
+ $modules =& $modulesHandler->get($_REQUEST['mod_name']);
+} else {
+ $modules =& $modulesHandler;
+}
+
+$mod_name = strtolower($modules->getVar('mod_name'));
+$mod_author_website_name = $modules->getVar('mod_author_website_name');
+$mod_author_website_url = $modules->getVar('mod_author_website_url');
+$mod_user = $modules->getVar('mod_user');
+$mod_notifications = $modules->getVar('mod_notifications');
+$mod_permissions = $modules->getVar('mod_permissions');
+
+if (isset($_REQUEST['table_name'])) {
+ $tables =& $tablesHandler->get($_REQUEST['table_name']);
+} else {
+ $tables =& $tablesHandler;
+}
+
+//Name of tables
+$criteria = new CriteriaCompo();
+if (isset($_REQUEST['mod_name'])) {
+ $criteria->add(new Criteria('table_mid', $_REQUEST['mod_name']));
+} else {
+ $criteria->add(new Criteria('table_mid'));
+}
+
+$nb_tables = $tablesHandler->getCount($criteria);
+$tables_arr = $tablesHandler->getAll($criteria);
+
+$from_dir = $modPath.'/modules/'.strtolower($mod_name);
+$to_dir = XOOPS_ROOT_PATH.'/modules/'.strtolower($mod_name);
+$class = 'even';
+echo $adminMenu->addNavigation('building.php');
+switch ($op) {
+ case 'build':
+ // Clear local directory of this module if exist
+ TDMCreate_clearDir($from_dir);
+ // Clear in root modules directory of this module if exist
+ TDMCreate_clearDir($to_dir);
+ // Debut
+ TDMCreate_OpenTable(_AM_TDMCREATE_BUILDING_FILES, _AM_TDMCREATE_BUILDING_SUCCESS, _AM_TDMCREATE_BUILDING_FAILED);
+ /************************************************/
+ /*Structure*/
+ /************************************************/
+ //Creation of the structure of folders and files
+ const_structure($modules);
+ xoops_load('XoopsFile');
+ $folder = XoopsFile::getHandler('folder');
+ echo '<tr class="'.$class.'">';
+ if ( $modules->getVar('mod_install') == 1 ) {
+ if ( $root_modules = $folder->inXoopsPath('/modules') ) {
+ if ( $folder->copy(array($root_modules, $from_dir, '755')) ) {
+ echo '<td style="padding-left: 30px;">'.sprintf(_AM_TDMCREATE_CONST_OK_ARCHITECTURE_ROOT, $to_dir).'</td>
+ <td> </td>
+ <td class="center"><img src='. $pathIcon16 .'/off.png></td>';
+ } else {
+ echo '<td style="padding-left: 30px;">'.sprintf(_AM_TDMCREATE_CONST_NOTOK_ARCHITECTURE_ROOT, $to_dir).'</td>
+ <td> </td>
+ <td class="center"><img src='. $pathIcon16 .'/off.png></td>';
+ }
+ }
+ }
+ echo '</tr>';
+ //Creation of changelog.txt
+ const_changelog($modules);
+
+ $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix('mod_tdmcreate_tables') . " WHERE table_name = 'mod_".strtolower($mod_name)."_categories'");
+ list( $category ) = $xoopsDB->fetchRow($result);
+
+ foreach (array_keys($tables_arr) as $i)
+ {
+ // Variables
+ $table_name = $tables_arr[$i]->getVar('table_name');
+ $table_fieldname = $tables_arr[$i]->getVar('table_fieldname');
+ $table_category = $tables_arr[$i]->getVar('table_category');
+ $table_fields = $tables_arr[$i]->getVar('table_fields');
+ $table_parameters = $tables_arr[$i]->getVar('table_parameters');
+ $table_image = $tables_arr[$i]->getVar('table_image');
+ $table_blocks = $tables_arr[$i]->getVar('table_blocks');
+ $table_admin = $tables_arr[$i]->getVar('table_admin');
+ $table_user = $tables_arr[$i]->getVar('table_user');
+ $table_search = $tables_arr[$i]->getVar('table_search');
+ $table_comments = $tables_arr[$i]->getVar('table_comments');
+ $table_notifications = $tables_arr[$i]->getVar('table_notifications');
+ $table_permissions = $tables_arr[$i]->getVar('table_permissions');
+ $table_waiting = $tables_arr[$i]->getVar('table_waiting');
+
+ // Fabrication
+ // Copy of images tables
+ $table_image1 = $modPath . '/images/uploads/tables/' . $table_image;
+ if (file_exists($table_image1)) {
+ copy($table_image1, $modPath . '/modules/' . strtolower($mod_name) . '/images/icons/32/' . $table_image);
+ }
+ // Creation of classes
+ if ( $table_admin == 1 || $table_user == 1) {
+ const_class($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $table_category, $table_permissions);
+ }
+ // Creation of pages admin
+ if ( $table_admin == 1 ) {
+ const_admin_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $category);
+ }
+ // Creation of pages and templates user
+ if ( $table_user == 1 && $table_name != null ) {
+ const_user_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
+ const_templates_pages($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
+ }
+ // Creation of search
+ if ( $table_search == 1 ) {
+ const_include_search($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $table_image);
+ }
+ // Creation of admin permissions.php
+ if ( $table_permissions == 1) {
+ const_admin_permissions($modules, $table_name, $table_fields, $table_parameters);
+ }
+ // Creation of notifications
+ if ( $table_notifications == 1 ) {
+ const_include_notifications($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
+ }
+ // Creation of the file mysql.sql
+ const_sql($modules, $table_name, $table_fieldname, $table_fields, $category);
+
+ // Creation of blocks
+ if ( $table_blocks == 1 ) {
+ const_blocks($modules, $table_name, $table_fieldname, $table_fields, $table_parameters, $category);
+ //Creation of template per blocks
+ const_blocks_templates($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
+ }
+ //$class = ($class == 'even') ? 'odd' : 'even';
+ }
+ $table_name = isset($table_name) ? $table_name : null;
+ $table_comments = isset($table_comments) ? $table_comments : null;
+ $table_waiting = isset($table_waiting) ? $table_waiting : null;
+ $table_parameters = isset($table_parameters) ? $table_parameters : null;
+ $table_user = isset($table_user) ? $table_user : null;
+ $table_admin = isset($table_admin) ? $table_admin : null;
+ $table_fields = isset($table_fields) ? $table_fields : null;
+ $table_blocks = isset($table_blocks) ? $table_blocks : null;
+ $table_image = isset($table_image) ? $table_image : null;
+ $table_permissions = isset($table_permissions) ? $table_permissions : null;
+ $table_notifications = isset($table_notifications) ? $table_notifications : null;
+ //Creation of architecture of more fields and data
+ //const_architecture(null, null, $table_admin, $table_blocks, $table_admin, $table_blocks );
+ // Creation of comments
+ if ( $table_comments == 1 ) {
+ const_include_comments($modules, $table_name, $table_fieldname, $table_fields, $table_parameters);
+ }
+
+ if ( $table_waiting == 1 ) {
+ // Creation of Waiting Plugin
+ const_waiting($modules, $tables_arr);
+ }
+ // Creation of class helper, module & request
+ if ( $table_name != '' ) {
+ const_class_helper($modules);
+ const_class_module($modules);
+ const_class_request($modules);
+ }
+ // Creation of xoopsversion.php
+ const_xoopsversion($modules, $table_name, $table_fields, $table_parameters, $table_image, $tables_arr);
+ // Creation of template index
+ const_templates_index($modules);
+ // Creation of template header
+ const_templates_header($modules, $tables_arr);
+ // Creation of template footer
+ const_templates_footer($modules, $table_comments, $table_notifications);
+
+ if ( $table_admin == 1 ) {
+ // Creation of template admin about
+ const_templates_admin_about($modules);
+ // Creation of template admin help
+ const_templates_admin_help($modules);
+ }
+ // Include
+ ///////////////////////////////////////////////////////////////////////
+ // Configs
+ const_include_common($modules, $mod_author_website_name, $mod_author_website_url);
+ // Functions
+ const_include_functions($modules);
+ //Creation of file install per l'uploads
+ const_include_install($modules, $tables_arr);
+ // Language
+ ///////////////////////////////////////////////////////////////////////
+ if ( $mod_user == 1 ) {
+ //Creation of language main.php
+ const_main_language($modules, $tables_arr);
+ }
+ // Creation of language modinfo.php
+ const_modinfo_language($modules, $table_name, $table_image, $tables_arr, $mod_notifications);
+ if ( $table_admin == 1 ) {
+ // Creation of language admin.php
+ const_admin_language($modules, $tables_arr, $mod_permissions);
+ }
+ if ( $table_blocks == 1 ) {
+ // Creation of language blocks.php
+ const_blocks_language($modules, $tables_arr);
+ }
+ // Creation of language help/help.html
+ const_help_language($modules);
+ ///////////////////////////////////////////////////////////////////////
+ //Creation of style.css
+ const_css_style($modules);
+ /************************************************/
+ /*Admin*/
+ /************************************************/
+ // Creation of admin header.php
+ const_admin_header($modules, $table_name, $tables_arr);
+ // Creation of admin index.php
+ const_admin_index($modules, $tables_arr);
+ // Creation of admin footer.php
+ const_admin_footer($modules);
+ // Creation of admin menu.php
+ const_admin_menu($modules, $tables_arr, $mod_permissions);
+ // Creation of admin about.php
+ const_admin_about($modules);
+ /************************************************/
+ /*User*/
+ /************************************************/
+ if ( $mod_user == 1 ) {
+ const_user_header($modules);
+ const_user_index($modules);
+ const_user_footer($modules);
+ }
+ if ( $modules->getVar('mod_install') == 1 ) {
+ copyInRootModules($from_dir, $to_dir);
+ }
+ TDMCreate_CloseTable();
+ break;
+
+ case 'default':
+ default:
+ include_once(XOOPS_ROOT_PATH . '/class/xoopsformloader.php');
+ $action = $_SERVER['REQUEST_URI'];
+
+ $form = new XoopsThemeForm(_AM_TDMCREATE_ADMIN_CONST, 'buildform', $action, 'post', true);
+
+ $mod_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_MODULES, 'mod_name', 'mod_name');
+ $mod_select->addOptionArray($modulesHandler->getList());
+ $form->addElement($mod_select, true);
+
+ $form->addElement(new XoopsFormHidden('op', 'build'));
+ $form->addElement(new XoopsFormButton(_REQUIRED.' <span class="red bold">*</span>', 'submit', _SUBMIT, 'submit'));
+ $form->display();
+ break;
+}
+include 'footer.php';
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/footer.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/footer.php 2014-04-17 21:19:14 UTC (rev 12457)
@@ -0,0 +1,26 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: footer.php 12207 2013-10-23 02:46:52Z beckmi $
+ */
+echo "<div align='center'><a href='http://www.xoops.org' title='Visit XOOPS' target='_blank'>
+ <img src='".$pathIcon32."/xoopsmicrobutton.gif' alt='XOOPS' /></a></div>";
+echo "<div class='center smallsmall italic pad5'>
+ <strong>" . $xoopsModule->getVar('name') . "</strong> is maintained by the
+ <a href='http://xoops.org/forums/newbb' title='Visit Support Forum' class='tooltip' rel='external'>Support Forum</a></div>";
+xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/header.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/header.php 2014-04-17 21:19:14 UTC (rev 12457)
@@ -0,0 +1,54 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: header.php 12207 2013-10-23 02:46:52Z beckmi $
+ */
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+include_once('../include/functions.php');
+include_once 'includes.php';
+//
+$thisDirname = $GLOBALS['xoopsModule']->getVar('dirname');
+//
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+// Get class handler
+$modulesHandler =& xoops_getModuleHandler('modules', $thisDirname);
+$tablesHandler =& xoops_getModuleHandler('tables', $thisDirname);
+//
+$myts =& MyTextSanitizer::getInstance();
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+//
+$GLOBALS['xoopsTpl']->assign('pathIcon16', $pathIcon16);
+$GLOBALS['xoopsTpl']->assign('pathIcon32', $pathIcon32);
+//Load languages
+xoops_loadLanguage('admin', $thisDirname);
+xoops_loadLanguage('modinfo', $thisDirname);
+xoops_loadLanguage('main', $thisDirname);
+// Locad admin menu class
+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);
+}
+xoops_cp_header();
+$adminMenu = new ModuleAdmin();
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/includes.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/includes.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/includes.php 2014-04-17 21:19:14 UTC (rev 12457)
@@ -0,0 +1,66 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: includes.php 11084 2013-02-23 15:44:20Z timgno $
+ */
+include '../../../include/cp_header.php';
+include_once("../include/functions.php");
+
+$modPath = XOOPS_ROOT_PATH.'/modules/TDMCreate';
+$cPath = $modPath.'/const';
+
+include_once $cPath.'/const_structure.php';
+include_once $cPath.'/const_xoopsversion.php';
+include_once $cPath.'/const_changelog.php';
+include_once $cPath.'/const_include_search.php';
+include_once $cPath.'/const_include_comments.php';
+include_once $cPath.'/const_include_notifications.php';
+include_once $cPath.'/const_include_common.php';
+include_once $cPath.'/const_include_functions.php';
+include_once $cPath.'/const_include_install.php';
+include_once $cPath.'/const_waiting.php';
+include_once $cPath.'/const_css_style.php';
+include_once $cPath.'/const_sql.php';
+include_once $cPath.'/const_blocks.php';
+include_once $cPath.'/const_blocks_templates.php';
+include_once $cPath.'/const_class.php';
+include_once $cPath.'/const_class_helper.php';
+include_once $cPath.'/const_class_request.php';
+include_once $cPath.'/const_class_module.php';
+include_once $cPath.'/const_admin_header.php';
+include_once $cPath.'/const_admin_footer.php';
+include_once $cPath.'/const_admin_menu.php';
+include_once $cPath.'/const_admin_index.php';
+include_once $cPath.'/const_admin_pages.php';
+include_once $cPath.'/const_admin_about.php';
+include_once $cPath.'/const_admin_permissions.php';
+include_once $cPath.'/const_admin_language.php';
+include_once $cPath.'/const_modinfo_language.php';
+include_once $cPath.'/const_help_language.php';
+include_once $cPath.'/const_blocks_language.php';
+include_once $cPath.'/const_main_language.php';
+include_once $cPath.'/const_user_header.php';
+include_once $cPath.'/const_user_index.php';
+include_once $cPath.'/const_user_pages.php';
+include_once $cPath.'/const_user_footer.php';
+include_once $cPath.'/const_templates_header.php';
+include_once $cPath.'/const_templates_index.php';
+include_once $cPath.'/const_templates_pages.php';
+include_once $cPath.'/const_templates_footer.php';
+include_once $cPath.'/const_templates_admin_about.php';
+include_once $cPath.'/const_templates_admin_help.php';
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/index.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/index.html (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/index.html 2014-04-17 21:19:14 UTC (rev 12457)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/index.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/index.php 2014-04-17 21:19:14 UTC (rev 12457)
@@ -0,0 +1,32 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: index.php 11084 2013-02-23 15:44:20Z timgno $
+ */
+include 'header.php';
+ $criteria = new CriteriaCompo();
+ $count_modules = $modulesHandler->getCount($criteria);
+ $count_tables = $tablesHandler->getCount($criteria);
+
+$adminMenu->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES) ;
+$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' ._AM_TDMCREATE_THEREARE_NUMMODULES. '</label>', $count_modules, 'Green') ;
+$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' ._AM_TDMCREATE_THEREARE_NUMTABLES. '</label>', $count_tables, 'Orange');
+
+ echo $adminMenu->addNavigation('index.php');
+ echo $adminMenu->renderIndex();
+include 'footer.php';
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/menu.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/menu.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/menu.php 2014-04-17 21:19:14 UTC (rev 12457)
@@ -0,0 +1,46 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: menu.php 11084 2013-02-23 15:44:20Z timgno $
+ */
+$module_handler =& xoops_gethandler('module');
+$xoopsModule =& XoopsModule::getByDirname('TDMCreate');
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathIcon32 = $moduleInfo->getInfo('icons32');
+$adminmenu = array();
+$i = 1;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_INDEX;
+$adminmenu[$i]["link"] = 'admin/index.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_MODULES;
+$adminmenu[$i]["link"] = 'admin/modules.php';
+$adminmenu[$i]["icon"] = 'images/icons/32/addmodule.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_TABLES;
+$adminmenu[$i]["link"] = 'admin/tables.php';
+$adminmenu[$i]["icon"] = 'images/icons/32/addtable.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_CONST;
+$adminmenu[$i]["link"] = 'admin/building.php';
+$adminmenu[$i]["icon"] = 'images/icons/32/builder.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_ABOUT;
+$adminmenu[$i]["link"] = 'admin/about.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
+unset($i);
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/modules.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/modules.php 2014-04-17 21:19:14 UTC (rev 12457)
@@ -0,0 +1,188 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: modules.php 11084 2013-02-23 15:44:20Z timgno $
+ */
+include_once 'header.php';
+$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'list', 'string' );
+echo $adminMenu->addNavigation('modules.php');
+switch ($op)
+{
+ case 'save':
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ if (isset($_REQUEST['mod_id'])) {
+ $obj =& $modulesHandler->get($_REQUEST['mod_id']);
+ } else {
+ $obj =& $modulesHandler->create();
+ }
+ //Image 'gif|jpeg|pjpeg|png' 500000
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ $uploaddir = XOOPS_ROOT_PATH . '/modules/'.$xoopsModule->dirname().'/images/uploads/modules/';
+ $uploader = new XoopsMediaUploader($uploaddir, xoops_getModuleOption('mimetypes', $thisDirname),
+ xoops_getModuleOption('maxsize', $thisDirname), null, null);
+
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attachedfile']['name']) ;
+ $img_name = $obj->getVar('mod_name').'_slogo.'.$extension;
+ $uploader->setTargetFileName($img_name);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header('javascript:history.go(-1)', 3, $errors);
+ } else {
+ $obj->setVar('mod_image', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('mod_image', $_POST['mod_image']);
+ }
+
+ $obj->setVar('mod_name', preg_replace('/\s+/', '', $_POST['mod_name'])); //remove all spaces from the new name
+ $obj->setVar('mod_version', $_POST['mod_version']);
+ $obj->setVar('mod_since', $_POST['mod_since']);
+ $obj->setVar('mod_min_php', $_POST['mod_min_php']);
+ $obj->setVar('mod_min_xoops', $_POST['mod_min_xoops']);
+ $obj->setVar('mod_min_admin', $_POST['mod_min_admin']);
+ $obj->setVar('mod_min_mysql', $_POST['mod_min_mysql']);
+ $obj->setVar('mod_description', $_POST['mod_description']);
+ $obj->setVar('mod_author', $_POST['mod_author']);
+ $obj->setVar('mod_author_mail', $_POST['mod_author_mail']);
+ $obj->setVar('mod_author_website_url', $_POST['mod_author_website_url']);
+ $obj->setVar('mod_author_website_name', $_POST['mod_author_website_name']);
+ $obj->setVar('mod_credits', $_POST['mod_credits']);
+ $obj->setVar('mod_license', $_POST['mod_license']);
+ $obj->setVar('mod_release_info', $_POST['mod_release_info']);
+ $obj->setVar('mod_release_file', $_POST['mod_release_file']);
+ $obj->setVar('mod_manual', $_POST['mod_manual']);
+ $obj->setVar('mod_manual_file', $_POST['mod_manual_file']);
+ $obj->setVar('mod_demo_site_url', $_POST['mod_demo_site_url']);
+ $obj->setVar('mod_demo_site_name', $_POST['mod_demo_site_name']);
+ $obj->setVar('mod_support_url', $_POST['mod_support_url']);
+ $obj->setVar('mod_support_name', $_POST['mod_support_name']);
+ $obj->setVar('mod_website_url', $_POST['mod_website_url']);
+ $obj->setVar('mod_website_name', $_POST['mod_website_name']);
+ $obj->setVar('mod_release', $_POST['mod_release']);
+ $obj->setVar('mod_status', $_POST['mod_status']);
+ $obj->setVar('mod_admin', $_REQUEST['mod_admin']);
+ $obj->setVar('mod_user', $_REQUEST['mod_user']);
+ $obj->setVar('mod_search', $_REQUEST['mod_search']);
+ $obj->setVar('mod_comments', $_REQUEST['mod_comments']);
+ $obj->setVar('mod_notifications', $_REQUEST['mod_notifications']);
+ $obj->setVar('mod_permissions', $_REQUEST['mod_permissions']);
+ $obj->setVar('mod_install', $_REQUEST['mod_install']);
+ $obj->setVar('mod_donations', $_POST['mod_donations']);
+ $obj->setVar('mod_subversion', $_POST['mod_subversion']);
+
+ if ($modulesHandler->insert($obj)) {
+ redirect_header('modules.php?op=list', 2, _AM_TDMCREATE_FORMOK);
+ }
+ break;
+
+ case 'new':
+ $GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
+ $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php?op=list', 'list');
+ echo $adminMenu->renderButton();
+
+ $obj =& $modulesHandler->create();
+ $form = $obj->getForm();
+ break;
+ case 'edit':
+ $GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
+ $obj =& $modulesHandler->get($_REQUEST['mod_id']);
+ $form = $obj->getForm();
+ break;
+ case 'delete':
+ $obj =& $modulesHandler->get($_REQUEST['mod_id']);
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1)
+ {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ($modulesHandler->delete($obj)) {
+ $xoopsDB->queryF("DELETE FROM ".$xoopsDB->prefix("tdmcreate_modules")." WHERE mod_id = ".$_REQUEST['mod_id']);
+ redirect_header('modules.php', 3, _AM_TDMCREATE_FORMDELOK);
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array('ok' => 1, 'mod_id' => $_REQUEST['mod_id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('mod_name')));
+ }
+ break;
+ case 'list':
+ default:
+ $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_NEW, 'modules.php?op=new', 'add');
+ echo $adminMenu->renderButton();
+
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('mod_id');
+ $criteria->setOrder('ASC');
+ $mod_arr = $modulesHandler->getall($criteria);
+ $numrows_modules = $modulesHandler->getCount();
+
+ if ( $numrows_modules > 0 )
+ {
+ echo '<table width="100%" cellspacing="1" class="outer">';
+ echo '<tr class="center">';
+ echo '<th width="1%">'._AM_TDMCREATE_ID.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_NAME.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
+ echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
+ echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
+ echo '<th width="1%">'._AM_TDMCREATE_FORMACTION.'</th>';
+ echo '</tr>';
+ $class = 'odd';
+ foreach (array_keys($mod_arr) as $i)
+ {
+ $mod_id = $mod_arr[$i]->getVar('mod_id');
+ $mod_name = $mod_arr[$i]->getVar('mod_name');
+ $mod_image = $mod_arr[$i]->getVar('mod_image');
+ //$mod_blocks = $mod_arr[$i]->getVar('mod_blocks');
+ $mod_admin = $mod_arr[$i]->getVar('mod_admin');
+ $mod_user = $mod_arr[$i]->getVar('mod_user');
+ $admin = ($mod_admin == 1) ? _YES : _NO;
+ $user = ($mod_user == 1) ? _YES : _NO;
+ echo '<tr class="odd center">';
+ echo '<td><b>'.$i.'</b></td>';
+ $nbsps = ' ';
+ echo '<td class="left">'.$nbsps.'<img src="../images/icons/16/arrow.gif" alt="Arrow" />'.$nbsps.'<b>'.$mod_name.'</b></td>';
+ echo '<td><img src="../images/uploads/modules/'.$mod_image.'" height="30px" /></td>';
+ echo '<td>'.$admin.'</td>';
+ echo '<td>'.$user.'</td>';
+ echo '<td>';
+ echo '<a href="modules.php?op=edit&mod_id='.$mod_id.'"><img src="'. $pathIcon16 .'/edit.png" alt="'._EDIT.'" title="'._EDIT.'" /></a> <a href="modules.php?op=delete&mod_id='.$mod_id.'"><img src="'. $pathIcon16 .'/delete.png" alt="'._DELETE.'" title="'._DELETE.'" /></a>';
+ echo '</td>';
+ echo '</tr>';
+ }
+ echo '</table><br><br>';
+ } else {
+ echo '<table width="100%" cellspacing="1" class="outer">';
+ echo '<tr class="center">';
+ echo '<th width="1%">'._AM_TDMCREATE_ID.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_NAME.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
+ echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
+ echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
+ echo '<th width="1%">'._AM_TDMCREATE_FORMACTION.'</th>';
+ echo '<tr><td class="errorMsg" colspan="8">No modules</td></tr>';
+ echo '</tr></table><br><br>';
+ }
+ break;
+}
+include_once 'footer.php';
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/tables.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.42/TDMCreate/admin/tables.php 2014-04-17 21:19:14 UTC (rev 12457)
@@ -0,0 +1,486 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: tables.php 11084 2013-02-23 15:44:20Z timgno $
+ */
+include_once 'header.php';
+$op = TDMCreate_CleanVars( $_REQUEST, 'op', 'default', 'string' );
+$table_id = TDMCreate_CleanVars( $_REQUEST, 'table_id', 0 );
+echo $adminMenu->addNavigation('tables.php');
+switch ($op) {
+ case 'save_table':
+ if (isset($_REQUEST['table_id'])) {
+ $obj =& $tablesHandler->get($_REQUEST['table_id']);
+ } else {
+ $obj =& $tablesHandler->create();
+ }
+
+ $obj->setVar('table_mid', $_REQUEST['table_mid']);
+
+ if ( $_REQUEST['select'] == 1 )
+ {
+ $obj->setVar('table_name', 'categories');
+ $obj->setVar('table_category', 1);
+ $obj->setVar('table_fieldname', 'cat');
+ $obj->setVar('table_blocks', 0);
+ $obj->setVar('table_admin', 1);
+ $obj->setVar('table_user', 1);
+ $obj->setVar('table_status', 0);
+ $obj->setVar('table_waiting', 0);
+ $obj->setVar('table_online', 0);
+ $obj->setVar('table_search', 0);
+ $obj->setVar('table_comments', 0);
+ $obj->setVar('table_notifications', 0);
+ $obj->setVar('table_permissions', 0);
+ $obj->setVar('table_nbfields', 7);
+
+ $table_fields = 'cat_id:int:8:unsigned:NOT NULL: :primary|cat_pid:int:5:unsigned:NOT NULL:0:unique|cat_title:varchar:255: :NOT NULL: :unique|cat_desc:text: : :NOT NULL: :|cat_image:varchar:255: :NOT NULL: :|cat_weight:int:5:unsigned:NOT NULL:0:|cat_color:varchar:10: :NULL: :';
+
+ $table_parameters = 'XoopsFormCategory:0:0:0:0:0:1|XoopsFormText:1:1:0:1:0:1|XoopsFormTextArea:0:1:0:0:0:1|XoopsFormUploadImage:1:1:0:0:0:0|XoopsFormText:1:1:0:0:0:0|XoopsFormColorPicker:1:1:0:0:0:0|XoopsFormSelectUser:0:0:0:0:0:1|XoopsFormTextDateSelect:0:0:0:0:0:1|XoopsFormCheckBox:1:1:0:0:0:1';
+
+ //Image
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+
+ if(is_dir($pathIcon32)){
+ $uploaddir = $pathIcon32;
+ }else{
+ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
+ }
+
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile1"]['name']) ;
+ $name_img = 'category.'.$extension;
+ $uploader->setTargetFileName($name_img);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $obj->setVar('table_image', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('table_image', $_REQUEST['table_image1']);
+ }
+ } else {
+
+ $obj->setVar('table_name', strtolower($_REQUEST['table_name']));
+ $obj->setVar('table_fieldname', strtolower($_REQUEST['table_fieldname']));
+ $obj->setVar('table_nbfields', $_REQUEST['table_nbfields']);
+ $obj->setVar('table_blocks', $_REQUEST['table_blocks']);
+ $obj->setVar('table_admin', $_REQUEST['table_admin']);
+ $obj->setVar('table_user', $_REQUEST['table_user']);
+ $obj->setVar('table_status', $_REQUEST['table_status']);
+ $obj->setVar('table_waiting', $_REQUEST['table_waiting']);
+ $obj->setVar('table_online', $_REQUEST['table_online']);
+ $obj->setVar('table_search', $_REQUEST['table_search']);
+ $obj->setVar('table_comments', $_REQUEST['table_comments']);
+ $obj->setVar('table_notifications', $_REQUEST['table_notifications']);
+ $obj->setVar('table_permissions', $_REQUEST['table_permissions']);
+
+ $table_fields = '';
+ $table_parameters = '';
+ for($i=0; $i<$_REQUEST['table_nbfields']; $i++)
+ {
+ //Additions of parameters: text: on: off: ...
+ if ( $i != 0 ) {
+ $table_parameters .= ( !empty($_REQUEST['fields_param_elements'][$i]) ) ? "".$_REQUEST['fields_param_elements'][$i].":" : " :";
+ $table_parameters .= ( !empty($_REQUEST['fields_param_admin'][$i]) ) ? "1:" : "0:";
+ $table_parameters .= ( !empty($_REQUEST['fields_param_user'][$i]) ) ? "1:" : "0:";
+ $table_parameters .= ( !empty($_REQUEST['fields_param_blocks'][$i]) ) ? "1:" : "0:";
+ $table_parameters .= ( $i == $_REQUEST['fields_param_main_field']) ? "1:" : "0:";
+ $table_parameters .= ( !empty($_REQUEST['fields_param_search_field'][$i]) ) ? "1:" : "0:";
+ $table_parameters .= ( !empty($_REQUEST['fields_param_required_field'][$i]) ) ? "1" : "0";
+ }
+
+ //Additions of fields: test: int: 4: ...
+ $table_fields .= (!empty($_REQUEST['fields_name'][$i])) ? $_REQUEST['fields_name'][$i].":" : " :";
+ $table_fields .= (!empty($_REQUEST['fields_type'][$i])) ? $_REQUEST['fields_type'][$i].":" : " :";
+ $table_fields .= (!empty($_REQUEST['fields_value'][$i])) ? $_REQUEST['fields_value'][$i].":" : " :";
+ $table_fields .= (!empty($_REQUEST['fields_attributes'][$i])) ? $_REQUEST['fields_attributes'][$i].":" : " :";
+ $table_fields .= (!empty($_REQUEST['fields_null'][$i])) ? strtoupper($_REQUEST['fields_null'][$i]).":" : " :";
+ $table_fields .= (!empty($_REQUEST['fields_default'][$i])) ? $_REQUEST['fields_default'][$i].":" : " :";
+ $table_fields .= (!empty($_REQUEST['fields_index'][$i])) ? $_REQUEST['fields_index'][$i]."" : " ";
+
+ // Break between fields and between the parameters
+ if ( $i != $_REQUEST['table_nbfields'] - 1) {
+ $table_fields .= '|';
+ if ( $i != 0 )
+ $table_parameters .= '|';
+ } else {
+ if ( isset($_REQUEST['table_status']) ) {
+ if ( $_REQUEST['table_status'] == 1 ) {
+ $table_fields .= '|'.strtolower($_REQUEST['table_fieldname']).'_status:int:10:unsigned:NOT NULL:0:';
+ $table_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1';
+ }
+ } else {
+ $table_fields .= '';
+ $table_parameters .= '';
+ }
+ if ( isset($_REQUEST['table_waiting']) ) {
+ if ( $_REQUEST['table_waiting'] == 1 ) {
+ $table_fields .= '|'.strtolower($_REQUEST['table_fieldname']).'_waiting:int:10:unsigned:NOT NULL:0:';
+ $table_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1';
+ }
+ } else {
+ $table_fields .= '';
+ $table_parameters .= '';
+ }
+ if ( isset($_REQUEST['table_online']) ) {
+ if ( $_REQUEST['table_online'] == 1 ) {
+ $table_fields .= '|'.strtolower($_REQUEST['table_fieldname']).'_online:tinyint:1: unsigned:NOT NULL:0:'; $table_parameters .= '|XoopsFormCheckBox:1:1:1:0:0:1';
+ }
+ } else {
+ $table_fields .= '';
+ $table_parameters .= '';
+ }
+ }
+ }
+ }
+ $obj->setVar('table_fields', $table_fields);
+ $obj->setVar('table_parameters', $table_parameters);
+
+ if ($tablesHandler->insert($obj)) {
+ redirect_header('tables.php', 2, _AM_TDMCREATE_FORMOK);
+ }
+
+ break;
+
+ case 'table_save_fields':
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ if (isset($_REQUEST['table_id'])) {
+ $obj =& $tablesHandler->get($_REQUEST['table_id']);
+ } else {
+ $obj =& $tablesHandler->create();
+ }
+
+ //Image
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ if(is_dir($pathIcon32)){
+ $uploaddir = $pathIcon32;
+ }else{
+ $uploaddir = XOOPS_ROOT_PATH . '/modules/'.$xoopsModule->dirname().'/images/uploads/tables/';
+ }
+ $uploader = new XoopsMediaUploader($uploaddir, 'gif|jpeg|pjpeg|png', 104857600, null, null);
+
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attachedfile']['name']);
+ $name_img = $_REQUEST['table_name'].'.'.$extension;
+ $uploader->setTargetFileName($name_img);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header('javascript:history.go(-1)', 3, $errors);
+ } else {
+ $obj->setVar('table_image', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('table_image', $_REQUEST['table_image']);
+ }
+
+
+ $oldname = $obj->getVar('table_fieldname');
+
+ $obj->setVar('table_mid', strtolower($_POST['table_mid']));
+ $obj->setVar('table_name', strtolower($_POST['table_name']));
+ $obj->setVar('table_fieldname', strtolower($_POST['table_fieldname']));
+ $obj->setVar('table_nbfields', $_POST['table_nbfields']);
+ $obj->setVar('table_blocks', $_REQUEST['table_blocks']);
+ $obj->setVar('table_admin', $_REQUEST['table_admin']);
+ $obj->setVar('table_user', $_REQUEST['table_user']);
+ $obj->setVar('table_status', $_REQUEST['table_status']);
+ $obj->setVar('table_waiting', $_REQUEST['table_waiting']);
+ $obj->setVar('table_online', $_REQUEST['table_online']);
+ $obj->setVar('table_search', $_REQUEST['table_search']);
+ $obj->setVar('table_comments', $_REQUEST['table_comments']);
+ $obj->setVar('table_notifications', $_REQUEST['table_notifications']);
+ $obj->setVar('table_permissions', $_REQUEST['table_permissions']);
+
+ $table_fields = $obj->getVar('table_fields');
+ $table_nbfields=$_REQUEST['table_nbfields'];
+
+ $fields_total = explode('|', $table_fields);
+ $count_fields = count($fields_total);
+
+ $newname = strtolower($_REQUEST['table_fieldname']);
+ //echo $count_parameters;
+ //fields
+ for($i=0; $i<$count_fields; $i++)
+ {
+ $fields = explode(":", $fields_total[$i]);
+ $fields[0] = $newname . substr($fields[0], stripos($fields[0], '_'));
+ $newfields[$i] = implode(":", $fields);
+ }
+
+ $newTableFields=implode("|",$newfields);
+ $obj->setVar('table_fields', $newTableFields);
+
+ if ($tablesHandler->insert($obj)) {
+ redirect_header('tables.php', 2, _AM_TDMCREATE_FORMOK);
+ }
+ break;
+
+ case "edit_table":
+ $GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
+ $table_id = TDMCreate_CleanVars( $_REQUEST, 'table_id', 0);
+ $table_mid = TDMCreate_CleanVars( $_REQUEST, 'table_mid', 0);
+ $obj =& $tablesHandler->get($_REQUEST['table_id']);
+ $form = $obj->getFormTable(false, $_REQUEST['table_id'], $_REQUEST['table_mid']);
+ break;
+
+ case "edit_fields":
+ $obj =& $tablesHandler->get($_REQUEST['table_id']);
+ $table_id = TDMCreate_CleanVars( $_REQUEST, 'table_id', 0);
+ $form = $obj->getFormEditFields(false, $_REQUEST['table_id']);
+ break;
+
+ case "delete_table":
+ $table_id = TDMCreate_CleanVars( $_REQUEST, 'table_id', 0);
+ $obj =& $tablesHandler->get($table_id);
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('tables.php', 3, impl...
[truncated message content] |
|
From: <luc...@us...> - 2014-04-17 21:08:01
|
Revision: 12456
http://sourceforge.net/p/xoops/svn/12456
Author: luciorota
Date: 2014-04-17 21:07:56 +0000 (Thu, 17 Apr 2014)
Log Message:
-----------
import procedure: check if limit options are compatible with php.ini 'max_input_vars' setting
standardize (in progress)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_subscrinfo.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/search.inc.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -25,7 +25,7 @@
* Version : $Id $
* ****************************************************************************
*/
-
+$currentFile = basename(__FILE__);
include "admin_header.php";
xoops_cp_header();
@@ -43,32 +43,31 @@
$skipcatsubscrexist = xNewsletter_CleanVars($_REQUEST, 'skipcatsubscrexist', 1, 'int' );
$check_import = xNewsletter_CleanVars($_REQUEST, 'check_import', 0, 'int');
-// echo "<br/>op:$op plugin:$plugin cat_id:$cat_id action_after_read:$action_after_read start:$start limitcheck:$limitcheck skipcatsubscrexist:$skipcatsubscrexist<br/><br/>";
+echo $indexAdmin->addNavigation($currentFile);
-echo $indexAdmin->addNavigation("import.php");
-
switch ($op) {
case "show_formcheck":
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
- $crit_import = new CriteriaCompo();
- $crit_import->setSort("import_id");
- $crit_import->setOrder("ASC");
- $numrows = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
+ $import_criteria = new CriteriaCompo();
+ $import_criteria->setSort("import_id");
+ $import_criteria->setOrder("ASC");
+ $numrows = $xnewsletter->getHandler('xNewsletter_import')->getCount($import_criteria);
- $crit_import->setStart($start);
- $crit_import->setLimit($limitcheck);
- $import_arr = $xnewsletter->getHandler('xNewsletter_import')->getall($crit_import);
+ $import_criteria->setStart($start);
+ $import_criteria->setLimit($limitcheck);
+ $import_arr = $xnewsletter->getHandler('xNewsletter_import')->getall($import_criteria);
if ($numrows > 0) {
include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
$action = $_SERVER["REQUEST_URI"];
$unique_id = uniqid(mt_rand());
- $form = "<br/><form name=\"form_import_".$unique_id."\" id=\"form_import_".$unique_id."\" action=\"import.php\" method=\"post\" enctype=\"multipart/form-data\">";
+ $form = "<br/>";
+ $form .= "<form name=\"form_import_{$unique_id}\" id=\"form_import_{$unique_id}\" action=\"{$currentFile}\" method=\"post\" enctype=\"multipart/form-data\">";
- $showlimit = str_replace("%s", $start+1, _AM_XNEWSLETTER_IMPORT_SHOW);
+ $showlimit = str_replace("%s", $start + 1, _AM_XNEWSLETTER_IMPORT_SHOW);
if ($limitcheck < $numrows) {
$showlimit = str_replace("%l", $limitcheck, $showlimit);
} else {
@@ -76,22 +75,23 @@
}
$showlimit = str_replace("%n", $numrows, $showlimit);
- $form .="<table width=\"100%\" cellspacing=\"1\" class=\"outer\">
+ $form .= "
+ <table width=\"100%\" cellspacing=\"1\" class=\"outer\">
<tr>
- <td align=\"left\" colspan='8'>".$showlimit."</td>
+ <td align=\"left\" colspan='8'>" . $showlimit . "</td>
</tr>";
$class = "odd";
- $form .="
+ $form .= "
<tr>
<th align=\"center\"> </th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_EMAIL."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_SEX."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_LASTNAME."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_CAT_NAME."</th>
+ <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_EMAIL . "</th>
+ <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_SEX . "</th>
+ <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_FIRSTNAME . "</th>
+ <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_LASTNAME . "</th>
+ <th align=\"center\">" . _AM_XNEWSLETTER_IMPORT_EMAIL_EXIST . "</th>
+ <th align=\"center\">" . _AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST . "</th>
+ <th align=\"center\">" . _AM_XNEWSLETTER_CAT_NAME . "</th>
</tr>";
$class = "odd";
@@ -105,7 +105,7 @@
foreach (array_keys($import_arr) as $i) {
$counter++;
- $form .= "<tr class=\"".$class."\">";
+ $form .= "<tr class=\"" . $class . "\">";
$class = ($class == "even") ? "odd" : "even";
$form .= "<td align=\"center\">".$counter;
$form .= "<input type='hidden' name='import_id_".$counter."' title='import_id_".$counter."' id='import_id_".$counter."' value='".$import_arr[$i]->getVar("import_id")."' />";
@@ -116,41 +116,48 @@
$form .= "<td align=\"center\">";
$sex = $import_arr[$i]->getVar("import_sex");
- $form .= "<select size=\"1\" name=\"sex_".$counter."\" id=\"sex_".$counter."\" title=\""._AM_XNEWSLETTER_SUBSCR_SEX."\" ";
- $form .= "value=\"".$sex."\">";
+ $form .= "<select size=\"1\" name=\"sex_" . $counter . "\" id=\"sex_" . $counter . "\" title=\"" . _AM_XNEWSLETTER_SUBSCR_SEX . "\" ";
+ $form .= "value=\"" . $sex . "\">";
$form .= "<option value=\"\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_EMPTY."</option>";
- $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FEMALE) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."</option>";
- $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_MALE."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_MALE) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_MALE."</option>";
- $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_COMP."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_COMP) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_COMP."</option>";
+ if ($sex == _AM_XNEWSLETTER_SUBSCR_SEX_EMPTY)
+ $form .= " selected=\"selected\"";
+ $form .= ">" . _AM_XNEWSLETTER_SUBSCR_SEX_EMPTY . "</option>";
+ $form .= "<option value=\"" . _AM_XNEWSLETTER_SUBSCR_SEX_FEMALE . "\"";
+ if ($sex == _AM_XNEWSLETTER_SUBSCR_SEX_FEMALE)
+ $form .= " selected=\"selected\"";
+ $form .= ">" . _AM_XNEWSLETTER_SUBSCR_SEX_FEMALE . "</option>";
+ $form .= "<option value=\"" . _AM_XNEWSLETTER_SUBSCR_SEX_MALE . "\"";
+ if ($sex == _AM_XNEWSLETTER_SUBSCR_SEX_MALE)
+ $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_MALE . "</option>";
+ $form .= "<option value=\"" . _AM_XNEWSLETTER_SUBSCR_SEX_COMP . "\"";
+ if ($sex == _AM_XNEWSLETTER_SUBSCR_SEX_COMP)
+ $form .= " selected=\"selected\"";
+ $form .= ">" . _AM_XNEWSLETTER_SUBSCR_SEX_COMP . "</option>";
$form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."</option>";
+ if ($sex == _AM_XNEWSLETTER_SUBSCR_SEX_FAMILY)
+ $form .= " selected=\"selected\"";
+ $form .= ">" . _AM_XNEWSLETTER_SUBSCR_SEX_FAMILY . "</option>";
$form .= "</select>\n";
$form .= "</td>";
$form .= "<td align=\"center\">";
- $form .= "<input type='text' name='firstname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."' id='firstname_".$counter."' value='".$import_arr[$i]->getVar("import_firstname")."' />";
+ $form .= "<input type='text' name='firstname_" . $counter . "' title='"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."' id='firstname_".$counter."' value='".$import_arr[$i]->getVar("import_firstname")."' />";
$form .= "</td>";
$form .= "<td align=\"center\">";
- $form .= "<input type='text' name='lastname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_LASTNAME."' id='lastname_".$counter."' value='".$import_arr[$i]->getVar("import_lastname")."' />";
+ $form .= "<input type='text' name='lastname_" . $counter . "' title='"._AM_XNEWSLETTER_SUBSCR_LASTNAME."' id='lastname_".$counter."' value='".$import_arr[$i]->getVar("import_lastname")."' />";
$form .= "</td>";
$form .= "<td align=\"center\">";
$subscr_id = $import_arr[$i]->getVar("import_subscr_id");
$form .= "<input type='hidden' name='subscr_id_".$counter."' title='subscr_id' id='subscr_id_".$counter."' value='".$subscr_id."' />";
- if ($subscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' />";
+ if ($subscr_id > 0)
+ $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' />";
$form .= "</td>";
$form .= "<td align=\"center\">";
$catsubscr_id = $import_arr[$i]->getVar("import_catsubscr_id");
$form .= "<input type='hidden' name='catsubscr_id_".$counter."' title='catsubscr_id' id='catsubscr_id_".$counter."' value='".$catsubscr_id."' />";
- if ($catsubscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' />";
+ if ($catsubscr_id > 0)
+ $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' />";
$form .= "</td>";
$form .= "</td>";
$form .= "<td align=\"center\">";
@@ -190,7 +197,7 @@
//update mod_xnewsletter with settings form_import
$counter = xNewsletter_CleanVars($_REQUEST, 'counter', 0, 'int');
- for ($i=1; $i < ($counter+1); $i++) {
+ for ($i=1; $i < ($counter + 1); $i++) {
$import_id = xNewsletter_CleanVars($_REQUEST, 'import_id_'.$i, 'default', 'string');
$subscr_firstname = xNewsletter_CleanVars($_REQUEST, 'firstname_'.$i, '', 'string');
$subscr_lastname = xNewsletter_CleanVars($_REQUEST, 'lastname_'.$i, '', 'string');
@@ -198,35 +205,41 @@
$cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id_'.$i, 0, 'int');
if ($cat_id > 0) {
- if ($subscr_id==0) {
+ if ($subscr_id == 0) {
//update sex, firstname, lastname
- $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_sex`='$subscr_sex', `import_firstname`='$subscr_firstname', `import_lastname`='$subscr_lastname' WHERE `import_id`=$import_id";
+ $sql = "UPDATE {$xoopsDB->prefix('mod_xnewsletter_import')}";
+ $sql .= " SET `import_sex`='{$subscr_sex}', `import_firstname`='{$subscr_firstname}', `import_lastname`='{$subscr_lastname}'";
+ $sql .= " WHERE `import_id`={$import_id}";
$result=$xoopsDB->queryF($sql);
}
}
//update cat_id and import_status
- $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_cat_id`='$cat_id', `import_status`=1 WHERE `import_id`=$import_id";
+ $sql = "UPDATE {$xoopsDB->prefix('mod_xnewsletter_import')}";
+ $sql .= " SET `import_cat_id`='{$cat_id}', `import_status`=1";
+ $sql.= " WHERE `import_id`={$import_id}";
$result=$xoopsDB->queryF($sql);
}
- redirect_header("import.php?op=exec_import_final&check_import=1&limitcheck=".$limitcheck, 0, "");
+ redirect_header("{$currentFile}?op=exec_import_final&check_import=1&limitcheck={$limitcheck}", 0, '');
break;
case "exec_import_final":
//execute final import of all data from mod_xnewsletter_import, where import_status = 1
//delete data from mod_xnewsletter_import, when imported (successful or not)
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
$ip = xoops_getenv("REMOTE_ADDR");
$submitter = $xoopsUser->uid();
- $crit_import = new CriteriaCompo();
- $crit_import->add(new Criteria('import_status', "1"));
+ $import_criteria = new CriteriaCompo();
+ $import_criteria->add(new Criteria('import_status', '1'));
$numrows_total = $xnewsletter->getHandler('xNewsletter_import')->getCount();
- $numrows_act = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
+ $numrows_act = $xnewsletter->getHandler('xNewsletter_import')->getCount($import_criteria);
if ( $numrows_act > 0 ) {
- $sql = "SELECT * FROM ".$xoopsDB->prefix("mod_xnewsletter_import")." WHERE ((import_status)=1)";
+ $sql = "SELECT *";
+ $sql .= " FROM {$xoopsDB->prefix("mod_xnewsletter_import")}";
+ $sql .= " WHERE ((import_status)=1)";
$sql .= " ORDER BY `import_id` ASC";
$counter = 0;
$users_import = $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
@@ -242,47 +255,53 @@
$subscribe = 0;
if ($cat_id == 0) {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_SKIP), 1, $submitter);
+ createProtocol(str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_SKIP), 1, $submitter);
} else {
//register email
if ($subscr_id==0) {
$subscr_uid = 0;
- $sql = "SELECT `uid` FROM ".$xoopsDB->prefix("users")." WHERE (`email`='";
- $sql .= $subscr_email;
- $sql .= "') LIMIT 1";
- if ( $user = $xoopsDB->queryF($sql) ) {
+ $sql = "SELECT `uid`";
+ $sql .= " FROM {$xoopsDB->prefix('users')}";
+ $sql .= " WHERE (`email`='{$subscr_email}') LIMIT 1";
+ if ($user = $xoopsDB->queryF($sql)) {
$row_user = mysql_fetch_array($user);
$subscr_uid = $row_user[0];
}
unset($row_user);
unset($user);
- $sql = "INSERT INTO `".$xoopsDB->prefix('mod_xnewsletter_subscr')."` (`subscr_email`, `subscr_firstname`, `subscr_lastname`, `subscr_uid`, `subscr_sex`, `subscr_submitter`, `subscr_created`, `subscr_ip`, `subscr_activated`, `subscr_actoptions`) VALUES ('".$subscr_email."','".$subscr_firstname."','".$subscr_lastname."',".intval($subscr_uid).",'".$subscr_sex."',".$submitter.",".time().",'".$ip."','1','')";
+ $sql = "INSERT";
+ $sql .= " INTO `{$xoopsDB->prefix('mod_xnewsletter_subscr')}`";
+ $sql .= " (`subscr_email`, `subscr_firstname`, `subscr_lastname`, `subscr_uid`, `subscr_sex`, `subscr_submitter`, `subscr_created`, `subscr_ip`, `subscr_activated`, `subscr_actoptions`)";
+ $sql .= " VALUES ('{$subscr_email}', '{$subscr_firstname}', '{$subscr_lastname}', " . intval($subscr_uid) . ", '{$subscr_sex}', {$submitter}, " . time() . ",'{$ip}', '1', '')";
if (!$xoopsDB->queryF($sql)) {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
+ createProtocol(str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
} else {
//register email successful
- $resulttext = $subscr_email.": "._AM_XNEWSLETTER_IMPORT_RESULT_REG_OK." | ";
+ $resulttext = $subscr_email . ": " . _AM_XNEWSLETTER_IMPORT_RESULT_REG_OK . " | ";
$subscr_id = $xoopsDB->getInsertId();
$subscribe=1;
}
} else {
//email already registered
- $resulttext = $subscr_email.": "._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST." | ";
+ $resulttext = $subscr_email . ": " ._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST . " | ";
$subscribe=1;
}
if ($subscribe == 1) {
if ($catsubscr_id==0) {
//add subscription of this email
- $sql = "INSERT INTO `".$xoopsDB->prefix('mod_xnewsletter_catsubscr')."` (`catsubscr_catid`, `catsubscr_subscrid`, `catsubscr_submitter`, `catsubscr_created`) VALUES (".$cat_id.",".$subscr_id.",".$submitter.",".time().")";
+ $sql = "INSERT";
+ $sql .= " INTO `{$xoopsDB->prefix('mod_xnewsletter_catsubscr')}`";
+ $sql .= " (`catsubscr_catid`, `catsubscr_subscrid`, `catsubscr_submitter`, `catsubscr_created`)";
+ $sql .= " VALUES ({$cat_id}, {$subscr_id}, {$submitter}," . time() . ")";
if ($xoopsDB->queryF($sql)) {
- create_prot ( $resulttext._AM_XNEWSLETTER_IMPORT_RESULT_SUBSCR_OK, 1, $submitter);
+ createProtocol($resulttext . _AM_XNEWSLETTER_IMPORT_RESULT_SUBSCR_OK, 1, $submitter);
//handle mailinglists
$cat_mailinglist = 0;
- $sql = "SELECT `cat_mailinglist` FROM ".$xoopsDB->prefix("mod_xnewsletter_cat")." WHERE (`cat_id`=";
- $sql .= $cat_id;
- $sql .= ") LIMIT 1";
- if ( $cat_mls = $xoopsDB->queryF($sql) ) {
+ $sql = "SELECT `cat_mailinglist`";
+ $sql .= " FROM {$xoopsDB->prefix("mod_xnewsletter_cat")}";
+ $sql .= " WHERE (`cat_id`={$cat_id}) LIMIT 1";
+ if ($cat_mls = $xoopsDB->queryF($sql)) {
$cat_ml = mysql_fetch_array($cat_mls);
$cat_mailinglist = $cat_ml[0];
}
@@ -290,18 +309,20 @@
unset($cat_mls);
if ($cat_mailinglist > 0) {
- require_once( XOOPS_ROOT_PATH."/modules/xNewsletter/include/mailinglist.php" );
+ require_once(XOOPS_ROOT_PATH . "/modules/xNewsletter/include/mailinglist.php");
subscribingMLHandler(1, $subscr_id, $cat_mailinglist);
}
} else {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
+ createProtocol(str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
}
} else {
- create_prot ( $resulttext._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST, 1, $submitter);
+ createProtocol($resulttext . _AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST, 1, $submitter);
}
}
}
- $sql_del = "DELETE FROM ".$xoopsDB->prefix('mod_xnewsletter_import')." WHERE `import_id`=".$import_id;
+ $sql_del = "DELETE";
+ $sql_del .= " FROM {$xoopsDB->prefix('mod_xnewsletter_import')}";
+ $sql_del .= " WHERE `import_id`={$import_id}";
$result = $xoopsDB->queryF($sql_del);
}
@@ -314,7 +335,7 @@
$numrows_pend = $xnewsletter->getHandler('xNewsletter_import')->getCount();
if ($numrows_pend > 0) {
- $form_continue = "<form id='form_continue' enctype='multipart/form-data' method='post' action='import.php' name='form_continue'>";
+ $form_continue = "<form id='form_continue' enctype='multipart/form-data' method='post' action='{$currentFile}' name='form_continue'>";
$form_continue .= "<input id='submit' class='formButton' type='submit' title='"._AM_XNEWSLETTER_IMPORT_CONTINUE."' value='"._AM_XNEWSLETTER_IMPORT_CONTINUE."' name='submit'>";
$form_continue .= '<input id="limitcheck" type="hidden" value="'.$limitcheck.'" name="limitcheck">';
if ($check_import==1) {
@@ -344,8 +365,8 @@
//set cat_id as preselected, update information about existing registration/subscriptions
//if ($action_after_read==1) execute import else show form for check before executing import
- $pluginFile = XNEWSLETTER_ROOT_PATH . "/plugins/" . $plugin . '.php';
- if ( !file_exists($pluginFile) ) {
+ $pluginFile = XNEWSLETTER_ROOT_PATH . "/plugins/{$plugin}.php";
+ if (!file_exists($pluginFile)) {
echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
break;
}
@@ -353,14 +374,14 @@
$function = 'xnewsletter_plugin_getdata_' . $plugin;
if (!function_exists($function)) {
- echo "Error: require function 'xnewsletter_plugin_getdata_".$plugin."' doesn't exist";
+ echo "Error: require function 'xnewsletter_plugin_getdata_{$plugin}' doesn't exist";
echo str_replace("%f", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION);
break;
}
//delete all existing data
$sql = "TRUNCATE TABLE ".$xoopsDB->prefix('mod_xnewsletter_import');
- $result=$xoopsDB->queryF($sql);
+ $result= $xoopsDB->queryF($sql);
//import data into mod_xnewsletter_import with plugin
if ($plugin == 'csv') {
@@ -379,37 +400,37 @@
}
if ($numData > 0) {
- if ($action_after_read==0) {
+ if ($action_after_read == 0) {
//execute import without check
- redirect_header("import.php?op=exec_import_final&action_after_read=0&limitcheck=".$limitcheck, 0, "");
+ redirect_header("{$currentFile}?op=exec_import_final&action_after_read=0&limitcheck={$limitcheck}", 0, '');
} else {
//show form for check before executing import
- redirect_header("import.php?op=show_formcheck&action_after_read=1&plugin=".$plugin."&limitcheck=".$limitcheck, 0, "");
+ redirect_header("{$currentFile}?op=show_formcheck&action_after_read=1&plugin={$plugin}&limitcheck={$limitcheck}", 0, '');
}
} else {
- redirect_header("import.php", 3, _AM_XNEWSLETTER_IMPORT_NODATA);
+ redirect_header($currentFile, 3, _AM_XNEWSLETTER_IMPORT_NODATA);
}
break;
case "form_additional":
//show form for additional settings
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
- $pluginFile = XNEWSLETTER_ROOT_PATH . "/plugins/" . $plugin . '.php';
- if ( !file_exists($pluginFile) ) {
+ $pluginFile = XNEWSLETTER_ROOT_PATH . "/plugins/{$plugin}.php";
+ if (!file_exists($pluginFile)) {
echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
break;
}
require_once($pluginFile);
- $function = 'xnewsletter_plugin_getform_' . $plugin;
- if (!function_exists($function) ) {
+ $function = "xnewsletter_plugin_getform_{$plugin}";
+ if (!function_exists($function)) {
echo str_replace("%f", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION);
break;
}
//$form = $function( $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist );
- $form = call_user_func($function, $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist );
+ $form = call_user_func($function, $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist);
$form->display();
break;
@@ -423,10 +444,12 @@
}
include "admin_footer.php";
-function create_prot($prot_text, $success, $submitter) {
+
+
+function createProtocol($prot_text, $success, $submitter) {
global $xoopsDB;
-
- $sql = "INSERT INTO `{$xoopsDB->prefix('mod_xnewsletter_protocol')}` (`protocol_letter_id`, `protocol_subscriber_id`, `protocol_status`, `protocol_success`, `protocol_submitter`, `protocol_created`)";
- $sql.= " VALUES (0,0,'{$prot_text}', {$success}, {$submitter}, " . time() . ")";
+ $sql = "INSERT INTO `{$xoopsDB->prefix('mod_xnewsletter_protocol')}`";
+ $sql .= " (`protocol_letter_id`, `protocol_subscriber_id`, `protocol_status`, `protocol_success`, `protocol_submitter`, `protocol_created`)";
+ $sql .= " VALUES (0,0,'{$prot_text}', {$success}, {$submitter}, " . time() . ")";
$xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_catsubscr.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_catsubscr.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -1,8 +1,10 @@
<?php
/**
* ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
* XNEWSLETTER - MODULE FOR XOOPS
- * Copyright (c) 2012
+ * Copyright (c) 2007 - 2012
* Goffy ( wedega.com )
*
* You may not change or alter any portion of this comment or credits
@@ -23,22 +25,21 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
-include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/include/functions.php";
+
function b_xnewsletter_catsubscr($options) {
- include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/class/xNewsletter_catsubscr.php";
- $myts =& MyTextSanitizer::getInstance();
+ global $xoopsUser;
+ $xnewsletter = xNewsletterxNewsletter::getInstance();
+ $myts = MyTextSanitizer::getInstance();
$catsubscr = array();
$type_block = $options[0];
$nb_catsubscr = $options[1];
$length_title = $options[2];
- $xnewsletter->getHandler('xNewsletter_catsubscr') =& xoops_getModuleHandler("xnewsletter_catsubscr", "xNewsletter");
- $xnewsletter->getHandler('xNewsletter_cat')=& xoops_getModuleHandler('xNewsletter_cat', 'xNewsletter');
- $xnewsletter->getHandler('xNewsletter_subscr')=& xoops_getModuleHandler('xNewsletter_subscr', 'xNewsletter');
-
$criteria = new CriteriaCompo();
array_shift($options);
array_shift($options);
@@ -76,29 +77,32 @@
if ($length_title > 0 && strlen($cat_name) > $length_title)
$cat_name = substr($cat_name, 0, $length_title) . "...";
$catsubscr[$i]["catsubscr_newsletter"] = $cat_name;
- $catsubscr[$i]["catsubscr_created"] = formatTimeStamp($catsubscr_arr[$i]->getVar("catsubscr_created"),"S");
+ $catsubscr[$i]["catsubscr_created"] = formatTimeStamp($catsubscr_arr[$i]->getVar("catsubscr_created"), "S");
}
}
return $catsubscr;
}
+
+
function b_xnewsletter_catsubscr_edit($options) {
- $xnewsletter->getHandler('xNewsletter_cat')=& xoops_getModuleHandler('xNewsletter_cat', 'xNewsletter');
+ global $xoopsUser;
+ $xnewsletter = xNewsletterxNewsletter::getInstance();
- $form = ""._MB_XNEWSLETTER_LETTER_DISPLAY."\n";
+ $form = "" . _MB_XNEWSLETTER_LETTER_DISPLAY . "\n";
$form .= "<input type=\"hidden\" name=\"options[0]\" value=\"" . $options[0] . "\" />";
$form .= "<input name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\"" . $options[1] . "\" type=\"text\" /> <br />";
- $form .= ""._MB_XNEWSLETTER_LETTER_TITLELENGTH." : <input name=\"options[2]\" size=\"5\" maxlength=\"255\" value=\"" . $options[2] . "\" type=\"text\" /><br /><br />";
+ $form .= "" . _MB_XNEWSLETTER_LETTER_TITLELENGTH . " : <input name=\"options[2]\" size=\"5\" maxlength=\"255\" value=\"" . $options[2] . "\" type=\"text\" /><br /><br />";
array_shift($options);
array_shift($options);
array_shift($options);
- $form .= ""._MB_XNEWSLETTER_LETTER_CATTODISPLAY."<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">";
+ $form .= "" . _MB_XNEWSLETTER_LETTER_CATTODISPLAY . "<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">";
$form .= "<option value=\"0\" " . (array_search(0, $options) === false ? "" : "selected=\"selected\"") . ">" ._MB_XNEWSLETTER_CATSUBSCR_ALLCAT . "</option>";
- $cat_crit = new CriteriaCompo();
- $cat_crit->setSort("cat_id");
- $cat_crit->setOrder("ASC");
- $cat_arr = $xnewsletter->getHandler('xNewsletter_cat')->getall($cat_crit);
+ $cat_criteria = new CriteriaCompo();
+ $cat_criteria->setSort("cat_id");
+ $cat_criteria->setOrder("ASC");
+ $cat_arr = $xnewsletter->getHandler('xNewsletter_cat')->getall($cat_criteria);
foreach (array_keys($cat_arr) as $i) {
$form .= "<option value=\"" . $i . "\" " . (array_search($i, $options) === false ? "" : "selected=\"selected\"") . ">" . $cat_arr[$i]->getVar("cat_name") . "</option>";
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_letter.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_letter.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -25,9 +25,11 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
+
+
function b_xnewsletter_letter($options) {
global $xoopsUser;
$myts = MyTextSanitizer::getInstance();
@@ -82,8 +84,9 @@
if ($showCat == true) {
$letter[$i]['letter_id'] = $letter_arr[$i]->getVar('letter_id');
$letter_title = $letter_arr[$i]->getVar('letter_title');
- if ($length_title > 0 && strlen($letter_title) > $length_title)
+ if ($length_title > 0 && strlen($letter_title) > $length_title) {
$letter_title = substr($letter_title, 0, $length_title) . '...';
+ }
$letter[$i]['letter_title'] = $letter_title;
// $letter[$i]["letter_content"] = $letter_arr[$i]->getVar("letter_content");
// $letter[$i]["letter_cats"] = $letter_arr[$i]->getVar("letter_cats");
@@ -96,8 +99,9 @@
return $letter;
}
+
+
function b_xnewsletter_letter_edit($options) {
-
$form = "" . _MB_XNEWSLETTER_LETTER_DISPLAY . "\n";
$form .= "<input type=\"hidden\" name=\"options[0]\" value=\"{$options[0]}\" />";
$form .= "<input name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\"{$options[1]}\" type=\"text\" />";
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_subscrinfo.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_subscrinfo.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_subscrinfo.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -1,8 +1,10 @@
<?php
/**
* ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
* XNEWSLETTER - MODULE FOR XOOPS
- * Copyright (c) 2012
+ * Copyright (c) 2007 - 2012
* Goffy ( wedega.com )
*
* You may not change or alter any portion of this comment or credits
@@ -23,7 +25,11 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
+
+
function b_xnewsletter_subscrinfo($options) {
xoops_loadLanguage('modinfo', 'xNewsletter');
$unique_id = uniqid(mt_rand());
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -113,16 +113,20 @@
if ($limitcheck > 200) $limitcheck = 200;
}
$sel_limitcheck = new XoopsFormSelect(_AM_XNEWSLETTER_IMPORT_CHECK_LIMIT_PACKAGE, "limitcheck", $limitcheck);
- $sel_limitcheck->addOption(0, _AM_XNEWSLETTER_IMPORT_NOLIMIT);
if ($action_after_read == 0 ) {
+ $sel_limitcheck->addOption(0, _AM_XNEWSLETTER_IMPORT_NOLIMIT);
$sel_limitcheck->addOption(500, 500);
$sel_limitcheck->addOption(1000, 1000);
$sel_limitcheck->addOption(10000, 10000);
$sel_limitcheck->addOption(25000, 25000);
} else {
- $sel_limitcheck->addOption(50, 50);
- $sel_limitcheck->addOption(100, 100);
- $sel_limitcheck->addOption(200, 200);
+ $limitOptions = array(25, 50, 100, 200, 400);
+ foreach ($limitOptions as $limitOption) {
+ // check if limit options are compatible with php.ini 'max_input_vars' setting
+ if ((ini_get('max_input_vars') == 0) || ((($limitOption * 7) + 4) < ini_get('max_input_vars'))) {
+ $sel_limitcheck->addOption($limitOption, $limitOption);
+ }
+ }
}
$form->addElement($sel_limitcheck, false);
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt 2014-04-17 21:07:56 UTC (rev 12456)
@@ -1,10 +1,12 @@
Version 1.3
--------------
+ - import procedure: check if limit options are compatible with php.ini 'max_input_vars' setting (luciorota)
- templatize user side (luciorota)
- standardize code (luciorota)
- added html2txt function for non-HTML mail clients (luciorota)
- added: breadcrumb class (luciorota)
- added: updating to XOOPS 2.5.7 Multi-page help (luciorota)
+ - fixed: when there is an apostrophe in the title, a backslash is obtained on reading the email (luciorota)
Version 1.2
--------------
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/mailinglist.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/mailinglist.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/mailinglist.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -25,26 +25,24 @@
* Version : 1 Thu 2012/12/06 12:57:01 : Exp $
* ****************************************************************************
*/
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+include_once dirname(__FILE__) . '/common.php';
+
function subscribingMLHandler($type, $subscr_id, $mailinglist_id) {
global $xoopsUser, $xoopsConfig;
- include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/class/xNewsletter_subscr.php";
- include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/class/xNewsletter_mailinglist.php";
- include_once XOOPS_ROOT_PATH . "/modules/xNewsletter/class/xNewsletter_protocol.php";
+ $xnewsletter = xNewsletterxNewsletter::getInstance();
- $xnewsletter->getHandler('xNewsletter_subscr')=& xoops_getModuleHandler('xNewsletter_subscr', 'xNewsletter');
- $xnewsletter->getHandler('xNewsletter_mailinglist')=& xoops_getModuleHandler('xNewsletter_mailinglist', 'xNewsletter');
+ $subscrObj = $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
+ $subscr_email = $subscrObj->getVar("subscr_email");
- $obj_subscr =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
- $subscr_email = $obj_subscr->getVar("subscr_email");
-
- $obj_mailinglist = $xnewsletter->getHandler('xNewsletter_mailinglist')->get($mailinglist_id);
- $mailinglist_email = $obj_mailinglist->getVar("mailinglist_email");
+ $mailinglistObj = $xnewsletter->getHandler('xNewsletter_mailinglist')->get($mailinglist_id);
+ $mailinglist_email = $mailinglistObj->getVar("mailinglist_email");
if ($type == 1) {
- $action_code = $obj_mailinglist->getVar("mailinglist_subscribe");
+ $action_code = $mailinglistObj->getVar("mailinglist_subscribe");
} else {
- $action_code = $obj_mailinglist->getVar("mailinglist_unsubscribe");
+ $action_code = $mailinglistObj->getVar("mailinglist_unsubscribe");
}
$action_code = str_replace("{email}", $subscr_email, $action_code);
@@ -53,11 +51,10 @@
echo "<br />mailinglist_id: {$mailinglist_id}";
echo "<br />action_code: {$action_code}";
echo "<br />";
-/* */
- require_once( XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.phpmailer.php" );
- require_once( XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.pop3.php" );
- require_once( XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.smtp.php" );
+ require_once(XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.phpmailer.php");
+ require_once(XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.pop3.php");
+ require_once(XOOPS_ROOT_PATH . "/class/mail/phpmailer/class.smtp.php");
//get emails of subscribers
$recipients = array();
@@ -71,7 +68,7 @@
);
$letter_id = 0;
- $senderuid = (is_object($xoopsUser) && isset($xoopsUser)) ? $xoopsUser->uid() : 0;
+ $senderUid = (is_object($xoopsUser) && isset($xoopsUser)) ? $xoopsUser->uid() : 0;
$subject = "";
@@ -102,31 +99,30 @@
$text_clean = array("<strong>", "</strong>", "<br/>", "<br />");
$protocol_status = str_replace($text_clean, "", $protocol_status);
- $xnewsletter->getHandler('xNewsletter_protocol') =& xoops_getModuleHandler("xNewsletter_protocol", "xNewsletter");
- $obj_protocol =& $xnewsletter->getHandler('xNewsletter_protocol')->create();
- $obj_protocol->setVar("protocol_letter_id", $letter_id);
- $obj_protocol->setVar("protocol_subscriber_id", $subscriber_id);
- $obj_protocol->setVar("protocol_status", $protocol_status);
- $obj_protocol->setVar("protocol_success", 1);
- $obj_protocol->setVar("protocol_submitter", $senderuid);
- $obj_protocol->setVar("protocol_created", time());
+ $protocolObj = $xnewsletter->getHandler('xNewsletter_protocol')->create();
+ $protocolObj->setVar("protocol_letter_id", $letter_id);
+ $protocolObj->setVar("protocol_subscriber_id", $subscriber_id);
+ $protocolObj->setVar("protocol_status", $protocol_status);
+ $protocolObj->setVar("protocol_success", 1);
+ $protocolObj->setVar("protocol_submitter", $senderUid);
+ $protocolObj->setVar("protocol_created", time());
- if ($xnewsletter->getHandler('xNewsletter_protocol')->insert($obj_protocol)) {
+ if ($xnewsletter->getHandler('xNewsletter_protocol')->insert($protocolObj)) {
//create protocol is ok
- $obj_protocol2 =& $xnewsletter->getHandler('xNewsletter_protocol')->create();
- $obj_protocol2->setVar("protocol_letter_id", $letter_id);
- $obj_protocol2->setVar("protocol_subscriber_id", $subscriber_id);
- $obj_protocol2->setVar("protocol_status", _AM_XNEWSLETTER_SEND_SUCCESS_ML);
- $obj_protocol2->setVar("protocol_success", 1);
- $obj_protocol2->setVar("protocol_submitter", $senderuid);
- $obj_protocol2->setVar("protocol_created", time());
- if ($xnewsletter->getHandler('xNewsletter_protocol')->insert($obj_protocol2)) {
+ $protocolObj2 = $xnewsletter->getHandler('xNewsletter_protocol')->create();
+ $protocolObj2->setVar("protocol_letter_id", $letter_id);
+ $protocolObj2->setVar("protocol_subscriber_id", $subscriber_id);
+ $protocolObj2->setVar("protocol_status", _AM_XNEWSLETTER_SEND_SUCCESS_ML);
+ $protocolObj2->setVar("protocol_success", 1);
+ $protocolObj2->setVar("protocol_submitter", $senderUid);
+ $protocolObj2->setVar("protocol_created", time());
+ if ($xnewsletter->getHandler('xNewsletter_protocol')->insert($protocolObj2)) {
return true;
} else {
- return $obj_protocol2->getHtmlErrors();
+ return $protocolObj2->getHtmlErrors();
}
} else {
- return $obj_protocol->getHtmlErrors();
+ return $protocolObj->getHtmlErrors();
}
}
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/search.inc.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/search.inc.php 2014-04-16 16:36:11 UTC (rev 12455)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/search.inc.php 2014-04-17 21:07:56 UTC (rev 12456)
@@ -29,7 +29,9 @@
function xnewsletter_search($queryarray, $andor, $limit, $offset, $userid) {
global $xoopsDB;
- $sql = "SELECT cat_id, cat_name, cat_submitter, cat_created FROM {$xoopsDB->prefix("mod_xnewsletter_cat")} WHERE cat_created > 0";
+ $sql = "SELECT cat_id, cat_name, cat_submitter, cat_created";
+ $sql.= " FROM {$xoopsDB->prefix("mod_xnewsletter_cat")}";
+ $sql.= " WHERE cat_created > 0";
if ($userid != 0) {
$sql .= " AND cat_submitter=" . intval($userid) . " ";
}
|
|
From: <luc...@us...> - 2014-04-16 16:36:14
|
Revision: 12455
http://sourceforge.net/p/xoops/svn/12455
Author: luciorota
Date: 2014-04-16 16:36:11 +0000 (Wed, 16 Apr 2014)
Log Message:
-----------
rename templates
Added Paths:
-----------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_day.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_recent.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_day.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_random.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_recent.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_subscrinfo_block.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_common_breadcrumb.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_list_subscrs.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_preview.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_print.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_protocol.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription_list_subscriptions.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription_result.html
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_day.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_day.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_day.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,11 @@
+<table class="outer">
+<{foreachq item=catsubscr from=$block}>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td>
+ <{$catsubscr.catsubscr_email}>;
+ <{$catsubscr.catsubscr_newsletter}>;
+ <{$catsubscr.catsubscr_created}>;
+ </td>
+ </tr>
+<{/foreach}>
+</table>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_recent.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_recent.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_recent.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,11 @@
+<table class="outer">
+<{foreachq item=catsubscr from=$block}>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td>
+ <{$catsubscr.catsubscr_email}>;
+ <{$catsubscr.catsubscr_newsletter}>;
+ <{$catsubscr.catsubscr_created}>;
+ </td>
+ </tr>
+<{/foreach}>
+</table>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_day.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_day.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_day.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,9 @@
+<table class="outer">
+<{foreachq item=letter from=$block}>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td>
+ <a href="<{$letter.href}>"><{$letter.letter_title}><br />(<{$letter.letter_created}>)</a>
+ </td>
+ </tr>
+<{/foreach}>
+</table>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_random.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_random.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_random.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,9 @@
+<table class="outer">
+<{foreachq item=letter from=$block}>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td>
+ <a href="<{$letter.href}>"><{$letter.letter_title}><br />(<{$letter.letter_created}>)</a>
+ </td>
+ </tr>
+<{/foreach}>
+</table>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_recent.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_recent.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_recent.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,9 @@
+<table class="outer">
+<{foreachq item=letter from=$block}>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td>
+ <a href="<{$letter.href}>"><{$letter.letter_title}><br />(<{$letter.letter_created}>)</a>
+ </td>
+ </tr>
+<{/foreach}>
+</table>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_subscrinfo_block.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_subscrinfo_block.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_subscrinfo_block.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,14 @@
+<form name="<{$block.formname}>" id="<{$block.formname}>" action="<{$block.formaction}>" method="post" enctype="multipart/form-data">
+ <table class="outer">
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td style="text-align:center">
+ <{$block.infotext}>
+ </td>
+ </tr>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td style="text-align:center">
+ <input type="submit" class="formButton" name="submit" id="submit" value="<{$block.buttontext}>" title="<{$block.buttontext}>" />
+ </td>
+ </tr>
+ </table>
+</form>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_common_breadcrumb.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_common_breadcrumb.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_common_breadcrumb.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,16 @@
+<div class="xnewsletter_headertable">
+ <div class="xnewsletter_breadcrumb">
+ <{foreach item=bread from=$breadcrumb name=bcloop}>
+ <span class="bread">
+ <{if ($bread.link)}>
+ <a href="<{$bread.link}>" title="<{$bread.title}>"><{$bread.title}></a>
+ <{else}>
+ <{$bread.title}>
+ <{/if}>
+ </span>
+ <{if !$smarty.foreach.bcloop.last}>
+ <span class="delimiter">></span>
+ <{/if}>
+ <{/foreach}>
+ </div>
+</div>
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,24 @@
+<{if $advertise_code != ''}>
+<div class="center">
+ <{$advertise_code}>
+</div>
+<{/if}>
+<{if $social_active != 0}>
+<div class="center">
+ <{$social_code}>
+</div>
+<{/if}>
+<div class="center">
+ <{$copyright_code}>
+</div>
+
+<!-- footer menu -->
+<div class="xnewsletter_adminlinks">
+<{foreach item='footerMenuItem' from=$xnewsletterModuleInfoSub}>
+ <a href='<{$smarty.const.XNEWSLETTER_URL}>/<{$footerMenuItem.url}>'><{$footerMenuItem.name}></a>
+<{/foreach}>
+<{if $isAdmin == true}>
+ <br />
+ <a href='<{$smarty.const.XNEWSLETTER_URL}>/admin/index.php'><{$smarty.const._MA_XNEWSLETTER_ADMIN}></a>
+<{/if}>
+</div>
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,7 @@
+<{$xnewsletter_breadcrumb}>
+
+<{if $advertise_code != ''}>
+<div class="center">
+ <{$advertise_code}>
+</div>
+<{/if}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,5 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <div><{$welcome_message}></div>
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index_list_letters.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index_list_letters.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index_list_letters.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,36 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <table cellpadding="0" cellspacing="0" class="item" width="100%">
+ <tr class="itemHead">
+ <th class="center"></th>
+ <th class="center"><{$smarty.const._AM_XNEWSLETTER_LETTER_TITLE}></th>
+ <th class="center"><{$smarty.const._AM_XNEWSLETTER_LETTER_CONTENT}></th>
+ <th class="center"><{$smarty.const._MA_XNEWSLETTER_LETTER_CATS}></th>
+ <th class="center"><{$smarty.const._AM_XNEWSLETTER_LETTER_CREATED}></th>
+ <th class="center"> </th>
+ </tr>
+ <{foreachq item='letter' from=$letters}>
+ <tr class = "<{cycle values = 'even,odd'}>">
+ <td class="center"><{$letter.letter_id}></td>
+ <td class="center"><{$letter.letter_title}></td>
+ <td class="center"><{$letter.letter_content}></td>
+ <td class="center">
+ <{foreach item='letter_cat' from=$letter.letter_cats}>
+ <{$letter_cat.cat_name}>
+ <br />
+ <{/foreach}>
+ </td>
+ <td class="center"><{$letter.letter_created_timestamp}></td>
+ <td class="center">
+ <a href="index.php?op=show_preview&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_preview.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>" />
+ </a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,5 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <{$content}>
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_list_letters.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_list_letters.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_list_letters.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,98 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <table class='outer width100' cellspacing='1'>
+ <tr>
+ <th class='center width2'><{$smarty.const._AM_XNEWSLETTER_LETTER_ID}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_TITLE}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_TEMPLATE}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_CATS}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_ATTACHMENT}></th>
+ <th class='center width10'><{$smarty.const._AM_XNEWSLETTER_LETTER_EMAIL_TEST}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_PROTOCOL_LAST_STATUS}></th>
+ <th class='center' width='120px'><{$smarty.const._AM_XNEWSLETTER_FORMACTION}></th>
+ </tr>
+ <{foreach item='letter' from=$letters}>
+ <tr class="<{cycle values = 'even,odd'}>">
+ <td class="center"><{$letter.letter_id}></td>
+ <td class="center"><{$letter.letter_title}></td>
+ <td class="center"><{$letter.letter_template}></td>
+ <td class="center">
+ <{foreach item='letter_cat' from=$letter.letter_cats}>
+ <{$letter_cat.cat_name}>
+ <br />
+ <{/foreach}>
+ </td>
+ <td class="center"><{$letter.attachmentCount}></td>
+ <td class="center"><{$letter.letter_email_test}></td>
+ <td class="center">
+ <{if ($letter.userPermissions.edit)}>
+ <{foreach item='protocol' from=$letter.protocols}>
+ <a href='protocol.php?op=list_letter&letter_id=<{$protocol.protocol_letter_id}>'><{$protocol.protocol_status}></a>
+ <br />
+ <{/foreach}>
+ <{else}>
+ -
+ <{/if}>
+ </td>
+ <td class="center">
+ <{if ($letter.userPermissions.edit)}>
+ <a href="?op=edit_letter&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_edit.png"
+ alt="<{$smarty.const._EDIT}>"
+ title="<{$smarty.const._EDIT}>" />
+ </a>
+ <{/if}>
+ <{if ($letter.userPermissions.delete)}>
+ <a href="?op=delete_letter&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_delete.png"
+ alt="<{$smarty.const._DELETE}>"
+ title="<{$smarty.const._DELETE}>" />
+ </a>
+ <{/if}>
+ <{if ($letter.userPermissions.create)}>
+ <a href="?op=copy_letter&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_copy.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_COPYNEW}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_COPYNEW}>" />
+ </a>
+ <{/if}>
+ <{if ($letter.userPermissions.read)}>
+ <a href="?op=show_preview&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_preview.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>" />
+ </a>
+ <{/if}>
+ <{if ($letter.userPermissions.send)}>
+ <a href="sendletter.php?op=send_test&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_sendtest.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SENDTEST}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SENDTEST}>" />
+ </a>
+ <a href="sendletter.php?op=send_letter&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_send.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SEND}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SEND}>" />
+ </a>
+ <a href="sendletter.php?op=resend_letter&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_resend.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_RESEND}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_RESEND}>" />
+ </a>
+ <{/if}>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <br />
+ <div class='center'><{$pagenav}></div>
+ <br />
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_list_subscrs.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_list_subscrs.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_list_subscrs.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,71 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <{$searchSubscriberForm}>
+ <br />
+ <!-- cats table -->
+ <table class='outer width100' cellspacing='1'>
+ <tr>
+ <th class='center width2'><{$smarty.const._AM_XNEWSLETTER_CAT_ID}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_CAT_NAME}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_CAT_INFO}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_CATSUBSCR_SUBSCRID}></th>
+ <th class='center width5'><{$smarty.const._AM_XNEWSLETTER_FORMACTION}></th>
+ </tr>
+ <{$cats_content}>
+ <{foreach item='cat' from=$cats}>
+ <tr class="<{cycle values = 'even,odd'}>">
+ <td class='center'><{$cat.cat_id}></td>
+ <td class='center'><{$cat.cat_name}></td>
+ <td><{$cat.cat_info}></td>
+ <td class='center'><{$cat.catsubscrCount}></td>
+ <td class='center'>
+ <a href='?op=list_subscrs&cat_id=<{$cat.cat_id}>'>
+ <img
+ src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_details.png'
+ alt='<{$smarty.const._AM_XNEWSLETTER_DETAILS}>'
+ title='<{$smarty.const._AM_XNEWSLETTER_DETAILS}>' />
+ </a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <br />
+ <br />
+<{if ($cat_id > 0)}>
+ <h2><{$smarty.const._AM_XNEWSLETTER_CATSUBSCR_SUBSCRID}>: <{$cats[$cat_id].cat_name}></h2>
+ <table class='outer width100' cellspacing='1'>
+ <tr>
+ <th class='center width5'> </th>
+ <th class='center width10'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_SEX}></th>
+ <th class='center width25'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_LASTNAME}></th>
+ <th class='center width25'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_FIRSTNAME}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_EMAIL}></th>
+ <{if ($permissionChangeOthersSubscriptions)}>
+ <th class='center width5'><{$smarty.const._AM_XNEWSLETTER_FORMACTION}></th>
+ <{/if}>
+ </tr>
+ <{foreach item='subscr' from=$subscrs}>
+ <tr>
+ <td class='center'><{$subscr.counter}></td>
+ <td class='center'><{$subscr.subscr_sex}></td>
+ <td class='center'><{$subscr.subscr_lastname}></td>
+ <td class='center'><{$subscr.subscr_firstname}></td>
+ <td class='center'><{$subscr.subscr_email}></td>
+ <{if ($permissionChangeOthersSubscriptions)}>
+ <td class='center'>
+ <a href='subscription.php?op=edit_subscription&subscr_id=<{$subscr.subscr_id}>'>
+ <img
+ src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_edit.png'
+ alt='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_EDIT}>'
+ title='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_EDIT}>' />
+ </a>
+ </td>
+ <{/if}>
+ </tr>
+ <{/foreach}>
+ </table>
+ <br />
+ <br />
+<{/if}>
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_preview.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_preview.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_preview.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,11 @@
+<{include file="db:xnewsletter_header.html"}>
+<div style='clear:both;'></div>
+<div class="outer">
+ <h2><{$letter.letter_title}></h2>
+ <div style='padding:10px;border:1px solid black;'>
+ <{$letter.letter_content_templated}>
+ </div>
+ <input action="action" type="button" value="<{$smarty.const._BACK}>" onclick="history.go(-1);" />
+</div>
+<div style='clear:both;'></div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_print.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_print.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_print.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,164 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$smarty.const._LANGCODE}>" lang="<{$smarty.const._LANGCODE}>">
+
+ <head>
+ <title>' . $xoopsConfig['sitename'] . '</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta name="AUTHOR" content="<{$xoopsConfig.sitename}>" />
+ <meta name="keywords" content="<{$xoops_meta_keywords}>" />
+ <meta name="COPYRIGHT" content="Copyright (c) 2012 by <{$xoopsConfig.sitename}>" />
+ <meta name="DESCRIPTION" content="<{$xoops_meta_description}>" />
+ <meta name="GENERATOR" content="XOOPS" />
+ <!-- Sheet Css -->
+ <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{$smarty.const.XOOPS_URL}>/xoops.css" />
+ <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{$smarty.const.XOOPS_URL}>/themes/default/style.css" />
+ <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{$smarty.const.XOOPS_URL}>/modules/xnewsletter/css/module.css" />
+
+
+ <script type="text/javascript">
+ // <![CDATA[
+ /*------------------------------------------------------------------------------
+ Function: footnoteLinks()
+ Author: Aaron Gustafson (aaron at easy-designs dot net)
+ Creation Date: 8 May 2005
+ Version: 1.3
+ Homepage: http://www.easy-designs.net/code/footnoteLinks/
+ License: Creative Commons Attribution-ShareAlike 2.0 License
+ http://creativecommons.org/licenses/by-sa/2.0/
+ Note: This version has reduced functionality as it is a demo of
+ the script's development
+ ------------------------------------------------------------------------------*/
+ function footnoteLinks(containerID,targetID) {
+ if (!document.getElementById ||
+ !document.getElementsByTagName ||
+ !document.createElement) return false;
+ if (!document.getElementById(containerID) ||
+ !document.getElementById(targetID)) return false;
+ var container = document.getElementById(containerID);
+ var target = document.getElementById(targetID);
+ var h2 = document.createElement('h2');
+ addClass.apply(h2,['printOnly']);
+ var h2_txt = document.createTextNode('<?php echo "_MA_NW_LINKS"; ?>');
+ h2.appendChild(h2_txt);
+ var coll = container.getElementsByTagName('*');
+ var ol = document.createElement('ol');
+ addClass.apply(ol,['printOnly']);
+ var myArr = [];
+ var thisLink;
+ var num = 1;
+ for (var i=0; i<coll.length; i++) {
+ if ( coll[i].getAttribute('href') ||
+ coll[i].getAttribute('cite') ) {
+ thisLink = coll[i].getAttribute('href') ? coll[i].href : coll[i].cite;
+ var note = document.createElement('sup');
+ addClass.apply(note,['printOnly']);
+ var note_txt;
+ var j = inArray.apply(myArr,[thisLink]);
+ if ( j || j===0 ) { // if a duplirolee
+ // get the corresponding number from
+ // the array of used links
+ note_txt = document.createTextNode(j+1);
+ } else {
+ // if not a duplirolee
+ var li = document.createElement('li');
+ var li_txt = document.createTextNode(thisLink);
+ li.appendChild(li_txt);
+ ol.appendChild(li);
+ myArr.push(thisLink);
+ note_txt = document.createTextNode(num);
+ num++;
+ }
+ note.appendChild(note_txt);
+ if (coll[i].tagName.toLowerCase() == 'blockquote') {
+ var lastChild = lastChildContainingText.apply(coll[i]);
+ lastChild.appendChild(note);
+ } else {
+ coll[i].parentNode.insertBefore(note, coll[i].nextSibling);
+ }
+ }
+ }
+ target.appendChild(h2);
+ target.appendChild(ol);
+ return true;
+ }
+ // ]]>
+ </script>
+ <script type="text/javascript">
+ // <![CDATA[
+ /*------------------------------------------------------------------------------
+ Excerpts from the jsUtilities Library
+ Version: 2.1
+ Homepage: http://www.easy-designs.net/code/jsUtilities/
+ License: Creative Commons Attribution-ShareAlike 2.0 License
+ http://creativecommons.org/licenses/by-sa/2.0/
+ Note: If you change or improve on this script, please let us know.
+ ------------------------------------------------------------------------------*/
+ if(Array.prototype.push == null) {
+ Array.prototype.push = function(item) {
+ this[this.length] = item;
+ return this.length;
+ };
+ };
+ // ---------------------------------------------------------------------
+ // function.apply (if unsupported)
+ // Courtesy of Aaron Boodman - http://youngpup.net
+ // ---------------------------------------------------------------------
+ if (!Function.prototype.apply) {
+ Function.prototype.apply = function(oScope, args) {
+ var sarg = [];
+ var rtrn, call;
+ if (!oScope) oScope = window;
+ if (!args) args = [];
+ for (var i = 0; i < args.length; i++) {
+ sarg[i] = "args["+i+"]";
+ };
+ call = "oScope.__applyTemp__(" + sarg.join(",") + ");";
+ oScope.__applyTemp__ = this;
+ rtrn = eval(call);
+ oScope.__applyTemp__ = null;
+ return rtrn;
+ };
+ };
+ function inArray(needle) {
+ for (var i=0; i < this.length; i++) {
+ if (this[i] === needle) {
+ return i;
+ }
+ }
+ return false;
+ }
+ function addClass(theClass) {
+ if (this.className != '') {
+ this.className += ' ' + theClass;
+ } else {
+ this.className = theClass;
+ }
+ }
+ function lastChildContainingText() {
+ var testChild = this.lastChild;
+ var contentCntnr = ['p','li','dd'];
+ while (testChild.nodeType != 1) {
+ testChild = testChild.previousSibling;
+ }
+ var tag = testChild.tagName.toLowerCase();
+ var tagInArr = inArray.apply(contentCntnr, [tag]);
+ if (!tagInArr && tagInArr!==0) {
+ testChild = lastChildContainingText.apply(testChild);
+ }
+ return testChild;
+ }
+ // ]]>
+ </script>
+ <style type="text/css" media="screen">
+ .printOnly {
+ display: none;
+ }
+ </style>
+ </head>
+ <body bgcolor="#ffffff" text="#000000" onload="window.print()">
+ <h2><{$letter.letter_title}></h2>
+ <div style='padding:10px;border:1px solid black;'>
+ <{$letter.letter_content_templated}>
+ </div>
+ </body>
+</html>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_protocol.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_protocol.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_protocol.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,40 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <table cellpadding="0" cellspacing="0" class="item" width="100%">
+ <tr class="itemHead">
+ <th class="center"><{$smarty.const._AM_XNEWSLETTER_PROTOCOL_ID}></th>
+ <th class="center"><{$smarty.const._AM_XNEWSLETTER_SUBSCR_EMAIL}></th>
+ <th class="center" colspan="2"><{$smarty.const._AM_XNEWSLETTER_PROTOCOL_STATUS}></th>
+ <th class="center"><{$smarty.const._AM_XNEWSLETTER_PROTOCOL_CREATED}></th>
+ </tr>
+ <{foreachq item='protocol' from=$protocols}>
+ <tr class = "<{cycle values = 'even,odd'}>">
+ <td class="center"><{$protocol.protocol_id}></td>
+ <td class="center">
+ <{if ($protocol.subscr)}>
+ <{$protocol.subscr_email}>
+ <{else}>
+ <{$smarty.const._AM_XNEWSLETTER_PROTOCOL_NO_SUBSCREMAIL}>
+ <{/if}>
+
+ </td>
+ <td class="right">
+ <{if ($protocol.protocol_success)}>
+ <img
+ src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_ok.png'
+ alt='<{$smarty.const._AM_XNEWSLETTER_OK}>'
+ title='<{$smarty.const._AM_XNEWSLETTER_OK}>' />
+ <{else}>
+ <img
+ src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_failed.png'
+ alt='<{$smarty.const._AM_XNEWSLETTER_FAILED}>'
+ title='<{$smarty.const._AM_XNEWSLETTER_FAILED}>' />
+ <{/if}>
+ </td>
+ <td class="left"><{$protocol.protocol_status}></td>
+ <td class="center"><{$protocol.protocol_created_timestamp}></td>
+ </tr>
+ <{/foreach}>
+ </table>
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,5 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <div><{$xnewsletter_content}></div>
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription_list_subscriptions.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription_list_subscriptions.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription_list_subscriptions.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,78 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <div>
+ <{if ($subscrCount > 0)}>
+ <{$smarty.const._MA_XNEWSLETTER_REGISTRATION_EXIST}>
+ <{else}>
+ <{$smarty.const._MA_XNEWSLETTER_REGISTRATION_NONE}>
+ <{/if}>
+ </div>
+
+<{if ($showSubscrSearchForm)}>
+ <{$subscrSearchForm}>
+<{/if}>
+<{if ($showSubscrForm)}>
+ <{$subscrForm}>
+<{/if}>
+</div>
+
+<{if ($subscrCount > 0)}>
+ <table class='outer width100' cellspacing='1'>
+ <tr>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_EMAIL}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_SEX}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_FIRSTNAME}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_LASTNAME}></th>
+ <th class='center'><{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_EXIST}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_CREATED}></th>
+ <th class='center width10'><{$smarty.const._AM_XNEWSLETTER_FORMACTION}></th>
+ </tr>
+ <{foreach item='subscr' from=$subscrs}>
+ <tr>
+ <td class='center'><{$subscr.subscr_email}></td>
+ <td class='center'><{$subscr.subscr_sex}></td>
+ <td class='center'><{$subscr.subscr_firstname}></td>
+ <td class='center'><{$subscr.subscr_lastname}></td>
+ <td class='center'>
+ <{if ($subscr.catsubscrs|count > 0)}>
+ <ul>
+ <{foreach item='catsubscr' from=$subscr.catsubscrs}>
+ <li>
+ <{$catsubscr.cat.cat_name}>
+ <{if ($catsubscr.catsubscr_quited)}>
+ <{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_QUITED}>
+ <{/if}>
+ </li>
+ <{/foreach}>
+ </ul>
+ <{else}>
+ <{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_EXIST_NONE}>
+ <{/if}>
+ </td>
+ <td class='center'><{$subscr.subscr_created_timestamp}></td>
+ <td class='center'>
+ <a href='?op=edit_subscription&subscr_id=<{$subscr.subscr_id}>'>
+ <img
+ src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_edit.png'
+ alt='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_EDIT}>'
+ title='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_EDIT}>' />
+ </a>
+ <a href='?op=delete_subscription&subscr_id=<{$subscr.subscr_id}>&subscr_email=<{$subscr.subscr_email}>'>
+ <img
+ src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_delete.png'
+ alt='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_DELETE}>'
+ title='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_DELETE}>' />
+ </a>
+ </td>
+ </tr>
+ <{if ($subscr.subscr_activated == 0)}>
+ <tr>
+ <td colspan='7'>
+ <{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_UNFINISHED|replace:'%link':'?op=resend_subscription&subscr_id=%subscr_id'|replace:'%subscr_id':$subscr.subscr_id}>
+ </td>
+ </tr>
+ <{/if}>
+ <{/foreach}>
+ </table>
+<{/if}>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription_result.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription_result.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription_result.html 2014-04-16 16:36:11 UTC (rev 12455)
@@ -0,0 +1,20 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <p align="center" style="margin-top: 20px; margin-bottom: 20px; font-weight:bold">
+ <{$subscription_result}>
+ </p>
+<{foreach item='actionProt_ok' from=$actionProts_ok}>
+ <p>
+ <img src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/on.png' alt='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_OK}>' title='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_OK}>'>
+ <{$actionProt_ok}>
+ </p>
+<{/foreach}>
+<{foreach item='actionProt_error' from=$actionProts_error}>
+ <p>
+ <img src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/off.png' alt='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_ERROR}>' title='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_ERROR}>"'>
+
+ <{$actionProt_error}>
+ </p>
+<{/foreach}>
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
|
|
From: <luc...@us...> - 2014-04-16 16:33:03
|
Revision: 12454
http://sourceforge.net/p/xoops/svn/12454
Author: luciorota
Date: 2014-04-16 16:32:59 +0000 (Wed, 16 Apr 2014)
Log Message:
-----------
delete wrong files
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/index.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/menu.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/sendletter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/header.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/evennews.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/print.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_common_breadcrumb.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_index_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_subscrs.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_preview.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_print.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_protocol.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription_list_subscriptions.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription_result.html
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php 2014-04-16 16:22:45 UTC (rev 12453)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php 2014-04-16 16:32:59 UTC (rev 12454)
@@ -31,179 +31,187 @@
//global $indexAdmin;
// We recovered the value of the argument op in the URL$
-$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
+$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
$save_and_check = xNewsletter_CleanVars($_REQUEST, 'save_and_check', 'none', 'string');
-$accounts_id = xNewsletter_CleanVars($_REQUEST, 'accounts_id', 0, 'int');
-$post = xNewsletter_CleanVars($_REQUEST, 'post', '', 'string');
+$accounts_id = xNewsletter_CleanVars($_REQUEST, 'accounts_id', 0, 'int');
+$post = xNewsletter_CleanVars($_REQUEST, 'post', '', 'string');
-if ( $post == "" && $op == "save_accounts" && $save_and_check =="none" ) $op = "edit_account";
+if ($post == "" && $op == "save_accounts" && $save_and_check =="none" ) $op = "edit_account";
-switch ($op)
-{
- case "check_account":
-
- $img_ok = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_ok.png' alt='" . _AM_XNEWSLETTER_OK . "' title='"._AM_XNEWSLETTER_OK . "' /> ";
- $img_failed = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_failed.png' alt='" . _AM_XNEWSLETTER_FAILED . "' title='" . _AM_XNEWSLETTER_FAILED . "' /> ";
+switch ($op) {
+ case "check_account" :
+ $img_ok = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_ok.png' alt='" . _AM_XNEWSLETTER_OK . "' title='"._AM_XNEWSLETTER_OK . "' /> ";
+ $img_failed = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_failed.png' alt='" . _AM_XNEWSLETTER_FAILED . "' title='" . _AM_XNEWSLETTER_FAILED . "' /> ";
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
- echo $indexAdmin->renderButton();
-
- if ($accounts_id == 0) {
- redirect_header("accounts.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
- } else {
- $obj_account =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
- }
-
- $mailhost = $obj_account->getVar("accounts_server_in");
- $port = $obj_account->getVar("accounts_port_in");
- switch ($obj_account->getVar("accounts_type")) {
- case _AM_ACCOUNTS_TYPE_VAL_POP3:
- $service = "pop3";
- break;
- case _AM_ACCOUNTS_TYPE_VAL_SMTP:
- case _AM_ACCOUNTS_TYPE_VAL_GMAIL:
- $service = "imap";
- break;
- case "default":
- default:
- $service = "";
- break;
- }
- $service_option = $obj_account->getVar("accounts_securetype_in");
- $accounts_password = $obj_account->getVar("accounts_password");
- $accounts_username = $obj_account->getVar("accounts_username");
- $accounts_inbox = $obj_account->getVar("accounts_inbox"); $accounts_inbox_ok = 0;
- $accounts_hardbox = $obj_account->getVar("accounts_hardbox"); $accounts_hardbox_ok = 0;
- $accounts_softbox = $obj_account->getVar("accounts_softbox"); $accounts_softbox_ok = 0;
-
- $command = $mailhost.":".$port;
- if ($service !='') $command .= '/' . $service;
- if ($service_option !='') $command .= '/' . $service_option;
-
- echo "<table class='outer width100' cellspacing='1'>
+ echo $indexAdmin->addNavigation("accounts.php");
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->renderButton();
+
+ if ($accounts_id == 0) {
+ redirect_header("accounts.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+ } else {
+ $accountObj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ }
+
+ $mailhost = $accountObj->getVar("accounts_server_in");
+ $port = $accountObj->getVar("accounts_port_in");
+ switch ($accountObj->getVar("accounts_type")) {
+ case _AM_ACCOUNTS_TYPE_VAL_POP3:
+ $service = "pop3";
+ break;
+ case _AM_ACCOUNTS_TYPE_VAL_SMTP:
+ case _AM_ACCOUNTS_TYPE_VAL_GMAIL:
+ $service = "imap";
+ break;
+ case "default":
+ default:
+ $service = "";
+ break;
+ }
+ $service_option = $accountObj->getVar("accounts_securetype_in");
+ $accounts_password = $accountObj->getVar("accounts_password");
+ $accounts_username = $accountObj->getVar("accounts_username");
+ $accounts_inbox = $accountObj->getVar("accounts_inbox"); $accounts_inbox_ok = 0;
+ $accounts_hardbox = $accountObj->getVar("accounts_hardbox"); $accounts_hardbox_ok = 0;
+ $accounts_softbox = $accountObj->getVar("accounts_softbox"); $accounts_softbox_ok = 0;
+
+ $command = $mailhost.":".$port;
+ if ($service !='') $command .= '/' . $service;
+ if ($service_option !='') $command .= '/' . $service_option;
+
+ echo "<table class='outer width100' cellspacing='1'>
<tr>
<th class='center width5'></th>
<th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK."</th>
<th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_INFO."</th>
</tr>";
- $mbox = @imap_open("{".$command."}", $accounts_username, $accounts_password); // or die ("can't connect: " . imap_last_error());
- if ( $mbox === false ) {
- echo "<tr>";
- echo "<td class='center width5'>".$img_failed."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
- echo "<td class='left'>".imap_last_error()."</td>";
- echo "</tr>";
- } else {
- echo "<tr>";
- echo "<td class='center width5'>".$img_ok."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
- echo "<td class='left'></td>";
- echo "</tr>";
-
- $folders = imap_listmailbox($mbox, "{".$command."}", "*");
- if ($folders == false) {
- echo "<tr>";
- echo "<td class='center width5'>".$img_failed."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
- echo "<td class='left'>".imap_last_error()."</td>";
- echo "</tr>";
- } else {
- echo "<tr>";
- echo "<td class='center width5'>".$img_ok."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
- echo "<td class='left'>";
- if (is_array($folders)) {
- reset ($folders);
- sort($folders);
- $foldercreated = 0;
- while (list( $key, $val) = each ($folders)) {
- echo "($key) ";
- echo imap_utf7_decode (str_replace("{".$command."}","",$val)) . "<br>\n";
- if ("{".$command."}".$accounts_inbox == $val) $accounts_inbox_ok = 1;
- if ("{".$command."}".$accounts_hardbox == $val) {
- $accounts_hardbox_ok = 1;
- } else {
- @imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_hardbox));
- $foldercreated = 1;
- }
- if ("{".$command."}".$accounts_softbox == $val) {
- $accounts_softbox_ok = 1;
- } else {
- @imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_softbox));
- $foldercreated = 1;
- }
- }
- if ($foldercreated == 1) {
- $folders_recheck = imap_listmailbox($mbox, "{".$command."}", "*");
- while (list( $key, $val) = each ($folders_recheck)) {
- if ("{".$command."}".$accounts_hardbox == $val) $accounts_hardbox_ok = 1;
- if ("{".$command."}".$accounts_softbox == $val) $accounts_softbox_ok = 1;
- }
- }
- }
-
- echo "</td>";
- echo "</tr>";
- echo "<tr>";
- if ($obj_account->getVar("accounts_use_bmh") == '1') {
- if ($accounts_inbox_ok == 1 && $accounts_hardbox_ok == 1 && $accounts_softbox_ok == 1) {
- echo "<td class='center width5'>".$img_ok."</td>";
- } else {
- echo "<td class='center width5'>".$img_failed."</td>";
- }
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH."</td>";
- echo "<td class='left'>";
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_INBOX." ";
- if ($accounts_inbox_ok == 1) {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK.$img_ok;} else {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED.$img_failed;}
- echo "<br />";
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX." ";
- if ($accounts_hardbox_ok == 1) {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK.$img_ok;} else {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED.$img_failed;}
- echo "<br />";
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_SOFTBOX." ";
- if ($accounts_softbox_ok == 1) {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK.$img_ok;} else {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED.$img_failed;}
- echo "<br />";
- echo "</td>";
- } else {
- echo "<td class='center width5'>".$img_ok."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH._AM_XNEWSLETTER_ACCOUNTS_CHECK_SKIPPED."</td>";
- echo "<td class='center'></td>";
- }
- echo "</tr>";
- }
- imap_close($mbox);
- }
+ $mbox = @imap_open("{" . $command . "}", $accounts_username, $accounts_password); // or die ("can't connect: " . imap_last_error());
+ if ( $mbox === false ) {
+ echo "<tr>";
+ echo "<td class='center width5'>".$img_failed."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
+ echo "<td class='left'>".imap_last_error()."</td>";
+ echo "</tr>";
+ } else {
+ echo "<tr>";
+ echo "<td class='center width5'>".$img_ok."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
+ echo "<td class='left'></td>";
+ echo "</tr>";
- echo "</table>";
- break;
+ $folders = imap_listmailbox($mbox, "{".$command."}", "*");
+ if ($folders == false) {
+ echo "<tr>";
+ echo "<td class='center width5'>".$img_failed."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
+ echo "<td class='left'>".imap_last_error()."</td>";
+ echo "</tr>";
+ } else {
+ echo "<tr>";
+ echo "<td class='center width5'>".$img_ok."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
+ echo "<td class='left'>";
+ if (is_array($folders)) {
+ reset ($folders);
+ sort ($folders);
+ $foldercreated = 0;
+ while (list( $key, $val) = each ($folders)) {
+ echo "($key) ";
+ echo imap_utf7_decode (str_replace("{".$command."}","",$val)) . "<br>\n";
+ if ("{".$command."}".$accounts_inbox == $val) $accounts_inbox_ok = 1;
+ if ("{".$command."}".$accounts_hardbox == $val) {
+ $accounts_hardbox_ok = 1;
+ } else {
+ @imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_hardbox));
+ $foldercreated = 1;
+ }
+ if ("{".$command."}".$accounts_softbox == $val) {
+ $accounts_softbox_ok = 1;
+ } else {
+ @imap_createmailbox($mbox, imap_utf7_encode('{' . $command . '}' . $accounts_softbox));
+ $foldercreated = 1;
+ }
+ }
+ if ($foldercreated == 1) {
+ $folders_recheck = imap_listmailbox($mbox, "{" . $command . "}", "*");
+ while (list( $key, $val) = each ($folders_recheck)) {
+ if ("{".$command."}".$accounts_hardbox == $val) $accounts_hardbox_ok = 1;
+ if ("{".$command."}".$accounts_softbox == $val) $accounts_softbox_ok = 1;
+ }
+ }
+ }
- case "list":
- default:
- echo $indexAdmin->addNavigation('accounts.php') ;
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
- echo $indexAdmin->renderButton();
+ echo "</td>";
+ echo "</tr>";
+ echo "<tr>";
+ if ($accountObj->getVar("accounts_use_bmh") == '1') {
+ if ($accounts_inbox_ok == 1 && $accounts_hardbox_ok == 1 && $accounts_softbox_ok == 1) {
+ echo "<td class='center width5'>" . $img_ok . "</td>";
+ } else {
+ echo "<td class='center width5'>" . $img_failed . "</td>";
+ }
+ echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH . "</td>";
+ echo "<td class='left'>";
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_INBOX . " ";
+ if ($accounts_inbox_ok == 1) {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
+ } else {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ }
+ echo "<br />";
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX." ";
+ if ($accounts_hardbox_ok == 1) {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
+ } else {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ }
+ echo "<br />";
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_SOFTBOX . " ";
+ if ($accounts_softbox_ok == 1) {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
+ } else {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ }
+ echo "<br />";
+ echo "</td>";
+ } else {
+ echo "<td class='center width5'>" . $img_ok . "</td>";
+ echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH._AM_XNEWSLETTER_ACCOUNTS_CHECK_SKIPPED . "</td>";
+ echo "<td class='center'></td>";
+ }
+ echo "</tr>";
+ }
+ imap_close($mbox);
+ }
+ echo "</table>";
+ break;
- $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
- $criteria = new CriteriaCompo();
- $criteria->setSort("accounts_id ASC, accounts_type");
- $criteria->setOrder("ASC");
- $numrows = $xnewsletter->getHandler('xNewsletter_accounts')->getCount();
- $start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $accounts_arr = $xnewsletter->getHandler('xNewsletter_accounts')->getall($criteria);
- if ( $numrows > $limit ) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ case "list":
+ default:
+ echo $indexAdmin->addNavigation('accounts.php') ;
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
+ echo $indexAdmin->renderButton();
+
+ $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("accounts_id ASC, accounts_type");
+ $criteria->setOrder("ASC");
+ $numrows = $xnewsletter->getHandler('xNewsletter_accounts')->getCount();
+ $start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $accounts_arr = $xnewsletter->getHandler('xNewsletter_accounts')->getall($criteria);
+ if ( $numrows > $limit ) {
+ include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
$pagenav = '';
}
-
- // View Table
- if ($numrows > 0)
- {
+
+ // View Table
+ if ($numrows > 0) {
echo "<table class='outer width100' cellspacing='1'>
<tr>
<th class='center width2'>"._AM_XNEWSLETTER_ACCOUNTS_ID."</th>
@@ -215,10 +223,9 @@
<th class='center width10'>"._AM_XNEWSLETTER_FORMACTION."</th>
</tr>";
- $class = "odd";
-
- foreach (array_keys($accounts_arr) as $i)
- {
+ $class = "odd";
+
+ foreach (array_keys($accounts_arr) as $i) {
echo "<tr class='".$class."'>";
$class = ($class == "even") ? "odd" : "even";
echo "<td class='center'>".$i."</td>";
@@ -229,11 +236,11 @@
_AM_ACCOUNTS_TYPE_VAL_SMTP=>_AM_ACCOUNTS_TYPE_SMTP,
_AM_ACCOUNTS_TYPE_VAL_GMAIL=>_AM_ACCOUNTS_TYPE_GMAIL);
echo "<td class='center'>". $arr_accounts_type[$accounts_arr[$i]->getVar("accounts_type")]."</td>";
- echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_name")."</td>";
- echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_yourname")."</td>";
+ echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_name")."</td>";
+ echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_yourname")."</td>";
echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_yourmail")."</td>";
$verif_accounts_default = ( $accounts_arr[$i]->getVar("accounts_default") == 1 ) ? _YES : _NO;
- echo "<td class='center'>".$verif_accounts_default."</td>";
+ echo "<td class='center'>".$verif_accounts_default."</td>";
echo "<td class='center width5'>";
echo " <a href='accounts.php?op=edit_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>";
@@ -242,13 +249,13 @@
echo " <a href='accounts.php?op=check_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_check.png alt='"._AM_ACCOUNTS_TYPE_CHECK."' title='"._AM_ACCOUNTS_TYPE_CHECK."' /></a>";
}
echo "</td>";
- echo "</tr>";
- }
- echo "</table><br /><br />";
- echo "<br /><div class='center'>" . $pagenav . "</div><br />";
- } else {
- echo "<table class='outer width100' cellspacing='1'>
- <tr>
+ echo "</tr>";
+ }
+ echo "</table><br /><br />";
+ echo "<br /><div class='center'>" . $pagenav . "</div><br />";
+ } else {
+ echo "<table class='outer width100' cellspacing='1'>
+ <tr>
<th class='center width2'>"._AM_XNEWSLETTER_ACCOUNTS_ID."</th>
<th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_TYPE."</th>
<th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_NAME."</th>
@@ -265,89 +272,91 @@
<th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_DEFAULT."</th>
<th class='center width10'>"._AM_XNEWSLETTER_FORMACTION."</th>
</tr>";
- echo "</table><br /><br />";
- }
-
- break;
+ echo "</table><br /><br />";
+ }
- case "new_account":
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
- echo $indexAdmin->renderButton();
- $obj = $xnewsletter->getHandler('xNewsletter_accounts')->create();
- $obj = xNewsletter_setPost($obj,$_POST);
- $form = $obj->getForm();
- $form->display();
- break;
-
- case "save_accounts":
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
-
- $obj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
- $_POST['accounts_id'] = $accounts_id;
- $obj = xNewsletter_setPost($obj,$_POST);
-
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria("accounts_default", 1));
- $count_accounts_default = $xnewsletter->getHandler('xNewsletter_accounts')->getCount($criteria);
- if ($count_accounts_default > 0) {
- if ($obj->getVar("accounts_default") == 1) {
- global $xoopsDB;
- $verif_accounts_default = "1";
- //reset old accounts_default
- $sql = "UPDATE `{$xoopsDB->prefix("mod_xnewsletter_accounts")}` SET `accounts_default` = '0'";
- $result= $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
- } else {
- $verif_accounts_default = "0";
- }
- } else {
- $verif_accounts_default = "1";
- }
- $obj->setVar("accounts_default", $verif_accounts_default);
- if ($obj->getVar("accounts_yourmail") != "" && $obj->getVar("accounts_yourmail") != _AM_ACCOUNTS_TYPE_YOUREMAIL ) {
- if ($xnewsletter->getHandler('xNewsletter_accounts')->insert($obj)) {
- if ($save_and_check == 'none') {
- redirect_header("accounts.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
- } else {
- redirect_header("accounts.php?op=check_account&accounts_id=".$obj->getVar("accounts_id"), 2, _AM_XNEWSLETTER_FORMOK);
- }
- }
- } else {
- $obj->setErrors(_MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NOEMAIL);
- }
+ break;
- echo $obj->getHtmlErrors();
- $form =& $obj->getForm();
- $form->display();
- break;
-
- case "edit_account":
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
- echo $indexAdmin->renderButton();
- $obj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
- if ( !empty($_POST) ) xNewsletter_setPost($obj,$_POST);
- $form = $obj->getForm();
- $form->display();
+ case "new_account":
+ echo $indexAdmin->addNavigation("accounts.php");
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->renderButton();
+ $accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->create();
+ $accountObj = xNewsletter_setPost($accountObj, $_POST);
+ $form = $accountObj->getForm();
+ $form->display();
+ break;
+
+ case "save_accounts":
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+
+ $accountObj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ $_POST['accounts_id'] = $accounts_id;
+ $accountObj = xNewsletter_setPost($accountObj, $_POST);
+
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("accounts_default", 1));
+ $count_accounts_default = $xnewsletter->getHandler('xNewsletter_accounts')->getCount($criteria);
+ if ($count_accounts_default > 0) {
+ if ($accountObj->getVar("accounts_default") == 1) {
+ global $xoopsDB;
+ $verif_accounts_default = "1";
+ //reset old accounts_default
+ $sql = "UPDATE `{$xoopsDB->prefix("mod_xnewsletter_accounts")}` SET `accounts_default` = '0'";
+ $result= $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
+ } else {
+ $verif_accounts_default = "0";
+ }
+ } else {
+ $verif_accounts_default = "1";
+ }
+ $accountObj->setVar("accounts_default", $verif_accounts_default);
+ if ($accountObj->getVar("accounts_yourmail") != "" && $accountObj->getVar("accounts_yourmail") != _AM_ACCOUNTS_TYPE_YOUREMAIL ) {
+ if ($xnewsletter->getHandler('xNewsletter_accounts')->insert($accountObj)) {
+ if ($save_and_check == 'none') {
+ redirect_header("accounts.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
+ } else {
+ redirect_header("accounts.php?op=check_account&accounts_id={$accountObj->getVar("accounts_id")}", 2, _AM_XNEWSLETTER_FORMOK);
+ }
+ }
+ } else {
+ $accountObj->setErrors(_MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NOEMAIL);
+ }
+
+ echo $obj->getHtmlErrors();
+ $form = $accountObj->getForm();
+ $form->display();
+ break;
+
+ case "edit_account":
+ echo $indexAdmin->addNavigation("accounts.php");
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->renderButton();
+ $accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ if (!empty($_POST)) {
+ xNewsletter_setPost($accountObj, $_POST);
+ }
+ $form = $accountObj->getForm();
+ $form->display();
break;
-
- case "delete_account":
- $obj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
- if (isset($_POST["ok"]) && $_POST["ok"] == "1") {
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
- if ($xnewsletter->getHandler('xNewsletter_accounts')->delete($obj)) {
- redirect_header("accounts.php", 3, _AM_XNEWSLETTER_FORMDELOK);
- } else {
- echo $obj->getHtmlErrors();
- }
- } else {
- xoops_confirm(array("ok" => 1, "accounts_id" => $accounts_id, "op" => "delete_account"), "accounts.php", sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $obj->getVar("accounts_name")));
- }
- break;
+
+ case "delete_account":
+ $accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ if (isset($_POST["ok"]) && $_POST["ok"] == "1") {
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if ($xnewsletter->getHandler('xNewsletter_accounts')->delete($accountObj)) {
+ redirect_header("accounts.php", 3, _AM_XNEWSLETTER_FORMDELOK);
+ } else {
+ echo $accountObj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array("ok" => 1, "accounts_id" => $accounts_id, "op" => "delete_account"), "accounts.php", sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $accountObj->getVar("accounts_name")));
+ }
+ break;
}
include "admin_footer.php";
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php 2014-04-16 16:22:45 UTC (rev 12453)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php 2014-04-16 16:32:59 UTC (rev 12454)
@@ -21,34 +21,33 @@
require_once "admin_header.php";
function callbackAction ($msgnum, $bounce_type, $email, $subject, $xheader, $remove, $rule_no = false, $rule_cat = false, $totalFetched = 0) {
+ global $xoopsUser;
+ $xnewsletter = xNewsletterxNewsletter::getInstance();
+
if ($rule_no != "0000") {
- global $xoopsUser;
- $xnewsletter->getHandler('xNewsletter_bmh')=& xoops_getModuleHandler('xNewsletter_bmh', 'xNewsletter');
-
- $obj =& $xnewsletter->getHandler('xNewsletter_bmh')->create();
-
+ $bmhObj = $xnewsletter->getHandler('xNewsletter_bmh')->create();
//Form bmh_rule_no
- $obj->setVar("bmh_rule_no", $rule_no);
+ $bmhObj->setVar("bmh_rule_no", $rule_no);
//Form bmh_rule_cat
- $obj->setVar("bmh_rule_cat", $rule_cat);
+ $bmhObj->setVar("bmh_rule_cat", $rule_cat);
//Form bmh_bouncetype
- $obj->setVar("bmh_bouncetype", $bounce_type);
+ $bmhObj->setVar("bmh_bouncetype", $bounce_type);
//Form bmh_remove
//$verif_bmh_remove = ($remove == true || $remove == '1') ? "1" : "0";
- $obj->setVar("bmh_remove", $remove);
+ $bmhObj->setVar("bmh_remove", $remove);
//Form bmh_email
- $obj->setVar("bmh_email", $email);
+ $bmhObj->setVar("bmh_email", $email);
//Form bmh_subject
- $obj->setVar("bmh_subject", $subject);
+ $bmhObj->setVar("bmh_subject", $subject);
//Form bmh_measure
- $obj->setVar("bmh_measure", "0");
+ $bmhObj->setVar("bmh_measure", "0");
//Form bmh_submitter
- $obj->setVar("bmh_submitter", $xoopsUser->uid());
+ $bmhObj->setVar("bmh_submitter", $xoopsUser->uid());
//Form bmh_created
- $obj->setVar("bmh_created", time());
+ $bmhObj->setVar("bmh_created", time());
- if (!$xnewsletter->getHandler('xNewsletter_bmh')->insert($obj)) {
- echo $obj->getHtmlErrors();
+ if (!$xnewsletter->getHandler('xNewsletter_bmh')->insert($bmhObj)) {
+ echo $bmhObj->getHtmlErrors();
return false;
}
//echo $msgnum . ': ' . $rule_no . ' | ' . $rule_cat . ' | ' . $bounce_type . ' | ' . $remove . ' | ' . $email . ' | ' . $subject . ' | ' . $xheader . "<br />\n";
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php 2014-04-16 16:22:45 UTC (rev 12453)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php 2014-04-16 16:32:59 UTC (rev 12454)
@@ -34,405 +34,399 @@
$basic_limit_import_checked = 100;
$basic_limit_import_at_once = 10;
-$op = xNewsletter_CleanVars($_REQUEST, 'op', 'default', 'string');
-$plugin = xNewsletter_CleanVars($_REQUEST, 'plugin', 'csv', 'string');
-$cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id', 0, 'int');
-$action_after_read = xNewsletter_CleanVars($_REQUEST, 'action_after_read', 1, 'int');
-$start = xNewsletter_CleanVars($_REQUEST, 'start', 0, 'int' );
-$limitcheck = xNewsletter_CleanVars($_REQUEST, 'limitcheck', $basic_limit_import_checked, 'int' );
+$op = xNewsletter_CleanVars($_REQUEST, 'op', 'default', 'string');
+$plugin = xNewsletter_CleanVars($_REQUEST, 'plugin', 'csv', 'string');
+$cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id', 0, 'int');
+$action_after_read = xNewsletter_CleanVars($_REQUEST, 'action_after_read', 1, 'int');
+$start = xNewsletter_CleanVars($_REQUEST, 'start', 0, 'int' );
+$limitcheck = xNewsletter_CleanVars($_REQUEST, 'limitcheck', $basic_limit_import_checked, 'int' );
$skipcatsubscrexist = xNewsletter_CleanVars($_REQUEST, 'skipcatsubscrexist', 1, 'int' );
-$check_import = xNewsletter_CleanVars($_REQUEST, 'check_import', 0, 'int');
+$check_import = xNewsletter_CleanVars($_REQUEST, 'check_import', 0, 'int');
// echo "<br/>op:$op plugin:$plugin cat_id:$cat_id action_after_read:$action_after_read start:$start limitcheck:$limitcheck skipcatsubscrexist:$skipcatsubscrexist<br/><br/>";
echo $indexAdmin->addNavigation("import.php");
-switch ($op)
-{
- case "show_formcheck":
-
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
- echo $indexAdmin->renderButton();
+switch ($op) {
+ case "show_formcheck":
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
+ echo $indexAdmin->renderButton();
- $crit_import = new CriteriaCompo();
- $crit_import->setSort("import_id");
- $crit_import->setOrder("ASC");
- $numrows = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
+ $crit_import = new CriteriaCompo();
+ $crit_import->setSort("import_id");
+ $crit_import->setOrder("ASC");
+ $numrows = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
- $crit_import->setStart($start);
- $crit_import->setLimit($limitcheck);
- $import_arr = $xnewsletter->getHandler('xNewsletter_import')->getall($crit_import);
-
- if ($numrows > 0) {
- include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-
- $action = $_SERVER["REQUEST_URI"];
- $unique_id = uniqid(mt_rand());
- $form = "<br/><form name=\"form_import_".$unique_id."\" id=\"form_import_".$unique_id."\" action=\"import.php\" method=\"post\" enctype=\"multipart/form-data\">";
-
- $showlimit = str_replace("%s", $start+1, _AM_XNEWSLETTER_IMPORT_SHOW);
- if ($limitcheck < $numrows) {
- $showlimit = str_replace("%l", $limitcheck, $showlimit);
- } else {
- $showlimit = str_replace("%l", $numrows, $showlimit);
- }
- $showlimit = str_replace("%n", $numrows, $showlimit);
-
- $form .="<table width=\"100%\" cellspacing=\"1\" class=\"outer\">
- <tr>
- <td align=\"left\" colspan='8'>".$showlimit."</td>
- </tr>";
-
- $class = "odd";
- $form .="
- <tr>
- <th align=\"center\"> </th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_EMAIL."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_SEX."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_LASTNAME."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_CAT_NAME."</th>
- </tr>";
-
- $class = "odd";
- $counter = 0;
-
- //get data for dropdown with cats
- $criteria = new CriteriaCompo();
- $criteria->setSort('cat_id ASC, cat_name');
- $criteria->setOrder('ASC');
- $cat_arr=$xnewsletter->getHandler('xNewsletter_cat')->getall($criteria);
-
- foreach (array_keys($import_arr) as $i) {
- $counter++;
- $form .= "<tr class=\"".$class."\">";
- $class = ($class == "even") ? "odd" : "even";
- $form .= "<td align=\"center\">".$counter;
- $form .= "<input type='hidden' name='import_id_".$counter."' title='import_id_".$counter."' id='import_id_".$counter."' value='".$import_arr[$i]->getVar("import_id")."' />";
- $form .= "</td>";
- $form .= "<td align=\"center\">";
- $form .= "<input type='text' disabled=disabled name='email_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_EMAIL."' id='email_".$counter."' value='".$import_arr[$i]->getVar("import_email")."' />";
- $form .= "</td>";
-
- $form .= "<td align=\"center\">";
- $sex = $import_arr[$i]->getVar("import_sex");
- $form .= "<select size=\"1\" name=\"sex_".$counter."\" id=\"sex_".$counter."\" title=\""._AM_XNEWSLETTER_SUBSCR_SEX."\" ";
- $form .= "value=\"".$sex."\">";
- $form .= "<option value=\"\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_EMPTY."</option>";
- $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FEMALE) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."</option>";
- $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_MALE."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_MALE) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_MALE."</option>";
- $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_COMP."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_COMP) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_COMP."</option>";
- $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."</option>";
- $form .= "</select>\n";
- $form .= "</td>";
-
- $form .= "<td align=\"center\">";
- $form .= "<input type='text' name='firstname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."' id='firstname_".$counter."' value='".$import_arr[$i]->getVar("import_firstname")."' />";
- $form .= "</td>";
- $form .= "<td align=\"center\">";
- $form .= "<input type='text' name='lastname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_LASTNAME."' id='lastname_".$counter."' value='".$import_arr[$i]->getVar("import_lastname")."' />";
- $form .= "</td>";
- $form .= "<td align=\"center\">";
- $subscr_id = $import_arr[$i]->getVar("import_subscr_id");
- $form .= "<input type='hidden' name='subscr_id_".$counter."' title='subscr_id' id='subscr_id_".$counter."' value='".$subscr_id."' />";
- if ($subscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' />";
- $form .= "</td>";
- $form .= "<td align=\"center\">";
- $catsubscr_id = $import_arr[$i]->getVar("import_catsubscr_id");
- $form .= "<input type='hidden' name='catsubscr_id_".$counter."' title='catsubscr_id' id='catsubscr_id_".$counter."' value='".$catsubscr_id."' />";
- if ($catsubscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' />";
- $form .= "</td>";
- $form .= "</td>";
- $form .= "<td align=\"center\">";
-
- $curr_cat_id =$import_arr[$i]->getVar("import_cat_id");
- $form .= "<select size=\"1\" name=\"cat_id_".$counter."\" id=\"cat_id_".$counter."\" title=\"cat\" ";
- $form .= "value=\"".$curr_cat_id."\">";
- $cat_select = "<option value=\"0\"";
- $cat_select .= ">"._AM_XNEWSLETTER_IMPORT_NOIMPORT."</option>";
- foreach (array_keys($cat_arr) as $j)
- {
- $cat_select .= "<option value=\"".$j."\"";
- if ($curr_cat_id == $j) $cat_select .= " selected=\"selected\"";
- $cat_select .= ">".$cat_arr[$j]->getVar("cat_name")."</option>";
- }
-
- $form .= $cat_select;
- $form .= "</select>\n";
-
- $form .= "</td>";
- $form .= "</tr>";
- }
- $form .= "<tr class=\"".$class."\">";
- $class = ($class == "even") ? "odd" : "even";
- $form .= "<td colspan=\"8\"align=\"center\">";
- $form .= "<input type='hidden' name='counter' title='counter' id='counter' value='".$counter."' />";
- $form .= "<input type='hidden' name='limitcheck' title='limitcheck' id='limitcheck' value='".$limitcheck."' />";
- $form .= "<input type='hidden' name='op' title='op' id='op' value='apply_import_form' />";
- $form .= "<input type='submit' class='formButton' name='submit' id='submit' value='"._AM_XNEWSLETTER_IMPORT_EXEC."' title='"._AM_XNEWSLETTER_IMPORT_EXEC."' />";
- $form .= "</td></tr>";
-
- $form .= "</table></form>";
- echo $form;
- }
- break;
+ $crit_import->setStart($start);
+ $crit_import->setLimit($limitcheck);
+ $import_arr = $xnewsletter->getHandler('xNewsletter_import')->getall($crit_import);
- case "apply_import_form":
- //update mod_xnewsletter with settings form_import
- $counter = xNewsletter_CleanVars($_REQUEST, 'counter', 0, 'int');
-
- for ($i=1; $i < ($counter+1); $i++) {
- $import_id = xNewsletter_CleanVars($_REQUEST, 'import_id_'.$i, 'default', 'string');
- $subscr_firstname = xNewsletter_CleanVars($_REQUEST, 'firstname_'.$i, '', 'string');
- $subscr_lastname = xNewsletter_CleanVars($_REQUEST, 'lastname_'.$i, '', 'string');
- $subscr_sex = xNewsletter_CleanVars($_REQUEST, 'sex_'.$i, '', 'string');
- $cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id_'.$i, 0, 'int');
-
- if ($cat_id > 0) {
- if ($subscr_id==0) {
- //update sex, firstname, lastname
- $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_sex`='$subscr_sex', `import_firstname`='$subscr_firstname', `import_lastname`='$subscr_lastname' WHERE `import_id`=$import_id";
- $result=$xoopsDB->queryF($sql);
- }
- }
- //update cat_id and import_status
- $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_cat_id`='$cat_id', `import_status`=1 WHERE `import_id`=$import_id";
- $result=$xoopsDB->queryF($sql);
- }
-
- redirect_header("import.php?op=exec_import_final&check_import=1&limitcheck=".$limitcheck, 0, "");
- break;
-
- case "exec_import_final":
-
- //execute final import of all data from mod_xnewsletter_import, where import_status = 1
- //delete data from mod_xnewsletter_import, when imported (successful or not)
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
- echo $indexAdmin->renderButton();
-
- $ip = xoops_getenv("REMOTE_ADDR");
- $submitter = $xoopsUser->uid();
-
- $crit_import = new CriteriaCompo();
- $crit_import->add(new Criteria('import_status', "1"));
- $numrows_total = $xnewsletter->getHandler('xNewsletter_import')->getCount();
- $numrows_act = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
- if ( $numrows_act > 0 ) {
- $sql = "SELECT * FROM ".$xoopsDB->prefix("mod_xnewsletter_import")." WHERE ((import_status)=1)";
- $sql .= " ORDER BY `import_id` ASC";
- $counter = 0;
- $users_import = $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
- while ($user_import = mysql_fetch_assoc($users_import)) {
- $import_id = $user_import["import_id"];
- $subscr_email = $user_import["import_email"];
- $subscr_firstname = $user_import["import_firstname"];
- $subscr_lastname = $user_import["import_lastname"];
- $subscr_sex = $user_import["import_sex"];
- $cat_id = $user_import["import_cat_id"];
- $subscr_id = $user_import["import_subscr_id"];
- $catsubscr_id = $user_import["import_catsubscr_id"];
- $subscribe = 0;
-
- if ($cat_id == 0) {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_SKIP), 1, $submitter);
- } else {
- //register email
- if ($subscr_id==0) {
- $subscr_uid = 0;
- $sql = "SELECT `uid` FROM ".$xoopsDB->prefix("users")." WHERE (`email`='";
- $sql .= $subscr_email;
- $sql .= "') LIMIT 1";
- if ( $user = $xoopsDB->queryF($sql) ) {
- $row_user = mysql_fetch_array($user);
- $subscr_uid = $row_user[0];
- }
- unset($row_user);
- unset($user);
+ if ($numrows > 0) {
+ include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $sql = "INSERT INTO `".$xoopsDB->prefix('mod_xnewsletter_subscr')."` (`subscr_email`, `subscr_firstname`, `subscr_lastname`, `subscr_uid`, `subscr_sex`, `subscr_submitter`, `subscr_created`, `subscr_ip`, `subscr_activated`, `subscr_actoptions`) VALUES ('".$subscr_email."','".$subscr_firstname."','".$subscr_lastname."',".intval($subscr_uid).",'".$subscr_sex."',".$submitter.",".time().",'".$ip."','1','')";
- if (!$xoopsDB->queryF($sql)) {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
+ $action = $_SERVER["REQUEST_URI"];
+ $unique_id = uniqid(mt_rand());
+ $form = "<br/><form name=\"form_import_".$unique_id."\" id=\"form_import_".$unique_id."\" action=\"import.php\" method=\"post\" enctype=\"multipart/form-data\">";
+
+ $showlimit = str_replace("%s", $start+1, _AM_XNEWSLETTER_IMPORT_SHOW);
+ if ($limitcheck < $numrows) {
+ $showlimit = str_replace("%l", $limitcheck, $showlimit);
} else {
- //register email successful
- $resulttext = $subscr_email.": "._AM_XNEWSLETTER_IMPORT_RESULT_REG_OK." | ";
- $subscr_id = $xoopsDB->getInsertId();
- $subscribe=1;
+ $showlimit = str_replace("%l", $numrows, $showlimit);
}
-
- } else {
- //email already registered
- $resulttext = $subscr_email.": "._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST." | ";
- $subscribe=1;
- }
- if ($subscribe == 1) {
- if ($catsubscr_id==0) {
- //add subscription of this email
- $sql = "INSERT INTO `".$xoopsDB->prefix('mod_xnewsletter_catsubscr')."` (`catsubscr_catid`, `catsubscr_subscrid`, `catsubscr_submitter`, `catsubscr_created`) VALUES (".$cat_id.",".$subscr_id.",".$submitter.",".time().")";
- if ($xoopsDB->queryF($sql)) {
- create_prot ( $resulttext._AM_XNEWSLETTER_IMPORT_RESULT_SUBSCR_OK, 1, $submitter);
- //handle mailinglists
- $cat_mailinglist = 0;
- $sql = "SELECT `cat_mailinglist` FROM ".$xoopsDB->prefix("mod_xnewsletter_cat")." WHERE (`cat_id`=";
- $sql .= $cat_id;
- $sql .= ") LIMIT 1";
- if ( $cat_mls = $xoopsDB->queryF($sql) ) {
- $cat_ml = mysql_fetch_array($cat_mls);
- $cat_mailinglist = $cat_ml[0];
+ $showlimit = str_replace("%n", $numrows, $showlimit);
+
+ $form .="<table width=\"100%\" cellspacing=\"1\" class=\"outer\">
+ <tr>
+ <td align=\"left\" colspan='8'>".$showlimit."</td>
+ </tr>";
+
+ $class = "odd";
+ $form .="
+ <tr>
+ <th align=\"center\"> </th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_EMAIL."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_SEX."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_LASTNAME."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_CAT_NAME."</th>
+ </tr>";
+
+ $class = "odd";
+ $counter = 0;
+
+ //get data for dropdown with cats
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('cat_id ASC, cat_name');
+ $criteria->setOrder('ASC');
+ $cat_arr=$xnewsletter->getHandler('xNewsletter_cat')->getall($criteria);
+
+ foreach (array_keys($import_arr) as $i) {
+ $counter++;
+ $form .= "<tr class=\"".$class."\">";
+ $class = ($class == "even") ? "odd" : "even";
+ $form .= "<td align=\"center\">".$counter;
+ $form .= "<input type='hidden' name='import_id_".$counter."' title='import_id_".$counter."' id='import_id_".$counter."' value='".$import_arr[$i]->getVar("import_id")."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $form .= "<input type='text' disabled=disabled name='email_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_EMAIL."' id='email_".$counter."' value='".$import_arr[$i]->getVar("import_email")."' />";
+ $form .= "</td>";
+
+ $form .= "<td align=\"center\">";
+ $sex = $import_arr[$i]->getVar("import_sex");
+ $form .= "<select size=\"1\" name=\"sex_".$counter."\" id=\"sex_".$counter."\" title=\""._AM_XNEWSLETTER_SUBSCR_SEX."\" ";
+ $form .= "value=\"".$sex."\">";
+ $form .= "<option value=\"\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_EMPTY."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FEMALE) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_MALE."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_MALE) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_MALE."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_COMP."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_COMP) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_COMP."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."</option>";
+ $form .= "</select>\n";
+ $form .= "</td>";
+
+ $form .= "<td align=\"center\">";
+ $form .= "<input type='text' name='firstname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."' id='firstname_".$counter."' value='".$import_arr[$i]->getVar("import_firstname")."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $form .= "<input type='text' name='lastname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_LASTNAME."' id='lastname_".$counter."' value='".$import_arr[$i]->getVar("import_lastname")."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $subscr_id = $import_arr[$i]->getVar("import_subscr_id");
+ $form .= "<input type='hidden' name='subscr_id_".$counter."' title='subscr_id' id='subscr_id_".$counter."' value='".$subscr_id."' />";
+ if ($subscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $catsubscr_id = $import_arr[$i]->getVar("import_catsubscr_id");
+ $form .= "<input type='hidden' name='catsubscr_id_".$counter."' title='catsubscr_id' id='catsubscr_id_".$counter."' value='".$catsubscr_id."' />";
+ if ($catsubscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' />";
+ $form .= "</td>";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+
+ $curr_cat_id =$import_arr[$i]->getVar("import_cat_id");
+ $form .= "<select size=\"1\" name=\"cat_id_".$counter."\" id=\"cat_id_".$counter."\" title=\"cat\" ";
+ $form .= "value=\"".$curr_cat_id."\">";
+ $cat_select = "<option value=\"0\"";
+ $cat_select .= ">"._AM_XNEWSLETTER_IMPORT_NOIMPORT."</option>";
+ foreach (array_keys($cat_arr) as $j) {
+ $cat_select .= "<option value=\"".$j."\"";
+ if ($curr_cat_id == $j) $cat_select .= " selected=\"selected\"";
+ $cat_select .= ">".$cat_arr[$j]->getVar("cat_name")."</option>";
}
- unset($cat_ml);
- unset($cat_mls);
- if ($cat_mailinglist > 0) {
- require_once( XOOPS_ROOT_PATH."/modules/xNewsletter/include/mailinglist.php" );
- subscribingMLHandler(1, $subscr_id, $cat_mailinglist);
- }
- } else {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
- }
+ $form .= $cat_select;
+ $form .= "</select>\n";
+
+ $form .= "</td>";
+ $form .= "</tr>";
+ }
+ $form .= "<tr class=\"".$class."\">";
+ $class = ($class == "even") ? "odd" : "even";
+ $form .= "<td colspan=\"8\"align=\"center\">";
+ $form .= "<input type='hidden' name='counter' title='counter' id='counter' value='".$counter."' />";
+ $form .= "<input type='hidden' name='limitcheck' title='limitcheck' id='limitcheck' value='".$limitcheck."' />";
+ $form .= "<input type='hidden' name='op' title='op' id='op' value='apply_import_form' />";
+ $form .= "<input type='submit' class='formButton' name='submit' id='submit' value='"._AM_XNEWSLETTER_IMPORT_EXEC."' title='"._AM_XNEWSLETTER_IMPORT_EXEC."' />";
+ $form .= "</td></tr>";
+
+ $form .= "</table></form>";
+ echo $form;
+ }
+ break;
+
+ case "apply_import_form":
+ //update mod_xnewsletter with settings form_import
+ $counter = xNewsletter_CleanVars($_REQUEST, 'counter', 0, 'int');
+
+ for ($i=1; $i < ($counter+1); $i++) {
+ $import_id = xNewsletter_CleanVars($_REQUEST, 'import_id_'.$i, 'default', 'string');
+ $subscr_firstname = xNewsletter_CleanVars($_REQUEST, 'firstname_'.$i, '', 'string');
+ $subscr_lastname = xNewsletter_CleanVars($_REQUEST, 'lastname_'.$i, '', 'string');
+ $subscr_sex = xNewsletter_CleanVars($_REQUEST, 'sex_'.$i, '', 'string');
+ $cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id_'.$i, 0, 'int');
+
+ if ($cat_id > 0) {
+ if ($subscr_id==0) {
+ //update sex, firstname, lastname
+ $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_sex`='$subscr_sex', `import_firstname`='$subscr_firstname', `import_lastname`='$subscr_lastname' WHERE `import_id`=$import_id";
+ $result=$xoopsDB->queryF($sql);
+ }
+ }
+ //update cat_id and import_status
+ $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_cat_id`='$cat_id', `import_status`=1 WHERE `import_id`=$import_id";
+ $result=$xoopsDB->queryF($sql);
+ }
+
+ redirect_header("import.php?op=exec_import_final&check_import=1&limitcheck=".$limitcheck, 0, "");
+ break;
+
+ case "exec_import_final":
+ //execute final import of all data from mod_xnewsletter_import, where import_status = 1
+ //delete data from mod_xnewsletter_import, when imported (successful or not)
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
+ echo $indexAdmin->renderButton();
+
+ $ip = xoops_getenv("REMOTE_ADDR");
+ $submitter = $xoopsUser->uid();
+
+ $crit_import = new CriteriaCompo();
+ $crit_import->add(new Criteria('import_status', "1"));
+ $numrows_total = $xnewsletter->getHandler('xNewsletter_import')->getCount();
+ $numrows_act = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
+ if ( $numrows_act > 0 ) {
+ $sql = "SELECT * FROM ".$xoopsDB->prefix("mod_xnewsletter_import")." WHERE ((import_status)=1)";
+ $sql .= " ORDER BY `import_id` ASC";
+ $counter = 0;
+ $users_import = $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
+ while ($user_import = mysql_fetch_assoc($users_import)) {
+ $import_id = $user_import["import_id"];
+ ...
[truncated message content] |
|
From: <luc...@us...> - 2014-04-16 16:22:48
|
Revision: 12453
http://sourceforge.net/p/xoops/svn/12453
Author: luciorota
Date: 2014-04-16 16:22:45 +0000 (Wed, 16 Apr 2014)
Log Message:
-----------
fixed templates name
Added Paths:
-----------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_common_breadcrumb.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_index_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_subscrs.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_preview.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_print.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_protocol.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription_list_subscriptions.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription_result.html
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_common_breadcrumb.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_index_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_subscrs.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_preview.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_print.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_protocol.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription_list_subscriptions.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription_result.html
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,11 +0,0 @@
-<table class="outer">
-<{foreachq item=catsubscr from=$block}>
- <tr class = "<{cycle values = "even,odd"}>">
- <td>
- <{$catsubscr.catsubscr_email}>;
- <{$catsubscr.catsubscr_newsletter}>;
- <{$catsubscr.catsubscr_created}>;
- </td>
- </tr>
-<{/foreach}>
-</table>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,11 @@
+<table class="outer">
+<{foreachq item=catsubscr from=$block}>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td>
+ <{$catsubscr.catsubscr_email}>;
+ <{$catsubscr.catsubscr_newsletter}>;
+ <{$catsubscr.catsubscr_created}>;
+ </td>
+ </tr>
+<{/foreach}>
+</table>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,11 +0,0 @@
-<table class="outer">
-<{foreachq item=catsubscr from=$block}>
- <tr class = "<{cycle values = "even,odd"}>">
- <td>
- <{$catsubscr.catsubscr_email}>;
- <{$catsubscr.catsubscr_newsletter}>;
- <{$catsubscr.catsubscr_created}>;
- </td>
- </tr>
-<{/foreach}>
-</table>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,11 @@
+<table class="outer">
+<{foreachq item=catsubscr from=$block}>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td>
+ <{$catsubscr.catsubscr_email}>;
+ <{$catsubscr.catsubscr_newsletter}>;
+ <{$catsubscr.catsubscr_created}>;
+ </td>
+ </tr>
+<{/foreach}>
+</table>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,9 +0,0 @@
-<table class="outer">
-<{foreachq item=letter from=$block}>
- <tr class = "<{cycle values = "even,odd"}>">
- <td>
- <a href="<{$letter.href}>"><{$letter.letter_title}><br />(<{$letter.letter_created}>)</a>
- </td>
- </tr>
-<{/foreach}>
-</table>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,9 @@
+<table class="outer">
+<{foreachq item=letter from=$block}>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td>
+ <a href="<{$letter.href}>"><{$letter.letter_title}><br />(<{$letter.letter_created}>)</a>
+ </td>
+ </tr>
+<{/foreach}>
+</table>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,9 +0,0 @@
-<table class="outer">
-<{foreachq item=letter from=$block}>
- <tr class = "<{cycle values = "even,odd"}>">
- <td>
- <a href="<{$letter.href}>"><{$letter.letter_title}><br />(<{$letter.letter_created}>)</a>
- </td>
- </tr>
-<{/foreach}>
-</table>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,9 @@
+<table class="outer">
+<{foreachq item=letter from=$block}>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td>
+ <a href="<{$letter.href}>"><{$letter.letter_title}><br />(<{$letter.letter_created}>)</a>
+ </td>
+ </tr>
+<{/foreach}>
+</table>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,9 +0,0 @@
-<table class="outer">
-<{foreachq item=letter from=$block}>
- <tr class = "<{cycle values = "even,odd"}>">
- <td>
- <a href="<{$letter.href}>"><{$letter.letter_title}><br />(<{$letter.letter_created}>)</a>
- </td>
- </tr>
-<{/foreach}>
-</table>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,9 @@
+<table class="outer">
+<{foreachq item=letter from=$block}>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td>
+ <a href="<{$letter.href}>"><{$letter.letter_title}><br />(<{$letter.letter_created}>)</a>
+ </td>
+ </tr>
+<{/foreach}>
+</table>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,14 +0,0 @@
-<form name="<{$block.formname}>" id="<{$block.formname}>" action="<{$block.formaction}>" method="post" enctype="multipart/form-data">
- <table class="outer">
- <tr class = "<{cycle values = "even,odd"}>">
- <td style="text-align:center">
- <{$block.infotext}>
- </td>
- </tr>
- <tr class = "<{cycle values = "even,odd"}>">
- <td style="text-align:center">
- <input type="submit" class="formButton" name="submit" id="submit" value="<{$block.buttontext}>" title="<{$block.buttontext}>" />
- </td>
- </tr>
- </table>
-</form>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,14 @@
+<form name="<{$block.formname}>" id="<{$block.formname}>" action="<{$block.formaction}>" method="post" enctype="multipart/form-data">
+ <table class="outer">
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td style="text-align:center">
+ <{$block.infotext}>
+ </td>
+ </tr>
+ <tr class = "<{cycle values = "even,odd"}>">
+ <td style="text-align:center">
+ <input type="submit" class="formButton" name="submit" id="submit" value="<{$block.buttontext}>" title="<{$block.buttontext}>" />
+ </td>
+ </tr>
+ </table>
+</form>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,39 +0,0 @@
-<{if $advertise_code != ''}>
-<div class="center">
- <{$advertise_code}>
-</div>
-<{/if}>
-<{if $social_active != 0}>
-<div class="center">
- <{$social_code}>
-</div>
-<{/if}>
-<div class="center">
- <{$copyright_code}>
-</div>
-
-<div class="xnewsletter_adminlinks">
- <a href='<{$smarty.const.XNEWSLETTER_URL}>/subscription.php?op=list_subscriptions'>
- <{$smarty.const._MI_XNEWSLETTER_SUBSCRIBE}>
- </a>
- <a href='<{$smarty.const.XNEWSLETTER_URL}>/letter.php?op=list_letters'>
- <{$smarty.const._MI_XNEWSLETTER_LIST}>
- </a>
-<{if $showCreate == true}>
- <a href='<{$smarty.const.XNEWSLETTER_URL}>/letter.php?op=new_letter'>
- <{$smarty.const._MI_XNEWSLETTER_CREATE}>
- </a>
-<{/if}>
-<{if $showList == true}>
- <a href='<{$smarty.const.XNEWSLETTER_URL}>/letter.php?op=list_subscrs'>
- <{$smarty.const._MI_XNEWSLETTER_LIST_SUBSCR}>
- </a>
-<{/if}>
-</div>
-<div class="xnewsletter_adminlinks">
-<{if $isAdmin == true}>
- <a href='<{$smarty.const.XNEWSLETTER_URL}>/admin/index.php'>
- <{$smarty.const._MA_XNEWSLETTER_ADMIN}>
- </a>
-<{/if}>
-</div>
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,24 @@
+<{if $advertise_code != ''}>
+<div class="center">
+ <{$advertise_code}>
+</div>
+<{/if}>
+<{if $social_active != 0}>
+<div class="center">
+ <{$social_code}>
+</div>
+<{/if}>
+<div class="center">
+ <{$copyright_code}>
+</div>
+
+<!-- footer menu -->
+<div class="xnewsletter_adminlinks">
+<{foreach item='footerMenuItem' from=$xnewsletterModuleInfoSub}>
+ <a href='<{$smarty.const.XNEWSLETTER_URL}>/<{$footerMenuItem.url}>'><{$footerMenuItem.name}></a>
+<{/foreach}>
+<{if $isAdmin == true}>
+ <br />
+ <a href='<{$smarty.const.XNEWSLETTER_URL}>/admin/index.php'><{$smarty.const._MA_XNEWSLETTER_ADMIN}></a>
+<{/if}>
+</div>
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,7 +0,0 @@
-<{$xnewsletter_breadcrumb}>
-
-<{if $advertise_code != ''}>
-<div class="center">
- <{$advertise_code}>
-</div>
-<{/if}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,7 @@
+<{$xnewsletter_breadcrumb}>
+
+<{if $advertise_code != ''}>
+<div class="center">
+ <{$advertise_code}>
+</div>
+<{/if}>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,5 +0,0 @@
-<{include file="db:xnewsletter_header.html"}>
-<div class="outer">
- <div><{$welcome_message}></div>
-</div>
-<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,5 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <div><{$welcome_message}></div>
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_common_breadcrumb.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_common_breadcrumb.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_common_breadcrumb.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,17 +0,0 @@
-<div class="xnewsletter_headertable">
- <div class="xnewsletter_breadcrumb">
- <{foreach item=bread from=$breadcrumb name=bcloop}>
- <span class="bread">
- <{if ($bread.link)}>
- <a href="<{$bread.link}>" title="<{$bread.title}>"><{$bread.title}></a>
- <{else}>
- <{$bread.title}>
- <{/if}>
- </span>
- <{if !$smarty.foreach.bcloop.last}>
- <span class="delimiter">></span>
- <{/if}>
- <{/foreach}>
- <hr/>
- </div>
-</div>
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_common_breadcrumb.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_common_breadcrumb.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_common_breadcrumb.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,16 @@
+<div class="xnewsletter_headertable">
+ <div class="xnewsletter_breadcrumb">
+ <{foreach item=bread from=$breadcrumb name=bcloop}>
+ <span class="bread">
+ <{if ($bread.link)}>
+ <a href="<{$bread.link}>" title="<{$bread.title}>"><{$bread.title}></a>
+ <{else}>
+ <{$bread.title}>
+ <{/if}>
+ </span>
+ <{if !$smarty.foreach.bcloop.last}>
+ <span class="delimiter">></span>
+ <{/if}>
+ <{/foreach}>
+ </div>
+</div>
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_index_list_letters.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_index_list_letters.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_index_list_letters.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,36 +0,0 @@
-<{include file="db:xnewsletter_header.html"}>
-<div class="outer">
- <table cellpadding="0" cellspacing="0" class="item" width="100%">
- <tr class="itemHead">
- <th class="center"></th>
- <th class="center"><{$smarty.const._AM_XNEWSLETTER_LETTER_TITLE}></th>
- <th class="center"><{$smarty.const._AM_XNEWSLETTER_LETTER_CONTENT}></th>
- <th class="center"><{$smarty.const._MA_XNEWSLETTER_LETTER_CATS}></th>
- <th class="center"><{$smarty.const._AM_XNEWSLETTER_LETTER_CREATED}></th>
- <th class="center"> </th>
- </tr>
- <{foreachq item='letter' from=$letters}>
- <tr class = "<{cycle values = 'even,odd'}>">
- <td class="center"><{$letter.letter_id}></td>
- <td class="center"><{$letter.letter_title}></td>
- <td class="center"><{$letter.letter_content}></td>
- <td class="center">
- <{foreach item='letter_cat' from=$letter.letter_cats}>
- <{$letter_cat.cat_name}>
- <br />
- <{/foreach}>
- </td>
- <td class="center"><{$letter.letter_created_timestamp}></td>
- <td class="center">
- <a href="index.php?op=show_preview&letter_id=<{$letter.letter_id}>">
- <img
- src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_preview.png"
- alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>"
- title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>" />
- </a>
- </td>
- </tr>
- <{/foreach}>
- </table>
-</div>
-<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_index_list_letters.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_index_list_letters.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_index_list_letters.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,36 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <table cellpadding="0" cellspacing="0" class="item" width="100%">
+ <tr class="itemHead">
+ <th class="center"></th>
+ <th class="center"><{$smarty.const._AM_XNEWSLETTER_LETTER_TITLE}></th>
+ <th class="center"><{$smarty.const._AM_XNEWSLETTER_LETTER_CONTENT}></th>
+ <th class="center"><{$smarty.const._MA_XNEWSLETTER_LETTER_CATS}></th>
+ <th class="center"><{$smarty.const._AM_XNEWSLETTER_LETTER_CREATED}></th>
+ <th class="center"> </th>
+ </tr>
+ <{foreachq item='letter' from=$letters}>
+ <tr class = "<{cycle values = 'even,odd'}>">
+ <td class="center"><{$letter.letter_id}></td>
+ <td class="center"><{$letter.letter_title}></td>
+ <td class="center"><{$letter.letter_content}></td>
+ <td class="center">
+ <{foreach item='letter_cat' from=$letter.letter_cats}>
+ <{$letter_cat.cat_name}>
+ <br />
+ <{/foreach}>
+ </td>
+ <td class="center"><{$letter.letter_created_timestamp}></td>
+ <td class="center">
+ <a href="index.php?op=show_preview&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_preview.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>" />
+ </a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,5 +0,0 @@
-<{include file="db:xnewsletter_header.html"}>
-<div class="outer">
- <{$content}>
-</div>
-<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,5 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <{$content}>
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_letters.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_letters.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_letters.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,98 +0,0 @@
-<{include file="db:xnewsletter_header.html"}>
-<div class="outer">
- <table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width2'><{$smarty.const._AM_XNEWSLETTER_LETTER_ID}></th>
- <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_TITLE}></th>
- <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_TEMPLATE}></th>
- <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_CATS}></th>
- <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_ATTACHMENT}></th>
- <th class='center width10'><{$smarty.const._AM_XNEWSLETTER_LETTER_EMAIL_TEST}></th>
- <th class='center'><{$smarty.const._AM_XNEWSLETTER_PROTOCOL_LAST_STATUS}></th>
- <th class='center' width='120px'><{$smarty.const._AM_XNEWSLETTER_FORMACTION}></th>
- </tr>
- <{foreach item='letter' from=$letters}>
- <tr class="<{cycle values = 'even,odd'}>">
- <td class="center"><{$letter.letter_id}></td>
- <td class="center"><{$letter.letter_title}></td>
- <td class="center"><{$letter.letter_template}></td>
- <td class="center">
- <{foreach item='letter_cat' from=$letter.letter_cats}>
- <{$letter_cat.cat_name}>
- <br />
- <{/foreach}>
- </td>
- <td class="center"><{$letter.attachmentCount}></td>
- <td class="center"><{$letter.letter_email_test}></td>
- <td class="center">
- <{if ($letter.userPermissions.edit)}>
- <{foreach item='protocol' from=$letter.protocols}>
- <a href='protocol.php?op=list_letter&letter_id=<{$protocol.protocol_letter_id}>'><{$protocol.protocol_status}></a>
- <br />
- <{/foreach}>
- <{else}>
- -
- <{/if}>
- </td>
- <td class="center">
- <{if ($letter.userPermissions.edit)}>
- <a href="?op=edit_letter&letter_id=<{$letter.letter_id}>">
- <img
- src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_edit.png"
- alt="<{$smarty.const._EDIT}>"
- title="<{$smarty.const._EDIT}>" />
- </a>
- <{/if}>
- <{if ($letter.userPermissions.delete)}>
- <a href="?op=delete_letter&letter_id=<{$letter.letter_id}>">
- <img
- src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_delete.png"
- alt="<{$smarty.const._DELETE}>"
- title="<{$smarty.const._DELETE}>" />
- </a>
- <{/if}>
- <{if ($letter.userPermissions.create)}>
- <a href="?op=copy_letter&letter_id=<{$letter.letter_id}>">
- <img
- src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_copy.png"
- alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_COPYNEW}>"
- title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_COPYNEW}>" />
- </a>
- <{/if}>
- <{if ($letter.userPermissions.read)}>
- <a href="?op=show_preview&letter_id=<{$letter.letter_id}>">
- <img
- src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_preview.png"
- alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>"
- title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>" />
- </a>
- <{/if}>
- <{if ($letter.userPermissions.send)}>
- <a href="sendletter.php?op=send_test&letter_id=<{$letter.letter_id}>">
- <img
- src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_sendtest.png"
- alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SENDTEST}>"
- title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SENDTEST}>" />
- </a>
- <a href="sendletter.php?op=send_letter&letter_id=<{$letter.letter_id}>">
- <img
- src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_send.png"
- alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SEND}>"
- title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SEND}>" />
- </a>
- <a href="sendletter.php?op=resend_letter&letter_id=<{$letter.letter_id}>">
- <img
- src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_resend.png"
- alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_RESEND}>"
- title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_RESEND}>" />
- </a>
- <{/if}>
- </td>
- </tr>
- <{/foreach}>
- </table>
- <br />
- <div class='center'><{$pagenav}></div>
- <br />
-</div>
-<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_letters.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_letters.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_letters.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,98 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <table class='outer width100' cellspacing='1'>
+ <tr>
+ <th class='center width2'><{$smarty.const._AM_XNEWSLETTER_LETTER_ID}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_TITLE}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_TEMPLATE}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_CATS}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_LETTER_ATTACHMENT}></th>
+ <th class='center width10'><{$smarty.const._AM_XNEWSLETTER_LETTER_EMAIL_TEST}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_PROTOCOL_LAST_STATUS}></th>
+ <th class='center' width='120px'><{$smarty.const._AM_XNEWSLETTER_FORMACTION}></th>
+ </tr>
+ <{foreach item='letter' from=$letters}>
+ <tr class="<{cycle values = 'even,odd'}>">
+ <td class="center"><{$letter.letter_id}></td>
+ <td class="center"><{$letter.letter_title}></td>
+ <td class="center"><{$letter.letter_template}></td>
+ <td class="center">
+ <{foreach item='letter_cat' from=$letter.letter_cats}>
+ <{$letter_cat.cat_name}>
+ <br />
+ <{/foreach}>
+ </td>
+ <td class="center"><{$letter.attachmentCount}></td>
+ <td class="center"><{$letter.letter_email_test}></td>
+ <td class="center">
+ <{if ($letter.userPermissions.edit)}>
+ <{foreach item='protocol' from=$letter.protocols}>
+ <a href='protocol.php?op=list_letter&letter_id=<{$protocol.protocol_letter_id}>'><{$protocol.protocol_status}></a>
+ <br />
+ <{/foreach}>
+ <{else}>
+ -
+ <{/if}>
+ </td>
+ <td class="center">
+ <{if ($letter.userPermissions.edit)}>
+ <a href="?op=edit_letter&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_edit.png"
+ alt="<{$smarty.const._EDIT}>"
+ title="<{$smarty.const._EDIT}>" />
+ </a>
+ <{/if}>
+ <{if ($letter.userPermissions.delete)}>
+ <a href="?op=delete_letter&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_delete.png"
+ alt="<{$smarty.const._DELETE}>"
+ title="<{$smarty.const._DELETE}>" />
+ </a>
+ <{/if}>
+ <{if ($letter.userPermissions.create)}>
+ <a href="?op=copy_letter&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_copy.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_COPYNEW}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_COPYNEW}>" />
+ </a>
+ <{/if}>
+ <{if ($letter.userPermissions.read)}>
+ <a href="?op=show_preview&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_preview.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW}>" />
+ </a>
+ <{/if}>
+ <{if ($letter.userPermissions.send)}>
+ <a href="sendletter.php?op=send_test&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_sendtest.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SENDTEST}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SENDTEST}>" />
+ </a>
+ <a href="sendletter.php?op=send_letter&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_send.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SEND}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_SEND}>" />
+ </a>
+ <a href="sendletter.php?op=resend_letter&letter_id=<{$letter.letter_id}>">
+ <img
+ src="<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_resend.png"
+ alt="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_RESEND}>"
+ title="<{$smarty.const._AM_XNEWSLETTER_LETTER_ACTION_RESEND}>" />
+ </a>
+ <{/if}>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <br />
+ <div class='center'><{$pagenav}></div>
+ <br />
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_subscrs.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_subscrs.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_subscrs.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,71 +0,0 @@
-<{include file="db:xnewsletter_header.html"}>
-<div class="outer">
- <{$searchSubscriberForm}>
- <br />
- <!-- cats table -->
- <table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width2'><{$smarty.const._AM_XNEWSLETTER_CAT_ID}></th>
- <th class='center'><{$smarty.const._AM_XNEWSLETTER_CAT_NAME}></th>
- <th class='center'><{$smarty.const._AM_XNEWSLETTER_CAT_INFO}></th>
- <th class='center'><{$smarty.const._AM_XNEWSLETTER_CATSUBSCR_SUBSCRID}></th>
- <th class='center width5'><{$smarty.const._AM_XNEWSLETTER_FORMACTION}></th>
- </tr>
- <{$cats_content}>
- <{foreach item='cat' from=$cats}>
- <tr class="<{cycle values = 'even,odd'}>">
- <td class='center'><{$cat.cat_id}></td>
- <td class='center'><{$cat.cat_name}></td>
- <td><{$cat.cat_info}></td>
- <td class='center'><{$cat.catsubscrCount}></td>
- <td class='center'>
- <a href='?op=list_subscrs&cat_id=<{$cat.cat_id}>'>
- <img
- src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_details.png'
- alt='<{$smarty.const._AM_XNEWSLETTER_DETAILS}>'
- title='<{$smarty.const._AM_XNEWSLETTER_DETAILS}>' />
- </a>
- </td>
- </tr>
- <{/foreach}>
- </table>
- <br />
- <br />
-<{if ($cat_id > 0)}>
- <h2><{$smarty.const._AM_XNEWSLETTER_CATSUBSCR_SUBSCRID}>: <{$cats[$cat_id].cat_name}></h2>
- <table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width5'> </th>
- <th class='center width10'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_SEX}></th>
- <th class='center width25'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_LASTNAME}></th>
- <th class='center width25'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_FIRSTNAME}></th>
- <th class='center'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_EMAIL}></th>
- <{if ($permissionChangeOthersSubscriptions)}>
- <th class='center width5'><{$smarty.const._AM_XNEWSLETTER_FORMACTION}></th>
- <{/if}>
- </tr>
- <{foreach item='subscr' from=$subscrs}>
- <tr>
- <td class='center'><{$subscr.counter}></td>
- <td class='center'><{$subscr.subscr_sex}></td>
- <td class='center'><{$subscr.subscr_lastname}></td>
- <td class='center'><{$subscr.subscr_firstname}></td>
- <td class='center'><{$subscr.subscr_email}></td>
- <{if ($permissionChangeOthersSubscriptions)}>
- <td class='center'>
- <a href='subscription.php?op=edit_subscription&subscr_id=<{$subscr.subscr_id}>'>
- <img
- src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_edit.png'
- alt='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_EDIT}>'
- title='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_EDIT}>' />
- </a>
- </td>
- <{/if}>
- </tr>
- <{/foreach}>
- </table>
- <br />
- <br />
-<{/if}>
-</div>
-<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_subscrs.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_subscrs.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_subscrs.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,71 @@
+<{include file="db:xnewsletter_header.html"}>
+<div class="outer">
+ <{$searchSubscriberForm}>
+ <br />
+ <!-- cats table -->
+ <table class='outer width100' cellspacing='1'>
+ <tr>
+ <th class='center width2'><{$smarty.const._AM_XNEWSLETTER_CAT_ID}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_CAT_NAME}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_CAT_INFO}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_CATSUBSCR_SUBSCRID}></th>
+ <th class='center width5'><{$smarty.const._AM_XNEWSLETTER_FORMACTION}></th>
+ </tr>
+ <{$cats_content}>
+ <{foreach item='cat' from=$cats}>
+ <tr class="<{cycle values = 'even,odd'}>">
+ <td class='center'><{$cat.cat_id}></td>
+ <td class='center'><{$cat.cat_name}></td>
+ <td><{$cat.cat_info}></td>
+ <td class='center'><{$cat.catsubscrCount}></td>
+ <td class='center'>
+ <a href='?op=list_subscrs&cat_id=<{$cat.cat_id}>'>
+ <img
+ src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_details.png'
+ alt='<{$smarty.const._AM_XNEWSLETTER_DETAILS}>'
+ title='<{$smarty.const._AM_XNEWSLETTER_DETAILS}>' />
+ </a>
+ </td>
+ </tr>
+ <{/foreach}>
+ </table>
+ <br />
+ <br />
+<{if ($cat_id > 0)}>
+ <h2><{$smarty.const._AM_XNEWSLETTER_CATSUBSCR_SUBSCRID}>: <{$cats[$cat_id].cat_name}></h2>
+ <table class='outer width100' cellspacing='1'>
+ <tr>
+ <th class='center width5'> </th>
+ <th class='center width10'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_SEX}></th>
+ <th class='center width25'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_LASTNAME}></th>
+ <th class='center width25'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_FIRSTNAME}></th>
+ <th class='center'><{$smarty.const._AM_XNEWSLETTER_SUBSCR_EMAIL}></th>
+ <{if ($permissionChangeOthersSubscriptions)}>
+ <th class='center width5'><{$smarty.const._AM_XNEWSLETTER_FORMACTION}></th>
+ <{/if}>
+ </tr>
+ <{foreach item='subscr' from=$subscrs}>
+ <tr>
+ <td class='center'><{$subscr.counter}></td>
+ <td class='center'><{$subscr.subscr_sex}></td>
+ <td class='center'><{$subscr.subscr_lastname}></td>
+ <td class='center'><{$subscr.subscr_firstname}></td>
+ <td class='center'><{$subscr.subscr_email}></td>
+ <{if ($permissionChangeOthersSubscriptions)}>
+ <td class='center'>
+ <a href='subscription.php?op=edit_subscription&subscr_id=<{$subscr.subscr_id}>'>
+ <img
+ src='<{$smarty.const.XNEWSLETTER_ICONS_URL}>/xn_edit.png'
+ alt='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_EDIT}>'
+ title='<{$smarty.const._MA_XNEWSLETTER_SUBSCRIPTION_EDIT}>' />
+ </a>
+ </td>
+ <{/if}>
+ </tr>
+ <{/foreach}>
+ </table>
+ <br />
+ <br />
+<{/if}>
+</div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_preview.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_preview.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_preview.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,11 +0,0 @@
-<{include file="db:xnewsletter_header.html"}>
-<div style='clear:both;'></div>
-<div class="outer">
- <h2><{$letter.letter_title}></h2>
- <div style='padding:10px;border:1px solid black;'>
- <{$letter.letter_content_templated}>
- </div>
- <input action="action" type="button" value="<{$smarty.const._BACK}>" onclick="history.go(-1);" />
-</div>
-<div style='clear:both;'></div>
-<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_preview.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_preview.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_preview.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,11 @@
+<{include file="db:xnewsletter_header.html"}>
+<div style='clear:both;'></div>
+<div class="outer">
+ <h2><{$letter.letter_title}></h2>
+ <div style='padding:10px;border:1px solid black;'>
+ <{$letter.letter_content_templated}>
+ </div>
+ <input action="action" type="button" value="<{$smarty.const._BACK}>" onclick="history.go(-1);" />
+</div>
+<div style='clear:both;'></div>
+<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
Deleted: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_print.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_print.html 2014-04-16 13:29:22 UTC (rev 12452)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_print.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -1,164 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$smarty.const._LANGCODE}>" lang="<{$smarty.const._LANGCODE}>">
-
- <head>
- <title>' . $xoopsConfig['sitename'] . '</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <meta name="AUTHOR" content="<{$xoopsConfig.sitename}>" />
- <meta name="keywords" content="<{$xoops_meta_keywords}>" />
- <meta name="COPYRIGHT" content="Copyright (c) 2012 by <{$xoopsConfig.sitename}>" />
- <meta name="DESCRIPTION" content="<{$xoops_meta_description}>" />
- <meta name="GENERATOR" content="XOOPS" />
- <!-- Sheet Css -->
- <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{$smarty.const.XOOPS_URL}>/xoops.css" />
- <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{$smarty.const.XOOPS_URL}>/themes/default/style.css" />
- <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{$smarty.const.XOOPS_URL}>/modules/xnewsletter/css/module.css" />
-
-
- <script type="text/javascript">
- // <![CDATA[
- /*------------------------------------------------------------------------------
- Function: footnoteLinks()
- Author: Aaron Gustafson (aaron at easy-designs dot net)
- Creation Date: 8 May 2005
- Version: 1.3
- Homepage: http://www.easy-designs.net/code/footnoteLinks/
- License: Creative Commons Attribution-ShareAlike 2.0 License
- http://creativecommons.org/licenses/by-sa/2.0/
- Note: This version has reduced functionality as it is a demo of
- the script's development
- ------------------------------------------------------------------------------*/
- function footnoteLinks(containerID,targetID) {
- if (!document.getElementById ||
- !document.getElementsByTagName ||
- !document.createElement) return false;
- if (!document.getElementById(containerID) ||
- !document.getElementById(targetID)) return false;
- var container = document.getElementById(containerID);
- var target = document.getElementById(targetID);
- var h2 = document.createElement('h2');
- addClass.apply(h2,['printOnly']);
- var h2_txt = document.createTextNode('<?php echo "_MA_NW_LINKS"; ?>');
- h2.appendChild(h2_txt);
- var coll = container.getElementsByTagName('*');
- var ol = document.createElement('ol');
- addClass.apply(ol,['printOnly']);
- var myArr = [];
- var thisLink;
- var num = 1;
- for (var i=0; i<coll.length; i++) {
- if ( coll[i].getAttribute('href') ||
- coll[i].getAttribute('cite') ) {
- thisLink = coll[i].getAttribute('href') ? coll[i].href : coll[i].cite;
- var note = document.createElement('sup');
- addClass.apply(note,['printOnly']);
- var note_txt;
- var j = inArray.apply(myArr,[thisLink]);
- if ( j || j===0 ) { // if a duplirolee
- // get the corresponding number from
- // the array of used links
- note_txt = document.createTextNode(j+1);
- } else {
- // if not a duplirolee
- var li = document.createElement('li');
- var li_txt = document.createTextNode(thisLink);
- li.appendChild(li_txt);
- ol.appendChild(li);
- myArr.push(thisLink);
- note_txt = document.createTextNode(num);
- num++;
- }
- note.appendChild(note_txt);
- if (coll[i].tagName.toLowerCase() == 'blockquote') {
- var lastChild = lastChildContainingText.apply(coll[i]);
- lastChild.appendChild(note);
- } else {
- coll[i].parentNode.insertBefore(note, coll[i].nextSibling);
- }
- }
- }
- target.appendChild(h2);
- target.appendChild(ol);
- return true;
- }
- // ]]>
- </script>
- <script type="text/javascript">
- // <![CDATA[
- /*------------------------------------------------------------------------------
- Excerpts from the jsUtilities Library
- Version: 2.1
- Homepage: http://www.easy-designs.net/code/jsUtilities/
- License: Creative Commons Attribution-ShareAlike 2.0 License
- http://creativecommons.org/licenses/by-sa/2.0/
- Note: If you change or improve on this script, please let us know.
- ------------------------------------------------------------------------------*/
- if(Array.prototype.push == null) {
- Array.prototype.push = function(item) {
- this[this.length] = item;
- return this.length;
- };
- };
- // ---------------------------------------------------------------------
- // function.apply (if unsupported)
- // Courtesy of Aaron Boodman - http://youngpup.net
- // ---------------------------------------------------------------------
- if (!Function.prototype.apply) {
- Function.prototype.apply = function(oScope, args) {
- var sarg = [];
- var rtrn, call;
- if (!oScope) oScope = window;
- if (!args) args = [];
- for (var i = 0; i < args.length; i++) {
- sarg[i] = "args["+i+"]";
- };
- call = "oScope.__applyTemp__(" + sarg.join(",") + ");";
- oScope.__applyTemp__ = this;
- rtrn = eval(call);
- oScope.__applyTemp__ = null;
- return rtrn;
- };
- };
- function inArray(needle) {
- for (var i=0; i < this.length; i++) {
- if (this[i] === needle) {
- return i;
- }
- }
- return false;
- }
- function addClass(theClass) {
- if (this.className != '') {
- this.className += ' ' + theClass;
- } else {
- this.className = theClass;
- }
- }
- function lastChildContainingText() {
- var testChild = this.lastChild;
- var contentCntnr = ['p','li','dd'];
- while (testChild.nodeType != 1) {
- testChild = testChild.previousSibling;
- }
- var tag = testChild.tagName.toLowerCase();
- var tagInArr = inArray.apply(contentCntnr, [tag]);
- if (!tagInArr && tagInArr!==0) {
- testChild = lastChildContainingText.apply(testChild);
- }
- return testChild;
- }
- // ]]>
- </script>
- <style type="text/css" media="screen">
- .printOnly {
- display: none;
- }
- </style>
- </head>
- <body bgcolor="#ffffff" text="#000000" onload="window.print()">
- <h2><{$letter.letter_title}></h2>
- <div style='padding:10px;border:1px solid black;'>
- <{$letter.letter_content_templated}>
- </div>
- </body>
-</html>
\ No newline at end of file
Added: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_print.html
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_print.html (rev 0)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_print.html 2014-04-16 16:22:45 UTC (rev 12453)
@@ -0,0 +1,164 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$smarty.const._LANGCODE}>" lang="<{$smarty.const._LANGCODE}>">
+
+ <head>
+ <title>' . $xoopsConfig['sitename'] . '</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta name="AUTHOR" content="<{$xoopsConfig.sitename}>" />
+ <meta name="keywords" content="<{$xoops_meta_keywords}>" />
+ <meta name="COPYRIGHT" content="Copyright (c) 2012 by <{$xoopsConfig.sitename}>" />
+ <meta name="DESCRIPTION" content="<{$xoops_meta_description}>" />
+ <meta name="GENERATOR" content="XOOPS" />
+ <!-- Sheet Css -->
+ <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{$smarty.const.XOOPS_URL}>/xoops.css" />
+ <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{$smarty.const.XOOPS_URL}>/themes/default/style.css" />
+ <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{$smarty.const.XOOPS_URL}>/modules/xnewsletter/css/module.css" />
+
+
+ <script type="text/javascript">
+ // <![CDATA[
+ /*------------------------------------------------------------------------------
+ Function: footnoteLinks()
+ Author: Aaron Gustafson (aaron at easy-designs dot net)
+ Creation Date: 8 May 2005
+ Version: 1.3
+ Homepage: http://www.easy-designs.net/code/footnoteLinks/
+ License: Creative Commons Attribution-ShareAlike 2.0 License
+ http://creativecommons.org/licenses/by-sa/2.0/
+ Note: This version has reduced functionality as it is a demo of
+ the script's development
+ ------------------------------------------------------------------------------*/
+ function footnoteLinks(containerID,targetID) {
+ if (!document.getElementById ||
+ !document.getElementsByTagName ||
+ !document.createElement) return false;
+ if (!document.getElementById(containerID) ||
+ !document.getElementById(targetID)) return false;
+ var container = document.getElementById(containerID);
+ var target = document.getElementById(targetID);
+ var h2 = document.createElement('h2');
+ addClass.apply(h2,['printOnly']);
+ var h2_txt = document.createTextNode('<?php echo "_MA_NW_LINKS"; ?>');
+ h2.appendChild(h2_txt);
+ var coll = container.getElementsByTagName('*');
+ var ol = document.createElement('ol');
+ addClass.apply(ol,['printOnly']);
+ var myArr = [];...
[truncated message content] |
|
From: <be...@us...> - 2014-04-16 13:29:32
|
Revision: 12452
http://sourceforge.net/p/xoops/svn/12452
Author: beckmi
Date: 2014-04-16 13:29:22 +0000 (Wed, 16 Apr 2014)
Log Message:
-----------
small updates (work in progress)
Modified Paths:
--------------
XoopsModules/mediawiki/trunk/mediawiki/LocalSettings.php
XoopsModules/mediawiki/trunk/mediawiki/admin/admin_header.php
XoopsModules/mediawiki/trunk/mediawiki/admin/index.php
XoopsModules/mediawiki/trunk/mediawiki/admin/install.mediawiki.php
XoopsModules/mediawiki/trunk/mediawiki/admin/update.mediawiki.php
XoopsModules/mediawiki/trunk/mediawiki/bin/ulimit.sh
XoopsModules/mediawiki/trunk/mediawiki/blocks/block.php
XoopsModules/mediawiki/trunk/mediawiki/blocks/mediawiki_recentchanges.php
XoopsModules/mediawiki/trunk/mediawiki/config/LocalSettings.php
XoopsModules/mediawiki/trunk/mediawiki/config/index.php
XoopsModules/mediawiki/trunk/mediawiki/docs/database.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/deferred.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/design.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/export-demo.xml
XoopsModules/mediawiki/trunk/mediawiki/docs/globals.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/hooks.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/language.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/linkcache.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/magicword.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/memcached.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/schema.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/skin.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/title.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/user.txt
XoopsModules/mediawiki/trunk/mediawiki/extensions/FCKeditor.php
XoopsModules/mediawiki/trunk/mediawiki/fckeditor.connector.php
XoopsModules/mediawiki/trunk/mediawiki/fckeditor.upload.php
XoopsModules/mediawiki/trunk/mediawiki/images/mediawiki.png
XoopsModules/mediawiki/trunk/mediawiki/img_auth.php
XoopsModules/mediawiki/trunk/mediawiki/include/XoopsOutputPage.php
XoopsModules/mediawiki/trunk/mediawiki/include/action.module.php
XoopsModules/mediawiki/trunk/mediawiki/include/functions.php
XoopsModules/mediawiki/trunk/mediawiki/include/search.php
XoopsModules/mediawiki/trunk/mediawiki/includes/.htaccess
XoopsModules/mediawiki/trunk/mediawiki/includes/AjaxDispatcher.php
XoopsModules/mediawiki/trunk/mediawiki/includes/AjaxFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Article.php
XoopsModules/mediawiki/trunk/mediawiki/includes/AuthPlugin.php
XoopsModules/mediawiki/trunk/mediawiki/includes/AutoLoader.php
XoopsModules/mediawiki/trunk/mediawiki/includes/BagOStuff.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Block.php
XoopsModules/mediawiki/trunk/mediawiki/includes/CacheManager.php
XoopsModules/mediawiki/trunk/mediawiki/includes/CategoryPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Categoryfinder.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ChangesList.php
XoopsModules/mediawiki/trunk/mediawiki/includes/CoreParserFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Credits.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Database.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DatabaseFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DatabaseMysql.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DatabaseOracle.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DatabasePostgreSQL.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DatabasePostgres.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Databaseb1.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Databasec.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DateFormatter.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DefaultSettings.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Defines.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DifferenceEngine.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DjVuImage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/EditPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Exception.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Exif.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Export.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ExternalEdit.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ExternalStore.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ExternalStoreDB.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ExternalStoreHttp.php
XoopsModules/mediawiki/trunk/mediawiki/includes/FakeTitle.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Feed.php
XoopsModules/mediawiki/trunk/mediawiki/includes/FileStore.php
XoopsModules/mediawiki/trunk/mediawiki/includes/GlobalFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Group.php
XoopsModules/mediawiki/trunk/mediawiki/includes/HTMLCacheUpdate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/HTMLForm.php
XoopsModules/mediawiki/trunk/mediawiki/includes/HistoryBlob.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Hooks.php
XoopsModules/mediawiki/trunk/mediawiki/includes/HttpFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Image.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ImageFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ImageGallery.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ImagePage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/JobQueue.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Licenses.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LinkBatch.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LinkCache.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LinkFilter.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Linker.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LinksUpdate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LoadBalancer.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LogPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/MacBinary.php
XoopsModules/mediawiki/trunk/mediawiki/includes/MagicWord.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Math.php
XoopsModules/mediawiki/trunk/mediawiki/includes/MemcachedSessions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/MessageCache.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Metadata.php
XoopsModules/mediawiki/trunk/mediawiki/includes/MimeMagic.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Namespace.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ObjectCache.php
XoopsModules/mediawiki/trunk/mediawiki/includes/OutputPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/PageHistory.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Parser.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ParserCache.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ParserXML.php
XoopsModules/mediawiki/trunk/mediawiki/includes/PersistentObject.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ProfilerSimple.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ProfilerSimpleUDP.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ProfilerStub.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Profiling.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ProtectionForm.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ProxyTools.php
XoopsModules/mediawiki/trunk/mediawiki/includes/QueryPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/RawPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/RecentChange.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Revision.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Sanitizer.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchEngine.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchMySQL.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchMySQL4.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchPostgres.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchTsearch2.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchUpdate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Setup.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SiteConfiguration.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SiteStatsUpdate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Skin.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SkinTemplate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialAllmessages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialAllpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialAncientpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialBlockip.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialBlockme.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialBooksources.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialBrokenRedirects.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialCategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialConfirmemail.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialContributions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialDeadendpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialDisambiguations.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialDoubleRedirects.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialEmailuser.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialExport.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialGroups.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialImagelist.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialImport.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialIpblocklist.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialListredirects.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialListusers.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialLockdb.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialLog.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialLonelypages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialLongpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMIMEsearch.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMostcategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMostimages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMostlinked.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMostlinkedcategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMostrevisions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMovepage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialNewimages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialNewpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialPopularpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialPreferences.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialPrefixindex.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialRandompage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialRandomredirect.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialRecentchanges.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialRecentchangeslinked.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialRevisiondelete.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialSearch.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialShortpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialSpecialpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialStatistics.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUncategorizedcategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUncategorizedimages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUncategorizedpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUndelete.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUnlockdb.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUnusedcategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUnusedimages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUnusedtemplates.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUnwatchedpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUpload.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUploadMogile.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUserlogin.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUserlogout.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUserrights.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialVersion.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialWantedcategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialWantedpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialWatchlist.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialWhatlinkshere.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SquidUpdate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/StreamFile.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Title.php
XoopsModules/mediawiki/trunk/mediawiki/includes/UpdateClasses.php
XoopsModules/mediawiki/trunk/mediawiki/includes/User.php
XoopsModules/mediawiki/trunk/mediawiki/includes/UserMailer.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Utf8Case.php
XoopsModules/mediawiki/trunk/mediawiki/includes/WatchedItem.php
XoopsModules/mediawiki/trunk/mediawiki/includes/WebRequest.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Wiki.php
XoopsModules/mediawiki/trunk/mediawiki/includes/WikiError.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Xml.php
XoopsModules/mediawiki/trunk/mediawiki/includes/XmlFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ZhClient.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ZhConversion.php
XoopsModules/mediawiki/trunk/mediawiki/includes/cbt/CBTCompiler.php
XoopsModules/mediawiki/trunk/mediawiki/includes/cbt/CBTProcessor.php
XoopsModules/mediawiki/trunk/mediawiki/includes/memcached-client.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/CleanUpTest.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/RandomTest.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/Utf8Test.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormal.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormalBench.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormalGenerate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormalTest.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormalUtil.php
XoopsModules/mediawiki/trunk/mediawiki/includes/proxy_check.php
XoopsModules/mediawiki/trunk/mediawiki/includes/templates/Confirmemail.php
XoopsModules/mediawiki/trunk/mediawiki/includes/templates/Userlogin.php
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/printutf8.c
XoopsModules/mediawiki/trunk/mediawiki/index.php
XoopsModules/mediawiki/trunk/mediawiki/install-utils.inc
XoopsModules/mediawiki/trunk/mediawiki/language/english/admin.php
XoopsModules/mediawiki/trunk/mediawiki/language/english/blocks.php
XoopsModules/mediawiki/trunk/mediawiki/language/english/main.php
XoopsModules/mediawiki/trunk/mediawiki/language/english/modinfo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/.htaccess
XoopsModules/mediawiki/trunk/mediawiki/languages/Language.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAb.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAb.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAf.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageArc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAst.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAv.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAy.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAz.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBa.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBat_smg.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBat_smg.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBg.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBm.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBm.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCe.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageConverter.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCsb.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCv.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageDa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageDe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageDv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageDz.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFur.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGn.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGsw.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGsw.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageHe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageHi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageHr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageHu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageIa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageId.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageIi.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageIi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageIs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageIt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageJa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageJv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKm.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKv.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageLa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageLi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageLo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageLt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageLv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageMk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageMl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageMs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNah.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNah.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNap.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNap.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNds.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNds_nl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNon.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNon.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageOc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageOr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageOs.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageOs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePms.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePms.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePt_br.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePt_br.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageQu.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageQu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageRmy.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageRmy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageRo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageRu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSd.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSq.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_ec.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_el.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_el.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_jc.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_jc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_jl.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_jl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTh.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTlh.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTy.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTyv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUdm.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUdm.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUg.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUtf8.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageVec.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageVec.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageVi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageWa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageXal.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageYi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZa.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_cn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_hk.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_hk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_sg.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_sg.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_tw.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_tw.php
XoopsModules/mediawiki/trunk/mediawiki/languages/Messages.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesAf.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesAr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesAz.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesBe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesBg.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesBn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesBr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesBs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesCa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesCs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesCsb.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesCv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesCy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesDa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesDe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesEl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesEo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesEs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesEt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesEu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFur.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesGa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesGsw.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesHe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesHi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesHr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesHu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesIa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesId.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesIs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesIt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesJa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesJv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesKn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesKo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesKu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesLa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesLi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesLt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesLv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesMk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesMs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesNah.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesNds.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesNl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesNn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesNo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesOc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesOs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesPa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesPl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesPms.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesPt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesPt_br.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesRmy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesRo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesRu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSq.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSr_ec.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSr_el.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTh.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTyv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesUdm.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesUk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesVec.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesVi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesWa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesXal.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesYi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesZh_cn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesZh_tw.php
XoopsModules/mediawiki/trunk/mediawiki/languages/Names.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/.htaccess
XoopsModules/mediawiki/trunk/mediawiki/maintenance/FiveUpgrade.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/addwiki.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/alltrans.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/.htaccess
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-list.txt
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-searchindex.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-usernewtalk.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-watchlist.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/rebuildRecentchanges.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/upgradeWatchlist.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/attachLatest.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/attribute.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/backup.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/benchmarkPurge.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/build-intl-wiki.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/changePassword.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/checkUsernames.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/checktrans.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/cleanupCaps.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/cleanupDupes.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/cleanupSpam.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/cleanupTitles.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/cleanupWatchlist.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/clear_interwiki_cache.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/clear_stats.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/convertLinks.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/counter.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/createAndPromote.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/delete-idle-wiki-users.pl
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteBatch.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteImageMemcached.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteOldRevisions.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteOrphanedRevisions.inc.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteOrphanedRevisions.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteRevision.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/diffLanguage.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpBackup.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpHTML.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpHTML.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpInterwiki.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpLinks.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpMessages.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpReplayLog.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpTextPass.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/duplicatetrans.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/entities2literals.pl
XoopsModules/mediawiki/trunk/mediawiki/maintenance/eval.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/fetchInterwiki.pl
XoopsModules/mediawiki/trunk/mediawiki/maintenance/findhooks.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/fixSlaveDesync.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/fixTimestamps.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/fixUserRegistration.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/generateSitemap.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importDump.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importImages.inc.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importImages.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importLogs.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importPhase2.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importTextFile.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importUseModWiki.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/initStats.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/lang2po.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/langmemusage.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/mcc.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/mctest.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/moveBatch.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/mwdocgen.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/mwdoxygen.cfg
XoopsModules/mediawiki/trunk/mediawiki/maintenance/mysql5/tables.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/namespace2sql.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/namespaceDupes.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/nukePage.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/orphans.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/ourusers.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTests.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTests.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTests.txt
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTestsParserHook.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTestsParserTime.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTestsStaticParserHook.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/portal.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/purgeOldText.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/reassignEdits.inc.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/reassignEdits.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildImages.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildInterwiki.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildMessages.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildall.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildrecentchanges.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildtextindex.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/redundanttrans.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/refreshImageCount.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/refreshLinks.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/removeUnusedAccounts.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/renderDump.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/runJobs.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/showJobs.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/splitLanguageFiles.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/stats.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/checkStorage.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/compressOld.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/dumpRev.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/moveToExternal.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/resolveStubs.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/tables.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/transstat.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/trivialCmdLine.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/update.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/updateArticleCount.inc.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/updateArticleCount.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/updateSearchIndex.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/updateSpecialPages.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/updaters.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/upgrade1_5.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/userDupes.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/wiki-mangleme.php
XoopsModules/mediawiki/trunk/mediawiki/math/.htaccess
XoopsModules/mediawiki/trunk/mediawiki/profileinfo.php
XoopsModules/mediawiki/trunk/mediawiki/redirect.php
XoopsModules/mediawiki/trunk/mediawiki/redirect.phtml
XoopsModules/mediawiki/trunk/mediawiki/setup_message.html
XoopsModules/mediawiki/trunk/mediawiki/skins/Chick.deps.php
XoopsModules/mediawiki/trunk/mediawiki/skins/Chick.php
XoopsModules/mediawiki/trunk/mediawiki/skins/CologneBlue.php
XoopsModules/mediawiki/trunk/mediawiki/skins/MonoBook.deps.php
XoopsModules/mediawiki/trunk/mediawiki/skins/MonoBook.php
XoopsModules/mediawiki/trunk/mediawiki/skins/MySkin.deps.php
XoopsModules/mediawiki/trunk/mediawiki/skins/MySkin.php
XoopsModules/mediawiki/trunk/mediawiki/skins/Nostalgia.php
XoopsModules/mediawiki/trunk/mediawiki/skins/Simple.deps.php
XoopsModules/mediawiki/trunk/mediawiki/skins/Simple.php
XoopsModules/mediawiki/trunk/mediawiki/skins/Standard.php
XoopsModules/mediawiki/trunk/mediawiki/skins/chick/IE50Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/chick/IE55Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/chick/IE60Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/chick/main.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/cologneblue.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/common.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/commonPrint.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/common_rtl.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/feed.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/nostalgia.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/quickbar-right.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/quickbar.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/wikiprintable.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/wikistandard.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/xoops.css
XoopsModules/mediawiki/trunk/mediawiki/skins/disabled/HTMLDump.php
XoopsModules/mediawiki/trunk/mediawiki/skins/disabled/MonoBookCBT.php
XoopsModules/mediawiki/trunk/mediawiki/skins/htmldump/main.css
XoopsModules/mediawiki/trunk/mediawiki/skins/monobook/IE50Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/monobook/IE55Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/monobook/IE60Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/monobook/IE70Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/monobook/IEMacFixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/monobook/KHTMLFixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/monobook/Opera6Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/monobook/Opera7Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/monobook/main.css
XoopsModules/mediawiki/trunk/mediawiki/skins/monobook/rtl.css
XoopsModules/mediawiki/trunk/mediawiki/skins/myskin/main.css
XoopsModules/mediawiki/trunk/mediawiki/skins/simple/main.css
XoopsModules/mediawiki/trunk/mediawiki/templates/Xoops.php
XoopsModules/mediawiki/trunk/mediawiki/tests/.htaccess
XoopsModules/mediawiki/trunk/mediawiki/tests/ArticleTest.php
XoopsModules/mediawiki/trunk/mediawiki/tests/DatabaseTest.php
XoopsModules/mediawiki/trunk/mediawiki/tests/GlobalTest.php
XoopsModules/mediawiki/trunk/mediawiki/tests/ImageTest.php
XoopsModules/mediawiki/trunk/mediawiki/tests/RunTests.php
XoopsModules/mediawiki/trunk/mediawiki/tests/SanitizerTest.php
XoopsModules/mediawiki/trunk/mediawiki/tests/SearchEngineTest.php
XoopsModules/mediawiki/trunk/mediawiki/tests/SearchMySQL4Test.php
XoopsModules/mediawiki/trunk/mediawiki/thumb.php
XoopsModules/mediawiki/trunk/mediawiki/trackback.php
XoopsModules/mediawiki/trunk/mediawiki/wiki.phtml
XoopsModules/mediawiki/trunk/mediawiki/xoops_version.php
Added Paths:
-----------
XoopsModules/mediawiki/trunk/mediawiki/.htaccess
Added: XoopsModules/mediawiki/trunk/mediawiki/.htaccess
===================================================================
--- XoopsModules/mediawiki/trunk/mediawiki/.htaccess (rev 0)
+++ XoopsModules/mediawiki/trunk/mediawiki/.htaccess 2014-04-16 13:29:22 UTC (rev 12452)
@@ -0,0 +1,2 @@
+# The application environment
+php_value memory_limit 512108864
\ No newline at end of file
Modified: XoopsModules/mediawiki/trunk/mediawiki/LocalSettings.php
===================================================================
--- XoopsModules/mediawiki/trunk/mediawiki/LocalSettings.php 2014-04-16 13:09:40 UTC (rev 12451)
+++ XoopsModules/mediawiki/trunk/mediawiki/LocalSettings.php 2014-04-16 13:29:22 UTC (rev 12452)
@@ -12,20 +12,20 @@
* @version $Id$
* @package module::mediawiki
*/
-
+
global $xoopsUser, $xoopsModule, $xoopsConfig, $xoopsOption, $xoopsLogger, $xoopsTpl;
global $wgUsePathInfo;
# If PHP's memory limit is very low, some operations may fail.
-@ini_set( 'memory_limit', '20M' );
+@ini_set( 'memory_limit', '32M' );
$mainfile = dirname(dirname(dirname(__FILE__)))."/mainfile.php";
include_once $mainfile;
define("MEDIAWIKI_DIRNAME", basename(dirname(__FILE__)));
-require_once(XOOPS_ROOT_PATH."/modules/".MEDIAWIKI_DIRNAME."/include/functions.php");
+require_once XOOPS_ROOT_PATH."/modules/".MEDIAWIKI_DIRNAME."/include/functions.php";
-if(!defined("NS_MAIN")) {
- require_once(XOOPS_ROOT_PATH."/modules/".MEDIAWIKI_DIRNAME."/includes/Defines.php");
+if (!defined("NS_MAIN")) {
+ require_once XOOPS_ROOT_PATH."/modules/".MEDIAWIKI_DIRNAME."/includes/Defines.php";
}
// define user name prefix for the module, must be capitalized!
@@ -37,29 +37,29 @@
# If you customize your file layout, set $IP to the directory that contains
# the other MediaWiki files. It will be used as a base to locate files.
-if( defined( 'MW_INSTALL_PATH' ) ) {
- $IP = MW_INSTALL_PATH;
+if ( defined( 'MW_INSTALL_PATH' ) ) {
+ $IP = MW_INSTALL_PATH;
} else {
- $IP = dirname( __FILE__ );
+ $IP = dirname( __FILE__ );
}
$path = array( $IP, "$IP/includes", "$IP/languages" );
set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() );
-require_once( "includes/DefaultSettings.php" );
+require_once 'includes/DefaultSettings.php';
/** We speak UTF-8 all the time now, unless some oddities happen */
//$wgInputEncoding = 'UTF-8';
-$wgOutputEncoding = empty($GLOBALS["xlanguage"]['charset_base'])?_CHARSET:$GLOBALS["xlanguage"]['charset_base'];
+$wgOutputEncoding = empty($GLOBALS["xlanguage"]['charset_base']) ? _CHARSET : $GLOBALS["xlanguage"]['charset_base'];
//$wgEditEncoding = '';
-if ( $wgCommandLineMode ) {
- if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
- //die( "This script must be run from the command line\n" );
- }
+if ($wgCommandLineMode) {
+ if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
+ //die( "This script must be run from the command line\n" );
+ }
} elseif ( empty( $wgNoOutputBuffer ) ) {
- ## Compress output if the browser supports it
- //if( !ini_get( 'zlib.output_compression' ) ) @ob_start( 'ob_gzhandler' );
+ ## Compress output if the browser supports it
+ //if( !ini_get( 'zlib.output_compression' ) ) @ob_start( 'ob_gzhandler' );
}
$wgSitename = mediawiki_encoding_xoops2mediawiki($xoopsConfig["sitename"]);
@@ -75,17 +75,17 @@
## For more information on customizing the URLs please see:
## http://meta.wikimedia.org/wiki/Eliminating_index.php_from_the_url
## If using PHP as a CGI module, the ?title= style usually must be used.
-if($wgUsePathInfo){
- $wgArticlePath = "$wgScript/$1";
-
- // $_SERVER['PATH_INFO'] used in WebRequest::WebRequest() would escape trailing "delimitors"
- if(!empty($_SERVER['PATH_INFO'])){
- if(preg_match("/([\.\?]+)$/", $_SERVER['REQUEST_URI'], $matches)){
- $_SERVER['PATH_INFO'] .= $matches[1];
- }
- }
-}else{
- $wgArticlePath = "$wgScript?title=$1";
+if ($wgUsePathInfo) {
+ $wgArticlePath = "$wgScript/$1";
+
+ // $_SERVER['PATH_INFO'] used in WebRequest::WebRequest() would escape trailing "delimitors"
+ if (!empty($_SERVER['PATH_INFO'])) {
+ if (preg_match("/([\.\?]+)$/", $_SERVER['REQUEST_URI'], $matches)) {
+ $_SERVER['PATH_INFO'] .= $matches[1];
+ }
+ }
+} else {
+ $wgArticlePath = "$wgScript?title=$1";
}
$wgStylePath = "$wgScriptPath/skins";
$wgStyleDirectory = "$IP/skins";
@@ -99,10 +99,10 @@
* database traffic on public sites.
* Must set $wgShowIPinHeader = false
*/
-$wgUseFileCache = @(mediawiki_getStyle())?false: ( is_object($xoopsModule) && $xoopsModule->getVar('dirname') == MEDIAWIKI_DIRNAME && @$xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] > 0 );
+$wgUseFileCache = @(mediawiki_getStyle()) ? false : ( is_object($xoopsModule) && $xoopsModule->getVar('dirname') == MEDIAWIKI_DIRNAME && @$xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] > 0 );
/** Directory where the cached page will be saved */
$wgFileCacheDirectory = XOOPS_CACHE_PATH."/".MEDIAWIKI_DIRNAME;
-if($wgUseFileCache && !$xoopsUser && !file_exists($wgFileCacheDirectory)) { mkdir($wgFileCacheDirectory,0775); } # create if necessary
+if ($wgUseFileCache && !$xoopsUser && !file_exists($wgFileCacheDirectory)) { mkdir($wgFileCacheDirectory,0775); } # create if necessary
$wgShowIPinHeader = false; # For non-logged in users
@@ -130,6 +130,10 @@
$wgDBport = "5432";
# Experimental charset support for MySQL 4.1/5.0.
+/**
+ * Enabling the parameter will call "SET NAMES 'utf8'" in database connection, which could cause conflicts with xoopsDB->conn,
+ * so just disable it and leave MySQL 4.1/5.0 handling to XOOPS
+ */
$wgDBmysql5 = false;
## Shared memory settings
@@ -138,7 +142,7 @@
## To enable image uploads, make sure the 'images' directory
## is writable, then set this to true:
-$wgEnableUploads = true;
+$wgEnableUploads = FALSE;
$wgUseImageResize = true;
# $wgUseImageMagick = true;
# $wgImageMagickConvertCommand = "/usr/bin/convert";
@@ -240,22 +244,24 @@
* for anonymous users and new user accounts.
*
*/
-$timeoffset_xoops = empty($xoopsUser)?$xoopsConfig['default_TZ']:$xoopsUser->getVar("timezone_offset");
+$timeoffset_xoops = empty($xoopsUser) ? $xoopsConfig['default_TZ'] : $xoopsUser->getVar("timezone_offset");
$wgLocalTZoffset = @(floatval($timeoffset_xoops) + floatval($xoopsConfig['server_TZ']));
-/* Installing this extension may lead to security and technical problems
+/* Installing this extension may lead to security and technical problems
* as well as data corruption.
*/
-require_once("extensions/FCKeditor.php");
-
-$wgFCKUseEditor = true; // When set to 'true' the FCKeditor is the default editor.
+if (! @include_once "extensions/FCKeditor.php") {
+ $wgFCKUseEditor = false; // DO NOT CHANGE IT !!!
+} else {
+ $wgFCKUseEditor = false; // When set to 'true' the FCKeditor is the default editor.
+}
$wgFCKEditorDir = XOOPS_URL."/class/xoopseditor/FCKeditor";
-$wgFCKEditorToken = "__USE_EDITOR__";
+$wgFCKEditorToken = "__USE_EDITOR__";
$wgFCKEditorToolbarSet = "Wiki";
$wgFCKEditorHeight = "600";
-$wgFCKEditorAllow_a_tags = true; // <a> </a> : Set this to true if you want to use the **external** link
+$wgFCKEditorAllow_a_tags = true; // <a> </a> : Set this to true if you want to use the **external** link
// generator of the FCKeditor.
-$wgFCKEditorAllow_img_tags = true; // <img /> : Set this to true if you want to use the
+$wgFCKEditorAllow_img_tags = true; // <img /> : Set this to true if you want to use the
// file browser and/or the smilies of the FCKeditor.
$wgFCKexcludedNamespaces = array(8,1,-1); // eg. "8" for disabling the editor within the MediaWiki namespace.
@@ -264,4 +270,5 @@
*/
$wgUseAjax = true;
$wgAjaxExportList[] = 'wfSajaxSearchImageFCKeditor';
-?>
\ No newline at end of file
+
+$wgAllowExternalImages = true;
Modified: XoopsModules/mediawiki/trunk/mediawiki/admin/admin_header.php
===================================================================
--- XoopsModules/mediawiki/trunk/mediawiki/admin/admin_header.php 2014-04-16 13:09:40 UTC (rev 12451)
+++ XoopsModules/mediawiki/trunk/mediawiki/admin/admin_header.php 2014-04-16 13:29:22 UTC (rev 12452)
@@ -27,7 +27,6 @@
// Author: phppp (D.J.) //
// URL: http://xoopsforge.com, http://xoops.org.cn //
// ------------------------------------------------------------------------- //
-include "../../../include/cp_header.php";
+include '../../../include/cp_header.php';
include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
$myts =& MyTextSanitizer::getInstance();
-?>
\ No newline at end of file
Modified: XoopsModules/mediawiki/trunk/mediawiki/admin/index.php
===================================================================
--- XoopsModules/mediawiki/trunk/mediawiki/admin/index.php 2014-04-16 13:09:40 UTC (rev 12451)
+++ XoopsModules/mediawiki/trunk/mediawiki/admin/index.php 2014-04-16 13:29:22 UTC (rev 12452)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
@@ -29,4 +29,3 @@
// ------------------------------------------------------------------------- //
include 'admin_header.php';
header("location: ".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php");
-?>
Modified: XoopsModules/mediawiki/trunk/mediawiki/admin/install.mediawiki.php
===================================================================
--- XoopsModules/mediawiki/trunk/mediawiki/admin/install.mediawiki.php 2014-04-16 13:09:40 UTC (rev 12451)
+++ XoopsModules/mediawiki/trunk/mediawiki/admin/install.mediawiki.php 2014-04-16 13:29:22 UTC (rev 12452)
@@ -5,7 +5,7 @@
// ------------------------------------------------------------------------- //
define( "MEDIAWIKI", true );
define( "MEDIAWIKI_INSTALL", true );
-include "admin_header.php";
+include 'admin_header.php';
xoops_cp_header();
@@ -32,69 +32,68 @@
define( 'MW_INSTALL_PATH', $IP );
//$sep = PATH_SEPARATOR;
$sep = strtoupper(substr(PHP_OS,0,3)=='WIN')?';':':';
-if( !@ini_set( "include_path", ".$sep$IP$sep$IP/includes$sep$IP/languages" ) ) {
- set_include_path( ".$sep$IP$sep$IP/includes$sep$IP/languages" );
+if ( !@ini_set( "include_path", ".$sep$IP$sep$IP/includes$sep$IP/languages" ) ) {
+ set_include_path( ".$sep$IP$sep$IP/includes$sep$IP/languages" );
}
# Define an entry point and include some files
// Run version checks before including other files
// so people don't see a scary parse error.
-require_once( "install-utils.inc" );
+require_once 'install-utils.inc';
install_version_checks();
-require_once( "includes/Defines.php" );
-require_once( "LocalSettings.php" );
+require_once 'includes/Defines.php';
+require_once 'LocalSettings.php';
//require_once( "includes/DefaultSettings.php" );
-require_once( "includes/MagicWord.php" );
-require_once( "includes/Namespace.php" );
+require_once 'includes/MagicWord.php';
+require_once 'includes/Namespace.php';
-require_once( "maintenance/updaters.inc" );
+require_once 'maintenance/updaters.inc';
- chdir( ".." );
- $wgCommandLineMode = true;
- $wgUseDatabaseMessages = false; /* FIXME: For database failure */
- require_once( "includes/Setup.php" );
- chdir( "admin" );
+ chdir( ".." );
+ $wgCommandLineMode = true;
+ $wgUseDatabaseMessages = false; /* FIXME: For database failure */
+ require_once 'includes/Setup.php';
+ chdir( "admin" );
- $wgDatabase = mwDatabase::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, "", 1 );
+ $wgDatabase = mwDatabase::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, "", 1 );
- if( $wgDBmysql5 ) {
- dbsource( XOOPS_ROOT_PATH."/modules/".MEDIAWIKI_DIRNAME."/maintenance/mysql5/tables.sql", $wgDatabase );
- } else {
- dbsource( XOOPS_ROOT_PATH."/modules/".MEDIAWIKI_DIRNAME."/maintenance/tables.sql", $wgDatabase );
- }
- dbsource( XOOPS_ROOT_PATH."/modules/".MEDIAWIKI_DIRNAME."/maintenance/interwiki.sql", $wgDatabase );
+ if ($wgDBmysql5) {
+ dbsource( XOOPS_ROOT_PATH."/modules/".MEDIAWIKI_DIRNAME."/maintenance/mysql5/tables.sql", $wgDatabase );
+ } else {
+ dbsource( XOOPS_ROOT_PATH."/modules/".MEDIAWIKI_DIRNAME."/maintenance/tables.sql", $wgDatabase );
+ }
+ dbsource( XOOPS_ROOT_PATH."/modules/".MEDIAWIKI_DIRNAME."/maintenance/interwiki.sql", $wgDatabase );
- $wgDatabase->insert( 'site_stats',
- array( 'ss_row_id' => 1,
- 'ss_total_views' => 0,
- 'ss_total_edits' => 0,
- 'ss_good_articles' => 0 ) );
+ $wgDatabase->insert( 'site_stats',
+ array( 'ss_row_id' => 1,
+ 'ss_total_views' => 0,
+ 'ss_total_edits' => 0,
+ 'ss_good_articles' => 0 ) );
- $u = new User();
- $u->setId($GLOBALS["xoopsUser"]->getVar("uid"));
- $u->setName(mediawiki_username_xoops2mediawiki($GLOBALS["xoopsUser"]->getVar("uname")));
- $u->addToDatabase();
- $u->saveSettings();
+ $u = new User();
+ $u->setId($GLOBALS["xoopsUser"]->getVar("uid"));
+ $u->setName(mediawiki_username_xoops2mediawiki($GLOBALS["xoopsUser"]->getVar("uname")));
+ $u->addToDatabase();
+ $u->saveSettings();
- $u->addGroup( "sysop" );
- $u->addGroup( "bureaucrat" );
+ $u->addGroup( "sysop" );
+ $u->addGroup( "bureaucrat" );
- $titleobj = Title::newFromText( wfMsgNoDB( "mainpage" ) );
- $article = new Article( $titleobj );
- $newid = $article->insertOn( $wgDatabase );
- $revision = new Revision( array(
- 'page' => $newid,
- 'text' => wfMsg( 'mainpagetext' ) . "\n\n" . wfMsg( 'mainpagedocfooter' ),
- 'comment' => '',
- 'user' => $u->getId(),
- 'user_text' => $u->getName(),
- ) );
- $revid = $revision->insertOn( $wgDatabase );
- $article->updateRevisionOn( $wgDatabase, $revision );
+ $titleobj = Title::newFromText( wfMsgNoDB( "mainpage" ) );
+ $article = new Article( $titleobj );
+ $newid = $article->insertOn( $wgDatabase );
+ $revision = new Revision( array(
+ 'page' => $newid,
+ 'text' => wfMsg( 'mainpagetext' ) . "\n\n" . wfMsg( 'mainpagedocfooter' ),
+ 'comment' => ...
[truncated message content] |
|
From: <be...@us...> - 2014-04-16 13:09:56
|
Revision: 12451
http://sourceforge.net/p/xoops/svn/12451
Author: beckmi
Date: 2014-04-16 13:09:40 +0000 (Wed, 16 Apr 2014)
Log Message:
-----------
Adding old code from 1.71
Added Paths:
-----------
XoopsModules/mediawiki/trunk/mediawiki/AdminSettings.sample
XoopsModules/mediawiki/trunk/mediawiki/COPYING
XoopsModules/mediawiki/trunk/mediawiki/FAQ
XoopsModules/mediawiki/trunk/mediawiki/HISTORY
XoopsModules/mediawiki/trunk/mediawiki/INSTALL
XoopsModules/mediawiki/trunk/mediawiki/LocalSettings.php
XoopsModules/mediawiki/trunk/mediawiki/README
XoopsModules/mediawiki/trunk/mediawiki/RELEASE-NOTES
XoopsModules/mediawiki/trunk/mediawiki/UPGRADE
XoopsModules/mediawiki/trunk/mediawiki/admin/
XoopsModules/mediawiki/trunk/mediawiki/admin/admin_header.php
XoopsModules/mediawiki/trunk/mediawiki/admin/index.php
XoopsModules/mediawiki/trunk/mediawiki/admin/install.mediawiki.php
XoopsModules/mediawiki/trunk/mediawiki/admin/update.mediawiki.php
XoopsModules/mediawiki/trunk/mediawiki/bin/
XoopsModules/mediawiki/trunk/mediawiki/bin/ulimit.sh
XoopsModules/mediawiki/trunk/mediawiki/blocks/
XoopsModules/mediawiki/trunk/mediawiki/blocks/block.php
XoopsModules/mediawiki/trunk/mediawiki/blocks/mediawiki_recentchanges.php
XoopsModules/mediawiki/trunk/mediawiki/config/
XoopsModules/mediawiki/trunk/mediawiki/config/LocalSettings.php
XoopsModules/mediawiki/trunk/mediawiki/config/index.php
XoopsModules/mediawiki/trunk/mediawiki/docs/
XoopsModules/mediawiki/trunk/mediawiki/docs/README
XoopsModules/mediawiki/trunk/mediawiki/docs/database.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/deferred.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/design.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/export-0.1.xsd
XoopsModules/mediawiki/trunk/mediawiki/docs/export-0.2.xsd
XoopsModules/mediawiki/trunk/mediawiki/docs/export-0.3.xsd
XoopsModules/mediawiki/trunk/mediawiki/docs/export-demo.xml
XoopsModules/mediawiki/trunk/mediawiki/docs/globals.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/hooks.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/html/
XoopsModules/mediawiki/trunk/mediawiki/docs/html/README
XoopsModules/mediawiki/trunk/mediawiki/docs/language.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/linkcache.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/magicword.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/memcached.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/php-memcached/
XoopsModules/mediawiki/trunk/mediawiki/docs/php-memcached/ChangeLog
XoopsModules/mediawiki/trunk/mediawiki/docs/php-memcached/Documentation
XoopsModules/mediawiki/trunk/mediawiki/docs/schema.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/skin.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/title.txt
XoopsModules/mediawiki/trunk/mediawiki/docs/user.txt
XoopsModules/mediawiki/trunk/mediawiki/extensions/
XoopsModules/mediawiki/trunk/mediawiki/extensions/FCKeditor.php
XoopsModules/mediawiki/trunk/mediawiki/extensions/README
XoopsModules/mediawiki/trunk/mediawiki/fckconfig.js
XoopsModules/mediawiki/trunk/mediawiki/fckeditor.config.js
XoopsModules/mediawiki/trunk/mediawiki/fckeditor.connector.php
XoopsModules/mediawiki/trunk/mediawiki/fckeditor.upload.php
XoopsModules/mediawiki/trunk/mediawiki/images/
XoopsModules/mediawiki/trunk/mediawiki/images/README
XoopsModules/mediawiki/trunk/mediawiki/images/mediawiki.png
XoopsModules/mediawiki/trunk/mediawiki/img_auth.php
XoopsModules/mediawiki/trunk/mediawiki/include/
XoopsModules/mediawiki/trunk/mediawiki/include/XoopsOutputPage.php
XoopsModules/mediawiki/trunk/mediawiki/include/action.module.php
XoopsModules/mediawiki/trunk/mediawiki/include/functions.php
XoopsModules/mediawiki/trunk/mediawiki/include/search.php
XoopsModules/mediawiki/trunk/mediawiki/includes/
XoopsModules/mediawiki/trunk/mediawiki/includes/.htaccess
XoopsModules/mediawiki/trunk/mediawiki/includes/AjaxDispatcher.php
XoopsModules/mediawiki/trunk/mediawiki/includes/AjaxFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Article.php
XoopsModules/mediawiki/trunk/mediawiki/includes/AuthPlugin.php
XoopsModules/mediawiki/trunk/mediawiki/includes/AutoLoader.php
XoopsModules/mediawiki/trunk/mediawiki/includes/BagOStuff.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Block.php
XoopsModules/mediawiki/trunk/mediawiki/includes/CacheManager.php
XoopsModules/mediawiki/trunk/mediawiki/includes/CategoryPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Categoryfinder.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ChangesList.php
XoopsModules/mediawiki/trunk/mediawiki/includes/CoreParserFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Credits.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Database.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DatabaseFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DatabaseMysql.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DatabaseOracle.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DatabasePostgreSQL.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DatabasePostgres.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Databaseb1.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Databasec.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DateFormatter.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DefaultSettings.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Defines.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DifferenceEngine.php
XoopsModules/mediawiki/trunk/mediawiki/includes/DjVuImage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/EditPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Exception.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Exif.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Export.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ExternalEdit.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ExternalStore.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ExternalStoreDB.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ExternalStoreHttp.php
XoopsModules/mediawiki/trunk/mediawiki/includes/FakeTitle.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Feed.php
XoopsModules/mediawiki/trunk/mediawiki/includes/FileStore.php
XoopsModules/mediawiki/trunk/mediawiki/includes/GlobalFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Group.php
XoopsModules/mediawiki/trunk/mediawiki/includes/HTMLCacheUpdate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/HTMLForm.php
XoopsModules/mediawiki/trunk/mediawiki/includes/HistoryBlob.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Hooks.php
XoopsModules/mediawiki/trunk/mediawiki/includes/HttpFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Image.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ImageFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ImageGallery.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ImagePage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/JobQueue.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Licenses.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LinkBatch.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LinkCache.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LinkFilter.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Linker.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LinksUpdate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LoadBalancer.php
XoopsModules/mediawiki/trunk/mediawiki/includes/LogPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/MacBinary.php
XoopsModules/mediawiki/trunk/mediawiki/includes/MagicWord.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Math.php
XoopsModules/mediawiki/trunk/mediawiki/includes/MemcachedSessions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/MessageCache.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Metadata.php
XoopsModules/mediawiki/trunk/mediawiki/includes/MimeMagic.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Namespace.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ObjectCache.php
XoopsModules/mediawiki/trunk/mediawiki/includes/OutputPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/PageHistory.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Parser.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ParserCache.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ParserXML.php
XoopsModules/mediawiki/trunk/mediawiki/includes/PersistentObject.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ProfilerSimple.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ProfilerSimpleUDP.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ProfilerStub.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Profiling.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ProtectionForm.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ProxyTools.php
XoopsModules/mediawiki/trunk/mediawiki/includes/QueryPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/RawPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/RecentChange.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Revision.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Sanitizer.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchEngine.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchMySQL.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchMySQL4.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchPostgres.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchTsearch2.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SearchUpdate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Setup.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SiteConfiguration.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SiteStatsUpdate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Skin.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SkinTemplate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialAllmessages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialAllpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialAncientpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialBlockip.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialBlockme.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialBooksources.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialBrokenRedirects.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialCategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialConfirmemail.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialContributions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialDeadendpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialDisambiguations.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialDoubleRedirects.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialEmailuser.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialExport.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialGroups.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialImagelist.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialImport.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialIpblocklist.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialListredirects.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialListusers.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialLockdb.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialLog.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialLonelypages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialLongpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMIMEsearch.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMostcategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMostimages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMostlinked.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMostlinkedcategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMostrevisions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialMovepage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialNewimages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialNewpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialPage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialPopularpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialPreferences.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialPrefixindex.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialRandompage.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialRandomredirect.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialRecentchanges.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialRecentchangeslinked.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialRevisiondelete.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialSearch.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialShortpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialSpecialpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialStatistics.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUncategorizedcategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUncategorizedimages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUncategorizedpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUndelete.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUnlockdb.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUnusedcategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUnusedimages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUnusedtemplates.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUnwatchedpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUpload.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUploadMogile.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUserlogin.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUserlogout.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialUserrights.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialVersion.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialWantedcategories.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialWantedpages.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialWatchlist.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SpecialWhatlinkshere.php
XoopsModules/mediawiki/trunk/mediawiki/includes/SquidUpdate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/StreamFile.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Title.php
XoopsModules/mediawiki/trunk/mediawiki/includes/UpdateClasses.php
XoopsModules/mediawiki/trunk/mediawiki/includes/User.php
XoopsModules/mediawiki/trunk/mediawiki/includes/UserMailer.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Utf8Case.php
XoopsModules/mediawiki/trunk/mediawiki/includes/WatchedItem.php
XoopsModules/mediawiki/trunk/mediawiki/includes/WebRequest.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Wiki.php
XoopsModules/mediawiki/trunk/mediawiki/includes/WikiError.php
XoopsModules/mediawiki/trunk/mediawiki/includes/Xml.php
XoopsModules/mediawiki/trunk/mediawiki/includes/XmlFunctions.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ZhClient.php
XoopsModules/mediawiki/trunk/mediawiki/includes/ZhConversion.php
XoopsModules/mediawiki/trunk/mediawiki/includes/cbt/
XoopsModules/mediawiki/trunk/mediawiki/includes/cbt/CBTCompiler.php
XoopsModules/mediawiki/trunk/mediawiki/includes/cbt/CBTProcessor.php
XoopsModules/mediawiki/trunk/mediawiki/includes/cbt/README
XoopsModules/mediawiki/trunk/mediawiki/includes/memcached-client.php
XoopsModules/mediawiki/trunk/mediawiki/includes/mime.info
XoopsModules/mediawiki/trunk/mediawiki/includes/mime.types
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/CleanUpTest.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/Makefile
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/README
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/RandomTest.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/Utf8Test.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormal.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormalBench.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormalData.inc
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormalDataK.inc
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormalGenerate.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormalTest.php
XoopsModules/mediawiki/trunk/mediawiki/includes/normal/UtfNormalUtil.php
XoopsModules/mediawiki/trunk/mediawiki/includes/proxy_check.php
XoopsModules/mediawiki/trunk/mediawiki/includes/templates/
XoopsModules/mediawiki/trunk/mediawiki/includes/templates/Confirmemail.php
XoopsModules/mediawiki/trunk/mediawiki/includes/templates/Userlogin.php
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/Makefile
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/README
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/printutf8.c
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/simp2trad.manual
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/toCN.manual
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/toHK.manual
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/toSG.manual
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/toTW.manual
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/trad2simp.manual
XoopsModules/mediawiki/trunk/mediawiki/includes/zhtable/tradphrases.manual
XoopsModules/mediawiki/trunk/mediawiki/index.php
XoopsModules/mediawiki/trunk/mediawiki/install-utils.inc
XoopsModules/mediawiki/trunk/mediawiki/language/
XoopsModules/mediawiki/trunk/mediawiki/language/english/
XoopsModules/mediawiki/trunk/mediawiki/language/english/admin.php
XoopsModules/mediawiki/trunk/mediawiki/language/english/blocks.php
XoopsModules/mediawiki/trunk/mediawiki/language/english/index.html
XoopsModules/mediawiki/trunk/mediawiki/language/english/main.php
XoopsModules/mediawiki/trunk/mediawiki/language/english/modinfo.php
XoopsModules/mediawiki/trunk/mediawiki/language/schinese/
XoopsModules/mediawiki/trunk/mediawiki/language/schinese/admin.php
XoopsModules/mediawiki/trunk/mediawiki/language/schinese/blocks.php
XoopsModules/mediawiki/trunk/mediawiki/language/schinese/index.html
XoopsModules/mediawiki/trunk/mediawiki/language/schinese/main.php
XoopsModules/mediawiki/trunk/mediawiki/language/schinese/modinfo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/
XoopsModules/mediawiki/trunk/mediawiki/languages/.htaccess
XoopsModules/mediawiki/trunk/mediawiki/languages/Language.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAb.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAb.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAf.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageArc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAst.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAv.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAy.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageAz.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBa.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBat_smg.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBat_smg.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBg.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBm.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBm.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageBs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCe.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageConverter.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCsb.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCv.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageCy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageDa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageDe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageDv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageDz.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageEu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFur.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageFy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGn.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGsw.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGsw.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageGu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageHe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageHi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageHr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageHu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageIa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageId.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageIi.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageIi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageIs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageIt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageJa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageJv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKm.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKv.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageKv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageLa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageLi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageLo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageLt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageLv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageMk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageMl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageMs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNah.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNah.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNap.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNap.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNds.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNds_nl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNon.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNon.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageNv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageOc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageOr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageOs.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageOs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePms.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePms.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePt_br.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguagePt_br.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageQu.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageQu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageRmy.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageRmy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageRo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageRu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSd.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSq.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_ec.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_el.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_el.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_jc.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_jc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_jl.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSr_jl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageSv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTh.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTlh.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTy.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageTyv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUdm.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUdm.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUg.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageUtf8.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageVec.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageVec.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageVi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageWa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageXal.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageYi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZa.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_cn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_hk.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_hk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_sg.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_sg.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_tw.deps.php
XoopsModules/mediawiki/trunk/mediawiki/languages/LanguageZh_tw.php
XoopsModules/mediawiki/trunk/mediawiki/languages/Messages.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesAf.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesAr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesAz.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesBe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesBg.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesBn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesBr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesBs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesCa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesCs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesCsb.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesCv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesCy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesDa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesDe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesEl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesEo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesEs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesEt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesEu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFur.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesFy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesGa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesGsw.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesHe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesHi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesHr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesHu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesIa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesId.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesIs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesIt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesJa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesJv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesKn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesKo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesKu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesLa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesLi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesLt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesLv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesMk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesMs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesNah.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesNds.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesNl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesNn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesNo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesOc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesOs.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesPa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesPl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesPms.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesPt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesPt_br.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesRmy.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesRo.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesRu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSc.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSl.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSq.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSr_ec.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSr_el.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSu.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesSv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTe.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTh.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTr.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTt.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesTyv.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesUdm.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesUk.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesVec.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesVi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesWa.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesXal.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesYi.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesZh_cn.php
XoopsModules/mediawiki/trunk/mediawiki/languages/MessagesZh_tw.php
XoopsModules/mediawiki/trunk/mediawiki/languages/Names.php
XoopsModules/mediawiki/trunk/mediawiki/locale/
XoopsModules/mediawiki/trunk/mediawiki/locale/README
XoopsModules/mediawiki/trunk/mediawiki/maintenance/
XoopsModules/mediawiki/trunk/mediawiki/maintenance/.htaccess
XoopsModules/mediawiki/trunk/mediawiki/maintenance/Doxyfile
XoopsModules/mediawiki/trunk/mediawiki/maintenance/FiveUpgrade.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/InitialiseMessages.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/Makefile
XoopsModules/mediawiki/trunk/mediawiki/maintenance/README
XoopsModules/mediawiki/trunk/mediawiki/maintenance/addwiki.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/alltrans.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/apache-ampersand.diff
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/.htaccess
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-archive-rev_id.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-archive-text_id.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-bot.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-cache.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-categorylinks.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-drop-user_newtalk.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-drop_img_type.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-email-authentication.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-email-notification.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-externallinks.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-filearchive.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-hitcounter.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-image_name_primary.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-image_name_unique.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-img_exif.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-img_media_type.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-img_metadata.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-img_width.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-indexes.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-interwiki-trans.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-interwiki.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-inverse_timestamp.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-ipb_expiry.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-ipb_range_start.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-ipblocks.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-job.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-langlinks.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-linkscc-1.3.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-linkscc.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-linktables.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-list.txt
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-log_params.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-logging-times-index.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-logging-title.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-logging.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-math.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-mimesearch-indexes.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-objectcache.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-oldestindex.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-page_len.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-pagelinks.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-parsercache.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-profiling.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-querycache.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-querycacheinfo.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-random-dateindex.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-rc-newindex.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-rc-patrol.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-rc_id.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-rc_ip.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-rc_type.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-rename-group.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-rename-user_groups-and_rights.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-restructure.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-rev_deleted.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-rev_text_id.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-searchindex.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-ss_images.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-ss_total_articles.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-templatelinks.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-trackbacks.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-transcache.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-user-realname.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-user_email_token.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-user_groups.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-user_nameindex.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-user_registration.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-user_rights.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-user_token.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-userindex.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-userlevels-defaultgroups.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-userlevels-rights.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-userlevels.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-usernewtalk.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-usernewtalk2.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-val_ip.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-validate.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-watchlist-null.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-watchlist.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/rebuildRecentchanges.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/upgradeWatchlist.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/attachLatest.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/attribute.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/backup.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/backupPrefetch.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/benchmarkPurge.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/build-intl-wiki.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/changePassword.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/changeuser.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/checkUsernames.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/checktrans.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/cleanupCaps.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/cleanupDupes.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/cleanupDupes.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/cleanupSpam.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/cleanupTitles.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/cleanupWatchlist.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/clear_interwiki_cache.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/clear_stats.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/commandLine.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/convertLinks.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/convertLinks.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/counter.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/createAndPromote.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/database.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/delete-idle-wiki-users.pl
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteBatch.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteImageMemcached.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteOldRevisions.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteOldRevisions.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteOrphanedRevisions.inc.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteOrphanedRevisions.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/deleteRevision.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/diffLanguage.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dtrace/
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dtrace/counts.d
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dtrace/tree.d
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpBackup.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpHTML.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpHTML.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpInterwiki.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpInterwiki.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpLinks.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpMessages.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpReplayLog.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/dumpTextPass.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/duplicatetrans.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/entities2literals.pl
XoopsModules/mediawiki/trunk/mediawiki/maintenance/eval.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/fetchInterwiki.pl
XoopsModules/mediawiki/trunk/mediawiki/maintenance/findhooks.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/fixSlaveDesync.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/fixTimestamps.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/fixUserRegistration.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/generateSitemap.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importDump.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importImages.inc.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importImages.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importLogs.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importLogs.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importPhase2.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importTextFile.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importTextFile.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/importUseModWiki.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/initStats.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/interwiki.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/lang2po.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/langmemusage.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/languages.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/liveCmdLine.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/mcc.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/mctest.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/moveBatch.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/mwdocgen.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/mwdoxygen.cfg
XoopsModules/mediawiki/trunk/mediawiki/maintenance/mysql5/
XoopsModules/mediawiki/trunk/mediawiki/maintenance/mysql5/tables.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/namespace2sql.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/namespaceDupes.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/nukePage.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/nukePage.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/oracle/
XoopsModules/mediawiki/trunk/mediawiki/maintenance/oracle/archives/
XoopsModules/mediawiki/trunk/mediawiki/maintenance/oracle/archives/patch-trackbacks.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/oracle/archives/patch-transcache.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/oracle/interwiki.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/oracle/tables.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/orphans.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/ourusers.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTests.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTests.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTests.txt
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTestsParserHook.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTestsParserTime.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/parserTestsStaticParserHook.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/portal.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/postgres/
XoopsModules/mediawiki/trunk/mediawiki/maintenance/postgres/tables.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/purgeOldText.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/purgeOldText.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/reassignEdits.inc.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/reassignEdits.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildImages.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildInterwiki.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildInterwiki.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildMessages.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildall.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildrecentchanges.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildrecentchanges.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildtextindex.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/rebuildtextindex.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/recount.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/redundanttrans.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/refreshImageCount.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/refreshLinks.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/refreshLinks.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/removeUnusedAccounts.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/removeUnusedAccounts.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/renderDump.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/runJobs.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/showJobs.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/splitLanguageFiles.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/splitLanguageFiles.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/stats.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/blobs.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/checkStorage.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/compressOld.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/compressOld.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/dumpRev.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/make-blobs
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/moveToExternal.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/storage/resolveStubs.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/table-name.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/tables.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/transstat.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/trivialCmdLine.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/update.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/updateArticleCount.inc.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/updateArticleCount.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/updateSearchIndex.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/updateSearchIndex.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/updateSpecialPages.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/updaters.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/upgrade1_5.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/userDupes.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/userDupes.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/userFunctions.inc
XoopsModules/mediawiki/trunk/mediawiki/maintenance/users.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/wiki-mangleme.php
XoopsModules/mediawiki/trunk/mediawiki/maintenance/wikipedia-interwiki.sql
XoopsModules/mediawiki/trunk/mediawiki/maintenance/wiktionary-interwiki.sql
XoopsModules/mediawiki/trunk/mediawiki/math/
XoopsModules/mediawiki/trunk/mediawiki/math/.htaccess
XoopsModules/mediawiki/trunk/mediawiki/math/.svnignore
XoopsModules/mediawiki/trunk/mediawiki/math/Makefile
XoopsModules/mediawiki/trunk/mediawiki/math/README
XoopsModules/mediawiki/trunk/mediawiki/math/TODO
XoopsModules/mediawiki/trunk/mediawiki/math/html.ml
XoopsModules/mediawiki/trunk/mediawiki/math/html.mli
XoopsModules/mediawiki/trunk/mediawiki/math/lexer.mll
XoopsModules/mediawiki/trunk/mediawiki/math/mathml.ml
XoopsModules/mediawiki/trunk/mediawiki/math/mathml.mli
XoopsModules/mediawiki/trunk/mediawiki/math/parser.mly
XoopsModules/mediawiki/trunk/mediawiki/math/render.ml
XoopsModules/mediawiki/trunk/mediawiki/math/render_info.mli
XoopsModules/mediawiki/trunk/mediawiki/math/tex.mli
XoopsModules/mediawiki/trunk/mediawiki/math/texutil.ml
XoopsModules/mediawiki/trunk/mediawiki/math/texutil.mli
XoopsModules/mediawiki/trunk/mediawiki/math/texvc.ml
XoopsModules/mediawiki/trunk/mediawiki/math/texvc_cgi.ml
XoopsModules/mediawiki/trunk/mediawiki/math/texvc_test.ml
XoopsModules/mediawiki/trunk/mediawiki/math/texvc_tex.ml
XoopsModules/mediawiki/trunk/mediawiki/math/util.ml
XoopsModules/mediawiki/trunk/mediawiki/profileinfo.php
XoopsModules/mediawiki/trunk/mediawiki/redirect.php
XoopsModules/mediawiki/trunk/mediawiki/redirect.phtml
XoopsModules/mediawiki/trunk/mediawiki/setup_message.html
XoopsModules/mediawiki/trunk/mediawiki/skins/
XoopsModules/mediawiki/trunk/mediawiki/skins/Chick.deps.php
XoopsModules/mediawiki/trunk/mediawiki/skins/Chick.php
XoopsModules/mediawiki/trunk/mediawiki/skins/CologneBlue.php
XoopsModules/mediawiki/trunk/mediawiki/skins/MonoBook.deps.php
XoopsModules/mediawiki/trunk/mediawiki/skins/MonoBook.php
XoopsModules/mediawiki/trunk/mediawiki/skins/MonoBook.tpl
XoopsModules/mediawiki/trunk/mediawiki/skins/MySkin.deps.php
XoopsModules/mediawiki/trunk/mediawiki/skins/MySkin.php
XoopsModules/mediawiki/trunk/mediawiki/skins/Nostalgia.php
XoopsModules/mediawiki/trunk/mediawiki/skins/Simple.deps.php
XoopsModules/mediawiki/trunk/mediawiki/skins/Simple.php
XoopsModules/mediawiki/trunk/mediawiki/skins/Skin.sample
XoopsModules/mediawiki/trunk/mediawiki/skins/SkinPHPTal.sample
XoopsModules/mediawiki/trunk/mediawiki/skins/Standard.php
XoopsModules/mediawiki/trunk/mediawiki/skins/chick/
XoopsModules/mediawiki/trunk/mediawiki/skins/chick/IE50Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/chick/IE55Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/chick/IE60Fixes.css
XoopsModules/mediawiki/trunk/mediawiki/skins/chick/main.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/
XoopsModules/mediawiki/trunk/mediawiki/skins/common/IEFixes.js
XoopsModules/mediawiki/trunk/mediawiki/skins/common/ajax.js
XoopsModules/mediawiki/trunk/mediawiki/skins/common/cologneblue.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/common.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/commonPrint.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/common_rtl.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/feed.css
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/Arr_.png
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/Arr_d.png
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/Arr_l.png
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/Arr_r.png
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/Arr_r.xcf
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/Zoom_sans.gif
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/bullet.gif
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/button_bold.png
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/button_extlink.png
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/button_headline.png
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/button_hr.png
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/button_image.png
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/button_italic.png
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/button_link.png
XoopsModules/mediawiki/trunk/mediawiki/skins/common/images/button_math.png
XoopsMo...
[truncated message content] |
|
From: <be...@us...> - 2014-04-16 12:13:46
|
Revision: 12450
http://sourceforge.net/p/xoops/svn/12450
Author: beckmi
Date: 2014-04-16 12:13:42 +0000 (Wed, 16 Apr 2014)
Log Message:
-----------
fixing typo, adding comment
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-15 17:29:33 UTC (rev 12449)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt 2014-04-16 12:13:42 UTC (rev 12450)
@@ -1,5 +1,5 @@
<b><u>=> Version 3.23 Beta (2014-04-14)</u></b>
-- replaced Thickbox with MignificPopup (mamba)
+- replaced Thickbox with MagnificPopup (mamba)
- fixed: source code for HTML5/CSS3 (mamba)
- moved module.css, and /js and /images to /assets folder (mamba)
- fixed review for Admin: Admin doesn't need approval (mamba)
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-15 17:29:33 UTC (rev 12449)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php 2014-04-16 12:13:42 UTC (rev 12450)
@@ -1330,7 +1330,7 @@
$uploadDirectory = $uploadDirectory . '/';
$file_name = $_FILES['userfile']['name'];
-
+//Admin can upload files of any size
if (wfdownloads_userIsAdmin()) {
$maxFileSize = return_bytes(ini_get('upload_max_filesize'));
} else {
|
|
From: <txm...@us...> - 2014-04-15 17:29:41
|
Revision: 12449
http://sourceforge.net/p/xoops/svn/12449
Author: txmodxoops
Date: 2014-04-15 17:29:33 +0000 (Tue, 15 Apr 2014)
Log Message:
-----------
Toggle temporarily disabled, display problems in the lists Table and Fields
Browsers: Firefox and Opera.
Possible conflicts with class="<{cycle values='even,odd'}>"
Work in progress
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tdmcreate.php
Removed Paths:
-------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/themeform.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-15 17:29:33 UTC (rev 12449)
@@ -47,6 +47,7 @@
$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
+ $GLOBALS['xoopsTpl']->assign('tdmc_icons_url', TDMC_ICONS_URL);
$GLOBALS['xoopsTpl']->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
$GLOBALS['xoopsTpl']->assign('pathIcon32', $pathIcon32);
// Redirect if there aren't modules
@@ -128,7 +129,7 @@
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
$obj =& $fieldsHandler->create();
- $form = $obj->getForm($field_tid, $field_mid, $field_numb, $field_name);
+ $form = $obj->getForm($field_mid, $field_tid, $field_numb, $field_name);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
@@ -140,36 +141,40 @@
$obj =& $fieldsHandler->get($field_id);
} else {
$obj =& $fieldsHandler->create();
+ }
+ $datas = array();
+ for( $i = 0; $i < $table_nbfields; $i++ ) {
+ $datas = array('field_mid' => $table_mid[$i],
+ 'field_tid' => $table_id[$i],
+ 'field_numb' => $table_nbfields[$i],
+ 'field_name' => $_POST['field_name'][$i],
+ 'field_type' => $_POST['field_type'][$i],
+ 'field_value' => $_POST['field_value'][$i],
+ 'field_attribute' => $_POST['field_attribute'][$i],
+ 'field_null' => $_POST['field_null'][$i],
+ 'field_default' => $_POST['field_default'][$i],
+ 'field_key' => $_POST['field_key'][$i],
+ 'field_autoincrement' => (($_REQUEST['field_autoincrement'][$i] == 1) ? '1' : '0'),
+ 'field_element' => $_REQUEST['fieldelement_name'][$i],
+ 'field_inlist' => (($_REQUEST['field_inlist'][$i] == 1) ? '1' : '0'),
+ 'field_inform' => (($_REQUEST['field_inform'][$i] == 1) ? '1' : '0'),
+ 'field_admin' => (($_REQUEST['field_admin'][$i] == 1) ? '1' : '0'),
+ 'field_user' => (($_REQUEST['field_user'][$i] == 1) ? '1' : '0'),
+ 'field_block' => (($_REQUEST['field_block'][$i] == 1) ? '1' : '0'),
+ 'field_main' => (($i == $_REQUEST['field_main']) ? '1' : '0'),
+ 'field_search' => (($_REQUEST['field_search'][$i] == 1) ? '1' : '0'),
+ 'field_required' => (($_REQUEST['field_required'][$i] == 1) ? '1' : '0')
+ );
+
+ }
+ foreach ($datas as $data => $value) {
+ $obj->setVars(array($data, $value));
}
- for( $i = 0; $i < $table_nbfields; $i++ ) {
- $obj->setVars(array('field_mid' => $table_mid[$i],
- 'field_tid' => $table_id[$i],
- 'field_numb' => $table_nbfields[$i],
- 'field_name' => $_POST['field_name'][$i],
- 'field_type' => $_POST['field_type'][$i],
- 'field_value' => $_POST['field_value'][$i],
- 'field_attribute' => $_POST['field_attribute'][$i],
- 'field_null' => $_POST['field_null'][$i],
- 'field_default' => $_POST['field_default'][$i],
- 'field_key' => $_POST['field_key'][$i],
- 'field_autoincrement' => (($_REQUEST['field_autoincrement'][$i] == 1) ? '1' : '0'),
- 'field_element' => $_REQUEST['fieldelement_name'][$i],
- 'field_inlist' => (($_REQUEST['field_inlist'][$i] == 1) ? '1' : '0'),
- 'field_inform' => (($_REQUEST['field_inform'][$i] == 1) ? '1' : '0'),
- 'field_admin' => (($_REQUEST['field_admin'][$i] == 1) ? '1' : '0'),
- 'field_user' => (($_REQUEST['field_user'][$i] == 1) ? '1' : '0'),
- 'field_block' => (($_REQUEST['field_block'][$i] == 1) ? '1' : '0'),
- 'field_main' => (($i == $_REQUEST['field_main']) ? '1' : '0'),
- 'field_search' => (($_REQUEST['field_search'][$i] == 1) ? '1' : '0'),
- 'field_required' => (($_REQUEST['field_required'][$i] == 1) ? '1' : '0')
- )
- );
- }
if ($fieldsHandler->insert($obj)) {
redirect_header('fields.php', 2, _AM_TDMCREATE_FORMOK);
- }
- $GLOBALS['xoopsTpl']->assign('error', $obj->getHtmlErrors());
- $form = $obj->getForm();
+ }
+ $GLOBALS['xoopsTpl']->assign('error', $obj->getHtmlErrors());
+ $form = $obj->getForm($field_mid, $field_tid, $field_numb, $field_name);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
@@ -183,7 +188,7 @@
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
$obj = $fieldsHandler->get($field_id);
- $form = $obj->getForm($field_tid, $field_mid, $field_numb, $field_name);
+ $form = $obj->getForm($field_mid, $field_tid, $field_numb, $field_name);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-15 17:29:33 UTC (rev 12449)
@@ -42,6 +42,7 @@
$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
+ $GLOBALS['xoopsTpl']->assign('tdmc_icons_url', TDMC_ICONS_URL);
$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
//$GLOBALS['xoopsTpl']->assign('tdmc_upload_table_url', TDMC_UPLOAD_IMGTAB_URL);
$GLOBALS['xoopsTpl']->assign('pathIcon32', $pathIcon32);
@@ -105,9 +106,9 @@
$GLOBALS['xoopsTpl']->append('modules_list', $mod);
unset($mod);
}
- if ( $numrows_modules > $limit ) {
+ if ( $nb_modules > $limit ) {
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($numrows_modules, $limit, $start, 'start', 'op=list&limit=' . $limit);
+ $pagenav = new XoopsPageNav($nb_modules, $limit, $start, 'start', 'op=list&limit=' . $limit);
$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
}
} else {
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-15 17:29:33 UTC (rev 12449)
@@ -77,13 +77,13 @@
/*
* @public function getForm
*
- * @param integer $table_id
- * @param integer $table_mid
- * @param integer $table_nbfields
- * @param string $table_fieldname
+ * @param integer $f_mid
+ * @param integer $f_tid
+ * @param integer $f_numb
+ * @param string $f_name
* @param mixed $action
*/
- public function getForm($f_tid = null, $f_mid = null, $f_numb = null, $f_name = null, $action = false)
+ public function getForm($f_mid = null, $f_tid = null, $f_numb = null, $f_name = null, $action = false)
{
if ($action === false) {
$action = $_SERVER['REQUEST_URI'];
@@ -105,7 +105,11 @@
$form->setExtra('enctype="multipart/form-data"');
$tablesHandler = xoops_getModuleHandler('tables');
- $fieldelementsHandler =& xoops_getModuleHandler('fieldelements');
+ $fieldelementsHandler =& xoops_getModuleHandler('fieldelements');
+ $fieldtypeHandler =& xoops_getModuleHandler('fieldtype');
+ $fieldattrsHandler =& xoops_getModuleHandler('fieldattributes');
+ $fieldnullHandler =& xoops_getModuleHandler('fieldnull');
+ $fieldkeyHandler =& xoops_getModuleHandler('fieldkey');
// New Object HtmlTable
$form->addElement(new TDMCreateFormLabel('<table class="outer">'));
$form->addElement(new TDMCreateFormLabel('<thead class="center"><tr class="width5">'));
@@ -132,21 +136,18 @@
$field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$i.']', 15, 255, $field_name);
// Field Name
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
- // Field Type
- $fieldtypeHandler =& xoops_getModuleHandler('fieldtype');
+ // Field Type
$fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$i.']', $this->getVar('field_type'));
$fieldtype_select->addOptionArray($fieldtypeHandler->getList());
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$fieldtype_select->render().'</td>'));
// Field Value
$field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value['.$i.']', 5, 20, $this->getVar('field_value'));
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_value->render().'</td>'));
- // Field Attributes
- $fieldattrsHandler =& xoops_getModuleHandler('fieldattributes');
+ // Field Attributes
$field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute['.$i.']', $this->getVar('field_attribute'));
$field_attributes_select->addOptionArray($fieldattrsHandler->getList());
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_attributes_select->render().'</td>'));
- // Field Null
- $fieldnullHandler =& xoops_getModuleHandler('fieldnull');
+ // Field Null
$field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null['.$i.']', $this->getVar('field_null'));
$field_null_select->addOptionArray($fieldnullHandler->getList());
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_null_select->render().'</td>'));
@@ -154,7 +155,6 @@
$field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default['.$i.']', 15, 25, $this->getVar('field_default'));
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_default->render().'</td>'));
// Field Key
- $fieldkeyHandler =& xoops_getModuleHandler('fieldkey');
$field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key['.$i.']', $this->getVar('field_key'));
$field_key_select->addOptionArray($fieldkeyHandler->getList());
$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_key_select->render().'</td>'));
@@ -226,7 +226,7 @@
$parameters_tray->addElement($check_field_required);
$form->addElement(new TDMCreateFormLabel('<td>'.$parameters_tray->render().'</td></tr>'));
- }
+ }
$form->addElement(new XoopsFormHidden('field_id['.$i.']', $i));
}
@@ -242,6 +242,20 @@
$form->addElement(new TDMCreateFormLabel('</tr></tfoot></table>'));
return $form;
}
+
+ /*
+ * @public function toArray
+ * @param null
+ */
+ public function toArray() {
+ $ret = parent::toArray();
+ $f_tid = $this->table->getVar('table_id');
+ $f_mid = $this->table->getVar('table_mid');
+ $f_numb = $this->table->getVar('table_nbfields');
+ $f_name = $this->table->getVar('table_fieldname');
+ $ret['edit_form'] = $this->getForm($f_tid, $f_mid, $f_numb, $f_name);
+ return $ret;
+ }
}
/*
* @Class TDMCreateFieldsHandler
@@ -263,4 +277,312 @@
$this->table = TDMCreateTables::getInstance();
parent::__construct($db, 'mod_tdmcreate_fields', 'tdmcreatefields', 'field_id', 'field_tid');
}
+
+ /*
+ * @public function getFieldModuleId
+ * @param integer $field_id
+ */
+ public function getFieldModuleId($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ return $obj[0]['field_mid'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldTableId
+ * @param integer $field_id
+ */
+ public function getFieldTableId($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ return $obj[0]['field_tid'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldName
+ * @param integer $field_id
+ */
+ public function getFieldName($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (!empty($obj[0]['field_name']))
+ return strtolower($obj[0]['field_name']);
+ else
+ return false;
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldType
+ * @param integer $field_id
+ */
+ public function getFieldType($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_type']))
+ return $obj[0]['field_type'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldValue
+ * @param integer $field_id
+ */
+ public function getFieldValue($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (!empty($obj[0]['field_value']) && is_numeric($obj[0]['field_value']))
+ return intval($obj[0]['field_value']);
+ else
+ return false;
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldAttribute
+ * @param integer $field_id
+ */
+ public function getFieldAttribute($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_attribute']))
+ return $obj[0]['field_attribute'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldNull
+ * @param integer $field_id
+ */
+ public function getFieldNull($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_null']))
+ return $obj[0]['field_null'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldDefault
+ * @param integer $field_id
+ */
+ public function getFieldDefault($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (!empty($obj[0]['field_default']))
+ return strtolower($obj[0]['field_default']);
+ else
+ return false;
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldKey
+ * @param integer $field_id
+ */
+ public function getFieldKey($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_key']))
+ return $obj[0]['field_key'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldAutoIncrement
+ * @param integer $field_id
+ */
+ public function getFieldAutoIncrement($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_autoincrement']))
+ return $obj[0]['field_autoincrement'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldElement
+ * @param integer $field_id
+ */
+ public function getFieldElement($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_element']))
+ return $obj[0]['field_element'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldInLst
+ * @param integer $field_id
+ */
+ public function getFieldInLst($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_inlist']))
+ return $obj[0]['field_inlist'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldInForm
+ * @param integer $field_id
+ */
+ public function getFieldInForm($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_inform']))
+ return $obj[0]['field_inform'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldAdmin
+ * @param integer $field_id
+ */
+ public function getFieldAdmin($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_admin']))
+ return $obj[0]['field_admin'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldUser
+ * @param integer $field_id
+ */
+ public function getFieldUser($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_user']))
+ return $obj[0]['field_user'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldBlock
+ * @param integer $field_id
+ */
+ public function getFieldBlock($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_block']))
+ return $obj[0]['field_block'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldMain
+ * @param integer $field_id
+ */
+ public function getFieldMain($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_main']))
+ return $obj[0]['field_main'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldSearch
+ * @param integer $field_id
+ */
+ public function getFieldSearch($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_search']))
+ return $obj[0]['field_search'];
+ } else {
+ return false;
+ }
+ }
+
+ /*
+ * @public function getFieldRequired
+ * @param integer $field_id
+ */
+ public function getFieldRequired($field_id)
+ {
+ $criteria = new Criteria('field_id', $field_id );
+ if ($this->getCount($criteria) > 0) {
+ $obj = $this->getObjects($criteria, false, false );
+ if (isset($obj[0]['field_required']))
+ return $obj[0]['field_required'];
+ } else {
+ return false;
+ }
+ }
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php 2014-04-15 17:29:33 UTC (rev 12449)
@@ -91,11 +91,13 @@
$form->setExtra('enctype="multipart/form-data"');
//
$modulesHandler =& xoops_getModuleHandler('modules');
+ $modules = $modulesHandler->getObjects(null);
$mods_select = new XoopsFormSelect(_AM_TDMCREATE_TABLE_MODULES, 'table_mid', $table_mid);
//$mods_select->setExtra('onchange="window.location=\'\'+this.options[this.selectedIndex].value"');
+ //$mods_select->setValue('table.php?op=new&table_mid='.$table_mid);$action.'table.php?op=new&table_mid='.
$mods_select->addOption($action, _AM_TDMCREATE_TABLE_MODSELOPT);
- foreach ($modulesHandler->getList() as $mod_id => $mod_name) {
- $mods_select->addOption($mod_id, $mod_name);
+ foreach ($modules as $mod) {
+ $mods_select->addOption($mod->getVar('mod_id'), $mod->getVar('mod_name'));
}
//$mods_select->addOptionArray();
$form->addElement($mods_select, true);
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tdmcreate.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tdmcreate.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tdmcreate.php 2014-04-15 17:29:33 UTC (rev 12449)
@@ -0,0 +1,173 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author trabis <lus...@gm...>
+ * @version $Id: tdmcreate.php 12258 2014-04-12 23:45:12Z timgno $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class TDMCreate
+{
+ /**
+ * @var string
+ */
+ private $dirname = null;
+ /**
+ * @var string
+ */
+ private $module = null;
+ /**
+ * @var string
+ */
+ private $handler = null;
+ /**
+ * @var string
+ */
+ private $config = null;
+ /**
+ * @var string
+ */
+ private $debug = null;
+ /**
+ * @var array
+ */
+ private $debugArray = array();
+ /*
+ * @protected function constructor class
+ * @param mixed $debug
+ */
+ protected function __construct($debug)
+ {
+ $this->debug = $debug;
+ $this->dirname = basename(dirname(dirname(__FILE__)));
+ }
+ /*
+ * @static function &getInstance
+ * @param mixed $debug
+ */
+ public static function &getInstance($debug = false)
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self($debug);
+ }
+ return $instance;
+ }
+ /*
+ * @static function getModule
+ * @param null
+ */
+ public function &getModule()
+ {
+ if ($this->module == null) {
+ $this->initModule();
+ }
+ return $this->module;
+ }
+ /*
+ * @static function getConfig
+ * @param string $name
+ */
+ public function getConfig($name = null)
+ {
+ if ($this->config == null) {
+ $this->initConfig();
+ }
+ if (!$name) {
+ $this->addLog("Getting all config");
+ return $this->config;
+ }
+ if (!isset($this->config[$name])) {
+ $this->addLog("ERROR :: CONFIG '{$name}' does not exist");
+ return null;
+ }
+ $this->addLog("Getting config '{$name}' : " . $this->config[$name]);
+ return $this->config[$name];
+ }
+ /*
+ * @static function setConfig
+ * @param string $name
+ * @param mixed $value
+ */
+ public function setConfig($name = null, $value = null)
+ {
+ if ($this->config == null) {
+ $this->initConfig();
+ }
+ $this->config[$name] = $value;
+ $this->addLog("Setting config '{$name}' : " . $this->config[$name]);
+ return $this->config[$name];
+ }
+ /*
+ * @static function getHandler
+ * @param string $name
+ */
+ public function &getHandler($name)
+ {
+ if (!isset($this->handler[$name . '_handler'])) {
+ $this->initHandler($name);
+ }
+ $this->addLog("Getting handler '{$name}'");
+ return $this->handler[$name . '_handler'];
+ }
+ /*
+ * @static function initModule
+ * @param null
+ */
+ public function initModule()
+ {
+ global $xoopsModule;
+ if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $this->dirname) {
+ $this->module = $xoopsModule;
+ } else {
+ $hModule = xoops_gethandler('module');
+ $this->module = $hModule->getByDirname($this->dirname);
+ }
+ $this->addLog('INIT MODULE');
+ }
+ /*
+ * @static function initConfig
+ * @param null
+ */
+ public function initConfig()
+ {
+ $this->addLog('INIT CONFIG');
+ $hModConfig = xoops_gethandler('config');
+ $this->config = $hModConfig->getConfigsByCat(0, $this->getModule()->getVar('mid'));
+ }
+ /*
+ * @static function initHandler
+ * @param string $name
+ */
+ public function initHandler($name)
+ {
+ $this->addLog('INIT ' . $name . ' HANDLER');
+ $this->handler[$name . '_handler'] = xoops_getModuleHandler($name, $this->dirname);
+ }
+ /*
+ * @static function addLog
+ * @param string $log
+ */
+ public function addLog($log)
+ {
+ if ($this->debug) {
+ if (is_object($GLOBALS['xoopsLogger'])) {
+ $GLOBALS['xoopsLogger']->addExtra($this->module->name(), $log);
+ }
+ }
+ }
+}
\ No newline at end of file
Deleted: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/themeform.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/themeform.php 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/themeform.php 2014-04-15 17:29:33 UTC (rev 12449)
@@ -1,65 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-/**
- * tdmcreate module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package tdmcreate
- * @since 2.5.5
- * @author Txmod Xoops <su...@tx...>
- * @version $Id: 1.59 themeform.php 11297 2013-03-24 10:58:10Z timgno $
- */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-xoops_load('XoopsFormLoader');
-
-/**
- * Form that will output as a theme-enabled HTML table
- *
- * Also adds JavaScript to validate required fields
- */
-class TDMCreateThemeForm extends XoopsForm
-{
- /**
- * create HTML to output the form as a theme-enabled table with validation.
- *
- * YOU SHOULD AVOID TO USE THE FOLLOWING Nocolspan METHOD, IT WILL BE REMOVED
- *
- * To use the noColspan simply use the following example:
- *
- * $colspan = new XoopsFormDhtmlTextArea( '', 'key', $value, '100%', '100%' );
- * $colspan->setNocolspan();
- * $form->addElement( $colspan );
- *
- * @return string
- */
- public function render()
- {
- $ele_name = $this->getName();
- $ret = ($this->getTitle() ? '<div class=" center head ">' . $this->getTitle() . '</div>' : '');
- $ret .= NWLINE . '<form name="' . $ele_name . '" id="' . $ele_name . '" action="' . $this->getAction() . '" method="' . $this->getMethod() . '" onsubmit="return xoopsFormValidate_' . $ele_name . '();"' . $this->getExtra() . '>' . NWLINE;
- $hidden = '';
- $class = 'even';
- foreach ($this->getElements() as $ele) {
- if (!is_object($ele)) {
- $ret .= $ele;
- } else if (!$ele->isHidden()) {
- $ret .= $ele->render();
- } else {
- $hidden .= $ele->render();
- }
- }
- $ret .= NWLINE . ' ' . $hidden . NWLINE . '</form>';
- $ret .= $this->renderValidationJS(true);
- return $ret;
- }
-}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css 2014-04-15 17:29:33 UTC (rev 12449)
@@ -28,10 +28,12 @@
}
img.imageToggle {
- width: 16px;
- height: 16px;
+ width: 16px;
+ height: 16px;
}
+.move { cursor: move; }
+
.width6{ width: 6%; }
.bred {background-color:rgba(255,0,0,0.3);} / * red */
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php 2014-04-15 17:29:33 UTC (rev 12449)
@@ -22,8 +22,14 @@
die('XOOPS root path not defined');
}
$dirname = $GLOBALS['xoopsModule']->getVar('dirname');
+// Local Directories
define('TDMC_PATH', XOOPS_ROOT_PATH . '/modules/' . $dirname );
define('TDMC_URL', XOOPS_URL . '/modules/' . $dirname );
+define('TDMC_IMAGE_PATH', TDMC_PATH . '/images' );
+define('TDMC_IMAGE_URL', TDMC_URL . '/images' );
+define('TDMC_ICONS_PATH', TDMC_IMAGE_PATH . '/icons' );
+define('TDMC_ICONS_URL', TDMC_IMAGE_URL . '/icons' );
+// Uploads Directories
define('TDMC_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $dirname );
define('TDMC_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $dirname );
define('TDMC_UPLOAD_MODULES_PATH', TDMC_UPLOAD_PATH . '/modules' );
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php 2014-04-15 17:29:33 UTC (rev 12449)
@@ -54,6 +54,49 @@
if (!$r) return false;
return true;
}
+
+/**
+ * Copy a file, or a folder and its contents
+ *
+ * @author Aidan Lister <ai...@ph...>
+ * @version 1.0.0
+ * @param string $source The source
+ * @param string $dest The destination
+ * @return bool Returns true on success, false on failure
+ */
+function TDMCreate_copyr($source, $dest)
+{
+ // Simple copy for a file
+ if (is_file($source)) {
+ return copy($source, $dest);
+ }
+
+ // Make destination directory
+ if (!is_dir($dest)) {
+ mkdir($dest);
+ }
+
+ // Loop through the folder
+ $dir = dir($source);
+ while (false !== $entry = $dir->read()) {
+ // Skip pointers
+ if ($entry == '.' || $entry == '..') {
+ continue;
+ }
+
+ // Deep copy directories
+ if (is_dir("$source/$entry") && ($dest !== "$source/$entry")) {
+ copyr("$source/$entry", "$dest/$entry");
+ } else {
+ copy("$source/$entry", "$dest/$entry");
+ }
+ }
+
+ // Clean up
+ $dir->close();
+ return true;
+}
+
/*
if(function_exists(isset($_GET['f']))) { // get function name and parameter $_GET['f']($_GET["p"]);
include_once TDMC_PATH . '/class/modules.php';
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html 2014-04-15 17:29:33 UTC (rev 12449)
@@ -22,9 +22,9 @@
</thead>
<tbody>
<{foreach item=table from=$tables_list}>
- <tr class="<{cycle values='even,odd'}> toggleMain">
+ <tr id="table<{$table.id}>" class="<{cycle values='even,odd'}>">
<td class='center'><{$table.id}><br />
- <a href="#" title="Toggle"><img class="imageToggle" src="<{$tdmc_url}>/images/icons/16/toggle.png" alt="Toggle" /></a>
+ <a href="#" title="Toggle"><img class="imageToggle" src="<{$tdmc_icons_url}>/16/toggle.png" alt="Toggle" /></a>
</td>
<td class='center'><u><{$table.name}></u></td>
<td class='center'><img src="<{$pathIcon32}>/<{$table.image}>" alt="<{$table.name}>" height="30" /></td>
@@ -82,8 +82,8 @@
</td>
</tr>
<{foreach item=field from=$table.fields}>
- <tr class="<{cycle values='even,odd'}> toggleChild">
- <td class='center'><{$field.id}> <img src="<{$tdmc_url}>/images/icons/16/drag.png" alt="<{$field.name}>" height="16" /></td>
+ <tr class="<{cycle values='even,odd'}>">
+ <td class='center'><{$field.id}> <img class="move" src="<{$tdmc_icons_url}>/16/drag.png" alt="<{$field.name}>" /></td>
<td class='center'><{$field.name}></td>
<td class='center' colspan="11"> </td>
</tr>
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html 2014-04-15 17:29:33 UTC (rev 12449)
@@ -19,7 +19,7 @@
<th class='center width5'><{$smarty.const._AM_TDMCREATE_FORMACTION}></th>
</tr>
<{foreach item=module from=$modules_list}>
- <tr class="<{cycle values='even,odd'}>">
+ <tr id="module<{$module.id}>" class="<{cycle values='even,odd'}>">
<td class='center'><{$module.id}></td>
<td class='center'><{$module.name}></td>
<td class='center'><{$module.version}></td>
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html 2014-04-15 17:29:33 UTC (rev 12449)
@@ -22,9 +22,9 @@
</thead>
<tbody>
<{foreach item=module from=$modules_list}>
- <tr id="module<{$module.id}>" class="<{cycle values='even,odd'}> toggleMain">
+ <tr id="module<{$module.id}>" class="<{cycle values='even,odd'}>">
<td class='center'><{$module.id}><br />
- <a href="#" title="Toggle"><img class="imageToggle" src="<{$tdmc_url}>/images/icons/16/toggle.png" alt="Toggle" /></a>
+ <a href="#" title="Toggle"><img class="imageToggle" src="<{$tdmc_icons_url}>/16/toggle.png" alt="Toggle" /></a>
</td>
<td class='center'><{$module.name}></td>
<td class='center'><img src="<{$tdmc_upload_imgmod_url}>/<{$module.image}>" height="32" /></td>
@@ -71,7 +71,7 @@
</td>
</tr>
<{foreach item=table from=$module.tables}>
- <tr class="<{cycle values='even,odd'}> toggleChild">
+ <tr id="table<{$table.id}>" class="<{cycle values='even,odd'}>">
<td class='center'><{$table.id}></td>
<td class='center'><{$table.name}></td>
<td class='center'><img src="<{xoModuleIcons32}><{$table.image}>" alt="<{$table.name}>" height="30" /></td>
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php 2014-04-15 09:16:07 UTC (rev 12448)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php 2014-04-15 17:29:33 UTC (rev 12449)
@@ -411,5 +411,5 @@
$modversion['config'][$i]['description'] = "";
$modversion['config'][$i]['formtype'] = "textbox";
$modversion['config'][$i]['valuetype'] = "text";
-$modversion['config'][$i]['default'] = '12435';
+$modversion['config'][$i]['default'] = '12443';
unset($i);
\ No newline at end of file
|
|
From: <be...@us...> - 2014-04-15 09:16:15
|
Revision: 12448
http://sourceforge.net/p/xoops/svn/12448
Author: beckmi
Date: 2014-04-15 09:16:07 +0000 (Tue, 15 Apr 2014)
Log Message:
-----------
adding xoAlbum
Added Paths:
-----------
XoopsModules/xoalbum/
XoopsModules/xoalbum/branches/
XoopsModules/xoalbum/releases/
XoopsModules/xoalbum/trunk/
XoopsModules/xoalbum/trunk/xoalbum/
XoopsModules/xoalbum/trunk/xoalbum/action.php
XoopsModules/xoalbum/trunk/xoalbum/admin/
XoopsModules/xoalbum/trunk/xoalbum/admin/action.album.php
XoopsModules/xoalbum/trunk/xoalbum/admin/action.category.php
XoopsModules/xoalbum/trunk/xoalbum/admin/action.picture.php
XoopsModules/xoalbum/trunk/xoalbum/admin/album.php
XoopsModules/xoalbum/trunk/xoalbum/admin/category.php
XoopsModules/xoalbum/trunk/xoalbum/admin/comments.php
XoopsModules/xoalbum/trunk/xoalbum/admin/footer.php
XoopsModules/xoalbum/trunk/xoalbum/admin/header.php
XoopsModules/xoalbum/trunk/xoalbum/admin/index.php
XoopsModules/xoalbum/trunk/xoalbum/admin/menu.php
XoopsModules/xoalbum/trunk/xoalbum/admin/picture.php
XoopsModules/xoalbum/trunk/xoalbum/ajax.php
XoopsModules/xoalbum/trunk/xoalbum/album.php
XoopsModules/xoalbum/trunk/xoalbum/blocks/
XoopsModules/xoalbum/trunk/xoalbum/blocks/block.php
XoopsModules/xoalbum/trunk/xoalbum/blocks/index.html
XoopsModules/xoalbum/trunk/xoalbum/category.php
XoopsModules/xoalbum/trunk/xoalbum/class/
XoopsModules/xoalbum/trunk/xoalbum/class/album.php
XoopsModules/xoalbum/trunk/xoalbum/class/category.php
XoopsModules/xoalbum/trunk/xoalbum/class/grid.php
XoopsModules/xoalbum/trunk/xoalbum/class/index.html
XoopsModules/xoalbum/trunk/xoalbum/class/picture.php
XoopsModules/xoalbum/trunk/xoalbum/footer.php
XoopsModules/xoalbum/trunk/xoalbum/header.php
XoopsModules/xoalbum/trunk/xoalbum/images/
XoopsModules/xoalbum/trunk/xoalbum/images/album.gif
XoopsModules/xoalbum/trunk/xoalbum/images/index.html
XoopsModules/xoalbum/trunk/xoalbum/images/loading.gif
XoopsModules/xoalbum/trunk/xoalbum/images/loadingAnimation.gif
XoopsModules/xoalbum/trunk/xoalbum/images/logo.png
XoopsModules/xoalbum/trunk/xoalbum/images/nopicture.gif
XoopsModules/xoalbum/trunk/xoalbum/images/xoalbum.jpg
XoopsModules/xoalbum/trunk/xoalbum/include/
XoopsModules/xoalbum/trunk/xoalbum/include/action.album.php
XoopsModules/xoalbum/trunk/xoalbum/include/action.category.php
XoopsModules/xoalbum/trunk/xoalbum/include/action.module.php
XoopsModules/xoalbum/trunk/xoalbum/include/action.picture.php
XoopsModules/xoalbum/trunk/xoalbum/include/ajax.album.php
XoopsModules/xoalbum/trunk/xoalbum/include/configs.php
XoopsModules/xoalbum/trunk/xoalbum/include/form.album.php
XoopsModules/xoalbum/trunk/xoalbum/include/form.category.php
XoopsModules/xoalbum/trunk/xoalbum/include/form.grid.php
XoopsModules/xoalbum/trunk/xoalbum/include/form.picture.php
XoopsModules/xoalbum/trunk/xoalbum/include/index.html
XoopsModules/xoalbum/trunk/xoalbum/include/search.inc.php
XoopsModules/xoalbum/trunk/xoalbum/include/xoalbum.php
XoopsModules/xoalbum/trunk/xoalbum/index.php
XoopsModules/xoalbum/trunk/xoalbum/language/
XoopsModules/xoalbum/trunk/xoalbum/language/english/
XoopsModules/xoalbum/trunk/xoalbum/language/english/admin.php
XoopsModules/xoalbum/trunk/xoalbum/language/english/blocks.php
XoopsModules/xoalbum/trunk/xoalbum/language/english/index.html
XoopsModules/xoalbum/trunk/xoalbum/language/english/main.php
XoopsModules/xoalbum/trunk/xoalbum/language/english/modinfo.php
XoopsModules/xoalbum/trunk/xoalbum/language/index.html
XoopsModules/xoalbum/trunk/xoalbum/language/schinese_utf8/
XoopsModules/xoalbum/trunk/xoalbum/language/schinese_utf8/admin.php
XoopsModules/xoalbum/trunk/xoalbum/language/schinese_utf8/blocks.php
XoopsModules/xoalbum/trunk/xoalbum/language/schinese_utf8/index.html
XoopsModules/xoalbum/trunk/xoalbum/language/schinese_utf8/main.php
XoopsModules/xoalbum/trunk/xoalbum/language/schinese_utf8/modinfo.php
XoopsModules/xoalbum/trunk/xoalbum/readme.txt
XoopsModules/xoalbum/trunk/xoalbum/script/
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/imgareaselect/
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/imgareaselect/border-anim-h.gif
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/imgareaselect/border-anim-v.gif
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/imgareaselect/border-h.gif
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/imgareaselect/border-v.gif
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/imgareaselect/imgareaselect-animated.css
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/imgareaselect/imgareaselect-default.css
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/imgareaselect/imgareaselect-deprecated.css
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/jquery-1.3.2.min.js
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/jquery-menu.js
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/jquery-ui-1.7.2.custom.min.js
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/jquery.form.js
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/jquery.imgareaselect.min.js
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/scripts/
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/scripts/jquery.imgareaselect.js
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/scripts/jquery.imgareaselect.min.js
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/scripts/jquery.imgareaselect.pack.js
XoopsModules/xoalbum/trunk/xoalbum/script/jquery/scripts/jquery.min.js
XoopsModules/xoalbum/trunk/xoalbum/script/style/
XoopsModules/xoalbum/trunk/xoalbum/script/style/imgareaselect/
XoopsModules/xoalbum/trunk/xoalbum/script/style/imgareaselect/border-anim-h.gif
XoopsModules/xoalbum/trunk/xoalbum/script/style/imgareaselect/border-anim-v.gif
XoopsModules/xoalbum/trunk/xoalbum/script/style/imgareaselect/border-h.gif
XoopsModules/xoalbum/trunk/xoalbum/script/style/imgareaselect/border-v.gif
XoopsModules/xoalbum/trunk/xoalbum/script/style/imgareaselect/imgareaselect-animated.css
XoopsModules/xoalbum/trunk/xoalbum/script/style/imgareaselect/imgareaselect-default.css
XoopsModules/xoalbum/trunk/xoalbum/script/style/imgareaselect/imgareaselect-deprecated.css
XoopsModules/xoalbum/trunk/xoalbum/script/style/nophoto.gif
XoopsModules/xoalbum/trunk/xoalbum/script/style/nophoto.jpg
XoopsModules/xoalbum/trunk/xoalbum/script/style/style.css
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-bg_inset-soft_25_000000_1x100.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-bg_flat_30_cccccc_40x100.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-bg_glass_20_555555_1x400.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-bg_gloss-wave_25_333333_500x100.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-bg_inset-soft_25_000000_1x100.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-bg_inset-soft_30_f58400_1x100.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-icons_222222_256x240.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-icons_4b8e0b_256x240.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-icons_a83300_256x240.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-icons_cccccc_256x240.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/images/ui-icons_ffffff_256x240.png
XoopsModules/xoalbum/trunk/xoalbum/script/style/ui-darkness/jquery-ui-1.7.2.custom.css
XoopsModules/xoalbum/trunk/xoalbum/script/style/upload_bg.jpg
XoopsModules/xoalbum/trunk/xoalbum/script/swfupload/
XoopsModules/xoalbum/trunk/xoalbum/script/swfupload/handlers.js
XoopsModules/xoalbum/trunk/xoalbum/script/swfupload/swfupload.js
XoopsModules/xoalbum/trunk/xoalbum/script/swfupload/swfupload.swf
XoopsModules/xoalbum/trunk/xoalbum/script/swfupload/swfupload_f8.swf
XoopsModules/xoalbum/trunk/xoalbum/script/swfupload/swfuploadbutton.swf
XoopsModules/xoalbum/trunk/xoalbum/script/swfupload/upload_bg.jpg
XoopsModules/xoalbum/trunk/xoalbum/script/xoalbum.js
XoopsModules/xoalbum/trunk/xoalbum/sql/
XoopsModules/xoalbum/trunk/xoalbum/sql/index.html
XoopsModules/xoalbum/trunk/xoalbum/sql/mysql.default.category.sql
XoopsModules/xoalbum/trunk/xoalbum/sql/mysql.sql
XoopsModules/xoalbum/trunk/xoalbum/templates/
XoopsModules/xoalbum/trunk/xoalbum/templates/album_album.html
XoopsModules/xoalbum/trunk/xoalbum/templates/album_category.html
XoopsModules/xoalbum/trunk/xoalbum/templates/album_cp_album.html
XoopsModules/xoalbum/trunk/xoalbum/templates/album_cp_category.html
XoopsModules/xoalbum/trunk/xoalbum/templates/album_cp_index.html
XoopsModules/xoalbum/trunk/xoalbum/templates/album_cp_picture.html
XoopsModules/xoalbum/trunk/xoalbum/templates/album_detail.html
XoopsModules/xoalbum/trunk/xoalbum/templates/album_form.html
XoopsModules/xoalbum/trunk/xoalbum/templates/album_header.html
XoopsModules/xoalbum/trunk/xoalbum/templates/album_index.html
XoopsModules/xoalbum/trunk/xoalbum/templates/album_upload.html
XoopsModules/xoalbum/trunk/xoalbum/templates/blocks/
XoopsModules/xoalbum/trunk/xoalbum/templates/blocks/album_blocks_newpicture.html
XoopsModules/xoalbum/trunk/xoalbum/templates/blocks/index.html
XoopsModules/xoalbum/trunk/xoalbum/templates/index.html
XoopsModules/xoalbum/trunk/xoalbum/upload.php
XoopsModules/xoalbum/trunk/xoalbum/xoops_version.php
Added: XoopsModules/xoalbum/trunk/xoalbum/action.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/action.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/action.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,182 @@
+<?php
+/**
+ * XOOPS xoAlbum management module
+ * demo http://www.xoyoke.com/modules/xoalbum/
+ *
+ * @copyright The XOOPS project http://code.google.com/p/xoalbum/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 2.0.0
+ * @author Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+$xoopsLogger->activated = false;
+$ts = MyTextSanitizer::getInstance();
+$op = isset($_REQUEST["op"]) ? trim($_REQUEST["op"]) : "";
+$ac = isset($_POST["ac"]) ? trim($_POST["ac"]) : "";
+$redirect_url = isset($_POST["redirect_url"]) ? $ts->stripSlashesGPC($redirect_url) : "index.php";
+
+switch ($op){
+ case "grid":
+ $info = array();
+ if ( isset($_SERVER["HTTP_X_REQUESTED_WITH"]) &&
+ $_SERVER["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest" ) {
+
+ } else {
+ if (!$GLOBALS["xoopsSecurity"]->check()) {
+ redirect_header($redirect_url, 3, implode("<br />",
+ $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ }
+ if ( empty($xoopsUser) || !is_object($xoopsUser) ) {
+ $info[] = "需要登陆，才能使用这个功能!";
+ }
+ extract($_POST);
+ if ( !$x1 || !$y1 || !$x2 || !$y2 || !$w || !$h || !$grid_title || !$pic_id ) {
+ $info[] = "选择有误，请重新选择!";
+ }
+
+ if ( $info ) {
+ $ret = array("status"=>"100","message"=>implode("<br />", $info));
+ echo json_encode($ret);
+ exit;
+ }
+ $params = array(
+ "grid_title"=> $grid_title,
+ "grid_data"=> array("x1"=>$x1,"y1"=>$y1,"x2"=>$x2,"y2"=>$y2,"w"=>$w,"h"=>$h),
+ "uid"=>(int)$xoopsUser->uid(),
+ "pic_id"=>(int)$pic_id
+ );
+ $grid_handler = xoops_getmodulehandler("grid");
+ if ( $id = $grid_handler->setGrid($params) ) {
+ $ret = array("status"=>"200","message"=>"保存成功!");
+ echo json_encode($ret);
+ exit;
+ }
+ break;
+ case "album":
+ $album_handler = xoops_getmodulehandler("album");
+ $cat_handler = xoops_getmodulehandler("category");
+ $params = $_POST;
+ include(dirname(__FILE__)."/include/action.album.php");
+ if ( isset($_SERVER["HTTP_X_REQUESTED_WITH"]) &&
+ $_SERVER["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest" ) {
+ if ( $msg ) {
+ $str = implode("<br />", $msg);
+ $status = "100";
+ } else {
+ $str = _ALBUM_SUCCEED;
+ $status = "200";
+ }
+ $json = array("status"=>$status,"message"=>$str);
+ echo json_encode($json);
+ exit;
+ } else {
+ if ( $msg ) {
+ redirect_header($redirect_url, 3, implode("<br />", $msg));
+ }
+ redirect_header("album.php?albumId={$album_id}", 3, _ALBUM_SUCCEED);
+ }
+ break;
+ case "category":
+ include(dirname(__FILE__)."/include/action.category.php");
+ break;
+ case "picture":
+ $album_handler = xoops_getmodulehandler("album");
+ $picture_handler = xoops_getmodulehandler("picture");
+ switch ($ac) {
+ case "delete":
+ $album_id = isset($_POST["album_id"]) ? intval($_POST["album_id"]) : 0;
+ $pic_id = isset($_POST["pic_id"]) ? intval($_POST["pic_id"]) : 0;
+ $album_obj = $album_handler->get($album_id);
+ $info = array("status"=>"100");
+ if ( !is_object($album_obj) && $album_obj->uid() != $xoopsUser->uid() ) {
+ $info["message"] = _NOPERM;
+ }
+ if ( empty($info["message"]) ) {
+ $pic_obj = $picture_handler->get($pic_id);
+ if ( !is_object($pic_obj) ) {
+ $info["message"] = "图片不存在或是被删除!";
+ }
+ }
+ if ( $picture_handler->delete($pic_obj) ) {
+ $album_handler->updateAlbumTotal($album_id,-1);
+ $info["status"] = "200";
+ $info["picid"] = $pic_id;
+ $info["message"] = "图片删除成功!";
+ } else {
+ $info["message"] = "图片删除失败!";
+ }
+ if ( isset($_SERVER["HTTP_X_REQUESTED_WITH"]) &&
+ $_SERVER["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest" ) {
+ echo json_encode($info);
+ exit;
+ } else {
+ if ( $info["status"] == "200" ) {
+ redirect_header($redirect_url, 3, implode("<br />", $info["message"]));
+ }
+ redirect_header("album.php?albumId={$album_id}", 3, _ALBUM_SUCCEED);
+ }
+ break;
+ case "edit":
+ $err = xoAlbum::checkSubmitFields("picture",$_POST,false);
+ $info = array();
+ if ( true === $err ) {
+ if ( $picture_handler->setPicture($_POST) ) {
+ $info["status"] = "200";
+ $info["message"] = "图片编辑成功!";
+ } else {
+ $info["status"] = "300";
+ $info["message"] = "图片编辑失败!";
+ }
+ } else {
+ $info["status"] = "100";
+ $info["message"] = $err;
+ }
+ if ( isset($_SERVER["HTTP_X_REQUESTED_WITH"]) &&
+ $_SERVER["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest" ) {
+ echo json_encode($info);
+ exit;
+ } else {
+ if ( $info["status"] == "200" ) {
+ redirect_header($redirect_url, 3, implode("<br />", $info["message"]));
+ }
+ redirect_header("album.php?albumId={$album_id}", 3, _ALBUM_SUCCEED);
+ }
+ break;
+ default:
+ die("no params");
+ }
+ break;
+
+ case "upload":
+ $album_handler = xoops_getmodulehandler("album");
+ $picture_handler = xoops_getmodulehandler("picture");
+ if (isset($_POST["PHPSESSID"])) {
+ session_id($_POST["PHPSESSID"]);
+ }
+ session_start();
+
+ $album_id = isset($_POST["albumId"]) ? intval($_POST["albumId"]) : 0;
+ $uid = isset($_POST["uid"]) ? intval($_POST["uid"]) : 0;
+ $sign = isset($_POST["sign"]) ? $_POST["sign"] : 0;
+ $sess_id = isset($_POST["PHPSESSID"]) ? $_POST["PHPSESSID"] : 0;
+ // prem error
+ $str = $album_id.$uid.$sess_id;
+ $error = array();
+
+ if ( false == xoAlbum::checkSign($str,$sign) ) {
+ $error[] = "签名错误";
+ }
+ $album_obj = $album_handler->get($album_id);
+
+ if ( !is_object($album_obj) || $album_obj->isNew() ||
+ $album_obj->uid() != $uid ) {
+ $error[] = "抱歉，这个相册不是您的";
+ }
+ include(dirname(__FILE__)."/include/action.picture.php");
+ break;
+ default:
+ die("no params");
+}
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/action.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/xoalbum/trunk/xoalbum/admin/action.album.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/admin/action.album.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/admin/action.album.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,56 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+$op = isset($_POST["op"]) ? trim($_POST["op"]) : "";
+$ac = isset($_POST["ac"]) ? trim($_POST["ac"]) : "";
+
+$album_handler = xoops_getmodulehandler("album");
+
+switch ($op) {
+ case "album":
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header("category.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ $cat_id = isset($_POST["cat_id"]) ? intval($_POST["cat_id"]) : 0;
+ $album_name = isset($_POST["album_name"]) ? trim($_POST["album_name"]) : "";
+ $album_desc = isset($_POST["album_desc"]) ? trim($_POST["album_desc"]) : "";
+ $album_state = isset($_POST["album_state"]) ? intval($_POST["album_state"]) : 0;
+ if ( empty($cat_id) || empty($album_name) ) {
+ redirect_header("album.php", 5, _AM_ERROR_FORM_ALBUM);
+ }
+ switch ($ac) {
+ case "edit":
+ $album_id = isset($_POST["album_id"]) ? trim($_POST["album_id"]) : 0;
+ if ( $album_id = $album_handler->setAlbum($album_id, $cat_id, $xoopsUser->getVar("uid"), $album_name, $album_desc, $album_state) ) {
+ redirect_header("album.php", 5, _AM_SUCCEED);
+ }
+ redirect_header("album.php", 5, _AM_FAILED);
+ break;
+
+ default:
+ case "create":
+ $album_id = 0;
+ if ( $album_id = $album_handler->setAlbum($album_id, $cat_id, $xoopsUser->getVar("uid"), $album_name, $album_desc, $album_state) ) {
+ $cat_handler = xoops_getmodulehandler("category");
+ $cat_handler->setCatAmount($cat_id,1);
+ redirect_header("album.php", 5, _AM_SUCCEED);
+ }
+ redirect_header("album.php", 5, _AM_FAILED);
+ break;
+ }
+ break;
+
+ default:
+ redirect_header("index.php");
+ break;
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/admin/action.album.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/xoalbum/trunk/xoalbum/admin/action.category.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/admin/action.category.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/admin/action.category.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,61 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+$op = isset($_REQUEST["op"]) ? trim($_REQUEST["op"]) : "";
+$ac = isset($_REQUEST["ac"]) ? trim($_REQUEST["ac"]) : "";
+$cat_handler = xoops_getmodulehandler("category");
+$cat_id = isset($_REQUEST["cat_id"]) ? intval($_REQUEST["cat_id"]) : "";
+switch ($op) {
+ case "delete":
+ $obj = $cat_handler->get($cat_id);
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+ if($cat_handler->delCategory($cat_id)) {
+ redirect_header('category.php', 3, _AM_ABOUT_DELETESUCCESS);
+ }else{
+ echo $obj->getHtmlErrors();
+ }
+ }else{
+ xoops_confirm(array('ok' => 1, 'id' => $obj->getVar('cat_id'), 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_RUSUREDEL, $obj->getVar('car_name')));
+ }
+ break;
+ case "category":
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header("category.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ $cat_name = isset($_POST["cat_name"]) ? trim($_POST["cat_name"]) : "";
+ $cat_order = isset($_POST["cat_order"]) ? intval($_POST["cat_order"]) : 0;
+ if ( empty($cat_name) ) {
+ redirect_header("category.php", 5, _AM_ERROR_NOCATNAME);
+ }
+ switch ($ac) {
+ case "edit":
+ $cat_id = isset($_POST["cat_id"]) ? trim($_POST["cat_id"]) : 0;
+ if ( $cat_handler->setCategory($cat_id, $cat_name, $cat_order) ) {
+ redirect_header("category.php", 5, _AM_SUCCEED);
+ }
+ redirect_header("category.php", 5, _AM_FAILED);
+ break;
+
+ default:
+ case "create":
+ $cat_id = 0;
+ if ( $cat_handler->setCategory($cat_id, $cat_name, $cat_order) ) {
+ redirect_header("category.php", 5, _AM_SUCCEED);
+ }
+ redirect_header("category.php", 5, _AM_FAILED);
+ break;
+ }
+ break;
+
+
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/admin/action.category.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/xoalbum/trunk/xoalbum/admin/action.picture.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/admin/action.picture.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/admin/action.picture.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,52 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+$op = isset($_POST["op"]) ? trim($_POST["op"]) : "";
+$ac = isset($_POST["ac"]) ? trim($_POST["ac"]) : "";
+$album_handler = xoops_getmodulehandler("album");
+switch ($op) {
+ case "album":
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header("category.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ $cat_id = isset($_POST["cat_id"]) ? intval($_POST["cat_id"]) : 0;
+ $album_name = isset($_POST["album_name"]) ? trim($_POST["album_name"]) : "";
+ $album_desc = isset($_POST["album_desc"]) ? trim($_POST["album_desc"]) : "";
+ $album_state = isset($_POST["album_state"]) ? intval($_POST["album_state"]) : 0;
+ if ( empty($cat_id) || empty($album_name) ) {
+ redirect_header("album.php", 5, _AM_ERROR_FORM_ALBUM);
+ }
+ switch ($ac) {
+ case "edit":
+ $album_id = isset($_POST["album_id"]) ? trim($_POST["album_id"]) : 0;
+ if ( $album_id = $album_handler->setAlbum($album_id, $cat_id, $xoopsUser->getVar("uid"), $album_name, $album_desc, $album_state) ) {
+ redirect_header("album.php", 5, _AM_SUCCEED);
+ }
+ redirect_header("album.php", 5, _AM_FAILED);
+ break;
+
+ default:
+ case "create":
+ $album_id = 0;
+ if ( $album_id = $album_handler->setAlbum($album_id, $cat_id, $xoopsUser->getVar("uid"), $album_name, $album_desc, $album_state) ) {
+ redirect_header("album.php", 5, _AM_SUCCEED);
+ }
+ redirect_header("album.php", 5, _AM_FAILED);
+ break;
+ }
+ break;
+
+ default:
+ redirect_header("index.php");
+ break;
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/admin/action.picture.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/xoalbum/trunk/xoalbum/admin/album.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/admin/album.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/admin/album.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,40 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+loadModuleAdminMenu(2, "");
+$start = isset($_GET["start"]) ? intval($_GET["start"]) : 0;
+$album_id = isset($_GET["albumId"]) ? intval($_GET["albumId"]) : 0;
+$cat_id = isset($_GET["catId"]) ? intval($_GET["catId"]) : 0;
+$limit = 10;
+
+$album_handler = xoops_getmodulehandler("album");
+$list = $album_handler->getAlbumList( $cat_id, 0, 0, $start, $limit);
+
+if ( !empty($album_id) ) {
+ $album_obj = $album_handler->get($album_id);
+}
+if ( empty($album_obj) || !is_object($album_obj) ) {
+ $album_obj = $album_handler->get();
+}
+$isNew = $album_obj->isNew();
+$album_rows = $album_obj->getValues();
+
+$cat_handler = xoops_getmodulehandler("category");
+$_cat_list = $cat_handler->getCatSelect(1);
+$formurl = "action.album.php";
+include_once(dirname(__FILE__)."../../include/form.album.php");
+
+$xoopsTpl->assign("categories",$_cat_list);
+$xoopsTpl->assign(array("albums"=>$list["list"],"pagenav"=>$list["pagenav"]));
+$xoopsTpl->display("db:album_cp_album.html");
+include "footer.php";
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/admin/album.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/xoalbum/trunk/xoalbum/admin/category.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/admin/category.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/admin/category.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,28 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+loadModuleAdminMenu(1, "");
+$cat_handler = xoops_getmodulehandler("category");
+$cat_id = isset($_GET["cat_id"]) ? intval($_GET["cat_id"]) : 0;
+if ( !empty($cat_id) ) {
+ $cat_obj = $cat_handler->get($cat_id);
+}
+if ( empty($cat_obj) || !is_object($cat_obj) ) {
+ $cat_obj = $cat_handler->get();
+}
+$isNew = $cat_obj->isNew();
+$cat_rows = $cat_obj->getValues();
+include_once(dirname(__FILE__)."../../include/form.category.php");
+$xoopsTpl->assign("categories",$cat_handler->getCatList());
+$xoopsTpl->display("db:album_cp_category.html");
+include "footer.php";
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/admin/category.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/xoalbum/trunk/xoalbum/admin/comments.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/admin/comments.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/admin/comments.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,22 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+loadModuleAdminMenu(3, "");
+$start = isset($_GET["start"]) ? intval($_GET["start"]) : 0;
+$pic_id = isset($_GET["picId"]) ? intval($_GET["picId"]) : 0;
+$limit = 20;
+$comment_handler = xoops_getmodulehandler("comment");
+$list = $comment_handler->getCommentsList($pic_id, 0, $start, $limit);
+$xoopsTpl->assign(array("pagenav"=>$list["pagenav"],"comments"=>$list["list"]));
+$xoopsTpl->display("db:album_cp_comments.html");
+include "footer.php";
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/admin/comments.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/xoalbum/trunk/xoalbum/admin/footer.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/admin/footer.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/admin/footer.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,14 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+
+xoops_cp_footer();
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/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/xoalbum/trunk/xoalbum/admin/header.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/admin/header.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/admin/header.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,85 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @author Susheng yang <ezs...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include '../../../include/cp_header.php';
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once XOOPS_ROOT_PATH . "/class/template.php";
+ $xoopsTpl = new XoopsTpl();
+}
+
+IF (!@ include_once XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php"):
+
+
+function loadModuleAdminMenu($currentoption, $breadcrumb = "")
+{
+ if (!$adminmenu = $GLOBALS["xoopsModule"]->getAdminMenu()) {
+ return false;
+ }
+
+ $breadcrumb = empty($breadcrumb) ? $adminmenu[$currentoption]["title"] : $breadcrumb;
+ $module_link = XOOPS_URL . "/modules/" . $GLOBALS["xoopsModule"]->getVar("dirname") . "/";
+ $image_link = XOOPS_URL . "/modules/" . $GLOBALS["xoopsModule"]->getVar("dirname") . "/images";
+
+ $adminmenu_text ='
+ <style type="text/css">
+ <!--
+ #buttontop { float:left; width:100%; background: #e7e7e7; font-size:93%; line-height:normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0;}
+ #buttonbar { float:left; width:100%; background: #e7e7e7 url("'.$image_link.'/modadminbg.gif") repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px;}
+ #buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; }
+ #buttonbar li { display:inline; margin:0; padding:0; }
+ #buttonbar a { float:left; background:url("'.$image_link.'/left_both.gif") no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; }
+ #buttonbar a span { float:left; display:block; background:url("'.$image_link.'/right_both.gif") no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; }
+ /* Commented Backslash Hack hides rule from IE5-Mac \*/
+ #buttonbar a span {float:none;}
+ /* End IE5-Mac hack */
+ #buttonbar a:hover span { color:#333; }
+ #buttonbar .current a { background-position:0 -150px; border-width:0; }
+ #buttonbar .current a span { background-position:100% -150px; padding-bottom:5px; color:#333; }
+ #buttonbar a:hover { background-position:0% -150px; }
+ #buttonbar a:hover span { background-position:100% -150px; }
+ //-->
+ </style>
+ <div id="buttontop">
+ <table style="width: 100%; padding: 0; " cellspacing="0">
+ <tr>
+ <td style="width: 70%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;">
+ <a href="../index.php">' . $GLOBALS["xoopsModule"]->getVar("name") . '</a>
+ </td>
+ <td style="width: 30%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;">
+ <strong>' . $GLOBALS["xoopsModule"]->getVar("name") . '</strong> ' . $breadcrumb . '
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div id="buttonbar">
+ <ul>
+ ';
+ foreach (array_keys($adminmenu) as $key) {
+ $adminmenu_text .= (($currentoption == $key) ? '<li class="current">' : '<li>') . '<a href="' . $module_link . $adminmenu[$key]["link"] . '"><span>' . $adminmenu[$key]["title"] . '</span></a></li>';
+ }
+ $adminmenu_text .= '<li><a href="' . XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $GLOBALS["xoopsModule"]->getVar("mid") . '"><span>' . _PREFERENCES . '</span></a></li>';
+ $adminmenu_text .= '
+ </ul>
+ </div>
+ <br style="clear:both;" />';
+
+ echo $adminmenu_text;
+}
+
+ENDIF;
+xoops_cp_header();
+
+$xoopsOption['xoops_module_header'] = '<script type="text/javascript" src="../include/jquery/jquery-1.2.3.js"></script>';
+$xoopsOption['xoops_module_header'] = '<script type="text/javascript" src="../include/jquery/jquery.form.js"></script>';
+include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/admin/header.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/xoalbum/trunk/xoalbum/admin/index.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/admin/index.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/admin/index.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,25 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+loadModuleAdminMenu(0, "");
+$cat_handler = xoops_getmodulehandler("category");
+$album_handler = xoops_getmodulehandler("album");
+$picture_handler = xoops_getmodulehandler("picture");
+// get new pictures
+$new_pictures = $picture_handler->getPictureNew(20);
+// get category list
+$categories = $cat_handler->getCatList();
+$xoopsTpl->assign("categories",$categories);
+$xoopsTpl->assign("new_pictures",$new_pictures);
+$xoopsTpl->display("db:album_cp_index.html");
+include "footer.php";
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/admin/index.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/xoalbum/trunk/xoalbum/admin/menu.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/admin/menu.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/admin/menu.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,29 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+$adminmenu = array();
+$adminmenu[] = array(
+ 'title' => _AM_HOME,
+ 'link' => 'admin/index.php'
+);
+$adminmenu[] = array(
+ 'title' => _AM_CATEGORY,
+ 'link' => 'admin/category.php'
+);
+$adminmenu[] = array(
+ 'title' => _AM_ALBUM,
+ 'link' => 'admin/album.php'
+);
+$adminmenu[] = array(
+ 'title' => _AM_COMMENTS,
+ 'link' => 'admin/comments.php'
+);
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/admin/menu.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/xoalbum/trunk/xoalbum/admin/picture.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/admin/picture.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/admin/picture.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,39 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+$start = isset($_GET["start"]) ? intval($_GET["start"]) : 0;
+$album_id = isset($_GET["albumId"]) ? intval($_GET["albumId"]) : 0;
+if ( empty($album_id) ) redirect_header("album.php");
+$limit = 10;
+
+$picture_handler = xoops_getmodulehandler("picture");
+$album_handler = xoops_getmodulehandler("album");
+
+$album_obj = $album_handler->get($album_id);
+$album = $album_obj->getValues();
+$album["album_dateline"] = formatTimestamp($album["album_dateline"]);
+$cat_handler = xoops_getmodulehandler("category");
+$cat_obj = $cat_handler->get($album_obj->getVar("cat_id"));
+$album["cat_name"] = $cat_obj->getVar("cat_name","n");
+$album["state"] = $album_obj->getVar("album_state") ? _AM_ALBUM_STATE1 : _AM_ALBUM_STATE0 ;
+$album["cover"] = !empty($album["album_cover"]) ? "<img src=\"".XOOPS_UPLOAD_URL."/{$album["album_cover"]}\" alt=\"\" />" : "<img src=\"".XOOPS_UPLOAD_URL."/album.gif\" alt=\"\" />" ;
+
+$list = $picture_handler->getPictureList($album_id, $start, $limit );
+$albums = $album_handler->getOtherAlbums($album_id);
+
+$cat_handler = xoops_getmodulehandler("category");
+$_cat_list = $cat_handler->getCatSelect();
+
+$xoopsTpl->assign(array("pictures"=>$list["list"],"pagenav"=>$list["pagenav"],"album"=>$album,"albums"=>$albums,"categories"=>$_cat_list));
+$xoopsTpl->display("db:album_cp_picture.html");
+include "footer.php";
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/admin/picture.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/xoalbum/trunk/xoalbum/ajax.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/ajax.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/ajax.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,130 @@
+<?php
+/**
+ * XOOPS xoAlbum management module
+ * demo http://www.xoyoke.com/modules/xoalbum/
+ *
+ * @copyright The XOOPS project http://code.google.com/p/xoalbum/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 2.0.0
+ * @author Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+include XOOPS_ROOT_PATH."/class/template.php";
+$xoopsLogger->activated = false;
+$op = isset($_REQUEST["op"]) ? trim($_REQUEST["op"]) : "";
+$ac = isset($_REQUEST["ac"]) ? trim($_REQUEST["ac"]) : "";
+if ( empty($xoopsUser) || !is_object($xoopsUser) ) {
+ echo _NOPERM;
+ exit;
+}
+switch ($op){
+ case "album":
+ $xoopsTpl = new XoopsTpl();
+ xoops_loadLanguage("admin","xoalbum");
+ $album_handler = xoops_getmodulehandler("album");
+ $cat_handler = xoops_getmodulehandler("category");
+ switch ($ac){
+ case "delete":
+ $album_id = isset($_GET["albumId"]) ? intval($_GET["albumId"]) : 0;
+ $album_obj = $album_handler->get($album_id);
+ if ( !is_object($album_obj) && $album_obj->uid() != $xoopsUser->uid() ) {
+ echo _NOPERM;
+ exit();
+ }
+ $form = new XoopsForm("", "form", "action.php", "post",true);
+ $form->addElement( new XoopsFormLabel("","确定删除 [{$album_obj->name()}] 这个相册 !"));
+ $form->addElement( new XoopsFormHidden("album_id",$album_id));
+ $form->addElement( new XoopsFormHidden("op","album"));
+ $form->addElement( new XoopsFormHidden("ac","delete"));
+ if ( isset($_SERVER["HTTP_X_REQUESTED_WITH"]) &&
+ $_SERVER["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest" ) {
+ } else {
+ $form->addElement( new XoopsFormButton("","submit",_DELETE,"submit"));
+ }
+ $form->assign($xoopsTpl);
+ break;
+ case "edit":
+ case "create":
+ $album_id = isset($_GET["albumId"]) ? intval($_GET["albumId"]) : 0;
+ $album_obj = empty($album_id) ? $album_handler->get() : $album_handler->get($album_id);
+ if ( !is_object($album_obj) ) {
+ echo _NOPERM;
+ exit();
+ }
+ $isnew = $album_obj->isNew();
+ $album = $album_obj->getValues();
+ $categories = $cat_handler->getCatList();
+
+ $formurl = "action.php";
+ include(dirname(__FILE__)."/include/form.album.php");
+ break;
+ default:
+ echo "not params";
+ }
+ $xoopsTpl->display("db:album_form.html");
+ break;
+ case "category":
+ include(dirname(__FILE__)."/include/ajax.category.php");
+ break;
+ case "picture":
+ $xoopsTpl = new XoopsTpl();
+ $album_handler = xoops_getmodulehandler("album");
+ $picture_handler = xoops_getmodulehandler("picture");
+ $album_id = isset($_GET["albumId"]) ? intval($_GET["albumId"]) : 0;
+ $pic_id = isset($_GET["picId"]) ? intval($_GET["picId"]) : 0;
+ $album_obj = $album_handler->get($album_id);
+ if ( !is_object($album_obj) && $album_obj->uid() != $xoopsUser->uid() ) {
+ echo _NOPERM;
+ exit();
+ }
+ switch ($ac){
+ case "delete":
+ $pic_obj = $picture_handler->get($pic_id);
+ if ( !is_object($pic_obj) || $pic_obj->isNew() ) {
+ echo "不存在的图片";
+ exit();
+ }
+ $form = new XoopsForm("", "form", "action.php", "post",true);
+ $form->addElement( new XoopsFormLabel("","确定删除 [{$pic_obj->name()}] 这张图片 !"));
+ $form->addElement( new XoopsFormHidden("pic_id",$pic_id));
+ $form->addElement( new XoopsFormHidden("album_id",$album_id));
+ $form->addElement( new XoopsFormHidden("op","picture"));
+ $form->addElement( new XoopsFormHidden("ac","delete"));
+ if ( isset($_SERVER["HTTP_X_REQUESTED_WITH"]) &&
+ $_SERVER["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest" ) {
+ } else {
+ $form->addElement( new XoopsFormButton("","submit",_DELETE,"submit"));
+ }
+ $form->assign($xoopsTpl);
+ break;
+ case "edit":
+ $pic_obj = $picture_handler->get($pic_id);
+ if ( !is_object($pic_obj) ) {
+ echo "不存在的图片";
+ exit();
+ }
+ $form = new XoopsForm("", "form", "action.php", "post",true);
+ $form->addElement( new XoopsFormText("名称","pic_name",24,32,$pic_obj->name()));
+ $form->addElement( new XoopsFormTextArea("描述","pic_desc",$pic_obj->getVar("pic_desc"),4,32));
+ $form->addElement( new XoopsFormHidden("pic_id",$pic_id));
+ $form->addElement( new XoopsFormHidden("album_id",$album_id));
+ $form->addElement( new XoopsFormHidden("op","picture"));
+ $form->addElement( new XoopsFormHidden("ac","edit"));
+ if ( isset($_SERVER["HTTP_X_REQUESTED_WITH"]) &&
+ $_SERVER["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest" ) {
+ } else {
+ $form->addElement( new XoopsFormButton("","submit",_DELETE,"submit"));
+ }
+ $form->assign($xoopsTpl);
+ break;
+ default:
+ echo "no params";
+ }
+ $xoopsTpl->display("db:album_form.html");
+// include(dirname(__FILE__)."/include/ajax.picture.php");
+ break;
+ default:
+ die("no params");
+}
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/ajax.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/xoalbum/trunk/xoalbum/album.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/album.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/album.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,206 @@
+<?php
+/**
+ * XOOPS xoAlbum management module
+ * demo http://www.xoyoke.com/modules/xoalbum/
+ *
+ * @copyright The XOOPS project http://code.google.com/p/xoalbum/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 2.0.0
+ * @author Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+
+$album_id = isset($_GET["albumId"]) ? intval($_GET["albumId"]) : 0;
+$pic_id = isset($_GET["picId"]) ? intval($_GET["picId"]) : 0;
+$start = isset($_GET["start"]) ? intval($_GET["start"]) : 0;
+
+$album_handler = xoops_getmodulehandler("album");
+$picture_handler = xoops_getmodulehandler("picture");
+$cat_handler = xoops_getmodulehandler("category");
+
+$album_obj = $album_handler->get($album_id);
+if ( empty($album_obj) || $album_obj->isNew() ) {
+ redirect_header("category.php",5,"抱歉，您访问的相册不存在或是被删除!");
+}
+$accessperm = true;
+if ( false == $album_obj->accessPerm() ) {
+ if ( !empty($pic_id) ) {
+ redirect_header("index.php",5,_ALBUM_NOPERM_ACCESS);
+ }
+ $accessperm = false;
+}
+
+$album = $album_obj->getValues();
+$album["album_dateline"] = $album_obj->dateline();
+$album["cat_name"] = $cat_handler->get($album_obj->getVar("cat_id"))->name();
+$album["cover"] = $album_obj->coverurl();
+
+$modulenav[] = array(
+ "navlink"=>"category.php?catId=".$album_obj->getVar("cat_id"),
+ "navtitle"=>$album["cat_name"]
+);
+
+$modulenav[] = array(
+ "navlink"=>"album.php?albumId={$album_id}",
+ "navtitle"=>$album_obj->name()
+);
+
+$xoopsOption["xoops_pagetitle"] = _ALBUM_NAME ." - {$album["cat_name"]} - {$album_obj->name()}";
+$xoopsOption["template_main"] = "album_album.html";
+include_once XOOPS_ROOT_PATH."/header.php";
+
+$extra = "albumId={$album_id}";
+$limit = 30;
+$pagenav = "";
+$op = false;
+if ( !empty($pic_id) ) {
+ $pic_obj = $picture_handler->get($pic_id);
+ if ( empty($pic_obj) || $pic_obj->isNew()
+ || $pic_obj->getVar("album_id") != $album_id ) {
+ redirect_header("album.php?albumId={$album_id}",_NOPERM);
+ }
+ $op = true;
+ $picture = array();
+ $grid_handler = xoops_getmodulehandler("grid");
+ if ( $pic_obj ) {
+ $picture = $pic_obj->getValues();
+ $picture["pic_dateline"] = $pic_obj->dateline();
+ $picture["pic_size"] = $pic_obj->size();
+ $picture["picture"] = $pic_obj->thumburl(1);
+ $picture["grids"] = $grid_handler->getGridList($pic_id);
+ }
+// $limit = 8;
+// $start = $picture_handler->getInPageStart($pic_id,$album_id,$limit);
+ $limit = 120;
+ $start = 0;
+ include(dirname(__FILE__)."/include/form.grid.php");
+ $xoopsTpl->assign(array(
+ "picture"=>$picture,
+ ));
+}
+
+$params = array(
+ "criteria" => array(
+ "album_id" => $album_id
+ ),
+ "fields"=> array("album_id","pic_name","pic_thumbsecond"),
+ "start" => $start,
+ "limit" => $limit,
+ "sort" => "pic_dateline",
+ "order" => "DESC",
+ "extra" => $extra
+);
+
+if ( empty($pic_id) ) {
+ $pagenav = $picture_handler->getPageNav($params);
+}
+$pic_objs = $picture_handler->getPictures($params);
+$pictures = array();
+if ( $pic_objs ) {
+ foreach ( $pic_objs as $k=>$obj ) {
+ $pictures[$k] = $obj->getValues();
+ $pictures[$k]["pic_dateline"] = $obj->dateline();
+ $pictures[$k]["pic_size"] = $obj->size();
+ $pictures[$k]["thumb"] = $obj->thumb(2);
+ }
+ $form = new XoopsForm("", "coverfrm", "action.php", "post",true);
+ $form->addElement( new XoopsFormHidden("op","album"));
+ $form->addElement( new XoopsFormHidden("ac","cover"));
+ $form->addElement( new XoopsFormHidden("album_id",$album_id));
+ $form->assign($xoopsTpl);
+}
+
+$albums_cat = $albums_user = array();
+if ( empty($pic_id) ) {
+ unset($params);
+ // 同分类相册
+ $params = array(
+ "criteria" => array(
+ "cat_id" => $album_obj->getVar("cat_id")
+ ),
+ "fields"=> array("album_name","album_total","album_status","album_cover"),
+ "limit" => 10,
+ "sort" => "album_total",
+ "order" => "DESC"
+ );
+ $album_cat_objs = $album_handler->getAlbums($params);
+ if ( isset($album_cat_objs[$album_id]) ) {
+ unset($album_cat_objs[$album_id]);
+ }
+ if ( $album_cat_objs ) {
+ foreach ( $album_cat_objs as $k=>$obj ) {
+ $albums_cat[$k]["album_id"] = $obj->id();
+ $albums_cat[$k]["album_name"] = $obj->name();
+ $albums_cat[$k]["album_cover"] = $obj->cover();
+ $albums_cat[$k]["album_status"] = $obj->state();
+ $albums_cat[$k]["album_total"] = $obj->getVar("album_total");
+ }
+
+ }
+ unset($params);
+ // 同分类相册
+ $params = array(
+ "criteria" => array(
+ "uid" => $album_obj->uid()
+ ),
+ "fields"=> array("album_name","album_total","album_status","album_cover"),
+ "limit" => 10,
+ "sort" => "album_total",
+ "order" => "DESC"
+ );
+ $album_user_objs = $album_handler->getAlbums($params);
+ if ( isset($album_user_objs[$album_id]) ) {
+ unset($album_user_objs[$album_id]);
+ }
+ if ( $album_user_objs ) {
+ foreach ( $album_user_objs as $k=>$obj ) {
+ $albums_user[$k]["album_id"] = $obj->id();
+ $albums_user[$k]["album_name"] = $obj->name();
+ $albums_user[$k]["album_cover"] = $obj->cover();
+ $albums_user[$k]["album_status"] = $obj->state();
+ $albums_user[$k]["album_total"] = $obj->getVar("album_total");
+ }
+ }
+}
+
+$my_albums = array();
+if ( is_object($xoopsUser) ) {
+ $params = array(
+ "criteria" => array(
+ "uid" => (int)$xoopsUser->uid()
+ ),
+ "fields"=>array("album_name","album_total","album_cover"),
+ "limit" => 10,
+ "sort" => "album_dateline",
+ "order" => "DESC"
+ );
+ $album_my_objs = $album_handler->getAlbums($params);
+ if ( $album_my_objs ) {
+ foreach ( $album_my_objs as $k=>$obj ) {
+ $my_albums[$k]["album_name"] = $obj->name();
+ $my_albums[$k]["album_total"] = $obj->getVar('album_total');
+ $my_albums[$k]["cover"] = $obj->cover();
+ $my_albums[$k]["album_id"] = $obj->id();
+ }
+ }
+}
+
+// smarty values
+$xoopsTpl->assign(array(
+ "op"=>$op,
+ "album"=>$album,
+ "albums_cat"=>$albums_cat,
+ "albums_user"=>$albums_user,
+ "modulenav"=>$modulenav,
+ "pictures"=>$pictures,
+ "my_albums"=>$my_albums,
+ "accessperm"=>$accessperm,
+ "pagenav"=>$pagenav
+));
+
+// loads page must js and css
+xoAlbum::addModConf($script_arg);
+include "footer.php";
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/album.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/xoalbum/trunk/xoalbum/blocks/block.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/blocks/block.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/blocks/block.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * XOOPS photo 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 Xiao Hui <xh...@gm...>
+ * @author Susheng Yang <ezs...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+if (false === defined("XOOPS_ROOT_PATH")) {exit();}
+
+function album_block_newpicture_show($options) {
+ // get new pictures
+$picture_handler = xoops_getmodulehandler("picture",'xoalbum');
+$block = $new_pictures = $picture_handler->getPictureNew($options[0]);
+return $block;
+}
+
+function album_block_newpicture_edit($options) {
+ $form = ALBUM_MI_BLOCK_NEWPICTURE_NUM . ": <input type=\"text\" name=\"options[0]\" value=\"" . $options[0] . "\" />";
+ return $form;
+}
+?>
\ No newline at end of file
Property changes on: XoopsModules/xoalbum/trunk/xoalbum/blocks/block.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/xoalbum/trunk/xoalbum/blocks/index.html
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/blocks/index.html (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/blocks/index.html 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xoalbum/trunk/xoalbum/category.php
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/category.php (rev 0)
+++ XoopsModules/xoalbum/trunk/xoalbum/category.php 2014-04-15 09:16:07 UTC (rev 12448)
@@ -0,0 +1,156 @@
+<?php
+/**
+ * XOOPS xoAlbum management module
+ * demo http://www.xoyoke.com/modules/xoalbum/
+ *
+ * @copyright The XOOPS project http://code.google.com/p/xoalbum/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @since 2.0.0
+ * @author Xiao Hui <xh...@gm...>
+ * @version $Id$
+ * @package xoAlbum
+ */
+include "header.php";
+/**
+ * 初使化请求的参数
+ */
+$cat_id = isset($_GET["catId"]) ? intval($_GET["catId"]) : 0;
+$uid = isset($_GET["uid"]) ? intval($_GET["uid"]) : 0;
+$start = isset($_GET["start"]) ? intval($_GET["start"]) : 0;
+$extra = "";
+
+/**
+ * 加载页面所需要的类文件
...
[truncated message content] |
|
From: <be...@us...> - 2014-04-15 08:32:10
|
Revision: 12447
http://sourceforge.net/p/xoops/svn/12447
Author: beckmi
Date: 2014-04-15 08:31:59 +0000 (Tue, 15 Apr 2014)
Log Message:
-----------
See changelog for changes
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/import.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/breadcrumb.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/img_uploader.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/ip_log.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/modification.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/multicolumnsthemeform.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/object.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/rating.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/report.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/request.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/session.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/tree.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/xoopstree.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/comment_functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/common.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/constants.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/directorychecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/filechecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/functions.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/module.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/blocks.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/directorychecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/filechecker.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help3.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help4.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help5.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/help6.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/install.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/help/tips_tricks.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/mirror.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/newlist.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/ratefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/review.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/rss.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/singlefile.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_brokenfile.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_disclaimer.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_download.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_mirrors.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_newlistindex.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_reviews.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_singlefile.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_topten.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_viewcat.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/topten.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/viewcat.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/visit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/module.css
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/VeraBd.ttf
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/blank.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/brokenimg.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/blank.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/blank.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/down.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/approve.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/arrow.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/close12.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/delete.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/disabled.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/down.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/download.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/download1.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/download2.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/download3.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/download4.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/downloads.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/downloads02.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/downloads03.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/edit.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/forum.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/ignore.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/ignore.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/link.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/newred.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/off.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/on.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/open12.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/pop.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate0.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate1.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate2.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate3.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate4.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rate5.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/reviews.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/rss.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/statistics.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/update.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon/world_link.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon32/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon32/database_go.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon32/editcopy.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/icon32/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/loadingAnimation.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/logo-en.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/logo.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/module_logo.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/blank.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/thumbs/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/thumbs/blank.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/screenshots/thumbs/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/size2.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/up.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/index.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/magnific/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/magnific/jquery.magnific-popup.min.js
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/magnific/magnific-popup.css
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/README.md
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/DO NOT CHANGE THESE FILES. USE -src- FOLDER.txt
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/background.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/bigplay.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/bigplay.svg
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/controls-ted.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/controls-wmp-bg.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/controls-wmp.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/controls.png
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/controls.svg
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/flashmediaelement-cdn.swf
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/flashmediaelement.swf
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/loading.gif
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/mediaelement-and-player.min.js
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/mediaelement.min.js
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/mediaelementplayer.min.css
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/mediaelementplayer.min.js
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/mejs-skins.css
XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/js/mediaelement/build/silverlightmediaelement.xap
XoopsModules/wfdownloads/branches/mamba/wfdownloads/index.html
Removed Paths:
-------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/uploader.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/images/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/js/
XoopsModules/wfdownloads/branches/mamba/wfdownloads/module.css
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -73,10 +73,10 @@
case "addCat" :
$cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$pid = WfdownloadsRequest::getInt('pid', 0, 'POST');
- $weight = (isset($_POST["weight"]) && $_POST["weight"] > 0) ? (int)$_POST["weight"] : 0;
+ $weight = (isset($_POST["weight"]) && $_POST["weight"] > 0) ? (int) $_POST["weight"] : 0;
$down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
$up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
- $spotlighthis = (isset($_POST["lid"])) ? (int)$_POST["lid"] : 0;
+ $spotlighthis = (isset($_POST["lid"])) ? (int) $_POST["lid"] : 0;
$spotlighttop = (isset($_POST["spotlighttop"]) && ($_POST["spotlighttop"] == 1)) ? 1 : 0;
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
@@ -100,7 +100,7 @@
}
// Formulize module support (2006/05/04) jpc
if (wfdownloads_checkModule('formulize') < 300) {
- $formulize_fid = (isset($_POST["formulize_fid"])) ? (int)$_POST["formulize_fid"] : 0;
+ $formulize_fid = (isset($_POST["formulize_fid"])) ? (int) $_POST["formulize_fid"] : 0;
}
if (!$cid) {
@@ -136,7 +136,7 @@
}
if (!$cid) {
if ($cid == 0) {
- $newid = (int)$category->getVar('cid');
+ $newid = (int) $category->getVar('cid');
}
wfdownloads_savePermissions($down_groups, $newid, 'WFDownCatPerm');
wfdownloads_savePermissions($up_groups, $newid, 'WFUpCatPerm');
@@ -164,7 +164,7 @@
if ($ok == true) {
// get all subcategories under the specified category
$arr = $mytree -> getAllChild($cid);
- foreach($arr as $child) {
+ foreach ($arr as $child) {
// get all category ids
$cids[] = $child->getVar('cid');
}
@@ -182,7 +182,7 @@
$wfdownloads->getHandler('report')->deleteAll($download_criteria);
$wfdownloads->getHandler('download')->deleteAll($download_criteria);
foreach (array_keys($downloads) as $lid) {
- xoops_comment_delete($wfdownloads->getModule()->mid(), (int)$lid);
+ xoops_comment_delete($wfdownloads->getModule()->mid(), (int) $lid);
}
// all downloads for each category is deleted, now delete the category data
@@ -256,7 +256,7 @@
if (isset($_POST['new_weights']) && count($_POST['new_weights']) > 0) {
$new_weights = $_POST['new_weights'];
$ids = array();
- foreach ($new_weights as $cid => $new_weight ) {
+ foreach ($new_weights as $cid => $new_weight) {
$category = $wfdownloads->getHandler('category')->get($cid);
$category->setVar('weight', $new_weight);
if (!$wfdownloads->getHandler('category')->insert($category)) {
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/clone.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -90,6 +90,9 @@
}
// recursive clonning script
+/**
+ * @param $path
+ */
function wfdownloads_cloneFileDir($path)
{
global $patKeys;
@@ -122,6 +125,11 @@
}
}
+/**
+ * @param $dirname
+ *
+ * @return bool
+ */
function wfdownloads_createLogo($dirname)
{
$wfdownloads = WfdownloadsWfdownloads::getInstance();
@@ -144,10 +152,10 @@
}
}
// Check original image/font
- if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png")) {
+ if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo.png")) {
return false;
}
- if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $wfdownloads->getModule()->dirname() . "/images/VeraBd.ttf")) {
+ if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $wfdownloads->getModule()->dirname() . "/assets/images/VeraBd.ttf")) {
return false;
}
// Create image
@@ -164,7 +172,7 @@
imagefill($imageModule, 0, 0, $whiteColor);
imagecolortransparent($imageModule, $whiteColor);
// Save new image
- imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png");
+ imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo.png");
imagedestroy($imageModule);
return true;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -255,7 +255,7 @@
$filename = '';
$filetype = '';
// Get size from form
- $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int)$_POST["size"];
+ $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int) $_POST["size"];
} else {
$url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
$filename = $_POST['filename'];
@@ -455,7 +455,7 @@
}
// Added Formulize module support (2006/05/04) jpc - end
$wfdownloads->getHandler('download')->insert($download);
- $newid = (int)$download->getVar('lid');
+ $newid = (int) $download->getVar('lid');
// Send notifications
if (!$lid) {
$tags = array();
@@ -691,7 +691,6 @@
$GLOBALS['xoopsTpl']->assign('filter_date_select', $date_select->render());
$GLOBALS['xoopsTpl']->assign('filter_date_condition', $filter_date_condition);
-
// New Downloads
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('published', 0));
@@ -834,7 +833,6 @@
$GLOBALS['xoopsTpl']->assign('download', $download_array);
}
-
// Get all logged users
$uidArray = array();
foreach ($ip_logs as $ip_log) {
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/import.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/import.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/import.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -206,6 +206,9 @@
// =========================================================================================
// This function imports data from WF-Downloads
// =========================================================================================
+/**
+ * @return null
+ */
function import_wfd_to_wfdownloads()
{
global $xoopsDB;
@@ -223,7 +226,7 @@
// Get destination module/handlers/configs
$wfdownloads = WfdownloadsWfdownloads::getInstance();
- echo "<br /><b>Copying Files</b><br />";
+ echo "<br /><span style='font-weight: bold;'>Copying Files</span><br />";
// Copy categories images/thumbnails
if (!wfdownloads_copyDir(XOOPS_ROOT_PATH . '/' . $wfdModuleConfig['catimage'], XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage'))) {
return false;
@@ -244,7 +247,7 @@
}
echo "Copied files<br />";
- echo "<br /><b>Importing Data</b><br />";
+ echo "<br /><span style='font-weight: bold;'>Importing Data</span><br />";
$destination = array(
"cat" => $xoopsDB->prefix("wfdownloads_cat"),
"downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
@@ -346,7 +349,6 @@
$xoopsDB->query($sql);
echo "Imported {$xoopsDB->getAffectedRows()} modification requests into {$destination['mod']}<br />";
-
// Update category ID to new value
$xoopsDB->query("UPDATE {$destination['downloads']} d, {$destination['cat']} c SET d.cid=c.cid WHERE d.old_cid=c.old_cid AND d.old_cid != 0");
$xoopsDB->query("UPDATE {$destination['cat']} c1, {$destination['cat']} c2 SET c1.pid=c2.cid WHERE c1.old_pid=c2.old_cid AND c1.old_pid != 0");
@@ -390,9 +392,9 @@
$xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_cid`");
$xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_lid`");
+ return null;
}
-
// =========================================================================================
// This function imports data from mydownloads
// =========================================================================================
@@ -400,7 +402,7 @@
{
global $xoopsDB;
- echo "<br /><b>Importing Data</b><br />";
+ echo "<br /><span style='font-weight: bold;'>Importing Data</span><br />";
$destination = array(
"cat" => $xoopsDB->prefix("wfdownloads_cat"),
"downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
@@ -471,7 +473,6 @@
);
echo "Imported " . $xoopsDB->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
-
//Update category ID to new value
$xoopsDB->query(
"UPDATE " . $destination['downloads'] . " d, " . $destination['cat'] . " c SET d.cid=c.cid WHERE d.old_cid=c.old_cid AND d.old_cid != 0"
@@ -515,7 +516,6 @@
}
-
// =========================================================================================
// This function imports data from pd-downloads
// =========================================================================================
@@ -523,7 +523,7 @@
{
global $xoopsDB;
- echo "<br /><b>Importing Data</b><br />";
+ echo "<br /><span style='font-weight: bold;'>Importing Data</span><br />";
$destination = array(
"cat" => $xoopsDB->prefix("wfdownloads_cat"),
"downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
@@ -563,36 +563,36 @@
//Import data into category table
$xoopsDB->query(
"INSERT INTO " . $destination['cat'] . " (`old_cid`, `old_pid`, `title`, `imgurl`, `description`, `total`, `weight`)
- SELECT `cid`, `pid`, `title`, `imgurl`, `description`, `total`, `weight`
- FROM " . $source['cat']
+ SELECT `cid`, `pid`, `title`, `imgurl`, `description`, `total`, `weight`
+ FROM " . $source['cat']
);
echo "Imported " . $xoopsDB->getAffectedRows() . " categories into " . $destination['cat'] . "<br />";
//Import data into downloads table
$xoopsDB->query(
"INSERT INTO " . $destination['downloads'] . " (`cid`, `old_lid`, `old_cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `ipaddress`, `notifypub`)
SELECT 0,`lid`, `cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `ipaddress`, `notifypub`
- FROM " . $source['downloads']
+ FROM " . $source['downloads']
);
echo "Imported " . $xoopsDB->getAffectedRows() . " downloads into " . $destination['downloads'] . "<br />";
//Import data into brokens table
$xoopsDB->query(
"INSERT INTO " . $destination['broken'] . " (`reportid`, `lid`, `sender`, `ip`, `date`, `confirmed`, `acknowledged`)
SELECT `reportid`, `lid`, `sender`, `ip`, `date`, `confirmed`, `acknowledged`
- FROM " . $source['broken']
+ FROM " . $source['broken']
);
echo "Imported " . $xoopsDB->getAffectedRows() . " broken reports into " . $destination['broken'] . "<br />";
//Import data into votedata table
$xoopsDB->query(
"INSERT INTO " . $destination['votes'] . " (`ratingid`, `lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`)
SELECT `ratingid`, `lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`
- FROM " . $source['votes']
+ FROM " . $source['votes']
);
echo "Imported " . $xoopsDB->getAffectedRows() . " votes into " . $destination['votes'] . "<br />";
//Import data into mod request table
$xoopsDB->query(
"INSERT INTO " . $destination['mod'] . " (`lid`, `cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `modifysubmitter`, `requestdate`)
SELECT `lid`, `cid`, `title`, `url`, `homepage`, `homepagetitle`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `features`, `forumid`, `dhistory`, `published`, `expired`, `updated`, `offline`, `description`, `modifysubmitter`, `requestdate`
- FROM " . $source['mod']
+ FROM " . $source['mod']
);
echo "Imported " . $xoopsDB->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
@@ -637,7 +637,6 @@
}
-
// =========================================================================================
// This function imports data from mydownloads
// =========================================================================================
@@ -645,7 +644,7 @@
{
global $xoopsDB;
- echo "<br /><b>Importing Data</b><br />";
+ echo "<br /><span style='font-weight: bold;'>Importing Data</span><br />";
$destination = array(
"cat" => $xoopsDB->prefix("wfdownloads_cat"),
"downloads" => $xoopsDB->prefix("wfdownloads_downloads"),
@@ -716,7 +715,6 @@
);
echo "Imported " . $xoopsDB->getAffectedRows() . " modification requests into " . $destination['mod'] . "<br />";
-
//Update category ID to new value
$xoopsDB->query(
"UPDATE " . $destination['downloads'] . " d, " . $destination['cat'] . " c SET d.cid=c.cid WHERE d.old_cid=c.old_cid AND d.old_cid != 0"
@@ -759,4 +757,3 @@
$xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_lid`");
}
-
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/index.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -179,7 +179,7 @@
);
// upload file size limit
// get max file size (setup and php.ini)
-$phpiniMaxFileSize = (min((int)(ini_get('upload_max_filesize')), (int)(ini_get('post_max_size')), (int)(ini_get('memory_limit')))) * 1024 * 1024; // bytes
+$phpiniMaxFileSize = (min((int) (ini_get('upload_max_filesize')), (int) (ini_get('post_max_size')), (int) (ini_get('memory_limit')))) * 1024 * 1024; // bytes
$maxFileSize = wfdownloads_bytesToSize1024(min($wfdownloads->getConfig('maxfilesize'), $phpiniMaxFileSize));
$indexAdmin->addInfoBoxLine(
_AM_WFDOWNLOADS_MINDEX_DOWNSUMMARY,
@@ -208,26 +208,26 @@
$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(FileChecker::getFileStatus($path . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine('');
$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(FileChecker::getFileStatus($path . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path . 'thumbs' . '/', 0777, $redirectFile));
$indexAdmin->addConfigBoxLine(
- FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/images/blank.gif', $redirectFile)
+ FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile)
);
$indexAdmin->addConfigBoxLine('');
$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(FileChecker::getFileStatus($path . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile));
$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus($path . 'thumbs' . '/', 0777, $redirectFile));
$indexAdmin->addConfigBoxLine(
- FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/images/blank.gif', $redirectFile)
+ FileChecker::getFileStatus($path . 'thumbs' . '/' . 'blank.gif', dirname(dirname(__FILE__)) . '/assets/images/blank.gif', $redirectFile)
);
//---------------------------
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/menu.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -31,55 +31,55 @@
$adminmenu[$i]["title"] = _MI_WFDOWNLOADS_MENU_HOME;
$adminmenu[$i]['link'] = "admin/index.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_CATEGORIES;
$adminmenu[$i]['link'] = "admin/categories.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_DOWNLOADS;
$adminmenu[$i]['link'] = "admin/downloads.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/download.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_REVIEWS;
$adminmenu[$i]['link'] = "admin/reviews.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/translations.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_RATINGS;
$adminmenu[$i]['link'] = "admin/ratings.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/button_ok.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_REPORTSMODIFICATIONS;
$adminmenu[$i]['link'] = "admin/reportsmodifications.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/alert.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_MIRRORS;
$adminmenu[$i]['link'] = "admin/mirrors.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/list.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_INDEXPAGE;
$adminmenu[$i]['link'] = "admin/indexpage.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/index.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_IMAGES;
$adminmenu[$i]['link'] = "admin/images.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/photo.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_MIMETYPES;
$adminmenu[$i]['link'] = "admin/mimetypes.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/type.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_PERMISSIONS;
$adminmenu[$i]['link'] = "admin/permissions.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/permissions.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_IMPORT;
$adminmenu[$i]['link'] = "admin/import.php";
-$adminmenu[$i]["icon"] = './images/icon32/database_go.png';
-$i++;
+$adminmenu[$i]["icon"] = './assets/images/icon32/database_go.png';
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_CLONE;
$adminmenu[$i]['link'] = "admin/clone.php";
-$adminmenu[$i]["icon"] = './images/icon32/editcopy.png';
-$i++;
+$adminmenu[$i]["icon"] = './assets/images/icon32/editcopy.png';
+++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_ABOUT;
$adminmenu[$i]['link'] = "admin/about.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png';
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mimetypes.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -88,8 +88,8 @@
$mimetype->setVar('mime_ext', $_POST['mime_ext']);
$mimetype->setVar('mime_name', $_POST['mime_name']);
$mimetype->setVar('mime_types', $_POST['mime_type']);
- $mimetype->setVar('mime_admin', (int)$_POST['mime_admin']);
- $mimetype->setVar('mime_user', (int)$_POST['mime_user']);
+ $mimetype->setVar('mime_admin', (int) $_POST['mime_admin']);
+ $mimetype->setVar('mime_user', (int) $_POST['mime_user']);
if (!$wfdownloads->getHandler('mimetype')->insert($mimetype)) {
$error = "Could not update mimetype information";
trigger_error($error, E_USER_ERROR);
@@ -122,13 +122,13 @@
if (!$wfdownloads->getHandler('mimetype')->insert($mimetype, true)) {
trigger_error($error, E_USER_ERROR);
}
- redirect_header("{$currentFile}?start=" . (int)($_GET['start']) . "", 0, _AM_WFDOWNLOADS_MIME_MODIFIED);
+ redirect_header("{$currentFile}?start=" . (int) ($_GET['start']) . "", 0, _AM_WFDOWNLOADS_MIME_MODIFIED);
break;
case "mimetypes.update" :
$mime_admin = WfdownloadsRequest::getBool('admin', false);
$mime_user = WfdownloadsRequest::getBool('user', false);
- $type_all = (int)($_GET['type_all']);
+ $type_all = (int) ($_GET['type_all']);
if ($mime_admin == true) {
$field = 'mime_admin';
@@ -142,7 +142,7 @@
$error = "Could not update mimetype information";
trigger_error($error, E_USER_ERROR);
}
- redirect_header("{$currentFile}?start=" . (int)($_GET['start']) . "", 1, _AM_WFDOWNLOADS_MIME_MODIFIED);
+ redirect_header("{$currentFile}?start=" . (int) ($_GET['start']) . "", 1, _AM_WFDOWNLOADS_MIME_MODIFIED);
break;
case "mimetype.delete" :
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/mirrors.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -100,7 +100,7 @@
$mirror->setVar('location', trim($_POST['location']));
$mirror->setVar('continent', trim($_POST['continent']));
$mirror->setVar('downurl', formatURL(trim($_POST['downurl'])));
- $mirror->setVar('submit', (int)($_POST['approve']));
+ $mirror->setVar('submit', (int) ($_POST['approve']));
$wfdownloads->getHandler('mirror')->insert($mirror);
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_MIRROR_MIRROR_UPDATED);
exit();
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reportsmodifications.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -61,14 +61,12 @@
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_BROKEN_FILEIGNORED);
break;
-
-
case "modification.show":
$requestid = WfdownloadsRequest::getInt('requestid', 0);
$modification = $wfdownloads->getHandler('modification')->get($requestid);
$modify_user = new XoopsUser($modification->getVar('modifysubmitter'));
- $modifyname = XoopsUserUtility::getUnameFromId((int)$modify_user->getVar('uid'));
+ $modifyname = XoopsUserUtility::getUnameFromId((int) $modify_user->getVar('uid'));
$modifyemail = $modify_user->getVar('email');
$download = $wfdownloads->getHandler('download')->get($modification->getVar('lid'));
@@ -103,7 +101,7 @@
$notAllowedKeys = array('lid', 'submitter', 'publisher', 'requestid', 'forumid', 'modifysubmitter', 'screenshots', 'paypalemail');
$i = 0;
- $mcform->addElement('', false, 0, 0);
+ $mcform->addElement(null, false, null, null);
$mcform->setTitles(array('', _AM_WFDOWNLOADS_MOD_ORIGINAL, _AM_WFDOWNLOADS_MOD_PROPOSED));
$i = 1;
foreach ($commonKeys as $key) {
@@ -208,12 +206,12 @@
$modificationFormElement = new XoopsFormLabel('', $modificationContent);
$mcform->addElement($downloadFormElement, false, $i, 1);
$mcform->addElement($modificationFormElement, false, $i, 2);
- $i++;
+ ++$i;
}
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('requestid', $requestid));
- $button_tray->addElement(new XoopsFormHidden('lid', (int)$modification->getVar('lid')));
+ $button_tray->addElement(new XoopsFormHidden('lid', (int) $modification->getVar('lid')));
$hidden = new XoopsFormHidden('op', 'modification.change');
$button_tray->addElement($hidden);
if (!$modification->isNew()) {
@@ -230,7 +228,7 @@
$mcform->addElement($button_tray, false, $i, 2);
$mcform->display();
-
+
xoops_cp_footer();
exit();
break;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/reviews.php 2014-04-15 08:31:59 UTC (rev 12447)
@@ -99,8 +99,8 @@
}
$review->setVar('title', trim($_POST['title']));
$review->setVar('review', trim($_POST['review']));
- $review->setVar('rated', (int)$_POST['rated']);
- $review->setVar('submit', (int)$_POST['approve']);
+ $review->setVar('rated', (int) $_POST['rated']);
+ $review->setVar('submit', (int) $_POST['approve']);
$wfdownloads->getHandler('review')->insert($review);
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_REV_REVIEW_UPDATED);
exit();
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/index.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/index.html (rev 0)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/index.html 2014-04-15 08:31:59 UTC (rev 12447)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/module.css
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/module.css (rev 0)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/css/module.css 2014-04-15 08:31:59 UTC (rev 12447)
@@ -0,0 +1,553 @@
+/*
+ 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.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author WF-Sections, Xoops Development Team, luciorota
+ * @version svn:$Id$
+ */
+.wfdownloads_headertable {
+ padding: 0;
+ border-bottom: 1px solid;
+ margin: 0 0 10px;
+}
+
+.wfdownloads_modulename {
+ font-size: 10px;
+ text-align: left;
+ font-weight: bold;
+ padding-right: 0.3em;
+ line-height: 18px;
+}
+
+.wfdownloads_breadcrumb {
+ font-size: 10px;
+ line-height: 18px;
+}
+
+.wfdownloads_infotitle {
+ margin-top: 8px;
+ margin-bottom: 8px;
+ font-size: 250%;
+ line-height: 250%;
+ font-weight: bold;
+ display: block;
+}
+
+.wfdownloads_infotext {
+ margin-bottom: 8px;
+ line-height: 130%;
+ display: block;
+}
+
+.wfdownloads_adminlinks {
+ padding-top: 15px;
+ padding-bottom: 5px;
+ font-size: 10px;
+ text-align: center;
+ line-height: 18px;
+}
+
+.wfdownloads_indexfooter {
+ font-size: 10px;
+ font-weight: bold;
+ text-align: center;
+ padding: 10px;
+}
+
+.wfdownloads_itemfooter {
+ font-size: 10px;
+ font-weight: bold;
+ text-align: center;
+ padding: 10px;
+}
+
+ul {
+ padding: 2px;
+ list-style: disc;
+ text-align: left;
+}
+
+li {
+ margin-left: 5px;
+ color: #2F5376;
+}
+
+h4 {
+ font-size: 14px;
+ text-decoration: underline;
+}
+
+.wfdownloads_container {
+ height: 100%;
+ display: table;
+ width: 100%;
+ margin: 0 auto;
+ border: none;
+}
+
+.wfdownloads_static {
+ position: static;
+ clear: both;
+}
+
+/* ---------- global ---------- */
+.wfdownloads_pagenav {
+ text-align: right;
+}
+
+.wfdownloads_copyright {
+ text-align: center;
+}
+
+/* ---------- header.html ---------- */
+.wfdownloads_head_catimgheader {
+ text-align: center;
+}
+
+.wfdownloads_head_downimgheader {
+ text-align: center;
+}
+
+.wfdownloads_head_imgheader {
+ text-align: center;
+}
+
+.wfdownloads_head_catindexheader {
+ /* text-align: center; do not uncomment (will stop index alignment option working) */
+}
+
+.wfdownloads_head_catletters {
+ text-align: center;
+ font-size: 80%;
+}
+
+.wfdownloads_head_cattoolbar {
+ text-align: center;
+}
+
+/* ---------- footer.html ---------- */
+.wfdownloads_foot_commentnav {
+ text-align: center;
+ padding: 3px;
+ margin: 3px;
+}
+
+.wfdownloads_foot_comments {
+ padding: 3px;
+ margin: 3px;
+}
+
+/* ---------- newlist.html ---------- */
+.wfdownloads_newlist_top {
+ text-align: center;
+ width: 100%;
+}
+
+.wfdownloads_newlist_top fieldset {
+ text-align: center;
+ border: 1px solid silver;
+ width: 450px;
+}
+
+.wfdownloads_newlist_totallast {
+ text-align: center;
+ width: 100%;
+ font-weight: bold;
+ font-size: large;
+}
+
+/* ---------- disclaimer.html ---------- */
+.wfdownloads_disc_imghead {
+ text-align: center;
+}
+
+.wfdownloads_disc_disclaimer {
+ text-align: center;
+}
+
+.wfdownloads_disc_discform {
+ text-align: center;
+}
+
+/* ---------- ratefile.html ---------- */
+.wfdownloads_rate_imghead {
+ text-align: center;
+}
+
+/* ---------- viewcat.html ---------- */
+.wfdownloads_view_top {
+}
+
+.wfdownloads_view_subs {
+ border: 0;
+ padding: 0;
+ margin: 0;
+}
+
+.wfdownloads_view_subs h3 {
+ text-align: center;
+ width: 100%;
+ background-color: #BEC8D1;
+}
+
+.wfdownloads_view_subs fieldset {
+}
+
+.wfdownloads_view_subslist {
+ text-align: left;
+ vertical-align: middle;
+ width: 90%;
+}
+
+.wfdownloads_view_catpath {
+ text-align: left;
+ margin-left: 5px;
+ padding: 0;
+ font-weight: bold;
+}
+
+.wfdownloads_view_sortlist {
+ text-align: center;
+ font-size: small;
+}
+
+/* ---------- download.html ---------- */
+.wfdownloads_down_title {
+ padding-top: 2.0em
+}
+
+.wfdownloads_down_top_r {
+ float: right;
+ margin-right: 10px;
+ position: relative;
+}
+
+.wfdownloads_down_top_l {
+ float: left;
+}
+
+.wfdownloads_down_main_l {
+ width: 74%;
+ float: left;
+ height: 100%;
+ position: relative;
+ display: table;
+}
+
+.wfdownloads_down_main_l p {
+ padding-top: 10px;
+ margin: 0;
+}
+
+.wfdownloads_down_viewdetails {
+ text-align: right;
+}
+
+.wfdownloads_down_main_r {
+ width: 25%;
+ height: 100%;
+ float: right;
+ position: relative;
+ display: table;
+}
+
+.wfdownloads_down_main_r p {
+ padding-top: 10px;
+ margin: 0;
+}
+
+.wfdownloads_down_info_top {
+ margin-left: 10px;
+ margin-right: 10px;
+ padding: 4px;
+ background-color: silver;
+ border-color: #999999;
+ font-size: .8em;
+}
+
+.wfdownloads_down_info_bottom {
+ margin-left: 10px;
+ margin-right: 10px;
+ padding: 4px;
+ font-size: .8em;
+}
+
+.wfdownloads_down_main_b {
+ text-align: center;
+}
+
+.wfdownloads_down_main_bottom {
+ width: 100%;
+ position: relative;
+ text-align: center;
+}
+
+.wfdownloads_down_main_bottom2 {
+ text-align: center;
+ background-color: silver;
+ width: 100%;
+ position: relative;
+ line-height: 150%;
+}
+
+.wfdownloads_down_custom {
+ width: 100%;
+ position: relative;
+ text-align: center;
+}
+
+/* ---------- singlefile.html ---------- */
+.wfdownloads_single_title {
+ padding-top: 2.0em
+}
+
+.wfdownloads_single_title a {
+ color: #32529C;
+ background-color: inherit;
+ font-weight: bold;
+ text-decoration: none;
+}
+
+.wfdownloads_single_title a:hover {
+ color: #666;
+ background-color: inherit;
+ text-decoration: none;
+}
+
+.wfdownloads_single_top_r {
+ float: right;
+ margin-right: 10px;
+ position: relative;
+}
+
+.wfdownloads_single_top_l {
+ float: left;
+}
+
+.wfdownloads_single_main_l {
+ width: 74%;
+ height: 100%;
+ float: left;
+ position: relative;
+ display: table;
+}
+
+.wfdownloads_single_main_l p {
+ padding-top: 10px;
+ margin: 0;
+}
+
+.wfdownloads_single_main_r {
+ width: 25%;
+ float: right;
+ display: table-column;
+}
+
+.wfdownloads_single_info_top {
+ margin-left: 10px;
+ margin-right: 10px;
+ padding: 4px;
+ background-color: silver;
+ border-color: #999999;
+ color: #333;
+ font-size: .8em;
+}
+
+.wfdownloads_single_info_dtimes {
+ margin-left: 4px;
+}
+
+.wfdownloads_single_main_custom {
+ width: 100%;
+ position: relative;
+ text-align: center;
+}
+
+.wfdownloads_single_main_bottom {
+ text-align: center;
+ background-color: silver;
+ width: 100%;
+ position: relative;
+ float: bottom;
+}
+
+.wfdownloads_single_userrev {
+ padding: 3px;
+ margin: 3px;
+}
+
+.wfdownloads_single_usermir {
+ padding: 3px;
+ margin: 3px;
+}
+
+/* ---------- mirrors.html ---------- */
+.wfdownloads_mirrors_head, .wfdownloads_mirrors_head2, .wfdownloads_mirrors_head3 {
+ border-bottom: 2px solid #000000;
+ border-left: 1px solid #000000;
+ background-color: #BEC8D1;
+ text-align: left;
+ font-family: Verdana, sans-serif;
+ font-weight: bold;
+ font-size: 14px;
+ color: #404040;
+}
+
+.wfdownloads_mirrors_head4 {
+ border-bottom: 2px solid #000000;
+ border-left: 1px solid #000000;
+ background-color: #BEC8D1;
+ text-align: center;
+ font-weight: bold;
+ font-size: 14px;
+ color: #404040;
+ width: 50px;
+}
+
+.wfdownloads_mirrors_head5 {
+ border-bottom: 2px solid #000000;
+ border-left: 0 solid #000000;
+ background-color: #BEC8D1;
+ text-align: center;
+ font-weight: bold;
+ font-size: 14px;
+ color: #404040;
+ width: 30px;
+}
+
+tr.wfdownloads_mirrors_elist {
+ line-height: 25px;
+}
+
+.wfdownloads_mirrors_list, .wfdownloads_mirrors_list2, .wfdownloads_mirrors_list3 {
+ text-align: left;
+ border-right: 1px solid #000000;
+}
+
+.wfdownloads_mirrors_list4, .wfdownloads_mirrors_list5 {
+ text-align: center;
+ vertical-align: middle;
+}
+
+.wfdownloads_mirrors_found {
+}
+
+table.wfdownloads_mirrors {
+ width: 95%;
+ padding: 10px 10px 10px 10px;
+ border: 1px #000000 solid;
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+tr.wfdownloads_mirrors_end {
+ background-color: #BEC8D1;
+}
+
+.wfdownloads_mirrors_foot, .wfdownloads_mirrors_foot a {
+ border-top: 2px solid #000000;
+ font-weight: bold;
+}
+
+.wfdownloads_mirrors_bottom {
+ font-weight: bold;
+}
+
+/* ---------- reviews.html ---------- */
+.wfdownloads_reviews_title {
+}
+
+.wfdownloads_reviews_desc {
+}
+
+.wfdownloads_reviews_catpath {
+}
+
+.wfdownloads_reviews_found {
+ width: 90%;
+ text-align: center;
+}
+
+.wfdownloads_reviews_revfound {
+ text-align: left;
+}
+
+.wfdownloads_reviews_addrev {
+ text-align: right;
+}
+
+.wfdownloads_reviews_reviewlist {
+ padding: 10px 10px 10px 10px;
+ border: 1px #000000 solid;
+ border-collapse: collapse;
+ width: 95%;
+}
+
+.wfdownloads_reviews_reviewer {
+ text-align: left;
+ width: 80%;
+ background-color: #BEC8D1;
+ /* border-right: 1px solid #000000; */
+ border-bottom: 2px solid #000000;
+}
+
+.wfdownloads_reviews_reviewdate {
+ text-align: right;
+ width: 15%;
+ background-color: #BEC8D1;
+ border-bottom: 2px solid #000000;
+}
+
+.wfdownloads_reviews_revlistleft {
+ text-align: left;
+ border-right: 1px solid #000000;
+ width: 120px;
+}
+
+.wfdownloads_reviews_revlistright {
+ text-align: left;
+}
+
+.wfdownloads_reviews_revlistreview {
+ position: absolute;
+ top: 0;
+ left: 125px;
+ width: 90%;
+}
+
+.wfdownloads_reviews_revlisttitle {
+ margin-left: 10px;
+ margin-right: 10px;
+ padding: 4px;
+ font-weight: bold;
+ color: #0000CC;
+}
+
+.wfdownloads_reviews_revlistrev {
+}
+
+.wfdownloads_reviews_foot {
+ background-color: #BEC8D1;
+ border: 2px solid #000000;
+ width: 95%;
+}
+
+.wfdownloads_reviews_addrev {
+ position: absolute;
+ top: 0;
+ left: 0;
+ background-color: #BEC8D1;
+ border: 2px solid #000000;
+}
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/VeraBd.ttf
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/VeraBd.ttf
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/VeraBd.ttf 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/VeraBd.ttf 2014-04-15 08:31:59 UTC (rev 12447)
Property changes on: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/VeraBd.ttf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/blank.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/blank.gif
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/blank.gif 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/blank.gif 2014-04-15 08:31:59 UTC (rev 12447)
Property changes on: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/blank.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/brokenimg.png
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/brokenimg.png
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/brokenimg.png 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/brokenimg.png 2014-04-15 08:31:59 UTC (rev 12447)
Property changes on: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/brokenimg.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/blank.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/blank.gif
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/blank.gif 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/blank.gif 2014-04-15 08:31:59 UTC (rev 12447)
Property changes on: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/blank.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/index.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/index.html (rev 0)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/index.html 2014-04-15 08:31:59 UTC (rev 12447)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/blank.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/blank.gif
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/blank.gif 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/blank.gif 2014-04-15 08:31:59 UTC (rev 12447)
Property changes on: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/blank.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/index.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/index.html (rev 0)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/category/thumbs/index.html 2014-04-15 08:31:59 UTC (rev 12447)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/down.gif
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/down.gif
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/down.gif 2014-04-14 22:42:04 UTC (rev 12446)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/down.gif 2014-04-15 08:31:59 UTC (rev 12447)
Property changes on: XoopsModules/wfdownloads/branches/mamba/wfdownloads/assets/images/down.gif
___________________________________________________________________
Adde...
[truncated message content] |
|
From: <be...@us...> - 2014-04-14 22:42:09
|
Revision: 12446
http://sourceforge.net/p/xoops/svn/12446
Author: beckmi
Date: 2014-04-14 22:42:04 +0000 (Mon, 14 Apr 2014)
Log Message:
-----------
creating a branch for mamba
Added Paths:
-----------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/
|
|
From: <be...@us...> - 2014-04-14 22:39:16
|
Revision: 12445
http://sourceforge.net/p/xoops/svn/12445
Author: beckmi
Date: 2014-04-14 22:39:12 +0000 (Mon, 14 Apr 2014)
Log Message:
-----------
adding placeholder for a branch
Added Paths:
-----------
XoopsModules/wfdownloads/branches/mamba/
|
|
From: <luc...@us...> - 2014-04-14 18:02:03
|
Revision: 12444
http://sourceforge.net/p/xoops/svn/12444
Author: luciorota
Date: 2014-04-14 18:01:58 +0000 (Mon, 14 Apr 2014)
Log Message:
-----------
WFDownload 3.23 RC1...
- added: preview for images, audio, video, pdf files
- added: calculate real upload file size limit
- fixed: upload files with spacial chairs in name
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/uploader.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_footer.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_index.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/README.md
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/DO NOT CHANGE THESE FILES. USE -src- FOLDER.txt
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/background.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/bigplay.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/bigplay.svg
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls-ted.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls-wmp-bg.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls-wmp.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls.png
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/controls.svg
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/flashmediaelement-cdn.swf
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/flashmediaelement.swf
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/loading.gif
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mediaelement-and-player.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mediaelement.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mediaelementplayer.min.css
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mediaelementplayer.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/mejs-skins.css
XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/build/silverlightmediaelement.xap
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/install.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/tips_tricks.html
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help2.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2014-04-13 07:51:58 UTC (rev 12443)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2014-04-14 18:01:58 UTC (rev 12444)
@@ -272,6 +272,7 @@
$url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
$size = $down['size'];
$title = $_FILES['userfile']['name'];
+
$ext = rtrim(strrchr($title, '.'), '.');
$title = str_replace($ext, '', $title);
$title = (isset($_POST['title_checkbox']) && $_POST['title_checkbox'] == 1) ? $title : trim($_POST['title']);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2014-04-13 07:51:58 UTC (rev 12443)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php 2014-04-14 18:01:58 UTC (rev 12444)
@@ -170,6 +170,23 @@
'green'
);
}
+// module max file size
+$indexAdmin->addInfoBoxLine(
+ _AM_WFDOWNLOADS_MINDEX_DOWNSUMMARY,
+ '<infolabel>' . _AM_WFDOWNLOADS_DOWN_MODULE_MAXFILESIZE . '</infolabel>',
+ wfdownloads_bytesToSize1024($wfdownloads->getConfig('maxfilesize')),
+ 'green'
+);
+// upload file size limit
+// get max file size (setup and php.ini)
+$phpiniMaxFileSize = (min((int)(ini_get('upload_max_filesize')), (int)(ini_get('post_max_size')), (int)(ini_get('memory_limit')))) * 1024 * 1024; // bytes
+$maxFileSize = wfdownloads_bytesToSize1024(min($wfdownloads->getConfig('maxfilesize'), $phpiniMaxFileSize));
+$indexAdmin->addInfoBoxLine(
+ _AM_WFDOWNLOADS_MINDEX_DOWNSUMMARY,
+ '<infolabel>' . _AM_WFDOWNLOADS_UPLOAD_MAXFILESIZE . '</infolabel>',
+ $maxFileSize,
+ 'green'
+);
//------ check directories ---------------
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2014-04-13 07:51:58 UTC (rev 12443)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2014-04-14 18:01:58 UTC (rev 12444)
@@ -89,7 +89,7 @@
echo "<div><b>" . _AM_WFDOWNLOADS_MOD_MODPOSTER . "</b> $submittername</div>";
echo "<div><b>" . _AM_WFDOWNLOADS_MOD_MODIFYSUBMITTER . "</b> $modifyname</div>";
- $mcform = new WfdownloadsMulticolumnsThemeForm('', 'modificationform', 'index.php');
+ $mcform = new WfdownloadsMulticolumnsThemeForm('', 'modificationform', $currentFile);
// Get download keys
$downloadVars = $download->getVars();
@@ -238,7 +238,7 @@
case "modification.change" :
/* Added by Lankford on 2007/3/21 */
// Get a pointer to the download record and the modification record, then compare their 'versions' to see if they are different. If they are, then raise filemodify events.
- $requestid = WfdownloadsRequest::getInt('requestid', 0, 'GET');
+ $requestid = WfdownloadsRequest::getInt('requestid', 0, 'POST');
$modification = $wfdownloads->getHandler('modification')->get($requestid);
$download = $wfdownloads->getHandler('download')->get($modification->getVar('lid'));
@@ -271,17 +271,9 @@
}
/* end add block */
- redirect_header(WFDOWNLOADS_URL . '/admin/index.php', 1, _AM_WFDOWNLOADS_MOD_REQUPDATED);
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_MOD_REQUPDATED);
break;
-/*
- case "modification.ignore" :
- $requestid = WfdownloadsRequest::getInt('requestid', 0, 'POST');
- $criteria = new Criteria('requestid', $requestid);
- $wfdownloads->getHandler('modification')->deleteAll($criteria, true);
- redirect_header(WFDOWNLOADS_URL . '/admin/index.php', 1, _AM_WFDOWNLOADS_MOD_REQDELETED);
- break;
-*/
case "modification.ignore" :
case "modification.delete" :
$requestid = WfdownloadsRequest::getInt('requestid', 0);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2014-04-13 07:51:58 UTC (rev 12443)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2014-04-14 18:01:58 UTC (rev 12444)
@@ -466,13 +466,16 @@
|| (wfdownloads_userIsAdmin())
) {
$userfile_file = new XoopsFormFile(_MD_WFDOWNLOADS_UPLOAD_FILEC, 'userfile', 0);
- $maxFileSize = wfdownloads_bytesToSize1024($this->wfdownloads->getConfig('maxfilesize'));
+ // get max file size (setup and php.ini)
+ $phpiniMaxFileSize = (min((int)(ini_get('upload_max_filesize')), (int)(ini_get('post_max_size')), (int)(ini_get('memory_limit')))) * 1024 * 1024; // bytes
+ $maxFileSize = wfdownloads_bytesToSize1024(min($this->wfdownloads->getConfig('maxfilesize'), $phpiniMaxFileSize));
+ // get allowed mimetypes
if (wfdownloads_userIsAdmin()) {
$criteria = new Criteria('mime_admin', true);
} else {
$criteria = new Criteria('mime_user', true);
}
- $mimetypes = $this->wfdownloads->getHandler('mimetype')->getList($criteria);
+ $mimetypes = $this->wfdownloads->getHandler('mimetype')->getList($criteria);
$allowedExtensions = implode(' | ', $mimetypes);
$userfile_file->setDescription(
sprintf(
@@ -730,10 +733,13 @@
$sform->addElement(new XoopsFormText(_AM_WFDOWNLOADS_FILE_MIRRORURL, 'mirror', 50, 255, $this->getVar('mirror', 'e')), false);
}
// download: userfile
- $userfile_file = new XoopsFormFile(_MD_WFDOWNLOADS_UPLOAD_FILEC, 'userfile', 0);
- $maxFileSize = wfdownloads_bytesToSize1024($this->wfdownloads->getConfig('maxfilesize'));
- $criteria = new Criteria('mime_admin', true);
- $mimetypes = $this->wfdownloads->getHandler('mimetype')->getList($criteria);
+ $userfile_file = new XoopsFormFile(_MD_WFDOWNLOADS_UPLOAD_FILEC, 'userfile', 0);
+ // get max file size (setup and php.ini)
+ $phpiniMaxFileSize = min((int)(ini_get('upload_max_filesize')), (int)(ini_get('post_max_size')), (int)(ini_get('memory_limit'))) * 1024 * 1024; // bytes
+ $maxFileSize = wfdownloads_bytesToSize1024(min($this->wfdownloads->getConfig('maxfilesize'), $phpiniMaxFileSize));
+ // get allowed mimetypes
+ $criteria = new Criteria('mime_admin', true);
+ $mimetypes = $this->wfdownloads->getHandler('mimetype')->getList($criteria);
$allowedExtensions = implode(' | ', $mimetypes);
$userfile_file->setDescription(
sprintf(
@@ -747,7 +753,7 @@
);
$sform->addElement($userfile_file, false);
// download: cid
- $categories = $this->wfdownloads->getHandler('category')->getObjects();
+ $categories = $this->wfdownloads->getHandler('category')->getObjects();
$categoriesTree = new XoopsObjectTree($categories, 'cid', 'pid');
$sform->addElement(
new XoopsFormLabel(_AM_WFDOWNLOADS_FILE_CATEGORY, $categoriesTree->makeSelBox('cid', 'title', '-', $this->getVar('cid', 'e')))
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/uploader.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/uploader.php 2014-04-13 07:51:58 UTC (rev 12443)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/uploader.php 2014-04-14 18:01:58 UTC (rev 12444)
@@ -142,7 +142,6 @@
function fetchMedia($media_name, $index = null)
{
global $_FILES;
-
if (!isset($_FILES[$media_name])) {
$this->setErrors('You either did not choose a file to upload or the server has insufficient read/writes to upload this file.!');
@@ -367,6 +366,8 @@
}
$this->savedFileName = preg_replace('!\s+!', '_', $this->savedFileName);
//$this->savedFileName = preg_replace('#[ \.]#', '_', $this->savedFileName);
+ $this->savedFileName = iconv("UTF-8", "ASCII//TRANSLIT", $this->savedFileName);
+ $this->savedFileName = preg_replace("/[^a-zA-Z0-9\.]/", "", $this->savedFileName);
$this->savedDestination = $this->uploadDir . $this->savedFileName;
if (is_file($this->savedDestination) && !is_dir($this->savedDestination)) {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads.php 2014-04-13 07:51:58 UTC (rev 12443)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads.php 2014-04-14 18:01:58 UTC (rev 12444)
@@ -42,9 +42,6 @@
if (!$instance) {
$instance = new self($debug);
}
-//error_log("istance: [" . print_r($istance,true) . "]");
-//phpinfo();
-//debug_print_backtrace ();
return $instance;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2014-04-13 07:51:58 UTC (rev 12443)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2014-04-14 18:01:58 UTC (rev 12444)
@@ -1,4 +1,7 @@
-<b><u>=> Version 3.23 Beta (2014-04-04)</u></b>
+<b><u>=> Version 3.23 Beta (2014-04-14)</u></b>
+- added: preview for images, audio, video, pdf files (luciorota)
+- added: calculate real upload file size limit (luciorota)
+- fixed: upload files with spacial chairs in name (luciorota)
- added: calculate file size also for local files (luciorota)
- added: use XoopsLocal::formatTimestamp (luciorota)
- update jQuery Thickbox plugin to 3.1 (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/footer.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/footer.php 2014-04-13 07:51:58 UTC (rev 12443)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/footer.php 2014-04-14 18:01:58 UTC (rev 12444)
@@ -18,16 +18,15 @@
* @author Xoops Development Team
* @version svn:$id$
*/
-$uid = is_object($xoopsUser) ? (int)$xoopsUser->getVar('uid') : 0;
-
+// Module info/menu
+$moduleInfo = $wfdownloads->getModule()->getInfo();
+//$xoopsTpl->assign('wfdownloadModuleInfo', $moduleInfo); // huge array but useful?
+$xoopsTpl->assign('wfdownloadModuleInfoSub', $moduleInfo['sub']);
+// Module admin
+$xoopsTpl->assign("isAdmin", $wfdownloads_isAdmin);
$xoopsTpl->assign("wfdownloads_adminpage", "<a href='" . WFDOWNLOADS_URL . "/admin/index.php'>" . _MD_WFDOWNLOADS_ADMIN_PAGE . "</a>");
+// Extra info
+$xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/'); // this definition is not removed for backward compatibility issues
+$xoopsTpl->assign("ref_smartfactory","WFDownloads is developed by The SmartFactory (http://www.smartfactory.ca), a division of InBox Solutions (http://www.inboxsolutions.net)");
-$xoopsTpl->assign("isAdmin", $wfdownloads_isAdmin);
-$xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
-
-$xoopsTpl->assign(
- "ref_smartfactory",
- "WFDownloads is developed by The SmartFactory (http://www.smartfactory.ca), a division of InBox Solutions (http://www.inboxsolutions.net)"
-);
-
include_once XOOPS_ROOT_PATH . '/footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2014-04-13 07:51:58 UTC (rev 12443)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2014-04-14 18:01:58 UTC (rev 12444)
@@ -30,9 +30,10 @@
/**
* This function transforms a numerical size (like 2048) to a letteral size (like 2MB)
*
- * @param integer $bytes numerical size
+ * @param integer $bytes numerical size
+ * @param integer $precision
*
- * @return string $size letteral size
+ * @return string letteral size
**/
function wfdownloads_bytesToSize1000($bytes, $precision = 2)
{
@@ -59,9 +60,9 @@
/**
* This function transforms the php.ini notation for numbers (like '2M') to an integer (2*1024*1024 in this case)
*
- * @param string $size letteral size
+ * @param string $size letteral size
*
- * @return integer $ret numerical size
+ * @return integer numerical size
**/
function wfdownloads_sizeToBytes1024($size)
{
@@ -656,11 +657,14 @@
**/
function wfdownloads_serverStats()
{
+ $wfdownloads = WfdownloadsWfdownloads::getInstance();
global $xoopsDB;
$html = "";
-
- $sql = $xoopsDB->query("SELECT metavalue FROM " . $xoopsDB->prefix('wfdownloads_meta') . " WHERE metakey='version' LIMIT 1");
- list($meta) = $xoopsDB->fetchRow($sql);
+ $sql = "SELECT metavalue";
+ $sql.= " FROM " . $xoopsDB->prefix('wfdownloads_meta');
+ $sql.= " WHERE metakey='version' LIMIT 1";
+ $query = $xoopsDB->query($sql);
+ list($meta) = $xoopsDB->fetchRow($query);
$html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_DOWN_IMAGEINFO . "</legend>\n";
$html .= "<div style='padding: 8px;'>\n";
$html .= "<div>" . _AM_WFDOWNLOADS_DOWN_METAVERSION . $meta . "</div>\n";
@@ -691,6 +695,7 @@
//
$html .= "<li>" . _AM_WFDOWNLOADS_DOWN_MAXUPLOADSIZE . " <b><span style=\"color: blue;\">" . ini_get('upload_max_filesize') . "</span></b>\n";
$html .= "<li>" . _AM_WFDOWNLOADS_DOWN_MAXPOSTSIZE . " <b><span style=\"color: blue;\">" . ini_get('post_max_size') . "</span></b>\n";
+ $html .= "<li>" . _AM_WFDOWNLOADS_DOWN_MEMORYLIMIT . " <b><span style=\"color: blue;\">" . ini_get('memory_limit') . "</span></b>\n";
$html .= "</ul>\n";
$html .= "<ul>\n";
@@ -1004,7 +1009,6 @@
$img = @imageCreateFromPNG($imagePath);
break;
default:
- error_log("debug3");
return $imagePath;
break;
}
@@ -1055,28 +1059,50 @@
return XOOPS_URL . '/' . $saveFile;
}
+/**
+ * wfdownloads_isNewImage()
+ *
+ * @param integer $published date
+ *
+ * @return array 'image', 'alttext', 'days' number of days between $published and now
+ **/
function wfdownloads_isNewImage($published)
{
- $oneDay = (time() - (86400 * 1)); // 1 day
- $threeDays = (time() - (86400 * 3)); // 3 days
- $week = (time() - (86400 * 7)); // 1 week
- if ($published > 0 && $published < $week) {
- $indicator['image'] = 'images/icon/download4.gif';
- $indicator['alttext'] = _MD_WFDOWNLOADS_NEWLAST;
- } elseif ($published >= $week && $published < $threeDays) {
- $indicator['image'] = 'images/icon/download3.gif';
- $indicator['alttext'] = _MD_WFDOWNLOADS_NEWTHIS;
- } elseif ($published >= $threeDays && $published < $oneDay) {
- $indicator['image'] = 'images/icon/download2.gif';
- $indicator['alttext'] = _MD_WFDOWNLOADS_THREE;
- } elseif ($published >= $oneDay) {
- $indicator['image'] = 'images/icon/download1.gif';
- $indicator['alttext'] = _MD_WFDOWNLOADS_TODAY;
- } else {
+ if ($published <= 0) {
$indicator['image'] = 'images/icon/download.gif';
$indicator['alttext'] = _MD_WFDOWNLOADS_NO_FILES;
+ $indicator['days'] = null;
+ } else {
+ $days = (int)((time() - $published) / 86400); // number of days between $published and now
+ $indicator['days'] = $days;
+ switch($days) {
+ case 0:
+ // today
+ $indicator['image'] = 'images/icon/download1.gif';
+ $indicator['alttext'] = _MD_WFDOWNLOADS_TODAY;
+ break;
+ case 1:
+ case 2:
+ // less than 3 days
+ $indicator['image'] = 'images/icon/download2.gif';
+ $indicator['alttext'] = _MD_WFDOWNLOADS_THREE;
+ break;
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ // less than 7 days
+ $indicator['image'] = 'images/icon/download3.gif';
+ $indicator['alttext'] = _MD_WFDOWNLOADS_NEWTHIS;
+ break;
+ case 7:
+ default:
+ // more than a week
+ $indicator['image'] = 'images/icon/download4.gif';
+ $indicator['alttext'] = _MD_WFDOWNLOADS_NEWLAST;
+ break;
+ }
}
-
return $indicator;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2014-04-13 07:51:58 UTC (rev 12443)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2014-04-14 18:01:58 UTC (rev 12444)
@@ -214,6 +214,7 @@
array(
'image' => $imageURL, // this definition is not removed for backward compatibility issues
'image_URL' => $imageURL,
+ 'days' => $isNewImage['days'],
'id' => (int)$mainCategories[$i]->getVar('cid'), // this definition is not removed for backward compatibility issues
'cid' => (int)$mainCategories[$i]->getVar('cid'),
'allowed_download' => in_array($mainCategories[$i]->getVar('cid'), $allowedDownCategoriesIds),
@@ -232,6 +233,7 @@
array(
'image' => $imageURL, // this definition is not removed for backward compatibility issues
'image_URL' => $imageURL,
+ 'days' => $isNewImage['days'],
'id' => (int)$mainCategories[$i]->getVar('cid'), // this definition is not removed for backward compatibility issues
'cid' => (int)$mainCategories[$i]->getVar('cid'),
'allowed_download' => in_array($mainCategories[$i]->getVar('cid'), $allowedDownCategoriesIds),
@@ -255,11 +257,9 @@
if ($wfdownloads->getConfig('enablerss') == true) {
$rsslink_URL = WFDOWNLOADS_URL . "/rss.php";
$xoopsTpl->assign('full_rssfeed_URL', $rsslink_URL);
- $rsslink
- =
- "<a href='" . $rsslink_URL . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "'><img src='" . XOOPS_URL . "/modules/" . $wfdownloads->getModule(
- )->getVar('dirname') . "/images/icon/rss.gif' border='0' alt='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS
- . "'></a>";
+ $rsslink = "<a href='" . $rsslink_URL . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "'>";
+ $rsslink.= "<img src='" . WFDOWNLOADS_URL . "/images/icon/rss.gif' border='0' alt='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "'>";
+ $rsslink.= "</a>";
$xoopsTpl->assign('full_rssfeed_link', $rsslink); // this definition is not removed for backward compatibility issues
}
Added: XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/README.md
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/README.md (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/js/mediaelement/README.md 2014-04-14 18:01:58 UTC (rev 12444)
@@ -0,0 +1,770 @@
+# `<video>` and `<audio>` made easy.
+
+One file. Any browser. Same UI.
+
+* Author: John Dyer [http://j.hn/](http://j.hn/)
+* Website: [http://mediaelementjs.com/](http://mediaelementjs.com/)
+* License: MIT
+* Meaning: Use everywhere, keep copyright, it'd be swell if you'd link back here.
+* Thanks: my employer, [Dallas Theological Seminary](http://www.dts.edu/)
+* Contributors: [mikesten](https://github.com/mikesten), [sylvinus](https://github.com/sylvinus), [mattfarina](https://github.com/mattfarina), [romaninsh](https://github.com/romaninsh), [fmalk](https://github.com/fmalk), [jeffrafter](https://github.com/jeffrafter), [sompylasar](https://github.com/sompylasar), [andyfowler](https://github.com/andyfowler), [RobRoy](https://github.com/RobRoy), [jakearchibald](https://github.com/jakearchibald), [seanhellwig](https://github.com/seanhellwig), [CJ-Jackson](https://github.com/CJ-Jackson), [kaichen](https://github.com/kaichen), [gselva](https://github.com/gselva), [erktime](https://github.com/erktime), [bradleyboy](https://github.com/bradleyboy), [kristerkari](https://github.com/kristerkari), [rmhall](https://github.com/rmhall), [tantalic](https://github.com/tantalic), [madesign](http://github.com/madesign), [aschempp](http://github.com/aschempp), [gavinlynch](https://github.com/gavinlynch), [Birol2010](http://github.com/Birol2010), tons of others (see pulls)
+
+
+## Installation and Usage
+
+_MediaElementPlayer: HTML5 `<video>` and `<audio>` player_
+
+A complete HTML/CSS audio/video player built on top `MediaElement.js` and `jQuery`. Many great HTML5 players have a completely separate Flash UI in fallback mode, but MediaElementPlayer.js uses the same HTML/CSS for all players.
+
+### 1. Add Script and Stylesheet
+```html
+<script src="jquery.js"></script>
+<script src="mediaelement-and-player.min.js"></script>
+<link rel="stylesheet" href="mediaelementplayer.css" />
+```
+### 2. Add `<video>` or `<audio>` tags
+If your users have JavaScript and/or Flash, the easist route for all browsers and mobile devices is to use a single MP4 or MP3 file.
+
+```html
+<video src="myvideo.mp4" width="320" height="240"></video>
+```
+```html
+<video src="myaudio.mp3"></video>
+```
+
+#### Optional: multiple codecs
+This includes multiple codecs for various browsers (H.264 for IE9+, Safari, and Chrome, WebM for Firefox 4 and Opera, Ogg for Firefox 3).
+
+```html
+<video width="320" height="240" poster="poster.jpg" controls="controls" preload="none">
+ <source type="video/mp4" src="myvideo.mp4" />
+ <source type="video/webm" src="myvideo.webm" />
+ <source type="video/ogg" src="myvideo.ogv" />
+</video>
+```
+
+#### Optional: Browsers with JavaScript disabled
+In very rare cases, you might have an non-HTML5 browser with Flash turned on and JavaScript turned off. In that specific case, you can also include the Flash `<object>` code.
+```html
+<video width="320" height="240" poster="poster.jpg" controls="controls" preload="none">
+ <source type="video/mp4" src="myvideo.mp4" />
+ <source type="video/webm" src="myvideo.webm" />
+ <source type="video/ogg" src="myvideo.ogv" />
+ <object width="320" height="240" type="application/x-shockwave-flash" data="flashmediaelement.swf">
+ <param name="movie" value="flashmediaelement.swf" />
+ <param name="flashvars" value="controls=true&poster=myvideo.jpg&file=myvideo.mp4" />
+ <img src="myvideo.jpg" width="320" height="240" title="No video playback capabilities" />
+ </object>
+</video>
+```
+
+### 3. Startup
+
+#### Automatic start
+You can avoid running any startup scripts by added `class="mejs-player"` to the `<video>` or `<audio>` tag. Options can be added using the `data-mejsoptions` attribute
+```html
+<video src="myvideo.mp4" width="320" height="240"
+ class="mejs-player"
+ data-mejsoptions='{"alwaysShowControls": true}'></video>
+```
+
+#### Normal JavaScirpt
+```html
+<script>
+var player = new MediaElementPlayer('#player', {success: function(mediaElement, originalNode) {
+ // do things
+}});
+</script>
+```
+
+#### jQuery plugin
+```html
+<script>
+$('video').mediaelementplayer({success: function(mediaElement, originalNode) {
+ // do things
+}});
+</script>
+```
+
+## How it Works:
+_MediaElement.js: HTML5 `<video>` and `<audio>` shim_
+
+`MediaElement.js` is a set of custom Flash and Silverlight plugins that mimic the HTML5 MediaElement API for browsers that don't support HTML5 or don't support the media codecs you're using.
+Instead of using Flash as a _fallback_, Flash is used to make the browser seem HTML5 compliant and enable codecs like H.264 (via Flash) and even WMV (via Silverlight) on all browsers.
+```html
+<script src="mediaelement.js"></script>
+<video src="myvideo.mp4" width="320" height="240"></video>
+
+<script>
+var v = document.getElementsByTagName("video")[0];
+new MediaElement(v, {success: function(media) {
+ media.play();
+}});
+</script>
+```
+You can use this as a standalone library if you wish, or just stick with the full MediaElementPlayer.
+
+### Version History
+
+*2.14.2 (2014/04/04)*
+
+* Additional progress bar checks for hidden/missing bars
+* Add Gruntfile.js build support (https://github.com/johndyer/mediaelement/pull/1147) [jeremyfelt]
+* Add #! line to Builder.py for legacy builds (https://github.com/johndyer/mediaelement/pull/1036) [amenonsen]
+
+*2.14.1 (2014/03/31)*
+
+* Fix infinite loop on progress bar
+
+*2.14.0 (2014/03/29)*
+
+* Vimeo support (https://github.com/johndyer/mediaelement/pull/1079) [clkao]
+* fix for aac-audio (itunes-samples etc.) (https://github.com/johndyer/mediaelement/pull/1133) [faebser]
+* added 'm4a' file type, to be detected as 'audio/mp4' (https://github.com/johndyer/mediaelement/pull/988) [heshiming]
+* Function remove() should remove mejs container only if it exists (https://github.com/johndyer/mediaelement/pull/1144) [lucash]
+* Handle the case when parentNode is null (https://github.com/johndyer/mediaelement/pull/1136) [lbeder, also hypomodern]
+* fix leaky variables (https://github.com/johndyer/mediaelement/pull/1123) [kernel]
+* Fixed display of volume control on non-mobile touch devices (https://github.com/johndyer/mediaelement/pull/1093) [OwenEdwards]
+* Calculate correctly the video player height for 100% (https://github.com/johndyer/mediaelement/pull/1083) [LeResKP]
+* restore focus after click on the controls (https://github.com/johndyer/mediaelement/pull/1094) [rounce]
+* Support youtu.be URL for youtube source (https://github.com/johndyer/mediaelement/pull/1135) [clkao]
+* Make slider work on touch devices (https://github.com/johndyer/mediaelement/pull/1033) [Singularetantum]
+* add Simplified Chinese translation (https://github.com/johndyer/mediaelement/pull/1065) [michaeljayt]
+* Fixed the reference to `media` in the bigPlay control creation. (https://github.com/johndyer/mediaelement/pull/1111) [nuzzio]
+* Fix layout bug when zooming page (https://github.com/johndyer/mediaelement/pull/1097) [ChiChou]
+* Fix fullscreen iframe zoom bug. (https://github.com/johndyer/mediaelement/pull/1070) [lisbakke]
+
+*2.13.2 (2014/01/24)*
+
+* Removed breaking `hasTouch` detection
+* Fixed IE detection https://github.com/johndyer/mediaelement/pull/1018
+* fix play() on ipad does not start playing and double click issue (https://github.com/johndyer/mediaelement/pull/918) [fbuecklers]
+* added scale=default to Flash for better 100% https://github.com/johndyer/mediaelement/pull/963
+* Add code fences for GHFM https://github.com/johndyer/mediaelement/pull/975
+* i18n improvements https://github.com/johndyer/mediaelement/pull/1025
+
+*2.13.1 (2013/09/?06)*
+
+* Support for fullscreen in IE11 beta
+
+*2.13.0 (2013/09/01)*
+
+* BREAKING FLASH SECURITY CHANGE: Removed `allowDomain("*")` by default. If you use MediaElement.js on a different domain use the `flashmediaelement-cdn.swf` file (nacin) https://github.com/johndyer/mediaelement/pull/956
+* Use only FlashVars and ignore parameters passed via query string.
+* Force LTR in controls (for RTL users) (nacin) https://github.com/johndyer/mediaelement/pull/958
+
+*2.12.1 (2013/08/26)*
+
+* Remove all `console.log` statements in `Builder.py` JD
+* More i18n fixes for Wordpress (SergeyBiryukov) https://github.com/johndyer/mediaelement/pull/940
+* Fix touch detection in QtWebKit (peterbrook) https://github.com/johndyer/mediaelement/pull/939
+* Added configuration option httpsBasicAuthSite fix sites using HTTPS basic authentication (benroy73) https://github.com/johndyer/mediaelement/pull/937
+* Fixed backlight plugin error (eviweb) https://github.com/johndyer/mediaelement/pull/932
+* Fix some wrong dates on the change log (heartcode) https://github.com/johndyer/mediaelement/pull/930
+* Add a mejs-fullscreen css class on the root element (fbuecklers) https://github.com/johndyer/mediaelement/pull/925
+* fix for ff switch between fullscreen and normal mode (fbuecklers) https://github.com/johndyer/mediaelement/pull/924
+* Multiple fixes: old issue #548, current issues #754 and #902 (peterh-capella) https://github.com/johndyer/mediaelement/pull/923
+* fix firefox detect 100% mode issue (KaptinLin ) https://github.com/johndyer/mediaelement/pull/919
+* Option to show the poster when the video is ended (LeResKP) https://github.com/johndyer/mediaelement/pull/891
+* Fix for Chrome autoplaying when forcing Flash (tjsnyder) https://github.com/johndyer/mediaelement/pull/889
+* Allow SWF to work over insecure domain (sebablanco ) https://github.com/johndyer/mediaelement/pull/897
+* Corrected buffering height on CSS (SourceR85 ) https://github.com/johndyer/mediaelement/pull/875
+* CSS cleanup (awittdesigns) https://github.com/johndyer/mediaelement/pull/883
+
+
+*2.12.0 (2013/06/02)*
+
+* Removed old media files from repo (reduced filesize from 150MB to 25MB)
+* Added `test.html` to `/tests/` folder to use JS files in `/src/` folder
+* Fullscreen plugin player toggles play/pause when controls are clicked (JeffreyATW) https://github.com/johndyer/mediaelement/pull/742
+* Making use of pluginWidth & pluginHeight (simonschuh) https://github.com/johndyer/mediaelement/pull/837
+* Proportional poster images (IE9+ Chrome, Safari, Firefox) (eyefood) https://github.com/johndyer/mediaelement/pull/838
+* Fixed video resolution on seek in flash (efEris) https://github.com/johndyer/mediaelement/pull/839
+* Option for custom error message when no plugins are found. (svoynow-lz) https://github.com/johndyer/mediaelement/pull/842
+* Fix for Safari to play video on HTTPS site (benroy73) https://github.com/johndyer/mediaelement/pull/845
+* Fixes Mute/UnMute when playing from a YouTube source (mbaker3) https://github.com/johndyer/mediaelement/pull/848
+* i18n fixes for better compatibility with WordPress (SergeyBiryukov) https://github.com/johndyer/mediaelement/pull/850
+* Fixing invalid characters restrictions for URLs (sebablanco) https://github.com/johndyer/mediaelement/pull/859
+* Checking for pluginType on media instead of mediaelementplayer in Fullscreen (JeffreyATW) https://github.com/johndyer/mediaelement/pull/865
+* Problem with IE9 on Windows 7 N / Windows 7 KN without WMP installed (sarvaje) https://github.com/johndyer/mediaelement/pull/868
+* Cleanup stylesheet (jawittdesigns) https://github.com/johndyer/mediaelement/pull/867
+* Properly treat namespace-only events for `globalUnbind()` (odnamrataizem) https://github.com/johndyer/mediaelement/pull/878
+* Fixed issue with slash character separating time (S2) https://github.com/johndyer/mediaelement/pull/879
+
+*2.11.3 (2013/04/13)*
+
+* Change to `getScriptPath` to allow querystring variables to be added (for Wordpress Core)
+
+*2.11.2 (2013/04/12)*
+
+* Fixed overly aggressive XSS testing (excluding forward slashes)
+* Fixed line endings on Flash (*.as) files (markjaquith) (https://github.com/johndyer/mediaelement/pull/834)
+* Included protocol relative URL for YouTube (Dan Tsosie) (https://github.com/johndyer/mediaelement/pull/832)
+
+*2.11.1 (2013/04/11)*
+
+Major changes
+
+* Removed Ogg, WebM, and MP3 files to keep download under 10MB. Files are now at https://github.com/johndyer/mediaelement-files
+* Simple Flash Pseudo-streaming [set enablePseudoStreaming:true, pseudoStreamingStartQueryParam:'start'] (BryanMorgan) (https://github.com/johndyer/mediaelement/pull/814)
+* Fixed possible XSS attack through `file=` parameter in `flashmediaelement.swf`
+
+Fixes and updates
+
+* Protocol relative YouTube URLs for `iframe` API (dtsosie) (https://github.com/johndyer/mediaelement/pull/825)
+* Added aria-label to all button elements (Luzifer) (https://github.com/johndyer/mediaelement/pull/824)
+* Fixed preroll adclick URL (johndyer)
+* Traditional chinese locale strings for i18n module (latzt) (https://github.com/johndyer/mediaelement/pull/820)
+* Allow captions on audio player (LeResKP) (https://github.com/johndyer/mediaelement/pull/819)
+* Fix incorrect path returned by `getScriptPath()` (Ciki) (Fix incorrect path returned by getScriptPath())
+* Overhauling hover div creation and placement (JeffreyATW) (https://github.com/johndyer/mediaelement/pull/813)
+* Clear timeout for second fullscreen stretch attempt (JeffreyATW) (https://github.com/johndyer/mediaelement/pull/812)
+* fix type resolution when extension is uppercased (jbdemonte) (https://github.com/johndyer/mediaelement/pull/801)
+* "splice is not a function" fix on `MediaElementPlayer.remove()` (odnamrataizem) (https://github.com/johndyer/mediaelement/pull/799)
+* Make Flash stage handle CLICK rather than MOUSE_DOWN (odnamrataizem) (https://github.com/johndyer/mediaelement/pull/804)
+
+
+*2.11.0 (2013/03/13)*
+
+* Preroll ads manager
+* VAST ads plugin (sponsored by Minito Video)
+* Slides `<track>` type (non-standard HTML5 use)
+* Calculate rails size only with visible elements (romanbsd) (https://github.com/johndyer/mediaelement/pull/773)
+* Round calculations of progress bar to prevent fractions (romanbsd) (https://github.com/johndyer/mediaelement/pull/768)
+* Fix AndroidUseNativeControls (LeResKP) (https://github.com/johndyer/mediaelement/pull/749)
+* Muting the volume icon if startVolume is set to 0 (heartcode) (https://github.com/johndyer/mediaelement/pull/747)
+* Make YouTube URL protocol relative (strworkstation) (https://github.com/johndyer/mediaelement/pull/761)
+* Prevent Flash audio player from sending too many 'progress' events (johndyer)
+* Properly clean up player when calling MediaElementPlayer.remove() (odnamrataizem) (https://github.com/johndyer/mediaelement/pull/779)
+* Add "mejs-shim" class to all shims to prevent improper resizing (JeffreyATW) (https://github.com/johndyer/mediaelement/pull/789)
+* Bug fix for the error "this.pluginApi.pauseMedia is not a function" when using the flash player and removing the dom element. (Jmaharman) https://github.com/johndyer/mediaelement/pull/788
+* Make possible to open youtube links as audio only (Seb33300) https://github.com/johndyer/mediaelement/pull/784
+* Add a few basic Jasmine tests (msgilligan) https://github.com/johndyer/mediaelement/pull/781
+* Add option to hide the video controls on load (eResKP) https://github.com/johndyer/mediaelement/pull/780#issuecomment-14781622
+* [cc] button can now be a toggle when there's just one track (LeResKP) https://github.com/johndyer/mediaelement/pull/793
+* fixed error when srclang was missing
+
+*2.10.3 (2013/01/27)*
+
+* Fix broken scrollbar from API reference error (peterbrook) (https://github.com/johndyer/mediaelement/pull/739)
+
+*2.10.2 (2013/01/26)*
+
+* The project is now MIT-only, instead of dual licensed MIT and GPL (just as jQuery has done: http://jquery.org/license/)
+* Fix audio height in 100% mode (https://github.com/johndyer/mediaelement/pull/667)
+* Make rewinding at the end optional (https://github.com/johndyer/mediaelement/pull/725)
+* Bugfix: attributes for PluginMediaElement (https://github.com/johndyer/mediaelement/pull/722)
+* Add mejs-long-video class when capture is 1hr or longer, custom styles (https://github.com/johndyer/mediaelement/pull/715)
+* Fix for dragging playhead horizontally off the video (https://github.com/johndyer/mediaelement/pull/711)
+* Align timing of captions with show/hide controls (https://github.com/johndyer/mediaelement/pull/708)
+* Missing semicolon (https://github.com/johndyer/mediaelement/pull/737)
+* Don't send timeupdate event after ended event (https://github.com/johndyer/mediaelement/pull/727)
+* Added option to disable pause/play on main div click (https://github.com/johndyer/mediaelement/pull/735)
+
+*2.10.1 (2012/12/31)*
+
+* New postroll feature (https://github.com/johndyer/mediaelement/pull/660)
+* PluginMediaElement click-to-pause behavior doesn't work (https://github.com/johndyer/mediaelement/pull/691)
+* Use the normal CSS property name after the vendor prefix (https://github.com/johndyer/mediaelement/pull/686)
+* Select first source that is supported by the browser (https://github.com/johndyer/mediaelement/pull/679)
+* fixed outerWidth for jQuery 1.8 compatiability (https://github.com/johndyer/mediaelement/pull/680)
+* Fix for Issue #676 when Stop button does not behaves as expected in selected browsers (https://github.com/johndyer/mediaelement/pull/678)
+* Fix source switching on Webkit in SourceChooser (https://github.com/johndyer/mediaelement/pull/675)
+* Better 100% mode handling within non-visible container (https://github.com/johndyer/mediaelement/pull/668)
+* Display chapter tracks for late-loading video sources, including YouTube (https://github.com/johndyer/mediaelement/pull/665)
+* Added SVG Stop icon (https://github.com/johndyer/mediaelement/pull/696)
+* Added SVG source chooser icon (https://github.com/johndyer/mediaelement/pull/669)
+* Adding rounding to volume slider left, top, and and width setters (https://github.com/johndyer/mediaelement/pull/684)
+* Display chapter tracks for late-loading video sources, including YouTube (https://github.com/johndyer/mediaelement/pull/665)
+
+*2.10.0 (2012/11/23)*
+
+* Support of matchMedia where possible [zachleat]
+* Fix for 100% audio using correct sizing [dougwilson]
+* SVG icons for better Retina support [johndyer]
+* Localized buttons [latzt] https://github.com/johndyer/mediaelement/pull/627
+* Volume handle doesn't set initial position properly [JeffreyATW] https://github.com/johndyer/mediaelement/pull/625
+* Cleaned up some CSS whitespace https://github.com/johndyer/mediaelement/pull/656
+* Vimeo - updated to iframe code (from old megaloop)
+
+*2.9.5 (2012/09/26)*
+
+* Fixed faulty FlashMediaElement.swf (due to Git program mashing it)
+* Fixed track element issues introduced by DFXP captions
+
+*2.9.4 (2012/09/24)*
+
+* Improved RTMP parsing [pansapien] https://github.com/johndyer/mediaelement/pull/574
+* Added `flashStreamer` option to separate streamer from file
+* Raise an error for unknown video size in Flash [denmarkin] https://github.com/johndyer/mediaelement/pull/571
+* Fix for alwaysShowControls with keyboard interaction [peterh-capella] https://github.com/johndyer/mediaelement/pull/569
+* Support for DFXP captions [justinl-capella] https://github.com/johndyer/mediaelement/pull/420
+
+*2.9.3 (2012/08/23) *
+
+* Allows use of `style="max-width: 100%;"` for responsive video
+* Added type to source buttons in mep-feature-sourcechooser.js:48 [flamadiddle ]
+* Fix use of inArray and $ in src/js/me-shim.js [lftl, Seb33300, eusonic and others] (this was a regression bug from another fix)
+* Fixing syntax error in events demo [JeffreyATW]
+
+*2.9.2 (2012/07/06) *
+
+* Added a few height checks (from Joe Anderson)
+* Removed console.log statements
+* Better file MIME type detection when the "type" attribute is not set (Seb33300)
+* Pass the event keyCode to the keyActions handler, and make seek interval configurable (bborn)
+* Responsive flash fix, YouTube edits (heikki)
+* New `auto_plugin` mode that starts with plugins then tries HTML5 (savil)
+
+*2.9.1 (2012/06/01)*
+
+* Fixed Firefox 10+ Fullscreen error
+
+*2.9.0 (2012/05/31)*
+
+* Fixed pointer-events detection in IE9 (when using Flash mode or YouTube)
+* YouTube now shows annotations (using YouTube player rather than chromeless)
+* Fix play/pause when clicking on video when overlays are displayed [markomarkovic]
+* Dont listen to mouse events when there's not a reason to [neverarriving]
+* Adding CSS animated buffer to the time rail [neverarriving]
+* Fix for box-sizing: border-box from cutting off time text. [MatthewCallis]
+
+*2.8.2 (2012/05/15)*
+
+* Fixed volume slider bug when initially hidden
+* Fixed YouTube size problems in Flash mode
+
+*2.8.1 (2012/04/19)*
+
+* Flash fullscreen: video not fullsized
+* Flash fullscreen: youtube controls not working
+
+*2.8.0 (2012/04/17)*
+
+* Revamped YouTube to work using the Flash shim so that it supports fullscreen
+* Fix for `remove()` method (lennym)
+* Fix possible issue with ContextMenu ( quangvhg)
+* Fix for stop button ( slavva97)
+* Type on `var` and `;` (lennym)
+* Fix for keyboard support forward and backward (myffical)
+
+*2.7.0 (2012/03/12)*
+
+* Added horizontal volume control, the new default for audio (based on work by [gavinlynch](http://github.com/gavinlynch))
+* Possible issues with < IE8 centering resolved
+* Full set of controls under Silverlight ([Birol2010](https://github.com/Birol2010/))
+* YouTube fix [raknam]
+* shim now has a .tagName property, and other DOM-like methods [tantalic]
+* Poster display fix when HTML5, Flash, and Silverlight are all missing [bruha]
+* Source Chooser plugin [markomarkovic]
+* Fix for flash audio mute [lbernau]
+
+*2.6.5 (2012/02/01)*
+
+* Removed iOS 3.x poster code [xtat] [James Cross]
+* Fixed bug when player is initially hidden in `display:none;`
+* Workaround for when inside an `<iframe>` and Chrome doesn't correctly report exiting from fullscreen
+
+*2.6.4 (2012/01/10)*
+
+* Fixed a Flash bug when one video ended and another was loaded through `setSrc()` and `load()`
+* Option for markup between current time and duration [tantalic]
+
+*2.6.3 (2012/01/08)*
+
+* Sending all options to Flash including colors
+
+*2.6.2 (2012/01/06)*
+
+* Fixed Flash fullscreen button inside an `<iframe>`
+* Fixed flash auto starting in 100% mode
+
+*2.6.1 (2012/01/03)*
+
+* Updated Opera's Flash Fullscreen support (apparently, it doesn't like pointer-events:none with Flash)
+* Added a `fullscreenchange` event to Flash to better track events
+
+*2.6.0 (2011/12/27)*
+
+* added major updates to Flash fullscreen mode controls [rmhall]
+* added sneaky `pointer-events: none` to allow Flash to enter fullscreen in one clean click
+* added missing CSS3 gradients syntaxes (kristerkari)[https://github.com/johndyer/mediaelement/pull/339]
+* added check for left offset to detect when mousedrag exceeds top boundary [jmcneese](https://github.com/johndyer/mediaelement/pull/335)
+
+*2.5.0 (2011/12/15) - 56kb*
+
+* Flash fullscreen now works on hover, so it's much easier to use. For Firefox it's always on, but for others `usePluginFullScreen:true` option
+* For the audio player, Flash objects are positioned outside the main `<div>` which allows the player to be hidden without breaking flash
+* Volume controls was adjusted slightly
+* Removed Google translate features (Google killed the API)
+
+*2.4.3 (2011/12/10)*
+
+* keyboard controls are now an array, allowing multiple keys to do the same thing
+* support for Google TV keybuttons (based on above)
+* arrow keys now move when paused
+* floating time is now handled via JavaScript instead of CSS :hover (and removed from touch devices)
+
+*2.4.2 (2011/12/06) - 57.3kb*
+
+* keyboard controls (up/down controls volume, left/right seeks, space play/pause, f goes fullscreen)
+* `<audio>` now works with 100% for responsive layouts [283](https://github.com/johndyer/mediaelement/issues/283)
+* Support for auto start with class `mejs-player` and `data-mejsoptions` e.g. `<video src="media.mp4" class="mejs-player" data-mejsoptions='{"features":["playpause","progress","volume"}, "success": "myCallback"}'><video>`
+* With multiple players on a page, when one starts the others pause (toggle `pauseOtherPlayers: true`) [285](https://github.com/johndyer/mediaelement/issues/285)
+
+*2.4.1 (2011/12/05) - 55.7kb*
+
+* Fixed fullscreen bug with Firefox (with Video for Everybody syntax) [270](https://github.com/johndyer/mediaelement/issues/270)
+* Added `remove()` method to `MediaElement` and `MediaElementPlayer` to safely remove Flash (from IE) [111](https://github.com/johndyer/mediaelement/issues/111)
+* Added a demo of MEJS skins to the /demo/ folder
+* Closed issue with `ended` event in Flash (my example works) [246](https://github.com/johndyer/mediaelement/issues/246)
+* Flash has better support for `preload="auto"` [290](https://github.com/johndyer/mediaelement/issues/290)
+
+*2.4.0 (2011/11/28) - 54.9kb*
+
+* Integration with YouTube API (and intial support for Vimeo API) : http://mediaelementjs.com/examples/?name=youtube
+* Catch when Google Translate fails due to API limits
+
+*2.3.3 (2011/11/21) - 49.4kb*
+
+* removed volume controls for touch devices (Android and iOS require hardware volume)
+* set a timeout to hide controls on touch devices
+* fixed timecode bug with :09 (used radix)
+* fixed bug when long videos end: (try/catch)
+* fixed issue with `alwaysShowControls`
+* removed a `console.log` in fullscreen that broke IE
+
+*2.3.2 (2011/11/12) 49.6kb*
+
+* removed `http` from Flash and Silverlight embeds to support SSL
+* fixed a possible bug when neither `src` nor `type` was specified
+* turned off useCapture for a few events
+
+*2.3.1 (2011/11/07)*
+
+* Another set of changes to handle various browser native fullscreen issues
+* New control behavior for touch enabled devices (iPad, Android tablets)
+* Bug fix for Flash (bradleyboy)
+
+*2.3.0 (2011/11/01) - 48.5kb*
+
+* Fixed bug when fullscreen was called before play pressed
+* Additional classes mejs-audio, mejs-video, mejs-ios, mejs-iphone, mejs-ipad, mejs-android added to contianing `<div>` for styles
+* IE9 can't use `<video width="100%">` so you must use either options ({videoHeight:'100%'}) or inline style `<video style="width:100%;height:100%;">`
+* updated fullscreen code for Safari (erktime)
+* loading indicators shows during 'waiting' event
+* iOS and Android now show "big play" button again (sometimes overlaps on iPhone)
+
+*2.2.5 (2011/10/14)*
+
+* fix for Flash fallback in certain scenarios (IE RegExp problem, Firefox fullscreen Flash issue)
+* adjustments for floating time indicator
+
+*2.2.4 (2011/10/10)*
+
+* True FullScreen support in Firefox (nightly) and Chrome (Canary)
+* more updates for 100% mode
+* enableContextMenu(), disableContextMenu() methods
+* change to poster code to let it be set later
+
+*2.2.3 (2011/10/07b) - 45.8kb*
+
+* updated accessibility again for JAWS and NVDA (thanks to twitter.com/mohammed0204)
+* added CSS class `<html class="mejs-embed">` for `<iframe>` embeds
+
+*2.2.2 (2011/10/07) - 45.8kb*
+
+* added support for <del>`<video width="100%" height="100%"></video>`</del> `<video style="width:100%;height:100%"></video>` (i.e. responsive/adaptive players)
+* added :focus state for buttons to improve accessibility
+* added title and aria-controls attributes to buttons to improve accessibility
+* changed when loading circle appears (WebKit fires the 'loadstart' event differently than FF or IE)
+
+*2.2.1 (2011/10/06) - 44.1kb*
+
+* fixed a bug with fullscreen that caused IE to completely mess up it layout
+* fixed another bug with fullscreen and z-index
+
+*2.2.0 (2011/10/04)*
+
+* controls now display on iPad, iPhone, and Android. Can be turned off using (iPadForceNativeControls:true)
+* fullscreen support for iPad (different from true fullscreen on Safari 5.1)
+* added frameaccurate timecode (via gselva)
+* added contextmenu as a feature. if turned on the default includes: fullscreen toggle, mute toggle, and media download
+* updated WebVTT support (still had some SRT formatting restrictions)
+* dynamic player creation: from `<a href="media.mp4">video</a>` and `<div class="mejs"></div>` specifying type (string or array)
+* Fixed bug where Flash couldn't go fullscreen with track chapters
+* fixed a bug with Flash fullscreen ratios
+* controls now disappear on timeout when mouse is idle (useful for fullscreen)
+* enableControls() and disableControls() (for pre/post roll scenarios)
+* added an autoplay override (especially for WebKit browsers)
+* fixed functionality of mute toggling
+* reorganized plugins to use $.extend
+* updating functionality of loading graphic to account for various browser inconsistencies (loadstart event)
+
+*2.1.9 (2011/08/04) - 36.9kb*
+
+* fixed Android 2.1 and 2.2 playing problems (still need a good 2.3 and 3.0 device. hint. hint.)
+
+*2.1.8 (2011/08/03) - 36.9kb*
+
+* True fullscreen for Safari 5.1
+* Flash/Silverlight fullscreen is now "full window" (except for Firefox which cannot handle adjusting Flash without reloading it)
+
+*2.1.7 (2011/07/19) - 35.9kb*
+
+* fixed mute button (kaichen)
+* added alwaysShowControls option (kaichen)
+* forceful padding override on buttons
+* started "ender" branch to experiment with removing jQuery dependency and baking in ender.js
+* updated the use of `type` javascript option with src is present
+* remove preload="none" hack for Chrome now that it supports it (note: Chrome still strangely fires a 'loadstart' event)
+* added hooks for other jQuery compatible libraries like [ender.js](http://enderjs.com)
+* Wordpress: if you don't specify a file extension, mejs will look for attached files and use them [video src="/wp-content/uploads/myfile"]
+* Wordpress: option to select a 'skin'
+* Wordpress: option to select audio width/height
+
+*2.1.6 (2011/06/14) - 35.5kb*
+
+* fix errors when the progress bar isn't present
+* buttons are now actual `<button>` tags which allows tabbed controls (for better accessibility and possible ARIA support)
+* fix problems with low volume in Flash on startup (startVolume was sometimes 0!)
+* updated a few places to use jQuery 1.6's new prop/attr methods
+* updated skins to account for new `<button>` (still need highlighted style)
+
+*2.1.5 (2011/05/28) - 35.2kb*
+
+* minor fix for controls not showing time or duration
+* when switching files, the Flash plugin now forcibly stops downliading
+
+*2.1.4 (2011/05/20) - 35.2kb*
+
+* fixed display of hours
+* fixed Flash audio bug where pausing when the file wasn't fully loaded would cause the progress bar to go offscreen
+* fixed Flash video bug where percent loaded was always 100%
+* fixed Flash audio bug where pressing pause, then play would always restart playback from the beginning
+* startVolume works more clearly in plugins (esp. Opera and Linux)
+* tracks support no longer refers to WebSRT, but is more generic for WebVTT (not all features of WebVTT are supported yet)
+* fixed fullscreen in Safari OS X 10.5 (which doens't really support true fullscreen)
+* Flash and Silverlight can now start downloading if preload="auto" or preload="metadata" (warning: preload="metadata" will load the entire thing)
+
+*2.1.3 (2011/04/12) - 35.8kb*
+
+* added support for hours in time format (00:00:00) and an alwaysShowHours option to force hours to always show
+* removed some duplicate flash events
+* added 'seeking' event to Flash/SL (already had 'seeked')
+
+*2.1.2 (2011/03/23) - 34.4kb*
+
+* fixed IE6 and IE7 caption position
+* fixed IE7 failure in certain places
+* changed browser UA detection to use only lowercase (iPhone iphone)
+* fixed Flash audio loaded bug (reporting 0 after loaded)
+* added removeEventListener to shims
+* new rail-resizing code
+
+*2.1.1 (2011/03/07) - 33.5kb*
+
+* added 'loadeddata' event to Flash and Silverlight
+* switched to flashvars parameter to support Apache's mod_security
+* better flash fullscreen support
+* added flv-x to flash's accepted types
+* Fixed a bug in poster sizing (only affected IE)
+* added "isFullScreen" property to media objects (like Safari's webkitDisplayingFullscreen)
+* controls start hidden with autoplay
+* fixed iOS loading issues (success wasn't firing, other errors)
+* fixed IE6 when using new MediaElementPlayer(), rather than jQuery
+
+*2.1.0 (2011/02/23) - 32.9kb*
+
+* Updated control styles for a cleaner look
+* Added loadeddata and canplay events to Flash and Silverlight
+* Added loading indicator to MediaElementPlayer
+* Added stop button (pause, then return to currentTime:0)
+* IE6/7 CSS updates
+* Poster is now forced to the size of the player (could be updated to be proportional if someone wants to add that)
+* Updated Flash ended event to account for buffering weirdness
+* Fixed a track text hovering problem
+
+*2.0.7 (2011/02/13) - 31.9kb*
+
+* Added 'mode' option to force native (HTML5) or shim (Flash,Silverlight) modes
+* Fixed audio seeking bug in Flash (thanks Andy!)
+* Fixed startVolume not working in Flash
+* Overrided Chrome's autoplay since it doesn't always work
+
+*2.0.6 (2011/02/04) - 31.7kb*
+
+* Whitespace cleanup on files
+* Preventing flash/sl plugins from reinitializing when they are removed by another script
+* Fixed IE JavaScript errors in Flash fallback (seen in Wordpress)
+* Added 'play' event to Silverlight to prevent errors
+
+*2.0.5 (2011/01/25) - 31.7kb*
+
+* Added error object to player
+* Adjusted popup timer and progress bar
+* Fixed media URL escaping
+* Stopped sending poster to plugin
+* Silverlight culture update
+* Added back reference check (also makes jQuery usage easier)
+* Added stop() function to mediaelement
+* timerupdate still fires when paused (plugins)
+* Added Security.allowDomain("*") to Flash so it can be used on different domains
+* Fixed progress bar for Firefox 3 with Ogg files
+* Prevented Flash from re-creating the player when show/hide restarts it
+* Fixed initial volume level in non-HTML5 players
+* Made PNG8 versions of controls images (for IE6)
+
+*2.0.4 (2011/01/14) - 31.2kb*
+
+* Fixed a major bug in plugin detection.
+
+*2.0.3 (2011/01/13) - 31.2kb*
+
+* changed IE Flash insertion to include me-plugin CSS class
+* changed player error handling
+* fixed a bug in the Silverlight player related to URLs
+
+*2.0.2 (2010/12/31) - 31.1kb*
+
+* Changed HTML escape method to encodeURICompnent
+* Flash-based RMTP support (contributor: sylvinus)
+* Fixed Wordpress loop bug
+* Changed time popup to move with mouse instead of currentTime
+* added enablePluginSmoothing (Flash)
+* Added some "play" "playing" event duplication to Flash
+
+*2.0.1 (2010/12/20) - XX.Xkb*
+
+* Changed Flash to allow cross domain video
+* Added 'click' event to Flash and Silverlight
+* Updated autoplay attribute detection
+
+*2.0.0 (2010/12/13) - 30.8kb*
+
+* Reorganized MediaElementPlayer code to allow each button to become a pluggable feature that can be removed or overrided
+* Enabled a no JavaScript version to support Video for Everybody nested syntax (optional)
+* Enabled drag on progress bar
+* Preload="none" is default for Flash and Silverlight
+* Preload="none" enabled on Google Chrome
+* Added skins to download
+* Support for skin swapping
+* Updated volume handle controls
+* Update progress controls display
+* Exposed MediaElement API methods on player
+* Adjusted layout for IE6
+
+*1.1.7 (2010/11/29) - 29.8kb*
+
+* Fixed bug with `<track>` loading on `<audio>` player
+
+*1.1.6 (2010/11/23) - 29.8kb*
+
+* Chapters support `<track kind="chapters" />`
+
+*1.1.5 (2010/11/21) - 29.8kb*
+
+* Workaround for IE issues when accidentally placed inside `<p>` tag
+* Fixed silverlight pause state reporting
+* Switched back to Flash as default
+* Removed requirement for Google translate API `<script>` (direct JSONP call)
+* Added googleApiKey option
+
+*1.1.4 (2010/11/21) - 29.5kb*
+
+* Added Default volume level to options (0.8)
+* Fix for IE volume slider positioning
+* Fix for IE tracks parsing (replacement String.split)
+* Changed namespace from html5 to mejs
+* Remove all showMessage references
+* Controls show again after playback ends
+
+*1.1.3 (2010/11/20) - 29.0kb*
+
+* Change to fallback mechanism and styling (Windows Phone 7)
+
+*1.1.2 (2010/11/19) - 28.9kb*
+
+* Removed messages, added big play button
+* Google translate now supports more than 1000 characters
+* Added a dropdownlist of languages from which the user can select
+* Added timerUpdate option to set the millisecond speed of timeupdate events
+* Updated the media file and examples
+
+*1.1.1 (2010/11/18) - 27.1kb*
+
+* added captioning support via the `<track>` tag (thanks to [Playr](http://www.delphiki.com/html5/playr) for the example)
+* added auto-translation support via Google translate API
+
+*1.1.0 (2010/11/17) - 22.6kb*
+
+* Total re-oganization of MediaElement, MediaElementPlayer, and supporting objects
+* Updated CSS to a cleaner look, with better IE support & big play button
+* Simplified all plugin and version detection
+* Added loop option (useful for audio files)
+* Added the ability to turn each control button on/off
+* Added canPlayType to PluginMediaElement
+* Updated setSrc to take multiple sources
+
+*1.0.7 (2010/11/16) - 18.15kb*
+
+* Total re-oganization of MediaElement code
+* JSLint compliant, YUI...
[truncated message content] |
|
From: <txm...@us...> - 2014-04-13 07:52:05
|
Revision: 12443
http://sourceforge.net/p/xoops/svn/12443
Author: txmodxoops
Date: 2014-04-13 07:51:58 +0000 (Sun, 13 Apr 2014)
Log Message:
-----------
Added custom themeform in subdirectory
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/index.html
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/themeform.php
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/index.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/index.html (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/index.html 2014-04-13 07:51:58 UTC (rev 12443)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/themeform.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/themeform.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/form/themeform.php 2014-04-13 07:51:58 UTC (rev 12443)
@@ -0,0 +1,65 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.5
+ * @author Txmod Xoops <su...@tx...>
+ * @version $Id: 1.59 themeform.php 11297 2013-03-24 10:58:10Z timgno $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+xoops_load('XoopsFormLoader');
+
+/**
+ * Form that will output as a theme-enabled HTML table
+ *
+ * Also adds JavaScript to validate required fields
+ */
+class TDMCreateThemeForm extends XoopsForm
+{
+ /**
+ * create HTML to output the form as a theme-enabled table with validation.
+ *
+ * YOU SHOULD AVOID TO USE THE FOLLOWING Nocolspan METHOD, IT WILL BE REMOVED
+ *
+ * To use the noColspan simply use the following example:
+ *
+ * $colspan = new XoopsFormDhtmlTextArea( '', 'key', $value, '100%', '100%' );
+ * $colspan->setNocolspan();
+ * $form->addElement( $colspan );
+ *
+ * @return string
+ */
+ public function render()
+ {
+ $ele_name = $this->getName();
+ $ret = ($this->getTitle() ? '<div class=" center head ">' . $this->getTitle() . '</div>' : '');
+ $ret .= NWLINE . '<form name="' . $ele_name . '" id="' . $ele_name . '" action="' . $this->getAction() . '" method="' . $this->getMethod() . '" onsubmit="return xoopsFormValidate_' . $ele_name . '();"' . $this->getExtra() . '>' . NWLINE;
+ $hidden = '';
+ $class = 'even';
+ foreach ($this->getElements() as $ele) {
+ if (!is_object($ele)) {
+ $ret .= $ele;
+ } else if (!$ele->isHidden()) {
+ $ret .= $ele->render();
+ } else {
+ $hidden .= $ele->render();
+ }
+ }
+ $ret .= NWLINE . ' ' . $hidden . NWLINE . '</form>';
+ $ret .= $this->renderValidationJS(true);
+ return $ret;
+ }
+}
\ No newline at end of file
|
8 messages has been excluded from this view by a project administrator.
