Merge pull request #4079 from MrPetovan/task/4069-add-pagination-to-statuses-api

[friendica.git] / include / security.php

diff --git a/include/security.php b/include/security.php
index ffab0e0953f8486fc89b427932e92b6cce2b0d32..6f6ef94b6937cba12c154fa37dfc1e0dce6427c3 100644 (file)
--- a/include/security.php
+++ b/include/security.php
@@ -1,7 +1,10 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 /**
  * @brief Calculate the hash that is needed for the "Friendica" cookie
@@ -11,8 +14,8 @@ use Friendica\Core\System;
  * @return string Hashed data
  */
 function cookie_hash($user) {
-       return(hash("sha256", get_config("system", "site_prvkey").
-                               $user["uprvkey"].
+       return(hash("sha256", Config::get("system", "site_prvkey").
+                               $user["prvkey"].
                                $user["password"]));
 }
 
@@ -38,7 +41,7 @@ function new_cookie($time, $user = array()) {
        }
 
        setcookie("Friendica", $value, $time, "/", "",
-               (get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true);
+               (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL), true);
 
 }
 
@@ -48,7 +51,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 
        $_SESSION['uid'] = $user_record['uid'];
        $_SESSION['theme'] = $user_record['theme'];
-       $_SESSION['mobile-theme'] = get_pconfig($user_record['uid'], 'system', 'mobile_theme');
+       $_SESSION['mobile-theme'] = PConfig::get($user_record['uid'], 'system', 'mobile_theme');
        $_SESSION['authenticated'] = 1;
        $_SESSION['page_flags'] = $user_record['page-flags'];
        $_SESSION['my_url'] = System::baseUrl() . '/profile/' . $user_record['nickname'];
@@ -85,14 +88,14 @@ function authenticate_success($user_record, $login_initial = false, $interactive
                $r = dba::fetch_first("SELECT * FROM `user` WHERE `uid` = ? LIMIT 1",
                        intval($_SESSION['submanage'])
                );
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $master_record = $r;
                }
        }
 
        $r = dba::select('user', array('uid', 'username', 'nickname'),
                array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false));
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                $a->identities = dba::inArray($r);
        } else {
                $a->identities = array();
@@ -104,7 +107,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
                WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?",
                $master_record['uid']
        );
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                $a->identities = array_merge($a->identities, dba::inArray($r));
        }
 
@@ -116,7 +119,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        }
 
        $r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $_SESSION['uid']);
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                $a->contact = $r;
                $a->cid = $r['id'];
                $_SESSION['cid'] = $a->cid;
@@ -207,7 +210,7 @@ function can_write_wall(App $a, $owner) {
                                intval(PAGE_COMMUNITY)
                        );
 
-                       if (dbm::is_result($r)) {
+                       if (DBM::is_result($r)) {
                                $verified = 2;
                                return true;
                        }
@@ -257,7 +260,7 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
                                intval($remote_user),
                                intval($owner_id)
                        );
-                       if (dbm::is_result($r)) {
+                       if (DBM::is_result($r)) {
                                $remote_verified = true;
                                $groups = init_groups_visitor($remote_user);
                        }
@@ -336,7 +339,7 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
                                intval($remote_user),
                                intval($owner_id)
                        );
-                       if (dbm::is_result($r)) {
+                       if (DBM::is_result($r)) {
                                $remote_verified = true;
                                $groups = init_groups_visitor($remote_user);
                        }
@@ -454,7 +457,7 @@ function init_groups_visitor($contact_id) {
                WHERE `contact-id` = %d ",
                intval($contact_id)
        );
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                foreach ($r as $rr)
                        $groups[] = $rr['gid'];
        }