13 files changed, 113 insertions, 26 deletions
diff --git a/settings/admin.php b/settings/admin.php
index cf37726189b..65deed6b883 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -38,7 +38,7 @@ $tmpl->assign('mail_smtppassword', OC_Config::getValue( "mail_smtppassword", ''
 $tmpl->assign('entries', $entries);
 $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking', $htaccessworking);
-$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
+$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : 'disabled');
 $tmpl->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
 $tmpl->assign('isPhpCharSetUtf8', OC_Util::isPhpCharSetUtf8());
 $tmpl->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking());
diff --git a/settings/ajax/excludegroups.php b/settings/ajax/excludegroups.php
index 2934a448a6a..c3488c5bae7 100644
--- a/settings/ajax/excludegroups.php
+++ b/settings/ajax/excludegroups.php
@@ -1,5 +1,5 @@
 <?php
-OC_JSON::checkSubAdminUser();
+OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
 $selectedGroups = isset($_POST["selectedGroups"]) ? json_decode($_POST["selectedGroups"]) : array();
diff --git a/settings/ajax/geteveryonecount.php b/settings/ajax/geteveryonecount.php
new file mode 100644
index 00000000000..54fbd6e2fbd
--- /dev/null
+++ b/settings/ajax/geteveryonecount.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Clark Tomlinson
+ * @copyright 2014 Clark Tomlinson <clark@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+OC_JSON::callCheck();
+OC_JSON::checkSubAdminUser();
+
+$userCount = 0;
+
+$currentUser = \OC::$server->getUserSession()->getLoginName();
+
+if (!OC_User::isAdminUser($currentUser)) {
+	$groups = OC_SubAdmin::getSubAdminsGroups($currentUser);
+
+	foreach ($groups as $group) {
+		$userCount += count(OC_Group::usersInGroup($group));
+
+	}
+} else {
+
+	$userCountArray = \OC::$server->getUserManager()->countUsers();
+
+	if (!empty($userCountArray)) {
+		foreach ($userCountArray as $classname => $usercount) {
+			$userCount += $usercount;
+		}
+	}
+}
+
+
+OC_JSON::success(array('count' => $userCount));
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 258b6aa7efd..081842734f0 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -251,12 +251,23 @@ GroupList = {
 
 	getElementGID: function (element) {
 		return ($(element).closest('li').data('gid') || '').toString();
+	},
+	getEveryoneCount: function () {
+		$.ajax({
+			type: "GET",
+			dataType: "json",
+			url: OC.generateUrl('/settings/ajax/geteveryonecount')
+		}).success(function (data) {
+			$('#everyonegroup').data('usercount', data.count);
+			$('#everyonecount').text(data.count);
+		});
 	}
 };
 
 $(document).ready( function () {
 	$userGroupList = $('#usergrouplist');
 	GroupList.initDeleteHandling();
+	GroupList.getEveryoneCount();
 
 	// Display or hide of Create Group List Element
 	$('#newgroup-form').hide();
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index f9acc08ce52..6d4880502dc 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -19,6 +19,7 @@ $TRANSLATIONS = array(
 "Invalid email" => "البريد الإلكتروني غير صالح",
 "Unable to delete group" => "فشل إزالة المجموعة",
 "Unable to delete user" => "فشل إزالة المستخدم",
+"Backups restored successfully" => "تم إسترجاع النسخة الإحتياطية بنجاح",
 "Language changed" => "تم تغيير اللغة",
 "Invalid request" => "طلب غير مفهوم",
 "Admins can't remove themself from the admin group" => "لا يستطيع المدير إزالة حسابه من مجموعة المديرين",
@@ -31,9 +32,11 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
 "Unable to change password" => "لا يمكن تغيير كلمة المرور",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "هل أنت متأكد انك تريد إضافة \"{domain}\" كنطاق موثوق فيه.",
 "Sending..." => "جاري الارسال ...",
 "User Documentation" => "كتاب توثيق المستخدم",
 "Update to {appversion}" => "تم التحديث الى ",
+"Uninstall App" => "أزالة تطبيق",
 "Disable" => "إيقاف",
 "Enable" => "تفعيل",
 "Please wait...." => "الرجاء الانتظار ...",
@@ -44,6 +47,8 @@ $TRANSLATIONS = array(
 "Error" => "خطأ",
 "Update" => "حدث",
 "Updated" => "تم التحديث بنجاح",
+"Uninstalling ...." => "جاري إلغاء التثبيت ...",
+"Uninstall" => "ألغاء التثبيت",
 "Select a profile picture" => "اختر صورة الملف الشخصي ",
 "Very weak password" => "كلمة السر ضعيفة جدا",
 "Weak password" => "كلمة السر ضعيفة",
@@ -89,9 +94,12 @@ $TRANSLATIONS = array(
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "الملف cron.php تم تسجيله فى خدمه webcron  لاستدعاء الملف cron.php كل  15 دقيقه",
 "Sharing" => "مشاركة",
 "Allow apps to use the Share API" => "السماح للتطبيقات بالمشاركة عن طريق الAPI",
+"Allow users to share via link" => "السماح للمستخدم بمشاركة الملف عن طريق رابط",
 "Allow public uploads" => "السماح بالرفع للعامة ",
+"Expire after " => "ينتهي بعد",
+"days" => "أيام",
 "Allow resharing" => "السماح بإعادة المشاركة ",
-"Security" => "حماية",
+"Security" => "الأمان",
 "Enforce HTTPS" => "فرض HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement.",
@@ -131,13 +139,14 @@ $TRANSLATIONS = array(
 "Profile picture" => "صورة الملف الشخصي",
 "Upload new" => "رفع الان",
 "Select new from Files" => "اختر جديد من الملفات ",
-"Remove image" => "احذف الصورة ",
+"Remove image" => "إزالة الصورة",
 "Either png or jpg. Ideally square but you will be able to crop it." => "سواء png او jpg. بامكانك قص الصورة ",
 "Your avatar is provided by your original account." => "صورتك الرمزية يتم توفيرها عن طريق حسابك الاصلي.",
 "Cancel" => "الغاء",
 "Choose as profile image" => "اختر صورة الملف الشخصي",
 "Language" => "اللغة",
 "Help translate" => "ساعد في الترجمه",
+"Valid until" => "صالح حتى",
 "The encryption app is no longer enabled, please decrypt all your files" => "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
 "Log-in password" => "كلمه سر الدخول",
 "Decrypt all Files" => "فك تشفير جميع الملفات ",
@@ -146,12 +155,14 @@ $TRANSLATIONS = array(
 "Admin Recovery Password" => "استعادة كلمة المرور للمسؤول",
 "Enter the recovery password in order to recover the users files during password change" => "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
 "Group" => "مجموعة",
+"Everyone" => "الجميع",
 "Default Quota" => "الحصة النسبية الإفتراضية",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
 "Unlimited" => "غير محدود",
 "Other" => "شيء آخر",
 "Username" => "إسم المستخدم",
 "Quota" => "حصه",
+"Last Login" => "آخر تسجيل دخول",
 "change full name" => "تغيير اسمك الكامل",
 "set new password" => "اعداد كلمة مرور جديدة",
 "Default" => "افتراضي"
diff --git a/settings/l10n/az.php b/settings/l10n/az.php
index 9db69929bab..c0937e271e2 100644
--- a/settings/l10n/az.php
+++ b/settings/l10n/az.php
@@ -106,6 +106,7 @@ $TRANSLATIONS = array(
 "More" => "Yenə",
 "Get the apps to sync your files" => "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
 "Password" => "Şifrə",
+"Change password" => "Şifrəni dəyiş",
 "Cancel" => "Dayandır",
 "Username" => "İstifadəçi adı"
 );
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index c84f51a90fe..a1a4c11fce7 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "None" => "কোনটিই নয়",
 "Login" => "প্রবেশ",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
+"days" => "দিনগুলি",
 "Server address" => "সার্ভার ঠিকানা",
 "Port" => "পোর্ট",
 "More" => "বেশী",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index dc46a70b9e2..55b6586f737 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -66,6 +66,7 @@ $TRANSLATIONS = array(
 "So-so password" => "Enam-vähem sobiv parool",
 "Good password" => "Hea parool",
 "Strong password" => "Väga hea parool",
+"Valid until {date}" => "Kehtib kuni {date}",
 "Delete" => "Kustuta",
 "Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
 "Delete encryption keys permanently." => "Kustuta krüpteerimisvõtmed lõplikult",
@@ -111,6 +112,7 @@ $TRANSLATIONS = array(
 "Your PHP version is outdated" => "PHP versioon on aegunud",
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Sinu PHP versioon on aegunud. Soovitame tungivalt uuenda versioonile 5.3.8 või uuemale, kuna varasemad versioonid on teadaolevalt vigased. On võimalik, et see käesolev paigaldus ei toimi korrektselt.",
 "PHP charset is not set to UTF-8" => "PHP märgistik pole UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP märgistikuks pole määratud UTF-8. See võib tekitada failinimedes mitte-ASCII märkidega suuri probleeme. Me soovitame tungivalt panna failis php.ini sätte 'default_charset' väärtuseks 'UTF-8'.",
 "Locale not working" => "Lokalisatsioon ei toimi",
 "System locale can not be set to a one which supports UTF-8." => "Süsteemi lokaliseeringuks ei saa panna sellist, mis toetab UTF-8-t.",
 "This means that there might be problems with certain characters in file names." => "See tähendab, et võib esineda probleeme failide nimedes mõnede sümbolitega.",
@@ -118,6 +120,7 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Internetiühendus ei toimi",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
 "URL generation in notification emails" => "URL-ide loomine teavituskirjades",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
 "Cron" => "Cron",
 "Last cron was executed at %s." => "Cron käivitati viimati %s.",
 "Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.",
@@ -200,6 +203,10 @@ $TRANSLATIONS = array(
 "Language" => "Keel",
 "Help translate" => "Aita tõlkida",
 "SSL root certificates" => "SSL root sertifikaadid",
+"Common Name" => "Üldnimetus",
+"Valid until" => "Kehtib kuni",
+"Issued By" => "isas",
+"Valid until %s" => "Kehtib kuni %s",
 "Import Root Certificate" => "Impordi root sertifikaadid",
 "The encryption app is no longer enabled, please decrypt all your files" => "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
 "Log-in password" => "Sisselogimise parool",
@@ -207,6 +214,8 @@ $TRANSLATIONS = array(
 "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt.",
 "Restore Encryption Keys" => "Taasta krüpteerimisvõtmed",
 "Delete Encryption Keys" => "Kustuta krüpteerimisvõtmed",
+"Show storage location" => "Näita salvestusruumi asukohta",
+"Show last log in" => "Viimane sisselogimine",
 "Login Name" => "Kasutajanimi",
 "Create" => "Lisa",
 "Admin Recovery Password" => "Admini parooli taastamine",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 7b48a8a33bd..42cd848597f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
 "Unable to change password" => "Impossible de modifier le mot de passe",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
+"Add trusted domain" => "Ajouter un domaine de confiance",
 "Sending..." => "Envoi en cours...",
 "User Documentation" => "Documentation utilisateur",
 "Admin Documentation" => "Documentation administrateur",
@@ -64,6 +66,7 @@ $TRANSLATIONS = array(
 "So-so password" => "Mot de passe de sécurité tout juste acceptable",
 "Good password" => "Mot de passe de sécurité suffisante",
 "Strong password" => "Mot de passe de forte sécurité",
+"Valid until {date}" => "Valide jusqu'au {date}",
 "Delete" => "Supprimer",
 "Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
 "Delete encryption keys permanently." => "Supprimer définitivement les clés de chiffrement",
@@ -205,6 +208,7 @@ $TRANSLATIONS = array(
 "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
 "Restore Encryption Keys" => "Restaurer les clés de chiffrement",
 "Delete Encryption Keys" => "Supprimer les clés de chiffrement",
+"Show last log in" => "Montrer la dernière identification",
 "Login Name" => "Nom d'utilisateur",
 "Create" => "Créer",
 "Admin Recovery Password" => "Récupération du mot de passe administrateur",
diff --git a/settings/routes.php b/settings/routes.php
index 191b5febbd7..86d6049551c 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -27,6 +27,8 @@ $this->create('settings_ajax_userlist', '/settings/ajax/userlist')
 	->actionInclude('settings/ajax/userlist.php');
 $this->create('settings_ajax_grouplist', '/settings/ajax/grouplist')
 	->actionInclude('settings/ajax/grouplist.php');
+$this->create('settings_ajax_everyonecount', '/settings/ajax/geteveryonecount')
+	->actionInclude('settings/ajax/geteveryonecount.php');
 $this->create('settings_ajax_createuser', '/settings/ajax/createuser.php')
 	->actionInclude('settings/ajax/createuser.php');
 $this->create('settings_ajax_removeuser', '/settings/ajax/removeuser.php')
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 1f3701778ab..0e6cb14bcef 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -184,7 +184,7 @@ if (!$_['isLocaleWorking']) {
 }
 
 // is internet connection working ?
-if (!$_['internetconnectionworking']) {
+if ($_['internetconnectionworking'] === false) {
 	?>
 	<div class="section">
 		<h2><?php p($l->t('Internet connection not working'));?></h2>
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 255f2a6cf45..5b516bc0e16 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -12,15 +12,15 @@
 		</form>
 	</li>
 	<!-- Everyone -->
-	<li data-gid="_everyone" data-usercount="<?php p($_["usercount"]); ?>" class="isgroup">
+	<li id="everyonegroup" data-gid="_everyone" data-usercount="" class="isgroup">
 		<a href="#">
 			<span class="groupname">
 				<?php p($l->t('Everyone')); ?>
 			</span>
 		</a>
 		<span class="utils">
-			<span class="usercount">
-				<?php p($_["usercount"]); ?>
+			<span class="usercount" id="everyonecount">
+
 			</span>
 		</span>
 	</li>
diff --git a/settings/users.php b/settings/users.php
index bc6c2ea7e7c..94dda43c523 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -60,13 +60,13 @@ $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false
 
 // load users and quota
 foreach($accessibleUsers as $uid => $displayName) {
-	$quota=OC_Preferences::getValue($uid, 'files', 'quota', 'default');
-	$isQuotaUserDefined=array_search($quota, $quotaPreset)===false
-		&& array_search($quota, array('none', 'default'))===false;
+	$quota = OC_Preferences::getValue($uid, 'files', 'quota', 'default');
+	$isQuotaUserDefined = array_search($quota, $quotaPreset) === false
+		&& array_search($quota, array('none', 'default')) === false;
 
 	$name = $displayName;
-	if ( $displayName !== $uid ) {
-		$name = $name . ' ('.$uid.')';
+	if ($displayName !== $uid) {
+		$name = $name . ' (' . $uid . ')';
 	}
 
 	$user = $userManager->get($uid);
@@ -82,17 +82,16 @@ foreach($accessibleUsers as $uid => $displayName) {
 	);
 }
 
-$tmpl = new OC_Template( "settings", "users/main", "user" );
-$tmpl->assign( 'users', $users );
-$tmpl->assign( 'groups', $groups );
-$tmpl->assign( 'adminGroup', $adminGroup );
-$tmpl->assign( 'isAdmin', (int) $isAdmin);
-$tmpl->assign( 'subadmins', $subadmins);
-$tmpl->assign('usercount', count($users));
-$tmpl->assign( 'numofgroups', count($groups) + count($adminGroup));
-$tmpl->assign( 'quota_preset', $quotaPreset);
-$tmpl->assign( 'default_quota', $defaultQuota);
-$tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
-$tmpl->assign( 'recoveryAdminEnabled', $recoveryAdminEnabled);
-$tmpl->assign( 'enableAvatars', \OC_Config::getValue('enable_avatars', true));
+$tmpl = new OC_Template("settings", "users/main", "user");
+$tmpl->assign('users', $users);
+$tmpl->assign('groups', $groups);
+$tmpl->assign('adminGroup', $adminGroup);
+$tmpl->assign('isAdmin', (int)$isAdmin);
+$tmpl->assign('subadmins', $subadmins);
+$tmpl->assign('numofgroups', count($groups) + count($adminGroup));
+$tmpl->assign('quota_preset', $quotaPreset);
+$tmpl->assign('default_quota', $defaultQuota);
+$tmpl->assign('defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
+$tmpl->assign('recoveryAdminEnabled', $recoveryAdminEnabled);
+$tmpl->assign('enableAvatars', \OC::$server->getConfig()->getSystemValue('enable_avatars', true));
 $tmpl->printPage();