L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changing the matching function that decides if a block is applicable for

Browse Source 
display in a page. Previously it returned the FIRST match; now it returns
the BEST match.

This allows things like

 array('all' => true, 'mod' => false, 'mod-quiz' => true)

to work correctly regardless of the order the array elements appear in.

Also, encapsulated the check into a function (it has definitely become
non-trivial).
This commit is contained in:
defacer
2005-02-10 18:43:18 +00:00
parent 89f688b6c6
commit 5bbbe0be91
1 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/blocklib.php
+21 -27
View File
@@ -106,20 +106,7 @@ function blocks_get_missing(&$page, &$pageblocks) {
foreach($allblocks as $block) {
if($block->visible && (!blocks_find_block($block->id, $pageblocks) || $block->multiple)) {
// And if it's applicable for display in this format...
$formats = block_method_result($block->name, 'applicable_formats');
$accept = NULL;
foreach($formats as $format => $allowed) {
$thisformat = '^'.str_replace('*', '[^-]*', $format).'.*$';
if(ereg($thisformat, $pageformat)) {
$accept = $allowed;
break;
}
}
if($accept === NULL) {
// ...or in all pages...
$accept = !empty($formats['all']);
}
if(!empty($accept)) {
if(blocks_name_allowed_in_format($block->name, $pageformat)) {
// ...add it to the missing blocks
$missingblocks[] = $block->id;
}
@@ -143,25 +130,32 @@ function blocks_remove_inappropriate($page) {
foreach($pageblocks as $position) {
foreach($position as $instance) {
$block = blocks_get_record($instance->blockid);
$formats = block_method_result($block->name, 'applicable_formats');
$accept = NULL;
foreach($formats as $format => $allowed) {
$thisformat = '^'.str_replace('*', '[^-]*', $format).'.*$';
if(ereg($thisformat, $pageformat)) {
$accept = $allowed;
break;
}
}
if($accept === NULL) {
$accept = !empty($formats['all']);
}
if(empty($accept)) {
if(!blocks_name_allowed_in_format($block->name, $pageformat)) {
blocks_delete_instance($instance);
}
}
}
}
function blocks_name_allowed_in_format($name, $pageformat) {
$formats = block_method_result($name, 'applicable_formats');
$accept = NULL;
$depth = -1;
foreach($formats as $format => $allowed) {
$thisformat = '^'.str_replace('*', '[^-]*', $format).'.*$';
if(ereg($thisformat, $pageformat)) {
if(($scount = substr_count($format, '-')) > $depth) {
$depth = $scount;
$accept = $allowed;
}
}
}
if($accept === NULL) {
$accept = !empty($formats['all']);
}
return $accept;
}
function blocks_delete_instance($instance) {
global $CFG;