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

MDL-20700 coding style cleanup - cvs keywords removed, closign php tag removed, trailing whitespace cleanup

Browse Source
This commit is contained in:
Petr Skoda
2009-11-01 12:00:47 +00:00
parent 5117d59899
commit 4ca6cfbfd4
90 changed files with 313 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/activity_modules/block_activity_modules.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
class block_activity_modules extends block_list {
function init() {
@@ -67,4 +67,4 @@ class block_activity_modules extends block_list {
}
}
?>
blocks/activity_modules/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the activity_modules block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_activity_modules_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_activity_modules_upgrade($oldversion) {
return $result;
}
?>
blocks/admin/block_admin.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
class block_admin extends block_list {
function init() {
@@ -217,4 +217,4 @@ class block_admin extends block_list {
}
}
?>
blocks/admin/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the admin block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_admin_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_admin_upgrade($oldversion) {
return $result;
}
?>
blocks/admin_bookmarks/block_admin_bookmarks.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
// seems to work...
// maybe I should add some pretty icons?
@@ -77,4 +77,4 @@ class block_admin_bookmarks extends block_base {
}
}
?>
blocks/admin_bookmarks/create.php
+1 -2
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
require('../../config.php');
@@ -45,4 +45,3 @@ if ($section = optional_param('section', '', PARAM_SAFEDIR) and confirm_sesskey(
}
?>
blocks/admin_bookmarks/delete.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
require('../../config.php');
@@ -46,4 +46,4 @@ if ($section = optional_param('section', '', PARAM_SAFEDIR) and confirm_sesskey(
die;
}
?>
blocks/admin_tree/admintree.js
+1 -1
View File
@@ -7,7 +7,7 @@ admin_tree = {
openalt: null,
init: function(numdivs, expandnodes, openimg, closedimg, openalt, closedalt) {
// Store the information we were passed in.
// Store the information we were passed in.
admin_tree.openimg = openimg;
admin_tree.closedimg = closedimg;
admin_tree.openalt = openalt;
blocks/admin_tree/block_admin_tree.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
class block_admin_tree extends block_base {
@@ -71,7 +71,7 @@ class block_admin_tree extends block_base {
if (admin_critical_warnings_present()) {
$class .= ' criticalnotification';
}
}
}
if ($content->is_hidden()) {
$class .= ' hidden';
}
blocks/blog_tags/block_blog_tags.php
+5 -5
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
define('BLOGDEFAULTTIMEWITHIN', 90);
define('BLOGDEFAULTNUMBEROFTAGS', 20);
@@ -67,9 +67,9 @@ class block_blog_tags extends block_base {
$this->content->text = '';
$this->content->footer = '';
/// Get a list of tags
/// Get a list of tags
$timewithin = time() - $this->config->timewithin * 24 * 60 * 60; /// convert to seconds
$blogheaders = blog_get_headers();
// admins should be able to read all tags
@@ -149,7 +149,7 @@ class block_blog_tags extends block_base {
} else if (!empty($blogheaders['filters']['course'])) {
$blogurl->param('courseid', $blogheaders['filters']['course']);
}
break;
}
@@ -184,4 +184,4 @@ function blog_tags_sort($a, $b) {
}
}
?>
blocks/blog_tags/edit_form.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
blocks/calendar_month/block_calendar_month.php
+7 -7
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
class block_calendar_month extends block_base {
function init() {
@@ -16,18 +16,18 @@ class block_calendar_month extends block_base {
$cal_y = optional_param( 'cal_y', 0, PARAM_INT );
require_once($CFG->dirroot.'/calendar/lib.php');
if ($this->content !== NULL) {
return $this->content;
}
// Reset the session variables
calendar_session_vars($this->page->course);
$this->content = new stdClass;
$this->content->text = '';
$this->content->footer = '';
// [pj] To me it looks like this if would never be needed, but Penny added it
// [pj] To me it looks like this if would never be needed, but Penny added it
// when committing the /my/ stuff. Reminder to discuss and learn what it's about.
// It definitely needs SOME comment here!
$courseshown = $this->page->course->id;
@@ -73,9 +73,9 @@ class block_calendar_month extends block_base {
$this->content->text .= calendar_get_mini($courses, $group, $user, $cal_m, $cal_y);
$this->content->text .= '<h3 class="eventskey">'.get_string('eventskey', 'calendar').'</h3>';
$this->content->text .= '<div class="filters">'.calendar_filter_controls('course', '', $this->page->course).'</div>';
}
// MDL-9059, unset this so that it doesn't stay in session
if (!empty($courseset)) {
unset($SESSION->cal_courses_shown[$this->page->course->id]);
@@ -85,4 +85,4 @@ class block_calendar_month extends block_base {
}
}
?>
blocks/calendar_month/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the calendar_month block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_calendar_month_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_calendar_month_upgrade($oldversion) {
return $result;
}
?>
blocks/calendar_upcoming/block_calendar_upcoming.php
+7 -7
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
class block_calendar_upcoming extends block_base {
function init() {
@@ -37,7 +37,7 @@ class block_calendar_upcoming extends block_base {
$this->content->footer .= '<br /><a href="'.$CFG->wwwroot.
'/calendar/event.php?action=new&amp;course='.$courseshown.'">'.
get_string('newevent', 'calendar').'</a>...';
}
}
if ($courseshown == SITEID) {
// Being displayed at site level. This will cause the filter to fall back to auto-detecting
// the list of courses it will be grabbing events from.
@@ -59,12 +59,12 @@ class block_calendar_upcoming extends block_base {
// Correct formatting is [courseid] => 1 to be concise with moodlelib.php functions.
calendar_set_filters($courses, $group, $user, $filtercourse, $groupeventsfrom, false);
$events = calendar_get_upcoming($courses, $group, $user,
get_user_preferences('calendar_lookahead', CALENDAR_UPCOMING_DAYS),
$events = calendar_get_upcoming($courses, $group, $user,
get_user_preferences('calendar_lookahead', CALENDAR_UPCOMING_DAYS),
get_user_preferences('calendar_maxevents', CALENDAR_UPCOMING_MAXEVENTS));
if (!empty($this->instance)) {
$this->content->text = calendar_get_sideblock_upcoming($events,
if (!empty($this->instance)) {
$this->content->text = calendar_get_sideblock_upcoming($events,
'view.php?view=day&amp;course='.$courseshown.'&amp;');
}
@@ -77,4 +77,4 @@ class block_calendar_upcoming extends block_base {
}
}
?>
blocks/calendar_upcoming/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the calendar_upcoming block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_calendar_upcoming_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_calendar_upcoming_upgrade($oldversion) {
return $result;
}
?>
blocks/course_list/block_course_list.php
+10 -10
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
include_once($CFG->dirroot . '/course/lib.php');
@@ -7,7 +7,7 @@ class block_course_list extends block_list {
$this->title = get_string('courses');
$this->version = 2007101509;
}
function has_config() {
return true;
}
@@ -26,7 +26,7 @@ class block_course_list extends block_list {
$icon = "<img src=\"" . $OUTPUT->old_icon_url('i/course') . "\"".
" class=\"icon\" alt=\"".get_string("coursecategory")."\" />";
$adminseesall = true;
if (isset($CFG->block_course_list_adminview)) {
if ( $CFG->block_course_list_adminview == 'own'){
@@ -34,8 +34,8 @@ class block_course_list extends block_list {
}
}
if (empty($CFG->disablemycourses) and
!empty($USER->id) and
if (empty($CFG->disablemycourses) and
!empty($USER->id) and
!(has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) and $adminseesall) and
!isguestuser()) { // Just print My Courses
if ($courses = get_my_courses($USER->id, 'visible DESC, fullname ASC')) {
@@ -83,7 +83,7 @@ class block_course_list extends block_list {
$this->content->items[]="<a $linkcss title=\""
. format_string($course->shortname)."\" ".
"href=\"$CFG->wwwroot/course/view.php?id=$course->id\">"
"href=\"$CFG->wwwroot/course/view.php?id=$course->id\">"
. format_string($course->fullname) . "</a>";
$this->content->icons[]=$icon;
}
@@ -93,7 +93,7 @@ class block_course_list extends block_list {
}
$this->get_remote_courses();
} else {
$this->content->icons[] = '';
$this->content->items[] = get_string('nocoursesyet');
if (has_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $category->id))) {
@@ -128,7 +128,7 @@ class block_course_list extends block_list {
$this->content->icons[] = '';
foreach ($courses as $course) {
$this->content->items[]="<a title=\"" . format_string($course->shortname) . "\" ".
"href=\"{$CFG->wwwroot}/auth/mnet/jump.php?hostid={$course->hostid}&amp;wantsurl=/course/view.php?id={$course->remoteid}\">"
"href=\"{$CFG->wwwroot}/auth/mnet/jump.php?hostid={$course->hostid}&amp;wantsurl=/course/view.php?id={$course->remoteid}\">"
. format_string($course->fullname) . "</a>";
$this->content->icons[]=$icon;
}
@@ -137,7 +137,7 @@ class block_course_list extends block_list {
}
if ($hosts = get_my_remotehosts()) {
$this->content->items[] = get_string('remotemoodles','mnet');
$this->content->items[] = get_string('remotemoodles','mnet');
$this->content->icons[] = '';
foreach($USER->mnet_foreign_host_array as $somehost) {
$this->content->items[] = $somehost['count'].get_string('courseson','mnet').'<a title="'.$somehost['name'].'" href="'.$somehost['url'].'">'.$somehost['name'].'</a>';
@@ -152,4 +152,4 @@ class block_course_list extends block_list {
}
?>
blocks/course_list/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the course_list block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_course_list_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_course_list_upgrade($oldversion) {
return $result;
}
?>
blocks/course_list/settings.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
$options = array('all'=>get_string('allcourses', 'block_course_list'), 'own'=>get_string('owncourses', 'block_course_list'));
@@ -10,4 +10,4 @@ $settings->add(new admin_setting_configcheckbox('block_course_list_hideallcourse
get_string('confighideallcourseslink', 'block_course_list'), 0));
?>
blocks/course_summary/block_course_summary.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
class block_course_summary extends block_base {
function init() {
@@ -50,4 +50,4 @@ class block_course_summary extends block_base {
}
?>
blocks/course_summary/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the course_summary block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_course_summary_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_course_summary_upgrade($oldversion) {
return $result;
}
?>
blocks/edit_form.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
blocks/global_navigation_tree/block_global_navigation_tree.php
+3 -3
View File
@@ -152,7 +152,7 @@ class block_global_navigation_tree extends block_tree {
$this->page->requires->js_function_call('setup_new_navtree', array($this->id))->on_dom_ready();
// Grab the items to display
$this->content->items = array($this->page->navigation);
$reloadicon = new moodle_action_icon();
$reloadicon->link->url = $this->page->url;
$reloadicon->link->url->param('regenerate','navigation');
@@ -161,10 +161,10 @@ class block_global_navigation_tree extends block_tree {
$reloadicon->alt = get_string('reload');
$reloadicon->title = get_string('reload');
$this->content->footer .= $OUTPUT->action_icon($reloadicon);
if (empty($this->config->enablesidebarpopout) || $this->config->enablesidebarpopout == 'yes') {
user_preference_allow_ajax_update('nav_in_tab_panel_globalnav'.block_global_navigation_tree::$navcount, PARAM_INT);
$moveicon = new moodle_action_icon();
$moveicon->link->add_classes('moveto customcommand requiresjs');
$moveicon->link->url = $this->page->url;
blocks/glossary_random/block_glossary_random.php
+5 -5
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
define('BGR_RANDOMLY', '0');
define('BGR_LASTMODIFIED', '1');
@@ -83,7 +83,7 @@ class block_glossary_random extends block_base {
$text = '';
} else {
$text = "<h3>".format_string($entry->concept,true)."</h3>";
}
}
$options = new object;
$options->trusted = $entry->definitiontrust;
@@ -157,8 +157,8 @@ class block_glossary_random extends block_base {
.'" title="'.$this->config->addentry.'">'.$this->config->addentry.'</a><br />';
} else {
$this->content->footer = '';
}
}
$this->content->footer .= '<a href="'.$CFG->wwwroot.'/mod/glossary/view.php?id='.$cm->id
.'" title="'.$this->config->viewglossary.'">'.$this->config->viewglossary.'</a>';
@@ -190,4 +190,4 @@ class block_glossary_random extends block_base {
}
}
?>
blocks/glossary_random/edit_form.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
blocks/html/block_html.php
+7 -7
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
class block_html extends block_base {
@@ -62,10 +62,10 @@ class block_html extends block_base {
/**
* This function makes all the necessary calls to {@link restore_decode_content_links_worker()}
* function in order to decode contents of this block from the backup
* format to destination site/course in order to mantain inter-activities
* working in the backup/restore process.
*
* function in order to decode contents of this block from the backup
* format to destination site/course in order to mantain inter-activities
* working in the backup/restore process.
*
* This is called from {@link restore_decode_content_links()} function in the restore process.
*
* NOTE: There is no block instance when this method is called.
@@ -81,7 +81,7 @@ class block_html extends block_base {
$sql = "SELECT bi.*
FROM {block_instance} bi
JOIN {block} b ON b.id = bi.blockid
WHERE b.name = 'html' AND bi.id IN ($restored_blocks)";
WHERE b.name = 'html' AND bi.id IN ($restored_blocks)";
if ($instances = $DB->get_records_sql($sql)) {
foreach ($instances as $instance) {
@@ -96,4 +96,4 @@ class block_html extends block_base {
return true;
}
}
?>
blocks/html/edit_form.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
blocks/index.html
+1 -1
View File
@@ -1 +1 @@
blocks/loancalc/block_loancalc.php
+5 -5
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
class block_loancalc extends block_base {
@@ -12,7 +12,7 @@ class block_loancalc extends block_base {
global $CFG, $OUTPUT;
$calc = $OUTPUT->old_icon_url('i/calc');
$this->content->text = '
<script type="text/javascript">
// <![CDATA[
@@ -172,14 +172,14 @@ function comp(v) { // general entry point for all cases
<tr>
<td><input name="LOANTERM" id="LOANTERM" size="17" /></td>
<td><a href="JavaScript:comp(\'np\');"><img src="'.$calc.'" alt="calculate" /></a></td>
</tr>
</tr>
<tr>
<td colspan="2">'.get_string('interestrate','block_loancalc').'</td>
</tr>
<tr>
<td><input name="LOANINTRATE" id="LOANINTRATE" size="17" /></td>
<td></td>
</tr>
</tr>
<tr>
<td colspan="2">'.get_string('repaymentfreq','block_loancalc').'</td>
</tr>
@@ -200,4 +200,4 @@ function comp(v) { // general entry point for all cases
}
}
?>
blocks/login/block_login.php
+4 -4
View File
@@ -1,9 +1,9 @@
<?PHP //$Id$
<?php
class block_login extends block_base {
function init() {
$this->title = get_string('login');
$this->version = 2007101509;
$this->version = 2007101509;
}
function applicable_formats() {
@@ -26,7 +26,7 @@ class block_login extends block_base {
// in unencrypted connection...
$wwwroot = str_replace("http://", "https://", $CFG->wwwroot);
}
if (!empty($CFG->registerauth)) {
$authplugin = get_auth_plugin($CFG->registerauth);
if ($authplugin->can_signup()) {
@@ -67,4 +67,4 @@ class block_login extends block_base {
}
}
?>
blocks/mentees/block_mentees.php
+3 -3
View File
@@ -33,10 +33,10 @@ class block_mentees extends block_base {
AND ra.contextid = c.id
AND c.instanceid = u.id
AND c.contextlevel = ".CONTEXT_USER, array($USER->id))) {
$this->content->text = '<ul>';
foreach ($usercontexts as $usercontext) {
$this->content->text .= '<li><a href="'.$CFG->wwwroot.'/user/view.php?id='.$usercontext->instanceid.'&amp;course=1">'.fullname($usercontext).'</a></li>';
$this->content->text .= '<li><a href="'.$CFG->wwwroot.'/user/view.php?id='.$usercontext->instanceid.'&amp;course=1">'.fullname($usercontext).'</a></li>';
}
$this->content->text .= '</ul>';
}
@@ -46,4 +46,4 @@ class block_mentees extends block_base {
return $this->content;
}
}
?>
blocks/mentees/edit_form.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
blocks/messages/block_messages.php
+6 -6
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
class block_messages extends block_base {
function init() {
@@ -14,7 +14,7 @@ class block_messages extends block_base {
if ($this->page->user_is_editing()) {
$this->content->text = get_string('disabled', 'message');
}
return $this->content;
return $this->content;
}
if ($this->content !== NULL) {
@@ -33,7 +33,7 @@ class block_messages extends block_base {
$users = $DB->get_records_sql("SELECT m.useridfrom AS id, COUNT(m.useridfrom) AS count,
u.firstname, u.lastname, u.picture, u.imagealt, u.lastaccess
FROM {user} u, {message} m
FROM {user} u, {message} m
WHERE m.useridto = ? AND u.id = m.useridfrom
GROUP BY m.useridfrom, u.firstname,u.lastname,u.picture,u.lastaccess,u.imagealt", array($USER->id));
@@ -50,15 +50,15 @@ class block_messages extends block_base {
$this->content->text .= '<div class="message"><a href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="this.target=\'message_'.$user->id.'\'; return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img class="iconsmall" src="'.$OUTPUT->old_icon_url('t/message') . '" alt="" />&nbsp;'.$user->count.'</a>';
$this->content->text .= '</div></li>';
}
$this->content->text .= '</ul>';
$this->content->text .= '</ul>';
} else {
$this->content->text .= '<div class="info">';
$this->content->text .= get_string('nomessages', 'message');
$this->content->text .= '</div>';
$this->content->text .= '</div>';
}
return $this->content;
}
}
?>
blocks/mnet_hosts/block_mnet_hosts.php
+5 -5
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
class block_mnet_hosts extends block_list {
function init() {
@@ -44,13 +44,13 @@ class block_mnet_hosts extends block_list {
// TODO: Test this query - it's appropriate? It works?
// get the hosts and whether we are doing SSO with them
$sql = "
SELECT DISTINCT
h.id,
SELECT DISTINCT
h.id,
h.name,
h.wwwroot,
a.name as application,
a.display_name
FROM
FROM
{mnet_host} h,
{mnet_application} a,
{mnet_host2service} h2s_IDP,
@@ -100,4 +100,4 @@ class block_mnet_hosts extends block_list {
}
}
?>
blocks/moodleblock.class.php
+34 -34
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
@@ -106,7 +106,7 @@ class block_base {
*/
var $config = NULL;
/**
/**
* How often the cronjob should run, 0 if not at all.
* @var int $cron
*/
@@ -130,25 +130,25 @@ class block_base {
function __construct() {
$this->block_base();
}
/**
* Function that can be overridden to do extra cleanup before
* the database tables are deleted. (Called once per block, not per instance!)
*/
function before_delete() {
}
/**
* Function that can be overridden to do extra setup after a block instance has been
* restored from backup. For example, it may need to alter any dates that the block
* stores, if the $restore->course_startdateoffset is set.
* stores, if the $restore->course_startdateoffset is set.
*/
function after_restore($restore) {
}
/**
* Enable custom instance data section in backup and restore.
*
*
* If return true, then {@link instance_backup()} and
* {@link instance_restore()} will be called during
* backup/restore routines.
@@ -160,11 +160,11 @@ class block_base {
}
/**
* Allows the block class to have a backup routine. Handy
* when the block has its own tables that have foreign keys to
* Allows the block class to have a backup routine. Handy
* when the block has its own tables that have foreign keys to
* other tables (example: user table).
*
* Note: at the time of writing this comment, the indent level
*
* Note: at the time of writing this comment, the indent level
* for the {@link full_tag()} should start at 5.
*
* @param resource $bf Backup File
@@ -177,10 +177,10 @@ class block_base {
/**
* Allows the block class to restore its backup routine.
*
* Should not return false if data is empty
*
* Should not return false if data is empty
* because old backups would not contain block instance backup data.
*
*
* @param object $restore Standard restore object
* @param object $data Object from backup_getid for this block instance
* @return boolean
@@ -214,10 +214,10 @@ class block_base {
/**
* This function makes all the necessary calls to {@link restore_decode_content_links_worker()}
* function in order to decode contents of this block from the backup
* format to destination site/course in order to mantain inter-activities
* working in the backup/restore process.
*
* function in order to decode contents of this block from the backup
* format to destination site/course in order to mantain inter-activities
* working in the backup/restore process.
*
* This is called from {@link restore_decode_content_links()} function in the restore process.
*
* NOTE: There is no block instance when this method is called.
@@ -277,7 +277,7 @@ class block_base {
/**
* Returns the class $title var value.
*
* Intentionally doesn't check if a title is set.
* Intentionally doesn't check if a title is set.
* This is already done in {@link _self_test()}
*
* @return string $this->title
@@ -290,7 +290,7 @@ class block_base {
/**
* Returns the class $content_type var value.
*
* Intentionally doesn't check if content_type is set.
* Intentionally doesn't check if content_type is set.
* This is already done in {@link _self_test()}
*
* @return string $this->content_type
@@ -303,7 +303,7 @@ class block_base {
/**
* Returns the class $version var value.
*
* Intentionally doesn't check if a version is set.
* Intentionally doesn't check if a version is set.
* This is already done in {@link _self_test()}
*
* @return string $this->version
@@ -433,7 +433,7 @@ class block_base {
*
* @return boolean
*/
function _self_test() {
// Tests if this block has been implemented correctly.
// Also, $errors isn't used right now
@@ -448,7 +448,7 @@ class block_base {
$errors[] = 'invalid_content_type';
$correct = false;
}
//following selftest was not working when roles&capabilities were used from block
//following selftest was not working when roles&capabilities were used from block
/* if ($this->get_content() === NULL) {
$errors[] = 'content_not_set';
$correct = false;
@@ -495,7 +495,7 @@ class block_base {
}
return true;
}
/**
* Which page types this block may appear on.
*
@@ -511,7 +511,7 @@ class block_base {
// Default case: the block can be used in courses and site index, but not in activities
return array('all' => true, 'mod' => false, 'tag' => false);
}
/**
* Default return is false - header will be shown
@@ -542,14 +542,14 @@ class block_base {
*/
function html_attributes() {
return array(
'id' => 'inst' . $this->instance->id,
'id' => 'inst' . $this->instance->id,
'class' => 'block_' . $this->name()
);
}
/**
* Set up a particular instance of this class given data from the block_insances
* table and the current page. (See {@link block_manager::load_blocks()}.)
* table and the current page. (See {@link block_manager::load_blocks()}.)
*
* @param stdClass $instance data from block_insances, block_positions, etc.
* @param moodle_page $the page this block is on.
@@ -731,7 +731,7 @@ class block_base {
/** @callback callback functions for comments api */
public static function comment_template($options) {
$ret = <<<EOD
<div class="comment-userpicture">___picture___</div>
<div class="comment-userpicture">___picture___</div>
<div class="comment-content">
___name___ - <span>___time___</span>
<div>___content___</div>
@@ -787,13 +787,13 @@ class block_list extends block_base {
/**
* Specialized class for displaying a tree menu.
*
*
* The {@link get_content()} method involves setting the content of
* <code>$this->content->items</code> with an array of {@link tree_item}
* objects (these are the top-level nodes). The {@link tree_item::children}
* property may contain more tree_item objects, and so on. The tree_item class
* itself is abstract and not intended for use, use one of it's subclasses.
*
*
* Unlike {@link block_list}, the icons are specified as part of the items,
* not in a separate array.
*
@@ -802,17 +802,17 @@ class block_list extends block_base {
* @internal this extends block_list so we get is_empty() for free
*/
class block_tree extends block_list {
/**
* @var int specifies the manner in which contents should be added to this
* block type. In this case <code>$this->content->items</code> is used with
* {@link tree_item}s.
*/
public $content_type = BLOCK_TYPE_TREE;
/**
* Make the formatted HTML ouput.
*
*
* Also adds the required javascript call to the page output.
*
* @param moodle_core_renderer $output
blocks/news_items/block_news_items.php
+3 -3
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
class block_news_items extends block_base {
function init() {
@@ -57,7 +57,7 @@ class block_news_items extends block_base {
/// Get all the recent discussions we're allowed to see
if (! $discussions = forum_get_discussions($cm, 'p.modified DESC', false,
if (! $discussions = forum_get_discussions($cm, 'p.modified DESC', false,
$currentgroup, $this->page->course->newsitems) ) {
$text .= '('.get_string('nonews', 'forum').')';
$this->content->text = $text;
@@ -116,4 +116,4 @@ class block_news_items extends block_base {
}
}
?>
blocks/news_items/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the news_items block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_news_items_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_news_items_upgrade($oldversion) {
return $result;
}
?>
blocks/online_users/block_online_users.php
+3 -3
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
/**
* This block needs to be reworked.
@@ -142,7 +142,7 @@ class block_online_users extends block_base {
$timeago = format_time(time() - $user->lastaccess); //bruno to calculate correctly on frontpage
$userpic = moodle_user_picture::make($user, $this->page->course->id);
$userpic->size = 16;
if ($user->username == 'guest') {
$this->content->text .= '<div class="user">'.$OUTPUT->user_picture($userpic);
$this->content->text .= get_string('guestuser').'</div>';
@@ -167,4 +167,4 @@ class block_online_users extends block_base {
}
}
?>
blocks/online_users/db/access.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
///////////////////////////////////////////////////////////////////////////
// //
@@ -40,4 +40,4 @@ $block_online_users_capabilities = array(
)
);
?>
blocks/online_users/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the online_users block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_online_users_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_online_users_upgrade($oldversion) {
return $result;
}
?>
blocks/online_users/settings.php
+2 -2
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
$settings->add(new admin_setting_configtext('block_online_users_timetosee', get_string('timetosee', 'block_online_users'),
get_string('configtimetosee', 'block_online_users'), 5, PARAM_INT));
?>
blocks/participants/block_participants.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
class block_participants extends block_list {
function init() {
@@ -49,4 +49,4 @@ class block_participants extends block_list {
}
?>
blocks/participants/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the participants block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_participants_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_participants_upgrade($oldversion) {
return $result;
}
?>
blocks/quiz_results/block_quiz_results.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
define('B_QUIZRESULTS_NAME_FORMAT_FULL', 1);
define('B_QUIZRESULTS_NAME_FORMAT_ID', 2);
@@ -437,4 +437,4 @@ class block_quiz_results extends block_base {
}
}
?>
blocks/quiz_results/edit_form.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
blocks/quiz_results/styles.php
+1 -1
View File
@@ -2,7 +2,7 @@
text-align: center;
}
.block_quiz_results table.grades .number,
.block_quiz_results table.grades .number,
.block_quiz_results table.grades .grade {
text-align: right;
width: 10%;
blocks/recent_activity/block_recent_activity.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
class block_recent_activity extends block_base {
function init() {
@@ -33,4 +33,4 @@ class block_recent_activity extends block_base {
return array('all' => true, 'my' => false, 'tag' => false);
}
}
?>
blocks/recent_activity/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the recent_activity block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_recent_activity_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_recent_activity_upgrade($oldversion) {
return $result;
}
?>
blocks/rss_client/block_rss_client.php
+4 -4
View File
@@ -1,4 +1,4 @@
<?php
<?php
// This file is part of Moodle - http://moodle.org/
//
@@ -285,7 +285,7 @@
}
/**
* cron - goes through all feeds and retrieves them with the cache
* cron - goes through all feeds and retrieves them with the cache
* duration set to 0 in order to force the retrieval of the item and
* refresh the cache
*
@@ -312,7 +312,7 @@
@set_time_limit(60);
$feed = new moodle_simplepie();
// set timeout for longer than normal to be agressive at
// set timeout for longer than normal to be agressive at
// fetching feeds if possible..
$feed->set_timeout(40);
$feed->set_cache_duration(0);
@@ -338,4 +338,4 @@
}
}
?>
blocks/rss_client/db/access.php
+1 -1
View File
@@ -57,4 +57,4 @@ $block_rss_client_capabilities = array(
);
?>
blocks/rss_client/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the rss_client block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_rss_client_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -49,4 +49,4 @@ function xmldb_block_rss_client_upgrade($oldversion) {
return $result;
}
?>
blocks/rss_client/edit_form.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
blocks/rss_client/editfeed.php
+4 -4
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
@@ -117,7 +117,7 @@ class feed_edit_form extends moodleform {
}
/**
* Autodiscovers a feed url from a given url, to be used by the formslibs
* Autodiscovers a feed url from a given url, to be used by the formslibs
* filter function
*
* Uses simplepie with autodiscovery set to maximum level to try and find
blocks/rss_client/settings.php
+1 -1
View File
@@ -1,4 +1,4 @@
<?php
<?php
$settings->add(new admin_setting_configtext('block_rss_client_num_entries', get_string('numentries', 'block_rss_client'),
get_string('clientnumentries', 'block_rss_client'), 5, PARAM_INT));
blocks/rss_client/viewfeed.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
blocks/search/config_global.html
+31 -31
View File
@@ -16,7 +16,7 @@ global $DB;
<b><?php print_string('configsearchtext', 'block_search') ?>:</b>
</td>
<td valign="top" align="left">
<input id="block_search_text" type="text" name="block_search_text" value="<?php
<input id="block_search_text" type="text" name="block_search_text" value="<?php
if(isset($CFG->block_search_text)) {
p($CFG->block_search_text);
} else {
@@ -29,7 +29,7 @@ global $DB;
<b><?php print_string('configbuttonlabel', 'block_search') ?>:</b>
</td>
<td valign="top" align="left">
<input id="block_search_button" type="text" name="block_search_button" value="<?php
<input id="block_search_button" type="text" name="block_search_button" value="<?php
if(isset($CFG->block_search_button)) {
p($CFG->block_search_button);
} else {
@@ -42,11 +42,11 @@ global $DB;
<b><?php print_string('configenablefileindexing', 'block_search') ?>:</b>
</td>
<td valign="top" align="left">
<input id="block_enable_file_indexing" type="radio" name="block_search_enable_file_indexing" value="1" <?php
<input id="block_enable_file_indexing" type="radio" name="block_search_enable_file_indexing" value="1" <?php
if(isset($CFG->block_search_enable_file_indexing) && $CFG->block_search_enable_file_indexing) {
echo " checked=\"checked\" ";
} ?> /> <?php print_string('yes') ?> -
<input id="block_search_enable_file_indexing" type="radio" name="block_search_enable_file_indexing" value="0" <?php
} ?> /> <?php print_string('yes') ?> -
<input id="block_search_enable_file_indexing" type="radio" name="block_search_enable_file_indexing" value="0" <?php
if(!isset($CFG->block_search_enable_file_indexing) || !$CFG->block_search_enable_file_indexing) {
echo " checked=\"checked\" ";
} ?> /> <?php print_string('no') ?>
@@ -58,10 +58,10 @@ global $DB;
<b><?php print_string('configfiletypes', 'block_search') ?>:</b>
</td>
<td valign="top" align="left">
<input id="block_search_filetypes" type="text" name="block_search_filetypes" value="<?php
<input id="block_search_filetypes" type="text" name="block_search_filetypes" value="<?php
if(!isset($CFG->block_search_filetypes)) {
$CFG->block_search_filetypes = $defaultfiletypes;
}
}
p($CFG->block_search_filetypes);
?>" />
<br/><br/>
@@ -72,12 +72,12 @@ global $DB;
<b><?php print_string('usemoodleroot', 'block_search') ?>:</b>
</td>
<td valign="top" align="left">
<?php
$usemoodleroot = (isset($CFG->block_search_usemoodleroot)) ? 'checked="checked"' : '' ;
$notusemoodleroot = (!isset($CFG->block_search_usemoodleroot)) ? 'checked="checked"' : '' ;
<?php
$usemoodleroot = (isset($CFG->block_search_usemoodleroot)) ? 'checked="checked"' : '' ;
$notusemoodleroot = (!isset($CFG->block_search_usemoodleroot)) ? 'checked="checked"' : '' ;
?>
<input id="block_search_usemoodleroot" type="radio" name="block_search_usemoodleroot" <?php echo $usemoodleroot ?> value="1"/> <?php print_string('yes') ?> -
<input id="block_search_usemoodleroot" type="radio" name="block_search_usemoodleroot" <?php echo $notusemoodleroot ?> value="0"/> <?php print_string('no') ?>
<input id="block_search_usemoodleroot" type="radio" name="block_search_usemoodleroot" <?php echo $usemoodleroot ?> value="1"/> <?php print_string('yes') ?> -
<input id="block_search_usemoodleroot" type="radio" name="block_search_usemoodleroot" <?php echo $notusemoodleroot ?> value="0"/> <?php print_string('no') ?>
<br/><br/>
</td>
</tr>
@@ -86,7 +86,7 @@ global $DB;
<b><?php print_string('configlimitindexbody', 'block_search') ?>:</b>
</td>
<td valign="top" align="left">
<input id="block_search_limit_index_body" type="text" size="8" name="block_search_limit_index_body" value="<?php
<input id="block_search_limit_index_body" type="text" size="8" name="block_search_limit_index_body" value="<?php
if(isset($CFG->block_search_limit_index_body)) {
p($CFG->block_search_limit_index_body);
} else {
@@ -97,14 +97,14 @@ global $DB;
</table>
<fieldset name="">
<legend align="top"><?php print_string('pdfhandling', 'block_search') ?></legend>
<legend align="top"><?php print_string('pdfhandling', 'block_search') ?></legend>
<table cellspacing="5" width="90%">
<tr>
<td valign="top" align="right">
<b><?php print_string('configpdftotextcmd', 'block_search') ?>:</b>
</td>
<td valign="top" align="left">
<input id="block_search_pdf_to_text_cmd" type="text" size="60" name="block_search_pdf_to_text_cmd" value="<?php
<input id="block_search_pdf_to_text_cmd" type="text" size="60" name="block_search_pdf_to_text_cmd" value="<?php
if(isset($CFG->block_search_pdf_to_text_cmd)) {
p($CFG->block_search_pdf_to_text_cmd);
} else {
@@ -121,14 +121,14 @@ global $DB;
</fieldset>
<fieldset name="">
<legend align="top"><?php print_string('wordhandling', 'block_search') ?></legend>
<legend align="top"><?php print_string('wordhandling', 'block_search') ?></legend>
<table cellspacing="5" width="90%">
<tr>
<td valign="top" align="right">
<b><?php print_string('configwordtotextcmd', 'block_search') ?>:</b>
</td>
<td valign="top" align="left">
<input id="block_search_word_to_text_cmd" type="text" size="60" name="block_search_word_to_text_cmd" value="<?php
<input id="block_search_word_to_text_cmd" type="text" size="60" name="block_search_word_to_text_cmd" value="<?php
if(isset($CFG->block_search_word_to_text_cmd)) {
p($CFG->block_search_word_to_text_cmd);
} else {
@@ -146,7 +146,7 @@ global $DB;
<b><?php print_string('configwordtotextenv', 'block_search') ?>:</b>
</td>
<td valign="top" align="left">
<input id="block_search_word_to_text_env" type="text" size="60" name="block_search_word_to_text_env" value="<?php
<input id="block_search_word_to_text_env" type="text" size="60" name="block_search_word_to_text_env" value="<?php
if(isset($CFG->block_search_word_to_text_env)) {
echo $CFG->block_search_word_to_text_env;
} else {
@@ -162,7 +162,7 @@ global $DB;
</table>
</fieldset>
<?php
<?php
$types = split(',', $CFG->block_search_filetypes);
if (!empty($types)){
foreach($types as $type) {
@@ -172,18 +172,18 @@ if (!empty($types)){
if (preg_match("/\\b$type\\b/i", $defaultfiletypes)) continue;
?>
<fieldset name="">
<legend align="top"><?php echo get_string('handlingfor', 'block_search').' '.$utype ?></legend>
<legend align="top"><?php echo get_string('handlingfor', 'block_search').' '.$utype ?></legend>
<table cellspacing="5" width="90%">
<tr>
<td valign="top" align="right">
<b><?php print_string('configtypetotxtcmd', 'block_search') ?>:</b>
</td>
<td valign="top" align="left">
<input id="block_search_<?php p($type) ?>_to_text_cmd" type="text" size="60" name="block_search_<?php p($type) ?>_to_text_cmd" value="<?php
<input id="block_search_<?php p($type) ?>_to_text_cmd" type="text" size="60" name="block_search_<?php p($type) ?>_to_text_cmd" value="<?php
$propname = "block_search_{$type}_to_text_cmd";
if(isset($CFG->$propname)) {
p($CFG->$propname);
}
}
?>"/>
<br/><br/>
</td>
@@ -193,7 +193,7 @@ if (!empty($types)){
<b><?php print_string('configtypetotxtenv', 'block_search') ?>:</b>
</td>
<td valign="top" align="left">
<input id="block_search_<?php p($type) ?>_to_text_env" type="text" size="60" name="block_search_<?php p($type) ?>_to_text_env" value="<?php
<input id="block_search_<?php p($type) ?>_to_text_env" type="text" size="60" name="block_search_<?php p($type) ?>_to_text_env" value="<?php
$propname = "block_search_{$type}_to_text_env";
if(isset($CFG->$propname)) {
echo $CFG->$propname;
@@ -208,7 +208,7 @@ if (!empty($types)){
?>
<fieldset name="">
<legend align="top"><?php echo get_string('searchdiscovery', 'block_search') ?></legend>
<legend align="top"><?php echo get_string('searchdiscovery', 'block_search') ?></legend>
<table>
<tr>
<td>
@@ -224,7 +224,7 @@ if (!empty($types)){
</fieldset>
<fieldset name="">
<legend align="top"><?php echo get_string('modulessearchswitches', 'block_search') ?></legend>
<legend align="top"><?php echo get_string('modulessearchswitches', 'block_search') ?></legend>
<table cellspacing="5" width="90%">
<tr valign="top">
<td align="left">
@@ -245,10 +245,10 @@ if ($modules = $DB->get_records_select('modules', "name $searchable_list", $para
}
$found_searchable_modules = 1;
}
}
}
if (!$found_searchable_modules) {
print_string('nosearchablemodules', 'block_search');
}
}
?>
</td>
@@ -257,7 +257,7 @@ if (!$found_searchable_modules) {
</fieldset>
<fieldset name="">
<legend align="top"><?php echo get_string('blockssearchswitches', 'block_search') ?></legend>
<legend align="top"><?php echo get_string('blockssearchswitches', 'block_search') ?></legend>
<table cellspacing="5" width="90%">
<tr valign="top">
<td align="left">
@@ -270,7 +270,7 @@ if ($blocks = $DB->get_records_select('block', "name $searchable_list", $params,
$keyname = "search_in_{$block->name}";
$checked = (!isset($CFG->$keyname) || $CFG->$keyname) ? 'checked="checked"' : '' ;
echo "<input type=\"checkbox\" name=\"search_in_{$block->name}\" value=\"1\" {$checked} />";
// multiple fallback strategy to get the name of the block
$blocklabel = get_string('blockname', 'block_'.$block->name);
if ($blocklabel == '[[blockname]]') $blocklabel = get_string($block->name, 'block_'.$block->name);
@@ -281,10 +281,10 @@ if ($blocks = $DB->get_records_select('block', "name $searchable_list", $params,
}
$found_searchable_blocks = 1;
}
}
}
if (!$found_searchable_blocks) {
print_string('nosearchableblocks', 'block_search');
}
}
?>
</td>
blocks/search/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the search block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_search_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -40,4 +40,4 @@ function xmldb_block_search_upgrade($oldversion) {
return $result;
}
?>
blocks/search_forums/block_search_forums.php
+4 -4
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
class block_search_forums extends block_base {
function init() {
@@ -28,13 +28,13 @@ class block_search_forums extends block_base {
//Accessibility: replaced <input value=" />" type="submit"> with configurable text/'silent' character.
// Theme config, $CFG->block_search_button = get_arrow_right() .'<span class="accesshide">'.get_string('search').'</span>';
$button = (isset($CFG->block_search_button)) ? $CFG->block_search_button : get_string('go');
$this->content->text = '<div class="searchform">';
$this->content->text .= '<form action="'.$CFG->wwwroot.'/mod/forum/search.php" style="display:inline"><fieldset class="invisiblefieldset">';
$this->content->text .= '<input name="id" type="hidden" value="'.$this->page->course->id.'" />'; // course
$this->content->text .= '<label class="accesshide" for="searchform_search">'.$search.'</label>'.
'<input id="searchform_search" name="search" type="text" size="16" />';
$this->content->text .= '<button id="searchform_button" type="submit" title="'.$search.'">'.$button.'</button><br />';
$this->content->text .= '<button id="searchform_button" type="submit" title="'.$search.'">'.$button.'</button><br />';
$this->content->text .= '<a href="'.$CFG->wwwroot.'/mod/forum/search.php?id='.$this->page->course->id.'">'.$advancedsearch.'</a>';
$this->content->text .= $OUTPUT->help_icon(moodle_help_icon::make('search', $advancedsearch));
$this->content->text .= '</fieldset></form></div>';
@@ -47,4 +47,4 @@ class block_search_forums extends block_base {
}
}
?>
blocks/search_forums/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the search_forums block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_search_forums_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_search_forums_upgrade($oldversion) {
return $result;
}
?>
blocks/section_links/block_section_links.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
class block_section_links extends block_base {
@@ -112,4 +112,4 @@ class block_section_links extends block_base {
}
}
?>
blocks/section_links/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the section_links block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_section_links_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_section_links_upgrade($oldversion) {
return $result;
}
?>
blocks/settings_navigation_tree/block_settings_navigation_tree.php
+1 -1
View File
@@ -152,7 +152,7 @@ class block_settings_navigation_tree extends block_tree {
if (!empty($this->config->enablesidebarpopout) && $this->config->enablesidebarpopout == 'yes') {
user_preference_allow_ajax_update('nav_in_tab_panel_settingsnav'.block_settings_navigation_tree::$navcount, PARAM_INT);
$moveicon = new moodle_action_icon();
$moveicon->link->add_classes('moveto customcommand requiresjs');
$moveicon->link->url = $this->page->url;
blocks/site_main_menu/block_site_main_menu.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
class block_site_main_menu extends block_list {
function init() {
@@ -156,4 +156,4 @@ class block_site_main_menu extends block_list {
}
}
?>
blocks/social_activities/block_social_activities.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
class block_social_activities extends block_list {
function init(){
@@ -165,4 +165,4 @@ class block_social_activities extends block_list {
}
}
?>
blocks/social_activities/db/upgrade.php
+5 -5
View File
@@ -1,6 +1,6 @@
<?php //$Id$
<?php
// This file keeps track of upgrades to
// This file keeps track of upgrades to
// the social_activities block
//
// Sometimes, changes between versions involve
@@ -26,8 +26,8 @@ function xmldb_block_social_activities_upgrade($oldversion) {
$dbman = $DB->get_manager();
$result = true;
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
/// this comment lines once this file start handling proper
/// upgrade code.
@@ -38,4 +38,4 @@ function xmldb_block_social_activities_upgrade($oldversion) {
return $result;
}
?>
blocks/tag_flickr/block_tag_flickr.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php // $id$
<?php
require_once($CFG->dirroot.'/tag/lib.php');
require_once($CFG->libdir . '/filelib.php');
@@ -161,4 +161,4 @@ class block_tag_flickr extends block_base {
}
}
?>
blocks/tag_flickr/edit_form.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
blocks/tag_youtube/block_tag_youtube.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php
<?php
require_once($CFG->dirroot.'/tag/lib.php');
require_once($CFG->libdir . '/filelib.php');
@@ -166,4 +166,4 @@ class block_tag_youtube extends block_base {
return $text;
}
}
?>
blocks/tag_youtube/edit_form.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
blocks/tags/block_tags.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php
class block_tags extends block_base {
function init() {
@@ -322,4 +322,4 @@ EOT;
return $this->content;
}
}
?>
blocks/tags/edit_form.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// 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
@@ -11,7 +11,7 @@
// 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/>.
blocks/tags/settings.php
+1 -1
View File
@@ -3,4 +3,4 @@
$settings->add(new admin_setting_configcheckbox('block_tags_showcoursetags', get_string('showcoursetags', 'block_tags'),
get_string('showcoursetagsdef', 'block_tags'), 0));
?>
blocks/upgrade.txt
+1 -1
View File
@@ -13,7 +13,7 @@ required changes in code:
* rewrite backup/restore
optional - no changes needed in older code:
*
*
TODO: add links to docs
blog/rsslib.php
-1
View File
@@ -162,4 +162,3 @@ function blog_rss_save_file($type, $id, $tagid=0, $contents='') {
return $status;
}
?>
blog/version.php
+2 -2
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
/////////////////////////////////////////////////////////////////////////////////
/// Code fragment to define the version of the blog module
@@ -7,4 +7,4 @@
$blog_version = 2009070600; // The current version of blog module (Date: YYYYMMDDXX)
$module->cron = 1800; // Period for cron to check this module (secs)
?>
group/assign.php
-3
View File
@@ -176,6 +176,3 @@ echo $OUTPUT->header();
<?php
echo $OUTPUT->footer();
?>
group/autogroup.php
+1 -2
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
/**
* Create and allocate users go groups
*
@@ -250,4 +250,3 @@ if($preview !== '') {
}
echo $OUTPUT->footer();
?>
group/autogroup_form.php
+1 -3
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
require_once($CFG->dirroot.'/lib/formslib.php');
@@ -133,5 +133,3 @@ class autogroup_form extends moodleform {
return $errors;
}
}
?>
group/delete.php
-1
View File
@@ -75,4 +75,3 @@ if ($confirm && data_submitted()) {
echo $OUTPUT->confirm($message, $formcontinue, $formcancel);
echo $OUTPUT->footer();
}
?>
group/externallib.php
+1 -1
View File
@@ -450,4 +450,4 @@ class moodle_group_external extends external_api {
return null;
}
}
}
group/group.php
-1
View File
@@ -126,4 +126,3 @@ if ($id) {
echo '</div>';
$editform->display();
echo $OUTPUT->footer();
?>
group/group_form.php
+1 -3
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
require_once($CFG->dirroot.'/lib/formslib.php');
@@ -75,5 +75,3 @@ class group_form extends moodleform {
return $this->_upload_manager;
}
}
?>
group/grouping.php
-2
View File
@@ -118,5 +118,3 @@ echo $OUTPUT->header();
echo $OUTPUT->heading($strheading);
$editform->display();
echo $OUTPUT->footer();
?>
group/grouping_form.php
+1 -2
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
require_once($CFG->dirroot.'/lib/formslib.php');
@@ -50,4 +50,3 @@ class grouping_form extends moodleform {
}
}
?>
group/groupings.php
-2
View File
@@ -105,5 +105,3 @@ echo $OUTPUT->button(html_form::make_button('grouping.php', array('courseid'=>$c
echo $OUTPUT->container_end();
echo $OUTPUT->footer();
?>
group/index.php
-2
View File
@@ -303,5 +303,3 @@ function groups_param_action($prefix = 'act_') {
///if (debugging()) echo 'Debug: '.$action;
return $action;
}
?>
group/lib.php
-2
View File
@@ -718,5 +718,3 @@ function groups_calculate_role_people($rs, $context) {
// Return list of roles containing their users
return $roles;
}
?>
group/members.php
+1 -2
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
/**
* Add/remove members from group.
*
@@ -129,4 +129,3 @@ check_theme_arrows();
<?php
echo $OUTPUT->footer();
?>
group/overview.php
+1 -2
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
/**
* Print an overview of groupings & group membership
*
@@ -208,4 +208,3 @@ foreach ($members as $gpgid=>$groupdata) {
}
echo $OUTPUT->footer();
?>
group/simpletest/ broken_testexternal.php
-1
View File
@@ -285,4 +285,3 @@ class group_external_test extends UnitTestCase {
}
*/
}
?>
group/tabs.php
+1 -2
View File
@@ -1,4 +1,4 @@
<?php // $Id$
<?php
$row = $tabs = array();
$row[] = new tabobject('groups',
$CFG->wwwroot.'/group/index.php?id='.$courseid,
@@ -17,4 +17,3 @@
echo '<div class="groupdisplay">';
print_tabs($tabs, $currenttab);
echo '</div>';
?>