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.
2025-06-01 21:55:12 +02:00 · 2007-10-09 21:43:28 +00:00 · 2007-10-09 21:43:28 +00:00 · 0baafc173a
commit 0baafc173a
parent 1f682581a7
35 changed files with 10 additions and 40 deletions
--- a/auth/cas/languages.php
+++ b/auth/cas/languages.php
@ -15,4 +15,3 @@ $CASLANGUAGES = array (
 "french" => "French");

 ?>
-
--- 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) {
 }

 ?>
-
--- a/course/search.php
+++ b/course/search.php
@ -340,4 +340,3 @@


 ?>
-
--- a/course/user.php
+++ b/course/user.php
@ -306,4 +306,3 @@ function print_outline_row($mod, $instance, $result) {
 }

 ?>
-
--- a/grade/edit/letter/edit.php
+++ b/grade/edit/letter/edit.php
@ -122,4 +122,3 @@ $mform->display();

 print_footer($COURSE);
 ?>
-
--- a/grade/edit/letter/index.php
+++ b/grade/edit/letter/index.php
@ -57,4 +57,3 @@ print_table($table);
 print_footer($course);

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

 ?>
-
--- 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	=> 'ÓãÇÍíÇÊ ÛíÑ ßÇÝíÉ'
 );
 ?>
-		
--- 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   => 'нямате достатъчно права'
 );
-?>
-		
+?>
--- 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   => 'нямате достатъчно права'
 );
 ?>
-		
--- 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'
 );
-?>
-		
+?>
--- 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'
 );
-?>
-		
+?>
--- 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'
 );
 ?>
-
--- 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 ไม่พอ'
 );
 ?>
-
--- 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$
--- a/mod/choice/index.php
+++ b/mod/choice/index.php
@ -93,4 +93,3 @@
    print_footer($course);
 
 ?>
-
--- a/mod/exercise/assessments.php
+++ b/mod/exercise/assessments.php
@ -1178,4 +1178,3 @@
    print_footer($course);

 ?>
-
--- a/mod/glossary/tabs.php
+++ b/mod/glossary/tabs.php
@ -107,4 +107,4 @@
        break;
    } 
    echo '<hr />';
-?> 
+?>
--- a/mod/journal/index.php
+++ b/mod/journal/index.php
@ -60,4 +60,3 @@
    print_footer($course);
 
 ?>
-
--- a/mod/journal/report.php
+++ b/mod/journal/report.php
@ -145,4 +145,3 @@
    print_footer($course);

 ?>
-
--- a/mod/label/view.php
+++ b/mod/label/view.php
@ -35,4 +35,3 @@
    redirect("$CFG->wwwroot/course/view.php?id=$course->id");

 ?>
-
--- 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");
 ?>
-    
--- a/mod/resource/index.php
+++ b/mod/resource/index.php
@ -87,4 +87,3 @@
    print_footer($course);

 ?>
-
--- 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);
 ?>
-
--- a/mod/scorm/datamodel.php
+++ b/mod/scorm/datamodel.php
@ -79,4 +79,3 @@
        }
    }
 ?>
-
--- a/mod/survey/download.php
+++ b/mod/survey/download.php
@ -309,4 +309,3 @@


 ?>
-
--- a/mod/workshop/assess.php
+++ b/mod/workshop/assess.php
@ -155,4 +155,3 @@
    print_footer('none');

 ?>
-
--- a/mod/workshop/assessments.php
+++ b/mod/workshop/assessments.php
@ -1364,4 +1364,3 @@
    print_footer($course);

 ?>
-
--- a/mod/workshop/upload.php
+++ b/mod/workshop/upload.php
@ -121,4 +121,3 @@
    print_footer($course);

 ?>
-
--- a/mod/workshop/viewassessment.php
+++ b/mod/workshop/viewassessment.php
@ -92,4 +92,3 @@
    print_footer('none');

 ?>
-
--- a/question/export.php
+++ b/question/export.php
@ -141,4 +141,3 @@

    print_footer($COURSE);
 ?>
-
--- a/sso/hive/login.php
+++ b/sso/hive/login.php
@ -20,4 +20,3 @@
    }

 ?>
-
--- a/theme/chameleon/ui/chameleon.php
+++ b/theme/chameleon/ui/chameleon.php
@ -28,5 +28,3 @@ if (!empty($THEME->chameleonenabled)) {
    }
 }
 ?>
-
-
--- 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 -->
--- a/theme/custom_corners/ui/chameleon.php
+++ b/theme/custom_corners/ui/chameleon.php
@ -28,5 +28,3 @@ if (!empty($THEME->chameleonenabled)) {
    }
 }
 ?>
-
-