nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add remaning/moving to files not touch by refactoring because of typo

Browse source
This commit is contained in:
Jonny Tischbein 2018-10-17 22:35:49 +02:00
parent 0c0e17b7a7
commit a937cf06a3
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mod/profiles.php
View file

@ -4,6 +4,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\BaseModule;
use Friendica\Content\ContactSelector; use Friendica\Content\ContactSelector;
use Friendica\Content\Feature; use Friendica\Content\Feature;
use Friendica\Content\Nav; use Friendica\Content\Nav;
@ -20,7 +21,6 @@ use Friendica\Model\Profile;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
use Friendica\Utill\Security;
use Friendica\Module\Login; use Friendica\Module\Login;
function profiles_init(App $a) { function profiles_init(App $a) {
@ -42,7 +42,7 @@ function profiles_init(App $a) {
return; // NOTREACHED 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 // 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')) { 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", $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
intval(local_user())); intval(local_user()));
@ -101,7 +101,7 @@ function profiles_init(App $a) {
if (($a->argc > 2) && ($a->argv[1] === 'clone')) { 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", $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
intval(local_user())); intval(local_user()));
@ -196,7 +196,7 @@ function profiles_post(App $a) {
return; return;
} }
Security::check_form_security_token_redirectOnErr('/profiles', 'profile_edit'); BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_edit');
$is_default = (($orig[0]['is-default']) ? 1 : 0); $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'), '$multi_profiles' => Feature::isEnabled(local_user(), 'multi_profiles'),
'$form_security_token' => Security::get_form_security_token("profile_edit"), '$form_security_token' => BaseModule::getFormSecurityToken("profile_edit"),
'$form_security_token_photo' => Security::get_form_security_token("profile_photo"), '$form_security_token_photo' => BaseModule::getFormSecurityToken("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_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=' . Security::get_form_security_token("profile_drop"), '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . BaseModule::getFormSecurityToken("profile_drop"),
'$profile_action' => L10n::t('Profile Actions'), '$profile_action' => L10n::t('Profile Actions'),
'$banner' => L10n::t('Edit Profile Details'), '$banner' => L10n::t('Edit Profile Details'),
@ -682,7 +682,7 @@ function profiles_content(App $a) {
'$header' => L10n::t('Edit/Manage Profiles'), '$header' => L10n::t('Edit/Manage Profiles'),
'$chg_photo' => L10n::t('Change profile photo'), '$chg_photo' => L10n::t('Change profile photo'),
'$cr_new' => L10n::t('Create New Profile'), '$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 '$profiles' => $profiles
]); ]);
} }

3
src/Model/Item.php
View file

@ -24,6 +24,7 @@ use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus; use Friendica\Protocol\OStatus;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\XML; use Friendica\Util\XML;
use Friendica\Util\Security;
use Text_LanguageDetect; use Text_LanguageDetect;
require_once 'boot.php'; require_once 'boot.php';
@ -3060,7 +3061,7 @@ class Item extends BaseObject
$uid = local_user(); $uid = local_user();
} }
if (!Security::can_write_wall($uid)) { if (!Security::canWriteToUserWall($uid)) {
logger('like: unable to write on wall ' . $uid); logger('like: unable to write on wall ' . $uid);
return false; return false;
} }