From 128fc6a3b52e43208e965da03966e519d6149355 Mon Sep 17 00:00:00 2001
From: jacob <jacob>
Date: Thu, 2 Dec 2010 17:25:23 +0000
Subject: [PATCH] Added logging to the API, and separated the log file creation
 into a common function

---
 admin/judges_sa_launcher.php | 11 +++--------
 api.php                      |  6 ++++++
 common.inc.functions.php     | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/admin/judges_sa_launcher.php b/admin/judges_sa_launcher.php
index caad1e5e..2d20d53c 100644
--- a/admin/judges_sa_launcher.php
+++ b/admin/judges_sa_launcher.php
@@ -1,15 +1,10 @@
 <?
-
-//make sure logs folder exists, and htaccess it to deny access
-if(!file_exists("../data/logs"))
-	@mkdir("../data/logs");
-
- if(!file_exists("../data/logs/.htaccess"))
- 	@file_put_contents("../data/logs/.htaccess","Order Deny,Allow\r\nDeny From All\r\n");
+require_once('../common.inc.functions.php');
+$logPath = get_logpath();
 
 //add PHP_SELF just so when we do a process listing on the server we know which fair its running for
 //the argument does not get used by the script at all
-exec("nice php judges_sa.php {$_SERVER['PHP_SELF']} >../data/logs/judge_scheduler_".date("YmdHis").".log 2>&1 &");
+exec("nice php judges_sa.php {$_SERVER['PHP_SELF']} > $logPath/judge_scheduler_".date("YmdHis").".log 2>&1 &");
 usleep(1500000); // 1.5 second to allow the judges_sa to update the % status to 0% otherwise the status page will think its not running if it gets there too soon
 header("Location: judges_scheduler_status.php");
 exit;
diff --git a/api.php b/api.php
index eff05252..3991fb0d 100644
--- a/api.php
+++ b/api.php
@@ -23,6 +23,7 @@
 ?>
 <?
 include "common.inc.php";
+require_once("common.inc.functions.php");
 require_once("account.inc.php");
 require_once("user.inc.php");
 require_once("schedule.inc.php");
@@ -35,6 +36,11 @@ if($_SERVER['HTTPS']!="on") {
 $request=explode("/",$_GET['request']);
 $ret=array();
 
+$logPath = get_logpath();
+$fout = fopen("$logPath/api.log", "a");
+fwrite($fout, date("Y-m-d H:i:s") . " \$_GET = " . json_encode($_GET) . ", \$_POST = " . json_encode($_POST) . ", \$_SESSION = " . json_encode($_SESSION) . "\n");
+fclose($fout);
+
 switch($request[0]) {
 	case 'config':
 		switch($request[1]){
diff --git a/common.inc.functions.php b/common.inc.functions.php
index f40c5ddc..af6b77eb 100644
--- a/common.inc.functions.php
+++ b/common.inc.functions.php
@@ -863,3 +863,17 @@ function get_conference_info($conferenceId){
 	}
 	return $returnval;
 }
+
+//make sure logs folder exists, and htaccess it to deny access, and return the full path
+function get_logpath(){
+	$q = mysql_fetch_assoc(mysql_query("SELECT val FROM config WHERE var = 'SFIABDIRECTORY'"));
+	$directory = $_SERVER["DOCUMENT_ROOT"] . $q['val'] . '/data/logs';
+	
+	if(!file_exists($directory))
+		@mkdir($directory);
+
+	if(!file_exists($directory . "/.htaccess"))
+		@file_put_contents($directory . "/.htaccess","Order Deny,Allow\r\nDeny From All\r\n");
+
+	return $directory;
+}