Changeset 15731 for trunk/inc

Timestamp:

12/07/11 18:53:05 (6 months ago)

Author:

Alexander Trofimov

Message:

Groups - are installable now

Location:

trunk/inc/classes

Files:

• BxDolDb.php (modified) (1 diff)
• BxDolModuleDb.php (added)
• BxDolPageView.php (modified) (3 diffs)
• BxDolPrivacy.php (modified) (3 diffs)
• BxDolTwigModule.php (modified) (2 diffs)
• BxDolTwigModuleDb.php (modified) (2 diffs)
• BxDolTwigSearchResult.php (modified) (1 diff)
• BxDolTwigTemplate.php (modified) (2 diffs)

trunk/inc/classes/BxDolDb.php

@@ -685 +685 @@
         return $sQuery;
     }
+
+    function log ($s) {
+        return file_put_contents(BX_DIRECTORY_PATH_ROOT . 'tmp/db.err.log', date('Y-m-d H:i:s') . "\t" . $s . "\n", FILE_APPEND);
+    }
 }
 

trunk/inc/classes/BxDolPageView.php

@@ -455 +455 @@
             $sClass .= isset($aLink['icon']) ? ' with_icon' : '';
 
-            if(!empty($aLink['onclick']))
+            if (!empty($aLink['onclick']))
                 $sOnclick = 'onclick="' . $aLink['onclick'] . '"';
-            else if($aLink['dynamic'])
+            else if (!empty($aLink['dynamic']))
                 $sOnclick = 'onclick="return !loadDynamicBlock(' . $iBlockID . ', this.href);"';
-            else if($aLink['dynamicPopup'])
+            else if (!empty($aLink['dynamicPopup']))
                 $sOnclick = 'onclick="loadDynamicPopupBlock(' . $iBlockID . ', this.href); return false;"';
             else
@@ -466 +466 @@
             $aItems[] = array(
                 'bx_if:item_act' => array(
-                    'condition' => (bool)$aLink['active'],
+                    'condition' => isset($aLink['active']) ? (bool)$aLink['active'] : false,
                     'content' => array(
                         'bx_if:icon_act' => array(
@@ -479 +479 @@
                 ),
                 'bx_if:item_pas' => array(
-                    'condition' => !(bool)$aLink['active'],
+                    'condition' => isset($aLink['active']) ? !(bool)$aLink['active'] : true,
                     'content' => array(
                         'bx_if:icon_pas' => array(

trunk/inc/classes/BxDolPrivacy.php

@@ -23 +23 @@
 ***************************************************************************/
 
-bx_import('BxDolMistake');
 bx_import('BxDolPrivacyQuery');
 
@@ -74 +73 @@
  *
  */
-class BxDolPrivacy extends BxDolMistake {
+class BxDolPrivacy extends BxDol {
     var $_oDb;
 
@@ -81 +80 @@
      */
     function BxDolPrivacy($sTable = '', $sFieldId = '', $sFieldOwnerId = '') {
-        parent::BxDolMistake();
+        parent::__construct();
 
         $this->_oDb = new BxDolPrivacyQuery($sTable, $sFieldId, $sFieldOwnerId);

trunk/inc/classes/BxDolTwigModule.php

@@ -36 +36 @@
     function BxDolTwigModule(&$aModule) {
         parent::BxDolModule($aModule);
-        $this->_iProfileId = $GLOBALS['logged']['member'] || $GLOBALS['logged']['admin'] ? $_COOKIE['memberID'] : 0;
+        $this->_iProfileId = !empty($GLOBALS['logged']['member']) || !empty($GLOBALS['logged']['admin']) ? $_COOKIE['memberID'] : 0;
     }
 
@@ -916 +916 @@
         $this->_oDb->removeFanFromAllEntries ($iProfileId);
         $this->_oDb->removeAdminFromAllEntries ($iProfileId);
+    }
+
+    function serviceResponseAccountDelete ($oAlert) {
+
+        if (!($iAccountId = (int)$oAlert->iObject))
+            return false;
+
+        // TODO: get all account's profiles and delete all profiles' data
+
+        return true;
     }
 

trunk/inc/classes/BxDolTwigModuleDb.php

@@ -23 +23 @@
 ***************************************************************************/
 
-bx_import('BxDolModuleQuery');
+bx_import('BxDolModuleDb');
 
 /**
  * Base database class for modules like events/groups/store
  */
-class BxDolTwigModuleDb extends BxDolModuleQuery {
+class BxDolTwigModuleDb extends BxDolModuleDb {
 
     var $_sTableMain = 'main';
@@ -48 +48 @@
     var $_sFieldAllowViewTo = 'allow_view_to';
 
-    /*
+    /**
      * Constructor.
      */
     function BxDolTwigModuleDb(&$oConfig) {
-        parent::BxDolModuleQuery($oConfig);
+        parent::__construct($oConfig);
     }
 

trunk/inc/classes/BxDolTwigSearchResult.php

@@ -104 +104 @@
 }
 
-?>

trunk/inc/classes/BxDolTwigTemplate.php

@@ -38 +38 @@
 
     function parseHtmlByName ($sName, &$aVars) {
-        return parent::parseHtmlByName ($sName.'.html', $aVars);
+        return parent::parseHtmlByName (strpos($sName, '.html', strlen($sName) - 5) ? $sName : $sName.'.html', $aVars);
     }
 
@@ -53 +53 @@
             $sCode = DesignBoxContent($sTitle, $sCode, $isWrap ? BX_DB_PADDING_DEF : BX_DB_DEF);
 
-        $oTemplate = $this;
-        $oTemplate->setPageNameIndex ($isDesignBox || !$this->_iPageIndex ? BX_PAGE_DEFAULT : $this->_iPageIndex);
+        $oTemplate = BxDolTemplate::getInstance();//$this;
+        $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);//$isDesignBox || !$this->_iPageIndex ? BX_PAGE_DEFAULT : $this->_iPageIndex);
         $oTemplate->setPageHeader ($sTitle);
         $oTemplate->setPageContent ('page_main_code', $sCode);
 
         $oTemplate->addDynamicLocation($this->_oConfig->getHomePath(), $this->_oConfig->getHomeUrl());
-        PageCode($oTemplate);
+        $oTemplate->getPageCode();
     }