From 957f674781eddc163a7162ca40335481393d5736 Mon Sep 17 00:00:00 2001 From: Pellaeon Lin Date: Mon, 13 Jul 2015 17:24:18 +0800 Subject: [PATCH 1/6] Fix# Can't use method return value in write context This would probably occur for PHP<5.5 ref: https://stackoverflow.com/a/4328049/446391 --- controller/registercontroller.php | 2 +- templates/register.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controller/registercontroller.php b/controller/registercontroller.php index 43450ef..255632d 100644 --- a/controller/registercontroller.php +++ b/controller/registercontroller.php @@ -85,7 +85,7 @@ class RegisterController extends Controller { ), 'error'); } - if ( !empty($this->config->getUsersForUserValue('settings', 'email', $email)) ) { + if ( $this->config->getUsersForUserValue('settings', 'email', $email) ) { return new TemplateResponse('', 'error', array( 'errors' => array(array( 'error' => $this->l10n->t('There is an existing user with this email'), diff --git a/templates/register.php b/templates/register.php index ef4b73c..96dfa53 100644 --- a/templates/register.php +++ b/templates/register.php @@ -25,7 +25,7 @@ if ($_['entered']): ?>
- +
  • t('Please re-enter a valid email address')); ?>
    • From bbcf4c9033797b110810759189b464ea025ba811 Mon Sep 17 00:00:00 2001 From: Pellaeon Lin Date: Mon, 13 Jul 2015 20:11:24 +0800 Subject: [PATCH 2/6] Fix# imports --- controller/registercontroller.php | 2 +- controller/settingscontroller.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/controller/registercontroller.php b/controller/registercontroller.php index 255632d..470807e 100644 --- a/controller/registercontroller.php +++ b/controller/registercontroller.php @@ -18,9 +18,9 @@ use \OCP\AppFramework\Controller; use \OCP\Util; use \OCA\Registration\Wrapper; use \OCP\IUserManager; +use \OCP\IGroupManager; use \OCP\IL10N; use \OCP\IConfig; -use \OCP\IUser; class RegisterController extends Controller { diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php index 9450573..7c60ec5 100644 --- a/controller/settingscontroller.php +++ b/controller/settingscontroller.php @@ -16,11 +16,9 @@ use \OCP\AppFramework\Http\TemplateResponse; use \OCP\AppFramework\Http\DataResponse; use \OCP\AppFramework\Http; use \OCP\AppFramework\Controller; -use \OCP\IUserManager; use \OCP\IGroupManager; use \OCP\IL10N; use \OCP\IConfig; -use \OCP\IUser; class SettingsController extends Controller { From 4c07997509edfd55c81d4ee6d25938dc11a4d3f5 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 14 Jul 2015 00:28:19 -0400 Subject: [PATCH 3/6] [tx-robot] updated from transifex --- l10n/ru.js | 1 + l10n/ru.json | 1 + l10n/ru.php | 1 + 3 files changed, 3 insertions(+) diff --git a/l10n/ru.js b/l10n/ru.js index 2bc19a7..092d256 100644 --- a/l10n/ru.js +++ b/l10n/ru.js @@ -16,6 +16,7 @@ OC.L10N.register( "Registration" : "Регистрация", "Default group that all registered users belong" : "Группа по умолчанию для всех новых пользователей", "None" : "Отсутствует", + "To create a new account on ownCloud, just click the following link:

    \n{link}" : "Для создания новой учетной записи ownCloud просто нажмите на следующую ссылку:

    \n{link}", "Welcome, you can create your account below." : "Добро пожаловать, Вы можете создать учетную запись ниже.", "Username" : "Имя пользователя", "Password" : "Пароль", diff --git a/l10n/ru.json b/l10n/ru.json index b789298..02e80d6 100644 --- a/l10n/ru.json +++ b/l10n/ru.json @@ -14,6 +14,7 @@ "Registration" : "Регистрация", "Default group that all registered users belong" : "Группа по умолчанию для всех новых пользователей", "None" : "Отсутствует", + "To create a new account on ownCloud, just click the following link:

    \n{link}" : "Для создания новой учетной записи ownCloud просто нажмите на следующую ссылку:

    \n{link}", "Welcome, you can create your account below." : "Добро пожаловать, Вы можете создать учетную запись ниже.", "Username" : "Имя пользователя", "Password" : "Пароль", diff --git a/l10n/ru.php b/l10n/ru.php index d8fbe1e..a4413d8 100644 --- a/l10n/ru.php +++ b/l10n/ru.php @@ -15,6 +15,7 @@ $TRANSLATIONS = array( "Registration" => "Регистрация", "Default group that all registered users belong" => "Группа по умолчанию для всех новых пользователей", "None" => "Отсутствует", +"To create a new account on ownCloud, just click the following link:

    \n{link}" => "Для создания новой учетной записи ownCloud просто нажмите на следующую ссылку:

    \n{link}", "Welcome, you can create your account below." => "Добро пожаловать, Вы можете создать учетную запись ниже.", "Username" => "Имя пользователя", "Password" => "Пароль", From a72edfdae601129e0e228b4ffa2bef372ad2f727 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 16 Jul 2015 00:28:20 -0400 Subject: [PATCH 4/6] [tx-robot] updated from transifex --- l10n/tr.js | 1 + l10n/tr.json | 1 + l10n/tr.php | 1 + 3 files changed, 3 insertions(+) diff --git a/l10n/tr.js b/l10n/tr.js index 325499a..983f050 100644 --- a/l10n/tr.js +++ b/l10n/tr.js @@ -16,6 +16,7 @@ OC.L10N.register( "Registration" : "Kayıt", "Default group that all registered users belong" : "Tüm kaydedilen kullanıcıların ait olduğu öntanımlı grup", "None" : "Hiçbiri", + "To create a new account on ownCloud, just click the following link:

    \n{link}" : "ownCloud üzerinde yeni bir hesap oluşturmak için, sadece şu bağlantıya tıklamanız yeterli:
    {link}", "Welcome, you can create your account below." : "Hoş geldiniz, aşağıdan hesabınızı oluşturabilirsiniz.", "Username" : "Kullanıcı Adı", "Password" : "Parola", diff --git a/l10n/tr.json b/l10n/tr.json index 52f21e9..c65bdff 100644 --- a/l10n/tr.json +++ b/l10n/tr.json @@ -14,6 +14,7 @@ "Registration" : "Kayıt", "Default group that all registered users belong" : "Tüm kaydedilen kullanıcıların ait olduğu öntanımlı grup", "None" : "Hiçbiri", + "To create a new account on ownCloud, just click the following link:

    \n{link}" : "ownCloud üzerinde yeni bir hesap oluşturmak için, sadece şu bağlantıya tıklamanız yeterli:
    {link}", "Welcome, you can create your account below." : "Hoş geldiniz, aşağıdan hesabınızı oluşturabilirsiniz.", "Username" : "Kullanıcı Adı", "Password" : "Parola", diff --git a/l10n/tr.php b/l10n/tr.php index 33f3b65..fd31ccf 100644 --- a/l10n/tr.php +++ b/l10n/tr.php @@ -15,6 +15,7 @@ $TRANSLATIONS = array( "Registration" => "Kayıt", "Default group that all registered users belong" => "Tüm kaydedilen kullanıcıların ait olduğu öntanımlı grup", "None" => "Hiçbiri", +"To create a new account on ownCloud, just click the following link:

    \n{link}" => "ownCloud üzerinde yeni bir hesap oluşturmak için, sadece şu bağlantıya tıklamanız yeterli:
    {link}", "Welcome, you can create your account below." => "Hoş geldiniz, aşağıdan hesabınızı oluşturabilirsiniz.", "Username" => "Kullanıcı Adı", "Password" => "Parola", From 291ecd22ebd74eed16fa9bb691a5d050352c54a5 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 17 Jul 2015 00:28:20 -0400 Subject: [PATCH 5/6] [tx-robot] updated from transifex --- l10n/fr.js | 1 + l10n/fr.json | 1 + l10n/fr.php | 1 + 3 files changed, 3 insertions(+) diff --git a/l10n/fr.js b/l10n/fr.js index 7c57712..3d22f68 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -16,6 +16,7 @@ OC.L10N.register( "Registration" : "Inscription", "Default group that all registered users belong" : "Groupe par défaut auquel appartiennent tous les utilisateurs", "None" : "Aucun", + "To create a new account on ownCloud, just click the following link:

    \n{link}" : "Pour créer un nouveau compte sur ownCloud, cliquez sur le lien suivant :

    \n{link}", "Welcome, you can create your account below." : "Bienvenue, vous pouvez créer votre compte ci-dessous.", "Username" : "Nom d'utilisateur", "Password" : "Mot de passe", diff --git a/l10n/fr.json b/l10n/fr.json index 09d5456..395d74a 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -14,6 +14,7 @@ "Registration" : "Inscription", "Default group that all registered users belong" : "Groupe par défaut auquel appartiennent tous les utilisateurs", "None" : "Aucun", + "To create a new account on ownCloud, just click the following link:

    \n{link}" : "Pour créer un nouveau compte sur ownCloud, cliquez sur le lien suivant :

    \n{link}", "Welcome, you can create your account below." : "Bienvenue, vous pouvez créer votre compte ci-dessous.", "Username" : "Nom d'utilisateur", "Password" : "Mot de passe", diff --git a/l10n/fr.php b/l10n/fr.php index d33d4fe..4ed7315 100644 --- a/l10n/fr.php +++ b/l10n/fr.php @@ -15,6 +15,7 @@ $TRANSLATIONS = array( "Registration" => "Inscription", "Default group that all registered users belong" => "Groupe par défaut auquel appartiennent tous les utilisateurs", "None" => "Aucun", +"To create a new account on ownCloud, just click the following link:

    \n{link}" => "Pour créer un nouveau compte sur ownCloud, cliquez sur le lien suivant :

    \n{link}", "Welcome, you can create your account below." => "Bienvenue, vous pouvez créer votre compte ci-dessous.", "Username" => "Nom d'utilisateur", "Password" => "Mot de passe", From 7b84690fe40cbdeb81badf61e2c364ad59708248 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 18 Jul 2015 00:28:19 -0400 Subject: [PATCH 6/6] [tx-robot] updated from transifex --- l10n/th_TH.js | 1 + l10n/th_TH.json | 1 + l10n/th_TH.php | 1 + 3 files changed, 3 insertions(+) diff --git a/l10n/th_TH.js b/l10n/th_TH.js index f2b49fe..61d4d32 100644 --- a/l10n/th_TH.js +++ b/l10n/th_TH.js @@ -16,6 +16,7 @@ OC.L10N.register( "Registration" : "การลงทะเบียน", "Default group that all registered users belong" : "ค่าเริ่มต้นของกลุ่มผู้ใช้ที่ลงทะเบียนเป็นสมาชิก", "None" : "ไม่มี", + "To create a new account on ownCloud, just click the following link:

    \n{link}" : "เพื่อที่จะสร้างบัญชี ownCloud ใหม่ โปรดคลิกที่ลิงค์ต่อไปนี้:

    \n{link}", "Welcome, you can create your account below." : "ยินดีต้อนรับ, คุณสามารถสร้างบัญชีของคุณด้านล่าง", "Username" : "ชื่อผู้ใช้งาน", "Password" : "รหัสผ่าน", diff --git a/l10n/th_TH.json b/l10n/th_TH.json index 582652c..5d475dc 100644 --- a/l10n/th_TH.json +++ b/l10n/th_TH.json @@ -14,6 +14,7 @@ "Registration" : "การลงทะเบียน", "Default group that all registered users belong" : "ค่าเริ่มต้นของกลุ่มผู้ใช้ที่ลงทะเบียนเป็นสมาชิก", "None" : "ไม่มี", + "To create a new account on ownCloud, just click the following link:

    \n{link}" : "เพื่อที่จะสร้างบัญชี ownCloud ใหม่ โปรดคลิกที่ลิงค์ต่อไปนี้:

    \n{link}", "Welcome, you can create your account below." : "ยินดีต้อนรับ, คุณสามารถสร้างบัญชีของคุณด้านล่าง", "Username" : "ชื่อผู้ใช้งาน", "Password" : "รหัสผ่าน", diff --git a/l10n/th_TH.php b/l10n/th_TH.php index 732d713..6426ba0 100644 --- a/l10n/th_TH.php +++ b/l10n/th_TH.php @@ -15,6 +15,7 @@ $TRANSLATIONS = array( "Registration" => "การลงทะเบียน", "Default group that all registered users belong" => "ค่าเริ่มต้นของกลุ่มผู้ใช้ที่ลงทะเบียนเป็นสมาชิก", "None" => "ไม่มี", +"To create a new account on ownCloud, just click the following link:

    \n{link}" => "เพื่อที่จะสร้างบัญชี ownCloud ใหม่ โปรดคลิกที่ลิงค์ต่อไปนี้:

    \n{link}", "Welcome, you can create your account below." => "ยินดีต้อนรับ, คุณสามารถสร้างบัญชีของคุณด้านล่าง", "Username" => "ชื่อผู้ใช้งาน", "Password" => "รหัสผ่าน",