Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12467] XoopsCore/branches/2.5.x/2.5.7/htdocs/modules
|
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] |
