Хранилища Subversion ant

Сравнить редакции

Не учитывать пробелы Редакция 216 → Редакция 217

/trunk/lib/core.php
23,7 → 23,7
 
class Core {
 
function getRepList($distro,$version,$dblink) {
function getSourceList($distro,$version,$repos,$dblink) {
// Fetch settings
$query =& $dblink->query("SELECT * FROM settings");
$settings = array();
34,11 → 34,10
$query =& $dblink->query("SELECT * FROM version v JOIN distribution d ON d.dist_id=v.dist_id JOIN dtype p ON d.disttype=p.type_id WHERE v.dist_id='$distro' AND v.version_id='$version'");
$query->fetchInto($infodist, DB_FETCHMODE_ASSOC);
// Fetch repos
$repos=$_GET["r"];
$porigid = -1; // Previous origin id
for($i=0;$i<count($repos);$i++) {
$id=$_GET["r"][$i];
$id=$repos[$i];
// Fetch info about origin and scheme
$sql =& $dblink->query("SELECT * FROM repository r JOIN ver2rep v ON r.rep_id=v.rep_id JOIN origin o ON o.orig_id=r.orig_id JOIN version v2 ON v.ver_id=v2.version_id JOIN scheme s ON s.scheme_id=r.scheme_id JOIN root r2 ON r2.root_id=r.root_id WHERE r.rep_id=".$id);
$sql->fetchInto($resinfo, DB_FETCHMODE_ASSOC);
201,21 → 200,17
}
 
 
function getAddsRepList($distro,$version,$dblink) {
$query =& $dblink->query("SELECT * FROM settings");
$settings = array();
while ($query->fetchInto($setting, DB_FETCHMODE_ASSOC)) {
$settings[stripslashes($setting["opt"])] = stripslashes($setting["optvalue"]);
};
$query =& $dblink->query("SELECT * FROM version v JOIN distribution d ON d.dist_id=v.dist_id JOIN dtype p ON d.disttype=p.type_id WHERE v.dist_id='$distro' AND v.version_id='$version'");
$query->fetchInto($infodist, DB_FETCHMODE_ASSOC);
function getRepList($distro,$version,$dblink) {
$query =& $dblink->query("SELECT * FROM repository r JOIN ver2rep v ON r.rep_id=v.rep_id JOIN origin o ON o.orig_id=r.orig_id JOIN version v2 ON v.ver_id=v2.version_id JOIN scheme s ON s.scheme_id=r.scheme_id JOIN root r2 ON r2.root_id=r.root_id WHERE v.ver_id='$version' ORDER BY r.rtype_id, r.scheme_id ASC");
$result.="<input type='hidden' name='d' value='".$_GET["d"]."'><input type='hidden' name='v' value='".$_GET["v"]."'>";
$i=-1;
while ($query->fetchInto($resinfo, DB_FETCHMODE_ASSOC)) {
if ($resinfo["default"]==true){$ch="checked";} else{$ch="";}
$result.="<input type='checkbox' name='r[]' ".$ch." value='".$resinfo["rep_id"]."'>".$resinfo["repname"]." <em>(".$resinfo["repdescribe"].")</em><br>";
$i++;
$res[0][$i]=$resinfo["rep_id"];
$res[1][$i]=$resinfo["repname"];
$res[2][$i]=$resinfo["repdescribe"];
$res[3][$i]=$resinfo["defaultrep"];
}
return $result;
return $res;
}
}
?>
/trunk/classic.php
25,6 → 25,7
$status = $secure->wrapInt($_GET["step"]);
$dist = $secure->wrapInt($_GET["d"]);
$vers = $secure->wrapInt($_GET["v"]);
$reps = $_GET["r"];
 
$query =& $db->query("SELECT * FROM distribution");
while ($query->fetchInto($data, DB_FETCHMODE_ASSOC)) {
48,7 → 49,13
 
if ($status==2)
{
$repos=$core->getAddsRepList($dist,$vers,$db);
$repos = "";
$repoz=$core->getRepList($dist,$vers,$db);
for($i=0;$i<count($repoz[0]);$i++) {
$repos.="<input type='hidden' name='d' value='".$dist."'><input type='hidden' name='v' value='".$vers."'>";
if ($resinfo["defaultrep"]==true){$ch="checked";} else{$ch="";}
$repos.="<input type='checkbox' name='r[]' ".$ch." value='".$repoz[0][$i]."'>".$repoz[1][$i]." <em>(".$repoz[2][$i].")</em><br>";
};
}
 
if ($status==3) {
59,9 → 66,9
if ($infodist["vname"]!="") {
$distname = "&#8220;".$secure->stripStr($infodist["vname"])."&#8221;";
}
$info = "<h2>Доступные репозитории для <em class='".$secure->stripStr($infodist["distua"])."-em'>".$secure->stripStr($infodist["distname"])." ".$secure->stripStr($infodist["version"])." ".$distname."</em></h2>";
$info = "<h2>Репозитории для <em class='".$secure->stripStr($infodist["distua"])."-em'>".$secure->stripStr($infodist["distname"])." ".$secure->stripStr($infodist["version"])." ".$distname."</em></h2>";
$result = "<p>Скопируйте эти строки в файл <span id='sourceslist'>/etc/apt/sources.list</span>:</p><pre>";
$result .= $core->getRepList($dist,$vers,$db);
$result .= $core->getSourceList($dist,$vers,$reps,$db);
$result .= "</pre>";
$result = $info.$result."<p><a href='./get.php?id=".$dist.",".$vers."'>Получить sources.list файлом</a></p>";
}