renaming and moving from security to Model/Item and BaseModule

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 05d55e53e44f626d1a7bf5794c792eb46a8ed2c9..ce5da9c36c8bcbba4d13c8a15159a3012336310d 100644 (file)
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -34,6 +34,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
@@ -234,7 +235,7 @@ function advancedcontentfilter_content(App $a)
                        ],
                        '$current_theme' => $a->getCurrentTheme(),
                        '$rules' => advancedcontentfilter_get_rules(),
-                       '$form_security_token' => Security::get_form_security_token()
+                       '$form_security_token' => BaseModule::getFormSecurityToken()
                ]);
        }
 }
@@ -322,7 +323,7 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request)
                throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
        }
 
-       if (!Security::check_form_security_token()) {
+       if (!BaseModule::checkFormSecurityToken()) {
                throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
        }
 
@@ -356,7 +357,7 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
                throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
        }
 
-       if (!Security::check_form_security_token()) {
+       if (!BaseModule::checkFormSecurityToken()) {
                throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
        }
 
@@ -385,7 +386,7 @@ function advancedcontentfilter_delete_rules_id(ServerRequestInterface $request,
                throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
        }
 
-       if (!Security::check_form_security_token()) {
+       if (!BaseModule::checkFormSecurityToken()) {
                throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
        }
 

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index bb8c9f2712991521da47bd47f2d0cbf67bf0e9b7..9a23edfe6aae05def7e05dec7e2ef2134b285117 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -104,7 +105,7 @@ function gravatar_addon_admin (&$a, &$o) {
        }
 
        // output Gravatar settings
-       $o .= '<input type="hidden" name="form_security_token" value="' .Security::get_form_security_token("gravatarsave") .'">';
+       $o .= '<input type="hidden" name="form_security_token" value="' . BaseModule::getFormSecurityToken("gravatarsave") .'">';
        $o .= replace_macros( $t, [
                '$submit' => L10n::t('Save Settings'),
                '$default_avatar' => ['avatar', L10n::t('Default avatar image'), $default_avatar, L10n::t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars],
@@ -116,7 +117,7 @@ function gravatar_addon_admin (&$a, &$o) {
  * Save admin settings
  */
 function gravatar_addon_admin_post (&$a) {
-       Security::check_form_security_token('gravatarsave');
+       BaseModule::checkFormSecurityToken('gravatarsave');
 
        $default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon');
        $rating = ((x($_POST, 'rating')) ? notags(trim($_POST['rating'])) : 'g');

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 787231bfc122af9e973f3dda1d393b7cc546ca6f..bc6715486a3f02b2c5456628cb4dd58eefcb87ff 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -107,7 +108,7 @@ function libravatar_addon_admin(&$a, &$o)
        }
 
        // output Libravatar settings
-       $o .= '<input type="hidden" name="form_security_token" value="' .Security::get_form_security_token("libravatarsave") .'">';
+       $o .= '<input type="hidden" name="form_security_token" value="' . BaseModule::getFormSecurityToken("libravatarsave") .'">';
        $o .= replace_macros( $t, [
                '$submit' => L10n::t('Save Settings'),
                '$default_avatar' => ['avatar', L10n::t('Default avatar image'), $default_avatar, L10n::t('Select default avatar image if none was found. See README'), $default_avatars],
@@ -119,7 +120,7 @@ function libravatar_addon_admin(&$a, &$o)
  */
 function libravatar_addon_admin_post(&$a)
 {
-       Security::check_form_security_token('libravatarrsave');
+       BaseModule::checkFormSecurityToken('libravatarrsave');
 
        $default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon');
        Config::set('libravatar', 'default_avatar', $default_avatar);

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 2e020b86640a46ef504e17bc6df6cc7631fed271..4d552951a6eb3be3a40a7b6729ea531c42a2d2ff 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -6,6 +6,7 @@
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  */
 
+use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -143,7 +144,7 @@ function public_server_login($a, $b)
 
 function public_server_addon_admin_post(&$a)
 {
-       Security::check_form_security_token_redirectOnErr('/admin/addons/publicserver', 'publicserver');
+       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons/publicserver', 'publicserver');
        $expiredays = (x($_POST, 'expiredays') ? notags(trim($_POST['expiredays'])) : '');
        $expireposts = (x($_POST, 'expireposts') ? notags(trim($_POST['expireposts'])) : '');
        $nologin = (x($_POST, 'nologin') ? notags(trim($_POST['nologin'])) : '');
@@ -161,7 +162,7 @@ function public_server_addon_admin_post(&$a)
 
 function public_server_addon_admin(&$a, &$o)
 {
-       $token = Security::get_form_security_token("publicserver");
+       $token = BaseModule::getFormSecurityToken("publicserver");
        $t = get_markup_template("admin.tpl", "addon/public_server");
        $o = replace_macros($t, [
                '$submit' => L10n::t('Save Settings'),

diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index ff9c4464eb11afa41924be69a9f1090ad16f1335..38ab60b3bf7affc8243127b469440772a1f43a6a 100644 (file)
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -472,7 +472,7 @@ function windowsphonepush_login(App $a)
                die('This api requires login');
        }
 
-       Authentication::success($record);
+       Authentication::setAuthenticatedSessionForUser($record);
        $_SESSION["allow_api"] = true;
        Addon::callHooks('logged_in', $a->user);
 }