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.

diff --git a/auth/cas/languages.php b/auth/cas/languages.php
index b0d40fa96caae0c8861e3f9553631add2c638f61..9edb8e768ed3f7024d8b1d7e08ff00a6b7944315 100644 (file)
--- a/auth/cas/languages.php
+++ b/auth/cas/languages.php
@@ -15,4 +15,3 @@ $CASLANGUAGES = array (
 "french" => "French");
 
 ?>
-

diff --git a/course/import/groups/index.php b/course/import/groups/index.php
index 7dc75208cf5e67b9aac1731b7dc00a4a26d203a7..231184f527926ec4d839a47109312d01344b0bff 100755 (executable)
--- 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
index 7b27391cd30a4ccbc5c7e3640994a3275f50179a..c7ff0d658f3947c949bccf92c40976900ddd9a70 100644 (file)
--- a/course/search.php
+++ b/course/search.php
@@ -340,4 +340,3 @@
 
 
 ?>
-

diff --git a/course/user.php b/course/user.php
index a28f487dbf34b1d74658ec4fb190bb98fbf4a8fd..59cb41258c59396f20864c2a57d5ee86e40de10c 100644 (file)
--- 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
index 2e8a6dcbebffe1afc8de3e03f25fc5e4b9ca28a1..6ba386285bbef099542b3cb91ef331d228bd6b7d 100644 (file)
--- a/grade/edit/letter/edit.php
+++ b/grade/edit/letter/edit.php
@@ -122,4 +122,3 @@ $mform->display();
 
 print_footer($COURSE);
 ?>
-

diff --git a/grade/edit/letter/index.php b/grade/edit/letter/index.php
index 6aceee9c31820093db3cf6ef4e7ce25f9623370e..93f9a9564c88acc5a36b66f97ffc3353ccd672d4 100644 (file)
--- a/grade/edit/letter/index.php
+++ b/grade/edit/letter/index.php
@@ -57,4 +57,3 @@ print_table($table);
 print_footer($course);
 
 ?>
-

diff --git a/grade/edit/settings/index.php b/grade/edit/settings/index.php
index a64f093125bc29a9189a24d3576266048a75f6e5..b9d6ccd56d0dfc509bf032987372ed00d2a6bb43 100644 (file)
--- a/grade/edit/settings/index.php
+++ b/grade/edit/settings/index.php
@@ -67,4 +67,3 @@ $mform->display();
 print_footer($course);
 
 ?>
-

diff --git a/lib/adodb/lang/adodb-ar.inc.php b/lib/adodb/lang/adodb-ar.inc.php
index dd0f830f17796d505d176322bdf6c7e634bbcc87..d4ef68fc44fa979b522859b00fad4a08aa20c9ce 100644 (file)
--- a/lib/adodb/lang/adodb-ar.inc.php
+++ b/lib/adodb/lang/adodb-ar.inc.php
@@ -31,4 +31,3 @@ $ADODB_LANG_ARRAY = array (
            DB_ERROR_ACCESS_VIOLATION   => 'ÓãÇÍíÇÊ ÛíÑ ßÇÝíÉ'
 );
 ?>
-               

diff --git a/lib/adodb/lang/adodb-bg.inc.php b/lib/adodb/lang/adodb-bg.inc.php
index 4fb1dc070ac6864f29a77bab62f6a0f8989899da..ee307c13fed9ca14443cb56f762d92cd1c0ab70c 100644 (file)
--- a/lib/adodb/lang/adodb-bg.inc.php
+++ b/lib/adodb/lang/adodb-bg.inc.php
@@ -34,5 +34,4 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_NOSUCHDB           => 'íåñúùåñòâóâàùà áàçà äàííè',
             DB_ERROR_ACCESS_VIOLATION   => 'íÿìàòå äîñòàòú÷íî ïðàâà'
 );
-?>
-               
\ No newline at end of file
+?>
\ No newline at end of file

