#42 - messages module (messages deletion)

modules/base/text/classes/BxBaseModTextFormEntry.php

@@ -16,7 +16,7 @@ bx_import('BxTemplFormView');
  */
 class BxBaseModTextFormEntry extends BxTemplFormView 
 {
-    protected static $MODULE;
+    protected $MODULE;
 
     protected $_oModule;
 
@@ -24,7 +24,7 @@ class BxBaseModTextFormEntry extends BxTemplFormView
     {
         parent::__construct($aInfo, $oTemplate);
         
-        $this->_oModule = BxDolModule::getInstance(self::$MODULE);
+        $this->_oModule = BxDolModule::getInstance($this->MODULE);
 
         $CNF = &$this->_oModule->_oConfig->CNF;
 

modules/base/text/classes/BxBaseModTextFormsEntryHelper.php

@@ -172,7 +172,8 @@ class BxBaseModTextFormsEntryHelper extends BxDolProfileForms
         bx_alert($this->_oModule->getName(), 'deleted', $aContentInfo[$CNF['FIELD_ID']]);
 
         // redirect 
-        $this->_redirectAndExit('page.php?i=' . $CNF['URI_HOME']);
+        bx_import('BxDolPermalinks');
+        $this->_redirectAndExit(BxDolPermalinks::getInstance()->permalink($CNF['URL_HOME']));
     }
 
 

modules/base/text/classes/BxBaseModTextMenu.php

@@ -16,7 +16,7 @@ bx_import('BxTemplMenu');
  */
 class BxBaseModTextMenu extends BxTemplMenu 
 {
-    protected static $MODULE;
+    protected $MODULE;
 
     protected $_oModule;
     protected $_aContentInfo;
@@ -26,7 +26,7 @@ class BxBaseModTextMenu extends BxTemplMenu
         parent::__construct($aObject, $oTemplate);
 
         bx_import('BxDolModule');
-        $this->_oModule = BxDolModule::getInstance(self::$MODULE);
+        $this->_oModule = BxDolModule::getInstance($this->MODULE);
     }
 
     /**

modules/base/text/classes/BxBaseModTextMenuView.php

@@ -9,13 +9,12 @@
  * @{
  */
 
-bx_import('BxTemplMenu');
-bx_import('Menu', 'bx_notes');
+bx_import('BxBaseModTextMenu');
 
 /**
  * View entry menu
  */
-class BxBaseModTextMenuView extends BxNotesMenu
+class BxBaseModTextMenuView extends BxBaseModTextMenu
 {
     public function __construct($aObject, $oTemplate = false) 
     {

modules/base/text/classes/BxBaseModTextPageBrowse.php

@@ -17,13 +17,13 @@ bx_import('BxTemplPage');
  */
 class BxBaseModTextPageBrowse extends BxTemplPage 
 {   
-    protected static $MODULE;
+    protected $MODULE;
  
     public function __construct($aObject, $oTemplate = false) 
     {
         parent::__construct($aObject, $oTemplate);
 
-        $oModule = BxDolModule::getInstance(self::$MODULE);
+        $oModule = BxDolModule::getInstance($this->MODULE);
 
         // select module submenu
         bx_import('BxDolMenu');

modules/base/text/classes/BxBaseModTextPageEntry.php

@@ -18,7 +18,7 @@ bx_import('BxDolMenu');
  */
 class BxBaseModTextPageEntry extends BxTemplPage 
 {    
-    protected static $MODULE;
+    protected $MODULE;
 
     protected $_oModule;
     protected $_aContentInfo = false;
@@ -27,7 +27,7 @@ class BxBaseModTextPageEntry extends BxTemplPage
     {
         parent::__construct($aObject, $oTemplate);
 
-        $this->_oModule = BxDolModule::getInstance(self::$MODULE);
+        $this->_oModule = BxDolModule::getInstance($this->MODULE);
         $CNF = &$this->_oModule->_oConfig->CNF;
 
         // select view entry submenu

modules/boonex/messages/classes/BxMsgConfig.php

@@ -39,10 +39,11 @@ class BxMsgConfig extends BxBaseModTextConfig
 
             // page URIs
             'URI_VIEW_ENTRY' => 'view-message',
-            'URI_HOME' => 'messages',
             'URI_AUTHOR_ENTRIES' => 'messages',
             'URI_ADD_ENTRY' => 'compose-message',
 
+            'URL_HOME' => 'modules/?r=messages/folder/1',
+
             // some params
             'PARAM_CHARS_SUMMARY' => '',
             'PARAM_CHARS_SUMMARY_PLAIN' => '',
@@ -68,9 +69,6 @@ class BxMsgConfig extends BxBaseModTextConfig
 
             // menu items which visibility depends on custom visibility checking
             'MENU_ITEM_TO_METHOD' => array (
-                'bx_messages_my' => array (
-                    'compose-message' => 'checkAllowedAdd',
-                ),
                 'bx_messages_view' => array (
                     'delete-message' => 'checkAllowedDelete',
                 ),

modules/boonex/messages/classes/BxMsgFormEntry.php

@@ -18,7 +18,7 @@ class BxMsgFormEntry extends BxBaseModTextFormEntry
 {
     public function __construct($aInfo, $oTemplate = false) 
     {
-        self::$MODULE = 'bx_messages';
+        $this->MODULE = 'bx_messages';
         parent::__construct($aInfo, $oTemplate);
 
         $aJs = array (

modules/boonex/messages/classes/BxMsgGrid.php

@@ -15,11 +15,11 @@ bx_import('BxTemplGrid');
 
 class BxMsgGrid extends BxTemplGrid 
 {
-    protected static $MODULE;
+    protected $MODULE;
 
     public function __construct ($aOptions, $oTemplate = false) 
     {
-        self::$MODULE = 'bx_messages';
+        $this->MODULE = 'bx_messages';
         parent::__construct ($aOptions, $oTemplate);
         $this->_sDefaultSortingOrder = 'DESC';
 
@@ -33,7 +33,7 @@ class BxMsgGrid extends BxTemplGrid
     public function performActionCompose() 
     {
         bx_import('BxDolModule');
-        $oModule = BxDolModule::getInstance(self::$MODULE);
+        $oModule = BxDolModule::getInstance($this->MODULE);
         $CNF = &$oModule->_oConfig->CNF;
 
         bx_import('BxDolPermalinks');
@@ -45,7 +45,7 @@ class BxMsgGrid extends BxTemplGrid
     protected function _getActionAdd ($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array()) 
     {
         bx_import('BxDolModule');
-        $oModule = BxDolModule::getInstance(self::$MODULE);
+        $oModule = BxDolModule::getInstance($this->MODULE);
         $CNF = &$oModule->_oConfig->CNF;
 
         bx_import('BxDolPermalinks');
@@ -60,7 +60,7 @@ class BxMsgGrid extends BxTemplGrid
     protected function _getCellPreview ($mixedValue, $sKey, $aField, $aRow) 
     {
         bx_import('BxDolModule');
-        $oModule = BxDolModule::getInstance(self::$MODULE);
+        $oModule = BxDolModule::getInstance($this->MODULE);
         $CNF = &$oModule->_oConfig->CNF;
 
         bx_import('BxDolPermalinks');
@@ -84,7 +84,7 @@ class BxMsgGrid extends BxTemplGrid
     protected function _getCellCollaborators ($mixedValue, $sKey, $aField, $aRow)
     {
         bx_import('BxDolModule');
-        $oModule = BxDolModule::getInstance(self::$MODULE);
+        $oModule = BxDolModule::getInstance($this->MODULE);
         $s = $oModule->_oTemplate->entryCollaborators ($aRow);
         return parent::_getCellDefault ($s, $sKey, $aField, $aRow);
     }
@@ -102,8 +102,11 @@ class BxMsgGrid extends BxTemplGrid
     protected function _delete ($mixedId) 
     {
         bx_import('BxDolModule');
-        $oModule = BxDolModule::getInstance(self::$MODULE);
+        $oModule = BxDolModule::getInstance($this->MODULE);
 
+        if ($sErrorMsg = $oModule->deleteMessage ($mixedId))
+            return false;
+    
         return $oModule->_oDb->moveMessage((int)$mixedId, bx_get_logged_profile_id(), BX_MSG_FOLDER_TRASH);
     }
 }

modules/boonex/messages/classes/BxMsgMenu.php

@@ -18,7 +18,7 @@ class BxMsgMenu extends BxBaseModTextMenu
 {
     public function __construct($aObject, $oTemplate = false) 
     {
-        self::$MODULE = 'bx_messages';
+        $this->MODULE = 'bx_messages';
         parent::__construct($aObject, $oTemplate);
     }
 }

modules/boonex/messages/classes/BxMsgMenuView.php

@@ -18,6 +18,7 @@ class BxMsgMenuView extends BxBaseModTextMenuView
 {
     public function __construct($aObject, $oTemplate = false) 
     {
+        $this->MODULE = 'bx_messages';
         parent::__construct($aObject, $oTemplate);
     }
 }

modules/boonex/messages/classes/BxMsgModule.php

@@ -53,12 +53,44 @@ class BxMsgModule extends BxBaseModTextModule
         $oMenuSubmenu = BxDolMenu::getObjectInstance('sys_site_submenu');
         if ($oMenuSubmenu) 
             $oMenuSubmenu->setObjectSubmenu($this->_oConfig->CNF['OBJECT_MENU_SUBMENU'], array (
-                'title' => 'Messages',
+                'title' => _t('_bx_msg'),
                 'link' => 'javascript:void(0);',
                 'icon' => '',
             ));
     }
 
+    /**
+     * Delete message for current user by content id
+     * @return error message on error, or empty message on success
+     */
+    public function deleteMessage ($iContentId) 
+    {
+        $aContentInfo = $this->_oDb->getContentInfoById($iContentId);
+        if (!$aContentInfo)
+            return _t('_sys_request_page_not_found_cpt');
+
+        if (CHECK_ACTION_RESULT_ALLOWED !== ($sMsg = $this->checkAllowedDelete($aContentInfo)))
+            return $sMsg;
+
+        if (!$this->_oDb->moveMessage((int)$iContentId, bx_get_logged_profile_id(), BX_MSG_FOLDER_TRASH))
+            return _t('_error occured');
+
+        return '';
+    }
+
+    public function actionDelete($iContentId) 
+    {
+        header('Content-Type:text/plain; charset=utf-8');
+
+        if ($s = $this->deleteMessage ($iContentId)) {
+            echo $s;
+            exit;
+        }
+
+        echo BX_DOL_URL_ROOT . $this->_oConfig->CNF['URL_HOME'];
+        exit;
+    }
+
     /**
      * Display messages in folder
      */

modules/boonex/messages/classes/BxMsgPageBrowse.php

@@ -18,7 +18,7 @@ class BxMsgPageBrowse extends BxBaseModTextPageBrowse
 {    
     public function __construct($aObject, $oTemplate = false) 
     {
-        self::$MODULE = 'bx_messages';
+        $this->MODULE = 'bx_messages';
         parent::__construct($aObject, $oTemplate);
     }
 }

modules/boonex/messages/classes/BxMsgPageEntry.php

@@ -18,7 +18,7 @@ class BxMsgPageEntry extends BxBaseModTextPageEntry
 {    
     public function __construct($aObject, $oTemplate = false) 
     {
-        self::$MODULE = 'bx_messages';
+        $this->MODULE = 'bx_messages';
         parent::__construct($aObject, $oTemplate);
 
         $CNF = &$this->_oModule->_oConfig->CNF;
@@ -26,6 +26,8 @@ class BxMsgPageEntry extends BxBaseModTextPageEntry
         $this->_oModule->_oDb->updateReadComments(bx_get_logged_profile_id(), $this->_aContentInfo[$CNF['FIELD_ID']], $this->_aContentInfo[$CNF['FIELD_COMMENTS']]);
 
         $this->_oModule->setModuleSubmenu ();
+
+        $this->_oModule->_oTemplate->addJs('main.js');
     }
 }
 

modules/boonex/messages/classes/BxMsgSearchResult.php

@@ -79,7 +79,8 @@ class BxMsgSearchResult extends BxBaseModTextSearchResult
             
             case 'public':
             case '':
-                $this->sBrowseUrl = 'page.php?i=' . $CNF['URI_HOME'];
+                bx_import('BxDolPermalinks');
+                $this->sBrowseUrl = BxDolPermalinks::getInstance()->permalink($CNF['URL_HOME']);
                 $this->aCurrent['title'] = _t('_bx_notes_page_title_browse_recent');
                 $this->aCurrent['rss']['link'] = 'modules/?r=notes/rss/' . $sMode;
                 break;

modules/boonex/messages/install/sql/disable.sql

@@ -18,12 +18,12 @@ TRUNCATE TABLE `bx_messages_photos_resized`;
 
 -- PAGES
 DELETE FROM `sys_objects_page` WHERE `module` = 'bx_messages';
-DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_messages' OR `object` IN('bx_messages_create_entry', 'bx_messages_delete_entry', 'bx_messages_view_entry', 'bx_messages_home');
+DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_messages' OR `object` IN('bx_messages_create_entry', 'bx_messages_view_entry', 'bx_messages_home');
 
 -- MENU
 DELETE FROM `sys_objects_menu` WHERE `module` = 'bx_messages';
 DELETE FROM `sys_menu_sets` WHERE `module` = 'bx_messages';
-DELETE FROM `sys_menu_items` WHERE `module` = 'bx_messages' OR `set_name` IN('bx_messages_view', 'bx_messages_submenu', 'bx_messages_my', 'bx_messages_menu_folders_more');
+DELETE FROM `sys_menu_items` WHERE `module` = 'bx_messages' OR `set_name` IN('bx_messages_view', 'bx_messages_submenu', 'bx_messages_menu_folders_more');
 
 -- GRID
 DELETE FROM `sys_objects_grid` WHERE `object` LIKE 'bx_messages%';

modules/boonex/messages/install/sql/enable.sql

@@ -40,15 +40,6 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designb
 ('bx_messages_create_entry', 1, 'bx_messages', '_bx_msg_page_block_title_create_entry', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_messages";s:6:"method";s:13:"entity_create";}', 0, 1, 1);
 
 
--- PAGE: delete entry
-
-INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_messages_delete_entry', '_bx_msg_page_title_sys_delete_entry', '_bx_msg_page_title_delete_entry', 'bx_messages', 5, 2147483647, 1, 'delete-message', '', '', '', '', 0, 1, 0, 'BxMsgPageEntry', 'modules/boonex/messages/classes/BxMsgPageEntry.php');
-
-INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES
-('bx_messages_delete_entry', 1, 'bx_messages', '_bx_msg_page_block_title_delete_entry', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_messages";s:6:"method";s:13:"entity_delete";}', 0, 0, 0);
-
-
 -- PAGE: view entry
 
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
@@ -80,19 +71,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 ('bx_messages_view', 'bx_messages', '_bx_msg_menu_set_title_view_entry', 0);
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('bx_messages_view', 'bx_messages', 'delete-message', '_bx_msg_menu_item_title_system_delete_entry', '_bx_msg_menu_item_title_delete_entry', 'page.php?i=delete-message&id={content_id}', '', '', 'remove', '', 0, 1, 0, 2);
-
-
--- MENU: actions menu for my entries
-
-INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_messages_my', '_bx_msg_menu_title_entries_my', 'bx_messages_my', 'bx_messages', 9, 0, 1, 'BxMsgMenu', 'modules/boonex/messages/classes/BxMsgMenu.php');
-
-INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
-('bx_messages_my', 'bx_messages', '_bx_msg_menu_set_title_entries_my', 0);
-
-INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('bx_messages_my', 'bx_messages', 'compose-message', '_bx_msg_menu_item_title_system_create_entry', '_bx_msg_menu_item_title_create_entry', 'page.php?i=compose-message', '', '', 'plus', '', 0, 1, 0, 0);
+('bx_messages_view', 'bx_messages', 'delete-message', '_bx_msg_menu_item_title_system_delete_entry', '_bx_msg_menu_item_title_delete_entry', 'javascript:void(0);', 'bx_msg_delete(this, \'{content_id}\')', '', 'remove', '', 0, 1, 0, 2);
 
 
 -- MENU: module sub-menu
@@ -107,6 +86,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_messages_submenu', 'bx_messages', 'messages-folder-primary', '_bx_msg_menu_item_title_system_folder_primary', '_bx_msg_menu_item_title_folder_primary', 'modules/?r=messages/folder/1', '', '', '', '', 2147483647, 1, 1, 1),
 ('bx_messages_submenu', 'bx_messages', 'messages-folder-more', '_bx_msg_menu_item_title_system_folder_more', '_bx_msg_menu_item_title_folder_more', 'javascript:void(0);', 'bx_menu_popup(''bx_messages_menu_folders_more'', this);', '', '', '', 2147483647, 1, 1, 2);
 
+
 -- MENU: more folders
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 

modules/boonex/messages/js/main.js

@@ -0,0 +1,14 @@
+
+function bx_msg_delete(e, iMsgId) {
+    if (!confirm(_t('_are you sure?')))
+        return false;
+
+    bx_loading_btn(e, 1);
+    $.post(sUrlRoot + 'modules/?r=messages/delete/' + parseInt(iMsgId), function (s) {
+        bx_loading_btn(e, 0);
+        if (sUrlRoot == s.substring(0,sUrlRoot.length))
+            location.href = s;
+        else
+            alert(s);
+    });
+}

modules/boonex/notes/classes/BxNotesConfig.php

@@ -39,10 +39,11 @@ class BxNotesConfig extends BxBaseModTextConfig
 
             // page URIs
             'URI_VIEW_ENTRY' => 'view-note',
-            'URI_HOME' => 'notes-home',
             'URI_AUTHOR_ENTRIES' => 'notes-author',
             'URI_ADD_ENTRY' => 'create-note',
 
+            'URL_HOME' => 'page.php?i=notes-home',
+
             // some params
             'PARAM_CHARS_SUMMARY' => 'bx_notes_summary_chars',
             'PARAM_CHARS_SUMMARY_PLAIN' => 'bx_notes_plain_summary_chars',

modules/boonex/notes/classes/BxNotesFormEntry.php

@@ -18,7 +18,7 @@ class BxNotesFormEntry extends BxBaseModTextFormEntry
 {
     public function __construct($aInfo, $oTemplate = false) 
     {
-        self::$MODULE = 'bx_notes';
+        $this->MODULE = 'bx_notes';
         parent::__construct($aInfo, $oTemplate);
     }
 }

modules/boonex/notes/classes/BxNotesMenu.php

@@ -18,7 +18,7 @@ class BxNotesMenu extends BxBaseModTextMenu
 {
     public function __construct($aObject, $oTemplate = false) 
     {
-        self::$MODULE = 'bx_notes';
+        $this->MODULE = 'bx_notes';
         parent::__construct($aObject, $oTemplate);
     }
 }

modules/boonex/notes/classes/BxNotesMenuView.php

@@ -18,6 +18,7 @@ class BxNotesMenuView extends BxBaseModTextMenuView
 {
     public function __construct($aObject, $oTemplate = false) 
     {
+        $this->MODULE = 'bx_notes';
         parent::__construct($aObject, $oTemplate);
     }
 }

modules/boonex/notes/classes/BxNotesPageBrowse.php

@@ -18,7 +18,7 @@ class BxNotesPageBrowse extends BxBaseModTextPageBrowse
 {    
     public function __construct($aObject, $oTemplate = false) 
     {
-        self::$MODULE = 'bx_notes';
+        $this->MODULE = 'bx_notes';
         parent::__construct($aObject, $oTemplate);
     }
 }

modules/boonex/notes/classes/BxNotesPageEntry.php

@@ -18,7 +18,7 @@ class BxNotesPageEntry extends BxBaseModTextPageEntry
 {    
     public function __construct($aObject, $oTemplate = false) 
     {
-        self::$MODULE = 'bx_notes';
+        $this->MODULE = 'bx_notes';
         parent::__construct($aObject, $oTemplate);
     }
 }

modules/boonex/notes/classes/BxNotesSearchResult.php

@@ -79,7 +79,8 @@ class BxNotesSearchResult extends BxBaseModTextSearchResult
             
             case 'public':
             case '':
-                $this->sBrowseUrl = 'page.php?i=' . $CNF['URI_HOME'];
+                bx_import('BxDolPermalinks');
+                $this->sBrowseUrl = BxDolPermalinks::getInstance()->permalink($CNF['URL_HOME']);
                 $this->aCurrent['title'] = _t('_bx_notes_page_title_browse_recent');
                 $this->aCurrent['rss']['link'] = 'modules/?r=notes/rss/' . $sMode;
                 break;