summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-07 18:00:03 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-07 18:00:03 +0100
commitae386823abf8ec095f7828e29f5b2a8981353fba (patch)
tree326ca9ca0d7f4c96042d44c85a81852f7ce7cf2e
parent4e8b9a70adee9f8a2670b43eb7be09cb3b427423 (diff)
Revert "Debug Persona temporaire"
This reverts commit 1fb25addd09660c08ff74b960b1c226acc319978.
-rwxr-xr-xapp/Controllers/indexController.php5
-rw-r--r--app/FreshRSS.php5
2 files changed, 0 insertions, 10 deletions
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 9817b7a81..690ca57be 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -237,7 +237,6 @@ class FreshRSS_index_Controller extends Minz_ActionController {
$assert = Minz_Request::param ('assertion');
$params = 'assertion=' . $assert . '&audience=' .
urlencode (Minz_Url::display (null, 'php', true));
- file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' login params=' . print_r($params, true) . "\n", FILE_APPEND); //DEBUG
$ch = curl_init ();
$options = array (
CURLOPT_URL => $url,
@@ -253,10 +252,8 @@ class FreshRSS_index_Controller extends Minz_ActionController {
$loginOk = false;
$reason = '';
- file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' login response=' . print_r($res, true) . "\n", FILE_APPEND); //DEBUG
if ($res['status'] === 'okay') {
$email = filter_var($res['email'], FILTER_VALIDATE_EMAIL);
- file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' filtered_email=' . $email . "\n", FILE_APPEND); //DEBUG
if ($email != '') {
$personaFile = DATA_PATH . '/persona/' . $email . '.txt';
if (($currentUser = @file_get_contents($personaFile)) !== false) {
@@ -280,14 +277,12 @@ class FreshRSS_index_Controller extends Minz_ActionController {
Minz_Session::_param('currentUser', $currentUser);
Minz_Session::_param ('mail', $email);
$this->view->loginOk = true;
- file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Login OK email=' . $email . ', currentUser=' . $currentUser . "\n", FILE_APPEND); //DEBUG
invalidateHttpCache();
} else {
$res = array ();
$res['status'] = 'failure';
$res['reason'] = $reason == '' ? Minz_Translate::t ('invalid_login') : $reason;
Minz_Log::record ('Persona: ' . $res['reason'], Minz_Log::WARNING);
- file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Failure=' . print_r($res, true) . "\n", FILE_APPEND); //DEBUG
}
header('Content-Type: application/json; charset=UTF-8');
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 86d35a6e7..f9857a4cb 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -11,7 +11,6 @@ class FreshRSS extends Minz_FrontController {
}
private function accessControl($currentUser) {
- file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' authType=' . Minz_Configuration::authType() . "\n", FILE_APPEND); //DEBUG
if ($currentUser == '') {
switch (Minz_Configuration::authType()) {
case 'http_auth':
@@ -19,15 +18,12 @@ class FreshRSS extends Minz_FrontController {
$loginOk = $currentUser != '';
break;
case 'persona':
- file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Persona access control' . "\n", FILE_APPEND); //DEBUG
$loginOk = false;
$email = filter_var(Minz_Session::param('mail'), FILTER_VALIDATE_EMAIL);
- file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Persona email=' . Minz_Session::param('mail') . ', filtered_email=' . $email . "\n", FILE_APPEND);
if ($email != '') { //TODO: Remove redundancy with indexController
$personaFile = DATA_PATH . '/persona/' . $email . '.txt';
if (($currentUser = @file_get_contents($personaFile)) !== false) {
$currentUser = trim($currentUser);
- file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Persona user from file=' . $currentUser . "\n", FILE_APPEND); //DEBUG
$loginOk = true;
}
}
@@ -81,7 +77,6 @@ class FreshRSS extends Minz_FrontController {
$loginOk = strcasecmp($currentUser, httpAuthUser()) === 0;
break;
case 'persona':
- file_put_contents(DATA_PATH . '/log/persona.log', date('c') . ' Persona compare session_email=' . Minz_Session::param('mail') . ' with config_email=' . $this->conf->mail_login . "\n", FILE_APPEND); //DEBUG
$loginOk = strcasecmp(Minz_Session::param('mail'), $this->conf->mail_login) === 0;
break;
case 'none':