[xoops-svn] SF.net SVN: xoops-svn:[10936] XoopsCore/branches/2.5.x/2.5.6

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10936
          http://sourceforge.net/p/xoops/svn/10936
Author:   beckmi
Date:     2013-01-27 23:53:28 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
Reverting changes related to paths for ranks and smilies

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/misc.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html
    XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html
    XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php

Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
===================================================================

--- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2013-01-27 22:25:30 UTC (rev 10935)
+++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2013-01-27 23:53:28 UTC (rev 10936)
@@ -7,7 +7,6 @@
  - issues with missing xoopscomments table (geekwright/sabahan/Mamba)
  - bug with using reference for non-variables (geekwright/mamba)
  - number of users when "all groups" selected was wrong (tatane/mamba) 
- - adding image folders for Smilies and User Ranks (alfred)
 
 ===============================
 2013/01/22: Version 2.5.6 Beta

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php	2013-01-27 22:25:30 UTC (rev 10935)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php	2013-01-27 23:53:28 UTC (rev 10936)
@@ -372,7 +372,7 @@
             if (is_object($com_poster)) {
                 $poster['uname'] = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $poster['id'] . '">' . $com_poster->getVar('uname') . '</a>';
                 $poster_rank = $com_poster->rank();
-                $poster['rank_image'] = ($poster_rank['image'] != '') ? 'ranks/' . $poster_rank['image'] : 'ranks/blank.gif';
+                $poster['rank_image'] = ($poster_rank['image'] != '') ? $poster_rank['image'] : 'blank.gif';
                 $poster['rank_title'] = $poster_rank['title'];
                 $poster['avatar'] = $com_poster->getVar('user_avatar');
                 $poster['regdate'] = formatTimestamp($com_poster->getVar('user_regdate'), 's');

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php	2013-01-27 22:25:30 UTC (rev 10935)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php	2013-01-27 23:53:28 UTC (rev 10936)
@@ -282,7 +282,7 @@
     {
         $smileys = $this->getSmileys();
         foreach($smileys as $smile) {
-            $message = str_replace($smile['code'], '<img class="imgsmile" src="' . XOOPS_UPLOAD_URL . '/smilies/' . htmlspecialchars($smile['smile_url']) . '" alt="" />', $message);
+            $message = str_replace($smile['code'], '<img class="imgsmile" src="' . XOOPS_UPLOAD_URL . '/' . htmlspecialchars($smile['smile_url']) . '" alt="" />', $message);
         }
         return $message;
     }

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php	2013-01-27 22:25:30 UTC (rev 10935)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php	2013-01-27 23:53:28 UTC (rev 10936)
@@ -50,7 +50,7 @@
     $smiles = $myts->getSmileys(FALSE);
     $count = count($smiles);
     for($i = 0; $i < $count; $i ++) {
-        echo "<img src='" . XOOPS_UPLOAD_URL . "/smilies/" . htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES) . "' border='0' alt='' onclick='xoopsCodeSmilie(\"{$textarea_id}\", \" " . $smiles[$i]['code'] . " \");' onmouseover='style.cursor=\"hand\"' />";
+        echo "<img src='" . XOOPS_UPLOAD_URL . "/" . htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES) . "' border='0' alt='' onclick='xoopsCodeSmilie(\"{$textarea_id}\", \" " . $smiles[$i]['code'] . " \");' onmouseover='style.cursor=\"hand\"' />";
     }
     echo "&nbsp;[<a href='#moresmiley' onmouseover='style.cursor=\"hand\"' alt='' onclick='openWithSelfMain(\"" . XOOPS_URL . "/misc.php?action=showpopups&amp;type=smilies&amp;target={$textarea_id}\",\"smilies\",300,475);'>" . _MORE . "</a>]";
 }

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/misc.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/misc.php	2013-01-27 22:25:30 UTC (rev 10935)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/misc.php	2013-01-27 23:53:28 UTC (rev 10936)
@@ -51,7 +51,7 @@
                 if ($smiles = $myts->getSmileys()) {
                     $rcolor = 'even';
                     foreach ($smiles as $key => $smile) {
-                        echo "<tr class='$rcolor'><td>" . $smile['code'] . "</td><td>" . $smile['emotion'] . "</td><td><img onmouseover='style.cursor=\"hand\"' onclick='doSmilie(\" " . $smile['code'] . " \");' src='" . XOOPS_UPLOAD_URL . "/smilies/" . $smile['smile_url'] . "' alt='' /></td></tr>";
+                        echo "<tr class='$rcolor'><td>" . $smile['code'] . "</td><td>" . $smile['emotion'] . "</td><td><img onmouseover='style.cursor=\"hand\"' onclick='doSmilie(\" " . $smile['code'] . " \");' src='" . XOOPS_UPLOAD_URL . "/" . $smile['smile_url'] . "' alt='' /></td></tr>";
                         $rcolor = ($rcolor == 'even') ? 'odd' : 'even';
                     }
                 } else {

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php	2013-01-27 22:25:30 UTC (rev 10935)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php	2013-01-27 23:53:28 UTC (rev 10936)
@@ -82,7 +82,7 @@
 				$smilies['emotion'] = $smilies_arr[$i]->getVar("emotion");
                 $smilies['display'] = $smilies_arr[$i]->getVar("display");
 				$smilies_img = ($smilies_arr[$i]->getVar("smile_url")) ? $smilies_arr[$i]->getVar("smile_url") : 'blank.gif';
-				$smilies['image'] = '<img src="' . XOOPS_UPLOAD_URL . '/smilies/' . $smilies_img . '" alt="" />';
+				$smilies['image'] = '<img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" />';
 				$smilies['edit_delete'] = '<a href="admin.php?fct=smilies&amp;op=edit_smilie&amp;smilies_id=' . $smilies_id . '">
                                            <img src="./images/icons/edit.png" border="0" alt="' . _AM_SYSTEM_SMILIES_EDIT . '" title="' . _AM_SYSTEM_SMILIES_EDIT . '"></a>
                                            <a href="admin.php?fct=smilies&amp;op=smilies_delete&amp;smilies_id=' . $smilies_id . '">

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php	2013-01-27 22:25:30 UTC (rev 10935)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php	2013-01-27 23:53:28 UTC (rev 10936)
@@ -87,7 +87,7 @@
 				$userrank['rank_max']   = $userrank_arr[$i]->getVar("rank_max");
 				$userrank['rank_special'] = $userrank_arr[$i]->getVar("rank_special");
 				$rank_img = ($userrank_arr[$i]->getVar("rank_image")) ? $userrank_arr[$i]->getVar("rank_image") : 'blank.gif';
-				$userrank['rank_image'] = '<img src="'.XOOPS_UPLOAD_URL.'/ranks/'.$rank_img.'" alt="" />';
+				$userrank['rank_image'] = '<img src="'.XOOPS_UPLOAD_URL.'/'.$rank_img.'" alt="" />';
 				$xoopsTpl->append_by_ref( 'userrank', $userrank );
 				unset( $userrank );
 			}

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html	2013-01-27 22:25:30 UTC (rev 10935)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html	2013-01-27 23:53:28 UTC (rev 10936)
@@ -10,7 +10,7 @@
           <td class="odd">
 			<div class="comUserRank">
 				<div class="comUserRankText"><{$comment.poster.rank_title}></div>
