diff options
60 files changed, 424 insertions, 264 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index ac10191618b..9f38263bef3 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -135,7 +135,7 @@ var Files = { return; } if (initStatus === '1') { // encryption tried to init but failed - OC.Notification.showHtml(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.')); + OC.Notification.show(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.')); return; } if (encryptedFiles === '1') { diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index 76fafc32650..1f69dca628d 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -1,6 +1,6 @@ <?php $TRANSLATIONS = array( -"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten var.", +"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten mevcut", "Could not move %s" => "%s taşınamadı", "File name cannot be empty." => "Dosya adı boş olamaz.", "\"%s\" is an invalid file name." => "'%s' geçersiz bir dosya adı.", diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php index bb34494a5d7..baab272d1d2 100644 --- a/apps/files_external/l10n/sl.php +++ b/apps/files_external/l10n/sl.php @@ -6,6 +6,11 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Vpisati je treba veljaven ključ programa in kodo za Dropbox", "Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive", "Saved" => "Shranjeno", +"<b>Note:</b> " => "<b>Opomba:</b> ", +" and " => "in", +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.", +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.", +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.", "External Storage" => "Zunanja podatkovna shramba", "Folder name" => "Ime mape", "External storage" => "Zunanja shramba", diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php index 2c022880019..032de8aedbc 100644 --- a/apps/user_ldap/l10n/ast.php +++ b/apps/user_ldap/l10n/ast.php @@ -1,11 +1,41 @@ <?php $TRANSLATIONS = array( +"The configuration is invalid. Please have a look at the logs for further details." => "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles.", +"No action specified" => "Nun s'especificó l'aición", +"No configuration specified" => "Nun s'especificó la configuración", +"No data specified" => "Nun s'especificaron los datos", +" Could not set configuration %s" => "Nun pudo afitase la configuración %s", "Deletion failed" => "Falló'l borráu", +"Keep settings?" => "¿Caltener los axustes?", +"Cannot add server configuration" => "Nun pue amestase la configuración del sirvidor", +"Success" => "Con ésitu", "Error" => "Fallu", -"_%s group found_::_%s groups found_" => array("",""), -"_%s user found_::_%s users found_" => array("",""), +"Configuration incorrect" => "Configuración incorreuta", +"Configuration incomplete" => "Configuración incompleta", +"Select groups" => "Esbillar grupos", +"Select attributes" => "Esbillar atributos", +"_%s group found_::_%s groups found_" => array("%s grupu alcontráu","%s grupos alcontraos"), +"_%s user found_::_%s users found_" => array("%s usuariu alcontráu","%s usuarios alcontraos"), +"Could not find the desired feature" => "Nun pudo alcontrase la carauterística deseyada", "Save" => "Guardar", +"groups found" => "grupos alcontraos", +"Users login with this attribute:" => "Aniciu de sesión d'usuarios con esti atributu:", +"LDAP Username:" => "Nome d'usuariu LDAP", +"Other Attributes:" => "Otros atributos:", +"Add Server Configuration" => "Amestar configuración del sirvidor", +"Host" => "Equipu", +"Port" => "Puertu", "Password" => "Contraseña", -"Continue" => "Continuar" +"For anonymous access, leave DN and Password empty." => "Pa un accesu anónimu, dexar el DN y la contraseña baleros.", +"users found" => "usuarios alcontraos", +"Continue" => "Continuar", +"Connection Settings" => "Axustes de conexón", +"Configuration Active" => "Configuración activa", +"When unchecked, this configuration will be skipped." => "Cuando nun tea conseñáu, saltaráse esta configuración.", +"Disable Main Server" => "Deshabilitar sirvidor principal", +"Turn off SSL certificate validation." => "Apagar la validación del certificáu SSL.", +"Directory Settings" => "Axustes del direutoriu", +"in bytes" => "en bytes", +"Internal Username" => "Nome d'usuariu internu" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/css/mobile.css b/core/css/mobile.css index 079fd2c017c..fd0628d7e28 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -7,6 +7,11 @@ background-position: right 26px; padding-right: 16px !important; } +/* do not show menu toggle on public share links as there is no menu */ +#body-public #owncloud.menutoggle { + background-image: none; + padding-right: 0 !important; +} /* compress search box on mobile, expand when focused */ .searchbox input[type="search"] { diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 7476d9f9c7c..7da6a81086c 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"), "One file conflict" => "En spor datotek", "New Files" => "Nove datoteke", +"Already existing files" => "Obstoječe datoteke", "Which files do you want to keep?" => "Katare datoteke želite ohraniti?", "If you select both versions, the copied file will have a number added to its name." => "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka.", "Cancel" => "Prekliči", diff --git a/core/setup/controller.php b/core/setup/controller.php index 1a8e9b2b764..cdbe0f7e129 100644 --- a/core/setup/controller.php +++ b/core/setup/controller.php @@ -122,7 +122,7 @@ class Controller { // Protect data directory here, so we can test if the protection is working \OC_Setup::protectDataDirectory(); try { - $htaccessWorking = \OC_Util::isHtAccessWorking(); + $htaccessWorking = \OC_Util::isHtaccessWorking(); } catch (\OC\HintException $e) { $errors[] = array( 'error' => $e->getMessage(), diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po index 3c4a00ce67c..734b55e2187 100644 --- a/l10n/ast/user_ldap.po +++ b/l10n/ast/user_ldap.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:41+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\n" +"PO-Revision-Date: 2014-04-20 22:01+0000\n" +"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,24 +40,24 @@ msgstr "" msgid "" "The configuration is invalid. Please have a look at the logs for further " "details." -msgstr "" +msgstr "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles." #: ajax/wizard.php:32 msgid "No action specified" -msgstr "" +msgstr "Nun s'especificó l'aición" #: ajax/wizard.php:38 msgid "No configuration specified" -msgstr "" +msgstr "Nun s'especificó la configuración" #: ajax/wizard.php:81 msgid "No data specified" -msgstr "" +msgstr "Nun s'especificaron los datos" #: ajax/wizard.php:89 #, php-format msgid " Could not set configuration %s" -msgstr "" +msgstr "Nun pudo afitase la configuración %s" #: js/settings.js:67 msgid "Deletion failed" @@ -68,11 +69,11 @@ msgstr "" #: js/settings.js:84 msgid "Keep settings?" -msgstr "" +msgstr "¿Caltener los axustes?" #: js/settings.js:99 msgid "Cannot add server configuration" -msgstr "" +msgstr "Nun pue amestase la configuración del sirvidor" #: js/settings.js:127 msgid "mappings cleared" @@ -80,7 +81,7 @@ msgstr "" #: js/settings.js:128 msgid "Success" -msgstr "" +msgstr "Con ésitu" #: js/settings.js:133 msgid "Error" @@ -92,15 +93,15 @@ msgstr "" #: js/settings.js:847 msgid "Configuration incorrect" -msgstr "" +msgstr "Configuración incorreuta" #: js/settings.js:856 msgid "Configuration incomplete" -msgstr "" +msgstr "Configuración incompleta" #: js/settings.js:873 js/settings.js:882 msgid "Select groups" -msgstr "" +msgstr "Esbillar grupos" #: js/settings.js:876 js/settings.js:885 msgid "Select object classes" @@ -108,7 +109,7 @@ msgstr "" #: js/settings.js:879 msgid "Select attributes" -msgstr "" +msgstr "Esbillar atributos" #: js/settings.js:906 msgid "Connection test succeeded" @@ -130,15 +131,15 @@ msgstr "" #, php-format msgid "%s group found" msgid_plural "%s groups found" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s grupu alcontráu" +msgstr[1] "%s grupos alcontraos" #: lib/wizard.php:122 #, php-format msgid "%s user found" msgid_plural "%s users found" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s usuariu alcontráu" +msgstr[1] "%s usuarios alcontraos" #: lib/wizard.php:784 lib/wizard.php:796 msgid "Invalid Host" @@ -146,7 +147,7 @@ msgstr "" #: lib/wizard.php:983 msgid "Could not find the desired feature" -msgstr "" +msgstr "Nun pudo alcontrase la carauterística deseyada" #: templates/part.settingcontrols.php:2 msgid "Save" @@ -195,15 +196,15 @@ msgstr "" #: templates/part.wizard-groupfilter.php:38 msgid "groups found" -msgstr "" +msgstr "grupos alcontraos" #: templates/part.wizard-loginfilter.php:4 msgid "Users login with this attribute:" -msgstr "" +msgstr "Aniciu de sesión d'usuarios con esti atributu:" #: templates/part.wizard-loginfilter.php:8 msgid "LDAP Username:" -msgstr "" +msgstr "Nome d'usuariu LDAP" #: templates/part.wizard-loginfilter.php:16 msgid "LDAP Email Address:" @@ -211,7 +212,7 @@ msgstr "" #: templates/part.wizard-loginfilter.php:24 msgid "Other Attributes:" -msgstr "" +msgstr "Otros atributos:" #: templates/part.wizard-loginfilter.php:38 #, php-format @@ -222,11 +223,11 @@ msgstr "" #: templates/part.wizard-server.php:18 msgid "Add Server Configuration" -msgstr "" +msgstr "Amestar configuración del sirvidor" #: templates/part.wizard-server.php:30 msgid "Host" -msgstr "" +msgstr "Equipu" #: templates/part.wizard-server.php:31 msgid "" @@ -235,7 +236,7 @@ msgstr "" #: templates/part.wizard-server.php:36 msgid "Port" -msgstr "" +msgstr "Puertu" #: templates/part.wizard-server.php:44 msgid "User DN" @@ -254,7 +255,7 @@ msgstr "Contraseña" #: templates/part.wizard-server.php:53 msgid "For anonymous access, leave DN and Password empty." -msgstr "" +msgstr "Pa un accesu anónimu, dexar el DN y la contraseña baleros." #: templates/part.wizard-server.php:60 msgid "One Base DN per line" @@ -277,7 +278,7 @@ msgstr "" #: templates/part.wizard-userfilter.php:38 msgid "users found" -msgstr "" +msgstr "usuarios alcontraos" #: templates/part.wizardcontrols.php:5 msgid "Back" @@ -302,15 +303,15 @@ msgstr "" #: templates/settings.php:20 msgid "Connection Settings" -msgstr "" +msgstr "Axustes de conexón" #: templates/settings.php:22 msgid "Configuration Active" -msgstr "" +msgstr "Configuración activa" #: templates/settings.php:22 msgid "When unchecked, this configuration will be skipped." -msgstr "" +msgstr "Cuando nun tea conseñáu, saltaráse esta configuración." #: templates/settings.php:23 msgid "Backup (Replica) Host" @@ -328,7 +329,7 @@ msgstr "" #: templates/settings.php:25 msgid "Disable Main Server" -msgstr "" +msgstr "Deshabilitar sirvidor principal" #: templates/settings.php:25 msgid "Only connect to the replica server." @@ -340,7 +341,7 @@ msgstr "" #: templates/settings.php:27 msgid "Turn off SSL certificate validation." -msgstr "" +msgstr "Apagar la validación del certificáu SSL." #: templates/settings.php:27 #, php-format @@ -359,7 +360,7 @@ msgstr "" #: templates/settings.php:30 msgid "Directory Settings" -msgstr "" +msgstr "Axustes del direutoriu" #: templates/settings.php:32 msgid "User Display Name Field" @@ -444,7 +445,7 @@ msgstr "" #: templates/settings.php:45 msgid "in bytes" -msgstr "" +msgstr "en bytes" #: templates/settings.php:46 msgid "Email Field" @@ -462,7 +463,7 @@ msgstr "" #: templates/settings.php:53 msgid "Internal Username" -msgstr "" +msgstr "Nome d'usuariu internu" #: templates/settings.php:54 msgid "" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index f867acbd3d0..9be90e0fbfc 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\n" +"PO-Revision-Date: 2014-04-20 20:53+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -246,7 +246,7 @@ msgstr "Nove datoteke" #: js/oc-dialogs.js:373 msgid "Already existing files" -msgstr "" +msgstr "Obstoječe datoteke" #: js/oc-dialogs.js:375 msgid "Which files do you want to keep?" @@ -306,12 +306,12 @@ msgstr "V souporabi" msgid "Share" msgstr "Souporaba" -#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:731 +#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734 #: templates/installation.php:10 msgid "Error" msgstr "Napaka" -#: js/share.js:160 js/share.js:787 +#: js/share.js:160 js/share.js:790 msgid "Error while sharing" msgstr "Napaka med souporabo" @@ -375,71 +375,71 @@ msgstr "Pošlji povezavo do dokumenta preko elektronske pošte:" msgid "No people found" msgstr "Ni najdenih uporabnikov" -#: js/share.js:324 js/share.js:383 +#: js/share.js:324 js/share.js:385 msgid "group" msgstr "skupina" -#: js/share.js:355 +#: js/share.js:357 msgid "Resharing is not allowed" msgstr "Nadaljnja souporaba ni dovoljena" -#: js/share.js:399 +#: js/share.js:401 msgid "Shared in {item} with {user}" msgstr "V souporabi v {item} z uporabnikom {user}" -#: js/share.js:421 +#: js/share.js:423 msgid "Unshare" msgstr "Prekliči souporabo" -#: js/share.js:429 +#: js/share.js:431 msgid "notify by email" msgstr "obvesti po elektronski pošti" -#: js/share.js:432 +#: js/share.js:434 msgid "can edit" msgstr "lahko ureja" -#: js/share.js:434 +#: js/share.js:436 msgid "access control" msgstr "nadzor dostopa" -#: js/share.js:437 +#: js/share.js:439 msgid "create" msgstr "ustvari" -#: js/share.js:440 +#: js/share.js:442 msgid "update" msgstr "posodobi" -#: js/share.js:443 +#: js/share.js:445 msgid "delete" msgstr "izbriše" -#: js/share.js:446 +#: js/share.js:448 msgid "share" msgstr "določi souporabo" -#: js/share.js:718 +#: js/share.js:721 msgid "Password protected" msgstr "Zaščiteno z geslom" -#: js/share.js:731 +#: js/share.js:734 msgid "Error unsetting expiration date" msgstr "Napaka brisanja datuma preteka" -#: js/share.js:749 +#: js/share.js:752 msgid "Error setting expiration date" msgstr "Napaka nastavljanja datuma preteka" -#: js/share.js:774 +#: js/share.js:777 msgid "Sending ..." msgstr "Pošiljanje ..." -#: js/share.js:785 +#: js/share.js:788 msgid "Email sent" msgstr "Elektronska pošta je poslana" -#: js/share.js:809 +#: js/share.js:812 msgid "Warning" msgstr "Opozorilo" diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po index 46ee2ccbc17..e50f93e901d 100644 --- a/l10n/sl/files_external.po +++ b/l10n/sl/files_external.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-09 01:55-0400\n" -"PO-Revision-Date: 2014-04-09 05:55+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\n" +"PO-Revision-Date: 2014-04-20 20:58+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,34 +42,34 @@ msgstr "Napaka nastavljanja shrambe Google Drive" msgid "Saved" msgstr "Shranjeno" -#: lib/config.php:592 +#: lib/config.php:598 msgid "<b>Note:</b> " -msgstr "" +msgstr "<b>Opomba:</b> " -#: lib/config.php:602 +#: lib/config.php:608 msgid " and " -msgstr "" +msgstr "in" -#: lib/config.php:624 +#: lib/config.php:630 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika." -#: lib/config.php:626 +#: lib/config.php:632 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika." -#: lib/config.php:628 +#: lib/config.php:634 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika." #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po index 6593ed803c0..9693bf3642a 100644 --- a/l10n/sl/lib.po +++ b/l10n/sl/lib.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-10 01:54-0400\n" -"PO-Revision-Date: 2014-04-09 06:10+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\n" +"PO-Revision-Date: 2014-04-20 20:59+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +50,7 @@ msgstr "Uporabniki" msgid "Admin" msgstr "Skrbništvo" -#: private/app.php:875 +#: private/app.php:880 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "Posodabljanje \"%s\" je spodletelo." @@ -75,7 +75,7 @@ msgstr "Prejemanje datotek v paketu ZIP je onemogočeno." msgid "Files need to be downloaded one by one." msgstr "Datoteke je mogoče prejeti le posamično." -#: private/files.php:234 private/files.php:262 +#: private/files.php:234 private/files.php:261 msgid "Back to Files" msgstr "Nazaj na datoteke" @@ -291,11 +291,11 @@ msgstr "%s je omogočil souporabo »%s«" msgid "Could not find category \"%s\"" msgstr "Kategorije \"%s\" ni mogoče najti." -#: private/template/functions.php:133 +#: private/template/functions.php:134 msgid "seconds ago" msgstr "pred nekaj sekundami" -#: private/template/functions.php:134 +#: private/template/functions.php:135 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "pred %n minuto" @@ -303,7 +303,7 @@ msgstr[1] "pred %n minutama" msgstr[2] "pred %n minutami" msgstr[3] "pred %n minutami" -#: private/template/functions.php:135 +#: private/template/functions.php:136 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "pred %n uro" @@ -311,15 +311,15 @@ msgstr[1] "pred %n urama" msgstr[2] "pred %n urami" msgstr[3] "pred %n urami" -#: private/template/functions.php:136 +#: private/template/functions.php:137 msgid "today" msgstr "danes" -#: private/template/functions.php:137 +#: private/template/functions.php:138 msgid "yesterday" msgstr "včeraj" -#: private/template/functions.php:139 +#: private/template/functions.php:140 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "pred %n dnevom" @@ -327,11 +327,11 @@ msgstr[1] "pred %n dnevoma" msgstr[2] "pred %n dnevi" msgstr[3] "pred %n dnevi" -#: private/template/functions.php:141 +#: private/template/functions.php:142 msgid "last month" msgstr "zadnji mesec" -#: private/template/functions.php:142 +#: private/template/functions.php:143 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "pred %n mesecem" @@ -339,28 +339,28 @@ msgstr[1] "pred %n mesecema" msgstr[2] "pred %n meseci" msgstr[3] "pred %n meseci" -#: private/template/functions.php:144 +#: private/template/functions.php:145 msgid "last year" msgstr "lansko leto" -#: private/template/functions.php:145 +#: private/template/functions.php:146 msgid "years ago" msgstr "let nazaj" -#: private/user/manager.php:246 +#: private/user/manager.php:232 msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "V uporabniškem imenu je dovoljeno uporabiti le znake: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" -#: private/user/manager.php:251 +#: private/user/manager.php:237 msgid "A valid username must be provided" msgstr "Navedeno mora biti veljavno uporabniško ime" -#: private/user/manager.php:255 +#: private/user/manager.php:241 msgid "A valid password must be provided" msgstr "Navedeno mora biti veljavno geslo" -#: private/user/manager.php:260 +#: private/user/manager.php:246 msgid "The username is already being used" -msgstr "" +msgstr "Vpisano uporabniško ime je že v uporabi" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index e3554a4c476..39ea1ec3292 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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.pot b/l10n/templates/files.pot index 03a8f46d180..27022f2c796 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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_encryption.pot b/l10n/templates/files_encryption.pot index 2c41f8b80e0..b4d444debae 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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 8071b5ccf54..6307ddbdadc 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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 8f4e5e93052..1bbd7419916 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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_trashbin.pot b/l10n/templates/files_trashbin.pot index d2a1456e384..1372eebdb17 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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 cafe757699a..1306b57e855 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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 277b489ea94..865c7b594ce 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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" @@ -74,7 +74,7 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: private/files.php:234 private/files.php:262 +#: private/files.php:234 private/files.php:261 msgid "Back to Files" msgstr "" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index 34d5b451d8e..e180700c127 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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" @@ -74,7 +74,7 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:234 files.php:262 +#: files.php:234 files.php:261 msgid "Back to Files" msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 5f0cf8f9e36..a9d73254860 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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 8b233aa2eb5..53f6270a730 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 36d1c1ee512..d7194035f61 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-19 01:55-0400\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\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/tr/files.po b/l10n/tr/files.po index b8465fffa99..ea746fec10f 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-17 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 06:30+0000\n" -"Last-Translator: Emre Saracoglu <emresaracoglu@live.com>\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\n" +"PO-Revision-Date: 2014-04-20 13:10+0000\n" +"Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +25,7 @@ msgstr "" #: ajax/move.php:15 #, php-format msgid "Could not move %s - File with this name already exists" -msgstr "%s taşınamadı. Bu isimde dosya zaten var." +msgstr "%s taşınamadı. Bu isimde dosya zaten mevcut" #: ajax/move.php:25 ajax/move.php:28 #, php-format diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index deb25c1af2c..768e0b1b458 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-16 01:55-0400\n" -"PO-Revision-Date: 2014-04-16 05:40+0000\n" +"POT-Creation-Date: 2014-04-21 01:55-0400\n" +"PO-Revision-Date: 2014-04-21 00:50+0000\n" "Last-Translator: volkangezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgstr "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor." #: admin/controller.php:94 msgid "" "A problem occurred while sending the e-mail. Please revisit your settings." -msgstr "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınızı tekrar ziyaret edin." +msgstr "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınıza tekrar bakın." #: admin/controller.php:99 msgid "Email sent" diff --git a/lib/base.php b/lib/base.php index 7098f480e27..83f54a8e4db 100644 --- a/lib/base.php +++ b/lib/base.php @@ -185,7 +185,6 @@ class OC { if (file_exists(self::$configDir . "/config.php") and !is_writable(self::$configDir . "/config.php") ) { - $defaults = new OC_Defaults(); if (self::$CLI) { echo "Can't write into config directory!\n"; echo "This can usually be fixed by giving the webserver write access to the config directory\n"; @@ -305,6 +304,11 @@ class OC { } } + /** + * Checks if the version requires an update and shows + * @param bool $showTemplate Whether an update screen should get shown + * @return bool|void + */ public static function checkUpgrade($showTemplate = true) { if (self::needUpgrade()) { if ($showTemplate && !OC_Config::getValue('maintenance', false)) { @@ -799,6 +803,11 @@ class OC { self::handleLogin(); } + /** + * Load a PHP file belonging to the specified application + * @param array $param The application and file to load + * @return bool Whether the file has been found (will return 404 and false if not) + */ public static function loadAppScriptFile($param) { OC_App::loadApps(); $app = $param['app']; @@ -841,6 +850,10 @@ class OC { OC_Util::displayLoginPage(array_unique($error)); } + /** + * Remove outdated and therefore invalid tokens for a user + * @param string $user + */ protected static function cleanupLoginTokens($user) { $cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15); $tokens = OC_Preferences::getKeys($user, 'login_token'); @@ -852,6 +865,10 @@ class OC { } } + /** + * Try to login a user via HTTP authentication + * @return bool|void + */ protected static function tryApacheAuth() { $return = OC_User::handleApacheAuth(); @@ -866,6 +883,10 @@ class OC { return is_null($return) ? false : true; } + /** + * Try to login a user using the remember me cookie. + * @return bool Whether the provided cookie was valid + */ protected static function tryRememberLogin() { if (!isset($_COOKIE["oc_remember_login"]) || !isset($_COOKIE["oc_token"]) @@ -907,6 +928,10 @@ class OC { return true; } + /** + * Tries to login a user using the formbased authentication + * @return bool|void + */ protected static function tryFormLogin() { if (!isset($_POST["user"]) || !isset($_POST['password'])) { return false; @@ -941,6 +966,10 @@ class OC { return true; } + /** + * Try to login a user using HTTP authentication. + * @return bool + */ protected static function tryBasicAuthLogin() { if (!isset($_SERVER["PHP_AUTH_USER"]) || !isset($_SERVER["PHP_AUTH_PW"]) @@ -959,6 +988,10 @@ class OC { } if (!function_exists('get_temp_dir')) { + /** + * Get the temporary dir to store uploaded data + * @return null|string Path to the temporary directory or null + */ function get_temp_dir() { if ($temp = ini_get('upload_tmp_dir')) return $temp; if ($temp = getenv('TMP')) return $temp; diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php index 6f9470401ed..86172b5ab71 100644 --- a/lib/l10n/sl.php +++ b/lib/l10n/sl.php @@ -67,7 +67,9 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"), "last year" => "lansko leto", "years ago" => "let nazaj", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "V uporabniškem imenu je dovoljeno uporabiti le znake: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"", "A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime", -"A valid password must be provided" => "Navedeno mora biti veljavno geslo" +"A valid password must be provided" => "Navedeno mora biti veljavno geslo", +"The username is already being used" => "Vpisano uporabniško ime je že v uporabi" ); $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"; diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php index 685809581ac..66aa039eb18 100755 --- a/lib/private/activitymanager.php +++ b/lib/private/activitymanager.php @@ -46,7 +46,7 @@ class ActivityManager implements IManager { $type, $priority); } catch (\Exception $ex) { - // TODO: log the excepetion + // TODO: log the exception } } diff --git a/lib/private/api.php b/lib/private/api.php index b3b5eb1067b..74887690952 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -127,9 +127,9 @@ class OC_API { /** * merge the returned result objects into one response * @param array $responses + * @return array|\OC_OCS_Result */ public static function mergeResponses($responses) { - $response = array(); // Sort into shipped and thirdparty $shipped = array( 'succeeded' => array(), @@ -191,7 +191,7 @@ class OC_API { // Merge the successful responses $data = array(); - foreach($responses as $app => $response) { + foreach($responses as $response) { if($response['shipped']) { $data = array_merge_recursive($response['response']->getData(), $data); } else { diff --git a/lib/private/app.php b/lib/private/app.php index c5fcad8f005..2f55b54b328 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -568,7 +568,7 @@ class OC_App{ /** * @brief Returns the navigation - * @return string + * @return array * * This function returns an array containing all entries added. The * entries are sorted by the key 'order' ascending. Additional to the keys diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php index fed6989a438..0cd6b3bc35b 100644 --- a/lib/private/appconfig.php +++ b/lib/private/appconfig.php @@ -71,6 +71,7 @@ class AppConfig implements \OCP\IAppConfig { /** * @param string $app + * @return \string[] */ private function getAppValues($app) { $appCache = $this->getAppCache($app); diff --git a/lib/private/archive.php b/lib/private/archive.php index 6f51066ddf8..a62f22cf6d7 100644 --- a/lib/private/archive.php +++ b/lib/private/archive.php @@ -10,7 +10,7 @@ abstract class OC_Archive{ /** * open any of the supported archive types * @param string $path - * @return OC_Archive + * @return OC_Archive|void */ public static function open($path) { $ext=substr($path, strrpos($path, '.')); @@ -29,6 +29,9 @@ abstract class OC_Archive{ } } + /** + * @param $source + */ abstract function __construct($source); /** * add an empty folder to the archive @@ -39,7 +42,7 @@ abstract class OC_Archive{ /** * add a file to the archive * @param string $path - * @param string source either a local file or string data + * @param string $source either a local file or string data * @return bool */ abstract function addFile($path, $source=''); diff --git a/lib/private/arrayparser.php b/lib/private/arrayparser.php index d353e486577..a5e1f6653fc 100644 --- a/lib/private/arrayparser.php +++ b/lib/private/arrayparser.php @@ -32,6 +32,7 @@ class ArrayParser { /** * @param string $string + * @return array|bool|int|null|string */ function parsePHP($string) { $string = $this->stripPHPTags($string); @@ -41,6 +42,7 @@ class ArrayParser { /** * @param string $string + * @return string */ function stripPHPTags($string) { $string = trim($string); @@ -55,6 +57,7 @@ class ArrayParser { /** * @param string $string + * @return string */ function stripAssignAndReturn($string) { $string = trim($string); @@ -67,6 +70,10 @@ class ArrayParser { return $string; } + /** + * @param string $string + * @return array|bool|int|null|string + */ function parse($string) { $string = trim($string); $string = trim($string, ';'); @@ -85,6 +92,7 @@ class ArrayParser { /** * @param string $string + * @return int */ function getType($string) { $string = strtolower($string); @@ -104,6 +112,7 @@ class ArrayParser { /** * @param string $string + * @return string */ function parseString($string) { return substr($string, 1, -1); @@ -111,6 +120,7 @@ class ArrayParser { /** * @param string $string + * @return int */ function parseNum($string) { return intval($string); @@ -118,6 +128,7 @@ class ArrayParser { /** * @param string $string + * @return bool */ function parseBool($string) { $string = strtolower($string); @@ -126,6 +137,7 @@ class ArrayParser { /** * @param string $string + * @return array */ function parseArray($string) { $body = substr($string, 5); @@ -157,6 +169,7 @@ class ArrayParser { /** * @param string $body + * @return array */ function splitArray($body) { $inSingleQuote = false;//keep track if we are inside quotes diff --git a/lib/private/files.php b/lib/private/files.php index bfe6d3c02da..152595ba697 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -231,7 +231,7 @@ class OC_Files { OC_Template::printErrorPage( $l->t('ZIP download is turned off.'), $l->t('Files need to be downloaded one by one.') - . '<br/><a href="javascript:history.back()">' . $l->t('Back to Files') . '</a>' + . '<br/><a href="'.OCP\Util::linkTo('files', 'index.php', array('dir' => $dir)).'">' . $l->t('Back to Files') . '</a>' ); exit; } @@ -258,8 +258,7 @@ class OC_Files { OC_Template::printErrorPage( $l->t('Selected files too large to generate zip file.'), $l->t('Please download the files separately in smaller chunks or kindly ask your administrator.') - .'<br/><a href="javascript:history.back()">' - . $l->t('Back to Files') . '</a>' + . '<br/><a href="'.OCP\Util::linkTo('files', 'index.php', array('dir' => $dir)).'">' . $l->t('Back to Files') . '</a>' ); exit; } diff --git a/lib/private/geo.php b/lib/private/geo.php index 7094d885af6..cd62511f0c1 100644 --- a/lib/private/geo.php +++ b/lib/private/geo.php @@ -6,15 +6,11 @@ * See the COPYING-README file. */ class OC_Geo{ - /* - * @brief returns the closest timezone to coordinates - * @param (string) $latitude - Latitude - * @param (string) $longitude - Longitude - * @return (string) $timezone - closest timezone - */ /** - * @param integer $latitude - * @param integer $longitude + * @brief returns the closest timezone to coordinates + * @param $latitude + * @param $longitude + * @return mixed Closest timezone */ public static function timezone($latitude, $longitude) { $alltimezones = DateTimeZone::listIdentifiers(); diff --git a/lib/private/group.php b/lib/private/group.php index 4c187b538af..d9f430f833b 100644 --- a/lib/private/group.php +++ b/lib/private/group.php @@ -200,6 +200,9 @@ class OC_Group { /** * @brief get a list of all groups + * @param string $search + * @param int|null $limit + * @param int|null $offset * @returns array with group names * * Returns a list with all groups @@ -225,6 +228,10 @@ class OC_Group { /** * @brief get a list of all users in a group + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset * @returns array with user ids */ public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { @@ -260,6 +267,10 @@ class OC_Group { /** * @brief get a list of all display names in a group + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset * @returns array with display names (value) and user ids(key) */ public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { diff --git a/lib/private/helper.php b/lib/private/helper.php index d5214823de9..ab1e0d38924 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -36,7 +36,7 @@ class OC_Helper { * @param array $parameters * @return * @internal param array $args with param=>value, will be appended to the returned url - * @returns the url + * @returns string the url * * Returns a url to the given app and file. */ diff --git a/lib/private/json.php b/lib/private/json.php index 34f81c3b8cf..4634d7adfea 100644 --- a/lib/private/json.php +++ b/lib/private/json.php @@ -43,8 +43,7 @@ class OC_JSON{ } /** - * @brief Check an ajax get/post call if the request token is valid. - * @return json Error msg if not valid. + * Check an ajax get/post call if the request token is valid, send json error msg if not. */ public static function callCheck() { if( !OC_Util::isCallRegistered()) { @@ -55,7 +54,7 @@ class OC_JSON{ } /** - * Check if the user is a admin, send json error msg if not + * Check if the user is a admin, send json error msg if not. */ public static function checkAdminUser() { if( !OC_User::isAdminUser(OC_User::getUser())) { diff --git a/lib/private/l10n.php b/lib/private/l10n.php index a397945b829..c7e4328161e 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -267,43 +267,18 @@ class OC_L10N implements \OCP\IL10N { $identifier = "_${text_singular}_::_${text_plural}_"; if( array_key_exists($identifier, $this->translations)) { return new OC_L10N_String( $this, $identifier, $parameters, $count ); - } - else{ + }else{ if($count === 1) { return new OC_L10N_String($this, $text_singular, $parameters, $count); - } - else{ + }else{ return new OC_L10N_String($this, $text_plural, $parameters, $count); } } } /** - * @brief Translating - * @param $textArray The text array we need a translation for - * @returns Translation or the same text - * - * Returns the translation. If no translation is found, $textArray will be - * returned. - * - * - * @deprecated deprecated since ownCloud version 5.0 - * This method will probably be removed with ownCloud 6.0 - * - * - */ - public function tA($textArray) { - OC_Log::write('core', 'DEPRECATED: the method tA is deprecated and will be removed soon.', OC_Log::WARN); - $result = array(); - foreach($textArray as $key => $text) { - $result[$key] = (string)$this->t($text); - } - return $result; - } - - /** * @brief getTranslations - * @returns Fetch all translations + * @returns array Fetch all translations * * Returns an associative array with all translations */ @@ -339,7 +314,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief get localizations - * @returns Fetch all localizations + * @returns array Fetch all localizations * * Returns an associative array with all localizations */ diff --git a/lib/private/migrate.php b/lib/private/migrate.php index 3fb3e334ea2..5bcc11b061b 100644 --- a/lib/private/migrate.php +++ b/lib/private/migrate.php @@ -69,9 +69,9 @@ class OC_Migrate{ /** * @brief exports a user, or owncloud instance - * @param optional $uid string user id of user to export if export type is user, defaults to current - * @param ootional $type string type of export, defualts to user - * @param otional $path string path to zip output folder + * @param string $uid user id of user to export if export type is user, defaults to current + * @param string $type type of export, defualts to user + * @param string $path path to zip output folder * @return string on error, path to zip on success */ public static function export( $uid=null, $type='user', $path=null ) { @@ -192,11 +192,12 @@ class OC_Migrate{ } /** - * @brief imports a user, or owncloud instance - * @param $path string path to zip - * @param optional $type type of import (user or instance) - * @param optional $uid userid of new user - */ + * @brief imports a user, or owncloud instance + * @param string $path path to zip + * @param string $type type of import (user or instance) + * @param string|null|int $uid userid of new user + * @return string + */ public static function import( $path, $type='user', $uid=null ) { $datadir = OC_Config::getValue( 'datadirectory' ); @@ -307,8 +308,8 @@ class OC_Migrate{ /** * @brief recursively deletes a directory - * @param string $dir string path of dir to delete - * $param optional $deleteRootToo bool delete the root directory + * @param string $dir path of dir to delete + * @param bool $deleteRootToo delete the root directory * @return bool */ private static function unlink_r( $dir, $deleteRootToo=true ) { @@ -406,7 +407,7 @@ class OC_Migrate{ /** * @brief generates json containing export info, and merges any data supplied - * @param optional $array array of data to include in the returned json + * @param array $array of data to include in the returned json * @return string */ static private function getExportInfo( $array=array() ) { @@ -430,8 +431,7 @@ class OC_Migrate{ /** * @brief connects to migration.db, or creates if not found - * @param $db optional path to migration.db, defaults to user data dir - * @param string $path + * @param string $path to migration.db, defaults to user data dir * @return bool whether the operation was successful */ static private function connectDB( $path=null ) { @@ -461,7 +461,7 @@ class OC_Migrate{ /** * @brief creates the tables in migration.db from an apps database.xml - * @param string $appid string id of the app + * @param string $appid id of the app * @return bool whether the operation was successful */ static private function createAppTables( $appid ) { @@ -499,7 +499,6 @@ class OC_Migrate{ /** * @brief tries to create the zip - * @param $path string path to zip destination * @return bool */ static private function createZip() { @@ -538,7 +537,7 @@ class OC_Migrate{ * @brief imports a new user * @param string $db string path to migration.db * @param $info object of migration info - * @param $uid optional uid to use + * @param string|null|int $uid uid to use * @return array of apps with import statuses, or false on failure. */ public static function importAppData( $db, $info, $uid=null ) { @@ -601,10 +600,10 @@ class OC_Migrate{ } - /* - * @brief creates a new user in the database - * @param $uid string user_id of the user to be created - * @param $hash string hash of the user to be created + /** + * creates a new user in the database + * @param string $uid user_id of the user to be created + * @param string $hash hash of the user to be created * @return bool result of user creation */ public static function createUser( $uid, $hash ) { diff --git a/lib/private/migration/content.php b/lib/private/migration/content.php index 43eba89b8d5..b0e7a4e9528 100644 --- a/lib/private/migration/content.php +++ b/lib/private/migration/content.php @@ -36,7 +36,7 @@ class OC_Migration_Content{ * @brief sets up the * @param ZipArchive $zip ZipArchive object * @param $db a database object (required for exporttype user) - * @return boolean|null + * @return bool|null */ public function __construct( $zip, $db=null ) { diff --git a/lib/private/ocs.php b/lib/private/ocs.php index bbe965ce561..211e8222145 100644 --- a/lib/private/ocs.php +++ b/lib/private/ocs.php @@ -39,6 +39,7 @@ class OC_OCS { * @return string Data or if the key is not found and no default is set it will exit with a 400 Bad request */ public static function readData($method, $key, $type = 'raw', $default = null) { + $data = false; if ($method == 'get') { if (isset($_GET[$key])) { $data = $_GET[$key]; @@ -107,19 +108,19 @@ class OC_OCS { /** - * generates the xml or json response for the API call from an multidimenional data array. - * @param string $format - * @param string $status - * @param string $statuscode - * @param string $message - * @param array $data - * @param string $tag - * @param string $tagattribute - * @param int $dimension - * @param int $itemscount - * @param int $itemsperpage - * @return string xml/json - */ + * generates the xml or json response for the API call from an multidimenional data array. + * @param string $format + * @param string $status + * @param string $statuscode + * @param string $message + * @param array $data + * @param string $tag + * @param string $tagattribute + * @param int $dimension + * @param int|string $itemscount + * @param int|string $itemsperpage + * @return string xml/json + */ private static function generateXml($format, $status, $statuscode, $message, $data=array(), $tag='', $tagattribute='', $dimension=-1, $itemscount='', $itemsperpage='') { if($format=='json') { @@ -212,6 +213,8 @@ class OC_OCS { } /** + * @param $writer + * @param $data * @param string $node */ public static function toXml($writer, $data, $node) { diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php index 68dc2c2d6ec..b0480caf028 100644 --- a/lib/private/ocsclient.php +++ b/lib/private/ocsclient.php @@ -95,7 +95,8 @@ class OC_OCSClient{ * @returns array with application data * * This function returns a list of all the applications on the OCS server - * @param integer $page + * @param $categories + * @param int $page * @param string $filter */ public static function getApplications($categories, $page, $filter) { @@ -148,6 +149,7 @@ class OC_OCSClient{ /** * @brief Get an the applications from the OCS server + * @param string $id * @returns array with application data * * This function returns an applications from the OCS server @@ -189,12 +191,13 @@ class OC_OCSClient{ } /** - * @brief Get the download url for an application from the OCS server - * @returns array with application data - * - * This function returns an download url for an applications from the OCS server - * @param integer $item - */ + * @brief Get the download url for an application from the OCS server + * @returns array with application data + * + * This function returns an download url for an applications from the OCS server + * @param string $id + * @param integer $item + */ public static function getApplicationDownload($id, $item) { if(OC_Config::getValue('appstoreenabled', true)==false) { return null; diff --git a/lib/private/preview.php b/lib/private/preview.php index 0187b4aacbb..cdf22240382 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -72,6 +72,7 @@ class Preview { * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image * @param bool $scalingUp Disable/Enable upscaling of previews + * @throws \Exception * @return mixed (bool / string) * false if thumbnail does not exist * path to thumbnail if thumbnail exists @@ -172,6 +173,9 @@ class Preview { return $this->configMaxY; } + /** + * @return false|Files\FileInfo|\OCP\Files\FileInfo + */ protected function getFileInfo() { $absPath = $this->fileView->getAbsolutePath($this->file); $absPath = Files\Filesystem::normalizePath($absPath); @@ -211,6 +215,7 @@ class Preview { /** * @brief set the the max width of the preview * @param int $maxX + * @throws \Exception * @return $this */ public function setMaxX($maxX = 1) { @@ -231,6 +236,7 @@ class Preview { /** * @brief set the the max height of the preview * @param int $maxY + * @throws \Exception * @return $this */ public function setMaxY($maxY = 1) { @@ -401,6 +407,10 @@ class Preview { return $possibleThumbnails; } + /** + * @param string $name + * @return array + */ private function getDimensionsFromFilename($name) { $size = explode('-', $name); $x = (int) $size[0]; @@ -409,6 +419,11 @@ class Preview { return array($x, $y, $aspectRatio); } + /** + * @param int $x + * @param int $y + * @return bool + */ private function unscalable($x, $y) { $maxX = $this->getMaxX(); @@ -707,6 +722,7 @@ class Preview { /** * @param string $mimeType + * @return bool */ public static function isMimeSupported($mimeType) { if (!\OC_Config::getValue('enable_previews', true)) { diff --git a/lib/private/request.php b/lib/private/request.php index 93cb322f1b3..90f7488eea5 100755 --- a/lib/private/request.php +++ b/lib/private/request.php @@ -201,6 +201,7 @@ class OC_Request { /** * @brief get Path info from request, not urldecoded + * @throws Exception * @return string Path info or false when not found */ public static function getRawPathInfo() { diff --git a/lib/private/response.php b/lib/private/response.php index 983c682bf3f..1aa5e629b8b 100644 --- a/lib/private/response.php +++ b/lib/private/response.php @@ -50,7 +50,7 @@ class OC_Response { /** * @brief Set response status - * @param $status a HTTP status code, see also the STATUS constants + * @param int $status a HTTP status code, see also the STATUS constants */ static public function setStatus($status) { $protocol = $_SERVER['SERVER_PROTOCOL']; diff --git a/lib/private/route/cachingrouter.php b/lib/private/route/cachingrouter.php index ad25372391f..6412ceb0418 100644 --- a/lib/private/route/cachingrouter.php +++ b/lib/private/route/cachingrouter.php @@ -31,7 +31,8 @@ class CachingRouter extends Router { * @return string */ public function generate($name, $parameters = array(), $absolute = false) { - $key = $name . json_encode($parameters) . $absolute; + sort($parameters); + $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . json_encode($parameters) . intval($absolute); if ($this->cache->hasKey($key)) { return $this->cache->get($key); } else { diff --git a/lib/private/search.php b/lib/private/search.php index 70d670e048e..3f540090fdd 100644 --- a/lib/private/search.php +++ b/lib/private/search.php @@ -45,7 +45,7 @@ class OC_Search{ /** * search all provider for $query - * @param string query + * @param string $query * @return array An array of OC_Search_Result's */ public static function search($query) { diff --git a/lib/private/subadmin.php b/lib/private/subadmin.php index 8cda7240ac9..5b6072987ad 100644 --- a/lib/private/subadmin.php +++ b/lib/private/subadmin.php @@ -32,8 +32,8 @@ class OC_SubAdmin{ /** * @brief add a SubAdmin - * @param $uid uid of the SubAdmin - * @param $gid gid of the group + * @param string $uid uid of the SubAdmin + * @param string $gid gid of the group * @return boolean */ public static function createSubAdmin($uid, $gid) { @@ -45,8 +45,8 @@ class OC_SubAdmin{ /** * @brief delete a SubAdmin - * @param $uid uid of the SubAdmin - * @param $gid gid of the group + * @param string $uid uid of the SubAdmin + * @param string $gid gid of the group * @return boolean */ public static function deleteSubAdmin($uid, $gid) { @@ -58,7 +58,7 @@ class OC_SubAdmin{ /** * @brief get groups of a SubAdmin - * @param $uid uid of the SubAdmin + * @param string $uid uid of the SubAdmin * @return array */ public static function getSubAdminsGroups($uid) { @@ -73,7 +73,7 @@ class OC_SubAdmin{ /** * @brief get SubAdmins of a group - * @param $gid gid of the group + * @param string $gid gid of the group * @return array */ public static function getGroupsSubAdmins($gid) { @@ -102,8 +102,8 @@ class OC_SubAdmin{ /** * @brief checks if a user is a SubAdmin of a group - * @param $uid uid of the subadmin - * @param $gid gid of the group + * @param string $uid uid of the subadmin + * @param string $gid gid of the group * @return bool */ public static function isSubAdminofGroup($uid, $gid) { @@ -118,7 +118,7 @@ class OC_SubAdmin{ /** * @brief checks if a user is a SubAdmin - * @param $uid uid of the subadmin + * @param string $uid uid of the subadmin * @return bool */ public static function isSubAdmin($uid) { @@ -138,8 +138,8 @@ class OC_SubAdmin{ /** * @brief checks if a user is a accessible by a subadmin - * @param $subadmin uid of the subadmin - * @param $user uid of the user + * @param string $subadmin uid of the subadmin + * @param string $user uid of the user * @return bool */ public static function isUserAccessible($subadmin, $user) { diff --git a/lib/private/template.php b/lib/private/template.php index 610d5fbc8e5..3d18b52bac9 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -136,6 +136,7 @@ class OC_Template extends \OC\Template\Base { * @param string $theme * @param string $app * @param string $fext + * @return array */ protected function findTemplate($theme, $app, $name, $fext) { // Check if it is a app template or not. @@ -232,7 +233,7 @@ class OC_Template extends \OC\Template\Base { * @brief Shortcut to print a simple page for guests * @param string $application The application we render the template for * @param string $name Name of the template - * @param string $parameters Parameters for the template + * @param array|string $parameters Parameters for the template * @return bool */ public static function printGuestPage( $application, $name, $parameters = array() ) { @@ -261,7 +262,6 @@ class OC_Template extends \OC\Template\Base { * print error page using Exception details * @param Exception $exception */ - public static function printExceptionErrorPage(Exception $exception) { $error_msg = $exception->getMessage(); if ($exception->getCode()) { diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 0c0c8d9c8d7..b7ac02a753d 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -1,8 +1,6 @@ <?php use Assetic\Asset\AssetCollection; use Assetic\Asset\FileAsset; -use Assetic\Asset\GlobAsset; -use Assetic\AssetManager; use Assetic\AssetWriter; use Assetic\Filter\CssRewriteFilter; @@ -99,6 +97,10 @@ class OC_TemplateLayout extends OC_Template { } } + /** + * @param $styles + * @return array + */ static public function findStylesheetFiles($styles) { // Read the selected theme from the config file $theme = OC_Util::getTheme(); @@ -113,6 +115,10 @@ class OC_TemplateLayout extends OC_Template { return $locator->getResources(); } + /** + * @param $scripts + * @return array + */ static public function findJavascriptFiles($scripts) { // Read the selected theme from the config file $theme = OC_Util::getTheme(); @@ -168,6 +174,10 @@ class OC_TemplateLayout extends OC_Template { $this->append('cssfiles', OC_Helper::linkTo('assets', "$cssHash.css")); } + /** + * @param $files + * @return string + */ private static function hashScriptNames($files) { $files = array_map(function ($item) { diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index c28e6a7cb4c..a56b0fe3378 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -95,6 +95,7 @@ class URLGenerator implements IURLGenerator { * @brief Creates path to an image * @param string $app app * @param string $image image name + * @throws \RuntimeException If the image does not exist * @return string the url * * Returns the path to the image. diff --git a/lib/private/user.php b/lib/private/user.php index dc4c7ec3b61..7106d664aca 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -37,6 +37,10 @@ * logout() */ class OC_User { + + /** + * @return \OC\User\Session + */ public static function getUserSession() { return OC::$server->getUserSession(); } @@ -220,8 +224,8 @@ class OC_User { /** * @brief Try to login a user - * @param $uid The username of the user to log in - * @param $password The password of the user + * @param string $uid The username of the user to log in + * @param string $password The password of the user * @return boolean|null * * Log in a user and regenerate a new session - if the password is ok @@ -291,6 +295,8 @@ class OC_User { /** * @brief Sets user display name for session * @param string $uid + * @param null $displayName + * @return bool Whether the display name could get set */ public static function setDisplayName($uid, $displayName = null) { if (is_null($displayName)) { @@ -514,6 +520,7 @@ class OC_User { * @returns array with all uids * * Get a list of all users. + * @param string $search * @param integer $limit * @param integer $offset */ diff --git a/lib/private/util.php b/lib/private/util.php index e20de308e87..e6aa7b061b5 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -87,7 +87,9 @@ class OC_Util { } /** + * Get the quota of a user * @param string $user + * @return int Quota bytes */ public static function getUserQuota($user){ $config = \OC::$server->getConfig(); @@ -301,8 +303,6 @@ class OC_Util { return $errors; } - $defaults = new \OC_Defaults(); - $webServerRestart = false; //check for database drivers if(!(is_callable('sqlite_open') or class_exists('SQLite3')) @@ -598,11 +598,11 @@ class OC_Util { } /** - * @return void + * @param array $errors */ public static function displayLoginPage($errors = array()) { $parameters = array(); - foreach( $errors as $key => $value ) { + foreach( $errors as $value ) { $parameters[$value] = true; } if (!empty($_POST['user'])) { @@ -827,12 +827,13 @@ class OC_Util { } /** - * @brief Check if the htaccess file is working + * @brief Check if the .htaccess file is working + * @throws OC\HintException If the testfile can't get written. * @return bool - * @description Check if the htaccess file is working by creating a test + * @description Check if the .htaccess file is working by creating a test * file in the data directory and trying to access via http */ - public static function isHtAccessWorking() { + public static function isHtaccessWorking() { if (!\OC_Config::getValue("check_for_working_htaccess", true)) { return true; } diff --git a/lib/private/vobject.php b/lib/private/vobject.php index 267176ebc07..a3e9f7ef790 100644 --- a/lib/private/vobject.php +++ b/lib/private/vobject.php @@ -36,8 +36,8 @@ class OC_VObject{ /** * @brief Parses the VObject - * @param string VObject as string - * @returns Sabre_VObject or null + * @param string $data VObject as string + * @returns Sabre\VObject\Reader|null */ public static function parse($data) { try { @@ -55,7 +55,7 @@ class OC_VObject{ /** * @brief Escapes semicolons - * @param string $value + * @param array $value * @return string */ public static function escapeSemicolons($value) { @@ -88,7 +88,7 @@ class OC_VObject{ } /** - * Constuctor + * Constructor * @param Sabre\VObject\Component or string */ public function __construct($vobject_or_name) { @@ -99,6 +99,11 @@ class OC_VObject{ } } + /** + * @todo Write documentation + * @param $item + * @param null $itemValue + */ public function add($item, $itemValue = null) { if ($item instanceof OC_VObject) { $item = $item->getVObject(); @@ -110,8 +115,8 @@ class OC_VObject{ * @brief Add property to vobject * @param object $name of property * @param object $value of property - * @param object $parameters of property - * @returns Sabre_VObject_Property newly created + * @param array|object $parameters of property + * @returns Sabre\VObject\Property newly created */ public function addProperty($name, $value, $parameters=array()) { if(is_array($value)) { @@ -131,6 +136,11 @@ class OC_VObject{ $this->vobject->add('UID', $uid); } + /** + * @todo Write documentation + * @param mixed $name + * @param string $string + */ public function setString($name, $string) { if ($string != '') { $string = strtr($string, array("\r\n"=>"\n")); @@ -145,7 +155,7 @@ class OC_VObject{ * When $datetime is set to 'now', use the current time * When $datetime is null, unset the property * - * @param string property name + * @param string $name * @param DateTime $datetime * @param int $dateType * @return void @@ -163,12 +173,22 @@ class OC_VObject{ } } + /** + * @todo Write documentation + * @param $name + * @return string + */ public function getAsString($name) { return $this->vobject->__isset($name) ? $this->vobject->__get($name)->value : ''; } + /** + * @todo Write documentation + * @param $name + * @return array + */ public function getAsArray($name) { $values = array(); if ($this->vobject->__isset($name)) { @@ -178,6 +198,11 @@ class OC_VObject{ return $values; } + /** + * @todo Write documentation + * @param $name + * @return array|OC_VObject|\Sabre\VObject\Property + */ public function &__get($name) { if ($name == 'children') { return $this->vobject->children; @@ -189,18 +214,38 @@ class OC_VObject{ return $return; } + /** + * @todo Write documentation + * @param string $name + * @param string $value + */ public function __set($name, $value) { return $this->vobject->__set($name, $value); } + /** + * @todo Write documentation + * @param string $name + */ public function __unset($name) { return $this->vobject->__unset($name); } + /** + * @todo Write documentation + * @param string $name + * @return bool + */ public function __isset($name) { return $this->vobject->__isset($name); } + /** + * @todo Write documentation + * @param $function + * @param $arguments + * @return mixed + */ public function __call($function, $arguments) { return call_user_func_array(array($this->vobject, $function), $arguments); } diff --git a/lib/public/util.php b/lib/public/util.php index f02213f2446..f06ddd66641 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -57,7 +57,7 @@ class Util { * @param string $mailtext * @param string $fromaddress * @param string $fromname - * @param bool $html + * @param int $html * @param string $altbody * @param string $ccaddress * @param string $ccname @@ -85,7 +85,7 @@ class Util { * write exception into the log. Include the stack trace * if DEBUG mode is enabled * @param string $app app name - * @param Exception $ex exception to log + * @param \Exception $ex exception to log */ public static function logException( $app, \Exception $ex ) { $class = get_class($ex); @@ -156,6 +156,7 @@ class Util { * formats a timestamp in the "right" way * @param int $timestamp $timestamp * @param bool $dateOnly option to omit time from the result + * @return string timestamp */ public static function formatDate( $timestamp, $dateOnly=false) { return(\OC_Util::formatDate( $timestamp, $dateOnly )); @@ -203,9 +204,8 @@ class Util { * Creates an url using a defined route * @param $route * @param array $parameters - * @return * @internal param array $args with param=>value, will be appended to the returned url - * @return the url + * @return string the url */ public static function linkToRoute( $route, $parameters = array() ) { return \OC_Helper::linkToRoute($route, $parameters); @@ -284,8 +284,7 @@ class Util { /** * Returns the request uri, even if the website uses one or more reverse proxies - * - * @return the request uri + * @return string the request uri */ public static function getRequestUri() { return(\OC_Request::requestUri()); @@ -293,8 +292,7 @@ class Util { /** * Returns the script name, even if the website uses one or more reverse proxies - * - * @return the script name + * @returns string the script name */ public static function getScriptName() { return(\OC_Request::scriptName()); @@ -350,7 +348,7 @@ class Util { * Emits a signal. To get data from the slot use references! * @param string $signalclass class name of emitter * @param string $signalname name of signal - * @param string $params defautl: array() array with additional data + * @param array $params default: array() array with additional data * @return bool true if slots exists or false if not * * TODO: write example @@ -467,9 +465,8 @@ class Util { /** * Calculate free space left within user quota - * - * @param $dir the current folder where the user currently operates - * @return number of bytes representing + * @param string $dir the current folder where the user currently operates + * @return int number of bytes representing */ public static function freeSpace($dir) { return \OC_Helper::freeSpace($dir); diff --git a/settings/admin.php b/settings/admin.php index e75ca940ae6..bce18b7cf6a 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -14,7 +14,7 @@ OC_App::setActiveNavigationEntry( "admin" ); $tmpl = new OC_Template( 'settings', 'admin', 'user'); $forms=OC_App::getForms('admin'); -$htaccessworking=OC_Util::isHtAccessWorking(); +$htaccessworking=OC_Util::isHtaccessWorking(); $entries=OC_Log_Owncloud::getEntries(3); $entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3; diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index fa163ed137d..4fdd08b2c4a 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -4,7 +4,7 @@ $TRANSLATIONS = array( "Saved" => "Kaydedildi", "test email settings" => "e-posta ayarlarını sına", "If you received this email, the settings seem to be correct." => "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.", -"A problem occurred while sending the e-mail. Please revisit your settings." => "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınızı tekrar ziyaret edin.", +"A problem occurred while sending the e-mail. Please revisit your settings." => "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınıza tekrar bakın.", "Email sent" => "E-posta gönderildi", "You need to set your user email before being able to send test emails." => "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.", "Send mode" => "Gönderme kipi", diff --git a/status.php b/status.php index 861eaed9cd2..4e423560aa7 100644 --- a/status.php +++ b/status.php @@ -34,7 +34,7 @@ try { if (OC::$CLI) { print_r($values); } else { - echo(json_encode($values)); + print_unescaped(json_encode($values)); } } catch (Exception $ex) { diff --git a/version.php b/version.php index 5e5fa22cf8b..079af525454 100644 --- a/version.php +++ b/version.php @@ -1,6 +1,8 @@ <?php -// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number. +// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades +// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel +// when updating major/minor version number. $OC_Version=array(6, 90, 0, 2); // The human readable string |