Removed closing PHP tags (?>) at the ends of files as they are unnece…

…ssary and can cause problems with unexpected output (eg see SF Bugs #288) git-svn-id: http://svn.code.sf.net/p/mrbs/code/mrbs/trunk@2784 25f7e783-145e-4f2d-a9f8-dd7182bfe9c7
vancegroup-mirrors · Nov 21, 2013 · 58b8aae · 58b8aae
1 parent 30f04ad
commit 58b8aae
Show file tree

Hide file tree

Showing 125 changed files with 44 additions and 129 deletions.
diff --git a/convert_db_to_utf8.php b/convert_db_to_utf8.php
@@ -408,4 +408,3 @@ function convert_one_db($db)
   } // end of if ($alterdatabasecharset)
 } // end of function convert_one_db()
 
-?>
diff --git a/testdata.php b/testdata.php
@@ -77,4 +77,3 @@
   }
 }
 
-?>
diff --git a/web/Blowfish.php b/web/Blowfish.php
@@ -314,4 +314,3 @@ function setKey($key)
 
 }
 
-?>
diff --git a/web/Blowfish/DefaultKey.php b/web/Blowfish/DefaultKey.php
@@ -324,4 +324,3 @@ function Crypt_Blowfish_DefaultKey()
 
 }
 
-?>
diff --git a/web/File/Passwd.php b/web/File/Passwd.php
@@ -413,4 +413,4 @@ function staticAuth($type, $file, $user, $pass, $opt = '')
         return call_user_func($func, $file, $user, $pass, $opt);
     }
 }
-?>
+
diff --git a/web/File/Passwd/Authbasic.php b/web/File/Passwd/Authbasic.php
@@ -393,4 +393,3 @@ function generatePassword($pass, $mode = FILE_PASSWD_DES, $salt = null)
         return File_Passwd_Authbasic::generatePasswd($pass, $mode, $salt);
     }
 }
-?>
diff --git a/web/File/Passwd/Authdigest.php b/web/File/Passwd/Authdigest.php
@@ -359,4 +359,3 @@ function generatePassword($user, $realm, $pass)
         return File_Passwd_Authdigest::generatePasswd($user, $realm, $pass);
     }
 }
-?>
diff --git a/web/File/Passwd/Common.php b/web/File/Passwd/Common.php
@@ -379,4 +379,3 @@ function _auth($file, $id, $sep = ':')
         return false;
     }
 }
-?>
diff --git a/web/File/Passwd/Custom.php b/web/File/Passwd/Custom.php
@@ -590,4 +590,3 @@ function _genPass($pass, $salt = null, $func = null)
         return $return;
     }
 }
-?>
diff --git a/web/File/Passwd/Cvs.php b/web/File/Passwd/Cvs.php
@@ -301,4 +301,3 @@ function generatePassword($pass, $salt = null)
         return File_Passwd_Cvs::generatePasswd($pass, $salt);
     }
 }
-?>
diff --git a/web/File/Passwd/Smb.php b/web/File/Passwd/Smb.php
@@ -423,4 +423,4 @@ function generatePassword($pass, $mode = 'nt')
         return File_Passwd_Smb::generatePasswd($pass, $mode);
     }
 }
-?>
+
diff --git a/web/File/Passwd/Unix.php b/web/File/Passwd/Unix.php
@@ -657,4 +657,3 @@ function generatePassword($pass, $mode = FILE_PASSWD_MD5, $salt = null)
     }
 
 }
-?>
diff --git a/web/PEAR.php b/web/PEAR.php
@@ -972,4 +972,4 @@ function toString() {
  * c-basic-offset: 4
  * End:
  */
-?>
+
diff --git a/web/Themes/classic126/styling.inc b/web/Themes/classic126/styling.inc
@@ -103,4 +103,3 @@ $main_cell_height             = '17'; // (px)  height of the cells in the main d
 // ***** FONTS ************************    
 $standard_font_family  = "Arial, 'Arial Unicode MS', Verdana, sans-serif";
 
-?>
diff --git a/web/Themes/default/header.inc b/web/Themes/default/header.inc
@@ -250,4 +250,4 @@ function print_theme_header($day, $month, $year, $area, $room)
 <?php
 
 } // end of print_theme_header()
-?>
+
diff --git a/web/Themes/default/styling.inc b/web/Themes/default/styling.inc
@@ -106,4 +106,3 @@ $main_cell_height             = '17'; // (px)  height of the cells in the main d
 // ***** FONTS ************************    
 $standard_font_family  = "Arial, 'Arial Unicode MS', Verdana, sans-serif";
 
