xoops-svn

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

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

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'>&nbsp;</td>
-            <td class='even'>
-                <{foreach item=element from=$pmform.elements}>
-                    <{if $element.hidden == 1}>
-                        <{$element.body}>
-                    <{/if}>
-                <{/foreach}>
-                <{$pmform.elements.submit.body}>&nbsp;
-                <{$pmform.elements.reset.body}>&nbsp;
-                <{$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'>&nbsp;</td>
+            <td class='even'>
+                <{foreach item=element from=$pmform.elements}>
+                    <{if $element.hidden == 1}>
+                        <{$element.body}>
+                    <{/if}>
+                <{/foreach}>
+                <{$pmform.elements.submit.body}>&nbsp;
+                <{$pmform.elements.reset.body}>&nbsp;
+                <{$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>&nbsp;
-<{elseif $op == "save"}>
-    <a href='viewpmsg.php?op=save' title='<{$smarty.const._PM_SAVEBOX}>'><{$smarty.const._PM_SAVEBOX}></a>&nbsp;
-<{else}>
-    <a href='viewpmsg.php?op=in' title='<{$smarty.const._PM_INBOX}>'><{$smarty.const._PM_INBOX}></a>&nbsp;
-<{/if}>
-
-<{if $message}>
-    <span class='bold'>&raquo;&raquo;</span>&nbsp;<{$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}>&amp;total_messages=<{$total_messages}>&amp;op=<{$op}>' title='<{$smarty.const._PM_PREVIOUS}>'>
-                            <{$smarty.const._PM_PREVIOUS}>
-                        </a>&nbsp|&nbsp;
-                    <{else}>
-                        <{$smarty.const._PM_PREVIOUS}>&nbsp;|&nbsp;
-                    <{/if}>
-                    <{if ( $next < $total_messages ) }>
-                        <a href='readpmsg.php?start=<{$next}>&amp;total_messages=<{$total_messages}>&amp;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>&nbsp;
+<{elseif $op == "save"}>
+    <a href='viewpmsg.php?op=save' title='<{$smarty.const._PM_SAVEBOX}>'><{$smarty.const._PM_SAVEBOX}></a>&nbsp;
+<{else}>
+    <a href='viewpmsg.php?op=in' title='<{$smarty.const._PM_INBOX}>'><{$smarty.const._PM_INBOX}></a>&nbsp;
+<{/if}>
+
+<{if $message}>
+    <span class='bold'>&raquo;&raquo;</span>&nbsp;<{$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>
+           ...
 
[truncated message content]

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

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

Revision: 12536
          http://sourceforge.net/p/xoops/svn/12536
Author:   beckmi
Date:     2014-05-19 07:28:51 +0000 (Mon, 19 May 2014)
Log Message:
-----------
added update routine to delete .html templates (slider84)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/menu.php
    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/include/update.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/header.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php

Added Paths:
-----------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/style.css

Removed Paths:
-------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/style.css

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/menu.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/menu.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/menu.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -17,7 +17,7 @@
  * @version         $Id$
  */
 
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 $path = dirname(dirname(dirname(dirname(__FILE__))));
 include_once $path . '/mainfile.php';

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-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt	2014-05-19 07:28:51 UTC (rev 12536)
@@ -2,6 +2,7 @@
 -------------------
 - moved all images, CSS, and JS files to /assets (mamba)
 - renamed .html Smarty templates to .tpl (mamba)
+- added routine to delete .html templates (slider84)
 
 Version 1.09
 -------------------

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -21,19 +21,29 @@
 {
 
     if ($oldversion <= 100) {
-    GLOBAL $xoopsDB;
-    // Check pm table version
-    $sql = "SHOW COLUMNS FROM " . $xoopsDB->prefix("priv_msgs");
-    if (!$result = $xoopsDB->queryF($sql)) {
-        return false;
+        GLOBAL $xoopsDB;
+        // Check pm table version
+        $sql = "SHOW COLUMNS FROM " . $xoopsDB->prefix("priv_msgs");
+        if (!$result = $xoopsDB->queryF($sql)) {
+            return false;
+        }
+        // Migrate from existent pm module
+        if (($rows = $xoopsDB->getRowsNum($result)) == 12) {
+            return true;
+        } elseif ($rows == 8) {
+            return $xoopsDB->queryFromFile(XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/sql/mysql.upgrade.sql");
+        } else {
+            return false;
+        }
     }
-    // Migrate from existent pm module
-    if ( ($rows = $xoopsDB->getRowsNum($result)) == 12) {
-        return true;
-    } elseif ($rows == 8) {
-        return $xoopsDB->queryFromFile(XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/sql/mysql.upgrade.sql");
-    } else {
-        return false;
+    // remove old html template files
+    $template_directory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/templates/";
+    $template_list      = array_diff(scandir($template_directory), array('..', '.'));
+    foreach ($template_list as $k => $v) {
+        $fileinfo = new SplFileInfo($template_directory . $v);
+        if ($fileinfo->getExtension() == 'html' && $fileinfo->getFilename() != 'index.html') {
+            @unlink($template_directory . $v);
+        }
     }
-    }
+    return null;
 }

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -17,7 +17,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * PM core preloads

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -17,7 +17,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * PM system preloads

Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/style.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/style.css	                        (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/style.css	2014-05-19 07:28:51 UTC (rev 12536)
@@ -0,0 +1,13 @@
+.breadcrumbs { font-size: 1.2em;  padding: 10px 2px;}
+.breadcrumbs span { border: 0;  padding: 0 2px;}
+.breadcrumbs .item {}
+.breadcrumbs .delimiter { font-size: 1.2em;}
+.register-steps { font-size: 1.2em;  padding: 5px 2px;}
+.register-steps span {  border: 0;  padding: 0 2px;}
+.register-steps .current { font-weight: bold; text-decoration: underline;}
+.register-steps .delimiter { font-size: 1.2em;}
+table.profile-form  { width: 90%;}
+.profile-form td.head { width: 20%;}
+.profile-list-category table { width: 80%; margin: 10px 5px;}
+.profile-list-category td.head { width: 20%;}
+.profile-list-activity { width: 90%; padding: 5px;}
\ No newline at end of file

Modified: 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/docs/changelog.txt	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt	2014-05-19 07:28:51 UTC (rev 12536)
@@ -3,6 +3,7 @@
 - moved all images, CSS, and JS files to /assets (mamba)
 - renamed .html Smarty templates to .tpl (mamba)
 - fixed missing .tpl (cesag/slider84)
+- added routine to delete .html templates (slider84)
 
 1.64 Final
 --------------------------------------

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/header.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/header.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -20,7 +20,7 @@
 
 $xoopsOption['pagetype'] = 'user';
 include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
-$xoopsOption['xoops_module_header'] = '<link rel="stylesheet" type="text/css" href="templates/style.css" />';
+$xoopsOption['xoops_module_header'] = '<link rel="stylesheet" type="text/css" href="assets/css/style.css" />';
 
 $xoBreadcrumbs = array();
 $xoBreadcrumbs[] = array("title" => $GLOBALS['xoopsModule']->getVar('name'), "link" => XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/');

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -106,6 +106,17 @@
         $GLOBALS['xoopsDB']->queryF("UPDATE `" . $GLOBALS['xoopsDB']->prefix("profile_field") . "` SET `field_valuetype`=1 WHERE `field_name`='umode'");
     }
 
+
+// remove old html template files
+    $template_directory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/templates/";
+    $template_list      = array_diff(scandir($template_directory), array('..', '.'));
+    foreach ($template_list as $k => $v) {
+        $fileinfo = new SplFileInfo($template_directory . $v);
+        if ($fileinfo->getExtension() == 'html' && $fileinfo->getFilename() != 'index.html') {
+            @unlink($template_directory . $v);
+        }
+    }
+
     $profile_handler =& xoops_getModuleHandler("profile", $module->getVar('dirname', 'n') );
     $profile_handler->cleanOrphan($GLOBALS['xoopsDB']->prefix("users"), "uid", "profile_id");
     $field_handler =& xoops_getModuleHandler('field', $module->getVar('dirname', 'n') );

Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/style.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/style.css	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/style.css	2014-05-19 07:28:51 UTC (rev 12536)
@@ -1,13 +0,0 @@
-.breadcrumbs { font-size: 1.2em;  padding: 10px 2px;}
-.breadcrumbs span { border: 0;  padding: 0 2px;}
-.breadcrumbs .item {}
-.breadcrumbs .delimiter { font-size: 1.2em;}
-.register-steps { font-size: 1.2em;  padding: 5px 2px;}
-.register-steps span {  border: 0;  padding: 0 2px;}
-.register-steps .current { font-weight: bold; text-decoration: underline;}
-.register-steps .delimiter { font-size: 1.2em;}
-table.profile-form  { width: 90%;}
-.profile-form td.head { width: 20%;}
-.profile-list-category table { width: 80%; margin: 10px 5px;}
-.profile-list-category td.head { width: 20%;}
-.profile-list-activity { width: 90%; padding: 5px;}
\ No newline at end of file

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

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

Revision: 12620
          http://sourceforge.net/p/xoops/svn/12620
Author:   beckmi
Date:     2014-06-19 21:07:49 +0000 (Thu, 19 Jun 2014)
Log Message:
-----------
Fix path specified for include

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/about.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groupperm.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/about.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/about.php	2014-06-18 22:38:58 UTC (rev 12619)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/about.php	2014-06-19 21:07:49 UTC (rev 12620)
@@ -17,7 +17,7 @@
  * @version    $Id $
  **/
 
-include_once dirname(__FILE__) . '../../../include/cp_header.php';
+include_once dirname(__FILE__) . '/../../../include/cp_header.php';
 include_once dirname(__FILE__) . '/admin_header.php';
 xoops_cp_header();
 

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groupperm.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groupperm.php	2014-06-18 22:38:58 UTC (rev 12619)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groupperm.php	2014-06-19 21:07:49 UTC (rev 12620)
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 
-include_once dirname(__FILE__) . '../../../include/cp_header.php';
+include_once dirname(__FILE__) . '/../../../include/cp_header.php';
 $modid = isset($_POST['modid']) ? intval($_POST['modid']) : 0;
 
 // we don't want system module permissions to be changed here

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

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

Revision: 12715
          http://sourceforge.net/p/xoops/svn/12715
Author:   beckmi
Date:     2014-07-16 17:10:42 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
adding code to .html template entries from the tpl table

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php	2014-07-16 14:05:18 UTC (rev 12714)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php	2014-07-16 17:10:42 UTC (rev 12715)
@@ -25,7 +25,7 @@
 {
 
     if ($oldversion <= 100) {
-        GLOBAL $xoopsDB;
+        global $xoopsDB;
         // Check pm table version
         $sql = "SHOW COLUMNS FROM " . $xoopsDB->prefix("priv_msgs");
         if (!$result = $xoopsDB->queryF($sql)) {
@@ -51,12 +51,15 @@
                 @unlink($templateDirectory . $v);
             }
         }
-        // Load class XoopsFile
+
         xoops_load('xoopsfile');
         //remove /images directory
         $imagesDirectory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/images/";
         $folderHandler = XoopsFile::getHandler("folder", $imagesDirectory);
         $folderHandler->delete($imagesDirectory);
+        //delete .html entries from the tpl table
+        $sql = "DELETE FROM " . $xoopsDB->prefix("tplfile") . " WHERE `tpl_module` = '" .$module->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+        $xoopsDB->queryF($sql);
     }
 
     return true;

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php	2014-07-16 14:05:18 UTC (rev 12714)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php	2014-07-16 17:10:42 UTC (rev 12715)
@@ -116,7 +116,7 @@
                 @unlink($templateDirectory . $v);
             }
         }
-        // Load class XoopsFile
+
         xoops_load('xoopsfile');
         //delete /images directory
         $imagesDirectory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/images/";
@@ -126,6 +126,9 @@
         $cssFile = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/templates/style.css";
         $folderHandler   = XoopsFile::getHandler("file", $cssFile);
         $folderHandler->delete($cssFile);
+        //delete .html entries from the tpl table
+        $sql = "DELETE FROM " . $GLOBALS['xoopsDB']->prefix("tplfile") . " WHERE `tpl_module` = '" .$module->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+        $GLOBALS['xoopsDB']->queryF($sql);
     }
 
     $profile_handler =& xoops_getModuleHandler("profile", $module->getVar('dirname', 'n'));