diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php index 70a900c3a0f..55a59d18ced 100644 --- a/blocks/activity_modules/block_activity_modules.php +++ b/blocks/activity_modules/block_activity_modules.php @@ -27,7 +27,7 @@ class CourseBlock_activity_modules extends MoodleBlock { foreach ($modnamesused as $modname => $modfullname) { if ($modname != 'label') { $this->content->items[] = ''.$modnamesplural[$modname].''; - $this->content->icons[] = ''; + $this->content->icons[] = ''; } } } diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php index 13a7b543b87..1da94e92838 100644 --- a/blocks/admin/block_admin.php +++ b/blocks/admin/block_admin.php @@ -76,77 +76,77 @@ class CourseBlock_admin extends MoodleBlock { $isteacheredit = isteacheredit($this->course->id); if ($isteacheredit) { - $this->content->icons[]=''; + $this->content->icons[]=''; if (isediting($this->course->id)) { $this->content->items[]=''.get_string('turneditingoff').''; } else { $this->content->items[]=''.get_string('turneditingon').''; } $this->content->items[]=''.get_string('settings').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; if (iscreator() or !empty($CFG->teacherassignteachers)) { if (!$this->course->teachers) { $this->course->teachers = get_string('defaultcourseteachers'); } $this->content->items[]=''.$this->course->teachers.'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; } if (!$this->course->students) { $this->course->students = get_string('defaultcoursestudents'); } $this->content->items[]=''.$this->course->students.'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; $this->content->items[]=''.get_string('backup').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; $this->content->items[]=''.get_string('restore').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; $this->content->items[]=''.get_string('scales').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; } $this->content->items[]=''.get_string('grades').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; $this->content->items[]=''.get_string('logs').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; if ($isteacheredit) { $this->content->items[]=''.get_string('files').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; } $this->content->items[]=''.get_string('help').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; if ($teacherforum = forum_get_course_forum($this->course->id, 'teacher')) { $this->content->items[]=''.get_string('nameteacher', 'forum').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } } else if (!isguest()) { // Students menu if ($this->course->showgrades) { $this->content->items[]=''.get_string('grades').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; } if ($this->course->showreports) { $this->content->items[]=''.get_string('activityreport').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; } if (is_internal_auth()) { $this->content->items[]=''.get_string('changepassword').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; } else if ($CFG->changepassword) { $this->content->items[]=''.get_string('changepassword').'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; } if ($CFG->allowunenroll) { $this->content->items[]=''.get_string('unenrolme', '', $this->course->shortname).'...'; - $this->content->icons[]=''; + $this->content->icons[]=''; } } } diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php index f25b7f8a564..6f3e8a907d2 100644 --- a/blocks/course_list/block_course_list.php +++ b/blocks/course_list/block_course_list.php @@ -41,10 +41,10 @@ class CourseBlock_course_list extends MoodleBlock { if (empty($THEME->custompix)) { $icon = "wwwroot/pix/i/course.gif\"". - " height=\"16\" width=\"16\" alt=\"".get_string("course")."\">"; + " height=\"16\" width=\"16\" alt=\"".get_string("course")."\" />"; } else { $icon = "wwwroot/theme/$CFG->theme/pix/i/course.gif\"". - " height=\"16\" width=\"16\" alt=\"".get_string("course")."\">"; + " height=\"16\" width=\"16\" alt=\"".get_string("course")."\" />"; } $adminseesall = true; diff --git a/blocks/online_users/block_online_users.php b/blocks/online_users/block_online_users.php index 8d3f1003b38..762451c768d 100644 --- a/blocks/online_users/block_online_users.php +++ b/blocks/online_users/block_online_users.php @@ -122,12 +122,12 @@ class CourseBlock_online_users extends MoodleBlock { $this->content->text .= '
'; $timeago = format_time(time() - max($user->timeaccess, $user->lastaccess)); //bruno to calculate correctly on frontpage if ($user->picture==0) { - $this->content->text .= ' '; + $this->content->text .= ' '; } else { if ($CFG->slasharguments) { - $imgtag = ' '; + $imgtag = ' '; } else { - $imgtag = ' '; + $imgtag = ' '; } $this->content->text .= $imgtag; } @@ -137,7 +137,7 @@ class CourseBlock_online_users extends MoodleBlock { $table->align = array("right","left"); $table->cellpadding = 1; $table->cellspacing = 1; - $table->data[] = array("pixpath/i/user.gif\" height=\"16\" width=\"16\" alt=\"\">",$user->fullname); + $table->data[] = array("pixpath/i/user.gif\" height=\"16\" width=\"16\" alt=\"\" />",$user->fullname); } // Slightly hacky way to do it but... ob_start(); diff --git a/blocks/participants/block_participants.php b/blocks/participants/block_participants.php index a67a57103ed..0a85027eeac 100644 --- a/blocks/participants/block_participants.php +++ b/blocks/participants/block_participants.php @@ -29,18 +29,18 @@ class CourseBlock_participants extends MoodleBlock { if ($this->course->category or $CFG->showsiteparticipantslist > 1 or ($CFG->showsiteparticipantslist == 1 and isteacher()) or isteacher(SITEID)) { $this->content->items[]=''.get_string('participants').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } if ($this->course->groupmode or !$this->course->groupmodeforce) { if ($this->course->groupmode == VISIBLEGROUPS or isteacheredit($this->course->id)) { $this->content->items[]=''.$strgroups.''; - $this->content->icons[]=''; + $this->content->icons[]=''; } else if ($this->course->groupmode == SEPARATEGROUPS and $this->course->groupmodeforce) { // Show nothing } else if ($currentgroup = get_current_group($this->course->id)) { $this->content->items[]=''.$strgroupmy.''; - $this->content->icons[]=''; + $this->content->icons[]=''; } } @@ -52,7 +52,7 @@ class CourseBlock_participants extends MoodleBlock { } else { $this->content->items[]= $editmyprofile." *"; } - $this->content->icons[]=''; + $this->content->icons[]=''; } return $this->content; diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php index f501f6bc6e5..ac9a88d19fd 100644 --- a/blocks/site_main_menu/block_site_main_menu.php +++ b/blocks/site_main_menu/block_site_main_menu.php @@ -53,7 +53,7 @@ class CourseBlock_site_main_menu extends MoodleBlock { $editbuttons = ''; if ($ismoving) { - $this->content->icons[] = ' '; + $this->content->icons[] = ' '; $this->content->items[] = $USER->activitycopyname.' ('.$strcancel.')'; } @@ -83,7 +83,7 @@ class CourseBlock_site_main_menu extends MoodleBlock { continue; } $this->content->items[] = ''. - ''.$strmovehere.''; + ''.$strmovehere.''; $this->content->icons[] = ''; } $instancename = urldecode($modinfo[$modnumber]->name); @@ -108,7 +108,7 @@ class CourseBlock_site_main_menu extends MoodleBlock { } else { $this->content->items[] = ''.$instancename.''.$editbuttons; - $this->content->icons[] = ''.$mod->modfullname.''; + $this->content->icons[] = ''.$mod->modfullname.''; } } } @@ -116,7 +116,7 @@ class CourseBlock_site_main_menu extends MoodleBlock { if ($ismoving) { $this->content->items[] = ''. - ''.$strmovehere.''; + ''.$strmovehere.''; $this->content->icons[] = ''; } diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php index e769e1b836d..ea288952f0f 100644 --- a/blocks/social_activities/block_social_activities.php +++ b/blocks/social_activities/block_social_activities.php @@ -49,7 +49,7 @@ class CourseBlock_social_activities extends MoodleBlock { $editbuttons = ''; if ($ismoving) { - $this->content->icons[] = ' '; + $this->content->icons[] = ' '; $this->content->items[] = $USER->activitycopyname.' ('.$strcancel.')'; } @@ -79,7 +79,7 @@ class CourseBlock_social_activities extends MoodleBlock { continue; } $this->content->items[] = ''. - ''.$strmovehere.''; + ''.$strmovehere.''; $this->content->icons[] = ''; } $instancename = urldecode($modinfo[$modnumber]->name); @@ -104,7 +104,7 @@ class CourseBlock_social_activities extends MoodleBlock { } else { $this->content->items[] = ''.$instancename.''.$editbuttons; - $this->content->icons[] = ''.$mod->modfullname.''; + $this->content->icons[] = ''.$mod->modfullname.''; } } } @@ -112,7 +112,7 @@ class CourseBlock_social_activities extends MoodleBlock { if ($ismoving) { $this->content->items[] = ''. - ''.$strmovehere.''; + ''.$strmovehere.''; $this->content->icons[] = ''; } diff --git a/index.php b/index.php index 696181c5c00..5efc3daa4b7 100644 --- a/index.php +++ b/index.php @@ -38,9 +38,9 @@ } else { $wwwroot = str_replace('http','https',$CFG->wwwroot); } - $loginstring = "".get_string("login").""; + $loginstring = "".get_string("login").""; } else { - $loginstring = "".user_login_string($site).""; + $loginstring = "".user_login_string($site).""; } if (empty($CFG->langmenu)) { @@ -171,7 +171,7 @@ /// If currently moving a file then show the current clipboard if (ismoving($site->id)) { $stractivityclipboard = strip_tags(get_string("activityclipboard", "", addslashes($USER->activitycopyname))); - echo "

"; + echo "

"; echo "$stractivityclipboard  (".get_string("cancel").")"; echo "

"; } @@ -192,7 +192,7 @@ $streditsummary = get_string('editsummary'); echo "id\">pixpath/t/edit.gif\" ". - " height=11 width=11 border=0 alt=\"$streditsummary\">
"; + " height=\"11\" width=\"11\" border=\"0\" alt=\"$streditsummary\" />
"; } echo '
'; @@ -220,9 +220,9 @@ } else { $subtext = get_string("subscribe", "forum"); } - $headertext = " + $headertext = "
-
$newsforum->name + id\">$subtext
"; } else {