X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fadmin.php;h=ee1526468a30659fbb0165565f484aded8984b5b;hb=bf0b98017decf73123891e935993f2921d3b0acf;hp=d7495340b4c961932c84e7ec81732ff3263ee5a6;hpb=fb0a21c0a28aa7d7488aca4440a60e5d728f2995;p=friendica.git

diff --git a/mod/admin.php b/mod/admin.php
index d7495340b4..ee1526468a 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -17,9 +17,11 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Contact;
-use Friendica\Model\User;
 use Friendica\Model\Item;
+use Friendica\Model\User;
 use Friendica\Module\Login;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 
 require_once 'include/enotify.php';
 require_once 'include/text.php';
@@ -382,7 +384,7 @@ function admin_page_contactblock_post(App $a)
 	check_form_security_token_redirectOnErr('/admin/contactblock', 'admin_contactblock');
 
 	if (x($_POST, 'page_contactblock_block')) {
-		$contact_id = Contact::getIdForURL($contact_url, 0);
+		$contact_id = Contact::getIdForURL($contact_url);
 		if ($contact_id) {
 			Contact::block($contact_id);
 			notice(L10n::t('The contact has been blocked from the node'));
@@ -503,7 +505,7 @@ function admin_page_deleteitem_post(App $a)
 		// associated threads.
 		$r = dba::select('item', ['id'], ['guid' => $guid]);
 		while ($row = dba::fetch($r)) {
-			Item::delete($row['id']);
+			Item::deleteById($row['id']);
 		}
 		dba::close($r);
 	}
@@ -537,7 +539,7 @@ function admin_page_federation(App $a)
 	// off one % two of them are needed in the query
 	// Add more platforms if you like, when one returns 0 known nodes it is not
 	// displayed on the stats page.
-	$platforms = ['Friendi%%a', 'Diaspora', '%%red%%', 'Hubzilla', 'BlaBlaNet', 'GNU Social', 'StatusNet', 'Mastodon', 'Pleroma', 'socialhome'];
+	$platforms = ['Friendi%%a', 'Diaspora', '%%red%%', 'Hubzilla', 'BlaBlaNet', 'GNU Social', 'StatusNet', 'Mastodon', 'Pleroma', 'socialhome', 'ganggo'];
 	$colors = [
 		'Friendi%%a' => '#ffc018', // orange from the logo
 		'Diaspora'   => '#a1a1a1', // logo is black and white, makes a gray
@@ -548,7 +550,8 @@ function admin_page_federation(App $a)
 		'StatusNet'  => '#789240', // the green from the logo (red and blue have already others
 		'Mastodon'   => '#1a9df9', // blue from the Mastodon logo
 		'Pleroma'    => '#E46F0F', // Orange from the text that is used on Pleroma instances
-		'socialhome' => '#52056b'  // lilac from the Django Image used at the Socialhome homepage
+		'socialhome' => '#52056b' , // lilac from the Django Image used at the Socialhome homepage
+		'ganggo'     => '#69d7e2' // from the favicon
 	];
 	$counts = [];
 	$total = 0;
@@ -739,7 +742,7 @@ function admin_page_summary(App $a)
 	if (!$last_worker_call) {
 		$showwarning = true;
 		$warningtext[] = L10n::t('The worker was never executed. Please check your database structure!');
-	} elseif ((strtotime(datetime_convert()) - strtotime($last_worker_call)) > 60 * 60) {
+	} elseif ((strtotime(DateTimeFormat::utcNow()) - strtotime($last_worker_call)) > 60 * 60) {
 		$showwarning = true;
 		$warningtext[] = L10n::t('The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.', $last_worker_call);
 	}
@@ -1565,7 +1568,7 @@ function admin_page_users(App $a)
 	if ($a->argc > 2) {
 		$uid = $a->argv[3];
 		$user = dba::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]);
-		if (DBM::is_result($user)) {
+		if (!DBM::is_result($user)) {
 			notice('User not found' . EOL);
 			goaway('admin/users');
 			return ''; // NOTREACHED
@@ -1647,13 +1650,13 @@ function admin_page_users(App $a)
 			L10n::t('Automatic Friend Account')
 		];
 		$e['page-flags'] = $accounts[$e['page-flags']];
-		$e['register_date'] = relative_date($e['register_date']);
-		$e['login_date'] = relative_date($e['login_date']);
-		$e['lastitem_date'] = relative_date($e['lastitem_date']);
+		$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'] ? relative_date($e['account_expires_on']) : False);
+		$e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False);
 		return $e;
 	};
 	$users = array_map($_setup_users, $users);