WebSVN - ant - Различия - Редакция 317 и 318


<?php

/**
 *  
 *  Codename: ant-ng - generator of sources.list for Debian and
 *  distributives, based on Debian
 *  http://alex-w.org.ru/p/antng/
 *
 *  Copyright (c) 2009 Alexander Wolf
 *  Dual licensed under the MIT and GNU LGPL licenses.
 *  http://alex-w.org.ru/p/antng/license
 *
 */

class Core {
    protected $db       = NULL;
    protected $prefix   = NULL;
    protected $secure   = NULL;    


    function __construct($database, $prefix, $secure) {
        $this->db       = $database;
        $this->prefix   = $prefix;
        $this->secure   = $secure;        
    }

    // Получение данных о настройке
    function getOption($attr) {
        $result = array();
        $query = "SELECT optvalue FROM ".$this->prefix."settings WHERE opt='".$this->secure->checkStr($attr)."'";
        $rq =& $this->db->query($query);
        if ($rq->numRows()!=0) {
            $rq->fetchInto($element);
            $result["ERR"] = 0;
            $result["OptValue"] = $element["optvalue"];
        } else {
            $result["ERR"] = 1;
            $result["ERRINFO"] = "Empty result";
        }
        return $result;
    }

    // Получение и отображение списка дистрибутивов
    function showDistributionList($name, $info = "", $format = 'html') {
        $query = "SELECT * FROM ".$this->prefix."distribution ORDER BY dist_id ASC";
        $rq =& $this->db->query($query);
        switch ($format) {
            case 'html':
                $show = "<fieldset><legend>".$info."</legend>\n<select id='".$name."' name='".$name."'>\n";                
                while ($rq->fetchInto($element)) {
                    $show .= "<option value='".$this->secure->checkInt($element["dist_id"])."'>".$this->secure->checkStr($element["distname"],1)."</option>\n";
                }
                $show .= "</select></fieldset>";
                break;
            case 'json':
                $show = '[{value:"",text:"'.$info.'"}';                
                while ($rq->fetchInto($element)) {
                    $show .= ',{value:"'.$this->secure->checkInt($element["dist_id"]).'",text:"'.$this->secure->checkStr($element["distname"],1).'"}';
                }
                $show .= ']';
                break;
        }
        return $show;
    }

    // Получение названия дистрибутива
    function getDistName($distID) {
        $result = array();
        $query = "SELECT distname FROM ".$this->prefix."distribution WHERE dist_id='".$this->secure->checkInt($distID)."'";
        $rq =& $this->db->query($query);
        if (PEAR::isError($this->db)) {
            $result["ERR"] = 1;
            $result["ERRINFO"] = $this->db->getMessage();
        } else {
            $rq->fetchInto($element);
            $result["ERR"] = 0;
            $result["DistName"] = $this->secure->checkStr($element["distname"],1);
        }

        return $result;
    }

    // Получение и отображение списка версий дистрибутива
    function showDistVersionsList($name, $distID, $format = 'html') {
        $distname = $this->getDistName($distID);
        $query = "SELECT * FROM ".$this->prefix."version WHERE dist_id='".$this->secure->checkInt($distID)."' ORDER BY version ASC";
        $rq =& $this->db->query($query);
        switch ($format) {
            case 'html':
                $show = "<fieldset><legend>Версии ".$distname["DistName"]."</legend>\n<select id='".$name."' name='".$name."'>\n";                
                while ($rq->fetchInto($element)) {
                    $show .= "<option value='".$this->secure->checkInt($element["version_id"])."'>".$this->secure->checkStr($element["version"],1)." ".$this->secure->checkStr($element["vname"],1)."</option>\n";
                }
                $show .= "</select></fieldset>";
                break;
            case 'json':
                $show = '[{value:"",text:"Выбери версию '.$distname["DistName"].'"}';                
                while ($rq->fetchInto($element)) {
                    $show .= ',{value:"'.$this->secure->checkInt($element["version_id"]).'",text:"'.$this->secure->checkStr($element["version"],1).' '.$this->secure->checkStr($element["vname"],1).'"}';
                }
                $show .= ']';
                break;
        }
        return $show;
    }