-?>
diff --git a/web/add.php b/web/add.php
@@ -38,3 +38,4 @@
 
 $returl = "admin.php?area=$area" . (!empty($error) ? "&error=$error" : "");
 header("Location: $returl");
+
diff --git a/web/admin.php b/web/admin.php
@@ -433,4 +433,4 @@
 }
 
 output_trailer();
-?>
+
diff --git a/web/approve_entry_handler.php b/web/approve_entry_handler.php
@@ -109,4 +109,3 @@
 header("Location: $returl");
 exit;
 
-?>
diff --git a/web/auth/auth_auth_basic.inc b/web/auth/auth_auth_basic.inc
@@ -106,4 +106,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/auth/auth_config.inc b/web/auth/auth_config.inc
@@ -85,4 +85,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/auth/auth_crypt.inc b/web/auth/auth_crypt.inc
@@ -101,4 +101,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/auth/auth_db.inc b/web/auth/auth_db.inc
@@ -94,4 +94,3 @@ function authGetUserLevel($user)
   return $result;
 }
 
-?>
diff --git a/web/auth/auth_db_ext.inc b/web/auth/auth_db_ext.inc
@@ -147,4 +147,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/auth/auth_ext.inc b/web/auth/auth_ext.inc
@@ -120,4 +120,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/auth/auth_imap.inc b/web/auth/auth_imap.inc
@@ -160,4 +160,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/auth/auth_imap_php.inc b/web/auth/auth_imap_php.inc
@@ -110,4 +110,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/auth/auth_ldap.inc b/web/auth/auth_ldap.inc
@@ -512,4 +512,3 @@ function authLdapDebug($message)
   }
 }
 
-?>
diff --git a/web/auth/auth_nis.inc b/web/auth/auth_nis.inc
@@ -99,4 +99,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/auth/auth_none.inc b/web/auth/auth_none.inc
@@ -67,4 +67,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/auth/auth_nw.inc b/web/auth/auth_nw.inc
@@ -80,4 +80,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/auth/auth_pop3.inc b/web/auth/auth_pop3.inc
@@ -187,4 +187,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/auth/auth_smtp.inc b/web/auth/auth_smtp.inc
@@ -101,4 +101,3 @@ function authGetUserLevel($user)
   return 1;
 }
 
-?>
diff --git a/web/check_slot_ajax.php b/web/check_slot_ajax.php
@@ -36,4 +36,4 @@
 }
 
 echo json_encode($result);
-?>
+
diff --git a/web/config.inc.php b/web/config.inc.php
@@ -59,4 +59,3 @@
    or areadefaults.inc.php.  */
 
 
-?>
diff --git a/web/day.php b/web/day.php
@@ -125,4 +125,3 @@
 
 output_trailer();
 
-?>
diff --git a/web/defaultincludes.inc b/web/defaultincludes.inc
@@ -19,4 +19,3 @@ require_once "dbsys.inc";
 require_once "mrbs_auth.inc";
 require "standard_vars.inc.php";
 
-?>
diff --git a/web/del.php b/web/del.php
@@ -100,4 +100,3 @@
   }
 }
 
-?>
diff --git a/web/del_entry.php b/web/del_entry.php
@@ -111,4 +111,4 @@
 
 // If you got this far then we got an access denied.
 showAccessDenied($day, $month, $year, $area, "");
-?>
+
diff --git a/web/del_entry_ajax.php b/web/del_entry_ajax.php
@@ -69,4 +69,4 @@
 
 
 echo $result;
-?>
+
diff --git a/web/edit_area_room.php b/web/edit_area_room.php
@@ -1241,4 +1241,4 @@ function create_field_entry_timezone()
 }
 
 output_trailer();
-?>
+
diff --git a/web/edit_entry.php b/web/edit_entry.php
@@ -1412,4 +1412,6 @@ function create_field_entry_custom_field($field, $key, $disabled=FALSE)
   </fieldset>
 </form>
 
-<?php output_trailer() ?>
+<?php 
+output_trailer();
+
diff --git a/web/edit_entry_handler.php b/web/edit_entry_handler.php
@@ -794,4 +794,4 @@ function invalid_booking($message)
 echo "</div>\n";
 
 output_trailer();
-?>
+
diff --git a/web/edit_users.php b/web/edit_users.php
@@ -920,4 +920,3 @@ function output_row(&$row)
   output_trailer();
 }
 
