r129: s/mysetcookie/$funct->cookie/g

diff --git a/admin/global.php b/admin/global.php
index c0dcfe6e11666f726f1050cd26061db79a692dc2..c8b14f20d880a96f0345b556bd40da89da90793e 100755 (executable)
--- a/admin/global.php
+++ b/admin/global.php
@@ -75,13 +75,13 @@ if ($_COOKIE[COOKIE_PREFIX . 'adminsession'])
        {
                if (md5(md5($bugsys->userinfo['authkey']) . md5($bugsys->userinfo['email']) . md5($bugsys->userinfo['userid'])) != $_COOKIE[COOKIE_PREFIX . 'adminsession'])
                {
-                       mysetcookie(COOKIE_PREFIX . 'adminsession', '');
+                       $funct->cookie(COOKIE_PREFIX . 'adminsession', '');
                        $admin->error(phrase('invalid_admin_session_terminated'));
                }
        }
        else
        {
-               mysetcookie(COOKIE_PREFIX . 'adminsession', '');
+               $funct->cookie(COOKIE_PREFIX . 'adminsession', '');
                admin_login();
        }
 }

diff --git a/login.php b/login.php
index 8c112b10749b2b5bde2dd812f7aa7dc169fd58c0..da05e59ce679d04d99174e3121783dd4c868b32b 100755 (executable)
--- a/login.php
+++ b/login.php
@@ -35,10 +35,10 @@ if (empty($_REQUEST['do']))
 
 if ($_POST['do'] == 'login' OR $_POST['do'] == 'cplogin')
 {
-       $rememberme = intval($bugsys->in['rememberme']);
+       $keeplogin = intval($bugsys->in['rememberme']);
        if ($_POST['cplogin'])
        {
-               $rememberme = 0;
+               $keeplogin = 0;
        }
        
        if ($_SERVER['HTTP_REFERER'] AND !$_POST['goindex'])
@@ -53,8 +53,8 @@ if ($_POST['do'] == 'login' OR $_POST['do'] == 'cplogin')
        $userinfo = $db->query_first("SELECT * FROM user WHERE email = '" . $bugsys->in['email'] . "'");
        if (md5(md5($bugsys->in['password']) . md5($userinfo['salt'])) == $userinfo['password'])
        {
-               $funct->cookie(COOKIE_PREFIX . 'userid', $userinfo['userid'], $rememberme);
-               $funct->cookie(COOKIE_PREFIX . 'authkey', $userinfo['authkey'], $rememberme);
+               $funct->cookie(COOKIE_PREFIX . 'userid', $userinfo['userid'], $keeplogin);
+               $funct->cookie(COOKIE_PREFIX . 'authkey', $userinfo['authkey'], $keeplogin);
        }
        else
        {
@@ -81,7 +81,7 @@ if ($_REQUEST['do'] == 'logout')
        if ($bugsys->userinfo['userid'])
        {
                $funct->cookie(COOKIE_PREFIX . 'userid');
-               mysetcookie(COOKIE_PREFIX . 'authkey');
+               $funct->cookie(COOKIE_PREFIX . 'authkey');
        }
        else
        {