Хранилища Subversion ant

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

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

/trunk/lib/core.php
34,10 → 34,11
$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=array_values($_GET);
$repos=$_GET["r"];
$porigid = -1; // Previous origin id
for ($i=3;$i<count($repos);$i++){
$id=(int)$repos[$i];
for($i=0;$i<count($repos);$i++) {
$id=$_GET["r"][$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);
58,7 → 59,7
$repscheme = str_replace("{ROOT}",stripslashes($resinfo["root_folder"]),$repscheme);
// Comment if another origin
if($porigid != $resinfo["orig_id"]) {
$result .= "### ".$resinfo["origin"]."( ".$resinfo["desk"]." ) - ".$resinfo["homeurl"]." ###\n";
$result .= "### ".$resinfo["origin"]." ( ".$resinfo["desk"]." ) - ".$resinfo["homeurl"]." ###\n";
}
$porigid = $resinfo["orig_id"];
// Result
168,23 → 169,22
 
 
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);
$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'].'">';
$tmp=0;
while ($query->fetchInto($resinfo, DB_FETCHMODE_ASSOC)) {
$tmp++;
if ($resinfo['rtype_id']!=3){$ch='checked';}else{$ch='';}
$result.='<input type="checkbox" name="'.$tmp.'" '.$ch.' value="'.$resinfo['rep_id'].'">'.$resinfo['repname'].' <em>('.$resinfo['repdescribe'].')</em><br>';
}
return $result;
$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);
$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"]."'>";
$tmp=0;
while ($query->fetchInto($resinfo, DB_FETCHMODE_ASSOC)) {
$tmp++;
if ($resinfo["rtype_id"]!=3){$ch="checked";} else{$ch="";} // Default reps hack, replace in future
$result.="<input type='checkbox' name='r[]' ".$ch." value='".$resinfo["rep_id"]."'>".$resinfo["repname"]." <em>(".$resinfo["repdescribe"].")</em><br>";
}
return $result;
}
}
}
?>