WebSVN - ant - Различия - Редакция 62 и 63


<?php

class Core {

        function getRepList($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 version v2 ON v.ver_id=v2.version_id JOIN scheme s ON s.scheme_id=r.scheme_id WHERE v.ver_id='$version' ORDER BY r.rtype_id, r.scheme_id ASC");
                while ($query->fetchInto($resinfo, DB_FETCHMODE_ASSOC)) {
                        $repscheme = stripslashes($resinfo["scheme"]);
           
                        $querysect =& $dblink->query("SELECT * FROM section s JOIN sect2rep r ON s.sect_id=r.sect_id WHERE
r.rep_id='$resinfo[rep_id]'");
                        $sections = "";
                        while ($querysect->fetchInto($section,DB_FETCHMODE_ASSOC)) {
                                $sections .= stripslashes($section["sectname"])." ";
                        }

                        $repscheme = str_replace("{TYPE}",stripslashes($infodist["type"]),$repscheme);
                        $repscheme = str_replace("{PROTO}",$settings["proto"],$repscheme);
                        $repscheme = str_replace("{URL}",$settings["url"],$repscheme);
                        $repscheme = str_replace("{REP}",stripslashes($resinfo["repname"]),$repscheme);
                        $repscheme = str_replace("{DIST}",stripslashes($infodist["vcodename"]),$repscheme);
                        $repscheme = str_replace("{SECT}",$sections,$repscheme);
           
                        $result .= "# ".stripslashes($resinfo["repdescribe"])."\n".$repscheme."\n\n";
                }
                return $result;
        }
       
        function getInfo($message,$dblink){
                $answer = array();

                if (preg_match("/linux/i",$message)) {
                        $dist_id = 0;
                        $dist_info = "";
                        $vers_id = 0;
                        $vers_info = "";
                        $qd =& $dblink->query("SELECT * FROM distribution");
                        while ($qd->fetchInto($res, DB_FETCHMODE_ASSOC)) {
 
 
                                if (preg_match("/".stripslashes($res["distua"])."/i",$message)) {
                                        $dist_id = $res["dist_id"];
                                        $dist_info = stripslashes($res["distname"]);
                                        $qv =& $dblink->query("SELECT * FROM version WHERE dist_id='$dist_id'");
                                        while($qv->fetchInto($rev, DB_FETCHMODE_ASSOC)) {
                                                if (preg_match("/".stripslashes($rev["vcodename"])."/i",$message)) {
                                                        $vers_id = $rev["version_id"];
                                                        $vers_info = stripslashes($rev["version"])." &#8220;".stripslashes($rev["vname"])."&#8221;";
                                                }
                                        }
                                }
                        }
                        $answer[] = "Linux";
                        $answer[] = "Судя по всему у Вас операционная система ";
                        if ($dist_id!=0) {
                                $answer[] = $dist_id;
                                $answer[] = $dist_info;
                        }
                        if ($vers_id!=0) {
                                $answer[] = $vers_id;
                                $answer[] = $vers_info;
                        }

                } else {
                        $answer[] = "unknown";
                        $answer[] = "Ресурс рассчитан явно не на Вашу операционную систему!";
                }

                return $answer;
        }
}

?>
 

Редакция 62	Редакция 63
1	<?php	1	<?php
2		2
3	class Core {	3	class Core {
4		4
5	function getRepList($distro,$version,$dblink) {	5	function getRepList($distro,$version,$dblink) {
6	$query =& $dblink->query("SELECT * FROM settings");	6	$query =& $dblink->query("SELECT * FROM settings");
7	$settings = array();	7	$settings = array();
8	while ($query->fetchInto($setting, DB_FETCHMODE_ASSOC)) {	8	while ($query->fetchInto($setting, DB_FETCHMODE_ASSOC)) {
9	$settings[stripslashes($setting["opt"])] = stripslashes($setting["optvalue"]);	9	$settings[stripslashes($setting["opt"])] = stripslashes($setting["optvalue"]);
10	};	10	};
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'");	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'");
12	$query->fetchInto($infodist, DB_FETCHMODE_ASSOC);	12	$query->fetchInto($infodist, DB_FETCHMODE_ASSOC);
13	$query =& $dblink->query("SELECT * FROM repository r JOIN ver2rep v ON r.rep_id=v.rep_id JOIN version v2 ON v.ver_id=v2.version_id JOIN scheme s ON s.scheme_id=r.scheme_id WHERE v.ver_id='$version' ORDER BY r.rtype_id, r.scheme_id ASC");	13	$query =& $dblink->query("SELECT * FROM repository r JOIN ver2rep v ON r.rep_id=v.rep_id JOIN version v2 ON v.ver_id=v2.version_id JOIN scheme s ON s.scheme_id=r.scheme_id WHERE v.ver_id='$version' ORDER BY r.rtype_id, r.scheme_id ASC");
14	while ($query->fetchInto($resinfo, DB_FETCHMODE_ASSOC)) {	14	while ($query->fetchInto($resinfo, DB_FETCHMODE_ASSOC)) {
15	$repscheme = stripslashes($resinfo["scheme"]);	15	$repscheme = stripslashes($resinfo["scheme"]);
16		16
17	$querysect =& $dblink->query("SELECT * FROM section s JOIN sect2rep r ON s.sect_id=r.sect_id WHERE	17	$querysect =& $dblink->query("SELECT * FROM section s JOIN sect2rep r ON s.sect_id=r.sect_id WHERE
18	r.rep_id='$resinfo[rep_id]'");	18	r.rep_id='$resinfo[rep_id]'");
19	$sections = "";	19	$sections = "";
20	while ($querysect->fetchInto($section,DB_FETCHMODE_ASSOC)) {	20	while ($querysect->fetchInto($section,DB_FETCHMODE_ASSOC)) {
21	$sections .= stripslashes($section["sectname"])." ";	21	$sections .= stripslashes($section["sectname"])." ";
22	}	22	}
23		23
24	$repscheme = str_replace("{TYPE}",stripslashes($infodist["type"]),$repscheme);	24	$repscheme = str_replace("{TYPE}",stripslashes($infodist["type"]),$repscheme);
25	$repscheme = str_replace("{PROTO}",$settings["proto"],$repscheme);	25	$repscheme = str_replace("{PROTO}",$settings["proto"],$repscheme);
26	$repscheme = str_replace("{URL}",$settings["url"],$repscheme);	26	$repscheme = str_replace("{URL}",$settings["url"],$repscheme);
27	$repscheme = str_replace("{REP}",stripslashes($resinfo["repname"]),$repscheme);	27	$repscheme = str_replace("{REP}",stripslashes($resinfo["repname"]),$repscheme);
28	$repscheme = str_replace("{DIST}",stripslashes($infodist["vcodename"]),$repscheme);	28	$repscheme = str_replace("{DIST}",stripslashes($infodist["vcodename"]),$repscheme);
29	$repscheme = str_replace("{SECT}",$sections,$repscheme);	29	$repscheme = str_replace("{SECT}",$sections,$repscheme);
30		30
31	$result .= "# ".stripslashes($resinfo["repdescribe"])."\n".$repscheme."\n\n";	31	$result .= "# ".stripslashes($resinfo["repdescribe"])."\n".$repscheme."\n\n";
32	}	32	}
33	return $result;	33	return $result;
34	}	34	}
35		35
36	function getInfo($message,$dblink){	36	function getInfo($message,$dblink){
37	$answer = array();	37	$answer = array();
38		38
39	if (preg_match("/linux/i",$message)) {	39	if (preg_match("/linux/i",$message)) {
40	$dist_id = 0;	40	$dist_id = 0;
41	$dist_info = "";	41	$dist_info = "";
-		42	$vers_id = 0;
-		43	$vers_info = "";
42	$qd =& $dblink->query("SELECT * FROM distribution");	44	$qd =& $dblink->query("SELECT * FROM distribution");
43	while ($qd->fetchInto($res, DB_FETCHMODE_ASSOC)) {	45	while ($qd->fetchInto($res, DB_FETCHMODE_ASSOC)) {
44	$vers_id = 0;	-
45	$vers_info = "";	-
46	if (preg_match("/".stripslashes($res["distua"])."/i",$message)) {	46	if (preg_match("/".stripslashes($res["distua"])."/i",$message)) {
47	$dist_id = $res["dist_id"];	47	$dist_id = $res["dist_id"];
48	$dist_info = stripslashes($res["distname"]);	48	$dist_info = stripslashes($res["distname"]);
49	$qv =& $dblink->query("SELECT * FROM version WHERE dist_id='$dist_id'");	49	$qv =& $dblink->query("SELECT * FROM version WHERE dist_id='$dist_id'");
50	while($qv->fetchInto($rev, DB_FETCHMODE_ASSOC)) {	50	while($qv->fetchInto($rev, DB_FETCHMODE_ASSOC)) {
-		51	if (preg_match("/".stripslashes($rev["vcodename"])."/i",$message)) {
51	$vers_id = $rev["version_id"];	52	$vers_id = $rev["version_id"];
52	$vers_info = stripslashes($rev["version"])." ".stripslashes($rev["vname"]);	53	$vers_info = stripslashes($rev["version"])." “".stripslashes($rev["vname"])."”";
-		54	}
53	}	55	}
54	}	56	}
55	}	57	}
56	$answer[] = "Linux";	58	$answer[] = "Linux";
57	$answer[] = "Судя по всему у Вас операционная система ";	59	$answer[] = "Судя по всему у Вас операционная система ";
58	if ($dist_id!=0) {	60	if ($dist_id!=0) {
59	$answer[] = $dist_id;	61	$answer[] = $dist_id;
60	$answer[] = $dist_info;	62	$answer[] = $dist_info;
61	}	63	}
62	if ($vers_id!=0) {	64	if ($vers_id!=0) {
63	$answer[] = $vers_id;	65	$answer[] = $vers_id;
64	$answer[] = $vers_info;	66	$answer[] = $vers_info;
65	}	67	}
66		68
67	} else {	69	} else {
68	$answer[] = "unknown";	70	$answer[] = "unknown";
69	$answer[] = "Ресурс рассчитан явно не на Вашу операционную систему!";	71	$answer[] = "Ресурс рассчитан явно не на Вашу операционную систему!";
70	}	72	}
71		73
72	return $answer;	74	return $answer;
73	}	75	}
74	}	76	}
75		77
76	?>	78	?>
77		79

Хранилища Subversion ant

(root)/trunk/lib/core.php @ 70 - Редакция 62 → 63