From f61027e32e0dd552b1b2c26d3c68c9eb1b6be61c Mon Sep 17 00:00:00 2001
From: dinesh <dinesh@dinesh-laptop>
Date: Tue, 12 Aug 2008 14:43:48 +0530
Subject: [PATCH] commiting uploaded for bzr

---
 web/configuration |  11 +++++--
 web/db/ccan.db    | Bin 32768 -> 32768 bytes
 web/uploader.php  |  76 +++++++++++++++++++++++++++++++---------------
 3 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/web/configuration b/web/configuration
index 80c6b889..7d0cc15e 100644
--- a/web/configuration
+++ b/web/configuration
@@ -9,10 +9,10 @@ $repopath = "testrepo/";
 $ccanlint = "tools/ccanlint -d ";
 
 //infotojson 
-$infotojson = "tools/infotojson ";
+$infotojson = "../../tools/infotojson ";
 
 //create tar of all dependencies
-$create_dep_tar = "../tools/create_dep_tar ";
+$create_dep_tar = "../../tools/create_dep_tar ";
 
 //junk code
 $junkcode = "junkcode/";
@@ -32,5 +32,12 @@ $frommail = "ccan@ozlabs.org";
 //email for admins
 $ccan_admin = "g.dinesh.cse@gmail.com";
 
+//ccan home 
 $ccan_home_dir = "ccan/";
+
+//bzr clone 
+$bzr_clone = 'bzr clone /home/dinesh/testwebsite/ ';
+
+//bzr push 
+$bzr_push = 'bzr push /home/dinesh/testwebsite/ ';
 ?>
