WebSVN - ant - Различия - Редакция 278 и 279




require_once dirname(__FILE__)."/lib/init.php";
$status = $secure->wrapInt($_GET["step"]);
$dist   = $secure->wrapInt($_GET["d"]);
$vers   = $secure->wrapInt($_GET["v"]);
$mirror = $secure->wrapInt($_GET["m"]);
$reps   = $_GET["r"];
$ID     = $_GET["id"];
if(isset($ID)){    
    list($mirror,$dist,$vers,$repstring) = split(",",$ID);
    if(isset($repstring)){
        $status=4;
        $reps = split("-",$repstring);
    }
}
$infomsg = array( _("Step"), _("Next step"), _("Mirror selection"), _("Choosing a distribution"), _("Choosing a version of distribution"), _("Selection of repositories"), _("Get sources.list") );


        }
    break;
    case 1:
        // Выбор дистрибутива
        $query =& $db->query("SELECT * FROM distribution");
        $linux .= "<input type='hidden' name='m' value='".$mirror."'>";
        while ($query->fetchInto($data, DB_FETCHMODE_ASSOC)) {
        $linux .= "<p><input type='radio' name='d' value='".$data["dist_id"]."'><span class='".$secure->stripStr($data["distua"])."'>".$secure->stripStr($data["distname"])."</span></p>\n";
        }
    break;
    case 2:
        // Выбор версии
        $query =& $db->query("SELECT * FROM version v JOIN distribution d ON d.dist_id=v.dist_id WHERE v.dist_id='$dist'");
        $distvers = "<input type='hidden' name='m' value='".$mirror."'>";
        $distvers .= "<p><input type='hidden' name='d' value='".$dist."'></p>\n";
        while ($query->fetchInto($version, DB_FETCHMODE_ASSOC)) {
                if ($version["vname"]!="") {
                        $distname = "&#8220;".$secure->stripStr($version["vname"])."&#8221;";
                } else {
                        $distname = "";
                }
                $distvers .= "<p><input type='radio' name='v' value='".$version["version_id"]."' /><span class='".$secure->stripStr($version["distua"])."'>".$secure->stripStr($version["distname"])." ".$secure->stripStr($version["version"])." ".$distname."</span></p>\n";
        }    break;
    case 3;
        // Выбор репозиториев
        $repos = "<input type='hidden' name='m' value='".$mirror."'>";
        $repodata=$core->getRepList($dist,$vers,$db);
        for($i=0;$i<count($repodata[0]);$i++) {
            $repos.="<input type='hidden' name='d' value='".$dist."'><input type='hidden' name='v' value='".$vers."'>";
            if ($repodata[3][$i]==true){$ch="checked";} else{$ch="";}
            $repos.="<input type='checkbox' name='r[]' ".$ch." value='".$repodata[0][$i]."'>".$repodata[1][$i]." <em>(".$repodata[2][$i].")</em><br>";

                        $getreps .= "-";
                }
        }
        $result = $info.$result."<p><a href='./get.php?id=".$dist.",".$vers.",".$getreps."'>".$infomsg[6]."</a></p>";
       
        $link="<div class='sllink'><a title='"._("Link to this sources.list")."' href=./classic.php?id=".$mirror.",".$dist.",".$vers.",".$getreps.">#</a></div>";
    break;
}

if ($status==3){$link='<div class="sllink"><a title="Ссылка на этот source.list" href=./classic.php?id='.$dist.",".$vers.",".$getreps.'>#</a></div>';}
$steps="<a href='classic.php'>".$infomsg[0]." 0</a> ::";
if ($status>0){ $steps .= "<a href='classic.php?step=1&m=".$mirr."'> ".$infomsg[0]." 1</a> ::"; } else { $steps.=" ".$infomsg[0]." 1 ::"; }
if ($status>1){ $steps .= "<a href='classic.php?step=2&m=".$mirr."&d=".$dist."'> ".$infomsg[0]." 2</a> ::"; } else{ $steps.=" ".$infomsg[0]." 2 ::"; }
if ($status>2){ $steps .= "<a href='classic.php?step=3&m=".$mirr."&d=".$dist."&v=".$vers."'> ".$infomsg[0]." 3</a> ::"; } else { $steps.=" ".$infomsg[0]." 3 ::"; }
if ($status>3){ $steps .= '<a href=./classic.php?id='.$mirror.','.$dist.','.$vers.','.$getreps.'>'.$infomsg[0].' 4</a>'; } else { $steps.=" ".$infomsg[0]." 4"; }

$smarty->assign('feedaddr',$_SERVER["HTTP_HOST"].dirname($_SERVER["PHP_SELF"]));
$smarty->assign('stepinfo',$infomsg[0]);
$smarty->assign('nextstep',$infomsg[1]);
$smarty->assign('mirrorselect',$infomsg[2]);

