Thread: [xoops-svn] SF.net SVN: xoops:[8960] XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/ system

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

Revision: 8960
          http://xoops.svn.sourceforge.net/xoops/?rev=8960&view=rev
Author:   mageg
Date:     2012-02-13 17:35:10 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Fixed bug ID: 3443381

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

Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin/images/main.php
===================================================================

--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin/images/main.php	2012-02-13 17:29:00 UTC (rev 8959)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin/images/main.php	2012-02-13 17:35:10 UTC (rev 8960)
@@ -229,9 +229,8 @@
         $criteria->setLimit(xoops_getModuleOption('images_pager', 'system'));
         $images = $image_handler->getObjects($criteria, true, false);
 
-		if ($imagecategory->getVar('imgcat_storetype') == 'db') {
-        	$xoopsTpl->assign('db_store', 1 );
-
+        if ($imagecategory->getVar('imgcat_storetype') == 'db') {
+            $xoopsTpl->assign('db_store', 1 );
         }
 
         foreach (array_keys($images) as $i) {
@@ -301,17 +300,19 @@
         // Get image id
         $image_id = system_CleanVars ( $_REQUEST, 'image_id', 0, 'int' );
         if ( $image_id > 0 ) {
-        $image = $image_handler->get($image_id);
-
+            $image = $image_handler->get($image_id);
             $image_cat =& $imgcat_handler->get($image->getVar('imgcat_id'));
             // Define Breadcrumb and tips
             $xoBreadCrumb->addLink( _AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath') );
             $xoBreadCrumb->addLink( $image_cat->getVar('imgcat_name'), system_adminVersion('images', 'adminpath') . '&amp;op=listimg&amp;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 src="./class/thumbs/phpThumb.php?src=' . XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name') . '&amp;h=120" alt="" /></div>';
-
             $xoopsTpl->assign('edit_thumbs', $msg );
 
             $form = new XoopsThemeForm( _AM_SYSTEM_IMAGES_EDITIMG, 'edit_form', 'admin.php', 'post', true );
@@ -339,6 +340,7 @@
     case 'delfile':
         // Get image handler
         $image_handler = xoops_gethandler('image');
+        $imgcat_handler = xoops_gethandler('imagecategory');
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
@@ -351,7 +353,12 @@
         $image_id = system_CleanVars ( $_REQUEST, 'image_id', 0, 'int' );
          if ( $image_id > 0 ) {
             $image = $image_handler->get($image_id);
-            $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_UPLOAD_URL . '/' . $image->getVar('image_name') . '" alt="" /></div>';
+            $image_cat =& $imgcat_handler->get($image->getVar('imgcat_id'));
+            if ($image_cat->getVar('imgcat_storetype') == 'db') {
+                $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
+            } else {
+                $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_UPLOAD_URL . '/' . $image->getVar('image_name') . '" alt="" /></div>';
+            }
             $msg .= '<div class="spacer">' . $image->getVar('image_nicename') . '</div>';
             $msg .= '<div class="spacer">' . _AM_SYSTEM_IMAGES_RUDELIMG . '</div>';
             xoops_confirm( array('op' => 'delfileok', 'image_id' => $image_id, 'fct' => 'images'), 'admin.php', $msg );

Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_images.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_images.html	2012-02-13 17:29:00 UTC (rev 8959)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_images.html	2012-02-13 17:35:10 UTC (rev 8960)
@@ -86,11 +86,11 @@
             <div class="xo-actions txtcenter">
                 <div class="spacer bold"><{$img.image_nicename}></div>
                     <img id="loading_img<{$img.image_id}>" src="./images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="cursorpointer tooltip" id="img<{$img.image_id}>" onclick="system_setStatus( { fct: 'images', op: 'display_img', image_id: <{$img.image_id}> }, 'img<{$img.image_id}>', 'admin.php' )" src="<{if $img.image_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._IMGDISPLAY}>" title="<{$smarty.const._IMGDISPLAY}>" />
-				    <{if !$db_store}>
-				    <a class="lightbox tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$smarty.const._PREVIEW}>">
+                    <{if !$db_store}>
+                    <a class="lightbox tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$smarty.const._PREVIEW}>">
                     <{else}>
                     <a class="lightbox tooltip" href="<{$xoops_url}>/image.php?id=<{$img.image_id}>" title="<{$smarty.const._PREVIEW}>">
-		            <{/if}>
+                    <{/if}>
                         <img src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>" />
                     </a>
                 <a class="tooltip" href="admin.php?fct=images&amp;op=editimg&amp;image_id=<{$img.image_id}>" title="<{$smarty.const._EDIT}>">
@@ -99,20 +99,20 @@
                 <a class="tooltip" href="admin.php?fct=images&amp;op=delfile&amp;image_id=<{$img.image_id}>" title="<{$smarty.const._DELETE}>">
                     <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" />
                 </a>
-	             <img class="tooltip" onclick="display_dialog(<{$img.image_id}>, true, true, 'slide', 'slide', 120, 350);" src="<{xoAdminIcons url.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" />
+                 <img class="tooltip" onclick="display_dialog(<{$img.image_id}>, true, true, 'slide', 'slide', 120, 350);" src="<{xoAdminIcons url.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" />
             </div>
         </div>
     </div>
     
     <div id="dialog<{$img.image_id}>" title="<{$img.image_nicename}>" style='display:none;'>
-		  <div class="center">
-		      <{if !$db_store}>
-		      <{$xoops_upload_url}>/<{$img.image_name}>
-		      <{else}>
-		      <{$xoops_url}>/image.php?id=<{$img.image_id}>
-		      <{/if}>
-		  </div>
-	</div>
+          <div class="center">
+              <{if !$db_store}>
+              <{$xoops_upload_url}>/<{$img.image_name}>
+              <{else}>
+              <{$xoops_url}>/image.php?id=<{$img.image_id}>
+              <{/if}>
+          </div>
+    </div>
 
     <{/foreach}>
     <div class="clear"></div>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [xoops-svn] SF.net SVN: xoops:[8960] XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/ system

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

xoops-svn