diff options
| -rw-r--r-- | web/configuration | 3 | ||||
| -rwxr-xr-x | web/db/ccan.db | bin | 32768 -> 32768 bytes | |||
| -rw-r--r-- | web/dispmoduleinfo.php | 41 | ||||
| -rw-r--r-- | web/tarball/.tar | bin | 0 -> 30720 bytes | |||
| -rw-r--r-- | web/uploader.php | 37 |
5 files changed, 53 insertions, 28 deletions
diff --git a/web/configuration b/web/configuration index 7d0cc15e..d29bed87 100644 --- a/web/configuration +++ b/web/configuration @@ -40,4 +40,7 @@ $bzr_clone = 'bzr clone /home/dinesh/testwebsite/ '; //bzr push $bzr_push = 'bzr push /home/dinesh/testwebsite/ '; + +//tar home dir +$tar_dir = 'tarball/'; ?>
\ No newline at end of file diff --git a/web/db/ccan.db b/web/db/ccan.db Binary files differindex 8d582d44..77ba6a01 100755 --- a/web/db/ccan.db +++ b/web/db/ccan.db diff --git a/web/dispmoduleinfo.php b/web/dispmoduleinfo.php index b6f08172..b0aba20e 100644 --- a/web/dispmoduleinfo.php +++ b/web/dispmoduleinfo.php @@ -8,25 +8,20 @@ $handle = sqlite3_open($db) or die("Could not open database"); $query = "select * from search where module=\"".$_GET['module']."\""; $result = sqlite3_query($handle, $query) or die("Error in query: ".sqlite3_error($handle)); $row = sqlite3_fetch_array($result); - -if (!file_exists($repopath . $ccan_home_dir.$_GET['module']."/".$_GET['module'].".tar")) { - chdir($repopath); - exec("tar -cvvf ".$ccan_home_dir. $_GET['module']. "/". $_GET['module'].".tar ". $ccan_home_dir.$_GET['module'], $status); - chdir(".."); -} - -if (!file_exists($repopath . $ccan_home_dir.$_GET['module']."/".$_GET['module']."_dep.tar")) { - chdir($repopath); - exec($create_dep_tar." ".$ccan_home_dir.$_GET['module'], $status); - chdir(".."); -} - - ?> <table align="center" bgcolor="lightblue" width="70%" border="0" cellpadding="3" cellspacing="1"> <tr align="center" bgcolor="FFFFCC"> -<td width="50%"><a href=<?=$repopath . $ccan_home_dir.$_GET['module']?>/<?=$_GET['module']?>.tar>Download</a></td> -<td><a href=<?=$repopath . $ccan_home_dir.$_GET['module']?>/<?=$_GET['module']?>_dep.tar>Download Dependencies</a></td> +<td width="50%"> + <?php + if(file_exists($tar_dir . $_GET['module']."_dependencies.tar")) + echo '<a href='. $tar_dir . $_GET['module'] . '.tar>Download</a>'; + ?> +<td> + <?php + if(file_exists($tar_dir . $_GET['module']."_dependencies.tar")) + echo '<a href='. $tar_dir . $_GET['module'] . '_dependencies.tar>Download Dependencies</a>'; + ?> +</td> </tr> </table> <table align="center" bgcolor="lightblue" width="70%" border="0" cellpadding="8" cellspacing="1"> @@ -43,6 +38,20 @@ if (!file_exists($repopath . $ccan_home_dir.$_GET['module']."/".$_GET['module']. </tr> <tr align="left" bgcolor="FFFFCC"> +<td><h3>Dependencies: </h3> <pre><?=$row['depends'];?></pre></td> +</tr> + +<tr align="left" bgcolor="FFFFCC"> <td><h3>Description: </h3> <pre><?=$row['desc'];?></pre></td> </tr> </table><hr> + +<?php +function checkerror($status, $msg) +{ + if($status != 0) { + echo "<div align=\"center\">" . $msg . "Contact ccan admin. </div>"; + exit(); + } +} +?>
\ No newline at end of file diff --git a/web/tarball/.tar b/web/tarball/.tar Binary files differnew file mode 100644 index 00000000..54203d2c --- /dev/null +++ b/web/tarball/.tar diff --git a/web/uploader.php b/web/uploader.php index 102ac1dc..0cb1c184 100644 --- a/web/uploader.php +++ b/web/uploader.php @@ -22,12 +22,10 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip" $tempfolder . $_FILES["uploadedfile"]["name"]); //extracting code - if($_FILES["uploadedfile"]["type"] == "application/zip") { + if($_FILES["uploadedfile"]["type"] == "application/zip") exec('unzip '.$tempfolder.$_FILES["uploadedfile"]["name"].' -d '.$tempfolder, $op, $status); - } - else { + else exec('tar -xf '.$tempfolder.$_FILES["uploadedfile"]["name"].' -C '.$tempfolder, $op, $status); - } checkerror($status,"Error: cannot extract(tar error)."); //if user not logged in @@ -39,11 +37,13 @@ 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"; + $message = "Some developer has uploaded code who has not logged in.\n\nModule is stored in ". + $temprepo.$folder.".\n\nOutput of ccanlint: \n"; $toaddress = getccanadmin($db); mail($toaddress, $subject, $message, "From: $frommail"); - echo "<div align=\"center\"> Stored to temporary repository. Mail will be send to admin to get verification of the code.<//div>"; + echo "<div align=\"center\"> Stored to temporary repository. + Mail will be send to admin to get verification of the code.<//div>"; unlink($tempfolder.$_FILES["uploadedfile"]["name"]); exit(); } @@ -73,14 +73,18 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip" // if owner is not same 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>"; + echo "<div align=\"center\">". $ccan_home_dir . $folder . + " already exists. Renaming to " . $folder . "-" . $_SESSION['susername'] . "</div>"; else - echo "<div align=\"center\">". $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>"; } @@ -93,18 +97,25 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip" 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); + 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); + 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."); + unset($op); exec($create_dep_tar . " " . $ccan_home_dir. $rename . " ../../" . + $tar_dir . " ../../" . $db , $op, $status); + checkerror($status,"Error: bzr push error."); + chdir('../..'); rmdirr($exactpath); echo "<div align=\"center\"> Stored to ". $ccan_home_dir . $rename . "</div>"; @@ -119,7 +130,9 @@ if($_FILES["uploadedfile"]["type"] == "application/x-gzip" 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>"; + 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>"; |