Fix MDL-11632: Multiple files with emtpy lines outside PHP open/close…

… tags There are multiple issues with Moodle files containing empty or blank lines (lines consisting of white spaces or tabs only) and/or white space before or after the PHP open and close tags, notably with config.php and theme files.
alseambusher · Oct 9, 2007 · 0baafc1 · 0baafc1
1 parent 1f68258
commit 0baafc1
Show file tree

Hide file tree

Showing 35 changed files with 10 additions and 40 deletions.
diff --git a/auth/cas/languages.php b/auth/cas/languages.php
@@ -15,4 +15,3 @@
 "french" => "French");
 
 ?>
-
diff --git a/course/import/groups/index.php b/course/import/groups/index.php
@@ -217,4 +217,3 @@ function my_file_get_contents($filename, $use_include_path = 0) {
 }
 
 ?>
-
diff --git a/course/search.php b/course/search.php
@@ -340,4 +340,3 @@
 
 
 ?>
-
diff --git a/course/user.php b/course/user.php
@@ -306,4 +306,3 @@ function print_outline_row($mod, $instance, $result) {
 }
 
 ?>
-
diff --git a/grade/edit/letter/edit.php b/grade/edit/letter/edit.php
@@ -122,4 +122,3 @@
 
 print_footer($COURSE);
 ?>
-
diff --git a/grade/edit/letter/index.php b/grade/edit/letter/index.php
@@ -57,4 +57,3 @@
 print_footer($course);
 
 ?>
-
diff --git a/grade/edit/settings/index.php b/grade/edit/settings/index.php
@@ -67,4 +67,3 @@
 print_footer($course);
 
 ?>
-
diff --git a/lib/adodb/lang/adodb-ar.inc.php b/lib/adodb/lang/adodb-ar.inc.php
@@ -31,4 +31,3 @@
 	    DB_ERROR_ACCESS_VIOLATION	=> 'سماحيات غير كافية'
 );
 ?>
-
diff --git a/lib/adodb/lang/adodb-bg.inc.php b/lib/adodb/lang/adodb-bg.inc.php
@@ -34,5 +34,4 @@
             DB_ERROR_NOSUCHDB           => 'несъществуваща база данни',
             DB_ERROR_ACCESS_VIOLATION   => 'нямате достатъчно права'
 );
-?>
-
+?>
diff --git a/lib/adodb/lang/adodb-bgutf8.inc.php b/lib/adodb/lang/adodb-bgutf8.inc.php
@@ -35,4 +35,3 @@
             DB_ERROR_ACCESS_VIOLATION   => 'нямате достатъчно права'
 );
 ?>
-
diff --git a/lib/adodb/lang/adodb-en.inc.php b/lib/adodb/lang/adodb-en.inc.php
@@ -30,5 +30,4 @@
             DB_ERROR_NOSUCHDB           => 'no such database',
             DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions'
 );
-?>
-
+?>
diff --git a/lib/adodb/lang/adodb-pl.inc.php b/lib/adodb/lang/adodb-pl.inc.php
@@ -32,5 +32,4 @@
             DB_ERROR_NOSUCHDB           => 'nie znaleziono bazy',
             DB_ERROR_ACCESS_VIOLATION   => 'niedostateczne uprawnienia'
 );
-?>
-
+?>
diff --git a/lib/adodb/lang/adodb-ro.inc.php b/lib/adodb/lang/adodb-ro.inc.php
@@ -33,4 +33,3 @@
             DB_ERROR_ACCESS_VIOLATION   => 'permisiuni insuficiente'
 );
 ?>
-
diff --git a/lib/adodb/lang/adodb_th.inc.php b/lib/adodb/lang/adodb_th.inc.php
@@ -31,4 +31,3 @@
             DB_ERROR_ACCESS_VIOLATION   => 'permissions à¹„à¸¡à¹ˆà¸žà¸'
 );
 ?>
-
diff --git a/lib/adodb/readme_moodle.txt b/lib/adodb/readme_moodle.txt
@@ -21,7 +21,12 @@ Our changes:
        working properly. Simplified logic (now that we are FETCH_ASSOC). Work in progress
        for the annoying http://tracker.moodle.org/browse/MDL-6877.
        Once fixed by adodb guys, we'll return to their official distro.
+ * lang/adodb-ar.inc.php lang/adodb-bg.inc.php lang/adodb-bgutf8.inc.php 
+   lang/adodb-en.inc.php lang/adodb-pl.inc.php lang/adodb-ro.inc.php
+   lang/adodb_th.inc.php - Removed leading white space outside PHP open/close tags
+   (see http://tracker.moodle.org/browse/MDL-11632).
 
-skodak
+
+skodak,iarenaza
 
 $Id$
diff --git a/mod/choice/index.php b/mod/choice/index.php
@@ -93,4 +93,3 @@
     print_footer($course);
 
 ?>
-
diff --git a/mod/exercise/assessments.php b/mod/exercise/assessments.php
@@ -1178,4 +1178,3 @@
     print_footer($course);
 
 ?>
-
diff --git a/mod/glossary/tabs.php b/mod/glossary/tabs.php
@@ -107,4 +107,4 @@
         break;
     } 
     echo '<hr />';
