Commit 1a118548 authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Fixed MANTIS-5941 (Block wizard was not correctly categorising a lot of blocks)

parent 568cfb63

sources/block_add.php

+15 −25
Original line number Diff line number Diff line
@@ -44,34 +44,24 @@ function block_helper_script() 


    if ($type == 'step1') { // Ask for block

        // Find what addons all our block files are in, and icons if possible

        $hooks = find_all_hooks('systems', 'addon_registry');

        $hook_keys = array_keys($hooks);

        $hook_files = [];

        foreach ($hook_keys as $hook) {

            $path = get_file_base() . '/sources_custom/hooks/systems/addon_registry/' . filter_naughty_harsh($hook) . '.php';

            if (!file_exists($path)) {

                $path = get_file_base() . '/sources/hooks/systems/addon_registry/' . filter_naughty_harsh($hook) . '.php';

            }

            $hook_files[$hook] = $path;

        }

        unset($hook_keys);

        $addon_icons = [];

        $addons_blocks = [];

        foreach ($hook_files as $addon_name => $hook_path) {

            $hook_file = cms_file_get_contents_safe($hook_path, FILE_READ_LOCK);

            $matches = [];

            if (preg_match('#function get_file_list\(\)\s*\{([^\}]*)\}#', $hook_file, $matches) != 0) {

                $addon_files = cms_eval($matches[1], $hook_path);

                if ($addon_files === false) {

                    $addon_files = []; // Some kind of PHP error

        $hooks = find_all_hook_obs('systems', 'addon_registry', 'Hook_addon_registry_');

        foreach ($hooks as $addon_name => &$obj) {

            if (!method_exists($obj,'get_file_list')) {

                continue;

            }



            $addon_files = $obj->get_file_list();

            foreach ($addon_files as $file) {

                    if ((substr($file, 0, 21) == 'sources_custom/blocks/') || (substr($file, 0, 15) == 'sources/blocks/')) {

                if ((substr($file, 0, 22) == 'sources_custom/blocks/') || (substr($file, 0, 15) == 'sources/blocks/')) {

                    $addons_blocks[basename($file, '.php')] = $addon_name;

                }

            }

            }



            $addon_icons[$addon_name] = find_addon_icon($addon_name);



            // Free up memory

            unset($files);

            unset($obj);

        }



        // Find where blocks have been used
@@ -126,7 +116,7 @@ function block_helper_script() 
                $addon_icon = null;

            }



            $this_block_type = (($addon_name === null) || (strpos($addon_name, 'block') !== false) || ($addon_name == 'core')) ? substr($block, 0, (strpos($block, '_') === false) ? strlen($block) : strpos($block, '_')) : $addon_name;

            $this_block_type = (($addon_name === null) || ($addon_name == 'core')) ? substr($block, 0, (strpos($block, '_') === false) ? strlen($block) : strpos($block, '_')) : $addon_name;

            if (!array_key_exists($this_block_type, $block_types)) {

                $block_types[$this_block_type] = new Tempcode();

            }

sources/blocks/main_comcode_page_children.php

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
/**

 * @license    http://opensource.org/licenses/cpal_1.0 Common Public Attribution License

 * @copyright  Christopher Graham

 * @package    core

 * @package    core_comcode_pages

 */



/**
@@ -38,7 +38,7 @@ class Block_main_comcode_page_children 
        $info['version'] = 2;

        $info['locked'] = false;

        $info['min_cms_version'] = 11.0;

        $info['addon'] = 'core';

        $info['addon'] = 'core_comcode_pages';

        $info['parameters'] = ['param', 'zone'];

        return $info;

    }

sources/hooks/systems/addon_registry/core.php

+0 −1
Original line number Diff line number Diff line
@@ -840,7 +840,6 @@ class Hook_addon_registry_core 
            'sources/blocks.php',

            'sources/blocks/.htaccess',

            'sources/blocks/index.html',

            'sources/blocks/main_comcode_page_children.php',

            'sources/blocks/main_content.php',

            'sources/blocks/main_content_filtering.php',

            'sources/blocks/main_db_notes.php',

sources/hooks/systems/addon_registry/core_comcode_pages.php

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ class Hook_addon_registry_core_comcode_pages 
            'data/modules/cms_comcode_pages/index.html',

            'data_custom/modules/cms_comcode_pages/.htaccess',

            'data_custom/modules/cms_comcode_pages/index.html',

            'sources/blocks/main_comcode_page_children.php',

            'sources/hooks/modules/admin_newsletter/comcode_pages.php',

            'sources/hooks/modules/search/comcode_pages.php',

            'sources/hooks/systems/addon_registry/core_comcode_pages.php',