MDL-23069 moving version and cron info into standard version.php - fi…

…nally, yay!

admin/blocks.php

@@ -126,7 +126,16 @@
         if (!file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) {
             $blockobject  = false;
             $strblockname = '<span class="notifyproblem">'.$blockname.' ('.get_string('missingfromdisk').')</span>';
+            $plugin = new object();
+            $plugin->version = $block->version;
+
         } else {
+            $plugin = new object();
+            $plugin->version = '???';
+            if (file_exists("$CFG->dirroot/blocks/$blockname/version.php")) {
+                include("$CFG->dirroot/blocks/$blockname/version.php");
+            }
+
             if (!$blockobject  = block_instance($block->name)) {
                 $incompatible[] = $block;
                 continue;
@@ -172,14 +181,17 @@
             $class = ' class="dimmed_text"'; // Leading space required!
         }
 
-
-        if ($blockobject) {
-            $blockobject->get_version();
+        if ($block->version == $plugin->version) {
+            $version = $block->version;
+        } else {
+            $version = "$block->version ($plugin->version)";
         }
+
+
         $table->add_data(array(
             '<span'.$class.'>'.$strblockname.'</span>',
             $blocklist,
-            '<span'.$class.'>'.$block->version.'</span>',
+            '<span'.$class.'>'.$version.'</span>',
             $visible,
             $delete,
             $settings

blocks/activity_modules/block_activity_modules.php

@@ -3,7 +3,6 @@
 class block_activity_modules extends block_list {
     function init() {
         $this->title = get_string('pluginname', 'block_activity_modules');
-        $this->version = 2007101509;
     }
 
     function get_content() {

blocks/activity_modules/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2007101509;

blocks/admin_bookmarks/block_admin_bookmarks.php

@@ -8,7 +8,6 @@ class block_admin_bookmarks extends block_base {
 
     function init() {
         $this->title = get_string('pluginname', 'block_admin_bookmarks');
-        $this->version = 2007101509;
     }
 
     function applicable_formats() {

blocks/admin_bookmarks/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2007101509;

blocks/blog_menu/block_blog_menu.php

@@ -37,7 +37,6 @@ class block_blog_menu extends block_base {
 
     function init() {
         $this->title = get_string('pluginname', 'block_blog_menu');
-        $this->version = 2009071700;
     }
 
     function instance_allow_multiple() {
@@ -57,7 +56,7 @@ function instance_allow_config() {
     }
 
     function get_content() {
-        
+
         // Check if we've already generated content
         if (!empty($this->content)) {
             return $this->content;
@@ -79,7 +78,7 @@ function get_content() {
             }
             return $this->content;
         }
-        
+
         // Iterate the option types
         $menulist = array();
         foreach ($options as $types) {

blocks/blog_menu/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2009071700;

blocks/blog_recent/block_blog_recent.php

@@ -37,7 +37,6 @@ class block_blog_recent extends block_base {
     function init() {
         $this->title = get_string('pluginname', 'block_blog_recent');
         $this->content_type = BLOCK_TYPE_TEXT;
-        $this->version = 2009070900;
     }
 
     function applicable_formats() {

blocks/blog_recent/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2009070900;

blocks/blog_tags/block_blog_tags.php

@@ -1,5 +1,7 @@
 <?php
 
+//TODO: fix these sloppy constant names or move them elsewhere!
+
 define('BLOGDEFAULTTIMEWITHIN', 90);
 define('BLOGDEFAULTNUMBEROFTAGS', 20);
 define('BLOGDEFAULTSORT', 'name');
@@ -8,7 +10,6 @@
 
 class block_blog_tags extends block_base {
     function init() {
-        $this->version = 2007101509;
         $this->title = get_string('pluginname', 'block_blog_tags');
     }
 

blocks/blog_tags/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2007101509;

blocks/calendar_month/block_calendar_month.php

@@ -3,7 +3,6 @@
 class block_calendar_month extends block_base {
     function init() {
         $this->title = get_string('pluginname', 'block_calendar_month');
-        $this->version = 2007101509;
     }
 
     function preferred_width() {

blocks/calendar_month/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2007101509;

blocks/calendar_upcoming/block_calendar_upcoming.php

@@ -3,7 +3,6 @@
 class block_calendar_upcoming extends block_base {
     function init() {
         $this->title = get_string('pluginname', 'block_calendar_upcoming');
-        $this->version = 2007101509;
     }
 
     function get_content() {

blocks/calendar_upcoming/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2007101509;

blocks/comments/block_comments.php

@@ -6,7 +6,6 @@ class block_comments extends block_base {
 
     function init() {
         $this->title = get_string('pluginname', 'block_comments');
-        $this->version = 2009072000;
     }
 
     function specialization() {

blocks/comments/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2009072000;

blocks/community/block_community.php

@@ -27,7 +27,6 @@
 class block_community extends block_list {
     function init() {
         $this->title = get_string('pluginname', 'block_community');
-        $this->version = 2010042701;
     }
 
     function user_can_addto($page) {
@@ -80,8 +79,8 @@ function get_content() {
             $this->content->icons[] = '';
             foreach ($courses as $course) {
                 //delete link
-                $deleteicon = html_writer::empty_tag('img', 
-                        array('src' => $OUTPUT->pix_url('i/cross_red_small'), 
+                $deleteicon = html_writer::empty_tag('img',
+                        array('src' => $OUTPUT->pix_url('i/cross_red_small'),
                             'alt' => get_string('removecommunitycourse', 'block_community')));
                 $deleteurl = new moodle_url($CFG->wwwroot.'/blocks/community/communitycourse.php',
                         array('remove'=>true, 'communityid'=> $course->id, 'sesskey' => sesskey()));

blocks/community/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2010042701;

blocks/completionstatus/block_completionstatus.php

@@ -34,7 +34,6 @@ class block_completionstatus extends block_base {
 
     public function init() {
         $this->title   = get_string('completionstatus', 'block_completionstatus');
-        $this->version = 2009072800;
     }
 
     public function get_content() {

blocks/completionstatus/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2009072800;

blocks/course_list/block_course_list.php

@@ -5,7 +5,6 @@
 class block_course_list extends block_list {
     function init() {
         $this->title = get_string('courses');
-        $this->version = 2007101509;
     }
 
     function has_config() {

blocks/course_list/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2007101509;

blocks/course_overview/block_course_overview.php

@@ -33,7 +33,6 @@ class block_course_overview extends block_base {
      */
     public function init() {
         $this->title   = get_string('pluginname', 'block_course_overview');
-        $this->version = 2010021100;
     }
 
     /**

blocks/course_overview/version.php

@@ -0,0 +1,18 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+$plugin->version = 2010021100;