From: Paul J R <me@pjr.cc>
Date: Sun, 23 Sep 2012 22:01:18 +0000 (+1000)
Subject: git branching and pushing is doing my head in
X-Git-Url: http://git.pjr.cc/?p=gwvp-mini.git;a=commitdiff_plain;h=7ae1c9fb36ba08c3cffde5620d2fa9587353a2b8

git branching and pushing is doing my head in
---

diff --git a/bin/gwvpminicmdtool.php b/bin/gwvpminicmdtool.php
index 7fb27d4..3d23011 100644
--- a/bin/gwvpminicmdtool.php
+++ b/bin/gwvpminicmdtool.php
@@ -3,7 +3,8 @@
 $WEB_ROOT_FS = realpath(dirname(__FILE__));
 $BASE_URL = "/";
 
-global $WEB_ROOT_FS, $BASE_URL;
+global $WEB_ROOT_FS, $BASE_URL, $IS_WEB_REQUEST;
+$IS_WEB_REQUEST = false;
 
 if(file_exists("../www/config.php")) require_once("../www/config.php");
 else if(file_exists("/etc/gwvpmini/config.php")) require_once("/etc/gwvpmini/config.php");
@@ -12,8 +13,29 @@ else $noconfig = true;
 if(file_exists("../gwvpmini/gwvpmini.php")) require_once("../gwvpmini/gwvpmini.php");
 else if(file_exists("/usr/share/gwvpmini/lib/gwvpmini/gwvpmini.php")) require_once("/usr/share/gwvpmini/lib/gwvpmini/gwvpmini.php");
 
-global $IS_WEB_REQUEST;
+if(isset($argv["1"])) {
+	switch($argv["1"]) {
+		case "updatehook":
+			gwvpcmdtool_UpdateHook();
+			break;
+		default:
+			gwvpcmdtool_Usage();
+	}
+} else gwvpcmdtool_Usage();
+return;
 
-$IS_WEB_REQUEST = false;
 
+
+function gwvpcmdtool_Usage()
+{
+	global $argv;
+	
+	echo "Usage: ".$argv[0]."\n";
+	echo "\tupdatehook <user> <ref> <firstupdate> <lastupdate>\n";
+}
+
+function gwvpcmdtool_UpdateHook()
+{
+	
+}
 ?>
\ No newline at end of file
diff --git a/gwvpmini/gwvpmini.php b/gwvpmini/gwvpmini.php
index ad44251..7b23820 100644
--- a/gwvpmini/gwvpmini.php
+++ b/gwvpmini/gwvpmini.php
@@ -11,7 +11,11 @@ require_once("gwvpmini_view.php");
 require_once("gwvpmini_activity.php");
 require_once("gwvpmini_register.php");
 require_once("gwvpmini_user.php");
