From cec12fb078b118f5d16d1988a1df0216caac01af Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Thu, 9 Oct 2014 08:21:46 +0200 Subject: [PATCH] pass $header and $ghost to underline function that require them --- web/Obj/brisk.phh | 10 +++++----- web/index.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 3af8a15..41653d1 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -2143,7 +2143,7 @@ class Brisk } /* - * function add_user(&$brisk, &$sess, &$idx, $name, $pass, $ip) + * function add_user(&$brisk, &$sess, &$idx, $name, $pass, $ip, $header, $cookie) * * RETURN VALUE: * if ($idx > -1 && ret == FALSE) => duplicated nick @@ -2154,7 +2154,7 @@ class Brisk * if ($idx == -$idx && ret == user) => SUCCESS (but the login exists in the auth db) */ - function add_user(&$sess, &$idx, $name, $pass, $ip, $cookie) + function add_user(&$sess, &$idx, $name, $pass, $ip, $header, $cookie) { GLOBAL $G_base; @@ -2264,7 +2264,7 @@ class Brisk $idx = $ghost; if (defined('CURL_DE_SAC_VERS')) { - brisk_cds_execute($this, $real_idx, $sess, $ip, $authenticate); + brisk_cds_execute($this, $ghost, $real_idx, $sess, $ip, $authenticate, $header); } return ($this->user[$ghost]); } @@ -2366,7 +2366,7 @@ class Brisk $ret = $this->user[$real_idx]; if (defined('CURL_DE_SAC_VERS')) { - brisk_cds_execute($this, $real_idx, $sess, $ip, $authenticate); + brisk_cds_execute($this, $ghost, $real_idx, $sess, $ip, $authenticate, $header); } return ($ret); } @@ -2528,7 +2528,7 @@ class Brisk case "": case "index.php": ob_start(); - index_main($this, $transp_type, $header_out, $addr, $get, $post, $cookie); + index_main($this, $transp_type, $header, $header_out, $addr, $get, $post, $cookie); $content = ob_get_contents(); ob_end_clean(); diff --git a/web/index.php b/web/index.php index 70e1ddd..498f2fb 100644 --- a/web/index.php +++ b/web/index.php @@ -297,7 +297,7 @@ function sidebanners_render($sidebanner, $sidebanner_idx) } } -function index_main(&$brisk, $transp_type, &$header_out, $remote_addr_full, $get, $post, $cookie) +function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_full, $get, $post, $cookie) { GLOBAL $G_with_donors, $G_donors_cur, $G_donors_all; GLOBAL $G_with_topbanner, $G_topbanner, $G_is_local; @@ -374,7 +374,7 @@ function index_main(&$brisk, $transp_type, &$header_out, $remote_addr_full, $get /* try login */ if ($banned == FALSE && - ($user = $brisk->add_user(&$sess, &$idx, $name, $pass_private, $remote_addr, $cookie)) != FALSE) { + ($user = $brisk->add_user(&$sess, &$idx, $name, $pass_private, $remote_addr, $header, $cookie)) != FALSE) { $brisk->sess_cur_set($user->sess); $ACTION = "room"; if ($idx < 0) { -- 2.17.1