-?>
diff --git a/web/escapeshellarg.inc b/web/escapeshellarg.inc
@@ -12,4 +12,3 @@ function escapeshellarg($x)
   return "'".preg_replace("/'/", "\\'", $x)."'";
 } 
 
-?>
diff --git a/web/functions.inc b/web/functions.inc
@@ -2554,4 +2554,4 @@ function is_cli()
     return FALSE;
   }
 }
-?>
+
diff --git a/web/functions_ical.inc b/web/functions_ical.inc
@@ -1221,5 +1221,3 @@ function export_icalendar(&$res, $keep_private, $export_end=PHP_INT_MAX)
   echo $icalendar;
 }
 
-
-?>
diff --git a/web/functions_mail.inc b/web/functions_mail.inc
@@ -1321,4 +1321,4 @@ function sendMail($addresses, $subject, $text_body, $html_body, $attachment, $ch
 }
 
 // }}}
-?>
+
diff --git a/web/functions_view.inc b/web/functions_view.inc
@@ -247,4 +247,3 @@ function create_details_body($data, $as_html=FALSE, $keep_private=FALSE, $room_d
   return $tbody;
 }
 
-?>
diff --git a/web/grab_globals.inc.php b/web/grab_globals.inc.php
@@ -231,4 +231,4 @@ function get_form_var($variable, $type = 'string')
     $cli_params = array_merge($cli_params, $param);
   }
 }
-?>
+
diff --git a/web/help.php b/web/help.php
@@ -37,4 +37,4 @@
 require_once "site_faq/site_faq" . $faqfilelang . ".html";
 
 output_trailer();
-?>
+
diff --git a/web/import.php b/web/import.php
@@ -562,4 +562,4 @@ function process_event($vevent)
 echo "</form>\n";
 
 output_trailer();
-?>
+
diff --git a/web/index.php b/web/index.php
@@ -26,4 +26,3 @@
 
 header("Location: $redirect_str");
 
-?>
diff --git a/web/internalconfig.inc.php b/web/internalconfig.inc.php
@@ -398,4 +398,3 @@
 
 error_reporting ($error_level);
 
-?>
diff --git a/web/js/refresh.js.php b/web/js/refresh.js.php
@@ -144,4 +144,3 @@ function(result){
   };
   <?php
 }
-?>
diff --git a/web/lang/lang.ca b/web/lang/lang.ca
@@ -228,4 +228,3 @@ $vocab["failed_connect_db"]  = "Error Fatal: Fallada al conectar a la base de da
 $vocab["type.I"]             = "Intern";
 $vocab["type.E"]             = "Extern";
 
-?>
diff --git a/web/lang/lang.cs b/web/lang/lang.cs
@@ -504,4 +504,4 @@
 // General
 $vocab["fatal_db_error"]     = "Závažná chyba: databáze bohužel není momentálně dostupná.";
 $vocab["back"]               = "Zpět";
-?>
+
diff --git a/web/lang/lang.da b/web/lang/lang.da
@@ -228,4 +228,3 @@ $vocab["failed_connect_db"]  = "Fatal fejl: kunne ikke forbinde til databasen";
 $vocab["type.I"]             = "Internt";
 $vocab["type.E"]             = "Eksternt";
 
-?>
diff --git a/web/lang/lang.de b/web/lang/lang.de
@@ -504,4 +504,4 @@ $vocab["type.E"]             = "Extern";
 // General
 $vocab["fatal_db_error"]     = "Fataler Fehler: Leider steht die Datenbank im Moment nicht zur Verfügung.";
 $vocab["back"]               = "Zurück";
-?>
+
diff --git a/web/lang/lang.el b/web/lang/lang.el
@@ -227,4 +227,3 @@ $vocab["failed_connect_db"]  = "Κρίσιμο σφάλμα: Αποτυχία σ
 $vocab["type.I"]             = "Εσωτερικά";
 $vocab["type.E"]             = "Εξωτερικά";
 
-?>
diff --git a/web/lang/lang.en b/web/lang/lang.en
@@ -504,4 +504,4 @@ $vocab["type.E"]            = "External";
 // General
 $vocab["fatal_db_error"]     = "Fatal error: unfortunately the database is not available at the moment.";
 $vocab["back"]               = "Back";
-?>
+
diff --git a/web/lang/lang.es b/web/lang/lang.es
@@ -396,4 +396,4 @@ $vocab["type.E"]             = "Externa";
 
 // General
 $vocab["fatal_db_error"]     = "Error: la base de datos no está disponible en este momento.";
