From 0b0a26a0105f700f50c3342d6385d7abd90e3215 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Fri, 7 Mar 2014 07:56:43 +0100 Subject: [PATCH 1/5] [FIX] Unset POPUPs on disabled API --- public/include/classes/api.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/public/include/classes/api.class.php b/public/include/classes/api.class.php index 8e245a22..913a1f03 100644 --- a/public/include/classes/api.class.php +++ b/public/include/classes/api.class.php @@ -15,6 +15,7 @@ class Api extends Base { return true; } else { if ($error == true) { + unset($_SESSION['POPUP']); header('HTTP/1.1 501 Not implemented'); die('501 Not implemented'); } From 8651cd38ad709523359413741a0da3c9f3cd8392 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Sat, 8 Mar 2014 08:41:00 +0100 Subject: [PATCH 2/5] [FIX] Changing Cookie Domain --- public/include/bootstrap.php | 10 +++++----- public/include/classes/user.class.php | 7 ++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/public/include/bootstrap.php b/public/include/bootstrap.php index fc300de6..c63ad5fa 100644 --- a/public/include/bootstrap.php +++ b/public/include/bootstrap.php @@ -19,13 +19,13 @@ if (!include_once(BASEPATH . 'include/config/security.inc.dist.php')) die('Unabl if (@file_exists(BASEPATH . 'include/config/security.inc.php')) include_once(BASEPATH . 'include/config/security.inc.php'); // start our session, we need it for smarty caching -$session_start = @session_start(); session_set_cookie_params(time()+$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly']); +$session_start = @session_start(); if (!$session_start) { - $log->log("info", "Forcing session id regeneration, session failed to start [hijack attempt?]"); - session_destroy(); - session_regenerate_id(true); - session_start(); + $log->log("info", "Forcing session id regeneration, session failed to start [hijack attempt?]"); + session_destroy(); + session_regenerate_id(true); + session_start(); } @setcookie(session_name(), session_id(), time()+$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly']); diff --git a/public/include/classes/user.class.php b/public/include/classes/user.class.php index 96c15cb8..81fefd45 100644 --- a/public/include/classes/user.class.php +++ b/public/include/classes/user.class.php @@ -624,15 +624,12 @@ class User extends Base { // Unset all of the session variables $_SESSION = array(); // As we're killing the sesison, also kill the cookie! - if (ini_get("session.use_cookies")) { - $params = session_get_cookie_params(); - setcookie(session_name(), '', time() - 42000, $params["path"], $params["domain"], $params["secure"], $params["httponly"]); - } + setcookie(session_name(), '', time() - 42000); // Destroy the session. session_destroy(); // Enforce generation of a new Session ID and delete the old session_regenerate_id(true); - + // Enforce a page reload and point towards login with referrer included, if supplied $port = ($_SERVER["SERVER_PORT"] == "80" || $_SERVER["SERVER_PORT"] == "443") ? "" : (":".$_SERVER["SERVER_PORT"]); $pushto = $_SERVER['SCRIPT_NAME'].'?page=login'; From 3c33e1b36f0cd5d9b099a5f872cf96df6b14275f Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Sat, 8 Mar 2014 11:11:09 +0100 Subject: [PATCH 3/5] [CHANGE] issue #1905 --- public/include/admin_checks.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/include/admin_checks.php b/public/include/admin_checks.php index b10e9dfa..98ecbbb2 100644 --- a/public/include/admin_checks.php +++ b/public/include/admin_checks.php @@ -9,7 +9,7 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][ // setup some basic stuff for checking - getuid/getpwuid not available on mac/windows $apache_user = 'unknown'; - if (substr_count(strtolower(PHP_OS), 'nix') > 0) { + if (substr_count(strtolower(PHP_OS), 'nix') > 0 || substr_count(strtolower(PHP_OS), 'linux') > 0) { $apache_user = (function_exists('posix_getuid')) ? posix_getuid() : 'unknown'; $apache_user = (function_exists('posix_getpwuid')) ? posix_getpwuid($apache_user) : $apache_user; } @@ -100,7 +100,7 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][ if ($socket !== false) { $address = @gethostbyname($config['gettingstarted']['stratumurl']); $result = @socket_connect($socket, $address, $config['gettingstarted']['stratumport']); - if ($result !== 1) { + if ($result !== true) { $enotice[] = "We tried to poke your Stratum server using config->gettingstarted details but it didn't respond"; } $close = @socket_close($socket); From 603961df1ea1dd38a534189dea1c7c7219414115 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Mon, 10 Mar 2014 13:06:41 +0100 Subject: [PATCH 4/5] [FIX] added default start var to worker paging --- public/templates/bootstrap/account/transactions/default.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/bootstrap/account/transactions/default.tpl b/public/templates/bootstrap/account/transactions/default.tpl index f3664abd..7818257b 100644 --- a/public/templates/bootstrap/account/transactions/default.tpl +++ b/public/templates/bootstrap/account/transactions/default.tpl @@ -9,7 +9,7 @@
    -
- Donation amount in percent ({$DONATE_THRESHOLD.min}-100%) + Donation amount in percent ({$DONATE_THRESHOLD.min} - 100%) {nocache}{/nocache}

- {$GLOBAL.config.ap_threshold.min}-{$GLOBAL.config.ap_threshold.max} {$GLOBAL.config.currency}. Set to '0' for no auto payout. A {if $GLOBAL.config.txfee_auto > 0.00001}{$GLOBAL.config.txfee_auto}{else}{$GLOBAL.config.txfee_auto|number_format:"8"}{/if} {$GLOBAL.config.currency} TX fee will apply + {$GLOBAL.config.ap_threshold.min} - {$GLOBAL.config.ap_threshold.max} {$GLOBAL.config.currency}. Set to '0' for no auto payout. A {if $GLOBAL.config.txfee_auto > 0.00001}{$GLOBAL.config.txfee_auto}{else}{$GLOBAL.config.txfee_auto|number_format:"8"}{/if} {$GLOBAL.config.currency} TX fee will apply