remove superfluous ?> at the end of .php files (left out apps/*/templates)

apps/bookmarks/lib/bookmarks.php

@@ -146,4 +146,3 @@ class OC_Bookmarks_Bookmarks{
 		return true;
 	}
 }
-?>

apps/contacts/ajax/addbook.php

@@ -17,4 +17,3 @@ $tmpl = new OCP\Template('contacts', 'part.editaddressbook');
 $tmpl->assign('new', true);
 $tmpl->assign('addressbook', $book);
 $tmpl->printPage();
-?>

apps/contacts/ajax/categories/categoriesfor.php

@@ -25,4 +25,3 @@ foreach($vcard->children as $property){
 	}
 }
 OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error setting checksum.'))));
-?>

apps/contacts/ajax/categories/delete.php

@@ -45,5 +45,3 @@ $catman->delete($categories, $cards);
 debug('After delete: '.print_r($catman->categories(), true));
 OC_Contacts_VCard::updateDataByID($cards);
 OCP\JSON::success(array('data' => array('categories'=>$catman->categories())));
-
-?>

apps/contacts/ajax/categories/list.php

@@ -13,5 +13,3 @@ OCP\JSON::checkAppEnabled('contacts');
 $categories = OC_Contacts_App::getCategories();
 
 OCP\JSON::success(array('data' => array('categories'=>$categories)));
-
-?>

apps/contacts/ajax/categories/rescan.php

@@ -14,5 +14,3 @@ OC_Contacts_App::scanCategories();
 $categories = OC_Contacts_App::getCategories();
 
 OCP\JSON::success(array('data' => array('categories'=>$categories)));
-
-?>

apps/contacts/ajax/currentphoto.php

@@ -51,5 +51,3 @@ if( is_null($contact)) {
 		bailOut(OC_Contacts_App::$l10n->t('The loading photo is not valid.'));
 	}
 }
-
-?>

apps/contacts/ajax/editaddress.php

@@ -39,5 +39,3 @@ $tmpl->assign('adr_types',$adr_types);
 
 $page = $tmpl->fetchPage();
 OCP\JSON::success(array('data' => array('page'=>$page, 'checksum'=>$checksum)));
-
-?>

apps/contacts/ajax/editaddressbook.php

@@ -14,4 +14,3 @@ $tmpl = new OCP\Template("contacts", "part.editaddressbook");
 $tmpl->assign('new', false);
 $tmpl->assign('addressbook', $addressbook);
 $tmpl->printPage();
-?>

apps/contacts/ajax/editname.php

@@ -32,5 +32,3 @@ if($id) {
 }
 $page = $tmpl->fetchPage();
 OCP\JSON::success(array('data' => array('page'=>$page)));
-
-?>

apps/contacts/ajax/importaddressbook.php

@@ -21,4 +21,3 @@ $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign('requesttoken', $_SERVER['HTTP_REQUESTTOKEN']);
 $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 $tmpl->printpage();
-?>

apps/contacts/ajax/importdialog.php

@@ -13,4 +13,3 @@ $tmpl = new OCP\Template('contacts', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);
 $tmpl->printpage();
-?>

apps/contacts/ajax/oc_photo.php

@@ -58,5 +58,3 @@ if(OC_Cache::set($tmpkey, $image->data(), 600)) {
 } else {
 	bailOut('Couldn\'t save temporary image: '.$tmpkey);
 }
-
-?>

apps/contacts/ajax/uploadimport.php

@@ -70,6 +70,3 @@ if(file_exists($file['tmp_name'])) {
 } else {
 	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
 }
-
-
-?>

apps/contacts/ajax/uploadphoto.php

@@ -102,4 +102,3 @@ if(file_exists($file['tmp_name'])) {
 } else {
 	bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
 }
-?>

apps/contacts/export.php

@@ -32,4 +32,3 @@ if(isset($bookid)){
 	header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $data['fullname']) . '.vcf'); 
 	echo $data['carddata'];
 }
-?>

apps/contacts/index.php

@@ -73,5 +73,3 @@ $tmpl->assign('addressbooks', $addressbooks);
 $tmpl->assign('details', $details );
 $tmpl->assign('id',$id);
 $tmpl->printPage();
-
-?>

apps/contacts/settings.php

@@ -4,4 +4,3 @@ $tmpl = new OCP\Template( 'contacts', 'settings');
 $tmpl->assign('addressbooks', OC_Contacts_Addressbook::all(OCP\USER::getUser()), false);
 
 return $tmpl->fetchPage();
-?>

apps/external/ajax/setsites.php

@@ -23,4 +23,3 @@ else
 	OCP\Config::setAppValue('external', 'sites', json_encode($sites));
 
 echo 'true';
-?>

apps/external/index.php

@@ -40,4 +40,3 @@ if (isset($_GET['id'])) {
 		$tmpl->printPage();
 	}
 }
-?>

apps/external/lib/external.php

@@ -32,5 +32,3 @@ class OC_External {
 	}
 
 }
-
-?>

apps/external/settings.php

@@ -7,4 +7,3 @@ OCP\Util::addscript( "external", "admin" );
 $tmpl = new OCP\Template( 'external', 'settings');
 
 return $tmpl->fetchPage();
-?>

apps/files/ajax/autocomplete.php

@@ -52,5 +52,3 @@ if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)){
 	}
 }
 OCP\JSON::encodedPrint($files);
-
-?>

apps/files/ajax/delete.php

@@ -26,5 +26,3 @@ if($success) {
 } else {
 	OCP\JSON::error(array("data" => array( "message" => "Could not delete:\n" . $filesWithError )));
 }
-
-?>

apps/files/ajax/download.php

@@ -34,4 +34,3 @@ $files = $_GET["files"];
 $dir = $_GET["dir"];
 
 OC_Files::get($dir, $files, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-?>

apps/files/ajax/list.php

@@ -42,5 +42,3 @@ $list->assign( "files", $files, false );
 $data = array('files' => $list->fetchPage());
 
 OCP\JSON::success(array('data' => $data));
-
-?>

apps/files/ajax/mimeicon.php

@@ -7,5 +7,3 @@ $RUNTIME_NOAPPS=false;
 
 
 print OC_Helper::mimetypeIcon($_GET['mime']);
-
-?>

apps/files/ajax/move.php

@@ -17,5 +17,3 @@ if(OC_Files::move($dir,$file,$target,$file)){
 }else{
 	OCP\JSON::error(array("data" => array( "message" => "Could not move $file" )));
 }
-
-?>

apps/files/ajax/rawlist.php

@@ -22,5 +22,3 @@ foreach( OC_Files::getdirectorycontent( $dir, $mimetype ) as $i ){
 }
 
 OCP\JSON::success(array('data' => $files));
-
-?>

apps/files/ajax/rename.php

@@ -18,5 +18,3 @@ if( OC_Files::move( $dir, $file, $dir, $newname )) {
 else{
 	OCP\JSON::error(array("data" => array( "message" => "Unable to rename file" )));
 }
-
-?>

apps/files/ajax/timezone.php

@@ -3,4 +3,4 @@
 	// see lib/base.php for an example
 	//session_start();
 	$_SESSION['timezone'] = $_GET['time'];
-?>
+        

apps/files/ajax/upload.php

@@ -60,5 +60,3 @@ if(strpos($dir,'..') === false){
 }
 
 OCP\JSON::error(array('data' => array('error' => $error, "file" => $fileName)));
-
-?>

apps/files/download.php

@@ -46,4 +46,3 @@ header('Content-Length: '.OC_Filesystem::filesize($filename));
 
 @ob_end_clean();
 OC_Filesystem::readfile( $filename );
-?>

apps/files/index.php

@@ -98,5 +98,3 @@ $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 $tmpl->assign( 'allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 $tmpl->printPage();
-
-?>

apps/files/settings.php

@@ -56,5 +56,3 @@ $tmpl = new OCP\Template( "files", "index", "user" );
 $tmpl->assign( 'files', $files );
 $tmpl->assign( "breadcrumb", $breadcrumb );
 $tmpl->printPage();
-
-?>

apps/files_external/ajax/addMountPoint.php

@@ -11,5 +11,3 @@ if ($_POST['isPersonal'] == 'true') {
 	$isPersonal = false;
 }
 OC_Mount_Config::addMountPoint($_POST['mountPoint'], $_POST['class'], $_POST['classOptions'], $_POST['mountType'], $_POST['applicable'], $isPersonal);
-
-?>

apps/files_external/ajax/removeMountPoint.php

@@ -11,5 +11,3 @@ if ($_POST['isPersonal'] == 'true') {
 	$isPersonal = false;
 }
 OC_Mount_Config::removeMountPoint($_POST['mountPoint'], $_POST['mountType'], $_POST['applicable'], $isPersonal);
-
-?>

apps/files_external/tests/amazons3.php

@@ -45,6 +45,3 @@ if (!is_array($config) or !isset($config['amazons3']) or !$config['amazons3']['r
 		}
 	}
 }
-
-?>
-

apps/files_imageviewer/appinfo/app.php

@@ -4,5 +4,3 @@ OCP\Util::addscript( 'files_imageviewer', 'lightbox' );
 OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
 OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
 OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
-
-?>

apps/files_pdfviewer/appinfo/app.php

@@ -6,4 +6,3 @@ OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/compatibility');
 OCP\Util::addscript( 'files_pdfviewer', 'viewer');
 OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/build/pdf');
 OCP\Util::addscript( 'files_pdfviewer', 'pdfjs/viewer');
-?>

apps/files_sharing/ajax/email.php

@@ -11,5 +11,3 @@ $link = $_POST['link'];
 $text = $user.' shared the '.$type.' '.$_POST['file'].' with you. It is available for download here: '.$link;
 $fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.OCP\Util::getServerHost());
 OC_Mail::send($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);
-
-?>

apps/files_sharing/ajax/getitem.php

@@ -64,5 +64,3 @@ while ($path != $userDirectory) {
 }
 
 OCP\JSON::success(array('data' => $item));
-
-?>

apps/files_sharing/ajax/getstatuses.php

@@ -20,5 +20,3 @@ if ($rows = OC_Share::getMySharedItems()) {
 }
 
 OCP\JSON::success(array('data' => $items));
-
-?>

apps/files_sharing/ajax/setpermissions.php

@@ -10,5 +10,3 @@ $permissions = $_POST['permissions'];
 OC_Share::setPermissions($source, $uid_shared_with, $permissions);
 
 OCP\JSON::success();
-
-?>

apps/files_sharing/ajax/share.php

@@ -35,5 +35,3 @@ foreach ($sources as $source) {
 		}
 	}
 }
-
-?>

apps/files_sharing/ajax/toggleresharing.php

@@ -7,5 +7,3 @@ if ($_POST['resharing'] == true) {
 } else {
 	OCP\Config::setAppValue('files_sharing', 'resharing', 'no');
 }
-
-?>

apps/files_sharing/ajax/unshare.php

@@ -9,5 +9,3 @@ $uid_shared_with = $_POST['uid_shared_with'];
 OC_Share::unshare($source, $uid_shared_with);
 
 OCP\JSON::success();
-
-?>

apps/files_sharing/ajax/userautocomplete.php

@@ -28,5 +28,3 @@ $users[] = "</optgroup>";
 $groups[] = "</optgroup>";
 $users = array_merge($users, $groups);
 OCP\JSON::encodedPrint($users);
-
-?>

apps/files_sharing/get.php

@@ -86,4 +86,3 @@ if (isset($_GET['token']) && $source = OC_Share::getSource($_GET['token'])) {
 	$tmpl->printPage();
 	die();
 }
-?>

apps/files_sharing/lib_share.php

@@ -513,5 +513,3 @@ class OC_Share {
 	}
 
 }
-
-?>

apps/files_sharing/list.php

@@ -33,5 +33,3 @@ OCP\Util::addscript("files_sharing", "list");
 $tmpl = new OCP\Template("files_sharing", "list", "user");
 $tmpl->assign("shared_items", OC_Share::getMySharedItems());
 $tmpl->printPage();
-
-?>

apps/files_texteditor/appinfo/app.php

@@ -4,4 +4,3 @@ OCP\Util::addStyle( 'files_texteditor', 'DroidSansMono/stylesheet' );
 OCP\Util::addStyle( 'files_texteditor', 'style' );
 OCP\Util::addscript( 'files_texteditor', 'editor');
 OCP\Util::addscript( 'files_texteditor', 'aceeditor/ace');
-?>

apps/files_versions/ajax/togglesettings.php

@@ -7,5 +7,3 @@ if (OCP\Config::getSystemValue('versions', 'true')=='true') {
 } else {
 	OCP\Config::setSystemValue('versions', 'true');
 }
-
-?>

apps/files_versions/history.php

@@ -71,5 +71,3 @@ if ( isset( $_GET['path'] ) ) {
 }
 
 $tmpl->printPage( );
-
-?>

apps/files_versions/lib/hooks.php

@@ -68,5 +68,3 @@ class Hooks {
 	}
 	
 }
-
-?>

apps/files_versions/settings.php

@@ -7,4 +7,3 @@ OCP\Util::addscript( 'files_versions', 'versions' );
 $tmpl = new OCP\Template( 'files_versions', 'settings');
 
 return $tmpl->fetchPage();
-?>

apps/gallery/ajax/createAlbum.php

@@ -28,5 +28,3 @@ OCP\JSON::checkAppEnabled('gallery');
 OC_Gallery_Album::create(OCP\USER::getUser(), $_GET['album_name']);
 
 OCP\JSON::success(array('name' => $_GET['album_name']));
-
-?>

apps/gallery/ajax/galleryOp.php

@@ -186,4 +186,3 @@ if ($_GET['operation']) {
     OCP\JSON::error(array('cause' => 'Unknown operation'));
   }
 }
-?>

apps/gallery/index.php

@@ -103,4 +103,3 @@ $tmpl = new OCP\Template( 'gallery', 'index', 'user' );
 $tmpl->assign('root', $root, false);
 $tmpl->assign('tl', $tl, false);
 $tmpl->printPage();
-?>

apps/gallery/lib/hooks_handlers.php

@@ -38,5 +38,3 @@ class OC_Gallery_Hooks_Handlers {
 		//TODO: implement this
 	}
 }
-
-?>

apps/gallery/lib/images_utils.php

@@ -60,5 +60,3 @@ function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height, $tgtImg, $
     imagedestroy($process);
     imagedestroy($myImage);
 }
-
-?>

apps/gallery/lib/managers.php

@@ -111,4 +111,3 @@ class ThumbnailsManager {
 	private function __construct() {}
 
 }
-?>

apps/gallery/lib/tiles.php

@@ -174,5 +174,3 @@ class TileStack extends TileBase {
 	private $tiles_array;
 	private $stack_name;
 }
-
-?>

apps/gallery/lib/tiles_test.php

@@ -83,5 +83,3 @@ if ($ts->getCount() != 0) {
 }
 
 echo $tl->get();
-
-?>

apps/media/ajax/api.php

@@ -131,4 +131,3 @@ if($arguments['action']){
 			exit;
 	}
 }
-?>

apps/media/ajax/autoupdate.php

@@ -35,4 +35,3 @@ $autoUpdate=(isset($_GET['autoupdate']) and $_GET['autoupdate']=='true');
 OCP\Config::setUserValue(OCP\USER::getUser(),'media','autoupdate',(integer)$autoUpdate);
 
 OCP\JSON::success(array('data' => $autoUpdate));
-?>

apps/media/index.php

@@ -40,5 +40,3 @@ OCP\App::setActiveNavigationEntry( 'media_index' );
 
 $tmpl = new OCP\Template( 'media', 'music', 'user' );
 $tmpl->printPage();
-?>
- 

apps/media/lib_ampache.php

@@ -419,5 +419,3 @@ class OC_MEDIA_AMPACHE{
 		echo('</root>');
 	}
 }
-
-?>

apps/media/lib_collection.php

@@ -387,5 +387,3 @@ class OC_MEDIA_COLLECTION{
 		$query->execute(array($newPath,$oldPath));
 	}
 }
-
-?>

apps/media/settings.php

@@ -3,4 +3,3 @@
 $tmpl = new OCP\Template( 'media', 'settings');
 
 return $tmpl->fetchPage();
-?>

apps/remoteStorage/settings.php

@@ -4,4 +4,3 @@ require_once('lib_remoteStorage.php');
 $tmpl = new OCP\Template( 'remoteStorage', 'settings');
 
 return $tmpl->fetchPage();
-?>

apps/user_migrate/appinfo/app.php

@@ -31,4 +31,3 @@ $entry = array(
 	'href' => OCP\Util::linkTo( "user_migrate", "admin.php" ),
 	'name' => 'Import'
 );
-?>

apps/user_openid/phpmyid.php

@@ -1705,4 +1705,3 @@ $run_mode = (isset($_REQUEST['openid_mode'])
 debug("Run mode: $run_mode at: " . time());
 debug($_REQUEST, 'Request params');
 call_user_func($run_mode . '_mode');
-?>

apps/user_openid/user.php

@@ -45,6 +45,3 @@ if(!OCP\User::userExists($USERNAME)){
 $IDENTITY=OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$USERNAME;
 
 require_once 'phpmyid.php';
-
-
-?>

apps/user_webfinger/webfinger.php

@@ -58,4 +58,3 @@ foreach($apps as $app) {
 	}
 }
 echo "]}";
-?>

core/ajax/grouplist.php

@@ -45,5 +45,3 @@ foreach( OC_Group::getGroups() as $i ){
 }
 
 OC_JSON::encodedPrint($groups);
-
-?>

core/ajax/translations.php

@@ -29,4 +29,3 @@ $app = $_POST["app"];
 $l = OC_L10N::get( $app );
 
 OC_JSON::success(array('data' => $l->getTranslations()));
-?>

core/ajax/userlist.php

@@ -44,5 +44,3 @@ foreach( OC_User::getUsers() as $i ){
 }
 
 OC_JSON::encodedPrint($users);
-
-?>

core/ajax/validateuser.php

@@ -36,5 +36,3 @@ if(!isset($_SERVER['PHP_AUTH_USER'])){
 	        OC_JSON::encodedPrint(array("username" => $_SERVER["PHP_AUTH_USER"], "user_valid" => "false"));
 	}
 }
-
-?>

core/ajax/vcategories/add.php

@@ -39,5 +39,3 @@ if($categories->hasCategory($category)) {
 }
 
 OC_JSON::success(array('data' => array('categories'=>$categories->categories())));
-
-?>

core/ajax/vcategories/delete.php

@@ -34,5 +34,3 @@ if(is_null($categories)) {
 $vcategories = new OC_VCategories($app);
 $vcategories->delete($categories);
 OC_JSON::success(array('data' => array('categories'=>$vcategories->categories())));
-
-?>

core/ajax/vcategories/edit.php

@@ -31,5 +31,3 @@ $categories = $vcategories->categories();
 debug(print_r($categories, true));
 $tmpl->assign('categories',$categories);
 $tmpl->printpage();
-
-?>

core/strings.php

@@ -7,4 +7,3 @@ $l->t("Users");
 $l->t("Apps");
 $l->t("Admin");
 $l->t("Help");
-?>

lib/MDB2/Driver/Function/sqlite3.php

@@ -134,4 +134,3 @@ class MDB2_Driver_Function_sqlite3 extends MDB2_Driver_Function_Common
 
     // }}}
 }
-?>

lib/MDB2/Driver/Manager/sqlite3.php

@@ -1360,4 +1360,3 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
 
     // }}}
 }
-?>

lib/MDB2/Driver/sqlite3.php

@@ -1332,5 +1332,3 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
 		$this->free();
     }
 }
-
-?>

lib/public/app.php

@@ -158,6 +158,3 @@ class App {
 
 
 }
-
-
-?>

lib/public/config.php

@@ -134,5 +134,3 @@ class Config {
 
 
 }
-
-?>

lib/public/db.php

@@ -91,5 +91,3 @@ class DB {
 
 
 }
-
-?>

lib/public/files.php

@@ -115,5 +115,3 @@ class Files {
 
 
 }
-
-?>

lib/public/json.php

@@ -105,5 +105,3 @@ class JSON {
 	}
 
 }
-
-?>

lib/public/response.php

@@ -105,5 +105,3 @@ class Response {
 
 
 }
-
-?>

lib/public/template.php

@@ -104,6 +104,3 @@ function html_select_options($options, $selected, $params=array()) {
 class Template extends \OC_Template {
 
 }
-
-
-?>

lib/public/user.php

@@ -120,6 +120,3 @@ class User {
 
 
 }
-
-
-?>

lib/public/util.php

@@ -321,5 +321,3 @@ class Util {
 		return(\OC_Helper::mb_str_replace($search, $replace, $subject, $encoding, $count));
 	}
 }
-
-?>

lib/setup.php

@@ -380,5 +380,3 @@ class OC_Setup {
 		file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/index.html', '');
 	}
 }
-
-?>

lib/updater.php

@@ -84,4 +84,3 @@ class OC_Updater{
 
 	}
 }
-?>

lib/vcategories.php

@@ -223,4 +223,3 @@ class OC_VCategories {
 	}
 
 }
-?>

ocs/providers.php

@@ -40,6 +40,3 @@ echo('
 </provider>
 </providers>
 ');
-
-
-?>

ocs/v1.php

@@ -24,5 +24,3 @@
 require_once('../lib/base.php');
 @ob_clean();
 OC_OCS::handle();
-
-?>