[xoops-svn] SF.net SVN: xoops-svn:[11867] XoopsModules/mxDirectory/trunk/mxdirectory

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

Revision: 11867
          http://sourceforge.net/p/xoops/svn/11867
Author:   beckmi
Date:     2013-08-02 12:42:30 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Updating deprecated "'Database::getInstance();"

Modified Paths:
--------------
    XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin.php
    XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php
    XoopsModules/mxDirectory/trunk/mxdirectory/class/coupon.php
    XoopsModules/mxDirectory/trunk/mxdirectory/include/blocksadmin.inc.php
    XoopsModules/mxDirectory/trunk/mxdirectory/include/comment_functions.php
    XoopsModules/mxDirectory/trunk/mxdirectory/include/sitemap.plugin.php
    XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php

Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin.php	2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin.php	2013-08-02 12:42:30 UTC (rev 11867)
@@ -68,7 +68,7 @@
 
 // get blocks owned by the module (Imported from xoopsblock.php then modified)
 //$block_arr =& XoopsBlock::getByModule( $target_mid ) ;
-$db =& Database::getInstance();
+$db =& XoopsDatabaseFactory::getDatabaseConnection();
 $sql = "SELECT * FROM ".$db->prefix("newblocks")." WHERE mid='$target_mid' ORDER BY visible DESC,side,weight";
 $result = $db->query($sql);
 $block_arr = array();
@@ -148,7 +148,7 @@
 		}
 
 		// target modules
-		$db =& Database::getInstance();
+		$db =& XoopsDatabaseFactory::getDatabaseConnection();
 		$result = $db->query( "SELECT module_id FROM ".$db->prefix('block_module_link')." WHERE block_id='$bid'" ) ;
 		$selected_mids = array();
 		while ( list( $selected_mid ) = $db->fetchRow( $result ) ) {

Modified: XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php	2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/admin/myblocksadmin2.php	2013-08-02 12:42:30 UTC (rev 11867)
@@ -63,7 +63,7 @@
 if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_BLOCK, $xoopsUser->getGroups())) redirect_header( XOOPS_URL.'/user.php' , 1 , _NOPERM ) ;
 
 // get blocks owned by the module (Imported from xoopsblock.php then modified)
-$db =& Database::getInstance();
+$db =& XoopsDatabaseFactory::getDatabaseConnection();
 $sql = "SELECT bid,name,show_func,func_file,template FROM ".$db->prefix("newblocks")." WHERE mid='$target_mid'";
 $result = $db->query($sql);
 $block_arr = array();

Modified: XoopsModules/mxDirectory/trunk/mxdirectory/class/coupon.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/class/coupon.php	2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/class/coupon.php	2013-08-02 12:42:30 UTC (rev 11867)
@@ -40,7 +40,7 @@
     */
 	function Coupon($coupid = false) {
 		global $mydirname;
-		$this->db = Database::getInstance();
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
         $this->initVar('couponid', XOBJ_DTYPE_INT, null, false);
         $this->initVar('lid', XOBJ_DTYPE_INT, null, true);
 		$this->initVar('description', XOBJ_DTYPE_TXTAREA);

Modified: XoopsModules/mxDirectory/trunk/mxdirectory/include/blocksadmin.inc.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/include/blocksadmin.inc.php	2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/include/blocksadmin.inc.php	2013-08-02 12:42:30 UTC (rev 11867)
@@ -329,7 +329,7 @@
   // edit_block($bid); GIJ imported from blocksadmin.php
 		$myblock = new XoopsBlock($bid);
 
-		$db =& Database::getInstance();
+		$db =& XoopsDatabaseFactory::getDatabaseConnection();
 		$sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.intval($bid);
 		$result = $db->query($sql);
 		$modules = array();
@@ -353,7 +353,7 @@
 	xoops_cp_header();
 	$myblock = new XoopsBlock($bid);
 
-	$db =& Database::getInstance();
+	$db =& XoopsDatabaseFactory::getDatabaseConnection();
 	$sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.intval($bid);
 	$result = $db->query($sql);
 	$modules = array();
@@ -429,7 +429,7 @@
 			$tplman->insert($tplclone);
 		}
 	} */
-	$db =& Database::getInstance();
+	$db =& XoopsDatabaseFactory::getDatabaseConnection();
 	$bmodule = (isset($_POST['bmodule']) && is_array($_POST['bmodule'])) ? $_POST['bmodule'] : array(-1) ; // GIJ +
 	foreach( $bmodule as $bmid ) {
 		$sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.$bmid.')';
@@ -497,7 +497,7 @@
 		}
 		$msg = _AM_DBUPDATED;
 		if ($myblock->store() != false) {
-			$db =& Database::getInstance();
+			$db =& XoopsDatabaseFactory::getDatabaseConnection();
 			$sql = sprintf("DELETE FROM %s WHERE block_id = %u", $db->prefix('block_module_link'), $bid);
 			$db->query($sql);
 			foreach ($bmodule as $bmid) {

Modified: XoopsModules/mxDirectory/trunk/mxdirectory/include/comment_functions.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/include/comment_functions.php	2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/include/comment_functions.php	2013-08-02 12:42:30 UTC (rev 11867)
@@ -2,7 +2,7 @@
 // comment callback functions
 
 function xdir_com_update($link_id, $total_num){
-	$db =& Database::getInstance();
+	$db =& XoopsDatabaseFactory::getDatabaseConnection();
 	$sql = 'UPDATE '.$db->prefix('xdir_links').' SET comments = '.$total_num.' WHERE lid = '.$link_id;
 	$db->query($sql);
 }

Modified: XoopsModules/mxDirectory/trunk/mxdirectory/include/sitemap.plugin.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/include/sitemap.plugin.php	2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/include/sitemap.plugin.php	2013-08-02 12:42:30 UTC (rev 11867)
@@ -8,7 +8,7 @@
 
 function b_sitemap_'.$mydirname.'(){
 
-	$db =& Database::getInstance();
+	$db =& XoopsDatabaseFactory::getDatabaseConnection();
   $smtree = new MxdirectoryTree($db->prefix("xdir_cat"),"cid","pid");
 	$myts =& MyTextSanitizer::getInstance();
 

Modified: XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php
===================================================================
--- XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php	2013-08-02 12:35:22 UTC (rev 11866)
+++ XoopsModules/mxDirectory/trunk/mxdirectory/include/waiting.plugin.php	2013-08-02 12:42:30 UTC (rev 11867)
@@ -18,7 +18,7 @@
 
 function b_waiting_mxdirectory_base( $mydirname )
 {
-	$xoopsDB =& Database::getInstance();
+	$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
 
 	$mydirname = (basename ( dirname ( dirname( __FILE__ ) ) , "a" ) ) ;