#53 - get rid of db.inc.php

inc/classes/BxDolCronCmd.php

@@ -25,11 +25,13 @@ class BxDolCronCmd extends BxDolCron {
 
     function clean_database()
     {
+        $oDb = BxDolDb::getInstance();
+
         $db_clean_mem_levels = (int) getParam("db_clean_mem_levels");
 
         //clear from `sys_acl_levels_members`
-        if (db_res("DELETE FROM `sys_acl_levels_members` WHERE `DateExpires` < NOW() - INTERVAL $db_clean_mem_levels DAY"))
-            db_res("OPTIMIZE TABLE `sys_acl_levels_members`");
+        if ($oDb->query("DELETE FROM `sys_acl_levels_members` WHERE `DateExpires` < NOW() - INTERVAL $db_clean_mem_levels DAY"))
+            $oDb->query("OPTIMIZE TABLE `sys_acl_levels_members`");
 
         //--- Clean sessions ---//
         bx_import('BxDolSession');

inc/classes/BxDolCronNotifies.php

@@ -21,7 +21,6 @@
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 
-require_once( BX_DIRECTORY_PATH_INC . 'db.inc.php' );
 require_once('BxDolCron.php');
 
 class BxDolCronNotifies extends BxDolCron {

inc/classes/BxDolDb.php

@@ -793,4 +793,13 @@ EOJ;
     }
 }
 
+function getParam( $param_name, $use_cache = true ) {
+    return BxDolDb::getInstance()->getParam($param_name, $use_cache);
+}
+
+function setParam( $param_name, $param_val ) {
+    return BxDolDb::getInstance()->setParam($param_name, $param_val);
+}
+
+
 /** @} */

inc/classes/BxDolForm.php

@@ -848,9 +848,11 @@ class BxDolForm extends BxDol implements iBxDolReplaceable
         $oChecker = new BxDolFormChecker($this->_sCheckerHelper);
         $oChecker->setFormMethod($this->aFormAttrs['method']);
         $sSql = $oChecker->dbInsert($this->aParams['db'], $this->aInputs, $aValsToAdd, $isIgnore);
-        if (!$sSql) return false;
-        if (db_res ($sSql))
-            return db_last_id();
+        if (!$sSql) 
+            return false;
+        $oDb = BxDolDb::getInstance();
+        if ($oDb->res($sSql))
+            return $oDb->lastId();
         return false;
     }
 
@@ -860,7 +862,7 @@ class BxDolForm extends BxDol implements iBxDolReplaceable
         $sSql = $oChecker->dbUpdate($val, $this->aParams['db'], $this->aInputs, $aValsToAdd, $aTrackTextFieldsChanges);
         if (!$sSql) 
             return false;
