From e59a1806cf676dad9256ad3adb83a6e9530b7612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 9 Jul 2012 16:51:16 +0200 Subject: [PATCH] remove superfluous ?> at the end of .php files (left out apps/*/templates) --- apps/bookmarks/lib/bookmarks.php | 3 +- apps/contacts/ajax/addbook.php | 1 - .../ajax/categories/categoriesfor.php | 1 - apps/contacts/ajax/categories/delete.php | 2 - apps/contacts/ajax/categories/list.php | 2 - apps/contacts/ajax/categories/rescan.php | 2 - apps/contacts/ajax/currentphoto.php | 2 - apps/contacts/ajax/editaddress.php | 2 - apps/contacts/ajax/editaddressbook.php | 1 - apps/contacts/ajax/editname.php | 2 - apps/contacts/ajax/importaddressbook.php | 1 - apps/contacts/ajax/importdialog.php | 1 - apps/contacts/ajax/oc_photo.php | 2 - apps/contacts/ajax/uploadimport.php | 3 - apps/contacts/ajax/uploadphoto.php | 1 - apps/contacts/export.php | 1 - apps/contacts/index.php | 2 - apps/contacts/settings.php | 1 - apps/external/ajax/setsites.php | 1 - apps/external/index.php | 1 - apps/external/lib/external.php | 2 - apps/external/settings.php | 1 - apps/files/ajax/autocomplete.php | 2 - apps/files/ajax/delete.php | 2 - apps/files/ajax/download.php | 1 - apps/files/ajax/list.php | 2 - apps/files/ajax/mimeicon.php | 2 - apps/files/ajax/move.php | 2 - apps/files/ajax/rawlist.php | 2 - apps/files/ajax/rename.php | 2 - apps/files/ajax/timezone.php | 2 +- apps/files/ajax/upload.php | 2 - apps/files/download.php | 1 - apps/files/index.php | 2 - apps/files/settings.php | 2 - apps/files_external/ajax/addMountPoint.php | 2 - apps/files_external/ajax/removeMountPoint.php | 2 - apps/files_external/tests/amazons3.php | 3 - apps/files_imageviewer/appinfo/app.php | 2 - apps/files_pdfviewer/appinfo/app.php | 1 - apps/files_sharing/ajax/email.php | 2 - apps/files_sharing/ajax/getitem.php | 2 - apps/files_sharing/ajax/getstatuses.php | 2 - apps/files_sharing/ajax/setpermissions.php | 2 - apps/files_sharing/ajax/share.php | 2 - apps/files_sharing/ajax/toggleresharing.php | 2 - apps/files_sharing/ajax/unshare.php | 2 - apps/files_sharing/ajax/userautocomplete.php | 2 - apps/files_sharing/get.php | 1 - apps/files_sharing/lib_share.php | 2 - apps/files_sharing/list.php | 2 - apps/files_texteditor/appinfo/app.php | 1 - apps/files_versions/ajax/togglesettings.php | 2 - apps/files_versions/history.php | 2 - apps/files_versions/lib/hooks.php | 72 +++++++++---------- apps/files_versions/settings.php | 1 - apps/gallery/ajax/createAlbum.php | 2 - apps/gallery/ajax/galleryOp.php | 1 - apps/gallery/index.php | 1 - apps/gallery/lib/hooks_handlers.php | 2 - apps/gallery/lib/images_utils.php | 2 - apps/gallery/lib/managers.php | 7 +- apps/gallery/lib/tiles.php | 2 - apps/gallery/lib/tiles_test.php | 2 - apps/media/ajax/api.php | 1 - apps/media/ajax/autoupdate.php | 1 - apps/media/index.php | 2 - apps/media/lib_ampache.php | 2 - apps/media/lib_collection.php | 2 - apps/media/settings.php | 1 - apps/remoteStorage/settings.php | 1 - apps/user_migrate/appinfo/app.php | 1 - apps/user_openid/phpmyid.php | 1 - apps/user_openid/user.php | 3 - apps/user_webfinger/webfinger.php | 1 - core/ajax/grouplist.php | 2 - core/ajax/translations.php | 1 - core/ajax/userlist.php | 2 - core/ajax/validateuser.php | 2 - core/ajax/vcategories/add.php | 2 - core/ajax/vcategories/delete.php | 2 - core/ajax/vcategories/edit.php | 2 - core/strings.php | 1 - lib/MDB2/Driver/Function/sqlite3.php | 1 - lib/MDB2/Driver/Manager/sqlite3.php | 1 - lib/MDB2/Driver/sqlite3.php | 2 - lib/public/app.php | 3 - lib/public/config.php | 2 - lib/public/db.php | 2 - lib/public/files.php | 2 - lib/public/json.php | 2 - lib/public/response.php | 2 - lib/public/template.php | 3 - lib/public/user.php | 3 - lib/public/util.php | 2 - lib/setup.php | 2 - lib/updater.php | 1 - lib/vcategories.php | 1 - ocs/providers.php | 3 - ocs/v1.php | 2 - search/ajax/search.php | 2 - search/index.php | 2 - settings/ajax/changepassword.php | 2 - settings/ajax/creategroup.php | 2 - settings/ajax/createuser.php | 2 - settings/ajax/lostpassword.php | 2 - settings/ajax/openid.php | 2 - settings/ajax/removegroup.php | 2 - settings/ajax/removeuser.php | 2 - settings/ajax/setlanguage.php | 2 - settings/ajax/setquota.php | 1 - settings/ajax/togglegroups.php | 2 - settings/apps.php | 2 - settings/help.php | 2 - settings/personal.php | 4 +- settings/users.php | 3 - status.php | 3 - webapps.php | 2 - 118 files changed, 41 insertions(+), 249 deletions(-) diff --git a/apps/bookmarks/lib/bookmarks.php b/apps/bookmarks/lib/bookmarks.php index e0005968f3..86fba45a50 100644 --- a/apps/bookmarks/lib/bookmarks.php +++ b/apps/bookmarks/lib/bookmarks.php @@ -145,5 +145,4 @@ class OC_Bookmarks_Bookmarks{ $result = $query->execute(); return true; } -} -?> +} \ No newline at end of file diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php index 70f47cc812..751185b44f 100644 --- a/apps/contacts/ajax/addbook.php +++ b/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(); -?> diff --git a/apps/contacts/ajax/categories/categoriesfor.php b/apps/contacts/ajax/categories/categoriesfor.php index 846af300de..6b6fcad0eb 100644 --- a/apps/contacts/ajax/categories/categoriesfor.php +++ b/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.')))); -?> diff --git a/apps/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php index 76c23d6487..7c3261446b 100644 --- a/apps/contacts/ajax/categories/delete.php +++ b/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()))); - -?> diff --git a/apps/contacts/ajax/categories/list.php b/apps/contacts/ajax/categories/list.php index 3ae7635390..f234116ba8 100644 --- a/apps/contacts/ajax/categories/list.php +++ b/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))); - -?> diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php index 0d8464a23e..fd875a965d 100644 --- a/apps/contacts/ajax/categories/rescan.php +++ b/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))); - -?> diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php index b10e752c45..8f60eca08e 100644 --- a/apps/contacts/ajax/currentphoto.php +++ b/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.')); } } - -?> diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php index 2d7aba11b0..1eb9429d79 100644 --- a/apps/contacts/ajax/editaddress.php +++ b/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))); - -?> diff --git a/apps/contacts/ajax/editaddressbook.php b/apps/contacts/ajax/editaddressbook.php index 7a9b757ae0..4bc77302e5 100644 --- a/apps/contacts/ajax/editaddressbook.php +++ b/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(); -?> diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php index 868ca222e0..9e7c090eee 100644 --- a/apps/contacts/ajax/editname.php +++ b/apps/contacts/ajax/editname.php @@ -32,5 +32,3 @@ if($id) { } $page = $tmpl->fetchPage(); OCP\JSON::success(array('data' => array('page'=>$page))); - -?> diff --git a/apps/contacts/ajax/importaddressbook.php b/apps/contacts/ajax/importaddressbook.php index 3c01e24a18..6b5b06681c 100644 --- a/apps/contacts/ajax/importaddressbook.php +++ b/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(); -?> diff --git a/apps/contacts/ajax/importdialog.php b/apps/contacts/ajax/importdialog.php index 5f8805a610..691522538f 100644 --- a/apps/contacts/ajax/importdialog.php +++ b/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(); -?> diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php index 5c50ba92db..710179fffc 100644 --- a/apps/contacts/ajax/oc_photo.php +++ b/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); } - -?> diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php index 9511520828..80b282f38a 100644 --- a/apps/contacts/ajax/uploadimport.php +++ b/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?'); } - - -?> diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php index 8545ca84ee..6bb3fe8a5e 100644 --- a/apps/contacts/ajax/uploadphoto.php +++ b/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?'); } -?> diff --git a/apps/contacts/export.php b/apps/contacts/export.php index 58fdb040a5..eb506506c4 100644 --- a/apps/contacts/export.php +++ b/apps/contacts/export.php @@ -32,4 +32,3 @@ if(isset($bookid)){ header('Content-Disposition: inline; filename=' . str_replace(' ', '_', $data['fullname']) . '.vcf'); echo $data['carddata']; } -?> diff --git a/apps/contacts/index.php b/apps/contacts/index.php index 0b4f89b30c..a89ffffa9c 100644 --- a/apps/contacts/index.php +++ b/apps/contacts/index.php @@ -73,5 +73,3 @@ $tmpl->assign('addressbooks', $addressbooks); $tmpl->assign('details', $details ); $tmpl->assign('id',$id); $tmpl->printPage(); - -?> diff --git a/apps/contacts/settings.php b/apps/contacts/settings.php index bc57f4a1d0..a079499381 100644 --- a/apps/contacts/settings.php +++ b/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(); -?> diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php index 188e71e891..0f9e061d0e 100644 --- a/apps/external/ajax/setsites.php +++ b/apps/external/ajax/setsites.php @@ -23,4 +23,3 @@ else OCP\Config::setAppValue('external', 'sites', json_encode($sites)); echo 'true'; -?> diff --git a/apps/external/index.php b/apps/external/index.php index 81819e76e2..3b6f06e1bf 100644 --- a/apps/external/index.php +++ b/apps/external/index.php @@ -40,4 +40,3 @@ if (isset($_GET['id'])) { $tmpl->printPage(); } } -?> diff --git a/apps/external/lib/external.php b/apps/external/lib/external.php index 9fff5d5569..d13a7cf6dd 100644 --- a/apps/external/lib/external.php +++ b/apps/external/lib/external.php @@ -32,5 +32,3 @@ class OC_External { } } - -?> diff --git a/apps/external/settings.php b/apps/external/settings.php index c109733e54..488444c119 100644 --- a/apps/external/settings.php +++ b/apps/external/settings.php @@ -7,4 +7,3 @@ OCP\Util::addscript( "external", "admin" ); $tmpl = new OCP\Template( 'external', 'settings'); return $tmpl->fetchPage(); -?> diff --git a/apps/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php index 7ff34da96b..e504bb24bf 100644 --- a/apps/files/ajax/autocomplete.php +++ b/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); - -?> diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index 161d820f73..695f803884 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -26,5 +26,3 @@ if($success) { } else { OCP\JSON::error(array("data" => array( "message" => "Could not delete:\n" . $filesWithError ))); } - -?> diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php index e9373f5f6a..b9a4ddaf5e 100644 --- a/apps/files/ajax/download.php +++ b/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); -?> diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index f0600a179d..dae0c1a828 100644 --- a/apps/files/ajax/list.php +++ b/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)); - -?> diff --git a/apps/files/ajax/mimeicon.php b/apps/files/ajax/mimeicon.php index 57898cd82d..80d50f8452 100644 --- a/apps/files/ajax/mimeicon.php +++ b/apps/files/ajax/mimeicon.php @@ -7,5 +7,3 @@ $RUNTIME_NOAPPS=false; print OC_Helper::mimetypeIcon($_GET['mime']); - -?> diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php index 56171dd0ed..3d4003a8ed 100644 --- a/apps/files/ajax/move.php +++ b/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" ))); } - -?> diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php index 7cb02f7967..d159f6e152 100644 --- a/apps/files/ajax/rawlist.php +++ b/apps/files/ajax/rawlist.php @@ -22,5 +22,3 @@ foreach( OC_Files::getdirectorycontent( $dir, $mimetype ) as $i ){ } OCP\JSON::success(array('data' => $files)); - -?> diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php index 8e98308eb5..45448279fa 100644 --- a/apps/files/ajax/rename.php +++ b/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" ))); } - -?> diff --git a/apps/files/ajax/timezone.php b/apps/files/ajax/timezone.php index cafb5074ec..0be441a36a 100644 --- a/apps/files/ajax/timezone.php +++ b/apps/files/ajax/timezone.php @@ -3,4 +3,4 @@ // see lib/base.php for an example //session_start(); $_SESSION['timezone'] = $_GET['time']; -?> + \ No newline at end of file diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 5553cf5a13..74e6eb560d 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -60,5 +60,3 @@ if(strpos($dir,'..') === false){ } OCP\JSON::error(array('data' => array('error' => $error, "file" => $fileName))); - -?> diff --git a/apps/files/download.php b/apps/files/download.php index 2b5d4e2d87..4e2478d1ad 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -46,4 +46,3 @@ header('Content-Length: '.OC_Filesystem::filesize($filename)); @ob_end_clean(); OC_Filesystem::readfile( $filename ); -?> diff --git a/apps/files/index.php b/apps/files/index.php index ed36c5edab..c2c0cb6170 100644 --- a/apps/files/index.php +++ b/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(); - -?> diff --git a/apps/files/settings.php b/apps/files/settings.php index e5a66239eb..cd6dd8c161 100644 --- a/apps/files/settings.php +++ b/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(); - -?> diff --git a/apps/files_external/ajax/addMountPoint.php b/apps/files_external/ajax/addMountPoint.php index 0eedfdb333..e08f805942 100644 --- a/apps/files_external/ajax/addMountPoint.php +++ b/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); - -?> diff --git a/apps/files_external/ajax/removeMountPoint.php b/apps/files_external/ajax/removeMountPoint.php index a96601b4d0..aa44642620 100644 --- a/apps/files_external/ajax/removeMountPoint.php +++ b/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); - -?> diff --git a/apps/files_external/tests/amazons3.php b/apps/files_external/tests/amazons3.php index d0084c94af..b9b4cf65bd 100644 --- a/apps/files_external/tests/amazons3.php +++ b/apps/files_external/tests/amazons3.php @@ -45,6 +45,3 @@ if (!is_array($config) or !isset($config['amazons3']) or !$config['amazons3']['r } } } - -?> - diff --git a/apps/files_imageviewer/appinfo/app.php b/apps/files_imageviewer/appinfo/app.php index 6c8d8c30ca..6184585cff 100644 --- a/apps/files_imageviewer/appinfo/app.php +++ b/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' ); - -?> diff --git a/apps/files_pdfviewer/appinfo/app.php b/apps/files_pdfviewer/appinfo/app.php index c8ca2dc8d9..e4771ee517 100644 --- a/apps/files_pdfviewer/appinfo/app.php +++ b/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'); -?> diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php index e1dccb7d0f..ca63f540f9 100644 --- a/apps/files_sharing/ajax/email.php +++ b/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); - -?> diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php index 94f0890d70..ff6c29b6a0 100644 --- a/apps/files_sharing/ajax/getitem.php +++ b/apps/files_sharing/ajax/getitem.php @@ -64,5 +64,3 @@ while ($path != $userDirectory) { } OCP\JSON::success(array('data' => $item)); - -?> diff --git a/apps/files_sharing/ajax/getstatuses.php b/apps/files_sharing/ajax/getstatuses.php index 488cab13bc..1be4d9a0d9 100644 --- a/apps/files_sharing/ajax/getstatuses.php +++ b/apps/files_sharing/ajax/getstatuses.php @@ -20,5 +20,3 @@ if ($rows = OC_Share::getMySharedItems()) { } OCP\JSON::success(array('data' => $items)); - -?> diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php index 31b7a3878e..0a2cf78f76 100644 --- a/apps/files_sharing/ajax/setpermissions.php +++ b/apps/files_sharing/ajax/setpermissions.php @@ -10,5 +10,3 @@ $permissions = $_POST['permissions']; OC_Share::setPermissions($source, $uid_shared_with, $permissions); OCP\JSON::success(); - -?> diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php index f4f2172d25..3f224d1b67 100644 --- a/apps/files_sharing/ajax/share.php +++ b/apps/files_sharing/ajax/share.php @@ -35,5 +35,3 @@ foreach ($sources as $source) { } } } - -?> diff --git a/apps/files_sharing/ajax/toggleresharing.php b/apps/files_sharing/ajax/toggleresharing.php index 673f00c5d1..7da4fdfeea 100644 --- a/apps/files_sharing/ajax/toggleresharing.php +++ b/apps/files_sharing/ajax/toggleresharing.php @@ -7,5 +7,3 @@ if ($_POST['resharing'] == true) { } else { OCP\Config::setAppValue('files_sharing', 'resharing', 'no'); } - -?> diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php index 44ffdb1a5b..02a59c4016 100644 --- a/apps/files_sharing/ajax/unshare.php +++ b/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(); - -?> diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php index 0e1bf6d588..388a4844b9 100644 --- a/apps/files_sharing/ajax/userautocomplete.php +++ b/apps/files_sharing/ajax/userautocomplete.php @@ -28,5 +28,3 @@ $users[] = ""; $groups[] = ""; $users = array_merge($users, $groups); OCP\JSON::encodedPrint($users); - -?> diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php index 40a90a1530..70a5162d38 100644 --- a/apps/files_sharing/get.php +++ b/apps/files_sharing/get.php @@ -86,4 +86,3 @@ if (isset($_GET['token']) && $source = OC_Share::getSource($_GET['token'])) { $tmpl->printPage(); die(); } -?> diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php index 6e09226925..0237acfc1a 100644 --- a/apps/files_sharing/lib_share.php +++ b/apps/files_sharing/lib_share.php @@ -513,5 +513,3 @@ class OC_Share { } } - -?> diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php index 2fd24840d3..54704c942f 100644 --- a/apps/files_sharing/list.php +++ b/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(); - -?> diff --git a/apps/files_texteditor/appinfo/app.php b/apps/files_texteditor/appinfo/app.php index c745170018..1f9773bca3 100644 --- a/apps/files_texteditor/appinfo/app.php +++ b/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'); -?> diff --git a/apps/files_versions/ajax/togglesettings.php b/apps/files_versions/ajax/togglesettings.php index d513d12dd6..86f614c5c8 100644 --- a/apps/files_versions/ajax/togglesettings.php +++ b/apps/files_versions/ajax/togglesettings.php @@ -7,5 +7,3 @@ if (OCP\Config::getSystemValue('versions', 'true')=='true') { } else { OCP\Config::setSystemValue('versions', 'true'); } - -?> diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php index e3332d7cdb..b2ae8d232e 100644 --- a/apps/files_versions/history.php +++ b/apps/files_versions/history.php @@ -71,5 +71,3 @@ if ( isset( $_GET['path'] ) ) { } $tmpl->printPage( ); - -?> diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php index b43fdb9fd3..f93d4dabe2 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/hooks.php @@ -30,43 +30,41 @@ class Hooks { } } - /** - * @brief Erase versions of deleted file - * @param array - * - * This function is connected to the delete signal of OC_Filesystem - * cleanup the versions directory if the actual file gets deleted - */ - public static function remove_hook($params) { - $rel_path = $params['path']; - $abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v'; - if(Storage::isversioned($rel_path)) { - $versions = Storage::getVersions($rel_path); - foreach ($versions as $v){ - unlink($abs_path . $v['version']); - } - } - } - - /** - * @brief rename/move versions of renamed/moved files - * @param array with oldpath and newpath - * - * This function is connected to the rename signal of OC_Filesystem and adjust the name and location - * of the stored versions along the actual file - */ - public static function rename_hook($params) { - $rel_oldpath = $params['oldpath']; - $abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v'; - $abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v'; - if(Storage::isversioned($rel_oldpath)) { - $versions = Storage::getVersions($rel_oldpath); - foreach ($versions as $v){ - rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']); - } - } + /** + * @brief Erase versions of deleted file + * @param array + * + * This function is connected to the delete signal of OC_Filesystem + * cleanup the versions directory if the actual file gets deleted + */ + public static function remove_hook($params) { + $rel_path = $params['path']; + $abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_path.'.v'; + if(Storage::isversioned($rel_path)) { + $versions = Storage::getVersions($rel_path); + foreach ($versions as $v){ + unlink($abs_path . $v['version']); + } + } + } + + /** + * @brief rename/move versions of renamed/moved files + * @param array with oldpath and newpath + * + * This function is connected to the rename signal of OC_Filesystem and adjust the name and location + * of the stored versions along the actual file + */ + public static function rename_hook($params) { + $rel_oldpath = $params['oldpath']; + $abs_oldpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$rel_oldpath.'.v'; + $abs_newpath = \OCP\Config::getSystemValue('datadirectory').'/'.\OCP\User::getUser()."/versions".$params['newpath'].'.v'; + if(Storage::isversioned($rel_oldpath)) { + $versions = Storage::getVersions($rel_oldpath); + foreach ($versions as $v){ + rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']); + } + } } } - -?> diff --git a/apps/files_versions/settings.php b/apps/files_versions/settings.php index 5f9e60fc58..f2873b8f7c 100644 --- a/apps/files_versions/settings.php +++ b/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(); -?> diff --git a/apps/gallery/ajax/createAlbum.php b/apps/gallery/ajax/createAlbum.php index 61e2e9ae2e..5bfa5aa9a9 100644 --- a/apps/gallery/ajax/createAlbum.php +++ b/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'])); - -?> diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php index 7cbe3e46e2..ab8c64e28a 100644 --- a/apps/gallery/ajax/galleryOp.php +++ b/apps/gallery/ajax/galleryOp.php @@ -186,4 +186,3 @@ if ($_GET['operation']) { OCP\JSON::error(array('cause' => 'Unknown operation')); } } -?> diff --git a/apps/gallery/index.php b/apps/gallery/index.php index a891e2889f..ce79f8f878 100644 --- a/apps/gallery/index.php +++ b/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(); -?> diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php index 093979834d..3bafdb5cf4 100644 --- a/apps/gallery/lib/hooks_handlers.php +++ b/apps/gallery/lib/hooks_handlers.php @@ -38,5 +38,3 @@ class OC_Gallery_Hooks_Handlers { //TODO: implement this } } - -?> diff --git a/apps/gallery/lib/images_utils.php b/apps/gallery/lib/images_utils.php index ac3a383c97..f5e37cf1de 100644 --- a/apps/gallery/lib/images_utils.php +++ b/apps/gallery/lib/images_utils.php @@ -60,5 +60,3 @@ function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height, $tgtImg, $ imagedestroy($process); imagedestroy($myImage); } - -?> diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php index 17eb741a66..495c51ea9c 100644 --- a/apps/gallery/lib/managers.php +++ b/apps/gallery/lib/managers.php @@ -102,13 +102,12 @@ class ThumbnailsManager { } public function delete($path) { - $thumbnail = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/gallery".$path; - if (file_exists($thumbnail)) { - unlink($thumbnail); + $thumbnail = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/gallery".$path; + if (file_exists($thumbnail)) { + unlink($thumbnail); } } private function __construct() {} } -?> diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php index 5efe0d7a29..3ff06dfcbe 100644 --- a/apps/gallery/lib/tiles.php +++ b/apps/gallery/lib/tiles.php @@ -174,5 +174,3 @@ class TileStack extends TileBase { private $tiles_array; private $stack_name; } - -?> diff --git a/apps/gallery/lib/tiles_test.php b/apps/gallery/lib/tiles_test.php index 022a88f75c..02d567c628 100644 --- a/apps/gallery/lib/tiles_test.php +++ b/apps/gallery/lib/tiles_test.php @@ -83,5 +83,3 @@ if ($ts->getCount() != 0) { } echo $tl->get(); - -?> diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php index 23abc57927..7f5cdb22c1 100644 --- a/apps/media/ajax/api.php +++ b/apps/media/ajax/api.php @@ -131,4 +131,3 @@ if($arguments['action']){ exit; } } -?> diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php index 3122c7e675..c2dbf27a00 100644 --- a/apps/media/ajax/autoupdate.php +++ b/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)); -?> diff --git a/apps/media/index.php b/apps/media/index.php index fb51aa0b17..ae85abc8aa 100644 --- a/apps/media/index.php +++ b/apps/media/index.php @@ -40,5 +40,3 @@ OCP\App::setActiveNavigationEntry( 'media_index' ); $tmpl = new OCP\Template( 'media', 'music', 'user' ); $tmpl->printPage(); -?> - diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php index 255e6f468f..d35cca150b 100644 --- a/apps/media/lib_ampache.php +++ b/apps/media/lib_ampache.php @@ -419,5 +419,3 @@ class OC_MEDIA_AMPACHE{ echo(''); } } - -?> diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php index 598c08d32e..e65930f551 100644 --- a/apps/media/lib_collection.php +++ b/apps/media/lib_collection.php @@ -387,5 +387,3 @@ class OC_MEDIA_COLLECTION{ $query->execute(array($newPath,$oldPath)); } } - -?> diff --git a/apps/media/settings.php b/apps/media/settings.php index 227298fafe..53738f02f9 100644 --- a/apps/media/settings.php +++ b/apps/media/settings.php @@ -3,4 +3,3 @@ $tmpl = new OCP\Template( 'media', 'settings'); return $tmpl->fetchPage(); -?> diff --git a/apps/remoteStorage/settings.php b/apps/remoteStorage/settings.php index 9c48549fe6..3be8b0984d 100644 --- a/apps/remoteStorage/settings.php +++ b/apps/remoteStorage/settings.php @@ -4,4 +4,3 @@ require_once('lib_remoteStorage.php'); $tmpl = new OCP\Template( 'remoteStorage', 'settings'); return $tmpl->fetchPage(); -?> diff --git a/apps/user_migrate/appinfo/app.php b/apps/user_migrate/appinfo/app.php index 9d314b59ce..366c400493 100644 --- a/apps/user_migrate/appinfo/app.php +++ b/apps/user_migrate/appinfo/app.php @@ -31,4 +31,3 @@ $entry = array( 'href' => OCP\Util::linkTo( "user_migrate", "admin.php" ), 'name' => 'Import' ); -?> diff --git a/apps/user_openid/phpmyid.php b/apps/user_openid/phpmyid.php index 5aaab64285..13fd31c47c 100644 --- a/apps/user_openid/phpmyid.php +++ b/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'); -?> diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php index 392424795f..d25b95259e 100644 --- a/apps/user_openid/user.php +++ b/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'; - - -?> diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php index 6b64a7e286..e5b7f042d5 100644 --- a/apps/user_webfinger/webfinger.php +++ b/apps/user_webfinger/webfinger.php @@ -58,4 +58,3 @@ foreach($apps as $app) { } } echo "]}"; -?> diff --git a/core/ajax/grouplist.php b/core/ajax/grouplist.php index cc15102bbc..e3e92fcfa1 100644 --- a/core/ajax/grouplist.php +++ b/core/ajax/grouplist.php @@ -45,5 +45,3 @@ foreach( OC_Group::getGroups() as $i ){ } OC_JSON::encodedPrint($groups); - -?> diff --git a/core/ajax/translations.php b/core/ajax/translations.php index a6433b1964..2bd6b7ed63 100644 --- a/core/ajax/translations.php +++ b/core/ajax/translations.php @@ -29,4 +29,3 @@ $app = $_POST["app"]; $l = OC_L10N::get( $app ); OC_JSON::success(array('data' => $l->getTranslations())); -?> diff --git a/core/ajax/userlist.php b/core/ajax/userlist.php index c8168eaf46..85ca004ae6 100644 --- a/core/ajax/userlist.php +++ b/core/ajax/userlist.php @@ -44,5 +44,3 @@ foreach( OC_User::getUsers() as $i ){ } OC_JSON::encodedPrint($users); - -?> diff --git a/core/ajax/validateuser.php b/core/ajax/validateuser.php index 258bd50fca..78ec451fac 100644 --- a/core/ajax/validateuser.php +++ b/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")); } } - -?> diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php index a58489228d..e69f8bb726 100644 --- a/core/ajax/vcategories/add.php +++ b/core/ajax/vcategories/add.php @@ -39,5 +39,3 @@ if($categories->hasCategory($category)) { } OC_JSON::success(array('data' => array('categories'=>$categories->categories()))); - -?> diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php index 75def433d3..a41fa083c3 100644 --- a/core/ajax/vcategories/delete.php +++ b/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()))); - -?> diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php index 252b3d3454..3e5540cbc2 100644 --- a/core/ajax/vcategories/edit.php +++ b/core/ajax/vcategories/edit.php @@ -31,5 +31,3 @@ $categories = $vcategories->categories(); debug(print_r($categories, true)); $tmpl->assign('categories',$categories); $tmpl->printpage(); - -?> diff --git a/core/strings.php b/core/strings.php index 8c3f64ef14..01ab386608 100644 --- a/core/strings.php +++ b/core/strings.php @@ -7,4 +7,3 @@ $l->t("Users"); $l->t("Apps"); $l->t("Admin"); $l->t("Help"); -?> diff --git a/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php index a013aea165..1af262fd7a 100644 --- a/lib/MDB2/Driver/Function/sqlite3.php +++ b/lib/MDB2/Driver/Function/sqlite3.php @@ -134,4 +134,3 @@ class MDB2_Driver_Function_sqlite3 extends MDB2_Driver_Function_Common // }}} } -?> diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php index 8f4e1312eb..10255a3619 100644 --- a/lib/MDB2/Driver/Manager/sqlite3.php +++ b/lib/MDB2/Driver/Manager/sqlite3.php @@ -1360,4 +1360,3 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common // }}} } -?> diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php index 39d3fb6727..25927aff63 100644 --- a/lib/MDB2/Driver/sqlite3.php +++ b/lib/MDB2/Driver/sqlite3.php @@ -1332,5 +1332,3 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common $this->free(); } } - -?> diff --git a/lib/public/app.php b/lib/public/app.php index 9e2108818b..38c51af9cd 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -158,6 +158,3 @@ class App { } - - -?> diff --git a/lib/public/config.php b/lib/public/config.php index 9f5abe672c..ab01902ffe 100644 --- a/lib/public/config.php +++ b/lib/public/config.php @@ -134,5 +134,3 @@ class Config { } - -?> diff --git a/lib/public/db.php b/lib/public/db.php index f7564c0bb6..3a33f7674d 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -91,5 +91,3 @@ class DB { } - -?> diff --git a/lib/public/files.php b/lib/public/files.php index fc3004434b..32b3f03674 100644 --- a/lib/public/files.php +++ b/lib/public/files.php @@ -115,5 +115,3 @@ class Files { } - -?> diff --git a/lib/public/json.php b/lib/public/json.php index b6edbd65bd..1bc1e3ab4d 100644 --- a/lib/public/json.php +++ b/lib/public/json.php @@ -105,5 +105,3 @@ class JSON { } } - -?> diff --git a/lib/public/response.php b/lib/public/response.php index cc2137c5ca..8dff3bcd35 100644 --- a/lib/public/response.php +++ b/lib/public/response.php @@ -105,5 +105,3 @@ class Response { } - -?> diff --git a/lib/public/template.php b/lib/public/template.php index b89088bdd0..a0ed618cb2 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -104,6 +104,3 @@ function html_select_options($options, $selected, $params=array()) { class Template extends \OC_Template { } - - -?> diff --git a/lib/public/user.php b/lib/public/user.php index a0c069f737..713e366b96 100644 --- a/lib/public/user.php +++ b/lib/public/user.php @@ -120,6 +120,3 @@ class User { } - - -?> diff --git a/lib/public/util.php b/lib/public/util.php index 4112109154..43f9e3cee5 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -321,5 +321,3 @@ class Util { return(\OC_Helper::mb_str_replace($search, $replace, $subject, $encoding, $count)); } } - -?> diff --git a/lib/setup.php b/lib/setup.php index bad0f5301c..2f73c486c9 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -380,5 +380,3 @@ class OC_Setup { file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/index.html', ''); } } - -?> diff --git a/lib/updater.php b/lib/updater.php index 5d97178c30..332cea03bf 100644 --- a/lib/updater.php +++ b/lib/updater.php @@ -84,4 +84,3 @@ class OC_Updater{ } } -?> diff --git a/lib/vcategories.php b/lib/vcategories.php index 4e73bb18d4..d15b7b166e 100644 --- a/lib/vcategories.php +++ b/lib/vcategories.php @@ -223,4 +223,3 @@ class OC_VCategories { } } -?> diff --git a/ocs/providers.php b/ocs/providers.php index adaa28db6c..f9cafd20b0 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -40,6 +40,3 @@ echo(' '); - - -?> diff --git a/ocs/v1.php b/ocs/v1.php index 77dd75b9fc..ab0dc80f4b 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -24,5 +24,3 @@ require_once('../lib/base.php'); @ob_clean(); OC_OCS::handle(); - -?> diff --git a/search/ajax/search.php b/search/ajax/search.php index 326724d60c..95ddfedf8b 100644 --- a/search/ajax/search.php +++ b/search/ajax/search.php @@ -35,5 +35,3 @@ if($query){ }else{ echo 'false'; } - -?> diff --git a/search/index.php b/search/index.php index 518695c56d..de55aec399 100644 --- a/search/index.php +++ b/search/index.php @@ -49,5 +49,3 @@ foreach($results as $result){ $tmpl = new OC_Template( 'search', 'index', 'user' ); $tmpl->assign('resultTypes',$resultTypes); $tmpl->printPage(); - -?> diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index 604298b1cf..4ba6813517 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -23,5 +23,3 @@ if( OC_User::setPassword( $username, $password )){ else{ OC_JSON::error(array("data" => array( "message" => "Unable to change password" ))); } - -?> diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php index 3626600ad9..af8ad3dd8c 100644 --- a/settings/ajax/creategroup.php +++ b/settings/ajax/creategroup.php @@ -26,5 +26,3 @@ if( OC_Group::createGroup( $groupname )){ else{ OC_JSON::error(array("data" => array( "message" => "Unable to add group" ))); } - -?> diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php index 079b4750b7..c56df4bc15 100644 --- a/settings/ajax/createuser.php +++ b/settings/ajax/createuser.php @@ -36,5 +36,3 @@ try { } catch (Exception $exception) { OC_JSON::error(array("data" => array( "message" => $exception->getMessage()))); } - -?> diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php index 68f6b7933e..803a424854 100644 --- a/settings/ajax/lostpassword.php +++ b/settings/ajax/lostpassword.php @@ -15,5 +15,3 @@ if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMA }else{ OC_JSON::error(array("data" => array( "message" => $l->t("Invalid email") ))); } - -?> diff --git a/settings/ajax/openid.php b/settings/ajax/openid.php index 883cd52bfe..bf4ead0602 100644 --- a/settings/ajax/openid.php +++ b/settings/ajax/openid.php @@ -17,5 +17,3 @@ if( isset( $_POST['identity'] ) ){ }else{ OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") ))); } - -?> diff --git a/settings/ajax/removegroup.php b/settings/ajax/removegroup.php index 19cbe51fd5..f8c2065956 100644 --- a/settings/ajax/removegroup.php +++ b/settings/ajax/removegroup.php @@ -15,5 +15,3 @@ if( OC_Group::deleteGroup( $name )){ else{ OC_JSON::error(array("data" => array( "message" => "Unable to delete group" ))); } - -?> diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php index 63388b3ca6..230815217c 100644 --- a/settings/ajax/removeuser.php +++ b/settings/ajax/removeuser.php @@ -15,5 +15,3 @@ if( OC_User::deleteUser( $username )){ else{ OC_JSON::error(array("data" => array( "message" => "Unable to delete user" ))); } - -?> diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php index 6b8c9274e6..54b103cd4f 100644 --- a/settings/ajax/setlanguage.php +++ b/settings/ajax/setlanguage.php @@ -22,5 +22,3 @@ if( isset( $_POST['lang'] ) ){ }else{ OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") ))); } - -?> diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php index 44c2067824..2b412c0f2f 100644 --- a/settings/ajax/setquota.php +++ b/settings/ajax/setquota.php @@ -35,4 +35,3 @@ if($username){ } OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>$quota))); -?> diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php index a7cdeb2cfb..95338ed026 100644 --- a/settings/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php @@ -38,5 +38,3 @@ if( $success ){ else{ OC_JSON::error(array("data" => array( "message" => "Unable to $error group $group" ))); } - -?> diff --git a/settings/apps.php b/settings/apps.php index f4ae8b8d97..762395c031 100644 --- a/settings/apps.php +++ b/settings/apps.php @@ -97,5 +97,3 @@ $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):''); $tmpl->assign('appid',$appid); $tmpl->printPage(); - -?> diff --git a/settings/help.php b/settings/help.php index f0abed8f55..b1dc1c5be7 100644 --- a/settings/help.php +++ b/settings/help.php @@ -25,5 +25,3 @@ $tmpl->assign( "kbe", $kbe ); $tmpl->assign( "pagecount", $pagecount ); $tmpl->assign( "page", $page ); $tmpl->printPage(); - -?> diff --git a/settings/personal.php b/settings/personal.php index 26a9f601d9..d82db0d0e7 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -17,7 +17,7 @@ OC_App::setActiveNavigationEntry( 'personal' ); // calculate the disc space $rootInfo=OC_FileCache::get(''); -$sharedInfo=OC_FileCache::get('/Shared'); +$sharedInfo=OC_FileCache::get('/Shared'); $used=$rootInfo['size']-$sharedInfo['size']; $free=OC_Filesystem::free_space(); $total=$free+$used; @@ -61,5 +61,3 @@ foreach($forms as $form){ $tmpl->append('forms',$form); } $tmpl->printPage(); - -?> diff --git a/settings/users.php b/settings/users.php index 026a30a750..c3259d2a3f 100644 --- a/settings/users.php +++ b/settings/users.php @@ -48,6 +48,3 @@ $tmpl->assign( 'quota_preset', $quotaPreset); $tmpl->assign( 'default_quota', $defaultQuota); $tmpl->assign( 'share_notice', $shareNotice); $tmpl->printPage(); - -?> - diff --git a/status.php b/status.php index 2d31702ecb..f314a3a1c6 100644 --- a/status.php +++ b/status.php @@ -29,6 +29,3 @@ if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='fals $values=array('installed'=>$installed,'version'=>implode('.',OC_Util::getVersion()),'versionstring'=>OC_Util::getVersionString(),'edition'=>OC_Util::getEditionString()); echo(json_encode($values)); - - -?> diff --git a/webapps.php b/webapps.php index b5fee9bf85..82e677a51c 100644 --- a/webapps.php +++ b/webapps.php @@ -52,5 +52,3 @@ if(!OC_User::login($authuser,$authpw)){ } - -?>