-if(gwvpmini_isLoggedIn()) if(gwvpmini_isUserAdmin()) {
+if($IS_WEB_REQUEST) {
+	if(gwvpmini_isLoggedIn()) if(gwvpmini_isUserAdmin()) {
+		require_once("gwvpmini_admin.php");
+	}
+} else {
 	require_once("gwvpmini_admin.php");
 }
 
diff --git a/gwvpmini/gwvpmini_activity.php b/gwvpmini/gwvpmini_activity.php
index cf2e122..4f07fc5 100644
--- a/gwvpmini/gwvpmini_activity.php
+++ b/gwvpmini/gwvpmini_activity.php
@@ -1,17 +1,18 @@
 <?php
 
-$reg = gwvpmini_getConfigVal("activityloglength");
-
-$activity_log_length = false;
-if($reg == null) {
-	gwvpmini_setConfigVal("activityloglength", "100");
-} else if($reg == 1) {
-	$activityloglength = true;
-} else {
-	$activityloglength = false;
-}
-
-global $use_gravatar;
+
+if($IS_WEB_REQUEST) {
+	$reg = gwvpmini_getConfigVal("activityloglength");
+	
+	$activity_log_length = false;
+	if($reg == null) {
+		gwvpmini_setConfigVal("activityloglength", "100");
+	} else if($reg == 1) {
+		$activityloglength = true;
+	} else {
+		$activityloglength = false;
+	}
+}	
 
 
 // this will add a repo activity (a commit for eg)
diff --git a/gwvpmini/gwvpmini_admin.php b/gwvpmini/gwvpmini_admin.php
index b4f9db6..2bdef07 100644
--- a/gwvpmini/gwvpmini_admin.php
+++ b/gwvpmini/gwvpmini_admin.php
@@ -1,24 +1,27 @@
 <?php
 
-if(gwvpmini_isLoggedIn()) if(gwvpmini_isUserAdmin()) {
-	$MENU_ITEMS["20repos"]["text"] = "Administration";
-	$MENU_ITEMS["20repos"]["link"] = "$BASE_URL/admin";
-	$CALL_ME_FUNCTIONS["admin"] = "gwvpmini_AdminCallMe";
-}
-
 
-$reg = gwvpmini_getConfigVal("gravatarenabled");
-
-$use_gravatar = false;
-if($reg == null) {
-	gwvpmini_setConfigVal("gravatarenabled", "1");
-} else if($reg == 1) {
-	$use_gravatar = true;
-} else {
+if($IS_WEB_REQUEST) {
+	if(gwvpmini_isLoggedIn()) if(gwvpmini_isUserAdmin()) {
+		$MENU_ITEMS["20repos"]["text"] = "Administration";
+		$MENU_ITEMS["20repos"]["link"] = "$BASE_URL/admin";
+		$CALL_ME_FUNCTIONS["admin"] = "gwvpmini_AdminCallMe";
+	}
+	
+	
+	$reg = gwvpmini_getConfigVal("gravatarenabled");
+	
 	$use_gravatar = false;
-}
-
-global $use_gravatar;
+	if($reg == null) {
+		gwvpmini_setConfigVal("gravatarenabled", "1");
+	} else if($reg == 1) {
+		$use_gravatar = true;
+	} else {
+		$use_gravatar = false;
+	}
+	
+	global $use_gravatar;
+}
 
 function gwvpmini_AdminCallMe()
 {
diff --git a/gwvpmini/gwvpmini_auth.php b/gwvpmini/gwvpmini_auth.php
index 89aec63..fc75359 100644
--- a/gwvpmini/gwvpmini_auth.php
+++ b/gwvpmini/gwvpmini_auth.php
@@ -1,6 +1,6 @@
 <?php
 
-session_start();
+if($IS_WEB_REQUEST) session_start();
 
 $CALL_ME_FUNCTIONS["auth"] = "gwvpmini_AuthCallMe";
 
diff --git a/gwvpmini/gwvpmini_register.php b/gwvpmini/gwvpmini_register.php
index 4fdd90e..b0c5147 100644
--- a/gwvpmini/gwvpmini_register.php
+++ b/gwvpmini/gwvpmini_register.php
@@ -1,35 +1,37 @@
 <?php
-$CALL_ME_FUNCTIONS["register"] = "gwvpmini_RegisterCallMe";
-
-global $can_register, $reg_reqs_confirm, $confirm_from_address;
-
-$reg = gwvpmini_getConfigVal("canregister");
-$reg2 = gwvpmini_getConfigVal("registerrequiresconfirm");
-$reg3 = gwvpmini_getConfigVal("eamilfromaddress");
-
-if($reg == null) {
-	gwvpmini_setConfigVal("canregister", "1");
-} else if($reg == 1) {
-	$can_register = true;
-} else {
-	$can_register = false;
-}
-
-if($reg2 == null) {
-	gwvpmini_setConfigVal("registerrequiresconfirm", "0");
-} else if($reg2 == 1) {
-	$reg_reqs_confirm = true;
-} else {
-	$reg_reqs_confirm = false;
-}
-
-if($reg3 == null) {
-	gwvpmini_setConfigVal("eamilfromaddress", "admin@localhost");
-	$confirm_from_address = "admin@localhost";
-} else {
-	$confirm_from_address = $reg3;
-}
 
+if($IS_WEB_REQUEST) {
+	$CALL_ME_FUNCTIONS["register"] = "gwvpmini_RegisterCallMe";
+	
+	global $can_register, $reg_reqs_confirm, $confirm_from_address;
+	
+	$reg = gwvpmini_getConfigVal("canregister");
+	$reg2 = gwvpmini_getConfigVal("registerrequiresconfirm");
+	$reg3 = gwvpmini_getConfigVal("eamilfromaddress");
+	
+	if($reg == null) {
+		gwvpmini_setConfigVal("canregister", "1");
+	} else if($reg == 1) {
+		$can_register = true;
+	} else {
+		$can_register = false;
+	}
+	
+	if($reg2 == null) {
+		gwvpmini_setConfigVal("registerrequiresconfirm", "0");
+	} else if($reg2 == 1) {
+		$reg_reqs_confirm = true;
+	} else {
+		$reg_reqs_confirm = false;
+	}
+	
+	if($reg3 == null) {
+		gwvpmini_setConfigVal("eamilfromaddress", "admin@localhost");
+		$confirm_from_address = "admin@localhost";
+	} else {
+		$confirm_from_address = $reg3;
+	}
+}	
 
 function gwvpmini_RegisterCallMe()
 {
diff --git a/www/index.php b/www/index.php
index 1482ceb..c0b765b 100644
--- a/www/index.php
+++ b/www/index.php
@@ -5,7 +5,7 @@ $BASE_URL = dirname($_SERVER["PHP_SELF"]);
 
 global $WEB_ROOT_FS, $BASE_URL, $data_directory, $db_type, $db_name, $db_username, $db_password, $IS_WEB_REQUEST;
 
-$IS_WEB_REQUEST = false;
+$IS_WEB_REQUEST = true;
 
 if(file_exists("./config.php")) require_once("./config.php");
 else if(file_exists("/etc/gwvpmini/config.php")) require_once("/etc/gwvpmini/config.php");