X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsettings.php;h=6c41856a4f808f9cc58872c41f2a284352127ef7;hb=122ad0af14f046c2462a03fe33967dc41abfc8b5;hp=e147144e21633fef45cd8c234ed6fa12dcbf99f9;hpb=0c73531da1d93f218a47c798ae5db1d00144a7be;p=friendica.git

diff --git a/mod/settings.php b/mod/settings.php
index e147144e21..6c41856a4f 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -225,10 +225,11 @@ function settings_post(App $a)
 		if (isset($_FILES['importcontact-filename'])) {
 			// was there an error
 			if ($_FILES['importcontact-filename']['error'] > 0) {
-				Logger::notice('Contact CSV file upload error');
+				Logger::notice('Contact CSV file upload error', ['error' => $_FILES['importcontact-filename']['error']]);
 				notice(DI::l10n()->t('Contact CSV file upload error'));
 			} else {
 				$csvArray = array_map('str_getcsv', file($_FILES['importcontact-filename']['tmp_name']));
+				Logger::info('Import started', ['lines' => count($csvArray)]);
 				// import contacts
 				foreach ($csvArray as $csvRow) {
 					// The 1st row may, or may not contain the headers of the table
@@ -240,11 +241,14 @@ function settings_post(App $a)
 						Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]);
 					}
 				}
+				Logger::info('Import done');
 
 				info(DI::l10n()->t('Importing Contacts done'));
 				// delete temp file
 				unlink($_FILES['importcontact-filename']['tmp_name']);
 			}
+		} else {
+			Logger::info('Import triggered, but no import file was found.');
 		}
 
 		return;
@@ -829,26 +833,6 @@ function settings_content(App $a)
 
 	$stpl = Renderer::getMarkupTemplate('settings/settings.tpl');
 
-	// Private/public post links for the non-JS ACL form
-	$private_post = 1;
-	if (!empty($_REQUEST['public']) && !$_REQUEST['public']) {
-		$private_post = 0;
-	}
-
-	$query_str = DI::args()->getQueryString();
-	if (strpos($query_str, 'public=1') !== false) {
-		$query_str = str_replace(['?public=1', '&public=1'], ['', ''], $query_str);
-	}
-
-	// I think $a->query_string may never have ? in it, but I could be wrong
-	// It looks like it's from the index.php?q=[etc] rewrite that the web
-	// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
-	if (strpos($query_str, '?') === false) {
-		$public_post_link = '?public=1';
-	} else {
-		$public_post_link = '&public=1';
-	}
-
 	/* Installed langs */
 	$lang_choices = DI::l10n()->getAvailableLanguages();
 
@@ -866,7 +850,7 @@ function settings_content(App $a)
 		'$password1'=> ['password', DI::l10n()->t('New Password:'), '', DI::l10n()->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).')],
 		'$password2'=> ['confirm', DI::l10n()->t('Confirm:'), '', DI::l10n()->t('Leave password fields blank unless changing')],
 		'$password3'=> ['opassword', DI::l10n()->t('Current Password:'), '', DI::l10n()->t('Your current password to confirm the changes')],
-		'$password4'=> ['mpassword', DI::l10n()->t('Password:'), '', DI::l10n()->t('Your current password to confirm the changes')],
+		'$password4'=> ['mpassword', DI::l10n()->t('Password:'), '', DI::l10n()->t('Your current password to confirm the changes of the email address')],
 		'$oid_enable' => (!DI::config()->get('system', 'no_openid')),
 		'$openid'	=> $openid_field,
 		'$delete_openid' => ['delete_openid', DI::l10n()->t('Delete OpenID URL'), false, ''],