web interface updated for new compiler server and installer updated

Author: ngsankha

.gitignore

@@ -1,6 +1,4 @@
+# Codejudge .gitignore
 *~
-<<<<<<< HEAD
 dbinfo.php
-=======
-
->>>>>>> ec6f72dda3d9d255fe3de2835f2748dee17e879b
+*.class

admin/problems.php

@@ -9,11 +9,7 @@
 		connectdb();
 ?>
               <li class="active"><a href="#">Admin Panel</a></li>
-<<<<<<< HEAD
               <li><a href="users.php">Users</a></li>
-=======
-              <li><a href="#about">Users</a></li>
->>>>>>> ec6f72dda3d9d255fe3de2835f2748dee17e879b
               <li><a href="logout.php">Logout</a></li>
             </ul>
           </div><!--/.nav-collapse -->

eval.php

@@ -1,5 +1,6 @@
 <?php
 	require_once('functions.php');
+	include('dbinfo.php');
 	connectdb();
 	$query = "SELECT * FROM prefs";
         $result = mysql_query($query);
@@ -17,43 +18,35 @@
 			$query = "UPDATE solve SET lang='".$_POST['lang']."', attempts='".($fields['attempts']+1)."', soln='".mysql_real_escape_string($_POST['soln'])."', filename='".mysql_real_escape_string($_POST['filename'])."' WHERE (username='".$_SESSION['username']."' AND problem_id='".$_POST['id']."')";
 		}
 		mysql_query($query);
-		$filename = "solution/".$_SESSION['username']."/".$_POST['filename'];
-		$fp = fopen($filename, 'w');
-		fwrite($fp, $_POST['soln']);
-		fclose($fp);
-		if($_POST['lang']=='c' and $accept['c'] == 1)
-			include('lang/c.php');
-		else if($_POST['lang']=='cpp' and $accept['cpp'] == 1)
-			include('lang/cpp.php');
-		else if($_POST['lang']=='java' and $accept['java'] == 1)
-			include('lang/java.php');
-		else if($_POST['lang']=='python' and $accept['python'] == 1)
-			include('lang/python.php');
-		else
-			header("Location: solve.php?lerror=1&id=".$_POST['id']);
-		$res=lang_compile($filename, $_POST['id']);
-		if($res == 1 or $res == 2) {
-			$fp = fopen("$filename.err", 'r');
-			$contents = fread($fp, filesize("$filename.err"));
-			fclose($fp);
-		}
-		unlink("$filename");
-		unlink("$filename.in");
-		unlink("$filename.out");
-		unlink("$filename.err");
-		if($res == 1) {
+		$socket = fsockopen($compilerhost, $compilerport);
+		fwrite($socket, $_POST['filename']."\n");
+		$soln = str_replace("\n", '$_n_$', treat($_POST['soln']));
+		fwrite($socket, $soln."\n");
+		$query = "SELECT input, output FROM problems WHERE sl='".$_POST['id']."'";
+		$result = mysql_query($query);
+		$fields = mysql_fetch_array($result);
+		$input = str_replace("\n", '$_n_$', treat($fields['input']));
+		fwrite($socket, $input."\n");
+		fwrite($socket, $_POST['lang']."\n");
+		$status = fgets($socket);
+		$contents = "";
+		while(!feof($socket))
+			$contents = $contents."\n".fgets($socket);
+		if($status == 0) {
 			$query = "UPDATE solve SET status=1 WHERE (username='".$_SESSION['username']."' AND problem_id='".$_POST['id']."')";
 			mysql_query($query);
-			$_SESSION['cerror'] = nl2br(trim($contents));
+			$_SESSION['cerror'] = trim($contents);
 			header("Location: solve.php?cerror=1&id=".$_POST['id']);
-		} else if($res == 2) {
-			$query = "UPDATE solve SET status=1 WHERE (username='".$_SESSION['username']."' AND problem_id='".$_POST['id']."')";
-			mysql_query($query);
-			header("Location: solve.php?oerror=1&id=".$_POST['id']);
-		} else if($res == 0) {
-			$query = "UPDATE solve SET status=2 WHERE (username='".$_SESSION['username']."' AND problem_id='".$_POST['id']."')";
-			mysql_query($query);
-			header("Location: index.php?success=1");
+		} else if($status == 1) {
+			if(trim($contents) == trim(treat($fields['output']))) {
+				$query = "UPDATE solve SET status=2 WHERE (username='".$_SESSION['username']."' AND problem_id='".$_POST['id']."')";
+				mysql_query($query);
+				header("Location: index.php?success=1");
+			} else {
+				$query = "UPDATE solve SET status=1 WHERE (username='".$_SESSION['username']."' AND problem_id='".$_POST['id']."')";
+				mysql_query($query);
+				header("Location: solve.php?oerror=1&id=".$_POST['id']);
+			}
 		}
 	}
 ?>

install.php

@@ -6,7 +6,9 @@
 		$l2 = '$user="'.$_POST['username'].'";';
 		$l3 = '$password="'.$_POST['password'].'";';
 		$l4 = '$database="'.$_POST['name'].'";';
-		fwrite($fp, "<?php\n$l1\n$l2\n$l3\n$l4\n?>");
+		$l5 = '$compilerhost="'.$_POST['chost'].'";';
+		$l6 = '$compilerport='.$_POST['cport'].';';
+		fwrite($fp, "<?php\n$l1\n$l2\n$l3\n$l4\n$l5\n$l6\n?>");
 		fclose($fp);
 		include('dbinfo.php');
 		mysql_connect($host,$user,$password);
@@ -55,7 +57,6 @@
 		$hash=crypt($pass,$salt);
 		$sql="INSERT INTO `users` ( `username` , `salt` , `hash` , `email` ) VALUES ('$pass', '$salt', '$hash', '".$_POST['email']."')";
 		mysql_query($sql);
-		mkdir("solution");
 		header("Location: install.php?installed=1");
 	}
 ?>
@@ -125,6 +126,8 @@
     Password: <input type="password" name="password"/><br/>
     Database Name: <input type="text" name="name" value="codejudge"/><br/>
     Email: <input type="email" name="email"/><br/>
+    Compiler Server Host: <input type="text" name="chost" value="localhost"/><br/>
+    Compiler Server Port: <input type="text" name="cport" value="3029"/><br/>
     <input type="submit" class="btn btn-primary" value="Install"/>
     </form>
     <?php } else {?>

login.php

@@ -25,7 +25,6 @@
 				$hash = crypt($_POST['password'], $salt);
 				$sql="INSERT INTO `users` ( `username` , `salt` , `hash` , `email` ) VALUES ('".$_POST['username']."', '$salt', '$hash', '".$_POST['email']."')";
 				mysql_query($sql);
-				mkdir("solution/".$_POST['username']);
 				header("Location: login.php?registered=1");
 			}
 		}

solve.php

@@ -20,7 +20,7 @@
     <div class="container">
     <?php
         if(isset($_GET['cerror']))
-          echo("<div class=\"alert alert-error\">\n<strong>The following errors occured:</strong><br/>\n".$_SESSION['cerror']."\n</div>");
+          echo("<div class=\"alert alert-error\">\n<strong>The following errors occured:</strong><br/>\n<pre>\n".$_SESSION['cerror']."\n</pre>\n</div>");
         else if(isset($_GET['oerror']))
           echo("<div class=\"alert alert-error\">\nYour program output did not match the solution for the problem. Please check your program and try again.\n</div>");
         else if(isset($_GET['lerror']))