-        return db_res ($sSql);
+        return BxDolDb::getInstance()->res($sSql);
     }
 
     function delete ($val) {
@@ -869,7 +871,7 @@ class BxDolForm extends BxDol implements iBxDolReplaceable
         $sSql = $oChecker->dbDelete($val, $this->aParams['db'], $this->aInputs);
         if (!$sSql) 
             return false;
-        return db_res ($sSql);
+        return BxDolDb::getInstance()->res($sSql);
     }
 
     function generateUri ()  {

inc/db.inc.php

@@ -1,81 +0,0 @@
-<?php
-/**
- * @package     Dolphin Core
- * @copyright   Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * @license     CC-BY - http://creativecommons.org/licenses/by/3.0/
- */
-defined('BX_DOL') or die('hack attempt');
-
-bx_import('BxDolDb');
-
-function db_list_tables( $error_checking = true ) {
-    BxDolDb::getInstance()->setErrorChecking ($error_checking);
-    return BxDolDb::getInstance()->listTables();
-}
-
-function db_get_encoding ( $error_checking = true ) {
-    BxDolDb::getInstance()->setErrorChecking ($error_checking);
-    return BxDolDb::getInstance()->getEncoding();
-}
-
-function db_res( $query, $error_checking = true ) {
-    BxDolDb::getInstance()->setErrorChecking ($error_checking);
-    return BxDolDb::getInstance()->res($query);
-}
-
-function db_last_id() {
-    return BxDolDb::getInstance()->lastId();
-}
-
-function db_affected_rows() {
-    return BxDolDb::getInstance()->getAffectedRows();
-}
-
-function db_res_assoc_arr( $query, $error_checking = true ) {
-    BxDolDb::getInstance()->setErrorChecking ($error_checking);
-    return BxDolDb::getInstance()->getAll($query);
-}
-
-function db_arr( $query, $error_checking = true ) {
-    BxDolDb::getInstance()->setErrorChecking ($error_checking);
-    return BxDolDb::getInstance()->getRow($query, MYSQL_BOTH);
-}
-
-function db_assoc_arr( $query, $error_checking = true ) {
-    BxDolDb::getInstance()->setErrorChecking ($error_checking);
-    return BxDolDb::getInstance()->getRow($query);
-}
-
-function db_value( $query, $error_checking = true, $index = 0 ) {
-    BxDolDb::getInstance()->setErrorChecking ($error_checking);
-    return BxDolDb::getInstance()->getOne($query, $index);
-}
-
-function fill_array( $res ) {
-    return BxDolDb::getInstance()->fillArray($res, MYSQL_BOTH);
-}
-
-function fill_assoc_array( $res ) {
-    return BxDolDb::getInstance()->fillArray($res, MYSQL_ASSOC);
-}
-
-function isParam( $param_name, $use_cache = true ) {
-    return BxDolDb::getInstance()->isParam($param_name, $use_cache);
-}
-
-function addParam($sName, $sValue, $iKateg, $sDesc, $sType) {
-	return BxDolDb::getInstance()->addParam($sName, $sValue, $iKateg, $sDesc, $sType);
-}
-
-function getParam( $param_name, $use_cache = true ) {
-    return BxDolDb::getInstance()->getParam($param_name, $use_cache);
-}
-
-function getParamDesc( $param_name ) {
-    return BxDolDb::getInstance()->getOne ("SELECT `desc` FROM `sys_options` WHERE `Name` = '$param_name'");
-}
-
-function setParam( $param_name, $param_val ) {
-    return BxDolDb::getInstance()->setParam($param_name, $param_val);
-}
-

inc/design.inc.php

@@ -103,7 +103,7 @@ function getFieldValues( $sField, $sUseLKey = 'LKey' ) {
 
     global $aPreValues;
 
-    $sValues = db_value( "SELECT `Values` FROM `sys_profile_fields` WHERE `Name` = '$sField'" );
+    $sValues = BxDolDb::getInstance()->getOne("SELECT `Values` FROM `sys_profile_fields` WHERE `Name` = '$sField'");
 
     if( substr( $sValues, 0, 2 ) == '#!' ) {
         //predefined list
@@ -204,73 +204,13 @@ function getVersionComment() {
     return '<!-- ' . implode(' ', $aVerR) . ' -->';
 }
 
-// ----------------------------------- site statistick functions --------------------------------------//
-
-function getSiteStatBody($aVal, $sMode = '') {
-    $sLink = strlen($aVal['link']) > 0 ? '<a href="'.BX_DOL_URL_ROOT.$aVal['link'].'">{iNum} '._t('_'.$aVal['capt']).'</a>' : '{iNum} '._t('_'.$aVal['capt']) ;
-    if ( $sMode != 'admin' ) {
-        $sBlockId = '';
-        $iNum = strlen($aVal['query']) > 0 ? db_value($aVal['query']) : 0;
-    } else {
-        $sBlockId = "id='{$aVal['name']}'";
-        $iNum  = strlen($aVal['adm_query']) > 0 ? db_value($aVal['adm_query']) : 0;
-        if ( strlen($aVal['adm_link']) > 0 ) {
-            if( substr( $aVal['adm_link'], 0, strlen( 'javascript:' ) ) == 'javascript:' ) {
-                $sHref = 'javascript:void(0);';
-                $sOnclick = 'onclick="' . $aVal['adm_link'] . '"';
-            } else {
-                $sHref = $aVal['adm_link'];
-                $sOnclick = '';
-            }
-            $sLink = '<a href="'.$sHref.'" '.$sOnclick.'>{iNum} '._t('_'.$aVal['capt']).'</a>';
-        } else {
-            $sLink = '{iNum} '._t('_'.$aVal['capt']);
-        }
-    }
-
-    $sLink = str_replace('{iNum}', $iNum, $sLink);
-    $sCode =
-    '
-        <div class="siteStatUnit" '. $sBlockId .'>
-            <img src="' . getTemplateIcon($aVal['icon']) . '" alt="" />
-                ' . $sLink . '
-        </div>
-    ';
-
-    return $sCode;
-}
-
-function getSiteStatUser() {
-    global $aStat;
-
-    $oDb = BxDolDb::getInstance();
-    $oCache = $oDb->getDbCacheObject();
-    $aStat = $oCache->getData($oDb->genDbCacheKey('sys_stat_site'));
-    if (null === $aStat) {
-        genSiteStatCache();
-        $aStat = $oCache->getData($oDb->genDbCacheKey('sys_stat_site'));
-    }
-
-    if( !$aStat )
-        $aStat = array();
-
-    $sCode  = '<div class="siteStatMain">';
-
-    foreach($aStat as $aVal)
-        $sCode .= getSiteStatBody($aVal);
-
-    $sCode .= '<div class="clear_both"></div></div>';
-
-    return $sCode;
-}
-
-function genSiteStatFile($aVal) {
+function getSiteStatUser() 
+{
+    $sqlQuery = "SELECT `Name` as `name`, `Title` as `capt`, `UserQuery` as `query`, `UserLink` as `link`, `IconName` as `icon`, `AdminQuery` as `adm_query`, `AdminLink` as `adm_link` FROM `sys_stat_site` ORDER BY `StatOrder`";
 
-    bx_import('BxTemplMenu');
-    $sLink = BxTemplMenu::getInstance() -> getCurrLink($aVal['link']);
-    $sLine = "'{$aVal['name']}'=>array('capt'=>'{$aVal['capt']}', 'query'=>'".addslashes($aVal['query'])."', 'link'=>'$sLink', 'icon'=>'{$aVal['icon']}'),\n";
+    $aStat = BxDolDb::getInstance()->fromCache('sys_stat_site', 'getAllWithKey', $sqlQuery, 'name');
 
-    return $sLine;
+    return "<pre>TODO: nice output\n" . print_r($aStat, true) . '</pre>';
 }
 
 function genAjaxyPopupJS($iTargetID, $sDivID = 'ajaxy_popup_result_div', $sRedirect = '') {

inc/utils.inc.php

@@ -515,36 +515,6 @@ function bx_mb_strpos ($s, $sReplacement, $iStart = 0) {
     return mb_strpos($s, $sReplacement, $iStart);
 }
 
-/**
-** @description : function will create cache file with all SQL queries ;
-** @return        :
-*/
-function genSiteStatCache() {
-
-    $sqlQuery = "SELECT `Name` as `name`,
-                        `Title` as `capt`,
-                        `UserQuery` as `query`,
-                        `UserLink` as `link`,
-                        `IconName` as `icon`,
-                        `AdminQuery` as `adm_query`,
-                           `AdminLink` as `adm_link`
-                        FROM `sys_stat_site`
-                        ORDER BY `StatOrder` ASC, `ID` ASC";
-
-    $rData = db_res($sqlQuery);
-
-    $sLine = "return array( \n";
-    while ($aVal = mysql_fetch_assoc($rData)) {
-        $sLine .= genSiteStatFile($aVal);
-    }
-    $sLine = rtrim($sLine, ",\n")."\n);";
-
-    $aResult = eval($sLine);
-
-    $oCache = BxDolDb::getInstance()->getDbCacheObject();
-    return $oCache->setData (BxDolDb::getInstance()->genDbCacheKey('sys_stat_site'), $aResult);
-}
-
 /**
  * Import class file, it automatically detects class path by its prefix or module array/name
  *

install/patterns/header.inc.php

@@ -137,8 +137,8 @@ require_once(BX_DIRECTORY_PATH_INC . "utils.inc.php");
 bx_import('BxDolConfig');
 bx_import('BxDolService');
 bx_import('BxDolAlerts');
+bx_import('BxDolDb');
 
-require_once(BX_DIRECTORY_PATH_INC . "db.inc.php");
 require_once(BX_DIRECTORY_PATH_INC . "profiles.inc.php");
 
 $o = new BxDolAlerts('system', 'begin', 0);

modules/boonex/antispam/classes/BxAntispamIP.php

@@ -139,7 +139,7 @@ class BxAntispamIP extends BxDol
         $iAffectedRows = $oDb->query($sQuery);
 
         if ($iAffectedRows) {
-            db_res("OPTIMIZE TABLE `bx_antispam_ip_table`");
+            $oDb->query("OPTIMIZE TABLE `bx_antispam_ip_table`");
             return $iAffectedRows;
         }