diff --git a/lib/adodb/lang/adodb-bgutf8.inc.php b/lib/adodb/lang/adodb-bgutf8.inc.php
index 1035c5989d54ef07a91af52d12cdab50debc68df..d5c7155c609bc820919f436e4fc78e2a90267afe 100644 (file)
--- a/lib/adodb/lang/adodb-bgutf8.inc.php
+++ b/lib/adodb/lang/adodb-bgutf8.inc.php
@@ -35,4 +35,3 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_ACCESS_VIOLATION   => 'нямате достатъчно права'
 );
 ?>
-               

diff --git a/lib/adodb/lang/adodb-en.inc.php b/lib/adodb/lang/adodb-en.inc.php
index ed1b8f19a869c998b9e43f0c0690865e26505935..6895995effd494b70d7025dc91f3c856c19c25b8 100644 (file)
--- a/lib/adodb/lang/adodb-en.inc.php
+++ b/lib/adodb/lang/adodb-en.inc.php
@@ -30,5 +30,4 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_NOSUCHDB           => 'no such database',
             DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions'
 );
-?>
-               
\ No newline at end of file
+?>
\ No newline at end of file

diff --git a/lib/adodb/lang/adodb-pl.inc.php b/lib/adodb/lang/adodb-pl.inc.php
index aee5bfdfdc00c26c6cb95bd532132620618c3361..9d9e390676234410849276fbff74b190f9733684 100644 (file)
--- a/lib/adodb/lang/adodb-pl.inc.php
+++ b/lib/adodb/lang/adodb-pl.inc.php
@@ -32,5 +32,4 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_NOSUCHDB           => 'nie znaleziono bazy',
             DB_ERROR_ACCESS_VIOLATION   => 'niedostateczne uprawnienia'
 );
-?>
-               
\ No newline at end of file
+?>
\ No newline at end of file

diff --git a/lib/adodb/lang/adodb-ro.inc.php b/lib/adodb/lang/adodb-ro.inc.php
index 7c9aa522b7e89d4e2042ef4da93b43ee17a85e8f..8263d822b4270d4a5dc9d7dd43d5a987a627dec6 100644 (file)
--- a/lib/adodb/lang/adodb-ro.inc.php
+++ b/lib/adodb/lang/adodb-ro.inc.php
@@ -33,4 +33,3 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_ACCESS_VIOLATION   => 'permisiuni insuficiente'
 );
 ?>
-

diff --git a/lib/adodb/lang/adodb_th.inc.php b/lib/adodb/lang/adodb_th.inc.php
index 745441cc1b2ad4bcd1f427b5040a75c829e98356..a7288efb57c851964b0bec585a95e5976ad5cba9 100644 (file)
--- a/lib/adodb/lang/adodb_th.inc.php
+++ b/lib/adodb/lang/adodb_th.inc.php
@@ -31,4 +31,3 @@ $ADODB_LANG_ARRAY = array (
             DB_ERROR_ACCESS_VIOLATION   => 'permissions ไม่พอ'
 );
 ?>
-

diff --git a/lib/adodb/readme_moodle.txt b/lib/adodb/readme_moodle.txt
index b73dd799a664f4f869b4a51f420e4b2142d3d729..be6ba52dba04a4d58a16350d38aa56cb7e019947 100644 (file)
--- 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
index c3a76da85997e3b41357eb4c14096dee2634f9b8..27924d75a9fdd5ac57c4a84e849f5111b38ae1b3 100644 (file)
--- 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
index d6b4e2290ca8d08a444afaccca0c1cfecb721c6e..20eea1c1ff1e39c9df4b8f1e327196fb46917c79 100644 (file)
--- 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
index ae0144a0bd8c7d4e0534638e4b129b483676360e..fc07aeee4564701f683b09ad7eec30fa54913d1b 100644 (file)
--- 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
index 2cdc0e46c7ad6f89e61bf5f7a6955e2dfe7df6fc..a71b6c06a100508228425abcd33f40812c7a5c10 100644 (file)
--- 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
index 6462000950f0e0263bc6c73d747ced991b7dab22..eb687ae0c93d5aa0c0e19d21c0a9c56caa626c72 100644 (file)
--- 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
index 20575ece2b8d534921bdcca6d37c4a2401abf0d5..74a8b3011261d67b093b7001303f388705519124 100644 (file)
--- 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
index a1f2a3a75da892255ba6a82377e6594b9ce43261..586312a6326c01c48d460aa688140837a4be6a24 100644 (file)
--- a/mod/lesson/action/confirmdelete.php
+++ b/mod/lesson/action/confirmdelete.php
@@ -28,4 +28,3 @@
          "lesson.php?action=delete&id=$cm->id&pageid=$pageid&sesskey=".$USER->sesskey, 
          "view.php?id=$cm->id");
 ?>
