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

New naming conventions for class names to bring them in line with the

Browse Source 
rest of Moodle. The convention for blocks is now:

class block_something extends block_base { ... }

HOWTO updated accordingly, plus some more minor polishing. More to come.
This commit is contained in:
defacer
2004-11-23 18:53:34 +00:00
parent 905e80d273
commit e89d741af3
18 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/blocklib.php
+9 -9
View File
@@ -61,7 +61,7 @@ function block_method_result($blockname, $method) {
if(!block_load_class($blockname)) {
return NULL;
}
return eval('return CourseBlock_'.$blockname.'::'.$method.'();');
return eval('return block_'.$blockname.'::'.$method.'();');
}
//This function creates a new object of the specified block class
@@ -69,7 +69,7 @@ function block_instance($blockname, $instance = NULL) {
if(!block_load_class($blockname)) {
return false;
}
$classname = 'CourseBlock_'.$blockname;
$classname = 'block_'.$blockname;
$retval = new $classname;
if($instance !== NULL) {
$retval->load_instance($instance);
@@ -83,7 +83,7 @@ function block_load_class($blockname) {
global $CFG;
@include_once($CFG->dirroot.'/blocks/moodleblock.class.php');
$classname = 'CourseBlock_'.$blockname;
$classname = 'block_'.$blockname;
@include_once($CFG->dirroot.'/blocks/'.$blockname.'/block_'.$blockname.'.php');
// After all this, return value indicating success or failure
@@ -677,8 +677,8 @@ function upgrade_blocks_plugins($continueto) {
}
include_once($CFG->dirroot .'/blocks/moodleblock.class.php');
if(!class_exists('moodleblock')) {
error('Class MoodleBlock is not defined or file not found for /blocks/moodleblock.class.php');
if(!class_exists('block_base')) {
error('Class block_base is not defined or file not found for /blocks/moodleblock.class.php');
}
foreach ($blocks as $blockname) {
@@ -705,7 +705,7 @@ function upgrade_blocks_plugins($continueto) {
}
}
$classname = 'CourseBlock_'.$blockname;
$classname = 'block_'.$blockname;
if(!class_exists($classname)) {
$notices[] = 'Block '. $blockname .': '. $classname .' not implemented';
continue;
@@ -732,9 +732,9 @@ function upgrade_blocks_plugins($continueto) {
$block = new stdClass; // This may be used to update the db below
$blockobj = new $classname; // This is what we 'll be testing
// Inherits from MoodleBlock?
if(!is_subclass_of($blockobj, 'moodleblock')) {
$notices[] = 'Block '. $blockname .': class does not inherit from MoodleBlock';
// Inherits from block_base?
if(!is_subclass_of($blockobj, 'block_base')) {
$notices[] = 'Block '. $blockname .': class does not inherit from block_base';
continue;
}