[xoops-svn] SF.net SVN: xoops:[8647] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/ banners

[<ma...@us...>]

Revision: 8647
          http://xoops.svn.sourceforge.net/xoops/?rev=8647&view=rev
Author:   mageg
Date:     2012-01-06 18:55:32 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
finalize upgrade for banners module

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/include/install.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php	2012-01-06 16:24:32 UTC (rev 8646)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php	2012-01-06 18:55:32 UTC (rev 8647)
@@ -38,7 +38,13 @@
             if (substr_count($obj->getVar('imageurl'), XOOPS_UPLOAD_URL . '/banners/') == false) {
                 $blank_img = 'blank.gif';
             } else {
-                $blank_img = str_replace( XOOPS_UPLOAD_URL . '/banners/', '', $obj->getVar('imageurl', 'e') );
+                $namefile = substr_replace($obj->getVar('imageurl'),'',0,strlen(XOOPS_UPLOAD_URL . '/banners/'));
+                $pathfile =  XOOPS_ROOT_PATH . '/uploads/banners/' . $namefile;
+                if (is_file($pathfile)){
+                    $blank_img = str_replace( XOOPS_UPLOAD_URL . '/banners/', '', $obj->getVar('imageurl', 'e') );
+                } else {
+                    $blank_img = 'blank.gif';
+                }
             }
             $html_banner = $obj->getVar('htmlbanner');
         }

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/include/install.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/include/install.php	2012-01-06 16:24:32 UTC (rev 8646)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/include/install.php	2012-01-06 18:55:32 UTC (rev 8647)
@@ -63,11 +63,29 @@
         $sql = "DROP TABLE " . $xoops->db->prefix("bannerfinish");
         $xoops->db->queryF($sql);
     }
-    
+
     // delete banners and my_ip
     $sql = "DELETE FROM " . $xoops->db->prefix("config") . " WHERE `conf_name` = 'banners'";
     $xoops->db->queryF($sql);
     $sql = "DELETE FROM " . $xoops->db->prefix("config") . " WHERE `conf_name` = 'my_ip'";
-    $xoops->db->queryF($sql);
+    $xoops->db->queryF($sql);
+
+    // move file
+    // Get banners handler
+    $banner_Handler = $xoops->getHandlerBanner();
+    $banner_arr = $banner_Handler->getall();
+    foreach (array_keys($banner_arr) as $i) {
+        $namefile = substr_replace($banner_arr[$i]->getVar('imageurl'),'',0,strlen(XOOPS_URL . '/images/banners/'));
+        $pathfile_image =  XOOPS_ROOT_PATH . '/images/banners/' . $namefile;
+        $pathfile_upload =  XOOPS_ROOT_PATH . '/uploads/banners/' . $namefile;
+        if (is_file($pathfile_image)){
+            copy($pathfile_image, $pathfile_upload);
+            unlink($pathfile_image);
+            $obj = $banner_Handler->get($banner_arr[$i]->getVar('bid'));
+            $obj->setVar("imageurl", XOOPS_UPLOAD_URL . '/banners/' . $namefile);
+            $banner_Handler->insert($obj);
+        }
+    }
+
     return true;
 }
\ No newline at end of file

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