Редакция 278	Редакция 279
Строка 23...	Строка 23...
23		23
24	require_once dirname(__FILE__)."/lib/init.php";	24	require_once dirname(__FILE__)."/lib/init.php";
25	$status = $secure->wrapInt($_GET["step"]);	25	$status = $secure->wrapInt($_GET["step"]);
26	$dist = $secure->wrapInt($_GET["d"]);	26	$dist = $secure->wrapInt($_GET["d"]);
27	$vers = $secure->wrapInt($_GET["v"]);	27	$vers = $secure->wrapInt($_GET["v"]);
-		28	$mirror = $secure->wrapInt($_GET["m"]);
28	$reps = $_GET["r"];	29	$reps = $_GET["r"];
29	$ID = $_GET["id"];	30	$ID = $_GET["id"];
30	if(isset($ID)){	31	if(isset($ID)){
31	list($dist,$vers,$repstring) = split(",",$ID);	32	list($mirror,$dist,$vers,$repstring) = split(",",$ID);
32	if(isset($repstring)){	33	if(isset($repstring)){
33	$status=3;	34	$status=4;
34	$reps = split("-",$repstring);	35	$reps = split("-",$repstring);
35	}	36	}
36	}	37	}
37	$infomsg = array( _("Step"), _("Next step"), _("Mirror selection"), _("Choosing a distribution"), _("Choosing a version of distribution"), _("Selection of repositories"), _("Get sources.list") );	38	$infomsg = array( _("Step"), _("Next step"), _("Mirror selection"), _("Choosing a distribution"), _("Choosing a version of distribution"), _("Selection of repositories"), _("Get sources.list") );
38		39
Строка 47...	Строка 48...
47	}	48	}
48	break;	49	break;
49	case 1:	50	case 1:
50	// Выбор дистрибутива	51	// Выбор дистрибутива
51	$query =& $db->query("SELECT * FROM distribution");	52	$query =& $db->query("SELECT * FROM distribution");
-		53	$linux .= "<input type='hidden' name='m' value='".$mirror."'>";
52	while ($query->fetchInto($data, DB_FETCHMODE_ASSOC)) {	54	while ($query->fetchInto($data, DB_FETCHMODE_ASSOC)) {
53	$linux .= "<p><input type='radio' name='d' value='".$data["dist_id"]."'><span class='".$secure->stripStr($data["distua"])."'>".$secure->stripStr($data["distname"])."</span></p>\n";	55	$linux .= "<p><input type='radio' name='d' value='".$data["dist_id"]."'><span class='".$secure->stripStr($data["distua"])."'>".$secure->stripStr($data["distname"])."</span></p>\n";
54	}	56	}
55	break;	57	break;
56	case 2:	58	case 2:
57	// Выбор версии	59	// Выбор версии
58	$query =& $db->query("SELECT * FROM version v JOIN distribution d ON d.dist_id=v.dist_id WHERE v.dist_id='$dist'");	60	$query =& $db->query("SELECT * FROM version v JOIN distribution d ON d.dist_id=v.dist_id WHERE v.dist_id='$dist'");
-		61	$distvers = "<input type='hidden' name='m' value='".$mirror."'>";
59	$distvers = "<p><input type='hidden' name='d' value='".$dist."'></p>\n";	62	$distvers .= "<p><input type='hidden' name='d' value='".$dist."'></p>\n";
60	while ($query->fetchInto($version, DB_FETCHMODE_ASSOC)) {	63	while ($query->fetchInto($version, DB_FETCHMODE_ASSOC)) {
61	if ($version["vname"]!="") {	64	if ($version["vname"]!="") {
62	$distname = "“".$secure->stripStr($version["vname"])."”";	65	$distname = "“".$secure->stripStr($version["vname"])."”";
63	} else {	66	} else {
64	$distname = "";	67	$distname = "";
65	}	68	}
66	$distvers .= "<p><input type='radio' name='v' value='".$version["version_id"]."' /><span class='".$secure->stripStr($version["distua"])."'>".$secure->stripStr($version["distname"])." ".$secure->stripStr($version["version"])." ".$distname."</span></p>\n";	69	$distvers .= "<p><input type='radio' name='v' value='".$version["version_id"]."' /><span class='".$secure->stripStr($version["distua"])."'>".$secure->stripStr($version["distname"])." ".$secure->stripStr($version["version"])." ".$distname."</span></p>\n";
67	} break;	70	} break;
68	case 3;	71	case 3;
69	// Выбор репозиториев	72	// Выбор репозиториев
70	$repos = "";	73	$repos = "<input type='hidden' name='m' value='".$mirror."'>";
71	$repodata=$core->getRepList($dist,$vers,$db);	74	$repodata=$core->getRepList($dist,$vers,$db);
72	for($i=0;$i<count($repodata[0]);$i++) {	75	for($i=0;$i<count($repodata[0]);$i++) {
73	$repos.="<input type='hidden' name='d' value='".$dist."'><input type='hidden' name='v' value='".$vers."'>";	76	$repos.="<input type='hidden' name='d' value='".$dist."'><input type='hidden' name='v' value='".$vers."'>";
74	if ($repodata[3][$i]==true){$ch="checked";} else{$ch="";}	77	if ($repodata[3][$i]==true){$ch="checked";} else{$ch="";}
75	$repos.="<input type='checkbox' name='r[]' ".$ch." value='".$repodata[0][$i]."'>".$repodata[1][$i]." <em>(".$repodata[2][$i].")</em><br>";	78	$repos.="<input type='checkbox' name='r[]' ".$ch." value='".$repodata[0][$i]."'>".$repodata[1][$i]." <em>(".$repodata[2][$i].")</em><br>";
Строка 95...	Строка 98...
95	$getreps .= "-";	98	$getreps .= "-";
96	}	99	}
97	}	100	}
98	$result = $info.$result."<p><a href='./get.php?id=".$dist.",".$vers.",".$getreps."'>".$infomsg[6]."</a></p>";	101	$result = $info.$result."<p><a href='./get.php?id=".$dist.",".$vers.",".$getreps."'>".$infomsg[6]."</a></p>";
99		102
100	$link="<div class='sllink'><a title='"._("Link to this sources.list")."' href='".$_SERVER['php_self']."'>#</a></div>";	103	$link="<div class='sllink'><a title='"._("Link to this sources.list")."' href=./classic.php?id=".$mirror.",".$dist.",".$vers.",".$getreps.">#</a></div>";
101	break;	104	break;
102	}	105	}
103		106
104	if ($status==3){$link='<div class="sllink"><a title="Ссылка на этот source.list" href=./classic.php?id='.$dist.",".$vers.",".$getreps.'>#</a></div>';}	107	if ($status==3){$link='<div class="sllink"><a title="Ссылка на этот source.list" href=./classic.php?id='.$dist.",".$vers.",".$getreps.'>#</a></div>';}
105	$steps="<a href='classic.php'>".$infomsg[0]." 0</a> ::";	108	$steps="<a href='classic.php'>".$infomsg[0]." 0</a> ::";
106	if ($status>0){ $steps .= "<a href='classic.php?step=1&m=".$mirr."'> ".$infomsg[0]." 1</a> ::"; } else { $steps.=" ".$infomsg[0]." 1 ::"; }	109	if ($status>0){ $steps .= "<a href='classic.php?step=1&m=".$mirr."'> ".$infomsg[0]." 1</a> ::"; } else { $steps.=" ".$infomsg[0]." 1 ::"; }
107	if ($status>1){ $steps .= "<a href='classic.php?step=2&m=".$mirr."&d=".$dist."'> ".$infomsg[0]." 2</a> ::"; } else{ $steps.=" ".$infomsg[0]." 2 ::"; }	110	if ($status>1){ $steps .= "<a href='classic.php?step=2&m=".$mirr."&d=".$dist."'> ".$infomsg[0]." 2</a> ::"; } else{ $steps.=" ".$infomsg[0]." 2 ::"; }
108	if ($status>2){ $steps .= "<a href='classic.php?step=3&m=".$mirr."&d=".$dist."&v=".$vers."'> ".$infomsg[0]." 3</a> ::"; } else { $steps.=" ".$infomsg[0]." 3 ::"; }	111	if ($status>2){ $steps .= "<a href='classic.php?step=3&m=".$mirr."&d=".$dist."&v=".$vers."'> ".$infomsg[0]." 3</a> ::"; } else { $steps.=" ".$infomsg[0]." 3 ::"; }
109	if ($status>3){ $steps .= "<a href=./classic.php?id='.$dist.','.$vers.','.$getreps.'>' ".$infomsg[0]." 4</a>"; } else { $steps.=" ".$infomsg[0]." 4"; }	112	if ($status>3){ $steps .= '<a href=./classic.php?id='.$mirror.','.$dist.','.$vers.','.$getreps.'>'.$infomsg[0].' 4</a>'; } else { $steps.=" ".$infomsg[0]." 4"; }
110		113
111	$smarty->assign('feedaddr',$_SERVER["HTTP_HOST"].dirname($_SERVER["PHP_SELF"]));	114	$smarty->assign('feedaddr',$_SERVER["HTTP_HOST"].dirname($_SERVER["PHP_SELF"]));
112	$smarty->assign('stepinfo',$infomsg[0]);	115	$smarty->assign('stepinfo',$infomsg[0]);
113	$smarty->assign('nextstep',$infomsg[1]);	116	$smarty->assign('nextstep',$infomsg[1]);
114	$smarty->assign('mirrorselect',$infomsg[2]);	117	$smarty->assign('mirrorselect',$infomsg[2]);

Хранилища Subversion ant

(root)/trunk/classic.php - Редакция 278 → 279