Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff

8 files changed, 8 insertions, 71 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 394d6b55d78..869729a9e41 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -30,7 +30,6 @@ $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
 $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
-$tmpl->assign('avatar', OC_Config::getValue("avatar", "local"));
 
 // Check if connected using HTTPS
 if (OC_Request::serverProtocol() === 'https') {
diff --git a/settings/ajax/setavatarmode.php b/settings/ajax/setavatarmode.php
deleted file mode 100644
index f6f19f50cc9..00000000000
--- a/settings/ajax/setavatarmode.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OC_Util::checkAdminUser();
-OCP\JSON::callCheck();
-
-OC_Config::setValue('avatar', $_POST['mode']);
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 6fa1c768ea3..f2d6f37a51a 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -14,12 +14,6 @@ $(document).ready(function(){
 		}
 	});
 
-	$('#avatar input').change(function(){
-		if ($(this).attr('checked')) {
-			$.post(OC.filePath('settings', 'ajax', 'setavatarmode.php'), {mode: $(this).val()});
-		}
-	});
-
 	$('#shareAPIEnabled').change(function() {
 		$('.shareAPI td:not(#enable)').toggle();
 	});
diff --git a/settings/personal.php b/settings/personal.php
index 233b1440eb2..d109d33e4bd 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -15,9 +15,7 @@ OC_Util::addScript( 'settings', 'personal' );
 OC_Util::addStyle( 'settings', 'settings' );
 OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
 OC_Util::addStyle( '3rdparty', 'chosen' );
-if (OC_Config::getValue('avatar', 'local') === 'local') {
-	\OC_Util::addScript('files', 'jquery.fileupload');
-}
+\OC_Util::addScript('files', 'jquery.fileupload');
 OC_App::setActiveNavigationEntry( 'personal' );
 
 $storageInfo=OC_Helper::getStorageInfo();
diff --git a/settings/routes.php b/settings/routes.php
index 9a27c3e439b..73ee70d1d5c 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -70,5 +70,3 @@ $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php')
 	->actionInclude('settings/ajax/setsecurity.php');
 $this->create('isadmin', '/settings/js/isadmin.js')
 	->actionInclude('settings/js/isadmin.php');
