Skip to content

Commit

Permalink
MDL-20700 coding style cleanup - cvs keywords removed, closign php ta…
Browse files Browse the repository at this point in the history
…g removed, trailing whitespace cleanup
  • Loading branch information
skodak committed Nov 1, 2009
1 parent 5117d59 commit 4ca6cfb
Show file tree
Hide file tree
Showing 90 changed files with 313 additions and 338 deletions.
4 changes: 2 additions & 2 deletions blocks/activity_modules/block_activity_modules.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php //$Id$
<?php

class block_activity_modules extends block_list {
function init() {
Expand Down Expand Up @@ -67,4 +67,4 @@ function applicable_formats() {
}
}

?>

10 changes: 5 additions & 5 deletions blocks/activity_modules/db/upgrade.php
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.

Expand All @@ -38,4 +38,4 @@ function xmldb_block_activity_modules_upgrade($oldversion) {
return $result;
}

?>

4 changes: 2 additions & 2 deletions blocks/admin/block_admin.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php //$Id$
<?php

class block_admin extends block_list {
function init() {
Expand Down Expand Up @@ -217,4 +217,4 @@ function applicable_formats() {
}
}

?>

10 changes: 5 additions & 5 deletions blocks/admin/db/upgrade.php
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.

Expand All @@ -38,4 +38,4 @@ function xmldb_block_admin_upgrade($oldversion) {
return $result;
}

?>

4 changes: 2 additions & 2 deletions blocks/admin_bookmarks/block_admin_bookmarks.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php // $Id$
<?php

// seems to work...
// maybe I should add some pretty icons?
Expand Down Expand Up @@ -77,4 +77,4 @@ function get_content() {
}
}

?>

3 changes: 1 addition & 2 deletions blocks/admin_bookmarks/create.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php // $Id$
<?php

require('../../config.php');

Expand Down Expand Up @@ -45,4 +45,3 @@
}


?>
4 changes: 2 additions & 2 deletions blocks/admin_bookmarks/delete.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php // $Id$
<?php

require('../../config.php');

Expand Down Expand Up @@ -46,4 +46,4 @@
die;
}

?>

2 changes: 1 addition & 1 deletion blocks/admin_tree/admintree.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions blocks/admin_tree/block_admin_tree.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php // $Id$
<?php

class block_admin_tree extends block_base {

Expand Down Expand Up @@ -71,7 +71,7 @@ function build_tree (&$content) {
if (admin_critical_warnings_present()) {
$class .= ' criticalnotification';
}
}
}
if ($content->is_hidden()) {
$class .= ' hidden';
}
Expand Down
10 changes: 5 additions & 5 deletions blocks/blog_tags/block_blog_tags.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php

define('BLOGDEFAULTTIMEWITHIN', 90);
define('BLOGDEFAULTNUMBEROFTAGS', 20);
Expand Down Expand Up @@ -67,9 +67,9 @@ function get_content() {
$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
Expand Down Expand Up @@ -149,7 +149,7 @@ function get_content() {
} else if (!empty($blogheaders['filters']['course'])) {
$blogurl->param('courseid', $blogheaders['filters']['course']);
}

break;
}

Expand Down Expand Up @@ -184,4 +184,4 @@ function blog_tags_sort($a, $b) {
}
}

?>

6 changes: 3 additions & 3 deletions blocks/blog_tags/edit_form.php
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/>.

Expand Down
14 changes: 7 additions & 7 deletions blocks/calendar_month/block_calendar_month.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php

class block_calendar_month extends block_base {
function init() {
Expand All @@ -16,18 +16,18 @@ function get_content() {
$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;
Expand Down Expand Up @@ -73,9 +73,9 @@ function get_content() {
$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]);
Expand All @@ -85,4 +85,4 @@ function get_content() {
}
}

?>

10 changes: 5 additions & 5 deletions blocks/calendar_month/db/upgrade.php
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.

Expand All @@ -38,4 +38,4 @@ function xmldb_block_calendar_month_upgrade($oldversion) {
return $result;
}

?>

14 changes: 7 additions & 7 deletions blocks/calendar_upcoming/block_calendar_upcoming.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?PHP //$Id$
<?php

class block_calendar_upcoming extends block_base {
function init() {
Expand Down Expand Up @@ -37,7 +37,7 @@ function get_content() {
$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.
Expand All @@ -59,12 +59,12 @@ function get_content() {
// 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;');
}

Expand All @@ -77,4 +77,4 @@ function get_content() {
}
}

?>

10 changes: 5 additions & 5 deletions blocks/calendar_upcoming/db/upgrade.php
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.

Expand All @@ -38,4 +38,4 @@ function xmldb_block_calendar_upcoming_upgrade($oldversion) {
return $result;
}

?>

Loading

0 comments on commit 4ca6cfb

Please sign in to comment.