no more require_once()

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 0770bca018d59f0a4fa8656048c8d9ab5e67fe1a..ebc09e789614aee02d796a351274cd3514de2c88 100644 (file)
--- 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 8a5e993b1d022221b5ae0228489a8b9f94fd408d..91c0f16c1f692069976fdfff2d3652eed2892c6b 100644 (file)
--- 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 1868bc4ba7707078f5efb2cc03f1c5b7403910fe..9a4b5c6dd2bdfdf8ba67b83e509d30a85f99e129 100644 (file)
--- 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 9ac7f6d5cde7eae86a90c09ece79dc1e9277e849..746f89a81391dba71f0bd44020bbd8cae4bf23ba 100644 (file)
--- 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 ebadcf30b6ce973935908857605730c07c98cc59..3ab323becce5360372cfd026f2c34255ad2e6603 100755 (executable)
--- 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 329879e864cc87226d316bd1d71c3d231ce89254..d59cc85eb819bda70785c956435809df7163c2ed 100644 (file)
--- 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 9d519c1a517bff69bb8f65ba59997753d1c9392f..44a43dfd40bbbfe1d3f3f106fd44d5320efac4d4 100644 (file)
--- 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 460fd2df782807f2b7ed7b2a382c00606c8f3d75..99b6ae69c3bccc2270b9d1c0dc75fb79d13f5185 100644 (file)
--- 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 de03296ccbbf059c2b9316058d391cd7e421a59e..adca26e6ea3b6d089768c5808a8da91e2039b040 100644 (file)
--- 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 e1ab849fe353bb0a0ba8702919af549e0dc1264f..160cb143db53a973262374ad47646aa4b9d078c6 100644 (file)
--- 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 61a011e4e32b1d4fad587c7929d57e92c4130257..be0aedd0b895044e067d4b08843396045305144c 100644 (file)
--- 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 82f5c27fdddcc72da856bcb1a38e1ec6164bb873..cfbef6875d2dd074621d42e8c3ea3c95d34ec8c0 100644 (file)
--- 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 7c8028eff731bac7f55710577948c53eaf364635..f506265f120d91fa325e5249fe98de94f9b3b2d9 100644 (file)
--- 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 b33a2245ac2ee63c33c1d57a488b4efbba3b4163..403d1173b375e34337fc866f92b44da4c453aa36 100644 (file)
--- 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 66c68b93778c936048fff36a7d48166d4744aeb6..673706e518c4ada993117c3cf61d50f784eca3e4 100644 (file)
--- 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 790bd0e747b2bd09e96c9b7c9f7e6c03addfbd3e..235a106e183df49f3089afe9a30135a8a48c3ccf 100644 (file)
--- 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 10255a3619a08543c3d73fdecdbdf4990e9425cb..0101f8ee2aba897e65854ab917b343682dfe25a4 100644 (file)
--- 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 e5c758e3503a4cbbd11e440aeb116d9aaf396403..36626478ce81d9be4918c2a699457c871cf0bee8 100644 (file)
--- 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 327329f9d91228e05deaf3ccca62a8a567c71226..c69970467f588996b6923fbf7a3c934bb2853166 100644 (file)
--- 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 fc9aebfda3be3178090f2f1b5462234787448117..15e91158e1c056671add71515484cbf58d9ae29a 100644 (file)
--- 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 7d7169c4e466f3b89836208a6f4b7a5d86863129..b3ef00cbf6d956220120609cf2b1f6d60964db97 100644 (file)
--- 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 110935ea3b736048a011a32fb37e66f4953bb4c9..0f1435fde4522a89114421e6be111ae5f8ca1f5f 100644 (file)
--- 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 0f5cb7e5577f4bec2659bda44cf1de735cc87fb5..97d54c8fb9766882018627d6f572cf8590b9bd3e 100644 (file)
--- 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 95ddfedf8ba7b044495177c5ff69c237a0e716e6..b524993d24f357b2d21fb4220b80e1004ed7b69e 100644 (file)
--- 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 8788de940b385e10537d4a5767c91a3ace66dda1..351c8a3fff123f57a5c3d27648ac2dc96c53abc8 100755 (executable)
--- 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 cc00698870702faf8482361dbc52c83fd0f8f4c5..977a536af215d084e39584a50dd3d8c89f4ceea1 100644 (file)
--- 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 fe3922fa02b7f90b75ce0442b04ce696fa77b206..b9cf6a13670733a7bb76674a09f51db4a5a1c463 100644 (file)
--- 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 42db8450302c8e34001065a5a48ab416b8638b7e..82bb6ac45f3cab88296eae30ad459b1fd4fd5aba 100644 (file)
--- 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 c138a51a6518829b38a934757c8107ada73f089b..22481f1a54a97a4fb297ccaeaa6f66fb4ae23496 100644 (file)
--- 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 615c9e3c7e23cb8ce184f6c3085eff0bc0093334..b61d8aeac2c2f17e77a933a6b20618a6806814ac 100644 (file)
--- 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{