Хранилища Subversion ant

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

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

/trunk/lib/core.php
37,12 → 37,7
$result .= "# ".stripslashes($resinfo["repdescribe"])."\n".$repscheme."\n\n";
}
//////////////////////////////////////////
////
/////////////////////////////////////////
//////////////////////////////////////////
////
/////////////////////////////////////////
 
if (count($_GET)>3){
$addsreps=array_values($_GET);
for ($i=3;$i<count($addsreps);$i++){
72,14 → 67,7
$result .= "# ".stripslashes($resinfo["repdescribe"])."\n".$repscheme."\n\n";
}
}
//////////////////////////////////////////
////
/////////////////////////////////////////
//////////////////////////////////////////
////
/////////////////////////////////////////
 
 
return $result;
}
192,17 → 180,13
$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' AND r.rtype_id=3 ORDER BY r.rtype_id, r.scheme_id ASC");
$result.='Включить дополнительные репозитории:<form action='.$_SERVER['PHP_SELF'].' method="get">';
$result.='<input type="hidden" name="step" value="2">
<input type="hidden" name="d" value="'.$_GET['d'].'">
<input type="hidden" name="v" value="'.$_GET['v'].'"';
$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 (isset($_GET[$tmp])){$ischecked='checked';}else{$ischecked='';}
$result.='<input type="checkbox" name="'.$tmp.'" '.$ischecked.' value="'.$resinfo['rep_id'].'">'.$resinfo['repname'].' <em>('.$resinfo['repdescribe'].')</em><br>';
$result.='<input type="checkbox" name="'.$tmp.'" value="'.$resinfo['rep_id'].'">'.$resinfo['repname'].' <em>('.$resinfo['repdescribe'].')</em><br>';
}
$result.="<input type='submit' value='Получить'></form>";
return $result;
}
}
/trunk/classic.php
46,7 → 46,12
}
}
 
if (isset($vers)) {
if ($status==2)
{
$repos=$core->getAddsRepList($dist,$vers,$db);
}
 
if ($status==3) {
$query =& $db->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='$dist' AND v.version_id='$vers'");
$query->fetchInto($infodist, DB_FETCHMODE_ASSOC);
 
58,7 → 63,6
$result = "<p>Скопируйте эти строки в файл <span id='sourceslist'>/etc/apt/sources.list</span>:</p><pre>";
$result .= $core->getRepList($dist,$vers,$db);
$result .= "</pre>";
$result .= $core->getAddsRepList($dist,$vers,$db);
$result = $info.$result."<p><a href='./get.php?id=".$dist.",".$vers."'>Получить sources.list файлом</a></p>";
}
 
65,6 → 69,7
$smarty->assign('feedaddr',$_SERVER["HTTP_HOST"].dirname($_SERVER["PHP_SELF"]));
$smarty->assign('status',$status);
$smarty->assign('linux',$linux);
$smarty->assign('repos',$repos);
$smarty->assign('version',$distvers);
$smarty->assign('result',$result);
$smarty->assign('antversion',$core->getSetting('version',$db));
/trunk/templates/classic.tpl
16,11 → 16,21
<form action='./classic.php' method='get'>
<p><input type='hidden' name='step' value='2'></p>
{$version}
<p><input type='submit' value=' Далее '></p>
</form>
{/if}
 
{if $status == 2}
<h2>Выбор дополниельных репозиториев</h2>
<form action='./classic.php' method='get'>
<p><input type='hidden' name='step' value='3'></p>
{$repos}
<p><input type='submit' value=' Получить sources.list '></p>
</form>
{/if}
 
{if $status == 2}
 
{if $status == 3}
{$result}
{/if}
</div>