Changeset 15733 for trunk/modules

Timestamp:

12/08/11 00:02:57 (6 months ago)

Author:

Alexander Trofimov

Message:

Groups - some corrections

Location:

trunk/modules/boonex/groups

Files:

• classes/BxGroupsDb.php (modified) (1 diff)
• classes/BxGroupsFormAdd.php (modified) (7 diffs)
• classes/BxGroupsFormEdit.php (modified) (1 diff)
• classes/BxGroupsModule.php (modified) (2 diffs)
• classes/BxGroupsPageView.php (modified) (2 diffs)
• classes/BxGroupsSearchResult.php (modified) (1 diff)
• classes/BxGroupsTemplate.php (modified) (2 diffs)
• install/sql/enable.sql (modified) (1 diff)

trunk/modules/boonex/groups/classes/BxGroupsDb.php

@@ -57 +57 @@
             $this->query ("DELETE FROM `" . $this->_sPrefix . "admins` WHERE `id_entry` = $iId");
             $this->deleteEntryMediaAll ($iId, 'images');
-            $this->deleteEntryMediaAll ($iId, 'videos');
-            $this->deleteEntryMediaAll ($iId, 'sounds');
-            $this->deleteEntryMediaAll ($iId, 'files');
         }
         return $iRet;

trunk/modules/boonex/groups/classes/BxGroupsFormAdd.php

@@ -23 +23 @@
 bx_import ('BxDolFormMedia');
 
