]> git.mxchange.org Git - friendica.git/commitdiff
add remaning/moving to files not touch by refactoring because of typo
authorJonny Tischbein <jonny_tischbein@systemli.org>
Wed, 17 Oct 2018 20:35:49 +0000 (22:35 +0200)
committerJonny Tischbein <jonny_tischbein@systemli.org>
Wed, 17 Oct 2018 20:35:49 +0000 (22:35 +0200)
mod/profiles.php
src/Model/Item.php

index 37277f3f24e44e2f1665892d889a8300cc7978a9..22f192b4ce6fa8f34f5308fdae4f80c2109f3f47 100644 (file)
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
@@ -20,7 +21,6 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
-use Friendica\Utill\Security;
 use Friendica\Module\Login;
 
 function profiles_init(App $a) {
@@ -42,7 +42,7 @@ function profiles_init(App $a) {
                        return; // NOTREACHED
                }
 
-               Security::check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_drop', 't');
 
                // move every contact using this profile as their default to the user default
 
@@ -65,7 +65,7 @@ function profiles_init(App $a) {
 
        if (($a->argc > 1) && ($a->argv[1] === 'new')) {
 
-               Security::check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_new', 't');
 
                $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
                        intval(local_user()));
@@ -101,7 +101,7 @@ function profiles_init(App $a) {
 
        if (($a->argc > 2) && ($a->argv[1] === 'clone')) {
 
-               Security::check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_clone', 't');
 
                $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
                        intval(local_user()));
@@ -196,7 +196,7 @@ function profiles_post(App $a) {
                        return;
                }
 
-               Security::check_form_security_token_redirectOnErr('/profiles', 'profile_edit');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_edit');
 
                $is_default = (($orig[0]['is-default']) ? 1 : 0);
 
@@ -566,10 +566,10 @@ function profiles_content(App $a) {
                        ],
 
                        '$multi_profiles'               => Feature::isEnabled(local_user(), 'multi_profiles'),
-                       '$form_security_token'          => Security::get_form_security_token("profile_edit"),
-                       '$form_security_token_photo'    => Security::get_form_security_token("profile_photo"),
-                       '$profile_clone_link'           => ((Feature::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . Security::get_form_security_token("profile_clone") : ""),
-                       '$profile_drop_link'            => 'profiles/drop/' . $r[0]['id'] . '?t=' . Security::get_form_security_token("profile_drop"),
+                       '$form_security_token'          => BaseModule::getFormSecurityToken("profile_edit"),
+                       '$form_security_token_photo'    => BaseModule::getFormSecurityToken("profile_photo"),
+                       '$profile_clone_link'           => ((Feature::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . BaseModule::getFormSecurityToken("profile_clone") : ""),
+                       '$profile_drop_link'            => 'profiles/drop/' . $r[0]['id'] . '?t=' . BaseModule::getFormSecurityToken("profile_drop"),
 
                        '$profile_action' => L10n::t('Profile Actions'),
                        '$banner'       => L10n::t('Edit Profile Details'),
@@ -682,7 +682,7 @@ function profiles_content(App $a) {
                                '$header'      => L10n::t('Edit/Manage Profiles'),
                                '$chg_photo'   => L10n::t('Change profile photo'),
                                '$cr_new'      => L10n::t('Create New Profile'),
-                               '$cr_new_link' => 'profiles/new?t=' . Security::get_form_security_token("profile_new"),
+                               '$cr_new_link' => 'profiles/new?t=' . BaseModule::getFormSecurityToken("profile_new"),
                                '$profiles'    => $profiles
                        ]);
                }
index bc31f3d819aa9a4b6c589162432ae70f06ef309b..dd513d0008fe129766ae08d2b93b671f1106e469 100644 (file)
@@ -24,6 +24,7 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\XML;
+use Friendica\Util\Security;
 use Text_LanguageDetect;
 
 require_once 'boot.php';
@@ -3060,7 +3061,7 @@ class Item extends BaseObject
                        $uid = local_user();
                }
 
-               if (!Security::can_write_wall($uid)) {
+               if (!Security::canWriteToUserWall($uid)) {
                        logger('like: unable to write on wall ' . $uid);
                        return false;
                }