    // Получение и отображение списка секций основного (официального) репозитория
    function showBranchesList($version, $format = 'html') {
        $query  = "SELECT rtype FROM ".$this->prefix."rtype WHERE rtype_id='1'";
        $rq =& $this->db->query($query);
        $rq->fetchInto($types);
        $query  = "SELECT s.*,t.rtype FROM ".$this->prefix."section s ";
        $query .= "JOIN ".$this->prefix."sect2rep l ON s.sect_id=l.sect_id ";
        $query .= "JOIN ".$this->prefix."repository r ON r.rep_id=l.rep_id ";
        $query .= "JOIN ".$this->prefix."rtype t ON r.rtype_id=t.rtype_id ";
        $query .= "WHERE t.rtype_id='1' AND r.version='".$this->secure->checkInt($version)."'";
        $rq =& $this->db->query($query);
        switch ($format) {
            case 'html':
                $show = "<fieldset><legend>".$this->secure->checkStr($types["rtype"],1)."</legend>\n";
                while ($rq->fetchInto($element)) {
                    $show .= "<div class='sections'><input type='checkbox' name='section[]' value='".$element["sect_id"]."'> ".$this->secure->checkStr($element["sectname"])." &mdash; ".$this->secure->checkStr($element["sectinfo"])."</div>\n";
                }
                $show .= "</fieldset>\n";
                break;
            case 'json':
                //TODO Доделать JSON-вывод списка секций основного репозитория
                break;
        }

        return $show;
    }

    // Получение и отображение списка репозиториев 
    function showRepList($version, $reptype, $format = 'html') {
        $query  = "SELECT rtype FROM ".$this->prefix."rtype WHERE rtype_id='1'";
        $rq =& $this->db->query($query);
        $rq->fetchInto($types);
        $query = "SELECT * FROM ".$this->prefix."repository WHERE version='".$this->secure->checkInt($version)."' AND rtype_id='".$this->secure->checkInt($reptype)."'";
        $rq =& $this->db->query($query);
        switch ($format) {
            case 'html':
                $show = "<fieldset><legend>".$this->secure->checkStr($types["rtype"],1)."</legend>\n";
                while ($rq->fetchInto($types)) {
                    $show .= "<div class='repository'><input type='checkbox' name='repository[]' value='".$element["rep_id"]."'> ".$this->secure->checkStr($element["repname"])." &mdash; ".$this->secure->checkStr($element["repinfo"])."</div>\n";
                }
                $show .= "</fieldset>\n";
                break;
            case 'json':
                //TODO Доделать JSON-вывод списка репозиториев
                break;
        }

        return $show;
    }

}

?>
 