-?> 
+?>
diff --git a/mod/journal/index.php b/mod/journal/index.php
@@ -60,4 +60,3 @@
     print_footer($course);
 
 ?>
-
diff --git a/mod/journal/report.php b/mod/journal/report.php
@@ -145,4 +145,3 @@
     print_footer($course);
 
 ?>
-
diff --git a/mod/label/view.php b/mod/label/view.php
@@ -35,4 +35,3 @@
     redirect("$CFG->wwwroot/course/view.php?id=$course->id");
 
 ?>
-
diff --git a/mod/lesson/action/confirmdelete.php b/mod/lesson/action/confirmdelete.php
@@ -28,4 +28,3 @@
          "lesson.php?action=delete&amp;id=$cm->id&amp;pageid=$pageid&amp;sesskey=".$USER->sesskey, 
          "view.php?id=$cm->id");
 ?>
-
diff --git a/mod/resource/index.php b/mod/resource/index.php
@@ -87,4 +87,3 @@
     print_footer($course);
 
 ?>
-
diff --git a/mod/resource/type/repository/hive/openlitepublish.php b/mod/resource/type/repository/hive/openlitepublish.php
@@ -43,4 +43,3 @@
 
 redirect($CFG->hiveprotocol .'://'. $CFG->hivehost .':'. $CFG->hiveport .''. $CFG->hivepath .'?'.$query);
 ?>
-
diff --git a/mod/scorm/datamodel.php b/mod/scorm/datamodel.php
@@ -79,4 +79,3 @@
         }
     }
 ?>
-
diff --git a/mod/survey/download.php b/mod/survey/download.php
@@ -309,4 +309,3 @@
 
 
 ?>
-
diff --git a/mod/workshop/assess.php b/mod/workshop/assess.php
@@ -155,4 +155,3 @@
     print_footer('none');
 
 ?>
-
diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php
@@ -1364,4 +1364,3 @@
     print_footer($course);
 
 ?>
-
diff --git a/mod/workshop/upload.php b/mod/workshop/upload.php
@@ -121,4 +121,3 @@
     print_footer($course);
 
 ?>
-
diff --git a/mod/workshop/viewassessment.php b/mod/workshop/viewassessment.php
@@ -92,4 +92,3 @@
     print_footer('none');
 
 ?>
-
diff --git a/question/export.php b/question/export.php
@@ -141,4 +141,3 @@
 
     print_footer($COURSE);
 ?>
-
diff --git a/sso/hive/login.php b/sso/hive/login.php
@@ -20,4 +20,3 @@
     }
 
 ?>
-
diff --git a/theme/chameleon/ui/chameleon.php b/theme/chameleon/ui/chameleon.php
@@ -28,5 +28,3 @@
     }
 }
 ?>
-
-
diff --git a/theme/custom_corners/footer.html b/theme/custom_corners/footer.html
@@ -1,4 +1,3 @@
-
 <?php print_custom_corners_end(false, 'content'); ?>
 </div> <!-- end div containerContent -->
 <!-- START OF FOOTER -->

diff --git a/theme/custom_corners/ui/chameleon.php b/theme/custom_corners/ui/chameleon.php
@@ -28,5 +28,3 @@
     }
 }
 ?>
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -217,4 +217,3 @@ function my_file_get_contents($filename, $use_include_path = 0) {
		}

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -306,4 +306,3 @@ function print_outline_row($mod, $instance, $result) {
		}

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,3 @@
		DB_ERROR_ACCESS_VIOLATION => 'سماحيات غير كافية'
		);
		?>
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,5 +34,4 @@ @@
                 DB_ERROR_NOSUCHDB           => 'несъществуваща база данни',
                 DB_ERROR_ACCESS_VIOLATION   => 'нямате достатъчно права'
     );
-    ?>
+    ?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,4 +35,3 @@
		DB_ERROR_ACCESS_VIOLATION => 'нямате достатъчно права'
		);
		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,3 @@
		DB_ERROR_ACCESS_VIOLATION => 'permisiuni insuficiente'
		);
		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,3 @@
		DB_ERROR_ACCESS_VIOLATION => 'permissions à¹„à¸¡à¹ˆà¸žà¸'
		);
		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,4 +35,3 @@
		redirect("$CFG->wwwroot/course/view.php?id=$course->id");

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,3 @@
		"lesson.php?action=delete&id=$cm->id&pageid=$pageid&sesskey=".$USER->sesskey,
		"view.php?id=$cm->id");
		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,4 +43,3 @@

		redirect($CFG->hiveprotocol .'://'. $CFG->hivehost .':'. $CFG->hiveport .''. $CFG->hivepath .'?'.$query);
		?>