-    

diff --git a/mod/resource/index.php b/mod/resource/index.php
index cd7d7e1db5c0e421b5b3afde6dd1563faee8aa17..5172ea1f5e14043c10425a335d9b65381a52aa71 100644 (file)
--- 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
index 73151342fb85063bcc64111e602f3826d68904af..d0fef9fab89028d2599593992df8ba804c2ef638 100644 (file)
--- a/mod/resource/type/repository/hive/openlitepublish.php
+++ b/mod/resource/type/repository/hive/openlitepublish.php
@@ -43,4 +43,3 @@ $query .= '&mklmsstyle='.$stylesheets;
 
 redirect($CFG->hiveprotocol .'://'. $CFG->hivehost .':'. $CFG->hiveport .''. $CFG->hivepath .'?'.$query);
 ?>
-

diff --git a/mod/scorm/datamodel.php b/mod/scorm/datamodel.php
index bcb4dc3a21015db2c3032ce2636c9ab0ead539ad..d7c6d8766eafc4bd4e5a390e60b397befe21a773 100755 (executable)
--- 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
index 60da14a72b21dff6b7dfdc4facea6fceb3095bec..bb8f28cd11202a2db2d9853ab227a2b905597f97 100644 (file)
--- 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
index 5d76f4a9cab2d64b8989e166051cdaa91719b3e0..b7b02ecb7b5ed2e058c8b61d2da6cb72558aa2d4 100644 (file)
--- 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
index e6c3249b65e465dd9b68b21c64abb415d3102023..b284d597b943c04565c0bd0d0580e22660b792cd 100644 (file)
--- 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
index 05c4fa753c1867af2d031c11848228def840d5e9..155867b8caf9f6d4defcf5f747daaa9ae700f219 100644 (file)
--- 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
index 9207ff3d305de67369417660751c7bff746d492c..a5238fe0c841848a6cd972b2177848b9929ece08 100644 (file)
--- 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
index 4e40dc47a5366c2f8a8b3bbb7f12141a994d66cf..77babbaecb26649bf10fc1fbc54e2bc72bd5aa56 100644 (file)
--- 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
index 5bd14c38668ccbd7d2da30dfb34528a71eb63a00..f8fe38cfc1cfca5f96a2be303e5b28e534938894 100644 (file)
--- 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
index aac69aa330a876653c28b46d44a2f4c32d81638a..86b3d8c57a29e04d0d1ca2ac3c92959fbe73eddc 100644 (file)
--- a/theme/chameleon/ui/chameleon.php
+++ b/theme/chameleon/ui/chameleon.php
@@ -28,5 +28,3 @@ if (!empty($THEME->chameleonenabled)) {
     }
 }
 ?>
-
-

diff --git a/theme/custom_corners/footer.html b/theme/custom_corners/footer.html
index a9327e411f060d52f3204f44110beec04d3a7b09..3bb3a6d17342a70ee1fb95b966e5c5085ab80392 100644 (file)
--- 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
index aac69aa330a876653c28b46d44a2f4c32d81638a..86b3d8c57a29e04d0d1ca2ac3c92959fbe73eddc 100644 (file)
--- a/theme/custom_corners/ui/chameleon.php
+++ b/theme/custom_corners/ui/chameleon.php
@@ -28,5 +28,3 @@ if (!empty($THEME->chameleonenabled)) {
     }
 }
 ?>
-
-