X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=update.php;h=8f937752599535f34bd58d941ca5e2c4a231a751;hb=73e163100c108caee1e295d00ac8433ea62405be;hp=fda04b6ce4b01881af95741464a0959a2ded10a5;hpb=0f91d1cbde9e36b10d66fe756229ec8a9635f7eb;p=friendica.git

diff --git a/update.php b/update.php
index fda04b6ce4..8f93775259 100644
--- a/update.php
+++ b/update.php
@@ -1148,6 +1148,10 @@ function update_1502()
 
 function update_1505()
 {
+	if (!DBStructure::existsTable('config')) {
+		return Update::SUCCESS;
+	}
+
 	$conditions = [
 		"((`cat`  = ?) AND ((`k` LIKE ?) OR (`k` = ?) OR (`k` LIKE ?) OR (`k` = ?))) OR " .
 		"((`cat` != ?) AND  (`k` LIKE ?)) OR " .
@@ -1178,19 +1182,65 @@ function update_1505()
 
 function update_1508()
 {
-	$categories = DBA::toArray(DBA::p("SELECT DISTINCT `cat` AS 'cat' FROM `config`"));
+	$config = DBA::selectToArray('config');
 
-	foreach ($categories as $category) {
-		DI::config()->load($category['cat']);
+	$newConfig = DI::config()->beginTransaction();
+
+	foreach ($config as $entry) {
+		$newConfig->set($entry['cat'], $entry['k'], $entry['v']);
 	}
 
-	$config = DBA::selectToArray('config');
+	$newConfig->commit();
 
-	foreach ($config as $entry) {
-		DI::config()->set($entry['cat'], $entry['k'], $entry['v'], false);
+	return Update::SUCCESS;
+}
+
+function update_1509()
+{
+	$addons = DBA::selectToArray('addon');
+
+	$newConfig = DI::config()->beginTransaction();
+
+	foreach ($addons as $addon) {
+		$newConfig->set('addons', $addon['name'], [
+			'last_update' => $addon['timestamp'],
+			'admin' => (bool)$addon['plugin_admin'],
+		]);
 	}
 
-	DI::config()->save();
+	$newConfig->commit();
+
+	return Update::SUCCESS;
+}
+
+function update_1510()
+{
+	$blocks = DBA::select('pconfig', ['uid', 'v'], ['cat' => 'blockem', 'k' => 'words']);
+	while ($block = DBA::fetch($blocks)) {
+		foreach (explode(',', $block['v']) as $account) {
+			$id = Contact::getIdForURL(trim($account), 0, false);
+			if (empty($id)) {
+				continue;
+			}
+			Contact\User::setCollapsed($id, $block['uid'], true);
+		}
+	}
+	return Update::SUCCESS;
+}
 
-	DBA::e("DELETE FROM `config`");
+function update_1512()
+{
+	DI::keyValue()->set('nodeinfo_total_users', DI::config()->get('nodeinfo', 'total_users'));
+	DI::keyValue()->set('nodeinfo_active_users_halfyear', DI::config()->get('nodeinfo', 'active_users_halfyear'));
+	DI::keyValue()->set('nodeinfo_active_users_monthly', DI::config()->get('nodeinfo', 'active_users_monthly'));
+	DI::keyValue()->set('nodeinfo_active_users_weekly', DI::config()->get('nodeinfo', 'active_users_weekly'));
+	DI::keyValue()->set('nodeinfo_local_posts', DI::config()->get('nodeinfo', 'local_posts'));
+	DI::keyValue()->set('nodeinfo_local_comments', DI::config()->get('nodeinfo', 'local_comments'));
+
+	DI::config()->delete('nodeinfo', 'total_users');
+	DI::config()->delete('nodeinfo', 'active_users_halfyear');
+	DI::config()->delete('nodeinfo', 'active_users_monthly');
+	DI::config()->delete('nodeinfo', 'active_users_weekly');
+	DI::config()->delete('nodeinfo', 'local_posts');
+	DI::config()->delete('nodeinfo', 'local_comments');
 }