From ebb28412ca47889019aa4c0f278fe3b9097996f8 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 5 Sep 2012 23:28:59 +0200
Subject: [PATCH] no more require_once()
---
apps/files_encryption/lib/crypt.php | 2 +-
apps/files_external/lib/smb.php | 2 +-
apps/files_external/lib/swift.php | 2 +-
apps/files_versions/appinfo/app.php | 2 +-
apps/user_webdavauth/appinfo/app.php | 2 +-
l10n/templates/core.pot | 6 +---
l10n/templates/files.pot | 44 +++++++++++++++-------------
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 2 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 2 +-
lib/MDB2/Driver/Datatype/sqlite3.php | 2 +-
lib/MDB2/Driver/Function/sqlite3.php | 2 +-
lib/MDB2/Driver/Manager/sqlite3.php | 2 +-
lib/MDB2/Driver/Reverse/sqlite3.php | 2 +-
lib/filesystem.php | 2 +-
lib/mail.php | 2 +-
lib/migrate.php | 4 +--
lib/minimizer/css.php | 2 +-
lib/minimizer/js.php | 2 +-
search/ajax/search.php | 2 +-
settings/admin.php | 2 +-
settings/ajax/disableapp.php | 2 +-
settings/ajax/enableapp.php | 2 +-
settings/ajax/togglesubadmins.php | 2 +-
tests/lib/archive/tar.php | 2 +-
tests/lib/archive/zip.php | 2 +-
30 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 0770bca018..ebc09e7896 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -31,7 +31,7 @@
// - IMPORTANT! Check if the block lenght of the encrypted data stays the same
-require_once('Crypt_Blowfish/Blowfish.php');
+require_once 'Crypt_Blowfish/Blowfish.php';
/**
* This class is for crypting and decrypting
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 8a5e993b1d..91c0f16c1f 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-require_once('smb4php/smb.php');
+require_once 'smb4php/smb.php';
class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
private $password;
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 1868bc4ba7..9a4b5c6dd2 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-require_once('php-cloudfiles/cloudfiles.php');
+require_once 'php-cloudfiles/cloudfiles.php';
class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
private $host;
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 9ac7f6d5cd..746f89a813 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -1,6 +1,6 @@
<?php
-//require_once('files_versions/versions.php');
+//require_once 'files_versions/versions.php';
OC::$CLASSPATH['OCA_Versions\Storage'] = 'apps/files_versions/lib/versions.php';
OC::$CLASSPATH['OCA_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php';
diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
index ebadcf30b6..3ab323becc 100755
--- a/apps/user_webdavauth/appinfo/app.php
+++ b/apps/user_webdavauth/appinfo/app.php
@@ -21,7 +21,7 @@
*
*/
-require_once('apps/user_webdavauth/user_webdavauth.php');
+require_once 'apps/user_webdavauth/user_webdavauth.php';
OC_APP::registerAdmin('user_webdavauth','settings');
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 329879e864..d59cc85eb8 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,10 +29,6 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/jquery-ui-1.8.16.custom.min.js:511
-msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-msgstr ""
-
#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
msgid "Settings"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 9d519c1a51..44a43dfd40 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,31 +55,35 @@ msgstr ""
msgid "Delete"
msgstr ""
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
msgid "already exists"
msgstr ""
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
msgid "replace"
msgstr ""
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
msgid "cancel"
msgstr ""
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
msgid "replaced"
msgstr ""
-#: js/filelist.js:195
-msgid "with"
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+msgid "undo"
msgstr ""
-#: js/filelist.js:195 js/filelist.js:246
-msgid "undo"
+#: js/filelist.js:237
+msgid "with"
msgstr ""
-#: js/filelist.js:246
+#: js/filelist.js:271
msgid "deleted"
msgstr ""
@@ -95,44 +99,44 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
msgid "Pending"
msgstr ""
-#: js/files.js:341
+#: js/files.js:355
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:409
+#: js/files.js:423
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:480
+#: js/files.js:493
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
msgid "Size"
msgstr ""
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
msgid "Modified"
msgstr ""
-#: js/files.js:754
+#: js/files.js:774
msgid "folder"
msgstr ""
-#: js/files.js:756
+#: js/files.js:776
msgid "folders"
msgstr ""
-#: js/files.js:764
+#: js/files.js:784
msgid "file"
msgstr ""
-#: js/files.js:766
+#: js/files.js:786
msgid "files"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 460fd2df78..99b6ae69c3 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index de03296ccb..adca26e6ea 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index e1ab849fe3..160cb143db 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 61a011e4e3..be0aedd0b8 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 82f5c27fdd..cfbef6875d 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 7c8028eff7..f506265f12 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"POT-Creation-Date: 2012-09-05 22:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index b33a2245ac..403d1173b3 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/MDB2/Driver/Datatype/sqlite3.php b/lib/MDB2/Driver/Datatype/sqlite3.php
index 66c68b9377..673706e518 100644
--- a/lib/MDB2/Driver/Datatype/sqlite3.php
+++ b/lib/MDB2/Driver/Datatype/sqlite3.php
@@ -20,7 +20,7 @@
*
*/
-require_once('MDB2/Driver/Datatype/Common.php');
+require_once 'MDB2/Driver/Datatype/Common.php';
/**
* MDB2 SQLite driver
diff --git a/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php
index 790bd0e747..235a106e18 100644
--- a/lib/MDB2/Driver/Function/sqlite3.php
+++ b/lib/MDB2/Driver/Function/sqlite3.php
@@ -20,7 +20,7 @@
*
*/
-require_once('MDB2/Driver/Function/Common.php');
+require_once 'MDB2/Driver/Function/Common.php';
/**
* MDB2 SQLite driver for the function modules
diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index 10255a3619..0101f8ee2a 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -20,7 +20,7 @@
*
*/
-require_once('MDB2/Driver/Manager/Common.php');
+require_once 'MDB2/Driver/Manager/Common.php';
/**
* MDB2 SQLite driver for the management modules
diff --git a/lib/MDB2/Driver/Reverse/sqlite3.php b/lib/MDB2/Driver/Reverse/sqlite3.php
index e5c758e350..36626478ce 100644
--- a/lib/MDB2/Driver/Reverse/sqlite3.php
+++ b/lib/MDB2/Driver/Reverse/sqlite3.php
@@ -20,7 +20,7 @@
*
*/
-require_once('MDB2/Driver/Reverse/Common.php');
+require_once 'MDB2/Driver/Reverse/Common.php';
/**
* MDB2 SQlite driver for the schema reverse engineering module
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 327329f9d9..c69970467f 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -559,4 +559,4 @@ OC_Hook::connect('OC_Filesystem','post_delete','OC_Filesystem','removeETagHook')
OC_Hook::connect('OC_Filesystem','post_rename','OC_Filesystem','removeETagHook');
OC_Util::setupFS();
-require_once('filecache.php');
+require_once 'filecache.php';
diff --git a/lib/mail.php b/lib/mail.php
index fc9aebfda3..15e91158e1 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -12,7 +12,7 @@
* A class to handle mail sending.
*/
-require_once('class.phpmailer.php');
+require_once 'class.phpmailer.php';
class OC_Mail {
diff --git a/lib/migrate.php b/lib/migrate.php
index 7d7169c4e4..b3ef00cbf6 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -376,7 +376,7 @@ class OC_Migrate{
// Connect if this did not happen before
if( !self::$schema ){
- require_once('MDB2/Schema.php');
+ require_once 'MDB2/Schema.php';
self::$schema=MDB2_Schema::factory( self::$MDB2 );
}
@@ -471,7 +471,7 @@ class OC_Migrate{
}
// Already connected
if(!self::$MDB2){
- require_once('MDB2.php');
+ require_once 'MDB2.php';
$datadir = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 110935ea3b..0f1435fde4 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -1,6 +1,6 @@
<?php
-require_once('mediawiki/CSSMin.php');
+require_once 'mediawiki/CSSMin.php';
class OC_Minimizer_CSS extends OC_Minimizer
{
diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php
index 0f5cb7e557..97d54c8fb9 100644
--- a/lib/minimizer/js.php
+++ b/lib/minimizer/js.php
@@ -1,6 +1,6 @@
<?php
-require_once('mediawiki/JavaScriptMinifier.php');
+require_once 'mediawiki/JavaScriptMinifier.php';
class OC_Minimizer_JS extends OC_Minimizer
{
diff --git a/search/ajax/search.php b/search/ajax/search.php
index 95ddfedf8b..b524993d24 100644
--- a/search/ajax/search.php
+++ b/search/ajax/search.php
@@ -23,7 +23,7 @@
// Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
// Check if we are a user
OC_JSON::checkLoggedIn();
diff --git a/settings/admin.php b/settings/admin.php
index 8788de940b..351c8a3fff 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -5,7 +5,7 @@
* See the COPYING-README file.
*/
-require_once('../lib/base.php');
+require_once '../lib/base.php';
OC_Util::checkAdminUser();
OC_Util::addStyle( "settings", "settings" );
diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php
index cc00698870..977a536af2 100644
--- a/settings/ajax/disableapp.php
+++ b/settings/ajax/disableapp.php
@@ -1,6 +1,6 @@
<?php
// Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
OC_JSON::checkAdminUser();
OCP\JSON::callCheck();
OC_JSON::setContentTypeHeader();
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index fe3922fa02..b9cf6a1367 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
OC_JSON::checkAdminUser();
OCP\JSON::callCheck();
OC_JSON::setContentTypeHeader();
diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
index 42db845030..82bb6ac45f 100644
--- a/settings/ajax/togglesubadmins.php
+++ b/settings/ajax/togglesubadmins.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
OC_JSON::checkAdminUser();
OCP\JSON::callCheck();
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index c138a51a65..22481f1a54 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-require_once('archive.php');
+require_once 'archive.php';
if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')){
class Test_Archive_TAR extends Test_Archive{
diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php
index 615c9e3c7e..b61d8aeac2 100644
--- a/tests/lib/archive/zip.php
+++ b/tests/lib/archive/zip.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-require_once('archive.php');
+require_once 'archive.php';
if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')){
class Test_Archive_ZIP extends Test_Archive{
--
GitLab