X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fadmin.php;h=0576a1b2471d3dc51c9cf68493d0689ee2686b59;hb=d1d2ee6b2f2a46f1c6495bfe9936146a2bfad403;hp=1209ad92bcd4480ecc5430db2ad5b931d6825fad;hpb=4d5b79a9d46ad07716febaac02e59dafe3baad90;p=friendica.git

diff --git a/mod/admin.php b/mod/admin.php
index 1209ad92bc..0576a1b247 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -14,6 +14,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Contact;
@@ -471,14 +472,14 @@ function admin_page_contactblock(App $a)
 {
 	$condition = ['uid' => 0, 'blocked' => true];
 
-	$total = dba::count('contact', $condition);
+	$total = DBA::count('contact', $condition);
 
 	$a->set_pager_total($total);
 	$a->set_pager_itemspage(30);
 
-	$statement = dba::select('contact', [], $condition, ['limit' => [$a->pager['start'], $a->pager['itemspage']]]);
+	$statement = DBA::select('contact', [], $condition, ['limit' => [$a->pager['start'], $a->pager['itemspage']]]);
 
-	$contacts = dba::inArray($statement);
+	$contacts = DBA::inArray($statement);
 
 	$t = get_markup_template('admin/contactblock.tpl');
 	$o = replace_macros($t, [
@@ -780,8 +781,12 @@ function admin_page_queue(App $a)
 function admin_page_workerqueue(App $a)
 {
 	// get jobs from the workerqueue table
-	$statement = dba::select('workerqueue', ['id', 'parameter', 'created', 'priority'], ['done' => 0], ['order'=> ['priority']]);
-	$r = dba::inArray($statement);
+	$statement = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], ['done' => 0], ['order'=> ['priority']]);
+	$r = DBA::inArray($statement);
+
+	for($i = 0; $i < count($r); $i++) {
+		$r[$i]['parameter'] = implode(json_decode($r[$i]['parameter']), ': ');
+	}
 
 	$t = get_markup_template('admin/workerqueue.tpl');
 	return replace_macros($t, [
@@ -811,7 +816,7 @@ function admin_page_workerqueue(App $a)
 function admin_page_summary(App $a)
 {
 	// are there MyISAM tables in the DB? If so, trigger a warning message
-	$r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", dbesc(dba::database_name()));
+	$r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", dbesc(DBA::database_name()));
 	$showwarning = false;
 	$warningtext = [];
 	if (DBM::is_result($r)) {
@@ -848,7 +853,7 @@ function admin_page_summary(App $a)
 	// Legacy config file warning
 	if (file_exists('.htconfig.php')) {
 		$showwarning = true;
-		$warningtext[] = L10n::t('Friencia\'s configuration now is stored in config/local.ini.php, please copy config/local-sample.ini.php and move your config from <code>.htconfig.php</code>.');
+		$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.ini.php, please copy config/local-sample.ini.php and move your config from <code>.htconfig.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->get_baseurl() . '/help/Config');
 	}
 
 	$r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`");
@@ -944,8 +949,6 @@ function admin_page_site_post(App $a)
 
 		function update_table($table_name, $fields, $old_url, $new_url)
 		{
-			global $a;
-
 			$dbold = dbesc($old_url);
 			$dbnew = dbesc($new_url);
 
@@ -959,7 +962,7 @@ function admin_page_site_post(App $a)
 			$r = q("UPDATE %s SET %s;", $table_name, $upds);
 
 			if (!DBM::is_result($r)) {
-				notice("Failed updating '$table_name': " . dba::errorMessage());
+				notice("Failed updating '$table_name': " . DBA::errorMessage());
 				goaway('admin/site');
 			}
 		}
@@ -1384,8 +1387,8 @@ function admin_page_site(App $a)
 		"develop" => L10n::t("check the development version")
 	];
 
-	if ($a->config['hostname'] == "") {
-		$a->config['hostname'] = $a->get_hostname();
+	if (empty(Config::get('config', 'hostname'))) {
+		Config::set('config', 'hostname', $a->get_hostname());
 	}
 	$diaspora_able = ($a->get_path() == "");
 
@@ -1412,9 +1415,9 @@ function admin_page_site(App $a)
 		'$relocate' => L10n::t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
 		'$baseurl' => System::baseUrl(true),
 		// name, label, value, help string, extra data...
-		'$sitename' 		=> ['sitename', L10n::t("Site name"), $a->config['sitename'],''],
-		'$hostname' 		=> ['hostname', L10n::t("Host name"), $a->config['hostname'], ""],
-		'$sender_email'		=> ['sender_email', L10n::t("Sender Email"), $a->config['sender_email'], L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"],
+		'$sitename' 		=> ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'),''],
+		'$hostname' 		=> ['hostname', L10n::t("Host name"), Config::get('config', 'hostname'), ""],
+		'$sender_email'		=> ['sender_email', L10n::t("Sender Email"), Config::get('config', 'sender_email'), L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"],
 		'$banner'		=> ['banner', L10n::t("Banner/Logo"), $banner, ""],
 		'$shortcut_icon'	=> ['shortcut_icon', L10n::t("Shortcut icon"), Config::get('system','shortcut_icon'),  L10n::t("Link to an icon that will be used for browsers.")],
 		'$touch_icon'		=> ['touch_icon', L10n::t("Touch icon"), Config::get('system','touch_icon'),  L10n::t("Link to an icon that will be used for tablets and mobiles.")],
@@ -1430,9 +1433,9 @@ function admin_page_site(App $a)
 		'$maximagelength'	=> ['maximagelength', L10n::t("Maximum image length"), Config::get('system','max_image_length'), L10n::t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")],
 		'$jpegimagequality'	=> ['jpegimagequality', L10n::t("JPEG image quality"), Config::get('system','jpeg_quality'), L10n::t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")],
 
-		'$register_policy'	=> ['register_policy', L10n::t("Register policy"), $a->config['register_policy'], "", $register_choices],
+		'$register_policy'	=> ['register_policy', L10n::t("Register policy"), Config::get('config', 'register_policy'), "", $register_choices],
 		'$daily_registrations'	=> ['max_daily_registrations', L10n::t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), L10n::t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect.")],
-		'$register_text'	=> ['register_text', L10n::t("Register text"), $a->config['register_text'], L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")],
+		'$register_text'	=> ['register_text', L10n::t("Register text"), Config::get('config', 'register_text'), L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")],
 		'$forbidden_nicknames' => ['forbidden_nicknames', L10n::t('Forbidden Nicknames'), Config::get('system', 'forbidden_nicknames'), L10n::t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')],
 		'$abandon_days'		=> ['abandon_days', L10n::t('Accounts abandoned after x days'), Config::get('system','account_abandon_days'), L10n::t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')],
 		'$allowed_sites'	=> ['allowed_sites', L10n::t("Allowed friend domains"), Config::get('system','allowed_sites'), L10n::t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")],
@@ -1670,13 +1673,13 @@ function admin_page_users_post(App $a)
 
 			Thank you and welcome to %4$s.'));
 
-		$preamble = sprintf($preamble, $user['username'], $a->config['sitename']);
-		$body = sprintf($body, System::baseUrl(), $user['email'], $result['password'], $a->config['sitename']);
+		$preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename'));
+		$body = sprintf($body, System::baseUrl(), $user['email'], $result['password'], Config::get('config', 'sitename'));
 
 		notification([
 			'type' => SYSTEM_EMAIL,
 			'to_email' => $user['email'],
-			'subject' => L10n::t('Registration details for %s', $a->config['sitename']),
+			'subject' => L10n::t('Registration details for %s', Config::get('config', 'sitename')),
 			'preamble' => $preamble,
 			'body' => $body]);
 	}
@@ -1727,7 +1730,7 @@ function admin_page_users(App $a)
 {
 	if ($a->argc > 2) {
 		$uid = $a->argv[3];
-		$user = dba::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]);
+		$user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]);
 		if (!DBM::is_result($user)) {
 			notice('User not found' . EOL);
 			goaway('admin/users');
@@ -1801,7 +1804,7 @@ function admin_page_users(App $a)
 				ORDER BY $sql_order $sql_order_direction LIMIT %d, %d", intval($a->pager['start']), intval($a->pager['itemspage'])
 	);
 
-	$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
+	$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
 	$_setup_users = function ($e) use ($adminlist) {
 		$page_types = [
 			PAGE_NORMAL => L10n::t('Normal Account Page'),
@@ -1828,7 +1831,6 @@ function admin_page_users(App $a)
 		$e['register_date'] = Temporal::getRelativeDate($e['register_date']);
 		$e['login_date'] = Temporal::getRelativeDate($e['login_date']);
 		$e['lastitem_date'] = Temporal::getRelativeDate($e['lastitem_date']);
-		//$e['is_admin'] = ($e['email'] === $a->config['admin_email']);
 		$e['is_admin'] = in_array($e['email'], $adminlist);
 		$e['is_deletable'] = (intval($e['uid']) != local_user());
 		$e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False);