X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=public_server%2Fpublic_server.php;h=482a8a0c65a75824e74e05885306ae28ff96c99f;hb=b4f0d0bd75d000aa0408404a44a8ad995b71d651;hp=f908b9fdf707c43cbdd60a21ed749c03cfc52d53;hpb=7509ce88b934a321369f5eeb5eb2b371b222878d;p=friendica-addons.git

diff --git a/public_server/public_server.php b/public_server/public_server.php
index f908b9fd..482a8a0c 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: public_server
- * Description: Friendica addon with functions suitable for a public server. WARNING: This addon is currently not well maintained. It may produce inexpected results. Use with caution!
+ * Description: Friendica addon with functions suitable for a public server. WARNING: This addon is currently not well maintained. It may produce unexpected results. Use with caution!
  * Version: 1.1
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  */
@@ -13,7 +13,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -27,15 +27,6 @@ function public_server_install()
 	Hook::register('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
-function public_server_uninstall()
-{
-	Hook::unregister('load_config',      'addon/public_server/public_server.php', 'public_server_load_config');
-	Hook::unregister('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
-	Hook::unregister('cron', 'addon/public_server/public_server.php', 'public_server_cron');
-	Hook::unregister('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
-	Hook::unregister('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
-}
-
 function public_server_load_config(App $a, ConfigFileLoader $loader)
 {
 	$a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
@@ -67,12 +58,9 @@ function public_server_cron($a, $b)
 	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
 			notification([
+				'type' => Notification\Type::SYSTEM,
 				'uid' => $rr['uid'],
-				'type' => Type::SYSTEM,
 				'system_type' => 'public_server_expire',
-				'language'     => $rr['language'],
-				'to_name'      => $rr['username'],
-				'to_email'     => $rr['email'],
 				'source_name'  => DI::l10n()->t('Administrator'),
 				'source_link'  => DI::baseUrl()->get(),
 				'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg',
@@ -124,7 +112,7 @@ function public_server_cron($a, $b)
 
 function public_server_enotify(&$a, &$b)
 {
-	if (!empty($b['params']) && $b['params']['type'] == Type::SYSTEM
+	if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM
 		&& !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') {
 		$b['itemlink'] = DI::baseUrl()->get();
 		$b['epreamble'] = $b['preamble'] = DI::l10n()->t('Your account on %s will expire in a few days.', DI::config()->get('system', 'sitename'));
@@ -160,7 +148,6 @@ function public_server_addon_admin_post(&$a)
 	DI::config()->set('public_server', 'flagusers', $flagusers);
 	DI::config()->set('public_server', 'flagposts', $flagposts);
 	DI::config()->set('public_server', 'flagpostsexpire', $flagpostsexpire);
-	info(DI::l10n()->t('Settings saved').EOL);
 }
 
 function public_server_addon_admin(&$a, &$o)