-$this->create('settings_ajax_setavatarmode', '/settings/ajax/setavatarmode.php')
-	->actionInclude('settings/ajax/setavatarmode.php');
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 64c1b1112ce..e54586b80df 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -116,33 +116,6 @@ if (!$_['internetconnectionworking']) {
 	</p>
 </fieldset>
 
-<fieldset class="personalblock" id="avatar">
-	<legend><strong><?php p($l->t('Profile images')); ?></strong></legend>
-	<p>
-		<input type="radio" name="avatarmode" value="gravatar" id="avatar_gravatar"
-			<?php if ($_['avatar'] === "gravatar") { p('checked'); } ?>
-			<?php if (!$_['internetconnectionworking']) { p('disabled'); } ?>>
-		<label for="avatar_gravatar">Gravatar</label><br>
-		<em><?php print_unescaped($l->t('Use <a href="http://gravatar.com/">gravatar</a> for profile images')); ?></em><br>
-		<em><?php p($l->t('This sends data to gravatar and may slow down loading')); ?></em>
-		<?php if (!$_['internetconnectionworking']): ?>
-		<br><em><?php p($l->t('Gravatar needs an internet connection!')); ?></em>
-		<?php endif; ?>
-	</p>
-	<p>
-		<input type="radio" name="avatarmode" value="local" id="avatar_local"
-			<?php if ($_['avatar'] === "local") { p('checked'); } ?>>
-		<label for="avatar_local"><?php p($l->t('Local avatars')); ?></label><br>
-		<em><?php p($l->t('Use local avatars, which each user has to upload themselves')); ?></em>
-	</p>
-	<p>
-		<input type="radio" name="avatarmode" value="none" id="avatar_none"
-			<?php if ($_['avatar'] === "none") { p('checked'); } ?>>
-		<label for="avatar_none"><?php p($l->t('No avatars')); ?></label><br>
-		<em><?php p($l->t('Do not provide avatars')); ?></em>
-	</p>
-</fieldset>
-
 <fieldset class="personalblock" id="shareAPI">
 	<legend><strong><?php p($l->t('Sharing'));?></strong></legend>
 	<table class="shareAPI nostyle">
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 7832c79894b..7cd5361a924 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -83,26 +83,17 @@ if($_['passwordChangeSupported']) {
 }
 ?>
 
-<?php if ($_['avatar'] !== "none"): ?>
 <form id="avatar" method="post" action="<?php p(\OC_Helper::linkTo('', 'avatar.php')); ?>">
 	<fieldset class="personalblock">
 		<legend><strong><?php p($l->t('Profile Image')); ?></strong></legend>
 		<img src="<?php print_unescaped(link_to('', 'avatar.php').'?user='.OC_User::getUser().'&size=128'); ?>"><br>
-		<?php if ($_['avatar'] === "local"): ?>
-			<em><?php p($l->t('Your profile image has to be a square and either a PNG or JPG image')); ?></em><br>
-			<div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload a new image')); ?></div>
-			<input type="file" class="hidden" name="files[]" id="uploadavatar">
-			<div class="inlineblock button" id="selectavatar"><?php p($l->t('Select a new image from your files')); ?></div>
-			<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove my image')); ?></div>
-		<?php elseif ($_['avatar'] === "gravatar"): ?>
-			<em><?php p($l->t('Your profile image is provided by gravatar, which is based on your Email.')); ?></em>
-			<div class?"inlineblock button" id="overridegravatar"><?php p($l->t('Use my local avatar instead')); ?></div>
-		<?php else: ?>
-			<em><?php p($l->t('Your profile image is provided by a custom service, ask your administrator, on how to change your image.')); ?></em>
-		<?php endif; ?>
+		<em><?php p($l->t('Has to be square and either PNG or JPG')); ?></em><br>
+		<div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div>
+		<input type="file" class="hidden" name="files[]" id="uploadavatar">
+		<div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from files')); ?></div>
+		<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div>
 	</fieldset>
 </form>
-<?php endif; ?>
 
 <form>
 	<fieldset class="personalblock">
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 78bdbcd8c43..d3f356a7ba8 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -81,9 +81,7 @@ $_['subadmingroups'] = array_flip($items);
 <table class="hascontrols" data-groups="<?php p(json_encode($allGroups));?>">
 	<thead>
 		<tr>
-			<?php if(\OC_Avatar::getMode() !== "none"): ?>
-				<th id='headerAvatar'></th>
-			<?php endif; ?>
+			<th id='headerAvatar'></th>
 			<th id='headerName'><?php p($l->t('Username'))?></th>
 			<th id="headerDisplayName"><?php p($l->t( 'Display Name' )); ?></th>
 			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
@@ -99,9 +97,7 @@ $_['subadmingroups'] = array_flip($items);
 		<?php foreach($_["users"] as $user): ?>
 		<tr data-uid="<?php p($user["name"]) ?>"
 			data-displayName="<?php p($user["displayName"]) ?>">
-			<?php if(\OC_Avatar::getMode() !== "none"): ?>
-				<td class="avatar"><img src="<?php print_unescaped(link_to('', 'avatar.php')); ?>?user=<?php p($user['name']); ?>&size=32"></td>
-			<?php endif; ?>
+			<td class="avatar"><img src="<?php print_unescaped(link_to('', 'avatar.php')); ?>?user=<?php p($user['name']); ?>&size=32"></td>
 			<td class="name"><?php p($user["name"]); ?></td>
 			<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
 				src="<?php p(image_path('core', 'actions/rename.svg'))?>"