From 1283f0d8043b7aafc4edd1c4627d465a92355a49 Mon Sep 17 00:00:00 2001 From: paulr Date: Thu, 10 Nov 2011 04:43:37 +1100 Subject: [PATCH] updated todo fixed a problem with the gitwebservice call changed some lines in the initial setup --- TODO | 10 ++++++---- gwvplib/gwvpauth.php | 7 ++----- gwvplib/gwvpgitwebservice.php | 2 +- gwvplib/gwvpsetup.php | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/TODO b/TODO index 50975cc..c0312c3 100644 --- a/TODO +++ b/TODO @@ -8,12 +8,14 @@ My basic roadmap of the things I want to do with this project in the order I wan Current ======= -1) implement repo permissions +1) implement repo permissions - DONE 2) add a page after repo creation to explain how to populate (via git remote add, git push name master) -3) remove initial repo bit via bundle - going to leave this here for now -4) fix up the gitbackend function once and for all -5) add a config var and initial setup var for website name (i.e. hostname) +3) remove initial repo bit via bundle - going to leave this here for now - DONE +4) fix up the gitbackend function once and for all - DONE +5) finish setup 6) sort gwvpdatabase.php functions into alpha order +7) registration page +8) home page content Alpha Release diff --git a/gwvplib/gwvpauth.php b/gwvplib/gwvpauth.php index 2807f56..0cd3212 100644 --- a/gwvplib/gwvpauth.php +++ b/gwvplib/gwvpauth.php @@ -37,11 +37,8 @@ function gwvp_AuthCallMe() function gwvp_AskForBasicAuth() { - error_log("AUTH: asking for basic auth"); - if(!isset($_SERVER["PHP_AUTH_USER"])) { - header('WWW-Authenticate: Basic realm="GIT Repo"'); - header('HTTP/1.1 401 Unauthorized'); - } else return; + header('WWW-Authenticate: Basic realm="GIT Repo"'); + header('HTTP/1.1 401 Unauthorized'); } // $levels is checked against $LOGIN_TYPE, levels can be either just "admin" or admin,user anon,user anon, etc. diff --git a/gwvplib/gwvpgitwebservice.php b/gwvplib/gwvpgitwebservice.php index 7c34d9b..57d0881 100644 --- a/gwvplib/gwvpgitwebservice.php +++ b/gwvplib/gwvpgitwebservice.php @@ -136,7 +136,7 @@ function gwvp_gitBackendInterface() return; } else { $perms = gwvp_resolvRepoPerms(gwvp_getUserId(null, $person), $repoid); - if($perms < 3) { + if($perms < 2) { $dump = print_r($person, true); error_log("in basic read, called 403 for $perms $dump"); gwvp_fourZeroThree(); diff --git a/gwvplib/gwvpsetup.php b/gwvplib/gwvpsetup.php index 1116156..aa0eaf1 100644 --- a/gwvplib/gwvpsetup.php +++ b/gwvplib/gwvpsetup.php @@ -21,7 +21,7 @@ function gwvp_PostSetup() function gwvp_PostSetupPageBody() { - echo "GWVP Is now setup, login at the top of the page and you should in control!"; + echo "GWVP Is now setup, login at the top of the page and you should be in control!"; } // TODO: need to do this bit -- 1.7.0.4