-?>
+
diff --git a/web/lang/lang.eu b/web/lang/lang.eu
@@ -227,4 +227,3 @@ $vocab["failed_connect_db"]  = "Errorea: Ezin izan da datubasearekiko konexioa b
 $vocab["type.I"]            = "Arrunta";
 $vocab["type.E"]            = "Berezia";
 
-?>
diff --git a/web/lang/lang.fi b/web/lang/lang.fi
@@ -492,4 +492,4 @@ $vocab["type.E"]             = "Ulkoinen";
 // General
 $vocab["fatal_db_error"]     = "Virhe: tietokanta ei ole käytettävissä.";
 $vocab["back"]               = "Takaisin";
-?>
+
diff --git a/web/lang/lang.fr b/web/lang/lang.fr
@@ -399,4 +399,4 @@ $vocab["type.E"]            = "Occasionnel";
 
 // General
 $vocab["back"]               = "Retour";
-?>
+
diff --git a/web/lang/lang.he b/web/lang/lang.he
@@ -406,4 +406,3 @@ $vocab["failed_connect_db"]  = "תקלה: ההתחברות למערכת נכשל
 // General
 $vocab["fatal_db_error"]     = "תקלה: המערכת אינה זמינה כרגע. נסה שוב מאוחר יותר.";
 
-?>
diff --git a/web/lang/lang.hu b/web/lang/lang.hu
@@ -426,4 +426,4 @@ $vocab["type.E"]            = "Külső";
 // General
 $vocab["fatal_db_error"]     = "Súlyos hiba történt: az adatbázis nem érhető el jelen pillanatban, kérlek, próbáld újra később.";
 $vocab["back"]               = "Vissza";
-?>
+
diff --git a/web/lang/lang.it b/web/lang/lang.it
@@ -394,4 +394,3 @@ $vocab["restore_original"]   = "Ripristina originali";
 $vocab["type.I"]             = "Interno";
 $vocab["type.E"]             = "Esterno";
 
-?>
diff --git a/web/lang/lang.ja b/web/lang/lang.ja
@@ -488,4 +488,4 @@ $vocab["type.E"]            = "外部";
 // General
 $vocab["fatal_db_error"]     = "致命的なエラー: 残念ながら、データベースは現在利用可能ではありません。";
 $vocab["back"]               = "戻る";
-?>
+
diff --git a/web/lang/lang.ko b/web/lang/lang.ko
@@ -227,4 +227,3 @@ $vocab["failed_connect_db"]  = "심각한 에러: 데이터베이스에 접속
 $vocab["type.I"]            = "내부회의";
 $vocab["type.E"]            = "외부회의";
 
-?>
diff --git a/web/lang/lang.nl b/web/lang/lang.nl
@@ -375,4 +375,3 @@ $vocab["failed_connect_db"]  = "Fatale Fout: Verbinding naar database server mis
 $vocab["type.I"]             = "Intern";
 $vocab["type.E"]             = "Extern";
 
-?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -408,4 +408,3 @@ function convert_one_db($db)
		} // end of if ($alterdatabasecharset)
		} // end of function convert_one_db()

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -324,4 +324,3 @@ function Crypt_Blowfish_DefaultKey()

		}

		?>
-Original file line number
+Diff line change
@@ Expand Up / @@ -413,4 +413,4 @@ function staticAuth($type, $file, $user, $pass, $opt = '') @@
             return call_user_func($func, $file, $user, $pass, $opt);
         }
     }
-    ?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -657,4 +657,3 @@ function generatePassword($pass, $mode = FILE_PASSWD_MD5, $salt = null)
		}

		}
		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -103,4 +103,3 @@ $main_cell_height = '17'; // (px) height of the cells in the main d
		// *** FONTS **********************
		$standard_font_family = "Arial, 'Arial Unicode MS', Verdana, sans-serif";

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -250,4 +250,4 @@ function print_theme_header($day, $month, $year, $area, $room)
		<?php

		} // end of print_theme_header()
		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -106,4 +106,3 @@ $main_cell_height = '17'; // (px) height of the cells in the main d
		// *** FONTS **********************
		$standard_font_family = "Arial, 'Arial Unicode MS', Verdana, sans-serif";

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,3 +38,4 @@

		$returl = "admin.php?area=$area" . (!empty($error) ? "&error=$error" : "");
		header("Location: $returl");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -109,4 +109,3 @@
		header("Location: $returl");
		exit;

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -106,4 +106,3 @@ function authGetUserLevel($user)
		return 1;
		}

		?>