remove obsolete files

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

3 files changed, 0 insertions, 728 deletions

diff --git a/settings/js/personal.js b/settings/js/personal.js
deleted file mode 100644
index effce9de07e..00000000000
--- a/settings/js/personal.js
+++ /dev/null
@@ -1,444 +0,0 @@
-/* global OC */
-
-/**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- *               2013, Morris Jobke <morris.jobke@gmail.com>
- *               2016, Christoph Wurst <christoph@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-OC.Settings = OC.Settings || {};
-
-/**
- * The callback will be fired as soon as enter is pressed by the
- * user or 1 second after the last data entry
- *
- * @param callback
- * @param allowEmptyValue if this is set to true the callback is also called when the value is empty
- */
-jQuery.fn.keyUpDelayedOrEnter = function (callback, allowEmptyValue) {
-	var cb = callback;
-	var that = this;
-
-	this.on('input', _.debounce(function (event) {
-		// enter is already handled in keypress
-		if (event.keyCode === 13) {
-			return;
-		}
-		if (allowEmptyValue || that.val() !== '') {
-			cb(event);
-		}
-	}, 1000));
-
-	this.keypress(function (event) {
-		if (event.keyCode === 13 && (allowEmptyValue || that.val() !== '')) {
-			event.preventDefault();
-			cb(event);
-		}
-	});
-};
-
-function updateAvatar (hidedefault) {
-	var $headerdiv = $('#header .avatardiv');
-	var $displaydiv = $('#displayavatar .avatardiv');
-
-	//Bump avatar avatarversion
-	oc_userconfig.avatar.version = -(Math.floor(Math.random() * 1000));
-
-	if (hidedefault) {
-		$headerdiv.hide();
-		$('#header .avatardiv').removeClass('avatardiv-shown');
-	} else {
-		$headerdiv.css({'background-color': ''});
-		$headerdiv.avatar(OC.currentUser, 32, true);
-		$('#header .avatardiv').addClass('avatardiv-shown');
-	}
-	$displaydiv.css({'background-color': ''});
-	$displaydiv.avatar(OC.currentUser, 145, true, null, function() {
-		$displaydiv.removeClass('loading');
-		$('#displayavatar img').show();
-		if($('#displayavatar img').length === 0) {
-			$('#removeavatar').removeClass('inlineblock').addClass('hidden');
-		} else {
-			$('#removeavatar').removeClass('hidden').addClass('inlineblock');
-		}
-	});
-}
-
-function showAvatarCropper () {
-	var $cropper = $('#cropper');
-	var $cropperImage = $('<img/>');
-	$cropperImage.css('opacity', 0); // prevent showing the unresized image
-	$cropper.children('.inner-container').prepend($cropperImage);
-
-	$cropperImage.attr('src',
-		OC.generateUrl('/avatar/tmp') + '?requesttoken=' + encodeURIComponent(oc_requesttoken) + '#' + Math.floor(Math.random() * 1000));
-
-	$cropperImage.load(function () {
-		var img = $cropperImage.get()[0];
-		var selectSize = Math.min(img.width, img.height);
-		var offsetX = (img.width - selectSize) / 2;
-		var offsetY = (img.height - selectSize) / 2;
-		$cropperImage.Jcrop({
-			onChange: saveCoords,
-			onSelect: saveCoords,
-			aspectRatio: 1,
-			boxHeight: Math.min(500, $('#app-content').height() -100),
-			boxWidth: Math.min(500, $('#app-content').width()),
-			setSelect: [offsetX, offsetY, selectSize, selectSize]
-		}, function() {
-			$cropper.show();
-		});
-	});
-}
-
-function sendCropData () {
-	cleanCropper();
-
-	var cropperData = $('#cropper').data();
-	var data = {
-		x: cropperData.x,
-		y: cropperData.y,
-		w: cropperData.w,
-		h: cropperData.h
-	};
-	$.post(OC.generateUrl('/avatar/cropped'), {crop: data}, avatarResponseHandler);
-}
-
-function saveCoords (c) {
-	$('#cropper').data(c);
-}
-
-function cleanCropper () {
-	var $cropper = $('#cropper');
-	$('#displayavatar').show();
-	$cropper.hide();
-	$('.jcrop-holder').remove();
-	$('#cropper img').removeData('Jcrop').removeAttr('style').removeAttr('src');
-	$('#cropper img').remove();
-}
-
-function avatarResponseHandler (data) {
-	if (typeof data === 'string') {
-		data = JSON.parse(data);
-	}
-	var $warning = $('#avatarform .warning');
-	$warning.hide();
-	if (data.status === "success") {
-		updateAvatar();
-	} else if (data.data === "notsquare") {
-		showAvatarCropper();
-	} else {
-		$warning.show();
-		$warning.text(data.data.message);
-	}
-}
-
-$(document).ready(function () {
-	if($('#pass2').length) {
-		$('#pass2').showPassword().keyup();
-	}
-
-	var removeloader = function () {
-		setTimeout(function(){
-			if ($('.password-state').length > 0) {
-				$('.password-state').remove();
-			}
-		}, 5000)
-	};
-
-	$("#passwordbutton").click(function () {
-		var isIE8or9 = $('html').hasClass('lte9');
-		// FIXME - TODO - once support for IE8 and IE9 is dropped
-		// for IE8 and IE9 this will check additionally if the typed in password
-		// is different from the placeholder, because in IE8/9 the placeholder
-		// is simply set as the value to look like a placeholder
-		if ($('#pass1').val() !== '' && $('#pass2').val() !== ''
-			&& !(isIE8or9 && $('#pass2').val() === $('#pass2').attr('placeholder'))) {
-			// Serialize the data
-			var post = $("#passwordform").serialize();
-			$('#passwordchanged').hide();
-			$('#passworderror').hide();
-			$("#passwordbutton").attr('disabled', 'disabled');
-			$("#passwordbutton").after("<span class='password-loading icon icon-loading-small-dark password-state'></span>");
-			$(".personal-show-label").hide();
-			// Ajax foo
-			$.post(OC.generateUrl('/settings/personal/changepassword'), post, function (data) {
-				if (data.status === "success") {
-					$("#passwordbutton").after("<span class='checkmark icon icon-checkmark password-state'></span>");
-					removeloader();
-					$(".personal-show-label").show();
-					$('#pass1').val('');
-					$('#pass2').val('').change();
-				}
-				if (typeof(data.data) !== "undefined") {
-					OC.msg.finishedSaving('#password-error-msg', data);
-				} else {
-					OC.msg.finishedSaving('#password-error-msg',
-						{
-							'status' : 'error',
-							'data' : {
-								'message' : t('core', 'Unable to change password')
-							}
-						}
-					);
-				}
-				$(".password-loading").remove();
-				$("#passwordbutton").removeAttr('disabled');
-			});
-			return false;
-		} else {
-			OC.msg.finishedSaving('#password-error-msg',
-				{
-					'status' : 'error',
-					'data' : {
-						'message' : t('core', 'Unable to change password')
-					}
-				}
-			);
-			return false;
-		}
-	});
-
-	var showVerifyDialog = function(dialog, howToVerify, verificationCode) {
-		var dialogContent = dialog.children('.verification-dialog-content');
-		dialogContent.children(".explainVerification").text(howToVerify);
-		dialogContent.children(".verificationCode").text(verificationCode);
-		dialog.css('display', 'block');
-	};
-
-	$(".verify").click(function (event) {
-
-		event.stopPropagation();
-
-		var verify = $(this);
-		var indicator = $(this).children('img');
-		var accountId = indicator.attr('id');
-		var status = indicator.data('status');
-
-		var onlyVerificationCode = false;
-		if (parseInt(status) === 1) {
-			onlyVerificationCode = true;
-		}
-
-		if (indicator.hasClass('verify-action')) {
-			$.ajax(
-				OC.generateUrl('/settings/users/{account}/verify', {account: accountId}),
-				{
-					method: 'GET',
-					data: {onlyVerificationCode: onlyVerificationCode}
-				}
-			).done(function (data) {
-				var dialog = verify.children('.verification-dialog');
-				showVerifyDialog($(dialog), data.msg, data.code);
-				indicator.attr('data-origin-title', t('core', 'Verifying …'));
-				indicator.attr('src', OC.imagePath('core', 'actions/verifying.svg'));
-				indicator.data('status', '1');
-			});
-		}
-
-	});
-
-	// When the user clicks anywhere outside of the verification dialog we close it
-	$(document).click(function(event){
-		var element = event.target;
-		var isDialog = $(element).hasClass('verificationCode')
-			|| $(element).hasClass('explainVerification')
-			|| $(element).hasClass('verification-dialog-content')
-			|| $(element).hasClass('verification-dialog');
-		if (!isDialog) {
-			$(document).find('.verification-dialog').css('display', 'none');
-		}
-	});
-
-
-	var federationSettingsView = new OC.Settings.FederationSettingsView({
-		el: '#personal-settings'
-	});
-	federationSettingsView.render();
-
-	var updateLanguage = function () {
-		if (OC.PasswordConfirmation.requiresPasswordConfirmation()) {
-			OC.PasswordConfirmation.requirePasswordConfirmation(updateLanguage);
-			return;
-		}
-
-		var selectedLang = $("#languageinput").val(),
-			user = OC.getCurrentUser();
-
-		$.ajax({
-			url: OC.linkToOCS('cloud/users', 2) + user['uid'],
-			method: 'PUT',
-			data: {
-				key: 'language',
-				value: selectedLang
-			},
-			success: function() {
-				location.reload();
-			},
-			fail: function() {
-				OC.Notification.showTemporary(t('settings', 'An error occured while changing your language. Please reload the page and try again.'));
-			}
-		});
-	};
-	$("#languageinput").change(updateLanguage);
-
-	var uploadparms = {
-		pasteZone: null,
-		done: function (e, data) {
-			var response = data;
-			if (typeof data.result === 'string') {
-				response = JSON.parse(data.result);
-			} else if (data.result && data.result.length) {
-				// fetch response from iframe
-				response = JSON.parse(data.result[0].body.innerText);
-			} else {
-				response = data.result;
-			}
-			avatarResponseHandler(response);
-		},
-		submit: function(e, data) {
-			$('#displayavatar img').hide();
-			$('#displayavatar .avatardiv').addClass('loading');
-			data.formData = _.extend(data.formData || {}, {
-				requesttoken: OC.requestToken
-			});
-		},
-		fail: function (e, data){
-			var msg = data.jqXHR.statusText + ' (' + data.jqXHR.status + ')';
-			if (!_.isUndefined(data.jqXHR.responseJSON) &&
-				!_.isUndefined(data.jqXHR.responseJSON.data) &&
-				!_.isUndefined(data.jqXHR.responseJSON.data.message)
-			) {
-				msg = data.jqXHR.responseJSON.data.message;
-			}
-			avatarResponseHandler({
-				data: {
-					message: msg
-				}
-			});
-		}
-	};
-
-	$('#uploadavatar').fileupload(uploadparms);
-
-	$('#selectavatar').click(function () {
-		OC.dialogs.filepicker(
-			t('settings', "Select a profile picture"),
-			function (path) {
-				$('#displayavatar img').hide();
-				$('#displayavatar .avatardiv').addClass('loading');
-				$.ajax({
-					type: "POST",
-					url: OC.generateUrl('/avatar/'),
-					data: { path: path }
-				}).done(avatarResponseHandler)
-					.fail(function(jqXHR) {
-						var msg = jqXHR.statusText + ' (' + jqXHR.status + ')';
-						if (!_.isUndefined(jqXHR.responseJSON) &&
-							!_.isUndefined(jqXHR.responseJSON.data) &&
-							!_.isUndefined(jqXHR.responseJSON.data.message)
-						) {
-							msg = jqXHR.responseJSON.data.message;
-						}
-						avatarResponseHandler({
-							data: {
-								message: msg
-							}
-						});
-					});
-			},
-			false,
-			["image/png", "image/jpeg"]
-		);
-	});
-
-	$('#removeavatar').click(function () {
-		$.ajax({
-			type: 'DELETE',
-			url: OC.generateUrl('/avatar/'),
-			success: function () {
-				updateAvatar(true);
-			}
-		});
-	});
-
-	$('#abortcropperbutton').click(function () {
-		$('#displayavatar .avatardiv').removeClass('loading');
-		$('#displayavatar img').show();
-		cleanCropper();
-	});
-
-	$('#sendcropperbutton').click(function () {
-		sendCropData();
-	});
-
-	$('#pass2').strengthify({
-		zxcvbn: OC.linkTo('core','vendor/zxcvbn/dist/zxcvbn.js'),
-		titles: [
-			t('core', 'Very weak password'),
-			t('core', 'Weak password'),
-			t('core', 'So-so password'),
-			t('core', 'Good password'),
-			t('core', 'Strong password')
-		],
-		drawTitles: true,
-	});
-
-	// Load the big avatar
-	$('#avatarform .avatardiv').avatar(OC.currentUser, 145, true, null, function() {
-		if($('#displayavatar img').length === 0) {
-			$('#removeavatar').removeClass('inlineblock').addClass('hidden');
-		} else {
-			$('#removeavatar').removeClass('hidden').addClass('inlineblock');
-		}
-	});
-
-
-	// Show token views
-	var collection = new OC.Settings.AuthTokenCollection();
-	var view = new OC.Settings.AuthTokenView({
-		collection: collection
-	});
-	view.reload();
-
-	// 'redirect' to anchor sections
-	// anchors are lost on redirects (e.g. while solving the 2fa challenge) otherwise
-	// example: /settings/person?section=devices will result in /settings/person?#devices
-	if (!window.location.hash) {
-		var query = OC.parseQueryString(location.search);
-		if (query && query.section) {
-			OC.Util.History.replaceState({});
-			window.location.hash = query.section;
-		}
-	}
-});
-
-if (!OC.Encryption) {
-	OC.Encryption = {};
-}
-
-OC.Encryption.msg = {
-	start: function (selector, msg) {
-		var spinner = '<img src="' + OC.imagePath('core', 'loading-small.gif') + '">';
-		$(selector)
-			.html(msg + ' ' + spinner)
-			.removeClass('success')
-			.removeClass('error')
-			.stop(true, true)
-			.show();
-	},
-	finished: function (selector, data) {
-		if (data.status === "success") {
-			$(selector).html(data.data.message)
-				.addClass('success')
-				.stop(true, true)
-				.delay(3000);
-		} else {
-			$(selector).html(data.data.message).addClass('error');
-		}
-	}
-};
-
-OC.Settings.updateAvatar = updateAvatar;
diff --git a/settings/personal.php b/settings/personal.php
deleted file mode 100644
index fcccbc50556..00000000000
--- a/settings/personal.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christopher Schäpers <kondou@ts.unde.re>
- * @author Christoph Wurst <christoph@owncloud.com>
- * @author Georg Ehrke <georg@owncloud.com>
- * @author Jakob Sack <mail@jakobsack.de>
- * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Marvin Thomas Rabe <mrabe@marvinrabe.de>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <pvince81@owncloud.com>
- * @author Volkan Gezer <volkangezer@gmail.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program 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, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-OC_Util::checkLoggedIn();
-
-$defaults = \OC::$server->getThemingDefaults();
-$certificateManager = \OC::$server->getCertificateManager();
-$accountManager = new \OC\Accounts\AccountManager(
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getEventDispatcher(),
-	\OC::$server->getJobList()
-);
-$config = \OC::$server->getConfig();
-$urlGenerator = \OC::$server->getURLGenerator();
-
-// Highlight navigation entry
-OC_Util::addScript('settings', 'authtoken');
-OC_Util::addScript('settings', 'authtoken_collection');
-OC_Util::addScript('settings', 'authtoken_view');
-OC_Util::addScript('settings', 'usersettings');
-OC_Util::addScript('settings', 'federationsettingsview');
-OC_Util::addScript('settings', 'federationscopemenu');
-OC_Util::addScript('settings', 'personal');
-OC_Util::addScript('settings', 'certificates');
-OC_Util::addStyle( 'settings', 'settings' );
-\OC_Util::addVendorScript('strengthify/jquery.strengthify');
-\OC_Util::addVendorStyle('strengthify/strengthify');
-\OC_Util::addScript('files', 'jquery.fileupload');
-\OC_Util::addVendorScript('jcrop/js/jquery.Jcrop');
-\OC_Util::addVendorStyle('jcrop/css/jquery.Jcrop');
-
-\OC::$server->getEventDispatcher()->dispatch('OC\Settings\Personal::loadAdditionalScripts');
-
-// Highlight navigation entry
-OC::$server->getNavigationManager()->setActiveEntry('personal');
-
-$storageInfo=OC_Helper::getStorageInfo('/');
-
-$user = OC::$server->getUserManager()->get(OC_User::getUser());
-
-$forceLanguage = $config->getSystemValue('force_language', false);
-if ($forceLanguage === false) {
-	$userLang=$config->getUserValue( OC_User::getUser(), 'core', 'lang', \OC::$server->getL10NFactory()->findLanguage() );
-	$languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages();
-
-	// array of common languages
-	$commonLangCodes = array(
-		'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
-	);
-
-	$languages=array();
-	$commonLanguages = array();
-	foreach($languageCodes as $lang) {
-		$l = \OC::$server->getL10N('settings', $lang);
-		// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
-		$potentialName = (string) $l->t('__language_name__');
-		if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
-			$ln = array('code' => $lang, 'name' => $potentialName);
-		} elseif ($lang === 'en') {
-			$ln = ['code' => $lang, 'name' => 'English (US)'];
-		}else{//fallback to language code
-			$ln=array('code'=>$lang, 'name'=>$lang);
-		}
-
-		// put appropriate languages into appropriate arrays, to print them sorted
-		// used language -> common languages -> divider -> other languages
-		if ($lang === $userLang) {
-			$userLang = $ln;
-		} elseif (in_array($lang, $commonLangCodes)) {
-			$commonLanguages[array_search($lang, $commonLangCodes)]=$ln;
-		} else {
-			$languages[]=$ln;
-		}
-	}
-
-	// if user language is not available but set somehow: show the actual code as name
-	if (!is_array($userLang)) {
-		$userLang = [
-			'code' => $userLang,
-			'name' => $userLang,
-		];
-	}
-
-	ksort($commonLanguages);
-
-	// sort now by displayed language not the iso-code
-	usort( $languages, function ($a, $b) {
-		if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
-			// If a doesn't have a name, but b does, list b before a
-			return 1;
-		}
-		if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
-			// If a does have a name, but b doesn't, list a before b
-			return -1;
-		}
-		// Otherwise compare the names
-		return strcmp($a['name'], $b['name']);
-	});
-}
-
-//links to clients
-$clients = array(
-	'desktop' => $config->getSystemValue('customclient_desktop', $defaults->getSyncClientUrl()),
-	'android' => $config->getSystemValue('customclient_android', $defaults->getAndroidClientUrl()),
-	'ios'     => $config->getSystemValue('customclient_ios', $defaults->getiOSClientUrl())
-);
-
-// only show root certificate import if external storages are enabled
-$enableCertImport = false;
-$externalStorageEnabled = \OC::$server->getAppManager()->isEnabledForUser('files_external');
-if ($externalStorageEnabled) {
-	/** @var \OCA\Files_External\Service\BackendService $backendService */
-	$backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService');
-	$enableCertImport = $backendService->isUserMountingAllowed();
-}
-
-
-// Return template
-$l = \OC::$server->getL10N('settings');
-$tmpl = new OC_Template( 'settings', 'personal', 'user');
-$tmpl->assign('usage', OC_Helper::humanFileSize($storageInfo['used']));
-if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-	$totalSpace = $l->t('Unlimited');
-} else {
-	$totalSpace = OC_Helper::humanFileSize($storageInfo['total']);
-}
-
-$uid = $user->getUID();
-$userData = $accountManager->getUser($user);
-
-$tmpl->assign('total_space', $totalSpace);
-$tmpl->assign('usage_relative', $storageInfo['relative']);
-$tmpl->assign('quota', $storageInfo['quota']);
-$tmpl->assign('clients', $clients);
-$tmpl->assign('email', $userData[\OC\Accounts\AccountManager::PROPERTY_EMAIL]['value']);
-if ($forceLanguage === false) {
-	$tmpl->assign('languages', $languages);
-	$tmpl->assign('commonlanguages', $commonLanguages);
-	$tmpl->assign('activelanguage', $userLang);
-}
-$tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
-$tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
-$tmpl->assign('displayName', $userData[\OC\Accounts\AccountManager::PROPERTY_DISPLAYNAME]['value']);
-
-$tmpl->assign('phone', $userData[\OC\Accounts\AccountManager::PROPERTY_PHONE]['value']);
-$tmpl->assign('website', $userData[\OC\Accounts\AccountManager::PROPERTY_WEBSITE]['value']);
-$tmpl->assign('twitter', $userData[\OC\Accounts\AccountManager::PROPERTY_TWITTER]['value']);
-$tmpl->assign('address', $userData[\OC\Accounts\AccountManager::PROPERTY_ADDRESS]['value']);
-
-$tmpl->assign('avatarScope', $userData[\OC\Accounts\AccountManager::PROPERTY_AVATAR]['scope']);
-$tmpl->assign('displayNameScope', $userData[\OC\Accounts\AccountManager::PROPERTY_DISPLAYNAME]['scope']);
-$tmpl->assign('phoneScope', $userData[\OC\Accounts\AccountManager::PROPERTY_PHONE]['scope']);
-$tmpl->assign('emailScope', $userData[\OC\Accounts\AccountManager::PROPERTY_EMAIL]['scope']);
-$tmpl->assign('websiteScope', $userData[\OC\Accounts\AccountManager::PROPERTY_WEBSITE]['scope']);
-$tmpl->assign('twitterScope', $userData[\OC\Accounts\AccountManager::PROPERTY_TWITTER]['scope']);
-$tmpl->assign('addressScope', $userData[\OC\Accounts\AccountManager::PROPERTY_ADDRESS]['scope']);
-
-$tmpl->assign('websiteVerification', $userData[\OC\Accounts\AccountManager::PROPERTY_WEBSITE]['verified']);
-$tmpl->assign('twitterVerification', $userData[\OC\Accounts\AccountManager::PROPERTY_TWITTER]['verified']);
-$tmpl->assign('emailVerification', $userData[\OC\Accounts\AccountManager::PROPERTY_EMAIL]['verified']);
-
-$needVerifyMessage = [\OC\Accounts\AccountManager::PROPERTY_EMAIL, \OC\Accounts\AccountManager::PROPERTY_WEBSITE, \OC\Accounts\AccountManager::PROPERTY_TWITTER];
-
-foreach ($needVerifyMessage as $property) {
-
-	switch ($userData[$property]['verified']) {
-		case \OC\Accounts\AccountManager::VERIFIED:
-			$message = $l->t('Verifying');
-			break;
-		case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-			$message = $l->t('Verifying …');
-			break;
-		default:
-			$message = $l->t('Verify');
-	}
-
-	$tmpl->assign($property . 'Message', $message);
-}
-
-$tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
-$tmpl->assign('certs', $certificateManager->listCertificates());
-$tmpl->assign('showCertificates', $enableCertImport);
-$tmpl->assign('urlGenerator', $urlGenerator);
-
-$federatedFileSharingEnabled = \OC::$server->getAppManager()->isEnabledForUser('federatedfilesharing');
-$lookupServerUploadEnabled = false;
-if ($federatedFileSharingEnabled) {
-	$federatedFileSharing = new \OCA\FederatedFileSharing\AppInfo\Application();
-	$shareProvider = $federatedFileSharing->getFederatedShareProvider();
-	$lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
-}
-
-$tmpl->assign('lookupServerUploadEnabled', $lookupServerUploadEnabled);
-
-// Get array of group ids for this user
-$groups = \OC::$server->getGroupManager()->getUserIdGroups(OC_User::getUser());
-$groups2 = array_map(function($group) { return $group->getGID(); }, $groups);
-sort($groups2);
-$tmpl->assign('groups', $groups2);
-
-// add hardcoded forms from the template
-$formsAndMore = [];
-$formsAndMore[]= ['anchor' => 'personal-settings', 'section-name' => $l->t('Personal info')];
-$formsAndMore[]= ['anchor' => 'security', 'section-name' => $l->t('Security')];
-$formsAndMore[]= ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync clients')];
-
-$forms=OC_App::getForms('personal');
-
-
-// add bottom hardcoded forms from the template
-if ($enableCertImport) {
-	$certificatesTemplate = new OC_Template('settings', 'certificates');
-	$certificatesTemplate->assign('type', 'personal');
-	$certificatesTemplate->assign('uploadRoute', 'settings.Certificate.addPersonalRootCertificate');
-	$certificatesTemplate->assign('certs', $certificateManager->listCertificates());
-	$certificatesTemplate->assign('urlGenerator', $urlGenerator);
-	$forms[] = $certificatesTemplate->fetchPage();
-}
-
-$formsMap = array_map(function($form){
-	if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
-		$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
-		$sectionName = str_replace('</h2>', '', $sectionName);
-		if (strpos($regs['class'], 'data-anchor-name') !== false) {
-			preg_match('%.*data-anchor-name="(?P<anchor>[^"]*)"%i', $regs['class'], $matches);
-			$anchor = $matches['anchor'];
-		} else {
-			$anchor = strtolower($sectionName);
-			$anchor = str_replace(' ', '-', $anchor);
-		}
-
-		return array(
-			'anchor' => $anchor,
-			'section-name' => $sectionName,
-			'form' => $form
-		);
-	}
-	return array(
-		'form' => $form
-	);
-}, $forms);
-
-$formsAndMore = array_merge($formsAndMore, $formsMap);
-
-$tmpl->assign('forms', $formsAndMore);
-$tmpl->printPage();
diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php
index 9fe0e546db8..8cb9aec8af5 100644
--- a/settings/templates/settings/personal/personal.info.php
+++ b/settings/templates/settings/personal/personal.info.php
@@ -35,9 +35,6 @@ vendor_style('strengthify/strengthify');
 vendor_script('jcrop/js/jquery.Jcrop');
 vendor_style('jcrop/css/jquery.Jcrop');
 
-//TODO: delete js/personal.js once the Encryption and AuthToken things are,
-// where they belong
-
 ?>
 
 <div id="quota" class="section">