Редакция 317	Редакция 318
1	<?php	1	<?php
2		2
3	/**	3	/**
4	*	4	*
5	* Codename: ant-ng - generator of sources.list for Debian and	5	* Codename: ant-ng - generator of sources.list for Debian and
6	* distributives, based on Debian	6	* distributives, based on Debian
7	* http://alex-w.org.ru/p/antng/	7	* http://alex-w.org.ru/p/antng/
8	*	8	*
9	* Copyright (c) 2009 Alexander Wolf	9	* Copyright (c) 2009 Alexander Wolf
10	* Dual licensed under the MIT and GNU LGPL licenses.	10	* Dual licensed under the MIT and GNU LGPL licenses.
11	* http://alex-w.org.ru/p/antng/license	11	* http://alex-w.org.ru/p/antng/license
12	*	12	*
13	*/	13	*/
14		14
15	class Core {	15	class Core {
16	protected $db = NULL;	16	protected $db = NULL;
17	protected $prefix = NULL;	17	protected $prefix = NULL;
18	protected $secure = NULL;	18	protected $secure = NULL;
19		19
20		20
21	function __construct($database, $prefix, $secure) {	21	function __construct($database, $prefix, $secure) {
22	$this->db = $database;	22	$this->db = $database;
23	$this->prefix = $prefix;	23	$this->prefix = $prefix;
24	$this->secure = $secure;	24	$this->secure = $secure;
25	}	25	}
26		26
27	// Получение данных о настройке	27	// Получение данных о настройке
28	function getOption($attr) {	28	function getOption($attr) {
29	$result = array();	29	$result = array();
30	$query = "SELECT optvalue FROM ".$this->prefix."settings WHERE opt='".$this->secure->checkStr($attr)."'";	30	$query = "SELECT optvalue FROM ".$this->prefix."settings WHERE opt='".$this->secure->checkStr($attr)."'";
31	$rq =& $this->db->query($query);	31	$rq =& $this->db->query($query);
32	if ($rq->numRows()!=0) {	32	if ($rq->numRows()!=0) {
33	$rq->fetchInto($element);	33	$rq->fetchInto($element);
34	$result["ERR"] = 0;	34	$result["ERR"] = 0;
35	$result["OptValue"] = $element["optvalue"];	35	$result["OptValue"] = $element["optvalue"];
36	} else {	36	} else {
37	$result["ERR"] = 1;	37	$result["ERR"] = 1;
38	$result["ERRINFO"] = "Empty result";	38	$result["ERRINFO"] = "Empty result";
39	}	39	}
40	return $result;	40	return $result;
41	}	41	}
42		42
43	// Получение и отображение списка дистрибутивов	43	// Получение и отображение списка дистрибутивов
44	function showDistributionList($name, $info = "", $format = 'html') {	44	function showDistributionList($name, $info = "", $format = 'html') {
45	$query = "SELECT * FROM ".$this->prefix."distribution ORDER BY dist_id ASC";	45	$query = "SELECT * FROM ".$this->prefix."distribution ORDER BY dist_id ASC";
46	$rq =& $this->db->query($query);	46	$rq =& $this->db->query($query);
47	switch ($format) {	47	switch ($format) {
48	case 'html':	48	case 'html':
49	$show = "<fieldset><legend>".$info."</legend>\n<select id='".$name."' name='".$name."'>\n";	49	$show = "<fieldset><legend>".$info."</legend>\n<select id='".$name."' name='".$name."'>\n";
50	while ($rq->fetchInto($element)) {	50	while ($rq->fetchInto($element)) {
51	$show .= "<option value='".$this->secure->checkInt($element["dist_id"])."'>".$this->secure->checkStr($element["distname"],1)."</option>\n";	51	$show .= "<option value='".$this->secure->checkInt($element["dist_id"])."'>".$this->secure->checkStr($element["distname"],1)."</option>\n";
52	}	52	}
53	$show .= "</select></fieldset>";	53	$show .= "</select></fieldset>";
54	break;	54	break;
55	case 'json':	55	case 'json':
56	$show = '[{value:"",text:"'.$info.'"}';	56	$show = '[{value:"",text:"'.$info.'"}';
57	while ($rq->fetchInto($element)) {	57	while ($rq->fetchInto($element)) {
58	$show .= ',{value:"'.$this->secure->checkInt($element["dist_id"]).'",text:"'.$this->secure->checkStr($element["distname"],1).'"}';	58	$show .= ',{value:"'.$this->secure->checkInt($element["dist_id"]).'",text:"'.$this->secure->checkStr($element["distname"],1).'"}';
59	}	59	}
60	$show .= ']';	60	$show .= ']';
61	break;	61	break;
62	}	62	}
63	return $show;	63	return $show;
64	}	64	}
65		65
66	// Получение названия дистрибутива	66	// Получение названия дистрибутива
67	function getDistName($distID) {	67	function getDistName($distID) {
68	$result = array();	68	$result = array();
69	$query = "SELECT distname FROM ".$this->prefix."distribution WHERE dist_id='".$this->secure->checkInt($distID)."'";	69	$query = "SELECT distname FROM ".$this->prefix."distribution WHERE dist_id='".$this->secure->checkInt($distID)."'";
70	$rq =& $this->db->query($query);	70	$rq =& $this->db->query($query);
71	if (PEAR::isError($this->db)) {	71	if (PEAR::isError($this->db)) {
72	$result["ERR"] = 1;	72	$result["ERR"] = 1;
73	$result["ERRINFO"] = $this->db->getMessage();	73	$result["ERRINFO"] = $this->db->getMessage();
74	} else {	74	} else {
75	$rq->fetchInto($element);	75	$rq->fetchInto($element);
76	$result["ERR"] = 0;	76	$result["ERR"] = 0;
77	$result["DistName"] = $this->secure->checkStr($element["distname"],1);	77	$result["DistName"] = $this->secure->checkStr($element["distname"],1);
78	}	78	}
79		79
80	return $result;	80	return $result;
81	}	81	}
82		82
83	// Получение и отображение списка версий дистрибутива	83	// Получение и отображение списка версий дистрибутива
84	function showDistVersionsList($name, $distID, $format = 'html') {	84	function showDistVersionsList($name, $distID, $format = 'html') {
85	$distname = $this->getDistName($distID);	85	$distname = $this->getDistName($distID);
86	$query = "SELECT * FROM ".$this->prefix."version WHERE dist_id='".$this->secure->checkInt($distID)."' ORDER BY version ASC";	86	$query = "SELECT * FROM ".$this->prefix."version WHERE dist_id='".$this->secure->checkInt($distID)."' ORDER BY version ASC";
87	$rq =& $this->db->query($query);	87	$rq =& $this->db->query($query);
88	switch ($format) {	88	switch ($format) {
89	case 'html':	89	case 'html':
90	$show = "<fieldset><legend>Версии ".$distname["DistName"]."</legend>\n<select id='".$name."' name='".$name."'>\n";	90	$show = "<fieldset><legend>Версии ".$distname["DistName"]."</legend>\n<select id='".$name."' name='".$name."'>\n";
91	while ($rq->fetchInto($element)) {	91	while ($rq->fetchInto($element)) {
92	$show .= "<option value='".$this->secure->checkInt($element["version_id"])."'>".$this->secure->checkStr($element["version"],1)." ".$this->secure->checkStr($element["vname"],1)."</option>\n";	92	$show .= "<option value='".$this->secure->checkInt($element["version_id"])."'>".$this->secure->checkStr($element["version"],1)." ".$this->secure->checkStr($element["vname"],1)."</option>\n";
93	}	93	}
94	$show .= "</select></fieldset>";	94	$show .= "</select></fieldset>";
95	break;	95	break;
96	case 'json':	96	case 'json':
97	$show = '[{value:"",text:"Выбери версию '.$distname["DistName"].'"}';	97	$show = '[{value:"",text:"Выбери версию '.$distname["DistName"].'"}';
98	while ($rq->fetchInto($element)) {	98	while ($rq->fetchInto($element)) {
99	$show .= ',{value:"'.$this->secure->checkInt($element["version_id"]).'",text:"'.$this->secure->checkStr($element["version"],1).' '.$this->secure->checkStr($element["vname"],1).'"}';	99	$show .= ',{value:"'.$this->secure->checkInt($element["version_id"]).'",text:"'.$this->secure->checkStr($element["version"],1).' '.$this->secure->checkStr($element["vname"],1).'"}';
100	}	100	}
101	$show .= ']';	101	$show .= ']';
102	break;	102	break;
103	}	103	}
104	return $show;	104	return $show;
105	}	105	}
106		106
107	// Получение и отображение списка секций основного (официального) репозитория	107	// Получение и отображение списка секций основного (официального) репозитория
108	function showBranchesList($version, $format = 'html') {	108	function showBranchesList($version, $format = 'html') {
109	$query = "SELECT rtype FROM ".$this->prefix."rtype WHERE rtype_id='1'";	109	$query = "SELECT rtype FROM ".$this->prefix."rtype WHERE rtype_id='1'";
110	$rq =& $this->db->query($query);	110	$rq =& $this->db->query($query);
111	$rq->fetchInto($types);	111	$rq->fetchInto($types);
112	$query = "SELECT s.*,t.rtype FROM ".$this->prefix."section s ";	112	$query = "SELECT s.*,t.rtype FROM ".$this->prefix."section s ";
113	$query .= "JOIN ".$this->prefix."sect2rep l ON s.sect_id=l.sect_id ";	113	$query .= "JOIN ".$this->prefix."sect2rep l ON s.sect_id=l.sect_id ";
114	$query .= "JOIN ".$this->prefix."repository r ON r.rep_id=l.rep_id ";	114	$query .= "JOIN ".$this->prefix."repository r ON r.rep_id=l.rep_id ";
115	$query .= "JOIN ".$this->prefix."rtype t ON r.rtype_id=t.rtype_id ";	115	$query .= "JOIN ".$this->prefix."rtype t ON r.rtype_id=t.rtype_id ";
116	$query .= "WHERE t.rtype_id='1' AND r.version='".$this->secure->checkInt($version)."'";	116	$query .= "WHERE t.rtype_id='1' AND r.version='".$this->secure->checkInt($version)."'";
117	$rq =& $this->db->query($query);	117	$rq =& $this->db->query($query);
118	switch ($format) {	118	switch ($format) {
119	case 'html':	119	case 'html':
120	$show = "<fieldset><legend>".$this->secure->checkStr($types["rtype"],1)."</legend>\n";	120	$show = "<fieldset><legend>".$this->secure->checkStr($types["rtype"],1)."</legend>\n";
121	while ($rq->fetchInto($element)) {	121	while ($rq->fetchInto($element)) {
122	$show .= "<div class='sections'><input type='checkbox' name='section[]' value='".$element["sect_id"]."'> ".$this->secure->checkStr($element["sectname"])." — ".$this->secure->checkStr($element["sectinfo"])."</div>\n";	122	$show .= "<div class='sections'><input type='checkbox' name='section[]' value='".$element["sect_id"]."'> ".$this->secure->checkStr($element["sectname"])." — ".$this->secure->checkStr($element["sectinfo"])."</div>\n";
123	}	123	}
124	$show .= "</fieldset>\n";	124	$show .= "</fieldset>\n";
125	break;	125	break;
126	case 'json':	126	case 'json':
127	//TODO Доделать JSON-вывод списка секций основного репозитория	127	//TODO Доделать JSON-вывод списка секций основного репозитория
128	break;	128	break;
129	}	129	}
-		130
-		131	return $show;
130	}	132	}
131		133
132	// Получение и отображение списка репозиториев	134	// Получение и отображение списка репозиториев
133	function showRepList($version, $reptype, $format = 'html') {	135	function showRepList($version, $reptype, $format = 'html') {
134	$query = "SELECT rtype FROM ".$this->prefix."rtype WHERE rtype_id='1'";	136	$query = "SELECT rtype FROM ".$this->prefix."rtype WHERE rtype_id='1'";
135	$rq =& $this->db->query($query);	137	$rq =& $this->db->query($query);
136	$rq->fetchInto($types);	138	$rq->fetchInto($types);
137	$query = "SELECT * FROM ".$this->prefix."repository WHERE version='".$this->secure->checkInt($version)."' AND rtype_id='".$this->secure->checkInt($reptype)."'";	139	$query = "SELECT * FROM ".$this->prefix."repository WHERE version='".$this->secure->checkInt($version)."' AND rtype_id='".$this->secure->checkInt($reptype)."'";
138	$rq =& $this->db->query($query);	140	$rq =& $this->db->query($query);
139	switch ($format) {	141	switch ($format) {
140	case 'html':	142	case 'html':
141	$show = "<fieldset><legend>".$this->secure->checkStr($types["rtype"],1)."</legend>\n";	143	$show = "<fieldset><legend>".$this->secure->checkStr($types["rtype"],1)."</legend>\n";
142	while ($rq->fetchInto($types)) {	144	while ($rq->fetchInto($types)) {
143	$show .= "<div class='repository'><input type='checkbox' name='repository[]' value='".$element["rep_id"]."'> ".$this->secure->checkStr($element["repname"])." — ".$this->secure->checkStr($element["repinfo"])."</div>\n";	145	$show .= "<div class='repository'><input type='checkbox' name='repository[]' value='".$element["rep_id"]."'> ".$this->secure->checkStr($element["repname"])." — ".$this->secure->checkStr($element["repinfo"])."</div>\n";
144	}	146	}
145	$show .= "</fieldset>\n";	147	$show .= "</fieldset>\n";
146	break;	148	break;
147	case 'json':	149	case 'json':
148	//TODO Доделать JSON-вывод списка репозиториев	150	//TODO Доделать JSON-вывод списка репозиториев
149	break;	151	break;
150	}	152	}
-		153
-		154	return $show;
151	}	155	}
152		156
153	}	157	}
154		158
155	?>	159	?>
156		160

Хранилища Subversion ant

(root)/branches/ant/0.9.x/lib/core.php @ 691 - Редакция 317 → 318