-class BxGroupsFormAdd extends BxDolFormMedia {
+bx_import('BxTemplFormView');
+
+class BxGroupsFormAdd extends BxTemplFormView {
 
     var $_oMain, $_oDb;
 
-    function BxGroupsFormAdd ($oMain, $iProfileId, $iEntryId = 0, $iThumb = 0) {
+    function __construct ($oMain, $iProfileId, $iEntryId = 0, $iThumb = 0) {
 
         $this->_oMain = $oMain;
         $this->_oDb = $oMain->_oDb;
-
-        $this->_aMedia = array (
-            'images' => array (
-                'post' => 'ready_images',
-                'upload_func' => 'uploadPhotos',
-                'tag' => BX_GROUPS_PHOTOS_TAG,
-                'cat' => BX_GROUPS_PHOTOS_CAT,
-                'thumb' => 'thumb',
-                'module' => 'photos',
-                'title_upload_post' => 'images_titles',
-                'title_upload' => _t('_bx_groups_form_caption_file_title'),
-                'service_method' => 'get_photo_array',
-            ),
-            'videos' => array (
-                'post' => 'ready_videos',
-                'upload_func' => 'uploadVideos',
-                'tag' => BX_GROUPS_VIDEOS_TAG,
-                'cat' => BX_GROUPS_VIDEOS_CAT,
-                'thumb' => false,
-                'module' => 'videos',
-                'title_upload_post' => 'videos_titles',
-                'title_upload' => _t('_bx_groups_form_caption_file_title'),
-                'service_method' => 'get_video_array',
-            ),
-            'sounds' => array (
-                'post' => 'ready_sounds',
-                'upload_func' => 'uploadSounds',
-                'tag' => BX_GROUPS_SOUNDS_TAG,
-                'cat' => BX_GROUPS_SOUNDS_CAT,
-                'thumb' => false,
-                'module' => 'sounds',
-                'title_upload_post' => 'sounds_titles',
-                'title_upload' => _t('_bx_groups_form_caption_file_title'),
-                'service_method' => 'get_music_array',
-            ),
-            'files' => array (
-                'post' => 'ready_files',
-                'upload_func' => 'uploadFiles',
-                'tag' => BX_GROUPS_FILES_TAG,
-                'cat' => BX_GROUPS_FILES_CAT,
-                'thumb' => false,
-                'module' => 'files',
-                'title_upload_post' => 'files_titles',
-                'title_upload' => _t('_bx_groups_form_caption_file_title'),
-                'service_method' => 'get_file_array',
-            ),
-        );
 
         bx_import('BxDolCategories');
@@ -85 +40 @@
         $aCountries = $oProfileFields->convertValues4Input('#!Country');
         asort($aCountries);
-
-        // generate templates for custom form's elements
-        $aCustomMediaTemplates = $this->generateCustomMediaTemplates ($oMain->_iProfileId, $iEntryId, $iThumb);
 
         // privacy
@@ -119 +71 @@
         $aInputPrivacyRate['db'] = $aInputPrivacyCustomPass;
 
-        $aInputPrivacyForum = $this->_oMain->_oPrivacy->getGroupChooser($iProfileId, 'groups', 'post_in_forum');
-        $aInputPrivacyForum['values'] = array_merge($aInputPrivacyForum['values'], $aInputPrivacyCustom);
-        $aInputPrivacyForum['db'] = $aInputPrivacyCustomPass;
-
         $aInputPrivacyUploadPhotos = $this->_oMain->_oPrivacy->getGroupChooser($iProfileId, 'groups', 'upload_photos');
         $aInputPrivacyUploadPhotos['values'] = $aInputPrivacyCustom2;
         $aInputPrivacyUploadPhotos['db'] = $aInputPrivacyCustom2Pass;
 
-        $aInputPrivacyUploadVideos = $this->_oMain->_oPrivacy->getGroupChooser($iProfileId, 'groups', 'upload_videos');
-        $aInputPrivacyUploadVideos['values'] = $aInputPrivacyCustom2;
-        $aInputPrivacyUploadVideos['db'] = $aInputPrivacyCustom2Pass;
-
-        $aInputPrivacyUploadSounds = $this->_oMain->_oPrivacy->getGroupChooser($iProfileId, 'groups', 'upload_sounds');
-        $aInputPrivacyUploadSounds['values'] = $aInputPrivacyCustom2;
-        $aInputPrivacyUploadSounds['db'] = $aInputPrivacyCustom2Pass;
-
-        $aInputPrivacyUploadFiles = $this->_oMain->_oPrivacy->getGroupChooser($iProfileId, 'groups', 'upload_files');
-        $aInputPrivacyUploadFiles['values'] = $aInputPrivacyCustom2;
-        $aInputPrivacyUploadFiles['db'] = $aInputPrivacyCustom2Pass;
 
         $aCustomForm = array(
@@ -258 +195 @@
                 'categories' => $oCategories->getGroupChooser ('bx_groups', (int)$iProfileId, true),
 
-                // images
-
-                'header_images' => array(
-                    'type' => 'block_header',
-                    'caption' => _t('_bx_groups_form_header_images'),
-                    'collapsable' => true,
-                    'collapsed' => false,
-                ),
-                'thumb' => array(
-                    'type' => 'custom',
-                    'content' => $aCustomMediaTemplates['images']['thumb_choice'],
-                    'name' => 'thumb',
-                    'caption' => _t('_bx_groups_form_caption_thumb_choice'),
-                    'info' => _t('_bx_groups_form_info_thumb_choice'),
-                    'required' => false,
-                    'db' => array (
-                        'pass' => 'Int',
-                    ),
-                ),
-                'images_choice' => array(
-                    'type' => 'custom',
-                    'content' => $aCustomMediaTemplates['images']['choice'],
-                    'name' => 'images_choice[]',
-                    'caption' => _t('_bx_groups_form_caption_images_choice'),
-                    'info' => _t('_bx_groups_form_info_images_choice'),
-                    'required' => false,
-                ),
-                'images_upload' => array(
-                    'type' => 'custom',
-                    'content' => $aCustomMediaTemplates['images']['upload'],
-                    'name' => 'images_upload[]',
-                    'caption' => _t('_bx_groups_form_caption_images_upload'),
-                    'info' => _t('_bx_groups_form_info_images_upload'),
-                    'required' => false,
-                ),
-
-                // videos
-
-                'header_videos' => array(
-                    'type' => 'block_header',
-                    'caption' => _t('_bx_groups_form_header_videos'),
-                    'collapsable' => true,
-                    'collapsed' => false,
-                ),
-                'videos_choice' => array(
-                    'type' => 'custom',
-                    'content' => $aCustomMediaTemplates['videos']['choice'],
-                    'name' => 'videos_choice[]',
-                    'caption' => _t('_bx_groups_form_caption_videos_choice'),
-                    'info' => _t('_bx_groups_form_info_videos_choice'),
-                    'required' => false,
-                ),
-                'videos_upload' => array(
-                    'type' => 'custom',
-                    'content' => $aCustomMediaTemplates['videos']['upload'],
-                    'name' => 'videos_upload[]',
-                    'caption' => _t('_bx_groups_form_caption_videos_upload'),
-                    'info' => _t('_bx_groups_form_info_videos_upload'),
-                    'required' => false,
-                ),
-
-                // sounds
-
-                'header_sounds' => array(
-                    'type' => 'block_header',
-                    'caption' => _t('_bx_groups_form_header_sounds'),
-                    'collapsable' => true,
-                    'collapsed' => false,
-                ),
-                'sounds_choice' => array(
-                    'type' => 'custom',
-                    'content' => $aCustomMediaTemplates['sounds']['choice'],
-                    'name' => 'sounds_choice[]',
-                    'caption' => _t('_bx_groups_form_caption_sounds_choice'),
-                    'info' => _t('_bx_groups_form_info_sounds_choice'),
-                    'required' => false,
-                ),
-                'sounds_upload' => array(
-                    'type' => 'custom',
-                    'content' => $aCustomMediaTemplates['sounds']['upload'],
-                    'name' => 'sounds_upload[]',
-                    'caption' => _t('_bx_groups_form_caption_sounds_upload'),
-                    'info' => _t('_bx_groups_form_info_sounds_upload'),
-                    'required' => false,
-                ),
-
-                // files
-
-                'header_files' => array(
-                    'type' => 'block_header',
-                    'caption' => _t('_bx_groups_form_header_files'),
-                    'collapsable' => true,
-                    'collapsed' => false,
-                ),
-                'files_choice' => array(
-                    'type' => 'custom',
-                    'content' => $aCustomMediaTemplates['files']['choice'],
-                    'name' => 'files_choice[]',
-                    'caption' => _t('_bx_groups_form_caption_files_choice'),
-                    'info' => _t('_bx_groups_form_info_files_choice'),
-                    'required' => false,
-                ),
-                'files_upload' => array(
-                    'type' => 'custom',
-                    'content' => $aCustomMediaTemplates['files']['upload'],
-                    'name' => 'files_upload[]',
-                    'caption' => _t('_bx_groups_form_caption_files_upload'),
-                    'info' => _t('_bx_groups_form_info_files_upload'),
-                    'required' => false,
-                ),
 
                 // privacy
@@ -383 +210 @@
 
                 'allow_rate_to' => $aInputPrivacyRate,
-
-                'allow_post_in_forum_to' => $aInputPrivacyForum,
 
                 'allow_join_to' => $this->_oMain->_oPrivacy->getGroupChooser($iProfileId, 'groups', 'join'),
@@ -408 +233 @@
                 'allow_upload_photos_to' => $aInputPrivacyUploadPhotos,
 
-                'allow_upload_videos_to' => $aInputPrivacyUploadVideos,
-
-                'allow_upload_sounds_to' => $aInputPrivacyUploadSounds,
-
-                'allow_upload_files_to' => $aInputPrivacyUploadFiles,
+                'header_submit' => array(
+                    'type' => 'block_header',
+                    'caption' => '',
+                ),
 
                 'Submit' => array (
@@ -423 +247 @@
         );
 
-        if (!$aCustomForm['inputs']['images_choice']['content']) {
-            unset ($aCustomForm['inputs']['thumb']);
-            unset ($aCustomForm['inputs']['images_choice']);
-        }
-
-        if (!$aCustomForm['inputs']['videos_choice']['content'])
-            unset ($aCustomForm['inputs']['videos_choice']);
-
-        if (!$aCustomForm['inputs']['sounds_choice']['content'])
-            unset ($aCustomForm['inputs']['sounds_choice']);
-
-        if (!$aCustomForm['inputs']['files_choice']['content'])
-            unset ($aCustomForm['inputs']['files_choice']);
-
-        $this->processMembershipChecksForMediaUploads ($aCustomForm['inputs']);
-
-        parent::BxDolFormMedia ($aCustomForm);
+        parent::__construct ($aCustomForm);
     }
 
 }
 
-?>

trunk/modules/boonex/groups/classes/BxGroupsFormEdit.php

@@ -24 +24 @@
 class BxGroupsFormEdit extends BxGroupsFormAdd {
 
-    function BxGroupsFormEdit ($oMain, $iProfileId, $iEntryId, &$aDataEntry) {
-        parent::BxGroupsFormAdd ($oMain, $iProfileId, $iEntryId, $aDataEntry['thumb']);
+    function __construct ($oMain, $iProfileId, $iEntryId, &$aDataEntry) {
+        parent::__construct ($oMain, $iProfileId, $iEntryId, $aDataEntry['thumb']);
 
         $aFormInputsId = array (

trunk/modules/boonex/groups/classes/BxGroupsModule.php

@@ -539 +539 @@
         if ($this->isAdmin())
             return true;
-        if (!$GLOBALS['logged']['member'])
+        if (empty($GLOBALS['logged']['member']))
             return false;
         $this->_defineActions();
@@ -688 +688 @@
         if (!$iProfileId)
             $iProfileId = $this->_iProfileId;
-        if (($GLOBALS['logged']['member'] || $GLOBALS['logged']['admin']) && $aDataEntry['author_id'] == $iProfileId && isProfileActive($iProfileId))
+        if ((!empty($GLOBALS['logged']['member']) || !empty($GLOBALS['logged']['admin'])) && $aDataEntry['author_id'] == $iProfileId)// TODO: && isProfileActive($iProfileId))
             return true;
         return $this->_oDb->isGroupAdmin ($aDataEntry['id'], $iProfileId) && isProfileActive($iProfileId);

trunk/modules/boonex/groups/classes/BxGroupsPageView.php

@@ -67 +67 @@
 
     function getBlockCode_Actions() {
-        global $oFunctions;
 
         if ($this->_oMain->_iProfileId || $this->_oMain->isAdmin()) {
@@ -101 +100 @@
                 return '';
 
-            return $oSubscription->getData() . $oFunctions->genObjectsActions($aInfo, 'bx_groups');
+            return $oSubscription->getData() . BxTemplFunctions::getInstance()->genObjectsActions($aInfo, 'bx_groups');
         }
 

trunk/modules/boonex/groups/classes/BxGroupsSearchResult.php

@@ -290 +290 @@
     }
 
-    function displayResultBlock () {
-        global $oFunctions;
+    function displayResultBlock () {        
         $s = parent::displayResultBlock ();
         if ($s) {
             $oMain = $this->getMain();
-            $GLOBALS['oSysTemplate']->addDynamicLocation($oMain->_oConfig->getHomePath(), $oMain->_oConfig->getHomeUrl());
-            $GLOBALS['oSysTemplate']->addCss('unit.css');
-            return $oFunctions->centerContent ($s, '.bx_groups_unit');
+            BxDolTemplate::getInstance()->addDynamicLocation($oMain->_oConfig->getHomePath(), $oMain->_oConfig->getHomeUrl());
+            BxDolTemplate::getInstance()->addCss('unit.css');
+            bx_import('BxTemplFunctions');
+            return BxTemplFunctions::getInstance()->centerContent ($s, '.bx_groups_unit');
         }
         return '';

trunk/modules/boonex/groups/classes/BxGroupsTemplate.php

@@ -38 +38 @@
     function unit ($aData, $sTemplateName, &$oVotingView) {
 
+        require_once(BX_DIRECTORY_PATH_INC . 'prof.inc.php');
+
         if (null == $this->_oMain)
             $this->_oMain = BxDolModule::getInstance('BxGroupsModule');
@@ -59 +61 @@
             'group_title' => $aData['title'],
             'created' => defineTimeInterval($aData['created']),
-            'author' => $aData['NickName'],
-            'author_url' => $aData['author_id'] ? getProfileLink($aData['author_id']) : 'javascript:void(0);',
+            'author' => 'Undefined', // TODO: $aData['NickName'],
+            'author_url' => '', // TODO: $aData['author_id'] ? getProfileLink($aData['author_id']) : 'javascript:void(0);',
             'fans_count' => $aData['fans_count'],
             'country_city' => _t($GLOBALS['aPreValues']['Country'][$aData['country']]['LKey']) . (trim($aData['city']) ? ', '.$aData['city'] : ''),

trunk/modules/boonex/groups/install/sql/enable.sql

@@ -9 +9 @@
 -- page compose blocks
 INSERT INTO `sys_page_compose` (`Page`, `PageWidth`, `Desc`, `Caption`, `Column`, `Order`, `Func`, `Content`, `DesignBox`, `ColWidth`, `Visible`, `MinWidth`) VALUES 
-    ('bx_groups_view', '998px', 'Group''s actions block', '_bx_groups_block_actions', '1', '0', 'Actions', '', '1', '34', 'non,memb', '0'),    
-    ('bx_groups_view', '998px', 'Group''s rate block', '_bx_groups_block_rate', '1', '1', 'Rate', '', '1', '34', 'non,memb', '0'),    
-    ('bx_groups_view', '998px', 'Group''s info block', '_bx_groups_block_info', '1', '2', 'Info', '', '1', '34', 'non,memb', '0'),
-    ('bx_groups_view', '998px', 'Group''s fans block', '_bx_groups_block_fans', '1', '3', 'Fans', '', '1', '34', 'non,memb', '0'),    
-    ('bx_groups_view', '998px', 'Group''s unconfirmed fans block', '_bx_groups_block_fans_unconfirmed', '1', '5', 'FansUnconfirmed', '', '1', '34', 'memb', '0'),
-    ('bx_groups_view', '998px', 'Group''s description block', '_bx_groups_block_desc', '2', '0', 'Desc', '', '1', '66', 'non,memb', '0'),
-    ('bx_groups_view', '998px', 'Group''s photo block', '_bx_groups_block_photo', '2', '1', 'Photo', '', '1', '66', 'non,memb', '0'),
-    ('bx_groups_view', '998px', 'Group''s comments block', '_bx_groups_block_comments', '2', '5', 'Comments', '', '1', '66', 'non,memb', '0'),
-    ('bx_groups_main', '998px', 'Latest Featured Group', '_bx_groups_block_latest_featured_group', '2', '0', 'LatestFeaturedGroup', '', '1', '66', 'non,memb', '0'),
-    ('bx_groups_main', '998px', 'Recent Groups', '_bx_groups_block_recent', '1', '0', 'Recent', '', '1', '34', 'non,memb', '0'),
-    ('bx_groups_my', '998px', 'Administration Owner', '_bx_groups_block_administration_owner', '1', '0', 'Owner', '', '1', '100', 'non,memb', '0'),
+    ('bx_groups_view', '998px', 'Group''s actions block', '_bx_groups_block_actions', '1', '0', 'Actions', '', '11', '34', 'non,memb', '0'),    
+    ('bx_groups_view', '998px', 'Group''s rate block', '_bx_groups_block_rate', '1', '1', 'Rate', '', '11', '34', 'non,memb', '0'),    
+    ('bx_groups_view', '998px', 'Group''s info block', '_bx_groups_block_info', '1', '2', 'Info', '', '11', '34', 'non,memb', '0'),
+    ('bx_groups_view', '998px', 'Group''s fans block', '_bx_groups_block_fans', '1', '3', 'Fans', '', '11', '34', 'non,memb', '0'),    
+    ('bx_groups_view', '998px', 'Group''s unconfirmed fans block', '_bx_groups_block_fans_unconfirmed', '11', '5', 'FansUnconfirmed', '', '1', '34', 'memb', '0'),
+    ('bx_groups_view', '998px', 'Group''s description block', '_bx_groups_block_desc', '2', '0', 'Desc', '', '11', '66', 'non,memb', '0'),
+    ('bx_groups_view', '998px', 'Group''s photo block', '_bx_groups_block_photo', '2', '1', 'Photo', '', '11', '66', 'non,memb', '0'),
+    ('bx_groups_view', '998px', 'Group''s comments block', '_bx_groups_block_comments', '2', '5', 'Comments', '', '11', '66', 'non,memb', '0'),
+    ('bx_groups_main', '998px', 'Latest Featured Group', '_bx_groups_block_latest_featured_group', '2', '0', 'LatestFeaturedGroup', '', '11', '66', 'non,memb', '0'),
+    ('bx_groups_main', '998px', 'Recent Groups', '_bx_groups_block_recent', '1', '0', 'Recent', '', '11', '34', 'non,memb', '0'),
+    ('bx_groups_my', '998px', 'Administration Owner', '_bx_groups_block_administration_owner', '1', '0', 'Owner', '', '11', '100', 'non,memb', '0'),
     ('bx_groups_my', '998px', 'User''s groups', '_bx_groups_block_users_groups', '1', '1', 'Browse', '', '0', '100', 'non,memb', '0'),
-    ('index', '998px', 'Groups', '_bx_groups_block_homepage', 0, 0, 'PHP', 'bx_import(''BxDolService''); return BxDolService::call(''groups'', ''homepage_block'');', 1, 66, 'non,memb', 0);
+    ('index', '998px', 'Groups', '_bx_groups_block_homepage', 0, 0, 'PHP', 'bx_import(''BxDolService''); return BxDolService::call(''groups'', ''homepage_block'');', 11, 66, 'non,memb', 0);
 
 -- permalinkU