update function names in logger and comments

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 1e0687c6546feba3183ea19c3369944d8e2e87b1..5fdff41e8c6b6d54820f5a45bac9279197032c69 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -188,7 +188,7 @@ function profile_photo_content(App $a)
        $imagecrop = [];
 
        if (isset($a->argv[1]) && $a->argv[1] == 'use' && $a->argc >= 3) {
-               // check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+               // BaseModule::checkFormSecurityTokenRedirectOnError('/profile_photo', 'profile_photo');
 
                $resource_id = $a->argv[2];
                //die(":".local_user());

diff --git a/mod/videos.php b/mod/videos.php
index 54451a74b442b39a63d6af60e1a3367d222fe00a..b66a7cbcda937cb192bcec78c4720b9936cada13 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -60,7 +60,7 @@ function videos_init(App $a)
                ]);
 
                /// @TODO Old-lost code?
-               /*$sql_extra = permissions_sql($a->data['user']['uid']);
+               /*$sql_extra = Security::getPermissionsSQLByUserId($a->data['user']['uid']);
 
                $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc",
                        intval($a->data['user']['uid'])

diff --git a/src/BaseModule.php b/src/BaseModule.php
index 0f6fbd785b28369e472afdf8ba1a7dc1b005d113..e77b1a1491e3714f2c1cef34a39dcc43166cb033 100644 (file)
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -135,9 +135,9 @@ abstract class BaseModule extends BaseObject
        {
                if (!self::checkFormSecurityToken($typename, $formname)) {
                        $a = get_app();
-                       logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
-                       logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
-                       notice(check_form_security_std_err_msg());
+                       logger('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
+                       logger('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
+                       notice(self::getFormSecurityStandardErrorMessage());
                        goaway(System::baseUrl() . $err_redirect);
                }
        }
@@ -146,8 +146,8 @@ abstract class BaseModule extends BaseObject
        {
                if (!self::checkFormSecurityToken($typename, $formname)) {
                        $a = get_app();
-                       logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
-                       logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
+                       logger('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
+                       logger('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
                        header('HTTP/1.1 403 Forbidden');
                        killme();
                }