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

[<luc...@us...>]

Revision: 11603
          http://sourceforge.net/p/xoops/svn/11603
Author:   luciorota
Date:     2013-05-28 19:19:24 +0000 (Tue, 28 May 2013)
Log Message:
-----------
system module uses image.php instead of phpThumb.php to resize images and avatars

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_avatars.html
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php	2013-05-28 19:11:00 UTC (rev 11602)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php	2013-05-28 19:19:24 UTC (rev 11603)
@@ -309,11 +309,7 @@
             $xoBreadCrumb->addLink( $image_cat->getVar('imgcat_name'), system_adminVersion('images', 'adminpath') . '&op=listimg&imgcat_id=' .$image->getVar('imgcat_id') );
             $xoBreadCrumb->addLink( _AM_SYSTEM_IMAGES_EDITIMG );
             $xoBreadCrumb->render();
-            if ($image_cat->getVar('imgcat_storetype') == 'db') {
-                $msg = '<div class="txtcenter"><img class="tooltip" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '" alt="' . $image->getVar('image_nicename') . '" title="' . $image->getVar('image_nicename') . '" style="max-width:120px; max-height:120px;"/></div>';
-            } else {
-                $msg = '<div class="txtcenter"><img src="./class/thumbs/phpThumb.php?src=' . XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name') . '&amp;h=120" alt="" /></div>';
-            }
+            $msg = '<div class="txtcenter"><img class="tooltip" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&amp;width=120&amp;height=120" alt="' . $image->getVar('image_nicename') . '" title="' . $image->getVar('image_nicename') . '" style="max-width:120px; max-height:120px;"/></div>';
 
             $xoopsTpl->assign('edit_thumbs', $msg );
 

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_avatars.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_avatars.html	2013-05-28 19:11:00 UTC (rev 11602)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_avatars.html	2013-05-28 19:19:24 UTC (rev 11603)
@@ -38,7 +38,7 @@
 <div class="floatleft">
     <div class="ui-corner-all xo-thumb txtcenter">
         <div class="xo-thumbimg">
-            <img class="tooltip" src="class/thumbs/phpThumb.php?src=<{$xoops_rootpath}>/uploads/<{$avatar.avatar_file}>&amp;h=120&amp;w=120" alt="<{$avatar.avatar_name}>" title="<{$avatar.avatar_name}>" />
+            <img class="tooltip" src="<{$xoops_url}>/image.php?src=<{$xoops_url}>/uploads/<{$avatar.avatar_file}>&amp;height=120&amp;width=120" alt="<{$avatar.avatar_name}>" title="<{$avatar.avatar_name}>" />
         </div>
         <div class="xo-actions txtcenter">
             <div class="spacer bold"><{$avatar.avatar_name}></div>

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html	2013-05-28 19:11:00 UTC (rev 11602)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html	2013-05-28 19:19:24 UTC (rev 11603)
@@ -77,11 +77,7 @@
     <div class="floatleft">
         <div class="ui-corner-all xo-thumb txtcenter">
             <div class="xo-thumbimg">
-                <{if !$db_store}>
-                <img class="tooltip" src="class/thumbs/phpThumb.php?src=<{$xoops_rootpath}>/uploads/<{$img.image_name}>&amp;h=120&amp;w=120" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" />
-                <{else}>
-                <img class="tooltip" src="<{$xoops_url}>/image.php?id=<{$img.image_id}>" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" style="max-width:120px; max-height:120px;" />
-                <{/if}>
+                <img class="tooltip" src="<{$xoops_url}>/image.php?id=<{$img.image_id}>&amp;width=120&amp;height=120" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" style="max-width:120px; max-height:120px;" />
             </div>
             <div class="xo-actions txtcenter">
                 <div class="spacer bold"><{$img.image_nicename}></div>