-				<img class="comUserRankImg" src="<{$xoops_upload_url}>/ranks/<{$comment.poster.rank_image}>" alt="" />
+				<img class="comUserRankImg" src="<{$xoops_upload_url}>/<{$comment.poster.rank_image}>" alt="" />
 			</div>
 			<img class="comUserImg" src="<{$xoops_upload_url}>/<{$comment.poster.avatar}>" alt="" />
 			<div class="comUserStat"><span class="comUserStatCaption"><{$lang_joined}>:</span> <{$comment.poster.regdate}></div>

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html	2013-01-27 22:25:30 UTC (rev 10935)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html	2013-01-27 23:53:28 UTC (rev 10936)
@@ -26,8 +26,8 @@
 
 <table class="width70 aligncenter bnone">
   <tr class="txtcenter">
-    <td><input type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&amp;uid=<{$user_uid}>&amp;op=users_edit'" />
-    <input type="button" value="<{$lang_deleteaccount}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&amp;op=users_delete&amp;uid=<{$user_uid}>'" />
+    <td><input type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&amp;uid=<{$user_uid}>&amp;op=modifyUser'" />
+    <input type="button" value="<{$lang_deleteaccount}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&amp;op=delUser&amp;uid=<{$user_uid}>'" />
   </tr>
 </table>
 
@@ -66,7 +66,7 @@
           <td class="odd"><{$user_email}></td>
         </tr>
         <{/if}>
-        <{if !$user_ownpage == true && $user_pmlink !=''}>
+        <{if !$user_ownpage == true}>
         <tr class="aligntop">
           <td class="head"><{$lang_privmsg}></td>
           <td class="even"><{$user_pmlink}></td>

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php	2013-01-27 22:25:30 UTC (rev 10935)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php	2013-01-27 23:53:28 UTC (rev 10936)
@@ -156,7 +156,7 @@
 }
 $userrank = $thisUser->rank();
 if (isset($userrank['image']) && $userrank['image']) {
-    $xoopsTpl->assign('user_rankimage', '<img src="' . XOOPS_UPLOAD_URL . '/ranks/' . $userrank['image'] . '" alt="" />');
+    $xoopsTpl->assign('user_rankimage', '<img src="' . XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="" />');
 }
 $xoopsTpl->assign('user_ranktitle', $userrank['title']);
 $date = $thisUser->getVar("last_login");





[xoops-svn] SF.net SVN: xoops-svn:[10936] XoopsCore/branches/2.5.x/2.5.6

The world's leading content management systems (CMS) written in PHP

[xoops-svn] SF.net SVN: xoops-svn:[10936] XoopsCore/branches/2.5.x/2.5.6