\ No newline at end of file
diff --git a/web/db/ccan.db b/web/db/ccan.db
index 30078430204eee429a34814a69569db88508b1fe..8d582d443992153c0cfa9b8897f91ef4652d78c2 100755
GIT binary patch
delta 1728
zcmbtTZ)jUp6u<YL{CRyz+N5pPzIJV1R|a*>$f{U6$|j6<8|W;hRjRDU<mJ^w)1<s4
z+v=Y+kI+<{f0{l}KMcec94j~s4?hUQ4>GYJvN@bz`ay*$YzXs<L#&|ZzSnkb^+Um2
zetGAfd;a{+IrkQetXO38E%o$yV*i@(<K?J^Z$S{ABn&zUd<UI;v1@!)^()K)uac;-
z;tF#iV*KHHx)z<vZKpIfk<wHpZ~W+%9jF>JitYnkIAC0Hk2Jtd47ftzcUak2roZ_;
z7=#~4TP!h|%H-8tzNZGawVPX^2AZf=$mOTq7^rh2g$p-(6eVW4IB`>B{^kkzCH6jH
zEJENCi_m8`7P(92D*BZ1#@-taG`M9v*OuZ!()haV8{|jpjEn6mC;E}$44vk}aYGG#
zQ0s(Q0=MBhd<wJhVO7t;Op6mD5>FgavYC7=l~J{5b|Qh_T(aH;A^R+y%H?fcGeGyc
zeNt6kisq-MuuI&!fkB6T5=*DEimhy+8{y-HR5}rj<#MXF9!f-BNNI_{D%^#yU<p1m
zJDMvn9)t+}7bT|;LbjHZaWz2qy3HmHsD%z&XAxkVVYa5Gi(L*sZ!m-V_)kKx2KUW?
zd<P^y;J%J>T28o1;Agl8-@})16_1x;On@Neshxh<Pq#M9VdZ^5gHPCIz%92W_rYJp
zMVARHvdgd!F4ASVUe({FqCO(Jn<R;rsB!1f^5B%3N#x`+F-=Lvw64BGhkG9i%Lz57
z?9?gQLMAWcO_MWOL?N9<vx!(CotF=pGrhCaMM;T}QbnKklwYR8ektpFGeymJMm6yI
zuu?|*2^^&TRXsvIr7Q>?Qo&aqre@2Fzfdo!3^1Wd8tPeeQ=`8xTyKqKYe}N<Lf>p%
z93!>xaFnbPvRcu<^_KUsnpR1No(nb9__Ocif4G{*4u8%lSsZX|Qen00R4N0oi^P7O
zxV@BR+h}`;P2~h3Co1|8&s?tyW4+>gOQGh->5qYrpAd5@F%Jt*I4ZNrg)WB(Bu>~(
za)ZPx`l#pi<6fab8uZN{p~kgXw9ZO1;}In3@$vEqH6D(4cUis2Tay+oIg?d2%@+By
z$i*hqs1g^=@%R$9av>z5`>Dv%W7N2JCLFNcx7Zo2XMcKz-@d(^9{xOt21Gq#4<dk&
z5&XOv(S~S51Q8N~+qNS@>#`retq9%?uQ@vQ2?#sJ?by~gKJMLgJ;1vzTepXtC*)Uh
zzM^ZMxpRULl!k}j9-_u0iSRM2zOC=X?u@eeP(*PwsmlCG$w@VqP&FCD2Fn3A-qNQI
zUI<V_nC$i2VIDY{M<>5v)&yHk=fD~`xfd~=C;tYDnsaO5dCeL>Yb30(s*B81N;#3)
jkgt4}n)1=xl<t_lz_yjajsI^M?d5=Dmt};kGN}9y&Hm0L

delta 5459
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

diff --git a/web/uploader.php b/web/uploader.php
index 467c51c0..102ac1dc 100644
--- a/web/uploader.php
+++ b/web/uploader.php
@@ -28,16 +28,8 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip"
 	else {
 		exec('tar -xf '.$tempfolder.$_FILES["uploadedfile"]["name"].' -C '.$tempfolder, $op, $status);
 	}
-	checkerror($status[0],"Error: cannot extract(tar error).");	
+	checkerror($status,"Error: cannot extract(tar error).");	
 
-	//chmod
-	exec('chmod -R 0777 '. $tempfolder.$folder, $status);
-	checkerror($status[0],"Error: chmod execution error.");	
-	
-	//running ccanlint
-	exec($ccanlint.$tempfolder.$folder, $score, $status);
-	//checkerror($status,"Error: ccanlint execution error.");	
-	
 	//if user not logged in
 	if($_SESSION["slogged"] == false) {
 		//move to temp folder 
@@ -48,8 +40,6 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip"
 		//send mail for review to admins 
 		$subject = "Review: code upload at temporary repository"; 
 		$message = "Some developer has uploaded code who has not logged in.\n\nModule is stored in ".$temprepo.$folder.".\n\nOutput of ccanlint: \n";
-		foreach($score as $disp)
-			$message = $message.$disp."\n";
 			
     	$toaddress = getccanadmin($db);
    	mail($toaddress, $subject, $message, "From: $frommail");
@@ -58,45 +48,83 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip"
    	exit();
 	} 
 
+	//running ccanlint
+	exec($ccanlint.$tempfolder.$folder, $score, $status);
+		
 	//if not junk code 
 	if($status == 0) {
 		$rename = $folder;
+		$exactpath = $repopath . $_SESSION['susername'] .'/';
+		
+		if (file_exists($exactpath)) {
+			echo "<div align=\"center\"> Your another upload is in progress please wait...</div>";
+			exit();
+		}
+		
+		//bzr local repo for commit
+		chdir($repopath);
+		unset($op); exec($bzr_clone . $_SESSION['susername'], $op, $status);
+		checkerror($status, "Error: bzr local repo.");
+		chdir('..');
+				
 		//if module already exist 
-		if (file_exists($repopath.$ccan_home_dir . $folder)) {
+		if (file_exists($exactpath . $ccan_home_dir . $folder)) {
+
 			// if owner is not same 
-			if(!(getowner($repopath.$ccan_home_dir.$folder, $db) == $_SESSION['susername'])) {	
-				if(!file_exists($repopath . $ccan_home_dir. $folder.'-'.$_SESSION['susername']))   			
-	   			echo "<div align=\"center\">".$repopath . $ccan_home_dir. $folder . " already exists. Renaming to ". $folder."-".$_SESSION['susername']."</div>";
+			if(!(getowner($ccan_home_dir . $folder, $db) == $_SESSION['susername'])) {	
+				if(!file_exists($repopath . $ccan_home_dir . $folder . '-' . $_SESSION['susername']))   			
+	   			echo "<div align=\"center\">". $ccan_home_dir . $folder . " already exists. Renaming to " . $folder . "-" . $_SESSION['susername'] . "</div>";
       		else
-	   			echo "<div align=\"center\">".$repopath . $ccan_home_dir. $folder."-".$_SESSION['susername'] . " already exists. Overwriting ". $folder."-".$_SESSION['susername']."</div>";
+	   			echo "<div align=\"center\">". $ccan_home_dir . $folder . "-" . $_SESSION['susername'] . " already exists. Overwriting " . $folder. "-" . $_SESSION['susername'] . "</div>";
 	   		$rename = $folder."-".$_SESSION['susername'];
 	   	}
+	   	
 	   	else
-	   		echo "<div align=\"center\">".$repopath. $ccan_home_dir. $folder. " already exists(uploaded by you). Overwriting ". $repopath. $folder."</div>";	
+	   		echo "<div align=\"center\">".$repopath. $ccan_home_dir. $folder. " already exists(uploaded by you). Overwriting ". $repopath. $folder."</div>";
+	   			
   		}
+
   		//module not exist. store author to db 
   		else {
-  			storefileowner($repopath . $ccan_home_dir. $folder, $_SESSION['susername'], $db);
+  			storefileowner($ccan_home_dir . $folder, $_SESSION['susername'], $db);
   		}
-  		rmdirr($repopath. $ccan_home_dir. $rename);
-      rename($tempfolder.$folder, $repopath. $ccan_home_dir. $rename);
-      echo "<div align=\"center\"> Stored to ".$repopath . $ccan_home_dir. $rename . "</div>";
+
+  		rmdirr($exactpath . $ccan_home_dir . $rename);
+	   rename($tempfolder . $folder, $exactpath . $ccan_home_dir . $rename);
+   		
+   	chdir($exactpath);
+		unset($op); exec($infotojson . $ccan_home_dir . $rename . " " . $ccan_home_dir. $rename."/_info.c ". $ccan_home_dir . $rename . "/json_" . $rename . " " . $_SESSION['susername']. " ../../" . $db, $op, $status);
+		checkerror($status,"Error: In infotojson.");
+		
+		unset($op); exec('bzr add', $op, $status);
+		checkerror($status,"Error: bzr add error.");
+		
+		unset($op); exec('bzr commit --unchanged -m "commiting from ccan web ' . $rename . " " . $_SESSION['susername'] . '"', $op, $status);
+		checkerror($status,"Error: bzr commit error.");	
+			
+		unset($op); exec($bzr_push, $op, $status);
+		checkerror($status,"Error: bzr push error.");
 		
-		exec($infotojson . $repopath. $ccan_home_dir. $rename."/_info.c ". $repopath. $ccan_home_dir. $rename."/json_".$rename. " ". $_SESSION['susername']." ".$db, $status);
-		checkerror($status[0],"Error: In infotojson.");	
-		//createsearchindex($rename, $repopath.$rename, $infofile, $db, $_SESSION['susername']);
+		chdir('../..');
+		rmdirr($exactpath);
+   	echo "<div align=\"center\"> Stored to ". $ccan_home_dir . $rename . "</div>";
 	}
 	
 	//if junk code (no _info.c etc)	
 	else {
+	
 		rmdirr($junkcode.$folder.'-'.$_SESSION['susername']);
 		rename($tempfolder.$folder, $junkcode.$folder.'-'.$_SESSION['susername']);
+		
 		if($score == '')
 			$msg =  'Below is details for test.';
+			
 		echo "<div align=\"center\"><table><tr><td> Score for code is low. Cannot copy to repository. Moving to ". $junkcode.$folder.'-'.$_SESSION['susername']."... </br></br>". $msg ." </br></br></td></tr><tr><td>";
+
 		foreach($score as $disp)
 			echo "$disp</br>";
 		echo "</td></tr></table></div>";
+		
 	}
   	unlink($tempfolder.$_FILES["uploadedfile"]["name"]);
 }
-- 
2.39.2