Menu
▾
▴
publicdnsadmin-cvs — CVS Commit List
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(23) |
Jul
(16) |
Aug
(10) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
(10) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: <sir...@us...> - 2006-09-11 14:58:39
|
Revision: 76
http://svn.sourceforge.net/publicdnsadmin/?rev=76&view=rev
Author: sirvulcan
Date: 2006-09-11 07:57:55 -0700 (Mon, 11 Sep 2006)
Log Message:
-----------
woah whats this? a publicdnsadmin commit :P few tweaks here n there. Re added the images as it seems they got screwed over when i converted to svn. Im trying to find some motovation to work on this project again
Modified Paths:
--------------
trunk/publicdnsadmin/docs/mysql.sql
trunk/publicdnsadmin/index.php
trunk/publicdnsadmin/lib/config.php-dist
Added Paths:
-----------
trunk/publicdnsadmin/.htaccess
trunk/publicdnsadmin/images/apache.gif
trunk/publicdnsadmin/images/b5.ttf
trunk/publicdnsadmin/images/bg_gfx_code.jpg
trunk/publicdnsadmin/images/edit.png
trunk/publicdnsadmin/images/index.html
trunk/publicdnsadmin/images/index.php
trunk/publicdnsadmin/images/logo.gif
trunk/publicdnsadmin/images/mysql.gif
trunk/publicdnsadmin/images/pgsql.gif
trunk/publicdnsadmin/images/php.gif
trunk/publicdnsadmin/images/rans.ttf
trunk/publicdnsadmin/images/server.jpg
trunk/publicdnsadmin/images/tile_dw.jpg
trunk/publicdnsadmin/images/tile_dw_small.jpg
trunk/publicdnsadmin/images/tile_up.jpg
trunk/publicdnsadmin/images/tile_up_small.jpg
trunk/publicdnsadmin/images/trash.png
trunk/publicdnsadmin/images/whois.gif
Removed Paths:
-------------
trunk/publicdnsadmin/images/apache.gif
trunk/publicdnsadmin/images/b5.ttf
trunk/publicdnsadmin/images/bg_gfx_code.jpg
trunk/publicdnsadmin/images/edit.png
trunk/publicdnsadmin/images/index.html
trunk/publicdnsadmin/images/index.php
trunk/publicdnsadmin/images/logo.gif
trunk/publicdnsadmin/images/mysql.gif
trunk/publicdnsadmin/images/pgsql.gif
trunk/publicdnsadmin/images/php.gif
trunk/publicdnsadmin/images/rans.ttf
trunk/publicdnsadmin/images/server.jpg
trunk/publicdnsadmin/images/tile_dw.jpg
trunk/publicdnsadmin/images/tile_dw_small.jpg
trunk/publicdnsadmin/images/tile_up.jpg
trunk/publicdnsadmin/images/tile_up_small.jpg
trunk/publicdnsadmin/images/trash.png
trunk/publicdnsadmin/images/whois.gif
Added: trunk/publicdnsadmin/.htaccess
===================================================================
--- trunk/publicdnsadmin/.htaccess (rev 0)
+++ trunk/publicdnsadmin/.htaccess 2006-09-11 14:57:55 UTC (rev 76)
@@ -0,0 +1 @@
+php_value include_path .:./lib:/usr/local/lib/php
Modified: trunk/publicdnsadmin/docs/mysql.sql
===================================================================
--- trunk/publicdnsadmin/docs/mysql.sql 2005-01-09 05:30:19 UTC (rev 75)
+++ trunk/publicdnsadmin/docs/mysql.sql 2006-09-11 14:57:55 UTC (rev 76)
@@ -46,8 +46,6 @@
) TYPE=MyISAM;
CREATE TABLE gfxcodes (
- x
- x
code VARCHAR(25) NOT NULL,
crc VARCHAR(128) NOT NULL,
expire INT NOT NULL
Deleted: trunk/publicdnsadmin/images/apache.gif
===================================================================
--- trunk/publicdnsadmin/images/apache.gif 2005-01-09 05:30:19 UTC (rev 75)
+++ trunk/publicdnsadmin/images/apache.gif 2006-09-11 14:57:55 UTC (rev 76)
@@ -1,20 +0,0 @@
-GIF89af |
|
From: Neil S. <sir...@us...> - 2005-01-09 05:30:38
|
Committer : sirvulcan
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2005-01-09 05:30:29 UTC
Modified files:
index.php search.php lib/header.php
Log message:
use utf-8 but decode it when querying the database. Mysql appears to handle unicode fine under its default character set but we cant query it with a unicode string, it has to be formatted back. In the future there could be option for what character set the sql db uses.
---------------------- diff included ----------------------
Index: publicdnsadmin/index.php
diff -u publicdnsadmin/index.php:1.12 publicdnsadmin/index.php:1.13
--- publicdnsadmin/index.php:1.12 Sat Jan 8 20:41:40 2005
+++ publicdnsadmin/index.php Sat Jan 8 21:30:18 2005
@@ -9,7 +9,6 @@
$Id:
*/
-header('Content-Type: text/html; charset=UTF-8');
require("lib/prepend.php");
require("lib/header.php");
Index: publicdnsadmin/lib/header.php
diff -u publicdnsadmin/lib/header.php:1.21 publicdnsadmin/lib/header.php:1.22
--- publicdnsadmin/lib/header.php:1.21 Wed Jan 5 18:27:40 2005
+++ publicdnsadmin/lib/header.php Sat Jan 8 21:30:19 2005
@@ -7,8 +7,10 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: header.php,v 1.21 2005/01/06 02:27:40 key2peace Exp $
+ $Id: header.php,v 1.22 2005/01/09 05:30:19 sirvulcan Exp $
*/
+
+header('Content-Type: text/html; charset=UTF-8');
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
Index: publicdnsadmin/search.php
diff -u publicdnsadmin/search.php:1.2 publicdnsadmin/search.php:1.3
--- publicdnsadmin/search.php:1.2 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/search.php Sat Jan 8 21:30:18 2005
@@ -14,11 +14,12 @@
if ($_SESSION["_UID"]) {
-$query = trim(addslashes($_POST["query"]));
+$query = utf8_decode(trim(addslashes($_POST["query"])));
+$uquery = trim(addslashes($_POST["query"]));
echo "<h3>"._DOMAINSEARCH."</h3>";
?>
-<p><? echo _QUERY; ?>: "<?php echo stripslashes($query); ?>"</p>
+<p><? echo _QUERY; ?>: "<?php echo stripslashes($uquery); ?>"</p>
<?php
$zones = getUserZones($_SESSION["_UID"], $query);
if (count($zones)) {
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2005-01-09 04:42:01
|
Committer : sirvulcan
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2005-01-09 04:41:51 UTC
Modified files:
create_zone.php index.php language/lang-english.php
Log message:
lets make use of this class, display the puny code if its a internation domain (on the my domains page).
Fixed a missing language define
Fixed a small error with create_zone.php that i had caused earlier.
---------------------- diff included ----------------------
Index: publicdnsadmin/create_zone.php
diff -u publicdnsadmin/create_zone.php:1.3 publicdnsadmin/create_zone.php:1.4
--- publicdnsadmin/create_zone.php:1.3 Fri Jan 7 17:51:39 2005
+++ publicdnsadmin/create_zone.php Sat Jan 8 20:41:40 2005
@@ -111,7 +111,7 @@
if (!$domain)
echo "<p class=\"error\">"._MISSINGINVDOM."</p>\n";
- } else {
+ else {
$dbh = db_connect();
$result = $dbh->query("SELECT * FROM templates WHERE id = '$template'");
if (!$dbh->isError($result) && $result->numRows()) {
Index: publicdnsadmin/index.php
diff -u publicdnsadmin/index.php:1.11 publicdnsadmin/index.php:1.12
--- publicdnsadmin/index.php:1.11 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/index.php Sat Jan 8 20:41:40 2005
@@ -9,9 +9,14 @@
$Id:
*/
+header('Content-Type: text/html; charset=UTF-8');
+
require("lib/prepend.php");
require("lib/header.php");
+require("lib/classes/idna_convert.class.php");
+
+
if (!extension_loaded("gd")) { // checking if LibGD is present in apache/php
$SHOW_GFXUSRCHK = 0;
} else {
@@ -41,7 +46,7 @@
$offsetmin = $offset;
$offsetmax = $offset + $domains_per_page;
- echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th>"._DOMAIN."</th><th>"._CURRENTSERIAL."</th><th>"._OWNER."</th><th>"._RECORDS."</th><th> </th></tr>\n";
+ echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th>"._DOMAIN."</th><th>"._PCODE."</th><th>"._CURRENTSERIAL."</th><th>"._OWNER."</th><th>"._RECORDS."</th><th> </th></tr>\n";
foreach ($zones as $zone) {
$row_id++;
@@ -69,6 +74,16 @@
$owner = htmlentities($tmprow["username"]);
}
+ $IDN = new Net_IDNA();
+
+ $edomain = utf8_encode($zone["name"]);
+ $pcode = $IDN->encode($edomain, 'utf8');
+
+ if ($pcode == $zone["name"])
+ $pcode = "";
+
+ $IDN = ``;
+
if (($row_count >= $offsetmin) && ($row_count <= $offsetmax)) {
if ($row_id == 1) {
echo "<tr onmouseover=\"setPointer(this, $row_c, 'over', '$row1', '#CCFFCC', '#FFCC99');\" onmouseout=\"setPointer(this, $row_c, 'out', '$row1', '#CCFFCC', '#FFCC99');\" onmousedown=\"setPointer(this, $row_c, 'click', '$row1', '#CCFFCC', '#FFCC99');\">";
@@ -77,6 +92,7 @@
}
echo "<td bgcolor=\"$bgcolor\"><a href=\"edit_zone.php?id=".$zone["id"]."\">".htmlentities($zone["name"])."</a></td>\n";
+ echo "<td bgcolor=\"$bgcolor\" align=\"right\">$pcode</td>\n";
echo "<td bgcolor=\"$bgcolor\" align=\"right\">$serial</td>\n";
echo "<td bgcolor=\"$bgcolor\" align=\"right\">$owner</td>\n";
echo "<td bgcolor=\"$bgcolor\" align=\"right\">$records</td>\n";
Index: publicdnsadmin/language/lang-english.php
diff -u publicdnsadmin/language/lang-english.php:1.3 publicdnsadmin/language/lang-english.php:1.4
--- publicdnsadmin/language/lang-english.php:1.3 Wed Aug 13 16:19:00 2003
+++ publicdnsadmin/language/lang-english.php Sat Jan 8 20:41:40 2005
@@ -260,5 +260,7 @@
define("_DOMAINPERLINE","Domain Per Line");
define("_DOMAINOWNEREXIST","A domain with the same name already exists");
define("_TEMPLATENAME","Template name");
+define("_PCODE","Puny Code");
+define("_DELDOMAIN","Delete Domain");
?>
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2005-01-09 03:20:45
|
Committer : sirvulcan
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2005-01-09 03:20:38 UTC
Added files:
lib/classes/idna_convert.class.php
Log message:
class for converting international domain names to/from puny code. I will do a chanelog later on. Possibly in the future we could turn some of the functions in the lib dir into classes.
---------------------- diff included ----------------------
Index: publicdnsadmin/lib/classes/idna_convert.class.php
diff -u /dev/null publicdnsadmin/lib/classes/idna_convert.class.php:1.1
--- /dev/null Sat Jan 8 19:20:38 2005
+++ publicdnsadmin/lib/classes/idna_convert.class.php Sat Jan 8 19:20:28 2005
@@ -0,0 +1,3001 @@
+<?php
+/* ------------------------------------------------------------------------- */
+/* idna_convert.class.php - Encode / Decode Internationalized Domain Names */
+/* (c) 2004 phlyLabs, Berlin (http://phlylabs.de) */
+/* All rights reserved */
+/* v0.3.7 */
+/* ------------------------------------------------------------------------- */
+
+// {{{ license
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 foldmethod=marker: */
+//
+// +----------------------------------------------------------------------+
+// | This library is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU Lesser General Public License as |
+// | published by the Free Software Foundation; either version 2.1 of the |
+// | License, or (at your option) any later version. |
+// | |
+// | This library is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | Lesser General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU Lesser General Public |
+// | License along with this library; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 |
+// | USA. |
+// +----------------------------------------------------------------------+
+//
+
+// }}}
+
+/**
+ * Encode/decode Internationalized Domain Names.
+ *
+ * The class allows to convert internationalized domain names
+ * (see RFC 3490 for details) as they can be used with various registries worldwide
+ * to be translated between their original (localized) form and their encoded form
+ * as it will be used in the DNS (Domain Name System).
+ *
+ * The class provides two public methods, encode() and decode(), which do exactly
+ * what you would expect them to do. You are allowed to use complete domain names,
+ * simple strings and complete email addresses as well. That means, that you might
+ * use any of the following notations:
+ *
+ * - www.n�rgler.com
+ * - xn--nrgler-wxa
+ * - xn--brse-5qa.xn--knrz-1ra.info
+ *
+ * Unicode input might be given as either UTF-8 string, UCS-4 string or UCS-4
+ * array. Unicode output is available in the same formats.
+ * You can select your preferred format via {@link set_paramter()}.
+ *
+ * ACE input and output is always expected to be ASCII.
+ *
+ * @author Matthias Sommerfeld <ms...@ph...>
+ * @version 0.3.7
+ *
+ */
+
+class idna_convert
+{
+ // {{{ npdata
+ /**
+ * These Unicode codepoints are mapped to nothing,
+ * See RFC3454 for details
+ *
+ * @static
+ * @var array
+ * @access private
+ */
+ var $_np_map_nothing = array(
+ 0xAD,
+ 0x34F,
+ 0x1806,
+ 0x180B,
+ 0x180C,
+ 0x180D,
+ 0x200B,
+ 0x200C,
+ 0x200D,
+ 0x2060,
+ 0xFE00,
+ 0xFE01,
+ 0xFE02,
+ 0xFE03,
+ 0xFE04,
+ 0xFE05,
+ 0xFE06,
+ 0xFE07,
+ 0xFE08,
+ 0xFE09,
+ 0xFE0A,
+ 0xFE0B,
+ 0xFE0C,
+ 0xFE0D,
+ 0xFE0E,
+ 0xFE0F,
+ 0xFEFF
+ );
+
+ /**
+ * @static
+ * @var array
+ * @access private
+ */
+ var $_general_prohibited = array(
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 0xA,
+ 0xB,
+ 0xC,
+ 0xD,
+ 0xE,
+ 0xF,
+ 0x10,
+ 0x11,
+ 0x12,
+ 0x13,
+ 0x14,
+ 0x15,
+ 0x16,
+ 0x17,
+ 0x18,
+ 0x19,
+ 0x1A,
+ 0x1B,
+ 0x1C,
+ 0x1D,
+ 0x1E,
+ 0x1F,
+ 0x20,
+ 0x21,
+ 0x22,
+ 0x23,
+ 0x24,
+ 0x25,
+ 0x26,
+ 0x27,
+ 0x28,
+ 0x29,
+ 0x2A,
+ 0x2B,
+ 0x2C,
+ 0x2F,
+ 0x3B,
+ 0x3C,
+ 0x3D,
+ 0x3E,
+ 0x3F,
+ 0x40,
+ 0x5B,
+ 0x5C,
+ 0x5D,
+ 0x5E,
+ 0x5F,
+ 0x60,
+ 0x7B,
+ 0x7C,
+ 0x7D,
+ 0x7E,
+ 0x7F,
+ 0x3002
+ );
+
+ /**
+ * @static
+ * @var array
+ * @access private
+ */
+ var $_np_prohibit = array(
+ 0xA0,
+ 0x1680,
+ 0x2000,
+ 0x2001,
+ 0x2002,
+ 0x2003,
+ 0x2004,
+ 0x2005,
+ 0x2006,
+ 0x2007,
+ 0x2008,
+ 0x2009,
+ 0x200A,
+ 0x200B,
+ 0x202F,
+ 0x205F,
+ 0x3000,
+ 0x6DD,
+ 0x70F,
+ 0x180E,
+ 0x200C,
+ 0x200D,
+ 0x2028,
+ 0x2029,
+ 0xFEFF,
+ 0xFFF9,
+ 0xFFFA,
+ 0xFFFB,
+ 0xFFFC,
+ 0xFFFE,
+ 0xFFFF,
+ 0x1FFFE,
+ 0x1FFFF,
+ 0x2FFFE,
+ 0x2FFFF,
+ 0x3FFFE,
+ 0x3FFFF,
+ 0x4FFFE,
+ 0x4FFFF,
+ 0x5FFFE,
+ 0x5FFFF,
+ 0x6FFFE,
+ 0x6FFFF,
+ 0x7FFFE,
+ 0x7FFFF,
+ 0x8FFFE,
+ 0x8FFFF,
+ 0x9FFFE,
+ 0x9FFFF,
+ 0xAFFFE,
+ 0xAFFFF,
+ 0xBFFFE,
+ 0xBFFFF,
+ 0xCFFFE,
+ 0xCFFFF,
+ 0xDFFFE,
+ 0xDFFFF,
+ 0xEFFFE,
+ 0xEFFFF,
+ 0xFFFFE,
+ 0xFFFFF,
+ 0x10FFFE,
+ 0x10FFFF,
+ 0xFFF9,
+ 0xFFFA,
+ 0xFFFB,
+ 0xFFFC,
+ 0xFFFD,
+ 0x340,
+ 0x341,
+ 0x200E,
+ 0x200F,
+ 0x202A,
+ 0x202B,
+ 0x202C,
+ 0x202D,
+ 0x202E,
+ 0x206A,
+ 0x206B,
+ 0x206C,
+ 0x206D,
+ 0x206E,
+ 0x206F,
+ 0xE0001
+ );
+
+ /**
+ * @static
+ * @var array
+ * @access private
+ */
+ var $_np_prohibit_ranges = array(
+ array(0x80, 0x9F ),
+ array(0x2060, 0x206F ),
+ array(0x1D173, 0x1D17A ),
+ array(0xE000, 0xF8FF ),
+ array(0xF0000, 0xFFFFD ),
+ array(0x100000, 0x10FFFD),
+ array(0xFDD0, 0xFDEF ),
+ array(0xD800, 0xDFFF ),
+ array(0x2FF0, 0x2FFB ),
+ array(0xE0020, 0xE007F )
+ );
+
+ /**
+ * @static
+ * @var array
+ * @access private
+ */
+ var $_np_replacemaps = array(
+ 0x41 => array(0x61),
+ 0x42 => array(0x62),
+ 0x43 => array(0x63),
+ 0x44 => array(0x64),
+ 0x45 => array(0x65),
+ 0x46 => array(0x66),
+ 0x47 => array(0x67),
+ 0x48 => array(0x68),
+ 0x49 => array(0x69),
+ 0x4A => array(0x6A),
+ 0x4B => array(0x6B),
+ 0x4C => array(0x6C),
+ 0x4D => array(0x6D),
+ 0x4E => array(0x6E),
+ 0x4F => array(0x6F),
+ 0x50 => array(0x70),
+ 0x51 => array(0x71),
+ 0x52 => array(0x72),
+ 0x53 => array(0x73),
+ 0x54 => array(0x74),
+ 0x55 => array(0x75),
+ 0x56 => array(0x76),
+ 0x57 => array(0x77),
+ 0x58 => array(0x78),
+ 0x59 => array(0x79),
+ 0x5A => array(0x7A),
+ 0xB5 => array(0x3BC),
+ 0xC0 => array(0xE0),
+ 0xC1 => array(0xE1),
+ 0xC2 => array(0xE2),
+ 0xC3 => array(0xE3),
+ 0xC4 => array(0xE4),
+ 0xC5 => array(0xE5),
+ 0xC6 => array(0xE6),
+ 0xC7 => array(0xE7),
+ 0xC8 => array(0xE8),
+ 0xC9 => array(0xE9),
+ 0xCA => array(0xEA),
+ 0xCB => array(0xEB),
+ 0xCC => array(0xEC),
+ 0xCD => array(0xED),
+ 0xCE => array(0xEE),
+ 0xCF => array(0xEF),
+ 0xD0 => array(0xF0),
+ 0xD1 => array(0xF1),
+ 0xD2 => array(0xF2),
+ 0xD3 => array(0xF3),
+ 0xD4 => array(0xF4),
+ 0xD5 => array(0xF5),
+ 0xD6 => array(0xF6),
+ 0xD8 => array(0xF8),
+ 0xD9 => array(0xF9),
+ 0xDA => array(0xFA),
+ 0xDB => array(0xFB),
+ 0xDC => array(0xFC),
+ 0xDD => array(0xFD),
+ 0xDE => array(0xFE),
+ 0xDF => array(0x73, 0x73),
+ 0x100 => array(0x101),
+ 0x102 => array(0x103),
+ 0x104 => array(0x105),
+ 0x106 => array(0x107),
+ 0x108 => array(0x109),
+ 0x10A => array(0x10B),
+ 0x10C => array(0x10D),
+ 0x10E => array(0x10F),
+ 0x110 => array(0x111),
+ 0x112 => array(0x113),
+ 0x114 => array(0x115),
+ 0x116 => array(0x117),
+ 0x118 => array(0x119),
+ 0x11A => array(0x11B),
+ 0x11C => array(0x11D),
+ 0x11E => array(0x11F),
+ 0x120 => array(0x121),
+ 0x122 => array(0x123),
+ 0x124 => array(0x125),
+ 0x126 => array(0x127),
+ 0x128 => array(0x129),
+ 0x12A => array(0x12B),
+ 0x12C => array(0x12D),
+ 0x12E => array(0x12F),
+ 0x130 => array(0x69, 0x307),
+ 0x132 => array(0x133),
+ 0x134 => array(0x135),
+ 0x136 => array(0x137),
+ 0x139 => array(0x13A),
+ 0x13B => array(0x13C),
+ 0x13D => array(0x13E),
+ 0x13F => array(0x140),
+ 0x141 => array(0x142),
+ 0x143 => array(0x144),
+ 0x145 => array(0x146),
+ 0x147 => array(0x148),
+ 0x149 => array(0x2BC, 0x6E),
+ 0x14A => array(0x14B),
+ 0x14C => array(0x14D),
+ 0x14E => array(0x14F),
+ 0x150 => array(0x151),
+ 0x152 => array(0x153),
+ 0x154 => array(0x155),
+ 0x156 => array(0x157),
+ 0x158 => array(0x159),
+ 0x15A => array(0x15B),
+ 0x15C => array(0x15D),
+ 0x15E => array(0x15F),
+ 0x160 => array(0x161),
+ 0x162 => array(0x163),
+ 0x164 => array(0x165),
+ 0x166 => array(0x167),
+ 0x168 => array(0x169),
+ 0x16A => array(0x16B),
+ 0x16C => array(0x16D),
+ 0x16E => array(0x16F),
+ 0x170 => array(0x171),
+ 0x172 => array(0x173),
+ 0x174 => array(0x175),
+ 0x176 => array(0x177),
+ 0x178 => array(0xFF),
+ 0x179 => array(0x17A),
+ 0x17B => array(0x17C),
+ 0x17D => array(0x17E),
+ 0x17F => array(0x73),
+ 0x181 => array(0x253),
+ 0x182 => array(0x183),
+ 0x184 => array(0x185),
+ 0x186 => array(0x254),
+ 0x187 => array(0x188),
+ 0x189 => array(0x256),
+ 0x18A => array(0x257),
+ 0x18B => array(0x18C),
+ 0x18E => array(0x1DD),
+ 0x18F => array(0x259),
+ 0x190 => array(0x25B),
+ 0x191 => array(0x192),
+ 0x193 => array(0x260),
+ 0x194 => array(0x263),
+ 0x196 => array(0x269),
+ 0x197 => array(0x268),
+ 0x198 => array(0x199),
+ 0x19C => array(0x26F),
+ 0x19D => array(0x272),
+ 0x19F => array(0x275),
+ 0x1A0 => array(0x1A1),
+ 0x1A2 => array(0x1A3),
+ 0x1A4 => array(0x1A5),
+ 0x1A6 => array(0x280),
+ 0x1A7 => array(0x1A8),
+ 0x1A9 => array(0x283),
+ 0x1AC => array(0x1AD),
+ 0x1AE => array(0x288),
+ 0x1AF => array(0x1B0),
+ 0x1B1 => array(0x28A),
+ 0x1B2 => array(0x28B),
+ 0x1B3 => array(0x1B4),
+ 0x1B5 => array(0x1B6),
+ 0x1B7 => array(0x292),
+ 0x1B8 => array(0x1B9),
+ 0x1BC => array(0x1BD),
+ 0x1C4 => array(0x1C6),
+ 0x1C5 => array(0x1C6),
+ 0x1C7 => array(0x1C9),
+ 0x1C8 => array(0x1C9),
+ 0x1CA => array(0x1CC),
+ 0x1CB => array(0x1CC),
+ 0x1CD => array(0x1CE),
+ 0x1CF => array(0x1D0),
+ 0x1D1 => array(0x1D2),
+ 0x1D3 => array(0x1D4),
+ 0x1D5 => array(0x1D6),
+ 0x1D7 => array(0x1D8),
+ 0x1D9 => array(0x1DA),
+ 0x1DB => array(0x1DC),
+ 0x1DE => array(0x1DF),
+ 0x1E0 => array(0x1E1),
+ 0x1E2 => array(0x1E3),
+ 0x1E4 => array(0x1E5),
+ 0x1E6 => array(0x1E7),
+ 0x1E8 => array(0x1E9),
+ 0x1EA => array(0x1EB),
+ 0x1EC => array(0x1ED),
+ 0x1EE => array(0x1EF),
+ 0x1F0 => array(0x6A, 0x30C),
+ 0x1F1 => array(0x1F3),
+ 0x1F2 => array(0x1F3),
+ 0x1F4 => array(0x1F5),
+ 0x1F6 => array(0x195),
+ 0x1F7 => array(0x1BF),
+ 0x1F8 => array(0x1F9),
+ 0x1FA => array(0x1FB),
+ 0x1FC => array(0x1FD),
+ 0x1FE => array(0x1FF),
+ 0x200 => array(0x201),
+ 0x202 => array(0x203),
+ 0x204 => array(0x205),
+ 0x206 => array(0x207),
+ 0x208 => array(0x209),
+ 0x20A => array(0x20B),
+ 0x20C => array(0x20D),
+ 0x20E => array(0x20F),
+ 0x210 => array(0x211),
+ 0x212 => array(0x213),
+ 0x214 => array(0x215),
+ 0x216 => array(0x217),
+ 0x218 => array(0x219),
+ 0x21A => array(0x21B),
+ 0x21C => array(0x21D),
+ 0x21E => array(0x21F),
+ 0x220 => array(0x19E),
+ 0x222 => array(0x223),
+ 0x224 => array(0x225),
+ 0x226 => array(0x227),
+ 0x228 => array(0x229),
+ 0x22A => array(0x22B),
+ 0x22C => array(0x22D),
+ 0x22E => array(0x22F),
+ 0x230 => array(0x231),
+ 0x232 => array(0x233),
+ 0x345 => array(0x3B9),
+ 0x37A => array(0x20, 0x3B9),
+ 0x386 => array(0x3AC),
+ 0x388 => array(0x3AD),
+ 0x389 => array(0x3AE),
+ 0x38A => array(0x3AF),
+ 0x38C => array(0x3CC),
+ 0x38E => array(0x3CD),
+ 0x38F => array(0x3CE),
+ 0x390 => array(0x3B9, 0x308, 0x301),
+ 0x391 => array(0x3B1),
+ 0x392 => array(0x3B2),
+ 0x393 => array(0x3B3),
+ 0x394 => array(0x3B4),
+ 0x395 => array(0x3B5),
+ 0x396 => array(0x3B6),
+ 0x397 => array(0x3B7),
+ 0x398 => array(0x3B8),
+ 0x399 => array(0x3B9),
+ 0x39A => array(0x3BA),
+ 0x39B => array(0x3BB),
+ 0x39C => array(0x3BC),
+ 0x39D => array(0x3BD),
+ 0x39E => array(0x3BE),
+ 0x39F => array(0x3BF),
+ 0x3A0 => array(0x3C0),
+ 0x3A1 => array(0x3C1),
+ 0x3A3 => array(0x3C3),
+ 0x3A4 => array(0x3C4),
+ 0x3A5 => array(0x3C5),
+ 0x3A6 => array(0x3C6),
+ 0x3A7 => array(0x3C7),
+ 0x3A8 => array(0x3C8),
+ 0x3A9 => array(0x3C9),
+ 0x3AA => array(0x3CA),
+ 0x3AB => array(0x3CB),
+ 0x3B0 => array(0x3C5, 0x308, 0x301),
+ 0x3C2 => array(0x3C3),
+ 0x3D0 => array(0x3B2),
+ 0x3D1 => array(0x3B8),
+ 0x3D2 => array(0x3C5),
+ 0x3D3 => array(0x3CD),
+ 0x3D4 => array(0x3CB),
+ 0x3D5 => array(0x3C6),
+ 0x3D6 => array(0x3C0),
+ 0x3D8 => array(0x3D9),
+ 0x3DA => array(0x3DB),
+ 0x3DC => array(0x3DD),
+ 0x3DE => array(0x3DF),
+ 0x3E0 => array(0x3E1),
+ 0x3E2 => array(0x3E3),
+ 0x3E4 => array(0x3E5),
+ 0x3E6 => array(0x3E7),
+ 0x3E8 => array(0x3E9),
+ 0x3EA => array(0x3EB),
+ 0x3EC => array(0x3ED),
+ 0x3EE => array(0x3EF),
+ 0x3F0 => array(0x3BA),
+ 0x3F1 => array(0x3C1),
+ 0x3F2 => array(0x3C3),
+ 0x3F4 => array(0x3B8),
+ 0x3F5 => array(0x3B5),
+ 0x400 => array(0x450),
+ 0x401 => array(0x451),
+ 0x402 => array(0x452),
+ 0x403 => array(0x453),
+ 0x404 => array(0x454),
+ 0x405 => array(0x455),
+ 0x406 => array(0x456),
+ 0x407 => array(0x457),
+ 0x408 => array(0x458),
+ 0x409 => array(0x459),
+ 0x40A => array(0x45A),
+ 0x40B => array(0x45B),
+ 0x40C => array(0x45C),
+ 0x40D => array(0x45D),
+ 0x40E => array(0x45E),
+ 0x40F => array(0x45F),
+ 0x410 => array(0x430),
+ 0x411 => array(0x431),
+ 0x412 => array(0x432),
+ 0x413 => array(0x433),
+ 0x414 => array(0x434),
+ 0x415 => array(0x435),
+ 0x416 => array(0x436),
+ 0x417 => array(0x437),
+ 0x418 => array(0x438),
+ 0x419 => array(0x439),
+ 0x41A => array(0x43A),
+ 0x41B => array(0x43B),
+ 0x41C => array(0x43C),
+ 0x41D => array(0x43D),
+ 0x41E => array(0x43E),
+ 0x41F => array(0x43F),
+ 0x420 => array(0x440),
+ 0x421 => array(0x441),
+ 0x422 => array(0x442),
+ 0x423 => array(0x443),
+ 0x424 => array(0x444),
+ 0x425 => array(0x445),
+ 0x426 => array(0x446),
+ 0x427 => array(0x447),
+ 0x428 => array(0x448),
+ 0x429 => array(0x449),
+ 0x42A => array(0x44A),
+ 0x42B => array(0x44B),
+ 0x42C => array(0x44C),
+ 0x42D => array(0x44D),
+ 0x42E => array(0x44E),
+ 0x42F => array(0x44F),
+ 0x460 => array(0x461),
+ 0x462 => array(0x463),
+ 0x464 => array(0x465),
+ 0x466 => array(0x467),
+ 0x468 => array(0x469),
+ 0x46A => array(0x46B),
+ 0x46C => array(0x46D),
+ 0x46E => array(0x46F),
+ 0x470 => array(0x471),
+ 0x472 => array(0x473),
+ 0x474 => array(0x475),
+ 0x476 => array(0x477),
+ 0x478 => array(0x479),
+ 0x47A => array(0x47B),
+ 0x47C => array(0x47D),
+ 0x47E => array(0x47F),
+ 0x480 => array(0x481),
+ 0x48A => array(0x48B),
+ 0x48C => array(0x48D),
+ 0x48E => array(0x48F),
+ 0x490 => array(0x491),
+ 0x492 => array(0x493),
+ 0x494 => array(0x495),
+ 0x496 => array(0x497),
+ 0x498 => array(0x499),
+ 0x49A => array(0x49B),
+ 0x49C => array(0x49D),
+ 0x49E => array(0x49F),
+ 0x4A0 => array(0x4A1),
+ 0x4A2 => array(0x4A3),
+ 0x4A4 => array(0x4A5),
+ 0x4A6 => array(0x4A7),
+ 0x4A8 => array(0x4A9),
+ 0x4AA => array(0x4AB),
+ 0x4AC => array(0x4AD),
+ 0x4AE => array(0x4AF),
+ 0x4B0 => array(0x4B1),
+ 0x4B2 => array(0x4B3),
+ 0x4B4 => array(0x4B5),
+ 0x4B6 => array(0x4B7),
+ 0x4B8 => array(0x4B9),
+ 0x4BA => array(0x4BB),
+ 0x4BC => array(0x4BD),
+ 0x4BE => array(0x4BF),
+ 0x4C1 => array(0x4C2),
+ 0x4C3 => array(0x4C4),
+ 0x4C5 => array(0x4C6),
+ 0x4C7 => array(0x4C8),
+ 0x4C9 => array(0x4CA),
+ 0x4CB => array(0x4CC),
+ 0x4CD => array(0x4CE),
+ 0x4D0 => array(0x4D1),
+ 0x4D2 => array(0x4D3),
+ 0x4D4 => array(0x4D5),
+ 0x4D6 => array(0x4D7),
+ 0x4D8 => array(0x4D9),
+ 0x4DA => array(0x4DB),
+ 0x4DC => array(0x4DD),
+ 0x4DE => array(0x4DF),
+ 0x4E0 => array(0x4E1),
+ 0x4E2 => array(0x4E3),
+ 0x4E4 => array(0x4E5),
+ 0x4E6 => array(0x4E7),
+ 0x4E8 => array(0x4E9),
+ 0x4EA => array(0x4EB),
+ 0x4EC => array(0x4ED),
+ 0x4EE => array(0x4EF),
+ 0x4F0 => array(0x4F1),
+ 0x4F2 => array(0x4F3),
+ 0x4F4 => array(0x4F5),
+ 0x4F8 => array(0x4F9),
+ 0x500 => array(0x501),
+ 0x502 => array(0x503),
+ 0x504 => array(0x505),
+ 0x506 => array(0x507),
+ 0x508 => array(0x509),
+ 0x50A => array(0x50B),
+ 0x50C => array(0x50D),
+ 0x50E => array(0x50F),
+ 0x531 => array(0x561),
+ 0x532 => array(0x562),
+ 0x533 => array(0x563),
+ 0x534 => array(0x564),
+ 0x535 => array(0x565),
+ 0x536 => array(0x566),
+ 0x537 => array(0x567),
+ 0x538 => array(0x568),
+ 0x539 => array(0x569),
+ 0x53A => array(0x56A),
+ 0x53B => array(0x56B),
+ 0x53C => array(0x56C),
+ 0x53D => array(0x56D),
+ 0x53E => array(0x56E),
+ 0x53F => array(0x56F),
+ 0x540 => array(0x570),
+ 0x541 => array(0x571),
+ 0x542 => array(0x572),
+ 0x543 => array(0x573),
+ 0x544 => array(0x574),
+ 0x545 => array(0x575),
+ 0x546 => array(0x576),
+ 0x547 => array(0x577),
+ 0x548 => array(0x578),
+ 0x549 => array(0x579),
+ 0x54A => array(0x57A),
+ 0x54B => array(0x57B),
+ 0x54C => array(0x57C),
+ 0x54D => array(0x57D),
+ 0x54E => array(0x57E),
+ 0x54F => array(0x57F),
+ 0x550 => array(0x580),
+ 0x551 => array(0x581),
+ 0x552 => array(0x582),
+ 0x553 => array(0x583),
+ 0x554 => array(0x584),
+ 0x555 => array(0x585),
+ 0x556 => array(0x586),
+ 0x587 => array(0x565, 0x582),
+ 0x1E00 => array(0x1E01),
+ 0x1E02 => array(0x1E03),
+ 0x1E04 => array(0x1E05),
+ 0x1E06 => array(0x1E07),
+ 0x1E08 => array(0x1E09),
+ 0x1E0A => array(0x1E0B),
+ 0x1E0C => array(0x1E0D),
+ 0x1E0E => array(0x1E0F),
+ 0x1E10 => array(0x1E11),
+ 0x1E12 => array(0x1E13),
+ 0x1E14 => array(0x1E15),
+ 0x1E16 => array(0x1E17),
+ 0x1E18 => array(0x1E19),
+ 0x1E1A => array(0x1E1B),
+ 0x1E1C => array(0x1E1D),
+ 0x1E1E => array(0x1E1F),
+ 0x1E20 => array(0x1E21),
+ 0x1E22 => array(0x1E23),
+ 0x1E24 => array(0x1E25),
+ 0x1E26 => array(0x1E27),
+ 0x1E28 => array(0x1E29),
+ 0x1E2A => array(0x1E2B),
+ 0x1E2C => array(0x1E2D),
+ 0x1E2E => array(0x1E2F),
+ 0x1E30 => array(0x1E31),
+ 0x1E32 => array(0x1E33),
+ 0x1E34 => array(0x1E35),
+ 0x1E36 => array(0x1E37),
+ 0x1E38 => array(0x1E39),
+ 0x1E3A => array(0x1E3B),
+ 0x1E3C => array(0x1E3D),
+ 0x1E3E => array(0x1E3F),
+ 0x1E40 => array(0x1E41),
+ 0x1E42 => array(0x1E43),
+ 0x1E44 => array(0x1E45),
+ 0x1E46 => array(0x1E47),
+ 0x1E48 => array(0x1E49),
+ 0x1E4A => array(0x1E4B),
+ 0x1E4C => array(0x1E4D),
+ 0x1E4E => array(0x1E4F),
+ 0x1E50 => array(0x1E51),
+ 0x1E52 => array(0x1E53),
+ 0x1E54 => array(0x1E55),
+ 0x1E56 => array(0x1E57),
+ 0x1E58 => array(0x1E59),
+ 0x1E5A => array(0x1E5B),
+ 0x1E5C => array(0x1E5D),
+ 0x1E5E => array(0x1E5F),
+ 0x1E60 => array(0x1E61),
+ 0x1E62 => array(0x1E63),
+ 0x1E64 => array(0x1E65),
+ 0x1E66 => array(0x1E67),
+ 0x1E68 => array(0x1E69),
+ 0x1E6A => array(0x1E6B),
+ 0x1E6C => array(0x1E6D),
+ 0x1E6E => array(0x1E6F),
+ 0x1E70 => array(0x1E71),
+ 0x1E72 => array(0x1E73),
+ 0x1E74 => array(0x1E75),
+ 0x1E76 => array(0x1E77),
+ 0x1E78 => array(0x1E79),
+ 0x1E7A => array(0x1E7B),
+ 0x1E7C => array(0x1E7D),
+ 0x1E7E => array(0x1E7F),
+ 0x1E80 => array(0x1E81),
+ 0x1E82 => array(0x1E83),
+ 0x1E84 => array(0x1E85),
+ 0x1E86 => array(0x1E87),
+ 0x1E88 => array(0x1E89),
+ 0x1E8A => array(0x1E8B),
+ 0x1E8C => array(0x1E8D),
+ 0x1E8E => array(0x1E8F),
+ 0x1E90 => array(0x1E91),
+ 0x1E92 => array(0x1E93),
+ 0x1E94 => array(0x1E95),
+ 0x1E96 => array(0x68, 0x331),
+ 0x1E97 => array(0x74, 0x308),
+ 0x1E98 => array(0x77, 0x30A),
+ 0x1E99 => array(0x79, 0x30A),
+ 0x1E9A => array(0x61, 0x2BE),
+ 0x1E9B => array(0x1E61),
+ 0x1EA0 => array(0x1EA1),
+ 0x1EA2 => array(0x1EA3),
+ 0x1EA4 => array(0x1EA5),
+ 0x1EA6 => array(0x1EA7),
+ 0x1EA8 => array(0x1EA9),
+ 0x1EAA => array(0x1EAB),
+ 0x1EAC => array(0x1EAD),
+ 0x1EAE => array(0x1EAF),
+ 0x1EB0 => array(0x1EB1),
+ 0x1EB2 => array(0x1EB3),
+ 0x1EB4 => array(0x1EB5),
+ 0x1EB6 => array(0x1EB7),
+ 0x1EB8 => array(0x1EB9),
+ 0x1EBA => array(0x1EBB),
+ 0x1EBC => array(0x1EBD),
+ 0x1EBE => array(0x1EBF),
+ 0x1EC0 => array(0x1EC1),
+ 0x1EC2 => array(0x1EC3),
+ 0x1EC4 => array(0x1EC5),
+ 0x1EC6 => array(0x1EC7),
+ 0x1EC8 => array(0x1EC9),
+ 0x1ECA => array(0x1ECB),
+ 0x1ECC => array(0x1ECD),
+ 0x1ECE => array(0x1ECF),
+ 0x1ED0 => array(0x1ED1),
+ 0x1ED2 => array(0x1ED3),
+ 0x1ED4 => array(0x1ED5),
+ 0x1ED6 => array(0x1ED7),
+ 0x1ED8 => array(0x1ED9),
+ 0x1EDA => array(0x1EDB),
+ 0x1EDC => array(0x1EDD),
+ 0x1EDE => array(0x1EDF),
+ 0x1EE0 => array(0x1EE1),
+ 0x1EE2 => array(0x1EE3),
+ 0x1EE4 => array(0x1EE5),
+ 0x1EE6 => array(0x1EE7),
+ 0x1EE8 => array(0x1EE9),
+ 0x1EEA => array(0x1EEB),
+ 0x1EEC => array(0x1EED),
+ 0x1EEE => array(0x1EEF),
+ 0x1EF0 => array(0x1EF1),
+ 0x1EF2 => array(0x1EF3),
+ 0x1EF4 => array(0x1EF5),
+ 0x1EF6 => array(0x1EF7),
+ 0x1EF8 => array(0x1EF9),
+ 0x1F08 => array(0x1F00),
+ 0x1F09 => array(0x1F01),
+ 0x1F0A => array(0x1F02),
+ 0x1F0B => array(0x1F03),
+ 0x1F0C => array(0x1F04),
+ 0x1F0D => array(0x1F05),
+ 0x1F0E => array(0x1F06),
+ 0x1F0F => array(0x1F07),
+ 0x1F18 => array(0x1F10),
+ 0x1F19 => array(0x1F11),
+ 0x1F1A => array(0x1F12),
+ 0x1F1B => array(0x1F13),
+ 0x1F1C => array(0x1F14),
+ 0x1F1D => array(0x1F15),
+ 0x1F28 => array(0x1F20),
+ 0x1F29 => array(0x1F21),
+ 0x1F2A => array(0x1F22),
+ 0x1F2B => array(0x1F23),
+ 0x1F2C => array(0x1F24),
+ 0x1F2D => array(0x1F25),
+ 0x1F2E => array(0x1F26),
+ 0x1F2F => array(0x1F27),
+ 0x1F38 => array(0x1F30),
+ 0x1F39 => array(0x1F31),
+ 0x1F3A => array(0x1F32),
+ 0x1F3B => array(0x1F33),
+ 0x1F3C => array(0x1F34),
+ 0x1F3D => array(0x1F35),
+ 0x1F3E => array(0x1F36),
+ 0x1F3F => array(0x1F37),
+ 0x1F48 => array(0x1F40),
+ 0x1F49 => array(0x1F41),
+ 0x1F4A => array(0x1F42),
+ 0x1F4B => array(0x1F43),
+ 0x1F4C => array(0x1F44),
+ 0x1F4D => array(0x1F45),
+ 0x1F50 => array(0x3C5, 0x313),
+ 0x1F52 => array(0x3C5, 0x313, 0x300),
+ 0x1F54 => array(0x3C5, 0x313, 0x301),
+ 0x1F56 => array(0x3C5, 0x313, 0x342),
+ 0x1F59 => array(0x1F51),
+ 0x1F5B => array(0x1F53),
+ 0x1F5D => array(0x1F55),
+ 0x1F5F => array(0x1F57),
+ 0x1F68 => array(0x1F60),
+ 0x1F69 => array(0x1F61),
+ 0x1F6A => array(0x1F62),
+ 0x1F6B => array(0x1F63),
+ 0x1F6C => array(0x1F64),
+ 0x1F6D => array(0x1F65),
+ 0x1F6E => array(0x1F66),
+ 0x1F6F => array(0x1F67),
+ 0x1F80 => array(0x1F00, 0x3B9),
+ 0x1F81 => array(0x1F01, 0x3B9),
+ 0x1F82 => array(0x1F02, 0x3B9),
+ 0x1F83 => array(0x1F03, 0x3B9),
+ 0x1F84 => array(0x1F04, 0x3B9),
+ 0x1F85 => array(0x1F05, 0x3B9),
+ 0x1F86 => array(0x1F06, 0x3B9),
+ 0x1F87 => array(0x1F07, 0x3B9),
+ 0x1F88 => array(0x1F00, 0x3B9),
+ 0x1F89 => array(0x1F01, 0x3B9),
+ 0x1F8A => array(0x1F02, 0x3B9),
+ 0x1F8B => array(0x1F03, 0x3B9),
+ 0x1F8C => array(0x1F04, 0x3B9),
+ 0x1F8D => array(0x1F05, 0x3B9),
+ 0x1F8E => array(0x1F06, 0x3B9),
+ 0x1F8F => array(0x1F07, 0x3B9),
+ 0x1F90 => array(0x1F20, 0x3B9),
+ 0x1F91 => array(0x1F21, 0x3B9),
+ 0x1F92 => array(0x1F22, 0x3B9),
+ 0x1F93 => array(0x1F23, 0x3B9),
+ 0x1F94 => array(0x1F24, 0x3B9),
+ 0x1F95 => array(0x1F25, 0x3B9),
+ 0x1F96 => array(0x1F26, 0x3B9),
+ 0x1F97 => array(0x1F27, 0x3B9),
+ 0x1F98 => array(0x1F20, 0x3B9),
+ 0x1F99 => array(0x1F21, 0x3B9),
+ 0x1F9A => array(0x1F22, 0x3B9),
+ 0x1F9B => array(0x1F23, 0x3B9),
+ 0x1F9C => array(0x1F24, 0x3B9),
+ 0x1F9D => array(0x1F25, 0x3B9),
+ 0x1F9E => array(0x1F26, 0x3B9),
+ 0x1F9F => array(0x1F27, 0x3B9),
+ 0x1FA0 => array(0x1F60, 0x3B9),
+ 0x1FA1 => array(0x1F61, 0x3B9),
+ 0x1FA2 => array(0x1F62, 0x3B9),
+ 0x1FA3 => array(0x1F63, 0x3B9),
+ 0x1FA4 => array(0x1F64, 0x3B9),
+ 0x1FA5 => array(0x1F65, 0x3B9),
+ 0x1FA6 => array(0x1F66, 0x3B9),
+ 0x1FA7 => array(0x1F67, 0x3B9),
+ 0x1FA8 => array(0x1F60, 0x3B9),
+ 0x1FA9 => array(0x1F61, 0x3B9),
+ 0x1FAA => array(0x1F62, 0x3B9),
+ 0x1FAB => array(0x1F63, 0x3B9),
+ 0x1FAC => array(0x1F64, 0x3B9),
+ 0x1FAD => array(0x1F65, 0x3B9),
+ 0x1FAE => array(0x1F66, 0x3B9),
+ 0x1FAF => array(0x1F67, 0x3B9),
+ 0x1FB2 => array(0x1F70, 0x3B9),
+ 0x1FB3 => array(0x3B1, 0x3B9),
+ 0x1FB4 => array(0x3AC, 0x3B9),
+ 0x1FB6 => array(0x3B1, 0x342),
+ 0x1FB7 => array(0x3B1, 0x342, 0x3B9),
+ 0x1FB8 => array(0x1FB0),
+ 0x1FB9 => array(0x1FB1),
+ 0x1FBA => array(0x1F70),
+ 0x1FBB => array(0x1F71),
+ 0x1FBC => array(0x3B1, 0x3B9),
+ 0x1FBE => array(0x3B9),
+ 0x1FC2 => array(0x1F74, 0x3B9),
+ 0x1FC3 => array(0x3B7, 0x3B9),
+ 0x1FC4 => array(0x3AE, 0x3B9),
+ 0x1FC6 => array(0x3B7, 0x342),
+ 0x1FC7 => array(0x3B7, 0x342, 0x3B9),
+ 0x1FC8 => array(0x1F72),
+ 0x1FC9 => array(0x1F73),
+ 0x1FCA => array(0x1F74),
+ 0x1FCB => array(0x1F75),
+ 0x1FCC => array(0x3B7, 0x3B9),
+ 0x1FD2 => array(0x3B9, 0x308, 0x300),
+ 0x1FD3 => array(0x3B9, 0x308, 0x301),
+ 0x1FD6 => array(0x3B9, 0x342),
+ 0x1FD7 => array(0x3B9, 0x308, 0x342),
+ 0x1FD8 => array(0x1FD0),
+ 0x1FD9 => array(0x1FD1),
+ 0x1FDA => array(0x1F76),
+ 0x1FDB => array(0x1F77),
+ 0x1FE2 => array(0x3C5, 0x308, 0x300),
+ 0x1FE3 => array(0x3C5, 0x308, 0x301),
+ 0x1FE4 => array(0x3C1, 0x313),
+ 0x1FE6 => array(0x3C5, 0x342),
+ 0x1FE7 => array(0x3C5, 0x308, 0x342),
+ 0x1FE8 => array(0x1FE0),
+ 0x1FE9 => array(0x1FE1),
+ 0x1FEA => array(0x1F7A),
+ 0x1FEB => array(0x1F7B),
+ 0x1FEC => array(0x1FE5),
+ 0x1FF2 => array(0x1F7C, 0x3B9),
+ 0x1FF3 => array(0x3C9, 0x3B9),
+ 0x1FF4 => array(0x3CE, 0x3B9),
+ 0x1FF6 => array(0x3C9, 0x342),
+ 0x1FF7 => array(0x3C9, 0x342, 0x3B9),
+ 0x1FF8 => array(0x1F78),
+ 0x1FF9 => array(0x1F79),
+ 0x1FFA => array(0x1F7C),
+ 0x1FFB => array(0x1F7D),
+ 0x1FFC => array(0x3C9, 0x3B9),
+ 0x20A8 => array(0x72, 0x73),
+ 0x2102 => array(0x63),
+ 0x2103 => array(0xB0, 0x63),
+ 0x2107 => array(0x25B),
+ 0x2109 => array(0xB0, 0x66),
+ 0x210B => array(0x68),
+ 0x210C => array(0x68),
+ 0x210D => array(0x68),
+ 0x2110 => array(0x69),
+ 0x2111 => array(0x69),
+ 0x2112 => array(0x6C),
+ 0x2115 => array(0x6E),
+ 0x2116 => array(0x6E, 0x6F),
+ 0x2119 => array(0x70),
+ 0x211A => array(0x71),
+ 0x211B => array(0x72),
+ 0x211C => array(0x72),
+ 0x211D => array(0x72),
+ 0x2120 => array(0x73, 0x6D),
+ 0x2121 => array(0x74, 0x65, 0x6C),
+ 0x2122 => array(0x74, 0x6D),
+ 0x2124 => array(0x7A),
+ 0x2126 => array(0x3C9),
+ 0x2128 => array(0x7A),
+ 0x212A => array(0x6B),
+ 0x212B => array(0xE5),
+ 0x212C => array(0x62),
+ 0x212D => array(0x63),
+ 0x2130 => array(0x65),
+ 0x2131 => array(0x66),
+ 0x2133 => array(0x6D),
+ 0x213E => array(0x3B3),
+ 0x213F => array(0x3C0),
+ 0x2145 => array(0x64),
+ 0x2160 => array(0x2170),
+ 0x2161 => array(0x2171),
+ 0x2162 => array(0x2172),
+ 0x2163 => array(0x2173),
+ 0x2164 => array(0x2174),
+ 0x2165 => array(0x2175),
+ 0x2166 => array(0x2176),
+ 0x2167 => array(0x2177),
+ 0x2168 => array(0x2178),
+ 0x2169 => array(0x2179),
+ 0x216A => array(0x217A),
+ 0x216B => array(0x217B),
+ 0x216C => array(0x217C),
+ 0x216D => array(0x217D),
+ 0x216E => array(0x217E),
+ 0x216F => array(0x217F),
+ 0x24B6 => array(0x24D0),
+ 0x24B7 => array(0x24D1),
+ 0x24B8 => array(0x24D2),
+ 0x24B9 => array(0x24D3),
+ 0x24BA => array(0x24D4),
+ 0x24BB => array(0x24D5),
+ 0x24BC => array(0x24D6),
+ 0x24BD => array(0x24D7),
+ 0x24BE => array(0x24D8),
+ 0x24BF => array(0x24D9),
+ 0x24C0 => array(0x24DA),
+ 0x24C1 => array(0x24DB),
+ 0x24C2 => array(0x24DC),
+ 0x24C3 => array(0x24DD),
+ 0x24C4 => array(0x24DE),
+ 0x24C5 => array(0x24DF),
+ 0x24C6 => array(0x24E0),
+ 0x24C7 => array(0x24E1),
+ 0x24C8 => array(0x24E2),
+ 0x24C9 => array(0x24E3),
+ 0x24CA => array(0x24E4),
+ 0x24CB => array(0x24E5),
+ 0x24CC => array(0x24E6),
+ 0x24CD => array(0x24E7),
+ 0x24CE => array(0x24E8),
+ 0x24CF => array(0x24E9),
+ 0x3371 => array(0x68, 0x70, 0x61),
+ 0x3373 => array(0x61, 0x75),
+ 0x3375 => array(0x6F, 0x76),
+ 0x3380 => array(0x70, 0x61),
+ 0x3381 => array(0x6E, 0x61),
+ 0x3382 => array(0x3BC, 0x61),
+ 0x3383 => array(0x6D, 0x61),
+ 0x3384 => array(0x6B, 0x61),
+ 0x3385 => array(0x6B, 0x62),
+ 0x3386 => array(0x6D, 0x62),
+ 0x3387 => array(0x67, 0x62),
+ 0x338A => array(0x70, 0x66),
+ 0x338B => array(0x6E, 0x66),
+ 0x338C => array(0x3BC, 0x66),
+ 0x3390 => array(0x68, 0x7A),
+ 0x3391 => array(0x6B, 0x68, 0x7A),
+ 0x3392 => array(0x6D, 0x68, 0x7A),
+ 0x3393 => array(0x67, 0x68, 0x7A),
+ 0x3394 => array(0x74, 0x68, 0x7A),
+ 0x33A9 => array(0x70, 0x61),
+ 0x33AA => array(0x6B, 0x70, 0x61),
+ 0x33AB => array(0x6D, 0x70, 0x61),
+ 0x33AC => array(0x67, 0x70, 0x61),
+ 0x33B4 => array(0x70, 0x76),
+ 0x33B5 => array(0x6E, 0x76),
+ 0x33B6 => array(0x3BC, 0x76),
+ 0x33B7 => array(0x6D, 0x76),
+ 0x33B8 => array(0x6B, 0x76),
+ 0x33B9 => array(0x6D, 0x76),
+ 0x33BA => array(0x70, 0x77),
+ 0x33BB => array(0x6E, 0x77),
+ 0x33BC => array(0x3BC, 0x77),
+ 0x33BD => array(0x6D, 0x77),
+ 0x33BE => array(0x6B, 0x77),
+ 0x33BF => array(0x6D, 0x77),
+ 0x33C0 => array(0x6B, 0x3C9),
+ 0x33C1 => array(0x6D, 0x3C9), /*
+ 0x33C2 => array(0x61, 0x2E, 0x6D, 0x2E), */
+ 0x33C3 => array(0x62, 0x71),
+ 0x33C6 => array(0x63, 0x2215, 0x6B, 0x67),
+ 0x33C7 => array(0x63, 0x6F, 0x2E),
+ 0x33C8 => array(0x64, 0x62),
+ 0x33C9 => array(0x67, 0x79),
+ 0x33CB => array(0x68, 0x70),
+ 0x33CD => array(0x6B, 0x6B),
+ 0x33CE => array(0x6B, 0x6D),
+ 0x33D7 => array(0x70, 0x68),
+ 0x33D9 => array(0x70, 0x70, 0x6D),
+ 0x33DA => array(0x70, 0x72),
+ 0x33DC => array(0x73, 0x76),
+ 0x33DD => array(0x77, 0x62),
+ 0xFB00 => array(0x66, 0x66),
+ 0xFB01 => array(0x66, 0x69),
+ 0xFB02 => array(0x66, 0x6C),
+ 0xFB03 => array(0x66, 0x66, 0x69),
+ 0xFB04 => array(0x66, 0x66, 0x6C),
+ 0xFB05 => array(0x73, 0x74),
+ 0xFB06 => array(0x73, 0x74),
+ 0xFB13 => array(0x574, 0x576),
+ 0xFB14 => array(0x574, 0x565),
+ 0xFB15 => array(0x574, 0x56B),
+ 0xFB16 => array(0x57E, 0x576),
+ 0xFB17 => array(0x574, 0x56D),
+ 0xFF21 => array(0xFF41),
+ 0xFF22 => array(0xFF42),
+ 0xFF23 => array(0xFF43),
+ 0xFF24 => array(0xFF44),
+ 0xFF25 => array(0xFF45),
+ 0xFF26 => array(0xFF46),
+ 0xFF27 => array(0xFF47),
+ 0xFF28 => array(0xFF48),
+ 0xFF29 => array(0xFF49),
+ 0xFF2A => array(0xFF4A),
+ 0xFF2B => array(0xFF4B),
+ 0xFF2C => array(0xFF4C),
+ 0xFF2D => array(0xFF4D),
+ 0xFF2E => array(0xFF4E),
+ 0xFF2F => array(0xFF4F),
+ 0xFF30 => array(0xFF50),
+ 0xFF31 => array(0xFF51),
+ 0xFF32 => array(0xFF52),
+ 0xFF33 => array(0xFF53),
+ 0xFF34 => array(0xFF54),
+ 0xFF35 => array(0xFF55),
+ 0xFF36 => array(0xFF56),
+ 0xFF37 => array(0xFF57),
+ 0xFF38 => array(0xFF58),
+ 0xFF39 => array(0xFF59),
+ 0xFF3A => array(0xFF5A),
+ 0x10400 => array(0x10428),
+ 0x10401 => array(0x10429),
+ 0x10402 => array(0x1042A),
+ 0x10403 => array(0x1042B),
+ 0x10404 => array(0x1042C),
+ 0x10405 => array(0x1042D),
+ 0x10406 => array(0x1042E),
+ 0x10407 => array(0x1042F),
+ 0x10408 => array(0x10430),
+ 0x10409 => array(0x10431),
+ 0x1040A => array(0x10432),
+ 0x1040B => array(0x10433),
+ 0x1040C => array(0x10434),
+ 0x1040D => array(0x10435),
+ 0x1040E => array(0x10436),
+ 0x1040F => array(0x10437),
+ 0x10410 => array(0x10438),
+ 0x10411 => array(0x10439),
+ 0x10412 => array(0x1043A),
+ 0x10413 => array(0x1043B),
+ 0x10414 => array(0x1043C),
+ 0x10415 => array(0x1043D),
+ 0x10416 => array(0x1043E),
+ 0x10417 => array(0x1043F),
+ 0x10418 => array(0x10440),
+ 0x10419 => array(0x10441),
+ 0x1041A => array(0x10442),
+ 0x1041B => array(0x10443),
+ 0x1041C => array(0x10444),
+ 0x1041D => array(0x10445),
+ 0x1041E => array(0x10446),
+ 0x1041F => array(0x10447),
+ 0x10420 => array(0x10448),
+ 0x10421 => array(0x10449),
+ 0x10422 => array(0x1044A),
+ 0x10423 => array(0x1044B),
+ 0x10424 => array(0x1044C),
+ 0x10425 => array(0x1044D),
+ 0x1D400 => array(0x61),
+ 0x1D401 => array(0x62),
+ 0x1D402 => array(0x63),
+ 0x1D403 => array(0x64),
+ 0x1D404 => array(0x65),
+ 0x1D405 => array(0x66),
+ 0x1D406 => array(0x67),
+ 0x1D407 => array(0x68),
+ 0x1D408 => array(0x69),
+ 0x1D409 => array(0x6A),
+ 0x1D40A => array(0x6B),
+ 0x1D40B => array(0x6C),
+ 0x1D40C => array(0x6D),
+ 0x1D40D => array(0x6E),
+ 0x1D40E => array(0x6F),
+ 0x1D40F => array(0x70),
+ 0x1D410 => array(0x71),
+ 0x1D411 => array(0x72),
+ 0x1D412 => array(0x73),
+ 0x1D413 => array(0x74),
+ 0x1D414 => array(0x75),
+ 0x1D415 => array(0x76),
+ 0x1D416 => array(0x77),
+ 0x1D417 => array(0x78),
+ 0x1D418 => array(0x79),
+ 0x1D419 => array(0x7A),
+ 0x1D434 => array(0x61),
+ 0x1D435 => array(0x62),
+ 0x1D436 => array(0x63),
+ 0x1D437 => array(0x64),
+ 0x1D438 => array(0x65),
+ 0x1D439 => array(0x66),
+ 0x1D43A => array(0x67),
+ 0x1D43B => array(0x68),
+ 0x1D43C => array(0x69),
+ 0x1D43D => array(0x6A),
+ 0x1D43E => array(0x6B),
+ 0x1D43F => array(0x6C),
+ 0x1D440 => array(0x6D),
+ 0x1D441 => array(0x6E),
+ 0x1D442 => array(0x6F),
+ 0x1D443 => array(0x70),
+ 0x1D444 => array(0x71),
+ 0x1D445 => array(0x72),
+ 0x1D446 => array(0x73),
+ 0x1D447 => array(0x74),
+ 0x1D448 => array(0x75),
+ 0x1D449 => array(0x76),
+ 0x1D44A => array(0x77),
+ 0x1D44B => array(0x78),
+ 0x1D44C => array(0x79),
+ 0x1D44D => array(0x7A),
+ 0x1D468 => array(0x61),
+ 0x1D469 => array(0x62),
+ 0x1D46A => array(0x63),
+ 0x1D46B => array(0x64),
+ 0x1D46C => array(0x65),
+ 0x1D46D => array(0x66),
+ 0x1D46E => array(0x67),
+ 0x1D46F => array(0x68),
+ 0x1D470 => array(0x69),
+ 0x1D471 => array(0x6A),
+ 0x1D472 => array(0x6B),
+ 0x1D473 => array(0x6C),
+ 0x1D474 => array(0x6D),
+ 0x1D475 => array(0x6E),
+ 0x1D476 => array(0x6F),
+ 0x1D477 => array(0x70),
+ 0x1D478 => array(0x71),
+ 0x1D479 => array(0x72),
+ 0x1D47A => array(0x73),
+ 0x1D47B => array(0x74),
+ 0x1D47C => array(0x75),
+ 0x1D47D => array(0x76),
+ 0x1D47E => array(0x77),
+ 0x1D47F => array(0x78),
+ 0x1D480 => array(0x79),
+ 0x1D481 => array(0x7A),
+ 0x1D49C => array(0x61),
+ 0x1D49E => array(0x63),
+ 0x1D49F => array(0x64),
+ 0x1D4A2 => array(0x67),
+ 0x1D4A5 => array(0x6A),
+ 0x1D4A6 => array(0x6B),
+ 0x1D4A9 => array(0x6E),
+ 0x1D4AA => array(0x6F),
+ 0x1D4AB => array(0x70),
+ 0x1D4AC => array(0x71),
+ 0x1D4AE => array(0x73),
+ 0x1D4AF => array(0x74),
+ 0x1D4B0 => array(0x75),
+ 0x1D4B1 => array(0x76),
+ 0x1D4B2 => array(0x77),
+ 0x1D4B3 => array(0x78),
+ 0x1D4B4 => array(0x79),
+ 0x1D4B5 => array(0x7A),
+ 0x1D4D0 => array(0x61),
+ 0x1D4D1 => array(0x62),
+ 0x1D4D2 => array(0x63),
+ 0x1D4D3 => array(0x64),
+ 0x1D4D4 => array(0x65),
+ 0x1D4D5 => array(0x66),
+ 0x1D4D6 => array(0x67),
+ 0x1D4D7 => array(0x68),
+ 0x1D4D8 => array(0x69),
+ 0x1D4D9 => array(0x6A),
+ 0x1D4DA => array(0x6B),
+ 0x1D4DB => array(0x6C),
+ 0x1D4DC => array(0x6D),
+ 0x1D4DD => array(0x6E),
+ 0x1D4DE => array(0x6F),
+ 0x1D4DF => array(0x70),
+ 0x1D4E0 => array(0x71),
+ 0x1D4E1 => array(0x72),
+ 0x1D4E2 => array(0x73),
+ 0x1D4E3 => array(0x74),
+ 0x1D4E4 => array(0x75),
+ 0x1D4E5 => array(0x76),
+ 0x1D4E6 => array(0x77),
+ 0x1D4E7 => array(0x78),
+ 0x1D4E8 => array(0x79),
+ 0x1D4E9 => array(0x7A),
+ 0x1D504 => array(0x61),
+ 0x1D505 => array(0x62),
+ 0x1D507 => array(0x64),
+ 0x1D508 => array(0x65),
+ 0x1D509 => array(0x66),
+ 0x1D50A => array(0x67),
+ 0x1D50D => array(0x6A),
+ 0x1D50E => array(0x6B),
+ 0x1D50F => array(0x6C),
+ 0x1D510 => array(0x6D),
+ 0x1D511 => array(0x6E),
+ 0x1D512 => array(0x6F),
+ 0x1D513 => array(0x70),
+ 0x1D514 => array(0x71),
+ 0x1D516 => array(0x73),
+ 0x1D517 => array(0x74),
+ 0x1D518 => array(0x75),
+ 0x1D519 => array(0x76),
+ 0x1D51A => array(0x77),
+ 0x1D51B => array(0x78),
+ 0x1D51C => array(0x79),
+ 0x1D538 => array(0x61),
+ 0x1D539 => array(0x62),
+ 0x1D53B => array(0x64),
+ 0x1D53C => array(0x65),
+ 0x1D53D => array(0x66),
+ 0x1D53E => array(0x67),
+ 0x1D540 => array(0x69),
+ 0x1D541 => array(0x6A),
+ 0x1D542 => array(0x6B),
+ 0x1D543 => array(0x6C),
+ 0x1D544 => array(0x6D),
+ 0x1D546 => array(0x6F),
+ 0x1D54A => array(0x73),
+ 0x1D54B => array(0x74),
+ 0x1D54C => array(0x75),
+ 0x1D54D => array(0x76),
+ 0x1D54E => array(0x77),
+ 0x1D54F => array(0x78),
+ 0x1D550 => array(0x79),
+ 0x1D56C => array(0x61),
+ 0x1D56D => array(0x62),
+ 0x1D56E => array(0x63),
+ 0x1D56F => array(0x64),
+ 0x1D570 => array(0x65),
+ 0x1D571 => array(0x66),
+ 0x1D572 => array(0x67),
+ 0x1D573 => array(0x68),
+ 0x1D574 => array(0x69),
+ 0x1D575 => array(0x6A),
+ 0x1D576 => array(0x6B),
+ 0x1D577 => array(0x6C),
+ 0x1D578 => array(0x6D),
+ 0x1D579 => array(0x6E),
+ 0x1D57A => array(0x6F),
+ 0x1D57B => array(0x70),
+ 0x1D57C => array(0x71),
+ 0x1D57D => array(0x72),
+ 0x1D57E => array(0x73),
+ 0x1D57F => array(0x74),
+ 0x1D580 => array(0x75),
+ 0x1D581 => array(0x76),
+ 0x1D582 => array(0x77),
+ 0x1D583 => array(0x78),
+ 0x1D584 => array(0x79),
+ 0x1D585 => array(0x7A),
+ 0x1D5A0 => array(0x61),
+ 0x1D5A1 => array(0x62),
+ 0x1D5A2 => array(0x63),
+ 0x1D5A3 => array(0x64),
+ 0x1D5A4 => array(0x65),
+ 0x1D5A5 => array(0x66),
+ 0x1D5A6 => array(0x67),
+ 0x1D5A7 => array(0x68),
+ 0x1D5A8 => array(0x69),
+ 0x1D5A9 => array(0x6A),
+ 0x1D5AA => array(0x6B),
+ 0x1D5AB => array(0x6C),
+ 0x1D5AC => array(0x6D),
+ 0x1D5AD => array(0x6E),
+ 0x1D5AE => array(0x6F),
+ 0x1D5AF => array(0x70),
+ 0x1D5B0 => array(0x71),
+ 0x1D5B1 => array(0x72),
+ 0x1D5B2 => array(0x73),
+ 0x1D5B3 => array(0x74),
+ 0x1D5B4 => array(0x75),
+ 0x1D5B5 => array(0x76),
+ 0x1D5B6 => array(0x77),
+ 0x1D5B7 => array(0x78),
+ 0x1D5B8 => array(0x79),
+ 0x1D5B9 => array(0x7A),
+ 0x1D5D4 => array(0x61),
+ 0x1D5D5 => array(0x62),
+ 0x1D5D6 => array(0x63),
+ 0x1D5D7 => array(0x64),
+ 0x1D5D8 => array(0x65),
+ 0x1D5D9 => array(0x66),
+ 0x1D5DA => array(0x67),
+ 0x1D5DB => array(0x68),
+ 0x1D5DC => array(0x69),
+ 0x1D5DD => array(0x6A),
+ 0x1D5DE => array(0x6B),
+ 0x1D5DF => array(0x6C),
+ 0x1D5E0 => array(0x6D),
+ 0x1D5E1 => array(0x6E),
+ 0x1D5E2 => array(0x6F),
+ 0x1D5E3 => array(0x70),
+ 0x1D5E4 => array(0x71),
+ 0x1D5E5 => array(0x72),
+ 0x1D5E6 => array(0x73),
+ 0x1D5E7 => array(0x74),
+ 0x1D5E8 => array(0x75),
+ 0x1D5E9 => array(0x76),
+ 0x1D5EA => array(0x77),
+ 0x1D5EB => array(0x78),
+ 0x1D5EC => array(0x79),
+ 0x1D5ED => array(0x7A),
+ 0x1D608 => array(0x61),
+ 0x1D609 => array(0x62),
+ 0x1D60A => array(0x63),
+ 0x1D60B => array(0x64),
+ 0x1D60C => array(0x65),
+ 0x1D60D => array(0x66),
+ 0x1D60E => array(0x67),
+ 0x1D60F => array(0x68),
+ 0x1D610 => array(0x69),
+ 0x1D611 => array(0x6A),
+ 0x1D612 => array(0x6B),
+ 0x1D613 => array(0x6C),
+ 0x1D614 => array(0x6D),
+ 0x1D615 => array(0x6E),
+ 0x1D616 => array(0x6F),
+ 0x1D617 => array(0x70),
+ 0x1D618 => array(0x71),
+ 0x1D619 => array(0x72),
+ 0x1D61A => array(0x73),
+ 0x1D61B => array(0x74),
+ 0x1D61C => array(0x75),
+ 0x1D61D => array(0x76),
+ 0x1D61E => array(0x77),
+ 0x1D61F => array(0x78),
+ 0x1D620 => array(0x79),
+ 0x1D621 => array(0x7A),
+ 0x1D63C => array(0x61),
+ 0x1D63D => array(0x62),
+ 0x1D63E => array(0x63),
+ 0x1D63F => array(0x64),
+ 0x1D640 => array(0x65),
+ 0x1D641 => array(0x66),
+ 0x1D642 => array(0x67),
+ 0x1D643 => array(0x68),
+ 0x1D644 => array(0x69),
+ 0x1D645 => array(0x6A),
+ 0x1D646 => array(0x6B),
+ 0x1D647 => array(0x6C),
+ 0x1D648 => array(0x6D),
+ 0x1D649 => array(0x6E),
+ 0x1D64A => array(0x6F),
+ 0x1D64B => array(0x70),
+ 0x1D64C => array(0x71),
+ 0x1D64D => array(0x72),
+ 0x1D64E => array(0x73),
+ 0x1D64F => array(0x74),
+ 0x1D650 => array(0x75),
+ 0x1D651 => array(0x76),
+ 0x1D652 => array(0x77),
+ 0x1D653 => array(0x78),
+ 0x1D654 => array(0x79),
+ 0x1D655 => array(0x7A),
+ 0x1D670 => array(0x61),
+ 0x1D671 => array(0x62),
+ 0x1D672 => array(0x63),
+ 0x1D673 => array(0x64),
+ 0x1D674 => array(0x65),
+ 0x1D675 => array(0x66),
+ 0x1D676 => array(0x67),
+ 0x1D677 => array(0x68),
+ 0x1D678 => array(0x69),
+ 0x1D679 => array(0x6A),
+ 0x1D67A => array(0x6B),
+ 0x1D67B => array(0x6C),
+ 0x1D67C => array(0x6D),
+ 0x1D67D => array(0x6E),
+ 0x1D67E => array(0x6F),
+ 0x1D67F => array(0x70),
+ 0x1D680 => array(0x71),
+ 0x1D681 => array(0x72),
+ 0x1D682 => array(0x73),
+ 0x1D683 => array(0x74),
+ 0x1D684 => array(0x75),
+ 0x1D685 => array(0x76),
+ 0x1D686 => array(0x77),
+ 0x1D687 => array(0x78),
+ 0x1D688 => array(0x79),
+ 0x1D689 => array(0x7A),
+ 0x1D6A8 => array(0x3B1),
+ 0x1D6A9 => array(0x3B2),
+ 0x1D6AA => array(0x3B3),
+ 0x1D6AB => array(0x3B4),
+ 0x1D6AC => array(0x3B5),
+ 0x1D6AD => array(0x3B6),
+ 0x1D6AE => array(0x3B7),
+ 0x1D6AF => array(0x3B8),
+ 0x1D6B0 => array(0x3B9),
+ 0x1D6B1 => array(0x3BA),
+ 0x1D6B2 => array(0x3BB),
+ 0x1D6B3 => array(0x3BC),
+ 0x1D6B4 => array(0x3BD),
+ 0x1D6B5 => array(0x3BE),
+ 0x1D6B6 => array(0x3BF),
+ 0x1D6B7 => array(0x3C0),
+ 0x1D6B8 => array(0x3C1),
+ 0x1D6B9 => array(0x3B8),
+ 0x1D6BA => array(0x3C3),
+ 0x1D6BB => array(0x3C4),
+ 0x1D6BC => array(0x3C5),
+ 0x1D6BD => array(0x3C6),
+ 0x1D6BE => array(0x3C7),
+ 0x1D6BF => array(0x3C8),
+ 0x1D6C0 => array(0x3C9),
+ 0x1D6D3 => array(0x3C3),
+ 0x1D6E2 => array(0x3B1),
+ 0x1D6E3 => array(0x3B2),
+ 0x1D6E4 => array(0x3B3),
+ 0x1D6E5 => array(0x3B4),
+ 0x1D6E6 => array(0x3B5),
+ 0x1D6E7 => array(0x3B6),
+ 0x1D6E8 => array(0x3B7),
+ 0x1D6E9 => array(0x3B8),
+ 0x1D6EA => array(0x3B9),
+ 0x1D6EB => array(0x3BA),
+ 0x1D6EC => array(0x3BB),
+ 0x1D6ED => array(0x3BC),
+ 0x1D6EE => array(0x3BD),
+ 0x1D6EF => array(0x3BE),
+ 0x1D6F0 => array(0x3BF),
+ 0x1D6F1 => array(0x3C0),
+ 0x1D6F2 => array(0x3C1),
+ 0x1D6F3 => array(0x3B8),
+ 0x1D6F4 => array(0x3C3),
+ 0x1D6F5 => array(0x3C4),
+ 0x1D6F6 => array(0x3C5),
+ 0x1D6F7 => array(0x3C6),
+ 0x1D6F8 => array(0x3C7),
+ 0x1D6F9 => array(0x3C8),
+ 0x1D6FA => array(0x3C9),
+ 0x1D70D => array(0x3C3),
+ 0x1D71C => array(0x3B1),
+ 0x1D71D => array(0x3B2),
+ 0x1D71E => array(0x3B3),
+ 0x1D71F => array(0x3B4),
+ 0x1D720 => array(0x3B5),
+ 0x1D721 => array(0x3B6),
+ 0x1D722 => array(0x3B7),
+ 0x1D723 => array(0x3B8),
+ 0x1D724 => array(0x3B9),
+ 0x1D725 => array(0x3BA),
+ 0x1D726 => array(0x3BB),
+ 0x1D727 => array(0x3BC),
+ 0x1D728 => array(0x3BD),
+ 0x1D729 => array(0x3BE),
+ 0x1D72A => array(0x3BF),
+ 0x1D72B => array(0x3C0),
+ 0x1D72C => array(0x3C1),
+ 0x1D72D => array(0x3B8),
+ 0x1D72E => array(0x3C3),
+ 0x1D72F => array(0x3C4),
+ 0x1D730 => array(0x3C5),
+ 0x1D731 => array(0x3C6),
+ 0x1D732 => array(0x3C7),
+ 0x1D733 => array(0x3C8),
+ 0x1D734 => array(0x3C9),
+ 0x1D747 => array(0x3C3),
+ 0x1D756 => array(0x3B1),
+ 0x1D757 => array(0x3B2),
+ 0x1D758 => array(0x3B3),
+ 0x1D759 => array(0x3B4),
+ 0x1D75A => array(0x3B5),
+ 0x1D75B => array(0x3B6),
+ 0x1D75C => array(0x3B7),
+ 0x1D75D => array(0x3B8),
+ 0x1D75E => array(0x3B9),
+ 0x1D75F => array(0x3BA),
+ 0x1D760 => array(0x3BB),
+ 0x1D761 => array(0x3BC),
+ 0x1D762 => array(0x3BD),
+ 0x1D763 => array(0x3BE),
+ 0x1D764 => array(0x3BF),
+ 0x1D765 => array(0x3C0),
+ 0x1D766 => array(0x3C1),
+ 0x1D767 => array(0x3B8),
+ 0x1D768 => array(0x3C3),
+ 0x1D769 => array(0x3C4),
+ 0x1D76A => array(0x3C5),
+ 0x1D76B => array(0x3C6),
+ 0x1D76C => array(0x3C7),
+ 0x1D76D => array(0x3C8),
+ 0x1D76E => array(0x3C9),
+ 0x1D781 => array(0x3C3),
+ 0x1D790 => array(0x3B1),
+ 0x1D791 => array(0x3B2),
+ 0x1D792 => array(0x3B3),
+ 0x1D793 => array(0x3B4),
+ 0x1D794 => array(0x3B5),
+ 0x1D795 => array(0x3B6),
+ 0x1D796 => array(0x3B7),
+ 0x1D797 => array(0x3B8),
+ 0x1D798 => array(0x3B9),
+ 0x1D799 => array(0x3BA),
+ 0x1D79A => array(0x3BB),
+ 0x1D79B => array(0x3BC),
+ 0x1D79C => array(0x3BD),
+ 0x1D79D => array(0x3BE),
+ 0x1D79E => array(0x3BF),
+ 0x1D79F => array(0x3C0),
+ 0x1D7A0 => array(0x3C1),
+ 0x1D7A1 => array(0x3B8),
+ 0x1D7A2 => array(0x3C3),
+ 0x1D7A3 => array(0x3C4),
+ 0x1D7A4 => array(0x3C5),
+ 0x1D7A5 => array(0x3C6),
+ 0x1D7A6 => array(0x3C7),
+ 0x1D7A7 => array(0x3C8),
+ 0x1D7A8 => array(0x3C9),
+ 0x1D7BB => array(0x3C3),
+ 0x3F9 => array(0x3C3),
+ 0x1D2C => array(0x61),
+ 0x1D2D => array(0xE6),
+ 0x1D2E => array(0x62),
+ 0x1D30 => array(0x64),
+ 0x1D31 => array(0x65),
+ 0x1D32 => array(0x1DD),
+ 0x1D33 => array(0x67),
+ 0x1D34 => array(0x68),
+ 0x1D35 => array(0x69),
+ 0x1D36 => array(0x6A),
+ 0x1D37 => array(0x6B),
+ 0x1D38 => array(0x6C),
+ 0x1D39 => array(0x6D),
+ 0x1D3A => array(0x6E),
+ 0x1D3C => array(0x6F),
+ 0x1D3D => array(0x223),
+ 0x1D3E => array(0x70),
+ 0x1D3F => array(0x72),
+ 0x1D40 => array(0x74),
+ 0x1D41 => array(0x75),
+ 0x1D42 => array(0x77),
+ 0x213B => array(0x66, 0x61, 0x78),
+ 0x3250 => array(0x70, 0x74, 0x65),
+ 0x32CC => array(0x68, 0x67),
+ 0x32CE => array(0x65, 0x76),
+ 0x32CF => array(0x6C, 0x74, 0x64),
+ 0x337A => array(0x69, 0x75),
+ 0x33DE => array(0x76, 0x2215, 0x6D),
+ 0x33DF => array(0x61, 0x2215, 0x6D)
+ );
+
+ /**
+ * Normalization Combining Classes; Code Points not listed
+ * got Combining Class 0.
+ *
+ * @static
+ * @var array
+ * @access private
+ */
+ var $_np_norm_combcls = array(
+ 0x334 => 1,
+ 0x335 => 1,
+ 0x336 => 1,
+ 0x337 => 1,
+ 0x338 => 1,
+ 0x93C => 7,
+ 0x9BC => 7,
+ 0xA3C => 7,
+ 0xABC => 7,
+ 0xB3C => 7,
+ 0xCBC => 7,
+ 0x1037 => 7,
+ 0x3099 => 8,
+ 0x309A => 8,
+ 0x94D => 9,
+ 0x9CD => 9,
+ 0xA4D => 9,
+ 0xACD => 9,
+ 0xB4D => 9,
+ 0xBCD => 9,
+ 0xC4D => 9,
+ 0xCCD => 9,
+ 0xD4D => 9,
+ 0xDCA => 9,
+ 0xE3A => 9,
+ 0xF84 => 9,
+ 0x1039 => 9,
+ 0x1714 => 9,
+ 0x1734 => 9,
+ 0x17D2 => 9,
+ 0x5B0 => 10,
+ 0x5B1 => 11,
+ 0x5B2 => 12,
+ 0x5B3 => 13,
+ 0x5B4 => 14,
+ 0x5B5 => 15,
+ 0x5B6 => 16,
+ 0x5B7 => 17,
+ 0x5B8 => 18,
+ 0x5B9 => 19,
+ 0x5BB => 20,
+ 0x5Bc => 21,
+ 0x5BD => 22,
+ 0x5BF => 23,
+ 0x5C1 => 24,
+ 0x5C2 => 25,
+ 0xFB1E => 26,
+ 0x64B => 27,
+ 0x64C => 28,
+ 0x64D => 29,
+ 0x64E => 30,
+ 0x64F => 31,
+ 0x650 => 32,
+ 0x651 => 33,
+ 0x652 => 34,
+ 0x670 => 35,
+ 0x711 => 36,
+ 0xC55 => 84,
+ 0xC56 => 91,
+ 0xE38 => 103,
+ 0xE39 => 103,
+ 0xE48 => 107,
+ 0xE49 => 107,
+ 0xE4A => 107,
+ 0xE4B => 107,
+ 0xEB8 => 118,
+ 0xEB9 => 118,
+ 0xEC8 => 122,
+ 0xEC9 => 122,
+ 0xECA => 122,
+ 0xECB => 122,
+ 0xF71 => 129,
+ 0xF72 => 130,
+ 0xF7A => 130,
+ 0xF7B => 130,
+ 0xF7C => 130,
+ 0xF7D => 130,
+ 0xF80 => 130,
+ 0xF74 => 132,
+ 0x321 => 202,
+ 0x322 => 202,
+ 0x327 => 202,
+ 0x328 => 202,
+ 0x31B => 216,
+ 0xF39 => 216,
+ 0x1D165 => 216,
+ 0x1D166 => 216,
+ 0x1D16E => 216,
+ 0x1D16F => 216,
+ 0x1D170 => 216,
+ 0x1D171 => 216,
+ 0x1D172 => 216,
+ 0x302A => 218,
+ 0x316 => 220,
+ 0x317 => 220,
+ 0x318 => 220,
+ 0x319 => 220,
+ 0x31C => 220,
+ 0x31D => 220,
+ 0x31E => 220,
+ 0x31F => 220,
+ 0x320 => 220,
+ 0x323 => 220,
+ 0x324 => 220,
+ 0x325 => 220,
+ 0x326 => 220,
+ 0x329 => 220,
+ 0x32A => 220,
+ 0x32B => 220,
+ 0x32C => 220,
+ 0x32D => 220,
+ 0x32E => 220,
+ 0x32F => 220,
+ 0x330 => 220,
+ 0x331 => 220,
+ 0x332 => 220,
+ 0x333 => 220,
+ 0x339 => 220,
+ 0x33A => 220,
+ 0x33B => 220,
+ 0x33C => 220,
+ 0x347 => 220,
+ 0x348 => 220,
+ 0x349 => 220,
+ 0x34D => 220,
+ 0x34E => 220,
+ 0x353 => 220,
+ 0x354 => 220,
+ 0x355 => 220,
+ 0x356 => 220,
+ 0x591 => 220,
+ 0x596 => 220,
+ 0x59B => 220,
+ 0x5A3 => 220,
+ 0x5A4 => 220,
+ 0x5A5 => 220,
+ 0x5A6 => 220,
+ 0x5A7 => 220,
+ 0x5AA => 220,
+ 0x655 => 220,
+ 0x656 => 220,
+ 0x6E3 => 220,
+ 0x6EA => 220,
+ 0x6ED => 220,
+ 0x731 => 220,
+ 0x734 => 220,
+ 0x737 => 220,
+ 0x738 => 220,
+ 0x739 => 220,
+ 0x73B => 220,
+ 0x73C => 220,
+ 0x73E => 220,
+ 0x742 => 220,
+ 0x744 => 220,
+ 0x746 => 220,
+ 0x748 => 220,
+ 0x952 => 220,
+ 0xF18 => 220,
+ 0xF19 => 220,
+ 0xF35 => 220,
+ 0xF37 => 220,
+ 0xFC6 => 220,
+ 0x193B => 220,
+ 0...
[truncated message content] |
|
From: Neil S. <sir...@us...> - 2005-01-09 03:15:38
|
Committer : sirvulcan CVSROOT : /cvsroot/publicdnsadmin Module : publicdnsadmin Commit time: 2005-01-09 03:15:32 UTC Log message: Directory /cvsroot/publicdnsadmin/publicdnsadmin/lib/classes added to the repository |
|
From: Neil S. <sir...@us...> - 2005-01-08 02:04:08
|
Committer : sirvulcan
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2005-01-08 02:03:56 UTC
Modified files:
docs/CHANGELOG
Log message:
Fixed the changelog entry plus a cvs mail test after the update i just done
---------------------- diff included ----------------------
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.43 publicdnsadmin/docs/CHANGELOG:1.44
--- publicdnsadmin/docs/CHANGELOG:1.43 Fri Jan 7 17:51:39 2005
+++ publicdnsadmin/docs/CHANGELOG Fri Jan 7 18:03:45 2005
@@ -1,4 +1,5 @@
-SiRVulcaN <vu...@li...> - 08/01/2005 - Quick hack to create_zone.php to allow international domains. I need to work on a regexp.
+SiRVulcaN <vu...@li...> - 08/01/2005 - Quick hack to create_zone.php to allow international domains.
+ I need to work on a regexp once ive read up on the rfc.
- Woops we forgot to add an admin user for Mysql users. Fixed.
OUTsider <out...@ke...> - 05/01/2005 - Redone getRecords adding new sorting method and added sort support.
- Removed the site_address setting, now done dynamically.
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2005-01-08 01:59:58
|
CVSROOT : /cvsroot/publicdnsadmin
Module : CVSROOT
Commit time: 2005-01-08 01:59:46 UTC
Modified files:
checkoutlist commitinfo loginfo new_commit_prep new_log_accum
rcsinfo
Added files:
maillist
Log message:
Thought this would need an update. CVS mailing scripts updated.
---------------------- diff included ----------------------
Index: CVSROOT/checkoutlist
diff -u CVSROOT/checkoutlist:1.2 CVSROOT/checkoutlist:1.3
--- CVSROOT/checkoutlist:1.2 Tue Apr 15 19:47:48 2003
+++ CVSROOT/checkoutlist Fri Jan 7 17:59:36 2005
@@ -12,7 +12,7 @@
#
# comment lines begin with '#'
-syncmail
-all.template Unable to check out template.
-new_commit_prep Won't be able to do mail logging.
-new_log_accum Won't be able to do mail logging.
+all.template Unable to check out template.
+new_commit_prep Won't be able to do mail logging.
+new_log_accum Won't be able to do mail logging.
+maillist Won't be able to do mail logging.
Index: CVSROOT/commitinfo
diff -u CVSROOT/commitinfo:1.2 CVSROOT/commitinfo:1.3
--- CVSROOT/commitinfo:1.2 Tue Apr 15 19:47:49 2003
+++ CVSROOT/commitinfo Fri Jan 7 17:59:36 2005
@@ -14,4 +14,5 @@
# If the name "ALL" appears as a regular expression it is always used
# in addition to the first matching regex or "DEFAULT".
+
DEFAULT $CVSROOT/CVSROOT/new_commit_prep
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.3 CVSROOT/loginfo:1.4
--- CVSROOT/loginfo:1.3 Wed Apr 16 00:28:03 2003
+++ CVSROOT/loginfo Fri Jan 7 17:59:36 2005
@@ -1,30 +1,21 @@
-# The "loginfo" file controls where "cvs commit" log information
-# is sent. The first entry on a line is a regular expression which must match
-# the directory that the change is being made to, relative to the
-# $CVSROOT. If a match is found, then the remainder of the line is a filter
-# program that should expect log information on its standard input.
+# The "loginfo" file is used to control where "cvs commit" log information is
+# sent. The first entry on a line is a regular expression which is tested
+# against the directory that the change is being made to, relative to the
+# $CVSROOT. For the first match that is found, the remainder of the line is a
+# filter program that should expect log information on its standard input
#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
+# If the repository name does not match any of the regular expressions in the
+# first field of this file, the "DEFAULT" line is used, if it is specified.
#
-# If the name ALL appears as a regular expression it is always used
-# in addition to the first matching regex or DEFAULT.
+# If the name "ALL" appears as a regular expression it is always used
+# in addition to the first matching regex or "DEFAULT".
#
-# You may specify a format string as part of the
-# filter. The string is composed of a `%' followed
-# by a single format character, or followed by a set of format
-# characters surrounded by `{' and `}' as separators. The format
-# characters are:
-#
-# s = file name
-# V = old version number (pre-checkin)
-# v = new version number (post-checkin)
+# The filter program may use one and only one "%s" modifier (ala printf). If
+# such a "%s" is specified in the filter program, a brief title is included
+# (as one argument, enclosed in single quotes) showing the relative directory
+# name and listing the modified file names.
#
# For example:
-#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
-# or
-#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
-
-DEFAULT $CVSROOT/CVSROOT/new_log_accum -m pub...@li... %{sVv}
-#DEFAULT $CVSROOT/CVSROOT/new_log_accum -m sir...@us... %{sVv}
+#DEFAULT (echo ""; who am i; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
+DEFAULT $CVSROOT/CVSROOT/new_log_accum %{sVv}
Index: CVSROOT/maillist
diff -u /dev/null CVSROOT/maillist:1.1
--- /dev/null Fri Jan 7 17:59:50 2005
+++ CVSROOT/maillist Fri Jan 7 17:59:36 2005
@@ -0,0 +1,21 @@
+# The "maillist" file is used to control commit log mails.
+# The (space-separated) addresses on the right will be added
+# to the list of addresses mail will be sent to. Using -m
+# on the new_log_accum command line will override the contents
+# of this file.
+#
+# The first entry on a line is a regular expression which is tested
+# against the module that the change is being committed to, relative
+# to the $CVSROOT. For the each match that is found, the remainder
+# of the line is the list of email addresses. Note this regular
+# expression is compared only against the *first* component of the
+# path!
+#
+# If the repository name does not match any of the regular expressions in this
+# file, the "DEFAULT" line is used, if it is specified.
+#
+# If the name "ALL" appears as a regular expression it is always used
+# in addition to the first matching regex or "DEFAULT".
+
+DEFAULT pub...@li...
+
Index: CVSROOT/new_commit_prep
diff -u CVSROOT/new_commit_prep:1.1 CVSROOT/new_commit_prep:1.2
--- CVSROOT/new_commit_prep:1.1 Tue Apr 15 19:47:49 2003
+++ CVSROOT/new_commit_prep Fri Jan 7 17:59:36 2005
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#
-# Copyright (C) 2000 by Kevin L. Mitchell <kl...@mi...>
+# Copyright (C) 2000,2002 by Kevin L. Mitchell <kl...@mi...>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,12 +19,23 @@
#
# Script to store the last visited directory for newlogaccum.pl.
#
-# $Id: new_commit_prep,v 1.1 2003/04/16 02:47:49 sirvulcan Exp $
+# $Id: new_commit_prep,v 1.2 2005/01/08 01:59:36 sirvulcan Exp $
use strict;
+use vars qw($debug);
+
+# Don't touch this; use the -d command line option
+$debug = 0;
+
+# Debugging output
+sub debug (@) {
+ print STDERR "$0: ", @_
+ if ($debug);
+}
+
# This routine removes everything in a directory
-sub clear_dir ($) {
+sub clear_dir {
my ($dir) = @_;
my ($file);
@@ -92,6 +103,8 @@
sub write_line ($$) {
my ($fname, $line) = @_;
+ debug "Writing line \"$line\" to \"$fname\"...\n";
+
open(FILE, ">$fname") || die "Cannot open file $fname for writing";
print FILE "$line\n";
close(FILE);
@@ -100,5 +113,14 @@
# Create and empty the temporary directory
my ($tmpdir) = (tmpdir(1));
+# Set debugging if necessary
+if ($ARGV[0] eq "-d") {
+ shift(@ARGV);
+ $debug++;
+}
+
+# Log command line
+debug "options \"", join("\" \"", @ARGV), "\"\n";
+
# Store the directory name
write_line("$tmpdir/lastdir", shift(@ARGV));
Index: CVSROOT/new_log_accum
diff -u CVSROOT/new_log_accum:1.1 CVSROOT/new_log_accum:1.2
--- CVSROOT/new_log_accum:1.1 Tue Apr 15 19:47:49 2003
+++ CVSROOT/new_log_accum Fri Jan 7 17:59:36 2005
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#
-# Copyright (C) 2000 by Kevin L. Mitchell <kl...@mi...>
+# Copyright (C) 2000,2002 by Kevin L. Mitchell <kl...@mi...>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,37 +20,59 @@
# Script to accumulate log messages for an entire tree and send them along
# with the diffs; deals correctly with all manner of branching (I hope)
#
-# $Id: new_log_accum,v 1.1 2003/04/16 02:47:49 sirvulcan Exp $
+# $Id: new_log_accum,v 1.2 2005/01/08 01:59:36 sirvulcan Exp $
use strict;
-use vars qw($MAILER $CVS $debug);
+use vars qw($MAILER $CVS $debug $maillist);
# Set this to the full path of a mailer that takes -s <subject> and a list
# of email addresses as arguments...
$MAILER = "/bin/mail";
# Set this to the path of the CVS binary responsible for this tree...
-$CVS = "/usr/local/bin/cvs";
+$CVS = "/usr/bin/cvs";
# Don't touch this; use the -d command line option
$debug = 0;
+# Don't touch this, just create (or delete) the file
+$maillist = "$ENV{CVSROOT}/CVSROOT/maillist";
+
use POSIX qw(setsid);
+# Debugging output
+sub debug (@) {
+ my (@args) = @_;
+
+ if ($args[0] eq "-np") {
+ shift(@args);
+ } else {
+ unshift(@args, "$0: ");
+ }
+
+ print STDERR @args
+ if ($debug);
+}
+
# We have to dissociate from our parent, so that the CVS commit can
# complete, before we try to extract the diffs
sub daemonize {
+ debug "Daemonizing...";
defined(my $pid = fork()) || die "Can't fork: $!";
exit(0)
if $pid;
+ unless ($debug) {
+ open(STDIN, "</dev/null");
+ open(STDOUT, ">/dev/null");
+ open(STDERR, ">&STDOUT");
+ for (my $i = 2; $i < 255; $i++) {
+ POSIX::close($i);
+ }
+ }
+ chdir("/");
setsid() || die "Can't start a new session: $!";
-}
-
-# Debugging output
-sub debug (@) {
- print STDERR @_
- if ($debug);
+ debug "-np", "Done!\n";
}
# Constants used in the FSM below for parsing the log message
@@ -62,7 +84,7 @@
sub STATE_LOG2 { 5 }
# This routine removes everything in a directory
-sub clear_dir ($) {
+sub clear_dir {
my ($dir) = @_;
my ($file);
@@ -171,6 +193,77 @@
return @{$array} - 1;
}
+# Load a list of regular expressions and email addresses
+sub load_maillist ($) {
+ my ($file) = @_;
+ my ($mmap) = ({
+ DEFAULT => [],
+ ALL => [],
+ re => {},
+ });
+
+ # Don't load the list if it doesn't exist
+ return undef
+ unless (-e $file);
+
+ # Open the map file
+ open(MAILFILE, "<$file");
+ while (<MAILFILE>) {
+ chomp;
+
+ s/\#.*$//;
+ next
+ if (/^\s*$/);
+
+ my ($re, @addrs) = split;
+
+ # DEFAULT and ALL are treated specially
+ if ($re eq "DEFAULT" || $re eq "ALL") {
+ push_once(@{$mmap->{$re}}, @addrs);
+ } else {
+ $mmap->{re}{$re} = []
+ unless (exists($mmap->{re}{$re}));
+
+ # Remember the associated email addresses
+ push_once(@{$mmap->{re}{$re}}, @addrs);
+ }
+ }
+ close(MAILFILE);
+
+ return $mmap;
+}
+
+# Given the module's name (and a mailmap structure), return the necessary
+# email addresses
+sub make_maillist ($$@) {
+ my ($mmap, $module, @inaddrs) = @_;
+ my ($matches, @addrs) = 0;
+
+ # Return defaults passed in
+ return @inaddrs
+ unless (defined($mmap));
+
+ # Everything in ALL gets a message
+ push_once(@addrs, @{$mmap->{ALL}}[1..$#{$mmap->{ALL}}]);
+ # Now check each pattern one by one
+ foreach my $pat (keys(%{$mmap->{re}})) {
+ if ($module =~ /$pat/) {
+ $matches++;
+ push_once(@addrs, @{$mmap->{re}{$pat}}[1..$#{$mmap->{re}{$pat}}]);
+ }
+ }
+ # If no patterns matched, push on the defaults
+ push_once(@addrs, @{$mmap->{DEFAULT}}[1..$#{$mmap->{DEFAULT}}])
+ unless ($matches > 0);
+
+ # Return the defaults if we came up with nothing
+ return @inaddrs
+ unless (@addrs > 0);
+
+ # Return just the addresses
+ return @addrs[1..$#addrs];
+}
+
# Filter //, /./, and remove leading ./ or / from filenames
sub fname_filter ($) {
my ($fname) = @_;
@@ -308,13 +401,44 @@
close(FILE);
}
+# load module list
+sub load_modules ($) {
+ my ($tmpdir) = @_;
+ my (@modlist);
+
+ debug "Reading modules from $tmpdir/modules...\n";
+
+ # We may not have, say, recorded any modules yet
+ return ()
+ if (!-e "$tmpdir/modules");
+
+ open(MODLIST, "<$tmpdir/modules");
+ push_once(@modlist, map { chomp; $_ } <MODLIST>);
+ close(MODLIST);
+
+ return @modlist;
+}
+
+# save module list
+sub save_modules (\@$) {
+ my ($modlist, $tmpdir) = @_;
+
+ debug "Writing modules out to $tmpdir/modules...\n";
+
+ open(MODLIST, ">$tmpdir/modules");
+ print MODLIST join("\n", @{$modlist}[1..$#{$modlist}]), "\n";
+ close(MODLIST);
+}
+
# Build the header of the commit message: CVSROOT, module name, any
# branch tags, and the commit time
sub build_header ($@) {
my ($module, @branch_tags) = @_;
my (@text);
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime(time());
+ my ($user) = (getpwuid($<));
+ push(@text, "Committer : $user");
push(@text, "CVSROOT : $ENV{CVSROOT}");
push(@text, "Module : $module");
push(@text, "Branch tags: " . join(' ', @branch_tags[1..$#branch_tags]))
@@ -329,18 +453,291 @@
sub send_mail (\@$@) {
my ($mailto, $subject, @text) = @_;
- open(MAIL, "|$MAILER -s \"$subject\" " . join(' ', @{$mailto}));
+ debug("Sending mail, subject \"$subject\", to ", join(' ', @{$mailto}),
+ "\n");
+ debug("-np", "> ", join("\n> ", @text), "\n");
+
+ # Execute our mailer...
+ my $pid = open(MAIL, "|-");
+
+ exec($MAILER, '-s', $subject, @{$mailto})
+ unless ($pid);
+
print MAIL join("\n", @text), "\n";
close(MAIL);
}
+# Generates the diffs to include
+sub diff_files ($@) {
+ my ($module, @files) = @_;
+ my (@text);
+
+ foreach my $file (@files) {
+ debug "Diffing file $file->{name} (module $module)\n";
+
+ # Run cvs rdiff, extracting a diff between the old and new versions
+ my $pid = open(DIFF, "-|");
+
+ exec($CVS, '-Q', 'rdiff', '-u', '-r', $file->{old}, '-r', $file->{new},
+ "$module/$file->{name}")
+ unless ($pid);
+
+ # Chomp and store all the text...
+ push(@text, map { chomp; $_ } <DIFF>);
+
+ close(DIFF);
+ }
+
+ return @text;
+}
+
+# Read in and process log message
+sub read_log (\%\@\@\@\@\@) {
+ my ($fversions, $modified, $added, $removed, $log, $branch_tags) = @_;
+ my ($state, $tag) = (STATE_NONE, undef);
+
+ while (<STDIN>) {
+ chomp;
+
+ debug "State $state, line:$_\n";
+
+ # Ignore empty space at the beginning of the log message
+ next
+ if ($state == STATE_LOG1 && /^\s*$/);
+
+ # We're done ignoring empty space
+ if ($state == STATE_LOG1) {
+ $state = STATE_LOG2;
+ }
+
+ if ($state == STATE_LOG2) {
+ # Don't modify the lines at all if we're processing the log message
+ push(@{$log}, $_);
+ next;
+ } else {
+ # Strip out leading and trailing space
+ s/^\s*(.*?)\s*$/$1/;
+ }
+
+ if (/^Modified Files/) {
+ # Collect list of modified files
+ debug "State switching to STATE_MODIFIED\n";
+
+ $state = STATE_MODIFIED;
+ $tag = undef;
+
+ next;
+
+ } elsif (/^Added Files/) {
+ # Collect list of added files
+ debug "State switching to STATE_ADDED\n";
+
+ $state = STATE_ADDED;
+ $tag = undef;
+
+ next;
+
+ } elsif (/^Removed Files/) {
+ # Collect list of removed files
+ debug "State switching to STATE_REMOVED\n";
+
+ $state = STATE_REMOVED;
+ $tag = undef;
+
+ next;
+
+ } elsif (/^Log Message/) {
+ # Collect log message
+ debug "State switching to STATE_LOG1\n";
+
+ $state = STATE_LOG1;
+ $tag = undef;
+
+ next;
+
+ } elsif (/^Revision\/Branch/) {
+ # Parse old-style Revision/Branch field
+ debug "Found a branch tag\n";
+
+ /^[^:]+:\s*(.*)/;
+
+ push_once(@{$branch_tags}, $1);
+
+ warn "Tag == $tag"
+ if (defined($tag));
+
+ next;
+ }
+
+ # Ignore the stuff at the top of the commit report
+ next
+ if ($state == STATE_NONE);
+
+ if (/^Tag:\s*(.*)$/) {
+ # Remember the tag
+ debug "Setting tag to $1\n";
+ $tag = $1;
+ next;
+ }
+
+ my (@tfiles) = ();
+
+ # Find the file in our command line list of files
+ foreach my $file (split) {
+ die "Nothing known about file $file!"
+ unless (exists($fversions->{$file}));
+
+ push @tfiles, {
+ file => $file,
+ tag => $tag,
+ old => $fversions->{$file}{old},
+ new => $fversions->{$file}{new},
+ };
+ }
+
+ # Store the file list in the correct array
+ push(@{$modified}, @tfiles)
+ if ($state == STATE_MODIFIED);
+
+ push(@{$added}, @tfiles)
+ if ($state == STATE_ADDED);
+
+ push(@{$removed}, @tfiles)
+ if ($state == STATE_REMOVED);
+ }
+
+ # Remove trailing blank lines from the log message
+ while (@{$log} > 0 && $log->[$#{$log}] =~ /^\s*$/) {
+ pop(@{$log});
+ }
+}
+
+# Build and send message for a new directory
+sub send_newdir ($$\@\@@) {
+ my ($module, $dir, $log, $branch_tags, @mailto) = @_;
+ my (@text) = ();
+
+ # If there was a sticky tag for the directory, make it a branch tag
+ if ($log->[$#{$log}] =~ /^--> Using per-directory sticky tag \`(.*)\'$/) {
+ push_once(@{$branch_tags}, $1);
+ pop(@{$log});
+ }
+
+ # Build the message...
+ push(@text, build_header($module, @{$branch_tags}));
+ push(@text, "Log message:", "", @{$log});
+
+ # and send it (synchronously)
+ send_mail(@mailto, "[CVS] Module $module: New directory $dir", @text);
+}
+
+# Build and send message for an import
+sub send_import ($$\@\@@) {
+ my ($module, $dir, $log, $branch_tags, @mailto) = @_;
+ my (@text) = ();
+
+ # Build the message...
+ push(@text, build_header($module, @{$branch_tags}));
+ push(@text, "Log message:", "", @{$log});
+
+ # and send it (synchronously)
+ send_mail(@mailto, "[CVS] Module $module: Imported $dir", @text);
+}
+
+# Find log file matching our log
+sub find_logfile ($$\@) {
+ my ($module, $tmpdir, $log) = @_;
+ my ($i);
+
+ debug "Searching for log file index...";
+
+ for ($i = 0; ; $i++) {
+ my (@text);
+
+ # found one that doesn't exist...
+ last
+ if (!-e "$tmpdir/mod.$module/logfile.$i");
+
+ # read in the log file
+ open(FILE, "<$tmpdir/mod.$module/logfile.$i");
+ push(@text, map { chomp; $_ } <FILE>);
+ close(FILE);
+
+ # If the log file was empty, use it
+ last
+ if (@text == 0);
+
+ # If the log messages are identical, use that
+ last
+ if (join(' ', @{$log}) eq join(' ', @text));
+ }
+
+ debug "-np", "$tmpdir/mod.$module/logfile.$i\n";
+
+ return $i;
+}
+
+sub send_commit ($$@) {
+ my ($module, $tmpdir, @mailto) = @_;
+ my ($i, @text, @modified, @added, @removed, @files, @branch_tags);
+
+ for ($i = 0; ; $i++) {
+ # No more log files
+ last
+ if (!-e "$tmpdir/mod.$module/logfile.$i");
+
+ # read modified list and list all modified files if non-empty
+ @modified = file_to_names(@branch_tags,
+ "$tmpdir/mod.$module/modified.$i");
+ push(@text, "Modified files:", name_to_list(@branch_tags, @modified),
+ "")
+ if (@modified > 0);
+
+ # read added list and list all added files if non-empty
+ @added = file_to_names(@branch_tags, "$tmpdir/mod.$module/added.$i");
+ push(@text, "Added files:", name_to_list(@branch_tags, @added), "")
+ if (@added > 0);
+
+ # read removed list and list all removed files if non-empty
+ @removed = file_to_names(@branch_tags,
+ "$tmpdir/mod.$module/removed.$i");
+ push(@text, "Removed files:", name_to_list(@branch_tags, @removed), "")
+ if (@removed > 0);
+
+ # read and insert the log message
+ open(FILE, "<$tmpdir/mod.$module/logfile.$i");
+ push(@text, "Log message:", "");
+ push(@text, map { chomp; $_ } <FILE>);
+ push(@text, "");
+ close(FILE);
+
+ # remember all the files we looked at
+ push(@files, @modified, @added, @removed);
+ }
+
+ # Now that name_to_list has rebuilt our list of branch tags, we can build
+ # the header and prepend it to the message
+ unshift(@text, build_header($module, @branch_tags));
+
+ # sort the files out for our diff
+ @files = sort { $a->{name} cmp $b->{name} } @files;
+
+ # add the diff...
+ push(@text, "---------------------- diff included ----------------------");
+ push(@text, diff_files($module, @files));
+ push(@text, "----------------------- End of diff -----------------------");
+
+ # Now send the mail
+ send_mail(@mailto, "[CVS] Module $module: Change committed", @text);
+}
+
# Find the tmp directory
my ($tmpdir) = (tmpdir());
my (@mailto) = ();
my (@files) = ();
my (@path) = ();
-my ($modname, $repdir, $dir) = (undef, undef, undef);
+my ($module, $repdir, $dir, $mailmap) = (undef, undef, undef, undef);
# Process command line arguments
while (@ARGV > 0) {
@@ -349,12 +746,6 @@
if ($arg eq '-d') {
# Turn on debugging
$debug++;
- } elsif ($arg eq '-M') {
- # Module name explicitly set -- XXX Not tested, use at your own risk
- die "Argument for -M missing"
- unless (@ARGV > 0);
-
- $modname = shift(@ARGV);
} elsif ($arg eq '-m') {
# An address to mail the notification to
die "Argument for -m missing"
@@ -370,9 +761,12 @@
}
}
-die "Nobody to mail to"
+$mailmap = load_maillist($maillist)
unless (@mailto > 0);
+die "Nobody to mail to"
+ unless (@mailto > 0 || defined($mailmap));
+
die "No files to process"
unless (@files > 1);
@@ -383,8 +777,7 @@
@path = split("/", $repdir);
# Now we know the module name, if it wasn't explicitly set
-$modname = $path[0]
- unless (defined($modname));
+$module = $path[0];
# Figure out what our directory is
if (@path == 1) {
@@ -396,7 +789,7 @@
# append a / to it...
$dir .= "/";
-debug "module = $modname\n";
+debug "module = $module\n";
debug "dir = $dir\n";
debug "path = ", join(":", @path), "\n";
debug "files = ", join(":", @files), "\n";
@@ -421,284 +814,62 @@
}
}
-# process log message
-my ($state, $tag) = (STATE_NONE, undef);
-
-my (@modified, @added, @removed, @log, @branch_tags) = ();
-
-while (<STDIN>) {
- chomp;
-
- debug "State $state, line:$_\n";
-
- # Ignore empty space at the beginning of the log message
- next
- if ($state == STATE_LOG1 && /^\s*$/);
-
- # We're done ignoring empty space
- if ($state == STATE_LOG1) {
- $state = STATE_LOG2;
- }
-
- if ($state == STATE_LOG2) {
- # Don't modify the lines at all if we're processing the log message
- push(@log, $_);
- next;
- } else {
- # Strip out leading and trailing space
- s/^\s*(.*?)\s*$/$1/;
- }
-
- if (/^Modified Files/) {
- # Collect list of modified files
- debug "State switching to STATE_MODIFIED\n";
-
- $state = STATE_MODIFIED;
- $tag = undef;
-
- next;
-
- } elsif (/^Added Files/) {
- # Collect list of added files
- debug "State switching to STATE_ADDED\n";
-
- $state = STATE_ADDED;
- $tag = undef;
-
- next;
-
- } elsif (/^Removed Files/) {
- # Collect list of removed files
- debug "State switching to STATE_REMOVED\n";
-
- $state = STATE_REMOVED;
- $tag = undef;
-
- next;
-
- } elsif (/^Log Message/) {
- # Collect log message
- debug "State switching to STATE_LOG1\n";
-
- $state = STATE_LOG1;
- $tag = undef;
+my (@modules) = load_modules($tmpdir);
+push_once(@modules, $module);
+save_modules(@modules, $tmpdir);
- next;
+die "Can't create per-module directory $tmpdir/mod.$module: $!"
+ unless (-e "$tmpdir/mod.$module" || mkdir("$tmpdir/mod.$module", 0700));
- } elsif (/^Revision\/Branch/) {
- # Parse old-style Revision/Branch field
- debug "Found a branch tag\n";
+die "Per-module directory $tmpdir/mod.$module is not a directory"
+ unless (-d "$tmpdir/mod.$module");
- /^[^:]+:\s*(.*)/;
+my (@modified, @added, @removed, @log, @branch_tags);
- push_once(@branch_tags, $1);
-
- warn "Tag == $tag"
- if (defined($tag));
-
- next;
- }
-
- # Ignore the stuff at the top of the commit report
- next
- if ($state == STATE_NONE);
-
- if (/^Tag:\s*(.*)$/) {
- # Remember the tag
- debug "Setting tag to $1\n";
- $tag = $1;
- next;
- }
-
- my (@tfiles) = ();
-
- # Find the file in our command line list of files
- foreach my $file (split) {
- die "Nothing known about file $file!"
- unless (exists($fversions{$file}));
-
- push @tfiles, {
- file => $file,
- tag => $tag,
- old => $fversions{$file}{old},
- new => $fversions{$file}{new},
- };
- }
-
- # Store the file list in the correct array
- push(@modified, @tfiles)
- if ($state == STATE_MODIFIED);
-
- push(@added, @tfiles)
- if ($state == STATE_ADDED);
-
- push(@removed, @tfiles)
- if ($state == STATE_REMOVED);
-}
-
-# Remove trailing blank lines from the log message
-while (@log > 0 && $log[$#log] =~ /^\s*$/) {
- pop(@log);
-}
+read_log(%fversions, @modified, @added, @removed, @log, @branch_tags);
# If a new directory was added, we're done...
if (defined($files[1]) && defined($files[2]) &&
$files[1] eq "New" && $files[2] eq "directory") {
+ debug "Sending log message for new directory $dir\n";
+ send_newdir($module, $dir, @log, @branch_tags,
+ make_maillist($mailmap, $module, @mailto));
+} elsif (defined($files[1]) && defined($files[2]) &&
+ $files[1] eq "Imported" && $files[2] eq "sources") {
+ debug "Sending log message for new import $dir\n";
+ send_import($module, $dir, @log, @branch_tags,
+ make_maillist($mailmap, $module, @mailto));
+} else {
+ my $i = find_logfile($module, $tmpdir, @log);
- my (@text) = ();
-
- # If there was a sticky tag for the directory, make it a branch tag
- if ($log[$#log] =~ /^--> Using per-directory sticky tag \`(.*)\'$/) {
- push_once(@branch_tags, $1);
- pop(@log);
- }
-
- # Build the message...
- push(@text, build_header($modname, @branch_tags));
- push(@text, "Log message:", "", @log);
-
- # and send it (synchronously)
- send_mail(@mailto, "[CVS] Module $modname: New directory $dir", @text);
-
- # Clean up after ourselves and exit.
- cleanup_dir($tmpdir);
- exit(0);
-}
-
-# If an import was done, we're done...
-if (defined($files[1]) && defined($files[2]) &&
- $files[1] eq "Imported" && $files[2] eq "sources") {
-
- my (@text) = ();
-
- # Build the message...
- push(@text, build_header($modname, @branch_tags));
- push(@text, "Log message:", "", @log);
-
- # and send it (synchronously)
- send_mail(@mailto, "[CVS] Module $modname: Imported $dir", @text);
-
- # Clean up after ourselves and exit.
- cleanup_dir($tmpdir);
- exit(0);
-}
-
-debug "Searching for log file index...";
-
-my ($i);
-
-# Look for an empty log file or one that matches our current log message
-for ($i = 0; ; $i++) {
- my (@text);
-
- # found one that doesn't exist...
- last
- if (!-e "$tmpdir/logfile.$i");
-
- # read in the log file
- open(FILE, "<$tmpdir/logfile.$i");
- while (<FILE>) {
- chomp;
- push(@text, $_);
- }
- close(FILE);
+ # Store modified, added, and removed file lists, along with the log message
+ names_to_file("$tmpdir/mod.$module/modified.$i", $dir, @modified);
+ names_to_file("$tmpdir/mod.$module/added.$i", $dir, @added);
+ names_to_file("$tmpdir/mod.$module/removed.$i", $dir, @removed);
+ write_log("$tmpdir/mod.$module/logfile.$i", @log);
- # If the log file was empty, use it
- last
- if (@text == 0);
-
- # If the log messages are identical, use that
- last
- if (join(' ', @log) eq join(' ', @text));
-}
-
-debug "$tmpdir/logfile.$i\n";
-
-# Store modified, added, and removed file lists, along with the log message
-names_to_file("$tmpdir/modified.$i", $dir, @modified);
-names_to_file("$tmpdir/added.$i", $dir, @added);
-names_to_file("$tmpdir/removed.$i", $dir, @removed);
-write_log("$tmpdir/logfile.$i", @log);
-
-# Now check to see if we're at the end of our rope
-my ($lastdir) = (get_line("$tmpdir/lastdir"));
-
-debug "Checking $ENV{CVSROOT}/$repdir against lastdir $lastdir\n";
-
-# Nope, exit instead of sending a message
-exit(0)
- if ($lastdir ne "$ENV{CVSROOT}/$repdir");
-
-debug "At last, we've reached the end\n";
-
-# We have to daemonize and sleep so that there isn't any lock hanging
-# around when we get to the cvs rdiff below...
-daemonize();
-sleep(10);
-
-# Build the mail message...
-my (@text) = ();
-@files = ();
-@branch_tags = ();
-
-for ($i = 0; ; $i++) {
- # No more log files
- last
- if (!-e "$tmpdir/logfile.$i");
-
- # read modified list and list all modified files if non-empty
- @modified = file_to_names(@branch_tags, "$tmpdir/modified.$i");
- push(@text, "Modified files:", name_to_list(@branch_tags, @modified), "")
- if (@modified > 0);
-
- # read added list and list all added files if non-empty
- @added = file_to_names(@branch_tags, "$tmpdir/added.$i");
- push(@text, "Added files:", name_to_list(@branch_tags, @added), "")
- if (@added > 0);
-
- # read removed list and list all removed files if non-empty
- @removed = file_to_names(@branch_tags, "$tmpdir/removed.$i");
- push(@text, "Removed files:", name_to_list(@branch_tags, @removed), "")
- if (@removed > 0);
-
- # read and insert the log message
- open(FILE, "<$tmpdir/logfile.$i");
- push(@text, "Log message:", "");
- while (<FILE>) {
- chomp;
- push(@text, $_);
- }
- push(@text, "");
- close(FILE);
-
- # remember all the files we looked at
- push(@files, @modified, @added, @removed);
-}
+ # Now check to see if we're at the end of our rope
+ my ($lastdir) = (get_line("$tmpdir/lastdir"));
-# Now that name_to_list has rebuilt our list of branch tags, we can build the
-# header and prepend it to the message
-unshift(@text, build_header($modname, @branch_tags));
+ debug "Checking $ENV{CVSROOT}/$repdir against lastdir $lastdir\n";
-# sort the files out for our diff
-@files = sort { $a->{name} cmp $b->{name} } @files;
+ # Nope, exit instead of sending a message
+ exit(0)
+ if ($lastdir ne "$ENV{CVSROOT}/$repdir");
-push(@text, "---------------------- diff included ----------------------");
-foreach my $file (@files) {
- debug "Diffing file $file->{name}...\n";
+ debug "At last, we've reached the end\n";
- # Run cvs rdiff, extracting a diff between the old version and the new
- open(DIFF, "$CVS -Q rdiff -u -r $file->{old} -r $file->{new} " .
- "$modname/$file->{name}|");
- while (<DIFF>) {
- chomp;
- push(@text, $_);
+ # We have to daemonize and sleep so that there isn't any lock hanging
+ # around when we get to the cvs rdiff below...
+ daemonize();
+ sleep(10);
+
+ # Send a mail for each module involved
+ foreach my $mod (@modules[1..$#modules]) {
+ debug "Sending log message for module $mod\n";
+ send_commit($mod, $tmpdir, make_maillist($mailmap, $mod, @mailto));
}
- close(DIFF);
}
-push(@text, "----------------------- End of diff -----------------------");
-
-# send the mail...
-send_mail(@mailto, "[CVS] Module $modname: Change committed", @text);
# and clean up after ourselves
cleanup_dir($tmpdir);
Index: CVSROOT/rcsinfo
diff -u CVSROOT/rcsinfo:1.2 CVSROOT/rcsinfo:1.3
--- CVSROOT/rcsinfo:1.2 Tue Apr 15 19:47:49 2003
+++ CVSROOT/rcsinfo Fri Jan 7 17:59:36 2005
@@ -13,4 +13,3 @@
# in addition to the first matching regex or "DEFAULT".
DEFAULT $CVSROOT/CVSROOT/all.template
-
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2005-01-08 01:52:07
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2005-01-08 01:51:49 UTC
Modified files:
create_zone.php docs/CHANGELOG docs/mysql.sql
Log message:
immm back. couple of small changes. Ill fix the changelog up later, i was editing it in cygwin which wont allow me to have a full screen nano session
---------------------- diff included ----------------------
Index: publicdnsadmin/create_zone.php
diff -u publicdnsadmin/create_zone.php:1.2 publicdnsadmin/create_zone.php:1.3
--- publicdnsadmin/create_zone.php:1.2 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/create_zone.php Fri Jan 7 17:51:39 2005
@@ -107,7 +107,9 @@
$domain = trim(addslashes($_POST["domain"]));
$template = trim(addslashes($_POST["template"]));
- if (!$domain or (!preg_match("/^[a-zA-Z0-9-_]+\.[a-zA-Z0-9-_\.]{2,6}$/", $domain) and !preg_match("/^[0-9\.]+\.in-addr\.arpa$/", $domain) and !preg_match("/^[0-9\.]+\.ip6\.arpa$/", $domain) and !preg_match("/^[0-9\.]+\.ip6\.int$/", $domain))) {
+ /* (!preg_match("/^[a-zA-Z0-9-_]+\.[a-zA-Z0-9-_\.]{2,6}$/", $domain) and !preg_match("/^[0-9\.]+\.in-addr\.arpa$/", $domain) and !preg_match("/^[0-9\.]+\.ip6\.arpa$/", $domain) and !preg_match("/^[0-9\.]+\.ip6\.int$/", $domain))) { */
+
+ if (!$domain)
echo "<p class=\"error\">"._MISSINGINVDOM."</p>\n";
} else {
$dbh = db_connect();
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.42 publicdnsadmin/docs/CHANGELOG:1.43
--- publicdnsadmin/docs/CHANGELOG:1.42 Wed Jan 5 18:27:40 2005
+++ publicdnsadmin/docs/CHANGELOG Fri Jan 7 17:51:39 2005
@@ -1,3 +1,5 @@
+SiRVulcaN <vu...@li...> - 08/01/2005 - Quick hack to create_zone.php to allow international domains. I need to work on a regexp.
+ - Woops we forgot to add an admin user for Mysql users. Fixed.
OUTsider <out...@ke...> - 05/01/2005 - Redone getRecords adding new sorting method and added sort support.
- Removed the site_address setting, now done dynamically.
Index: publicdnsadmin/docs/mysql.sql
diff -u publicdnsadmin/docs/mysql.sql:1.4 publicdnsadmin/docs/mysql.sql:1.5
--- publicdnsadmin/docs/mysql.sql:1.4 Wed Jul 16 07:36:51 2003
+++ publicdnsadmin/docs/mysql.sql Fri Jan 7 17:51:39 2005
@@ -54,3 +54,5 @@
);
CREATE INDEX gfxcodes_idx ON gfxcodes(code,crc,expire);
+
+INSERT INTO users (username, password, name, email, company, permission) VALUES('administrator', '21232f297a57a5a743894a0e4a801fc3', 'DNS Administrator', 'dns...@ho...', 'PublicDNSAdmin', 2);
----------------------- End of diff -----------------------
|
|
From: Alexander M. <key...@us...> - 2005-01-06 02:43:27
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2005-01-06 02:43:17 UTC
Added files:
data/.cvsignore lib/.cvsignore
Log message:
Author: Alexander Maassen <out...@ke...>
Log message: Added .cvsignore in data and lib, in case people want to submit patches
---------------------- diff included ----------------------
Index: publicdnsadmin/data/.cvsignore
diff -u /dev/null publicdnsadmin/data/.cvsignore:1.1
--- /dev/null Wed Jan 5 18:43:17 2005
+++ publicdnsadmin/data/.cvsignore Wed Jan 5 18:43:07 2005
@@ -0,0 +1 @@
+*.gz
Index: publicdnsadmin/lib/.cvsignore
diff -u /dev/null publicdnsadmin/lib/.cvsignore:1.1
--- /dev/null Wed Jan 5 18:43:18 2005
+++ publicdnsadmin/lib/.cvsignore Wed Jan 5 18:43:07 2005
@@ -0,0 +1,2 @@
+config.php
+terms.php
----------------------- End of diff -----------------------
|
|
From: Alexander M. <key...@us...> - 2005-01-06 02:28:07
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2005-01-06 02:27:51 UTC
Modified files:
dbbackup.php forgotten_pass.php signup.php docs/CHANGELOG
lib/config.php-dist lib/header.php lib/prepend.php
Added files:
lib/functions.php
Log message:
Author: Alexander Maassen <out...@ke...>
Log message: Removed the site_address setting, now done dynamically.
Added functions.php to put in other often used functions not related to anything else.
---------------------- diff included ----------------------
Index: publicdnsadmin/dbbackup.php
diff -u publicdnsadmin/dbbackup.php:1.8 publicdnsadmin/dbbackup.php:1.9
--- publicdnsadmin/dbbackup.php:1.8 Fri Apr 23 01:53:28 2004
+++ publicdnsadmin/dbbackup.php Wed Jan 5 18:27:39 2005
@@ -38,7 +38,7 @@
if ($error) {
echo "<p>". $error ."</p>\n";
} else {
- echo "<p>". _BACKUPCREATED ." <a href=\"".$site_address."/data/".$filesmall."\">". _BACKUPDOWNLOAD .".</a></p>\n";
+ echo "<p>". _BACKUPCREATED ." <a href=\"data/".$filesmall."\">". _BACKUPDOWNLOAD .".</a></p>\n";
}
}
include("lib/footer.php");
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.41 publicdnsadmin/docs/CHANGELOG:1.42
--- publicdnsadmin/docs/CHANGELOG:1.41 Wed Jan 5 12:14:28 2005
+++ publicdnsadmin/docs/CHANGELOG Wed Jan 5 18:27:40 2005
@@ -1,4 +1,5 @@
OUTsider <out...@ke...> - 05/01/2005 - Redone getRecords adding new sorting method and added sort support.
+ - Removed the site_address setting, now done dynamically.
SiRVulcaN <vu...@li...> - 08/05/2004 - Fixed a bug in delete_user.php that OUTsider found. When a user
who owned a domain was delete all other users who have access to
Index: publicdnsadmin/forgotten_pass.php
diff -u publicdnsadmin/forgotten_pass.php:1.3 publicdnsadmin/forgotten_pass.php:1.4
--- publicdnsadmin/forgotten_pass.php:1.3 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/forgotten_pass.php Wed Jan 5 18:27:40 2005
@@ -27,7 +27,7 @@
$fromaddy = $contact_addy;
$subject = _REQUESTEDPASS;
- $content = "". _PASSWORDFOR ." $site_address ". _IS .": $newpass. ". _LOGINANDCHANGE ."";
+ $content = "". _PASSWORDFOR . gen_server_url() . _IS .": $newpass. ". _LOGINANDCHANGE ."";
$headers .= "MIME-Version: 1.0\r\n";
$headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
Index: publicdnsadmin/lib/config.php-dist
diff -u publicdnsadmin/lib/config.php-dist:1.12 publicdnsadmin/lib/config.php-dist:1.13
--- publicdnsadmin/lib/config.php-dist:1.12 Tue Aug 12 19:47:13 2003
+++ publicdnsadmin/lib/config.php-dist Wed Jan 5 18:27:40 2005
@@ -7,7 +7,7 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: config.php-dist,v 1.12 2003/08/13 02:47:13 sirvulcan Exp $
+ $Id: config.php-dist,v 1.13 2005/01/06 02:27:40 key2peace Exp $
*/
/*
@@ -45,9 +45,6 @@
/* Contact email address */
$contact_addy = "dns...@do...";
-/* Path to site (without a trailing fowardslash */
-$site_address = "http://www.site.com/publicdnsadmin";
-
/* Restrict new user signups, admins can still add users via the interface when logged in */
$allow_newusers = 1;
Index: publicdnsadmin/lib/functions.php
diff -u /dev/null publicdnsadmin/lib/functions.php:1.1
--- /dev/null Wed Jan 5 18:27:52 2005
+++ publicdnsadmin/lib/functions.php Wed Jan 5 18:27:40 2005
@@ -0,0 +1,33 @@
+<?php
+/*
+ Public DNS Administator
+ Originally Written by Trond Arve Nordheim <tr...@no...>
+ Modified By Neil Spierling <sir...@si...>
+
+ Distributed under the GPL license, see LICENSE for
+ more information
+
+ $Id: functions.php,v 1.1 2005/01/06 02:27:40 key2peace Exp $
+*/
+
+function gen_server_url() {
+ global $SERVER_NAME,$SERVER_PORT,$PHP_SELF;
+ $a = split('/',"$SERVER_NAME"."$PHP_SELF");
+ $b = 0;
+ if ($SERVER_PORT == "80")
+ $reply = "http://";
+ elseif ($SERVER_PORT == "443")
+ $reply = "https://";
+ else {
+ $reply = "http://$SERVER_NAME:$SERVER_PORT";
+ $b++;
+ }
+
+ while ($b < (count($a) - 1)) {
+ $reply = $reply.$a[$b]."/";
+ $b++;
+ }
+ return $reply;
+}
+
+?>
Index: publicdnsadmin/lib/header.php
diff -u publicdnsadmin/lib/header.php:1.20 publicdnsadmin/lib/header.php:1.21
--- publicdnsadmin/lib/header.php:1.20 Sat Sep 20 07:39:12 2003
+++ publicdnsadmin/lib/header.php Wed Jan 5 18:27:40 2005
@@ -7,7 +7,7 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: header.php,v 1.20 2003/09/20 14:39:12 sirvulcan Exp $
+ $Id: header.php,v 1.21 2005/01/06 02:27:40 key2peace Exp $
*/
?>
@@ -46,7 +46,6 @@
die("Default Language File Choosen Doesnt Exist Or Is Unreadable By The Webserver");
}
}
-
?>
<table border="0" cellspacing="1" cellpadding="5" width="100%" height="95%">
Index: publicdnsadmin/lib/prepend.php
diff -u publicdnsadmin/lib/prepend.php:1.2 publicdnsadmin/lib/prepend.php:1.3
--- publicdnsadmin/lib/prepend.php:1.2 Wed Jun 18 01:05:47 2003
+++ publicdnsadmin/lib/prepend.php Wed Jan 5 18:27:40 2005
@@ -7,7 +7,7 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: prepend.php,v 1.2 2003/06/18 08:05:47 sirvulcan Exp $
+ $Id: prepend.php,v 1.3 2005/01/06 02:27:40 key2peace Exp $
*/
/* Start session */
@@ -18,6 +18,7 @@
/* Internal dependencies */
require("config.php");
+require("functions.php");
require("db.inc.php");
require("gfx_code.inc.php");
require("permission.inc.php");
Index: publicdnsadmin/signup.php
diff -u publicdnsadmin/signup.php:1.6 publicdnsadmin/signup.php:1.7
--- publicdnsadmin/signup.php:1.6 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/signup.php Wed Jan 5 18:27:40 2005
@@ -238,7 +238,7 @@
// send email
$accsubject = _NEWACCOUNTCREATED;
- $acccontent = ""._REGGEDWITH." ($site_address)<br><br>"._USERNAME.": $username<Br>"._PASSWORD.": $password";
+ $acccontent = _REGGEDWITH. gen_server_url() ."<br><br>"._USERNAME.": $username<Br>"._PASSWORD.": $password";
$secondaddy = $contact_addy;
$secondsubject = "$username "._SIGNUPCOMPLETE."";
----------------------- End of diff -----------------------
|
|
From: Alexander M. <key...@us...> - 2005-01-05 20:14:48
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2005-01-05 20:14:38 UTC
Modified files:
edit_zone.php whois.php docs/CHANGELOG lib/records.inc.php
Log message:
Author: Alexander Maassen <out...@ke...>
Log message: Changed getRecords and added sorting to edit_zone.php
---------------------- diff included ----------------------
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.40 publicdnsadmin/docs/CHANGELOG:1.41
--- publicdnsadmin/docs/CHANGELOG:1.40 Fri May 7 09:42:08 2004
+++ publicdnsadmin/docs/CHANGELOG Wed Jan 5 12:14:28 2005
@@ -1,4 +1,5 @@
-$Id:
+OUTsider <out...@ke...> - 05/01/2005 - Redone getRecords adding new sorting method and added sort support.
+
SiRVulcaN <vu...@li...> - 08/05/2004 - Fixed a bug in delete_user.php that OUTsider found. When a user
who owned a domain was delete all other users who have access to
the domain lost their access.
Index: publicdnsadmin/edit_zone.php
diff -u publicdnsadmin/edit_zone.php:1.7 publicdnsadmin/edit_zone.php:1.8
--- publicdnsadmin/edit_zone.php:1.7 Sat Sep 20 07:39:12 2003
+++ publicdnsadmin/edit_zone.php Wed Jan 5 12:14:27 2005
@@ -16,6 +16,7 @@
$perms = getUserPermissions($_SESSION["_UID"]);
$zoneid = trim(addslashes($_GET["id"]));
+ $sortorder = trim(addslashes($_GET["order"]));
echo "<h3>"._EDITDOMAIN."</h3>";
if ($perms["raw"] == 2) {
@@ -31,11 +32,11 @@
$row = $result->fetchRow();
if ($perms["edit_other"] or userHasZoneAccess($_SESSION["_UID"], $zoneid) or ($perms["edit_own"] and $row["user_id"] == $_SESSION["_UID"])) {
- $records = getRecords($zoneid);
+ $records = getRecords($zoneid,$sortorder);
echo "<p>· <a href=\"new_record.php?zone=$zoneid\">"._NEWRECORDUP."</a></p>\n";
echo "<form action=\"delete_multi_records.php\" name=\"recdelform\" method=\"post\">\n";
- echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th><input type=\"submit\" name=\"delbut\" disabled=\"true\" value=\""._DEL."\"></th><th>"._RECORD."</th><th>"._TYPE."</th><th>"._CONTENT."</th><th>"._PRIORITY."</th><th>"._TTL."</th><th> </th></tr>\n";
+ echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th><input type=\"submit\" name=\"delbut\" disabled=\"true\" value=\""._DEL."\"></th><th><a href=?id=$zoneid&order=name>"._RECORD."</a></th><th><a href=?id=$zoneid&order=type>"._TYPE."</a></th><th><a href=?id=$zoneid&order=content>"._CONTENT."</a></th><th><a href=?id=$zoneid&order=prio>"._PRIORITY."</a></th><th><a href=?id=$zoneid&order=ttl>"._TTL."</a></th><th> </th></tr>\n";
$row_id = 0;
$row_c = -1;
Index: publicdnsadmin/lib/records.inc.php
diff -u publicdnsadmin/lib/records.inc.php:1.3 publicdnsadmin/lib/records.inc.php:1.4
--- publicdnsadmin/lib/records.inc.php:1.3 Thu Jul 17 05:02:28 2003
+++ publicdnsadmin/lib/records.inc.php Wed Jan 5 12:14:28 2005
@@ -7,133 +7,54 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: records.inc.php,v 1.3 2003/07/17 12:02:28 sirvulcan Exp $
+ $Id: records.inc.php,v 1.4 2005/01/05 20:14:28 key2peace Exp $
*/
-function getRecords($zoneid) {
+function getRecords($zoneid, $sortorder) {
$records = array();
- /* TODO: Improve the way records are sorted */
-
- /* Fetch SOA */
- $rec = getRecordsByType($zoneid, "SOA");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
- }
- }
-
- /* Fetch NS */
- $rec = getRecordsByType($zoneid, "NS");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
- }
- }
-
- /* Fetch MX */
- $rec = getRecordsByType($zoneid, "MX");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
- }
- }
-
- /* Fetch A */
- $rec = getRecordsByType($zoneid, "A");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
- }
- }
+ if (empty($sortorder) || ($sortorder == 'type')) {
- /* Fetch AAAA */
- $rec = getRecordsByType($zoneid, "AAAA");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
- }
- }
-
- /* Fetch PTR */
- $rec = getRecordsByType($zoneid, "PTR");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
- }
- }
-
- /* Fetch CNAME */
- $rec = getRecordsByType($zoneid, "CNAME");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
- }
- }
+ $order = array("SOA","NS","MX","A","AAAA","PTR","CNAME","MBOXFW","URL",
+ "RP","HWINFO","A6","NS6");
- /* Fetch MBOXFW */
- $rec = getRecordsByType($zoneid, "MBOXFW");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
- }
- }
-
- /* Fetch URL */
- $rec = getRecordsByType($zoneid, "URL");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
+ foreach ($order as $type) {
+ $rec = getRecordsByType($zoneid, $type);
+ if (count($rec)) {
+ foreach ($rec as $r) {
+ array_push($records, $r);
+ }
+ }
}
- }
- /* Fetch RP */
- $rec = getRecordsByType($zoneid, "RP");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
- }
- }
+ /* Fetch everything else */
+ $dbh = db_connect();
- /* Fetch HWINFO */
- $rec = getRecordsByType($zoneid, "HWINFO");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
- }
- }
+ $result = $dbh->query("SELECT * FROM records WHERE domain_id = '$zoneid' AND (type <> 'SOA' AND type <> 'NS' AND type <> 'MX' AND type <> 'A' AND type <> 'AAAA' AND type <> 'PTR' AND type <> 'CNAME' AND type <> 'MBOXFW' AND type <> 'URL' AND type <> 'RP' AND type <> 'HWINFO' AND type <> 'A6' AND type <> 'NS6')");
+ if (!$dbh->isError($result) && $result->numRows()) {
+ while ($row = $result->fetchRow()) {
- /* Fetch A6 */
- $rec = getRecordsByType($zoneid, "A6");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
- }
- }
+ array_push($records, array("id" => $row["id"], "name" => $row["name"], "type" => $row["type"], "prio" => $row["prio"], "content" => $row["content"], "ttl" => $row["ttl"], "change_date" => $row["change_date"]));
- /* Fetch NS6 */
- $rec = getRecordsByType($zoneid, "NS6");
- if (count($rec)) {
- foreach ($rec as $r) {
- array_push($records, $r);
+ }
}
- }
-
- /* Fetch everything else */
- $dbh = db_connect();
- $result = $dbh->query("SELECT * FROM records WHERE domain_id = '$zoneid' AND (type <> 'SOA' AND type <> 'NS' AND type <> 'MX' AND type <> 'A' AND type <> 'AAAA' AND type <> 'PTR' AND type <> 'CNAME' AND type <> 'MBOXFW' AND type <> 'URL' AND type <> 'RP' AND type <> 'HWINFO' AND type <> 'A6' AND type <> 'NS6')");
- if (!$dbh->isError($result) && $result->numRows()) {
- while ($row = $result->fetchRow()) {
-
- array_push($records, array("id" => $row["id"], "name" => $row["name"], "type" => $row["type"], "prio" => $row["prio"], "content" => $row["content"], "ttl" => $row["ttl"], "change_date" => $row["change_date"]));
+ $dbh->disconnect();
+ } elseif ($sortorder == 'name' || $sortorder == 'prio' || $sortorder == 'content' || $sortorder == 'ttl') {
+ /* User wants to sort on something else */
+ $dbh = db_connect();
+ $result = $dbh->query("SELECT * FROM records WHERE domain_id = '$zoneid' ORDER BY $sortorder");
+ if (!$dbh->isError($result) && $result->numRows()) {
+ while ($row = $result->fetchRow()) {
+ array_push($records, array("id" => $row["id"], "name" => $row["name"], "type" => $row["type"], "prio" => $row["prio"], "content" => $row["content"], "ttl" => $row["ttl"], "change_date" => $row["change_date"]));
+ }
}
- }
-
- $dbh->disconnect();
+ $dbh->disconnect();
+ }
+
return $records;
}
Index: publicdnsadmin/whois.php
diff -u publicdnsadmin/whois.php:1.3 publicdnsadmin/whois.php:1.4
--- publicdnsadmin/whois.php:1.3 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/whois.php Wed Jan 5 12:14:27 2005
@@ -79,7 +79,7 @@
if (!$dbh->isError($result) && $result->numRows()) {
$row = $result->fetchRow();
- $records = getRecords($zoneid);
+ $records = getRecords($zoneid,'name');
foreach ($records as $record) {
wwwhois($record[name]);
break;
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2004-05-07 16:42:25
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2004-05-07 16:42:18 UTC
Modified files:
delete_user.php docs/CHANGELOG
Log message:
Author: SiRVulcaN <vu...@li...>
Log message:
Fixed a bug.. see CHANGELOG.
---------------------- diff included ----------------------
Index: publicdnsadmin/delete_user.php
diff -u publicdnsadmin/delete_user.php:1.2 publicdnsadmin/delete_user.php:1.3
--- publicdnsadmin/delete_user.php:1.2 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/delete_user.php Fri May 7 09:42:08 2004
@@ -45,7 +45,7 @@
$dbh->query("DELETE FROM domain_owners WHERE domain_id = 'checkdomain'");
$dbh->query("DELETE FROM records WHERE domain_id = '$checkdomain'");
} else {
- $dbh->query("DELETE FROM domain_owners WHERE domain_id = '$checkdomain'");
+ $dbh->query("DELETE FROM domain_owners WHERE domain_id = '$checkdomain' AND user_id = '$id'");
}
}
}
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.39 publicdnsadmin/docs/CHANGELOG:1.40
--- publicdnsadmin/docs/CHANGELOG:1.39 Fri Apr 23 01:53:28 2004
+++ publicdnsadmin/docs/CHANGELOG Fri May 7 09:42:08 2004
@@ -1,4 +1,8 @@
$Id:
+SiRVulcaN <vu...@li...> - 08/05/2004 - Fixed a bug in delete_user.php that OUTsider found. When a user
+ who owned a domain was delete all other users who have access to
+ the domain lost their access.
+
OUTsider <out...@ke...> - 23/04/2004 - Fixed an issue in language handler, we shall use english by default
if no session is set.
----------------------- End of diff -----------------------
|
|
From: Alexander M. <key...@us...> - 2004-04-23 08:53:44
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2004-04-23 08:53:38 UTC
Modified files:
dbbackup.php docs/CHANGELOG
Log message:
Author: Alexander Maassen <out...@ke...>
Log message: Fixed bug #918640. (Added password functionality the dirty but working way
Since postgres doesn't support passwords in pg_dump it won't work for them
they have to manually perform the command on console or learn how to
correctly setup host based auth.
---------------------- diff included ----------------------
Index: publicdnsadmin/dbbackup.php
diff -u publicdnsadmin/dbbackup.php:1.7 publicdnsadmin/dbbackup.php:1.8
--- publicdnsadmin/dbbackup.php:1.7 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/dbbackup.php Fri Apr 23 01:53:28 2004
@@ -19,14 +19,27 @@
$filesmall = "lbdns-".$date.".sql.gz";
if (db_type() == "mysql") {
- passthru("mysqldump --opt -h".$database_host." -u".$database_user." -r".$filename." ".$database_name);
+ if ($database_pass == "") {
+ passthru("mysqldump --opt -h".$database_host." -u".$database_user." -r".$filename." ".$database_name);
+ } else {
+ passthru("mysqldump --opt -h".$database_host." -u".$database_user." --password=".$database_pass." -r".$filename." ".$database_name);
+ }
$zipline = "gzip -9 ".$filename."";
shell_exec($zipline);
} else {
- passthru("pg_dump -v -Z9 -h".$database_host." -U".$database_user." -f".$filename.".gz ".$database_name);
+ if ($database_pass == "") {
+ passthru("pg_dump -v -Z9 -h".$database_host." -U".$database_user." -f".$filename.".gz ".$database_name);
+ } else {
+ $error = "Sorry, but since you use a password it is not possible to dump the database like this. Please manually run:\n".
+ "pg_dump -v -Z9 -h".$database_host." -U".$database_user." -f".$filename.".gz ".$database_name." from the shell and enter the password";
+ }
}
- echo "<p>". _BACKUPCREATED ." <a href=\"".$site_address."/data/".$filesmall."\">". _BACKUPDOWNLOAD .".</a></p>\n";
+ if ($error) {
+ echo "<p>". $error ."</p>\n";
+ } else {
+ echo "<p>". _BACKUPCREATED ." <a href=\"".$site_address."/data/".$filesmall."\">". _BACKUPDOWNLOAD .".</a></p>\n";
+ }
}
include("lib/footer.php");
?>
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.38 publicdnsadmin/docs/CHANGELOG:1.39
--- publicdnsadmin/docs/CHANGELOG:1.38 Fri Apr 23 00:52:38 2004
+++ publicdnsadmin/docs/CHANGELOG Fri Apr 23 01:53:28 2004
@@ -1,7 +1,13 @@
$Id:
OUTsider <out...@ke...> - 23/04/2004 - Fixed an issue in language handler, we shall use english by default
if no session is set.
+
+ - Fixed bug #918640. (Added password functionality the dirty but working way
+ Since postgres doesn't support passwords in pg_dump it won't work for them
+ they have to manually perform the command on console or learn how to
+ correctly setup host based auth.
SiRVulcaN <sir...@si...> - 21/09/2003 - Fixed a issue with 2 lines around the wrong way, caused ip
addresses not to display with PTR records.
+
- Changed version to 1.4-dev.
----------------------- End of diff -----------------------
|
|
From: Alexander M. <key...@us...> - 2004-04-23 07:52:55
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2004-04-23 07:52:48 UTC
Modified files:
docs/CHANGELOG lib/db.inc.php
Log message:
Author: Alexander Maassen <out...@ke...>
Log message: Use english if session language is not set for some reason.
---------------------- diff included ----------------------
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.37 publicdnsadmin/docs/CHANGELOG:1.38
--- publicdnsadmin/docs/CHANGELOG:1.37 Sat Sep 20 07:39:12 2003
+++ publicdnsadmin/docs/CHANGELOG Fri Apr 23 00:52:38 2004
@@ -1,4 +1,6 @@
$Id:
+OUTsider <out...@ke...> - 23/04/2004 - Fixed an issue in language handler, we shall use english by default
+ if no session is set.
SiRVulcaN <sir...@si...> - 21/09/2003 - Fixed a issue with 2 lines around the wrong way, caused ip
addresses not to display with PTR records.
Index: publicdnsadmin/lib/db.inc.php
diff -u publicdnsadmin/lib/db.inc.php:1.4 publicdnsadmin/lib/db.inc.php:1.5
--- publicdnsadmin/lib/db.inc.php:1.4 Wed Aug 13 05:14:14 2003
+++ publicdnsadmin/lib/db.inc.php Fri Apr 23 00:52:38 2004
@@ -7,7 +7,7 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: db.inc.php,v 1.4 2003/08/13 12:14:14 sirvulcan Exp $
+ $Id: db.inc.php,v 1.5 2004/04/23 07:52:38 key2peace Exp $
*/
function db_connect() {
@@ -17,7 +17,11 @@
$connection_string = "$database_type://$database_user:$database_pass@$database_host/$database_name";
$dbh =& DB::connect($connection_string);
if (DB::isError($dbh)) {
- require("language/lang-". $_SESSION["_LANGUAGE"] .".php");
+ if (!empty($_SESSION["_LANGUAGE"])) {
+ require("language/lang-". $_SESSION["_LANGUAGE"] .".php");
+ } else {
+ require("language/lang-english.php");
+ }
echo "<p>"._DBUNAVAIL."<br><b>".$dbh->getMessage()."</b></p>\n";
exit;
}
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2003-09-20 14:39:57
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2003-09-20 14:39:22 UTC
Modified files:
edit_zone.php docs/CHANGELOG docs/TODO lib/header.php
Log message:
Author: SiRVulcaN <sir...@si...>
Log message:
- Fixed a issue with 2 lines around the wrong way, caused ip addresses not to display with PTR records.
- Changed version to 1.4-dev.
---------------------- diff included ----------------------
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.36 publicdnsadmin/docs/CHANGELOG:1.37
--- publicdnsadmin/docs/CHANGELOG:1.36 Wed Aug 13 16:19:00 2003
+++ publicdnsadmin/docs/CHANGELOG Sat Sep 20 07:39:12 2003
@@ -1,23 +1,5 @@
$Id:
-SiRVulcaN <sir...@si...> - 23/07/2003 - SQL Tweak.
- - Released 1.2.
-OUTsider <out...@ke...> - 03/08/2003 - Using ISO standard dates in CHANGELOG
- (Let's agree that when a version gets release, we start with a fresh CHANGELOG)
- - Bumped DEV version to 1.3
- - Made suport links open in new window.
-OUTsider <out...@ke...> - 06/08/2003 - mysql does not support now()::abstime::int4,
- thus gfxcheck was likely to fail.
- - Fixed problem that some records/templates could not be updated
- or created using postgres. This was coz prio was empty.
-SiRVulcaN <sir...@si...> - 12/08/2003 - Disable prio field if a record type isnt MX.
- - Deny loading publicdnsadmin index.php if config and term files are missing.
- - Added index.html into the data dir to prevent the public from seeing the backups.
-OUTsider <out...@ke...> - 12/08/2003 - Modified index.html to redirect clients to mainpage
- - Copied index.html as index.php just in case.
- - Added index.(html|php) in images/docs/lib
-SiRVulcaN <sir...@si...> - 13/08/2003 - Fixed up some hardcoded addresses in signup.php and forgotten_pass.php
- - Added in first stage of multilanguage support.
- - Default selected language on the main login page is now $language.
-SiRVulcaN <sir...@si...> - 14/08/2003 - Second stage of multilanguage support added, fully works now.
- - Fixed a couple of missed translations.
+SiRVulcaN <sir...@si...> - 21/09/2003 - Fixed a issue with 2 lines around the wrong way, caused ip
+ addresses not to display with PTR records.
+ - Changed version to 1.4-dev.
Index: publicdnsadmin/docs/TODO
diff -u publicdnsadmin/docs/TODO:1.17 publicdnsadmin/docs/TODO:1.18
--- publicdnsadmin/docs/TODO:1.17 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/docs/TODO Sat Sep 20 07:39:12 2003
@@ -1,6 +1,5 @@
- Some sort of maintenence news system (displayed on the main login page).
- Syntax check records for validity to make it more fool proof.
-- Make the mouseoverthingie mozilla proof as well. (sucky on Firebird) (working fine still for me -sirv)
- poweradmin record validation dns.inc.php
- use a error code system
-- client_message(CODE, TYPE);
Index: publicdnsadmin/edit_zone.php
diff -u publicdnsadmin/edit_zone.php:1.6 publicdnsadmin/edit_zone.php:1.7
--- publicdnsadmin/edit_zone.php:1.6 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/edit_zone.php Sat Sep 20 07:39:12 2003
@@ -79,8 +79,8 @@
echo "<td bgcolor=\"$bgcolor\">".htmlentities($record["name"])."</td>\n";
}
} else {
- $dispaddy = $expaddy[3].".".$expaddy[2].".".$expaddy[1].".".$expaddy[0];
$expaddy = explode(".", htmlentities($record["name"]));
+ $dispaddy = $expaddy[3].".".$expaddy[2].".".$expaddy[1].".".$expaddy[0];
if ($record["type"] != "SOA") {
echo "<td bgcolor=\"$bgcolor\"><a href=\"edit_record.php?id=".$record["id"]."\">".$dispaddy."</a></td>\n";
} else {
Index: publicdnsadmin/lib/header.php
diff -u publicdnsadmin/lib/header.php:1.19 publicdnsadmin/lib/header.php:1.20
--- publicdnsadmin/lib/header.php:1.19 Wed Aug 13 05:14:14 2003
+++ publicdnsadmin/lib/header.php Sat Sep 20 07:39:12 2003
@@ -7,7 +7,7 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: header.php,v 1.19 2003/08/13 12:14:14 sirvulcan Exp $
+ $Id: header.php,v 1.20 2003/09/20 14:39:12 sirvulcan Exp $
*/
?>
@@ -103,7 +103,7 @@
<table><tr><td>
<img src="images/logo.gif"><br>
</td></tr><tr><td align="right">
- <font face="verdana" size=1>Public DNS Administrator v1.3</font>
+ <font face="verdana" size=1>Public DNS Administrator v1.4-dev</font>
</td></tr></table>
<?
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2003-08-13 23:43:03
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2003-08-13 23:19:10 UTC
Modified files:
edit_user.php users.php docs/CHANGELOG language/lang-english.php
lib/footer.php
Log message:
Author: SiRVulcaN <sir...@si...>
Log message:
- Fixed a couple of missed translations.
---------------------- diff included ----------------------
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.35 publicdnsadmin/docs/CHANGELOG:1.36
--- publicdnsadmin/docs/CHANGELOG:1.35 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/docs/CHANGELOG Wed Aug 13 16:19:00 2003
@@ -20,3 +20,4 @@
- Added in first stage of multilanguage support.
- Default selected language on the main login page is now $language.
SiRVulcaN <sir...@si...> - 14/08/2003 - Second stage of multilanguage support added, fully works now.
+ - Fixed a couple of missed translations.
Index: publicdnsadmin/edit_user.php
diff -u publicdnsadmin/edit_user.php:1.2 publicdnsadmin/edit_user.php:1.3
--- publicdnsadmin/edit_user.php:1.2 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/edit_user.php Wed Aug 13 16:19:00 2003
@@ -40,7 +40,7 @@
?>
<form action="update_user.php?id=<?php echo $userid; ?>" method="post">
-<p><b>Username:</b> <?php echo htmlentities($row["username"]); ?></p>
+<p><b><? echo _USERNAME; ?>:</b> <?php echo htmlentities($row["username"]); ?></p>
<table border="0" cellspacing="0" cellpadding="2">
<tr>
<? echo "<td><b>"._NAME.":</b></td>"; ?>
Index: publicdnsadmin/language/lang-english.php
diff -u publicdnsadmin/language/lang-english.php:1.2 publicdnsadmin/language/lang-english.php:1.3
--- publicdnsadmin/language/lang-english.php:1.2 Wed Aug 13 05:14:14 2003
+++ publicdnsadmin/language/lang-english.php Wed Aug 13 16:19:00 2003
@@ -217,6 +217,7 @@
define("_USERCREATED","The user was successfully created");
define("_TEMPLATECREATED","The template was successfully created");
define("_DOESNOTRESOLVE","does not resolve to");
+define("_POWEREDBY","Powered By");
define("_LICENSEDUNDER","Licensed Under");
define("_REPORTBUGS","Report Bugs To");
define("_DBUNAVAIL","Unable to connect to database");
Index: publicdnsadmin/lib/footer.php
diff -u publicdnsadmin/lib/footer.php:1.8 publicdnsadmin/lib/footer.php:1.9
--- publicdnsadmin/lib/footer.php:1.8 Wed Aug 13 05:14:14 2003
+++ publicdnsadmin/lib/footer.php Wed Aug 13 16:19:00 2003
@@ -7,7 +7,7 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: footer.php,v 1.8 2003/08/13 12:14:14 sirvulcan Exp $
+ $Id: footer.php,v 1.9 2003/08/13 23:19:00 sirvulcan Exp $
*/
?>
</td>
@@ -21,7 +21,7 @@
<table border="0" cellspacing="1" cellpadding="5" width="100%" height="5%">
<tr>
<td valign="top" class="menu" nowrap style="border-top: 1px solid #000000; border-left: 1px solid #000000;border-right: 1px solid #000000; border-bottom: 1px solid #000000;">
- Powered By <a href="http://www.sirvulcan.org/" target="_new">Public DNS Administrator</a>, <? echo _LICENSEDUNDER; ?> <a href="http://www.gnu.org" target="_new">GNU/GPL.</a> <? echo _REPORTBUGS; ?>:
+ <? echo _POWEREDBY; ?> <a href="http://www.sirvulcan.org/" target="_new">Public DNS Administrator</a>, <? echo _LICENSEDUNDER; ?> <a href="http://www.gnu.org" target="_new">GNU/GPL.</a> <? echo _REPORTBUGS; ?>:
<a href="http://sourceforge.net/tracker/?func=add&group_id=78804&atid=554506" target="_new">PublicDNSAdmin Bug Tracker</a>.
</td>
</tr>
Index: publicdnsadmin/users.php
diff -u publicdnsadmin/users.php:1.3 publicdnsadmin/users.php:1.4
--- publicdnsadmin/users.php:1.3 Wed Aug 13 05:14:13 2003
+++ publicdnsadmin/users.php Wed Aug 13 16:19:00 2003
@@ -23,7 +23,7 @@
$result = $dbh->query("SELECT * FROM users ORDER BY username");
if (!$dbh->isError($result) && $result->numRows()) {
- echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th>". _USERNAME ."</th><th>Name</th><th>". _EMAIL ."</th><th>". _COMPANY ."</th><th>". _DOMAINS ."</th><th></th></tr>\n";
+ echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th>". _USERNAME ."</th><th>". _NAME ."</th><th>". _EMAIL ."</th><th>". _COMPANY ."</th><th>". _DOMAINS ."</th><th></th></tr>\n";
$row_id = 0;
while ($row = $result->fetchRow()) {
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2003-08-13 12:15:34
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2003-08-13 12:14:24 UTC
Modified files:
create_record.php create_template.php create_template_record.php
create_user.php create_zone.php dbbackup.php
delete_multi_records.php delete_multi_t_records.php
delete_record.php delete_template.php delete_template_record.php
delete_user.php delete_zone.php edit_record.php edit_self.php
edit_template.php edit_template_record.php edit_user.php
edit_zone.php forgotten_pass.php gfx_code.php grant_access.php
index.php new_record.php new_template.php new_template_record.php
new_user.php new_zone.php revoke_user.php search.php
set_access.php signup.php stats.php templates.php terms.php
update_record.php update_self.php update_template.php
update_template_record.php update_user.php users.php whois.php
zone_access.php docs/CHANGELOG docs/TODO
language/lang-english.php lib/db.inc.php lib/footer.php
lib/header.php lib/permission.inc.php
Log message:
Author: SiRVulcaN <sir...@si...>
Log message:
- Multilanguage support completly finished, finally after 10hrs of work.
---------------------- diff included ----------------------
Index: publicdnsadmin/create_record.php
diff -u publicdnsadmin/create_record.php:1.5 publicdnsadmin/create_record.php:1.6
--- publicdnsadmin/create_record.php:1.5 Wed Aug 6 06:17:40 2003
+++ publicdnsadmin/create_record.php Wed Aug 13 05:14:13 2003
@@ -18,7 +18,7 @@
$zoneid = trim(addslashes($_GET["zone"]));
?>
-<h3>Edit domain » new record</h3>
+<h3><? echo _EDITDOMAIN; ?> » <? echo _NEWRECORD; ?></h3>
<?php
$dbh = db_connect();
@@ -38,7 +38,7 @@
$record = preg_replace("/\.+$/", "", $record); /* Remove trailing .'s */
if ($type != "NS" and $type != "MX" and $type != "A" and $type != "AAAA" and $type != "PTR" and $type != "CNAME" and $type != "TXT" and $type != "A6" and $type != "NS6" and $type != "MBOXFW" and $type != "URL" and $type != "RP" and $type != "HWINFO") {
- echo "<p class=\"error\">· Invalid pointer type: \"$type\"</p>\n";
+ echo "<p class=\"error\">· ". _INVALIDPOINTTYPE .": \"$type\"</p>\n";
} else {
if ($type == "MX") {
@@ -59,16 +59,16 @@
$expaddy = explode(".", $record);
$record = $expaddy[3].".".$expaddy[2].".".$expaddy[1].".".$expaddy[0].".in-addr.arpa";
} else {
- echo "<p class=\"error\">· $content does not resolve to $record</p>\n";
+ echo "<p class=\"error\">· $content ". _DOESNOTRESOLVE ." $record</p>\n";
$dbh->disconnect();
die();
}
}
if (!validateRecordContent($type, $content)) {
- echo "<p class=\"error\">· Invalid content for pointer type</p>\n";
+ echo "<p class=\"error\">· ". _INVALIDPOINTCONT ."</p>\n";
} elseif (!validateRecordData($type, $record)) {
- echo "<p class=\"error\">· Invalid record data for pointer type</p>\n";
+ echo "<p class=\"error\">· ". _INVALIDPOINTREC ."</p>\n";
} else {
if ($type == "PTR") {
@@ -83,7 +83,7 @@
$dbh->query("INSERT INTO records (domain_id, name, type, content, ttl, prio, change_date) VALUES($zoneid, '$record_name', '$type', '$content', '$ttl', '$prio', '".time()."')");
updateZoneSerial($zoneid);
- echo "<p>The record was added<br><a href=\"edit_zone.php?id=$zoneid\">Proceed »</a></p>\n";
+ echo "<p>". _RECWASADDED ."<br><a href=\"edit_zone.php?id=$zoneid\">". _PROCEED ." »</a></p>\n";
echo "<script language=\"JavaScript\">\n";
echo "document.location.href='edit_zone.php?id=$zoneid';\n";
echo "</script>\n";
@@ -93,11 +93,11 @@
}
} else {
- echo "<p class=\"error\">· You don't have permission to edit this domain</p>\n";
+ echo "<p class=\"error\">· ". _NOPERMSEDITDOM ."</p>\n";
}
} else {
- echo "<p class=\"error\">· Zone not found</p>\n";
+ echo "<p class=\"error\">· ". _ZONENOTFND ."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/create_template.php
diff -u publicdnsadmin/create_template.php:1.1.1.1 publicdnsadmin/create_template.php:1.2
--- publicdnsadmin/create_template.php:1.1.1.1 Wed Apr 16 00:19:03 2003
+++ publicdnsadmin/create_template.php Wed Aug 13 05:14:13 2003
@@ -14,23 +14,21 @@
if (userHasAccess($_SESSION["_UID"], "new_template")) {
-?>
-<h3>New template</h3>
-<?php
+ echo "<h3>"._NEWTEMPLATE."</h3>";
$name = trim(addslashes($_POST["name"]));
if ($name) {
$dbh = db_connect();
$result = $dbh->query("SELECT * FROM templates WHERE name = '$name'");
if (!$dbh->isError($result) && $result->numRows()) {
- echo "<p class=\"error\">· Another template with the same name already exists</p>\n";
+ echo "<p class=\"error\">· "._TEMPLATEEXISTS."</p>\n";
} else {
$templateid = createTemplate($name, $_SESSION["_UID"]);
- echo "<p>The template was successfully created. Click <a href=\"edit_template.php?id=$templateid\">here</a> to edit.</p>\n";
+ echo "<p>"._TEMPLATECREATED.". "._CLICK." <a href=\"edit_template.php?id=$templateid\">"._HERE."</a> "._TOEDIT.".</p>\n";
}
$dbh->disconnect();
} else {
- echo "<p class=\"error\">· No template name defined</p>\n";
+ echo "<p class=\"error\">· "._NOTEMPNAMEDEFINED."</p>\n";
}
} else {
Index: publicdnsadmin/create_template_record.php
diff -u publicdnsadmin/create_template_record.php:1.6 publicdnsadmin/create_template_record.php:1.7
--- publicdnsadmin/create_template_record.php:1.6 Wed Aug 6 06:17:40 2003
+++ publicdnsadmin/create_template_record.php Wed Aug 13 05:14:13 2003
@@ -18,7 +18,7 @@
$zoneid = trim(addslashes($_GET["zone"]));
?>
-<h3>Edit template » new record</h3>
+<h3><? echo _EDITTEMPLATE; ?> » <? echo _NEWRECORD; ?></h3>
<?php
$dbh = db_connect();
@@ -36,7 +36,7 @@
$record = preg_replace("/\.+$/", "", $record); /* Remove trailing .'s */
if ($type != "NS" and $type != "MX" and $type != "A" and $type != "AAAA" and $type != "PTR" and $type != "CNAME" and $type != "TXT" and $type != "A6" and $type != "NS6" and $type != "MBOXFW" and $type != "URL" and $type != "RP" and $type != "HWINFO") {
- echo "<p class=\"error\">· Invalid pointer type: \"$type\"</p>\n";
+ echo "<p class=\"error\">· "._INVALIDPOINTTYPE.": \"$type\"</p>\n";
} else {
if ($type == "MX") {
@@ -52,9 +52,9 @@
}
if (!validateTemRecordContent($type, $content, true)) {
- echo "<p class=\"error\">· Invalid content for pointer type</p>\n";
+ echo "<p class=\"error\">· "._INVALIDPOINTCONT."</p>\n";
} elseif (!validateRecordData($type, $record, true)) {
- echo "<p class=\"error\">· Invalid record data for pointer type</p>\n";
+ echo "<p class=\"error\">· "._INVALIDPOINTREC."</p>\n";
} else {
if ($type == "MBOXFW") {
@@ -64,7 +64,7 @@
}
$dbh->query("INSERT INTO template_records (template_id, name, type, content, ttl, prio) VALUES('$zoneid', '$record_name', '$type', '$content', '$ttl', '$prio')");
- echo "<p>The record was added<br><a href=\"edit_template.php?id=$zoneid\">Proceed »</a></p>\n";
+ echo "<p>"._RECWASADDED."<br><a href=\"edit_template.php?id=$zoneid\">"._PROCEED." »</a></p>\n";
echo "<script language=\"JavaScript\">\n";
echo "document.location.href='edit_template.php?id=$zoneid';\n";
echo "</script>\n";
@@ -74,7 +74,7 @@
}
} else {
- echo "<p class=\"error\">· Template not found</p>\n";
+ echo "<p class=\"error\">· "._TEMPLATENOTFND."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/create_user.php
diff -u publicdnsadmin/create_user.php:1.1.1.1 publicdnsadmin/create_user.php:1.2
--- publicdnsadmin/create_user.php:1.1.1.1 Wed Apr 16 00:19:03 2003
+++ publicdnsadmin/create_user.php Wed Aug 13 05:14:13 2003
@@ -15,7 +15,7 @@
if (userHasAccess($_SESSION["_UID"], "users")) {
?>
-<h3>User administration » new user</h3>
+<h3><? echo _USERADMIN; ?> » <? echo _NEWUSER; ?></h3>
<?php
$dbh = db_connect();
@@ -27,15 +27,15 @@
$pass_confirm = trim(addslashes($_POST["confirm_password"]));
if (!$username or !$name or !$email or !$pass) {
- echo "<p class=\"error\">· Some fields were missing. You must fill out the username, name, email and password-fields.</p>\n";
+ echo "<p class=\"error\">· "._FIELDSMISSINGFILL.".</p>\n";
} else {
if (!preg_match("/^[a-zA-Z\-]+$/", $username)) {
- echo "<p class=\"error\">· Invalid username. Can only contain characters a to z and dash</p>\n";
+ echo "<p class=\"error\">· "._INVUSERNAME."</p>\n";
} elseif (!preg_match("/^[a-zA-Z0-9\-_]+$/", $pass)) {
- echo "<p class=\"error\">· Invalid password. May only contain characters a to z, dash, and numbers.</p>\n";
+ echo "<p class=\"error\">· "._INVPASSWORD.".</p>\n";
} elseif ($pass != $pass_confirm) {
- echo "<p class=\"error\">· The passwords did not match.</p>\n";
+ echo "<p class=\"error\">· "._PASSWORDSDONTMATCH.".</p>\n";
} else {
$dbh = db_connect();
@@ -46,7 +46,7 @@
}
if (!$dbh->isError($result) && $result->numRows()) {
- echo "<p class=\"error\">· Username already exists</p>\n";
+ echo "<p class=\"error\">· "._USERNAMEXISTS."</p>\n";
} else {
$tmpres = $dbh->query("SELECT permission FROM users WHERE id = '".$_SESSION["_UID"]."'");
@@ -92,7 +92,7 @@
$md5_pass = md5($pass);
$dbh->query("INSERT INTO users (username, password, name, email, company, permission) VALUES('$username', '$md5_pass', '$name', '$email', '$company', '$permission_string')");
- echo "<p>The user was successfully created</p>\n";
+ echo "<p>"._USERCREATED."</p>\n";
}
Index: publicdnsadmin/create_zone.php
diff -u publicdnsadmin/create_zone.php:1.1.1.1 publicdnsadmin/create_zone.php:1.2
--- publicdnsadmin/create_zone.php:1.1.1.1 Wed Apr 16 00:19:03 2003
+++ publicdnsadmin/create_zone.php Wed Aug 13 05:14:13 2003
@@ -14,9 +14,7 @@
if (userHasAccess($_SESSION["_UID"], "new")) {
-?>
-<h3>New domain</h3>
-<?php
+ echo "<h3>"._NEWDOMAIN."</h3>";
if ($_GET["bulk"]) {
@@ -41,7 +39,7 @@
if (count($errors)) {
- echo "<p>One or more of the domains were invalid:<br>\n";
+ echo "<p>"._SOMEDOMAINSINVALID.":<br>\n";
foreach ($errors as $error) {
echo " · " . htmlspecialchars($error) . "<br>\n";
@@ -68,7 +66,7 @@
if (count($errors)) {
- echo "<p>The following domains already exists:<br>\n";
+ echo "<p>"._DOMAINEXISTS.":<br>\n";
foreach ($errors as $error) {
echo " ·" . htmlspecialchars($error) . "<br>\n";
@@ -78,7 +76,7 @@
} else {
- echo "<p>The following domains was added:<br>\n";
+ echo "<p>"._DOMAINSADDED.":<br>\n";
foreach ($domains as $domain) {
$domain = preg_replace("/(\r\n|\r|\n)$/", "", $domain);
@@ -92,7 +90,7 @@
} else {
- echo "<p class=\"error\">The specified template does not exist</p>\n";
+ echo "<p class=\"error\">"._TEMPLATEUNAVAIL."</p>\n";
}
@@ -100,7 +98,7 @@
} else {
- echo "<p>No domain names entered</p>\n";
+ echo "<p>"._NODOMAINS."</p>\n";
}
@@ -110,7 +108,7 @@
$template = trim(addslashes($_POST["template"]));
if (!$domain or (!preg_match("/^[a-zA-Z0-9-_]+\.[a-zA-Z0-9-_\.]{2,6}$/", $domain) and !preg_match("/^[0-9\.]+\.in-addr\.arpa$/", $domain) and !preg_match("/^[0-9\.]+\.ip6\.arpa$/", $domain) and !preg_match("/^[0-9\.]+\.ip6\.int$/", $domain))) {
- echo "<p class=\"error\">Missing or invalid domain name</p>\n";
+ echo "<p class=\"error\">"._MISSINGINVDOM."</p>\n";
} else {
$dbh = db_connect();
$result = $dbh->query("SELECT * FROM templates WHERE id = '$template'");
@@ -118,13 +116,13 @@
$result = $dbh->query("SELECT * FROM domains WHERE name = '$domain'");
if (!$dbh->isError($result) && $result->numRows()) {
- echo "<p class=\"error\">· A domain with the same name already exists</p>\n";
+ echo "<p class=\"error\">· ".DOMAINOWNEREXIST."</p>\n";
} else {
$zoneid = createZone($domain, $template, $_SESSION["_UID"]);
- echo "<p>The zone was successfully created. Click <a href=\"edit_zone.php?id=$zoneid\">here</a> to edit.</p>\n";
+ echo "<p>"._ZONECREATED." <a href=\"edit_zone.php?id=$zoneid\">"._HERE."</a> "._TOEDIT.".</p>\n";
}
} else {
- echo "<p class=\"error\">The specified template does not exist</p>\n";
+ echo "<p class=\"error\">"._TEMPLATEUNAVAIL."</p>\n";
}
}
Index: publicdnsadmin/dbbackup.php
diff -u publicdnsadmin/dbbackup.php:1.6 publicdnsadmin/dbbackup.php:1.7
--- publicdnsadmin/dbbackup.php:1.6 Wed Jul 16 05:32:44 2003
+++ publicdnsadmin/dbbackup.php Wed Aug 13 05:14:13 2003
@@ -26,7 +26,7 @@
passthru("pg_dump -v -Z9 -h".$database_host." -U".$database_user." -f".$filename.".gz ".$database_name);
}
- echo "<p>The backup was successfully created. Click <a href=\"".$site_address."/data/".$filesmall."\">here</a> to download.</p>\n";
+ echo "<p>". _BACKUPCREATED ." <a href=\"".$site_address."/data/".$filesmall."\">". _BACKUPDOWNLOAD .".</a></p>\n";
}
include("lib/footer.php");
?>
Index: publicdnsadmin/delete_multi_records.php
diff -u publicdnsadmin/delete_multi_records.php:1.2 publicdnsadmin/delete_multi_records.php:1.3
--- publicdnsadmin/delete_multi_records.php:1.2 Fri Jul 18 22:45:30 2003
+++ publicdnsadmin/delete_multi_records.php Wed Aug 13 05:14:13 2003
@@ -18,7 +18,7 @@
if (userHasAccess($_SESSION["_UID"], "edit")) {
?>
-<h3>Edit domain » delete multple records</h3>
+<h3><? echo _EDITDOMAIN; ?> » <? echo _DELMULTIRECORDS; ?></h3>
<?php
if ($recdel) {
@@ -33,22 +33,22 @@
$dbh->query("DELETE FROM records WHERE id = '$recordid'");
updateZoneSerial($row["domain_id"]);
} else {
- echo "<p class=\"error\">· You don't have permission to delete this record- ($recordid)</p>\n";
+ echo "<p class=\"error\">· "._NOPERMSDELREC."- ($recordid)</p>\n";
$error_occur = 1;
}
// Technically the above and below errors shouldnt happen, if they do it will be a very rare occasion. -sirvulcan
} else {
- echo "<p class=\"error\">· Zone/record not found ($recordid)</p>\n";
+ echo "<p class=\"error\">· "._ZONERECNOTFND." ($recordid)</p>\n";
$error_occur = 1;
}
}
if ($error_occur == 1) {
- echo "<p>Some records could not be deleted, please check make sure you have permission to access/delete them</p>";
- echo "<p>Some ";
+ echo "<p>"._ALLRECNOTDEL."</p>";
+ echo "<p>".Some." ";
} else {
- echo "<p>All ";
+ echo "<p>".All." ";
}
- echo "selected records were successfully deleted<br><a href=\"edit_zone.php?id=".$row["domain_id"]."\">Proceed»</a></p>\n";
+ echo ""._SELECTTEMPDEL."<br><a href=\"edit_zone.php?id=".$row["domain_id"]."\">"._PROCEED."»</a></p>\n";
if ($error_occur != 1) {
echo "<script language=\"JavaScript\">\n";
echo "document.location.href='edit_zone.php?id=".$row["domain_id"]."';\n";
Index: publicdnsadmin/delete_multi_t_records.php
diff -u publicdnsadmin/delete_multi_t_records.php:1.1 publicdnsadmin/delete_multi_t_records.php:1.2
--- publicdnsadmin/delete_multi_t_records.php:1.1 Fri Jul 18 22:45:30 2003
+++ publicdnsadmin/delete_multi_t_records.php Wed Aug 13 05:14:13 2003
@@ -18,7 +18,7 @@
if (userHasAccess($_SESSION["_UID"], "edit_template")) {
?>
-<h3>Edit template » delete multiple record</h3>
+<h3><? echo _EDITTEMPLATE; ?> » <? echo _DELMULTIRECORDS; ?></h3>
<?php
if ($recdel) {
@@ -31,17 +31,17 @@
$row = $result->fetchRow();
$dbh->query("DELETE FROM template_records WHERE id = '$recordid'");
} else {
- echo "<p class=\"error\">· Template/record not found- ($recordid)</p>\n";
+ echo "<p class=\"error\">· "._TEMPRECNOTFND."- ($recordid)</p>\n";
$error_occur = 1;
}
}
if ($error_occur == 1) {
- echo "<p>Some records could not be deleted, please check make sure you have permission to access/delete them</p>";
- echo "<p>Some ";
+ echo "<p>"._ALLRECNOTDEL."</p>";
+ echo "<p>"._SOME." ";
} else {
echo "<p>All ";
}
- echo "selected tempplate records were successfully deleted<br><a href=\"edit_template.php?id=".$row["id"]."\">Proceed»</a></p>\n";
+ echo ""._SELECTTEMPDEL."<br><a href=\"edit_template.php?id=".$row["id"]."\">"._PROCEED." »</a></p>\n";
if ($error_occur != 1) {
echo "<script language=\"JavaScript\">\n";
echo "document.location.href='edit_template.php?id=".$row["id"]."';\n";
Index: publicdnsadmin/delete_record.php
diff -u publicdnsadmin/delete_record.php:1.1.1.1 publicdnsadmin/delete_record.php:1.2
--- publicdnsadmin/delete_record.php:1.1.1.1 Wed Apr 16 00:19:03 2003
+++ publicdnsadmin/delete_record.php Wed Aug 13 05:14:13 2003
@@ -18,7 +18,7 @@
$recordid = trim(addslashes($_GET["id"]));
?>
-<h3>Edit domain » delete record</h3>
+<h3><? echo _EDITDOMAIN; ?> » <? echo _DELRECORD; ?></h3>
<?php
$dbh = db_connect();
@@ -32,7 +32,7 @@
$dbh->query("DELETE FROM records WHERE id = '$recordid'");
updateZoneSerial($row["domain_id"]);
- echo "<p>The record was successfully deleted<br><a href=\"edit_zone.php?id=".$row["domain_id"]."\">Proceed »</a></p>\n";
+ echo "<p>"._RECSUCESDEL."<br><a href=\"edit_zone.php?id=".$row["domain_id"]."\">"._PROCEED." »</a></p>\n";
echo "<script language=\"JavaScript\">\n";
echo "document.location.href='edit_zone.php?id=".$row["domain_id"]."';\n";
echo "</script>\n";
@@ -44,17 +44,17 @@
$record_data .= htmlentities($row["prio"] . " ");
}
$record_data .= htmlentities($row["content"]);
- echo "<p>Are you sure you wish to delete the record \"$record_data\"?</p>\n";
- echo "<p><input type=\"button\" value=\"Yes\" onClick=\"javascript:document.location.href='delete_record.php?id=$recordid&confirm=1';\"> <input type=\"button\" value=\"No\" onClick=\"javascript:history.go(-1);\"></p>\n";
+ echo "<p>"._WISHTODELTHISREC." \"$record_data\"?</p>\n";
+ echo "<p><input type=\"button\" value=\""._YES."\" onClick=\"javascript:document.location.href='delete_record.php?id=$recordid&confirm=1';\"> <input type=\"button\" value=\""._NO."\" onClick=\"javascript:history.go(-1);\"></p>\n";
}
} else {
- echo "<p class=\"error\">· You don't have permission to delete this record</p>\n";
+ echo "<p class=\"error\">· "._NOPERMSDELREC."</p>\n";
}
} else {
- echo "<p class=\"error\">· Zone/record not found</p>\n";
+ echo "<p class=\"error\">· "._ZONERECNOTFND."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/delete_template.php
diff -u publicdnsadmin/delete_template.php:1.1.1.1 publicdnsadmin/delete_template.php:1.2
--- publicdnsadmin/delete_template.php:1.1.1.1 Wed Apr 16 00:19:03 2003
+++ publicdnsadmin/delete_template.php Wed Aug 13 05:14:13 2003
@@ -17,9 +17,7 @@
$perms = getUserPermissions($_SESSION["_UID"]);
$zoneid = trim(addslashes($_GET["id"]));
-?>
-<h3>Delete template</h3>
-<?php
+ echo "<h3>". _DELTEMPLATE ."</h3>";
$dbh = db_connect();
$result = $dbh->query("SELECT * FROM templates WHERE id = '$zoneid'");
@@ -31,15 +29,15 @@
$dbh->query("DELETE FROM templates WHERE id = '$zoneid'");
$dbh->query("DELETE FROM template_records WHERE template_id = '$zoneid'");
- echo "<p>The template \"".htmlentities($row["name"])."\" and all records was successfully deleted</p>\n";
+ echo "<p>". _THETEMPLATE ." \"".htmlentities($row["name"])."\" ". _ALLRECDEL ."</p>\n";
} else {
- echo "<p>Are you sure you wish to delete the template \"".htmlentities($row["name"])."\"?</p>\n";
- echo "<p><input type=\"button\" value=\"Yes\" onClick=\"javascript:document.location.href='delete_template.php?id=$zoneid&confirm=1';\"> <input type=\"button\" value=\"No\" onClick=\"javascript:history.go(-1);\"></p>\n";
+ echo "<p>". _WISHTODELTEMPLATE ." \"".htmlentities($row["name"])."\"?</p>\n";
+ echo "<p><input type=\"button\" value=\"". _YES ."\" onClick=\"javascript:document.location.href='delete_template.php?id=$zoneid&confirm=1';\"> <input type=\"button\" value=\"". _NO ."\" onClick=\"javascript:history.go(-1);\"></p>\n";
}
} else {
- echo "<p class=\"error\">· Template not found</p>\n";
+ echo "<p class=\"error\">· ". _TEMPLATENOTFND ."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/delete_template_record.php
diff -u publicdnsadmin/delete_template_record.php:1.1.1.1 publicdnsadmin/delete_template_record.php:1.2
--- publicdnsadmin/delete_template_record.php:1.1.1.1 Wed Apr 16 00:19:04 2003
+++ publicdnsadmin/delete_template_record.php Wed Aug 13 05:14:13 2003
@@ -18,7 +18,7 @@
$recordid = trim(addslashes($_GET["id"]));
?>
-<h3>Edit template » delete record</h3>
+<h3><? echo _EDITTEMPLATE; ?> » <? echo _DELRECORD; ?></h3>
<?php
$dbh = db_connect();
@@ -29,7 +29,7 @@
if ($_GET["confirm"]) {
$dbh->query("DELETE FROM template_records WHERE id = '$recordid'");
- echo "<p>The record was successfully deleted<br><a href=\"edit_template.php?id=".$row["id"]."\">Proceed »</a></p>\n";
+ echo "<p>". _RECSUCESDEL ."<br><a href=\"edit_template.php?id=".$row["id"]."\">". _PROCEED ." »</a></p>\n";
echo "<script language=\"JavaScript\">\n";
echo "document.location.href='edit_template.php?id=".$row["id"]."';\n";
echo "</script>\n";
@@ -41,13 +41,13 @@
$record_data .= htmlentities($row["prio"] . " ");
}
$record_data .= htmlentities($row["content"]);
- echo "<p>Are you sure you wish to delete the record \"$record_data\"?</p>\n";
- echo "<p><input type=\"button\" value=\"Yes\" onClick=\"javascript:document.location.href='delete_template_record.php?id=$recordid&confirm=1';\"> <input type=\"button\" value=\"No\" onClick=\"javascript:history.go(-1);\"></p>\n";
+ echo "<p>". _WISHTODELTHISREC ." \"$record_data\"?</p>\n";
+ echo "<p><input type=\"button\" value=\"". _YES ."\" onClick=\"javascript:document.location.href='delete_template_record.php?id=$recordid&confirm=1';\"> <input type=\"button\" value=\"". _NO ."\" onClick=\"javascript:history.go(-1);\"></p>\n";
}
} else {
- echo "<p class=\"error\">· Template/record not found</p>\n";
+ echo "<p class=\"error\">· ". _TEMPRECNOTFND ."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/delete_user.php
diff -u publicdnsadmin/delete_user.php:1.1 publicdnsadmin/delete_user.php:1.2
--- publicdnsadmin/delete_user.php:1.1 Fri Jun 13 08:19:11 2003
+++ publicdnsadmin/delete_user.php Wed Aug 13 05:14:13 2003
@@ -23,16 +23,15 @@
$urow = $getuser->fetchRow();
$username = $urow["username"];
} else {
- echo "<h3>Delete user</h3>";
- echo "<p>Fatal Error, User Does Not Exist Most Likely</p>";
+ echo "<h3>"._DELETEUSER."</h3>";
+ echo "<p>"._FTUSERDONTEXIST."</p>";
$dbh->disconnect();
require("lib/footer.php");
die();
}
-?>
-<h3>Delete user</h3>
-<?php
+ echo "<h3>"._DELETEUSER."</h3>";
+
if ($_GET["confirm"]) {
$result = $dbh->query("SELECT user_id, domain_id FROM domain_owners WHERE user_id = '$id'");
@@ -53,10 +52,10 @@
}
$dbh->query("DELETE FROM users WHERE id = '$id'");
- echo "<p>$username and all their domains/records were successfully deleted</p>\n";
+ echo "<p>$username "._ANDALLDOMRECDEL."</p>\n";
} else {
- echo "<p>Are you sure you wish to delete $username?</p>\n";
- echo "<p><input type=\"button\" value=\"Yes\" onClick=\"javascript:document.location.href='delete_user.php?id=$userid&confirm=1';\"> <input type=\"button\" value=\"No\" onClick=\"javascript:history.go(-1);\"></p>\n";
+ echo "<p>"._WISHTODEL." $username?</p>\n";
+ echo "<p><input type=\"button\" value=\""._YES."\" onClick=\"javascript:document.location.href='delete_user.php?id=$userid&confirm=1';\"> <input type=\"button\" value=\""._NO."\" onClick=\"javascript:history.go(-1);\"></p>\n";
}
Index: publicdnsadmin/delete_zone.php
diff -u publicdnsadmin/delete_zone.php:1.1.1.1 publicdnsadmin/delete_zone.php:1.2
--- publicdnsadmin/delete_zone.php:1.1.1.1 Wed Apr 16 00:19:04 2003
+++ publicdnsadmin/delete_zone.php Wed Aug 13 05:14:13 2003
@@ -17,9 +17,7 @@
$perms = getUserPermissions($_SESSION["_UID"]);
$zoneid = trim(addslashes($_GET["id"]));
-?>
-<h3>Delete domain</h3>
-<?php
+ echo "<h3>"._DELDOMAIN."</h3>";
$dbh = db_connect();
$result = $dbh->query("SELECT domain_owners.user_id, domains.name FROM domains, domain_owners WHERE domain_owners.domain_id = '$zoneid' AND domains.id = domain_owners.domain_id");
@@ -33,19 +31,19 @@
$dbh->query("DELETE FROM domains WHERE id = '$zoneid'");
$dbh->query("DELETE FROM domain_owners WHERE domain_id = '$zoneid'");
$dbh->query("DELETE FROM records WHERE domain_id = '$zoneid'");
- echo "<p>The domain \"".htmlentities($row["name"])."\" and all records was successfully deleted</p>\n";
+ echo "<p>"._THEDOMAIN." \"".htmlentities($row["name"])."\" "._ANDALLRECSDEL."</p>\n";
} else {
- echo "<p>Are you sure you wish to delete the domain \"".htmlentities($row["name"])."\"?</p>\n";
- echo "<p><input type=\"button\" value=\"Yes\" onClick=\"javascript:document.location.href='delete_zone.php?id=$zoneid&confirm=1';\"> <input type=\"button\" value=\"No\" onClick=\"javascript:history.go(-1);\"></p>\n";
+ echo "<p>"._WISHTODELTHEDOM." \"".htmlentities($row["name"])."\"?</p>\n";
+ echo "<p><input type=\"button\" value=\""._YES."\" onClick=\"javascript:document.location.href='delete_zone.php?id=$zoneid&confirm=1';\"> <input type=\"button\" value=\""._NO."\" onClick=\"javascript:history.go(-1);\"></p>\n";
}
} else {
- echo "<p class=\"error\">· You don't have permission to delete this domain</p>\n";
+ echo "<p class=\"error\">· "._NOPERMSDOMAIN."</p>\n";
}
} else {
- echo "<p class=\"error\">· Zone not found</p>\n";
+ echo "<p class=\"error\">· "._ZONENOTFND."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.34 publicdnsadmin/docs/CHANGELOG:1.35
--- publicdnsadmin/docs/CHANGELOG:1.34 Tue Aug 12 19:56:57 2003
+++ publicdnsadmin/docs/CHANGELOG Wed Aug 13 05:14:13 2003
@@ -19,3 +19,4 @@
SiRVulcaN <sir...@si...> - 13/08/2003 - Fixed up some hardcoded addresses in signup.php and forgotten_pass.php
- Added in first stage of multilanguage support.
- Default selected language on the main login page is now $language.
+SiRVulcaN <sir...@si...> - 14/08/2003 - Second stage of multilanguage support added, fully works now.
Index: publicdnsadmin/docs/TODO
diff -u publicdnsadmin/docs/TODO:1.16 publicdnsadmin/docs/TODO:1.17
--- publicdnsadmin/docs/TODO:1.16 Tue Aug 12 19:47:13 2003
+++ publicdnsadmin/docs/TODO Wed Aug 13 05:14:13 2003
@@ -6,7 +6,4 @@
-- client_message(CODE, TYPE);
- ERR_TYPE, ie ERR_INVPASS (invalid pass)
- TYPE as in "general", "error", "critical" etc, each type has diff types of output styles
-- multilanguage, use a code based system like the error codes which read off a file, lang.XX.php, then combine errors into the language file
- > First Stage Complete.
- - Adjust all files to use _VARS from the language files instead of the sentences/words.
- install.php - databases + configuration
Index: publicdnsadmin/edit_record.php
diff -u publicdnsadmin/edit_record.php:1.7 publicdnsadmin/edit_record.php:1.8
--- publicdnsadmin/edit_record.php:1.7 Tue Aug 12 02:06:51 2003
+++ publicdnsadmin/edit_record.php Wed Aug 13 05:14:13 2003
@@ -19,7 +19,7 @@
$zoneid = getZoneFromRecord($recordid);
?>
-<h3>Edit domain » edit record</h3>
+<h3><? echo _EDITDOMAIN; ?> » <? echo _EDITRECORD; ?></h3>
<?php
$dbh = db_connect();
@@ -41,7 +41,7 @@
<form action="update_record.php?id=<?php echo $recordid; ?>" method="post" name="recform">
<table border="0" cellspacing="0" cellpadding="2">
<tr>
- <td><b>Record:</b></td>
+ <? echo "<td><b>"._RECORD.":</b></td>"; ?>
<?
if ($row["type"] != "PTR") {
if ($row["type"] == "MBOXFW") {
@@ -61,7 +61,7 @@
?>
</tr>
<tr>
- <td><b>Type:</b></td>
+ <? echo "<td><b>"._TYPE.":</b></td>"; ?>
<td><select name="type" onChange="changeText(this.form.type)">
<option value="NS"<?php if ($row["type"] == "NS") { ?> selected<?php } ?>>NS</option>
<option value="NS6"<?php if ($row["type"] == "NS6") { ?> selected<?php } ?>>NS6</option>
@@ -79,7 +79,7 @@
</select></td>
</tr>
<tr>
- <td><b>Prio:</b></td>
+ <? echo "<td><b>"._PRIO.":</b></td>"; ?>
<? if ($row["type"] != "MX") { ?>
<td><input type="text" name="prio" disabled="true" size="5" maxlength="11" value="<?php if ($row["prio"]) { echo htmlentities($row["prio"]); } ?>"></td>
<? } else { ?>
@@ -87,26 +87,26 @@
<? } ?>
</tr>
<tr>
- <td><b>Content:</b></td>
+ <? echo "<td><b>"._CONTENT.":</b></td>"; ?>
<td><input type="text" name="content" size="15" maxlength="255" value="<?php echo htmlentities($row["content"]); ?>"></td>
</tr>
<tr>
- <td><b>TTL:</b></td>
+ <? echo "<td><b>"._TTL.":</b></td>"; ?>
<td><input type="text" name="ttl" size="5" maxlength="11" value="<?php echo $row["ttl"]; ?>"></td>
</tr>
<tr>
- <td colspan="2" align="right"><input type="submit" value="Update"></td>
+ <td colspan="2" align="right"><input type="submit" value="<? echo _UPDATE; ?>"></td>
</tr>
</table>
</form>
<?php
} else {
- echo "<p class=\"error\">· You don't have permission to edit this domain</p>\n";
+ echo "<p class=\"error\">· "._NOPERMSEDITDOM."</p>\n";
}
} else {
- echo "<p class=\"error\">· Zone/record not found</p>\n";
+ echo "<p class=\"error\">· "._ZONERECNOTFND."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/edit_self.php
diff -u publicdnsadmin/edit_self.php:1.1.1.1 publicdnsadmin/edit_self.php:1.2
--- publicdnsadmin/edit_self.php:1.1.1.1 Wed Apr 16 00:19:04 2003
+++ publicdnsadmin/edit_self.php Wed Aug 13 05:14:13 2003
@@ -13,9 +13,7 @@
require("lib/header.php");
-?>
-<h3>Edit Settings</h3>
-<?php
+ echo "<h3>"._EDITSETTINGS."</h3>";
$dbh = db_connect();
$userid = trim(addslashes($_SESSION["_UID"]));
@@ -28,40 +26,40 @@
<table border="0" cellspacing="0" cellpadding="2">
<tr>
- <td><b>Username:</b></td>
+ <? echo "<td><b>"._USERNAME.":</b></td>"; ?>
<td><?php echo htmlentities($row["username"]);?></rd>
</tr>
<tr>
<td colspan="2" height="15"> </td>
</tr>
<tr>
- <td><b>Name:</b></td>
+ <? echo "<td><b>"._NAME.":</b></td>"; ?>
<td><input type="text" name="name" size="20" maxlength="255" value="<?php echo htmlentities($row["name"]); ?>"></td>
</tr>
<tr>
- <td><b>E-mail:</b></td>
+ <? echo "<td><b>"._EMAIL.":</b></td>"; ?>
<td><input type="text" name="email" size="20" maxlength="255" value="<?php echo htmlentities($row["email"]); ?>"></td>
</tr>
<tr>
- <td><b>Company:</b></td>
+ <? echo "<td><b>"._COMPANY.":</b></td>"; ?>
<td><input type="text" name="company" size="20" maxlength="255" value="<?php echo htmlentities($row["company"]); ?>"></td>
</tr>
<tr>
<td colspan="2" height="15"> </td>
</tr>
<tr>
- <td colspan="2">Only type anything here if you want to<br>change password</td>
+ <? echo "<td colspan=\"2\">"._TYPEIFNEED."<br>"._CHGPASS."</td>"; ?>
</tr>
<tr>
- <td><b>Password:</b></td>
+ <? echo "<td><b>"._PASSWORD.":</b></td>"; ?>
<td><input type="password" name="password" size="20" maxlength="25" value=""></td>
</tr>
<tr>
- <td nowrap><b>Confirm password:</b></td>
+ <? echo "<td nowrap><b>"._CONFIRMPASSWORD.":</b></td>"; ?>
<td><input type="password" name="confirm_password" size="20" maxlength="25" value=""></td>
</tr>
<tr>
- <td colspan="2" align="right"><input type="submit" value="Update"></td>
+ <td colspan="2" align="right"><input type="submit" value="<? echo _UPDATE; ?>"></td>
</tr>
</table>
</form>
Index: publicdnsadmin/edit_template.php
diff -u publicdnsadmin/edit_template.php:1.5 publicdnsadmin/edit_template.php:1.6
--- publicdnsadmin/edit_template.php:1.5 Sat Jul 19 06:46:31 2003
+++ publicdnsadmin/edit_template.php Wed Aug 13 05:14:13 2003
@@ -17,9 +17,7 @@
$perms = getUserPermissions($_SESSION["_UID"]);
$zoneid = trim(addslashes($_GET["id"]));
-?>
-<h3>Edit template</h3>
-<?php
+ echo "<h3>"._EDITTEMPLATE."</h3>";
$dbh = db_connect();
$result = $dbh->query("SELECT * FROM templates WHERE id = '$zoneid'");
@@ -29,17 +27,17 @@
echo "<form action=\"update_template.php?id=$zoneid\" method=\"post\">\n";
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"2\">\n";
echo "<tr>\n";
- echo "<td><b>Template name:</b></td>\n";
+ echo "<td><b>"._TEMPLATENAME.":</b></td>\n";
echo "<td><input type=\"text\" name=\"name\" size=\"15\" maxlength=\"255\" value=\"".htmlentities($row["name"])."\"></td>\n";
echo "</tr>\n";
echo "<tr>\n";
- echo "<td colspan=\"2\" align=\"right\"><input type=\"submit\" value=\"Update\"></td>\n";
+ echo "<td colspan=\"2\" align=\"right\"><input type=\"submit\" value=\""._UPDATE."\"></td>\n";
echo "</tr>\n";
echo "</table>\n";
echo "</form>\n";
- echo "<p>· <a href=\"new_template_record.php?zone=$zoneid\">New record</a></p>\n";
+ echo "<p>· <a href=\"new_template_record.php?zone=$zoneid\">"._NEWRECORDUP."</a></p>\n";
echo "<form action=\"delete_multi_t_records.php\" name=\"recdelform\" method=\"post\">\n";
- echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th><input type=\"submit\" value=\"Del\" disabled=\"true\" name=\"delbut\"></th><th>Record</th><th>Type</th><th>Content</th><th>Priority</th><th>TTL</th><th> </th></tr>\n";
+ echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th><input type=\"submit\" value=\""._DEL."\" disabled=\"true\" name=\"delbut\"></th><th>"._RECORD."</th><th>"._TYPE."</th><th>"._CONTENT."</th><th>"._PRIORITY."</th><th>"._TTL."</th><th> </th></tr>\n";
$row_id = 0;
$row_c = -1;
@@ -76,7 +74,7 @@
echo "<td bgcolor=\"$bgcolor\" align=\"right\">$priority</td>\n";
echo "<td bgcolor=\"$bgcolor\" align=\"right\">".htmlentities($rec_row["ttl"])."</td>\n";
- echo "<td bgcolor=\"$bgcolor\"><a href=\"edit_template_record.php?id=".$rec_row["id"]."\"><img src=\"images/edit.png\" alt=\"Edit record\" border=\"0\"></a> <a href=\"delete_template_record.php?id=".$rec_row["id"]."\"><img src=\"images/trash.png\" alt=\"Delete record\" border=\"0\"></a></td>\n";
+ echo "<td bgcolor=\"$bgcolor\"><a href=\"edit_template_record.php?id=".$rec_row["id"]."\"><img src=\"images/edit.png\" alt=\""._EDITRECORD."\" border=\"0\"></a> <a href=\"delete_template_record.php?id=".$rec_row["id"]."\"><img src=\"images/trash.png\" alt=\""._DELRECORD."\" border=\"0\"></a></td>\n";
echo "</tr>\n";
if ($row_id == 2) { $row_id = 0; }
@@ -87,7 +85,7 @@
echo "</table></td></tr></table></form>\n";
} else {
- echo "<p class=\"error\">· Template not found</p>\n";
+ echo "<p class=\"error\">· "._TEMPLATENOTFND."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/edit_template_record.php
diff -u publicdnsadmin/edit_template_record.php:1.5 publicdnsadmin/edit_template_record.php:1.6
--- publicdnsadmin/edit_template_record.php:1.5 Tue Aug 12 02:06:52 2003
+++ publicdnsadmin/edit_template_record.php Wed Aug 13 05:14:13 2003
@@ -18,7 +18,7 @@
$recordid = trim(addslashes($_GET["id"]));
?>
-<h3>Edit template » edit record</h3>
+<h3><? echo _EDITTEMPLATE; ?> » <? echo _EDITRECORD; ?></h3>
<?php
$dbh = db_connect();
@@ -36,7 +36,7 @@
<form action="update_template_record.php?id=<?php echo $recordid; ?>" method="post" name="recform">
<table border="0" cellspacing="0" cellpadding="2">
<tr>
- <td><b>Record:</b></td>
+<? echo "<td><b>"._RECORD.":</b></td>"; ?>
<? if ($row["type"] == "MBOXFW") { ?>
<td><input type="text" name="record" size="15" maxlength="200" value="<?php echo htmlentities($record_name); ?>"><DIV ID="seperator"><div class="seperator">@</div></div><div class="domain">$DOMAIN</div></td>
<? } else { ?>
@@ -44,7 +44,7 @@
<? } ?>
</tr>
<tr>
- <td><b>Type:</b></td>
+ <? echo "<td><b>"._TYPE.":</b></td>"; ?>
<td><select name="type" onChange="changeText(this.form.type)">
<option value="NS"<?php if ($row["type"] == "NS") { ?> selected<?php } ?>>NS</option>
<option value="NS6"<?php if ($row["type"] == "NS6") { ?> selected<?php } ?>>NS6</option>
@@ -62,7 +62,7 @@
</select></td>
</tr>
<tr>
- <td><b>Prio:</b></td>
+ <? echo "<td><b>"._PRIO.":</b></td>"; ?>
<? if ($row["type"] != "MX") { ?>
<td><input type="text" name="prio" disabled="true" size="5" maxlength="11" value="<?php if ($row["prio"]) { echo htmlentities($row["prio"]); } ?>"></td>
<? } else { ?>
@@ -70,22 +70,22 @@
<? } ?>
</tr>
<tr>
- <td><b>Content:</b></td>
+ <? echo "<td><b>"._CONTENT.":</b></td>"; ?>
<td><input type="text" name="content" size="15" maxlength="255" value="<?php echo htmlentities($row["content"]); ?>"></td>
</tr>
<tr>
- <td><b>TTL:</b></td>
+ <? echo "<td><b>"._TTL.":</b></td>"; ?>
<td><input type="text" name="ttl" size="5" maxlength="11" value="<?php echo $row["ttl"]; ?>"></td>
</tr>
<tr>
- <td colspan="2" align="right"><input type="submit" value="Update"></td>
+ <td colspan="2" align="right"><input type="submit" value="<? echo _UPDATE; ?>"></td>
</tr>
</table>
</form>
<?php
} else {
- echo "<p class=\"error\">· Template/record not found</p>\n";
+ echo "<p class=\"error\">· "._TEMPRECNOTFND."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/edit_user.php
diff -u publicdnsadmin/edit_user.php:1.1.1.1 publicdnsadmin/edit_user.php:1.2
--- publicdnsadmin/edit_user.php:1.1.1.1 Wed Apr 16 00:19:04 2003
+++ publicdnsadmin/edit_user.php Wed Aug 13 05:14:13 2003
@@ -15,7 +15,7 @@
if (userHasAccess($_SESSION["_UID"], "users")) {
?>
-<h3>User administration » edit user</h3>
+<h3><? echo _USERADMIN; ?> » <? echo _EDITUSER; ?></h3>
<?php
$dbh = db_connect();
@@ -33,7 +33,7 @@
}
if ($row["permission"] == 2 and $permission != 2) {
- echo "<p class=\"error\">· You don't have the permission to edit a superuser</p>\n";
+ echo "<p class=\"error\">· "._CANTEDITASUPERUSER."</p>\n";
} else {
$perm = getUserPermissions($userid);
@@ -43,53 +43,55 @@
<p><b>Username:</b> <?php echo htmlentities($row["username"]); ?></p>
<table border="0" cellspacing="0" cellpadding="2">
<tr>
- <td><b>Name:</b></td>
+ <? echo "<td><b>"._NAME.":</b></td>"; ?>
<td><input type="text" name="name" size="20" maxlength="255" value="<?php echo htmlentities($row["name"]); ?>"></td>
</tr>
<tr>
- <td><b>E-mail:</b></td>
+ <? echo "<td><b>"._EMAIL.":</b></td>"; ?>
<td><input type="text" name="email" size="20" maxlength="255" value="<?php echo htmlentities($row["email"]); ?>"></td>
</tr>
<tr>
- <td><b>Company:</b></td>
+ <? echo "<td><b>"._COMPANY.":</b></td>"; ?>
<td><input type="text" name="company" size="20" maxlength="255" value="<?php echo htmlentities($row["company"]); ?>"></td>
</tr>
<tr>
<td colspan="2" height="15"> </td>
</tr>
<tr>
- <td colspan="2"><b>Permissions</b></td>
+ <? echo "<td colspan=\"2\"><b>"._PERMISSIONS."</b></td>"; ?>
</tr>
<tr>
<td colspan="2">
- <?php if ($permission == 2) { ?><input type="checkbox" name="perm_superuser" value="1"<?php if ($perm["raw"] == 2) { ?> checked<?php } ?>> Superuser<br>
- <input type="checkbox" name="perm_users" value="1"<?php if ($perm["users"]) { ?> checked<?php } ?>> User administration<br><br><?php } ?>
- <input type="checkbox" name="perm_new" value="1"<?php if ($perm["new"]) { ?> checked<?php } ?>> New domains<br>
- <input type="checkbox" name="perm_new_template" value="1"<?php if ($perm["new_template"]) { ?> checked<?php } ?>> New templates<br>
- <input type="checkbox" name="perm_edit_own" value="1"<?php if ($perm["edit_own"]) { ?> checked<?php } ?>> Edit own domains<br>
- <input type="checkbox" name="perm_edit_other" value="1"<?php if ($perm["edit_other"]) { ?> checked<?php } ?>> Edit other domains<br>
- <input type="checkbox" name="perm_edit_template" value="1"<?php if ($perm["edit_template"]) { ?> checked<?php } ?>> Edit templates<br>
- <input type="checkbox" name="perm_delete_own" value="1"<?php if ($perm["delete_own"]) { ?> checked<?php } ?>> Delete own domains<br>
- <input type="checkbox" name="perm_delete_other" value="1"<?php if ($perm["delete_other"]) { ?> checked<?php } ?>> Delete other domains<br>
- <input type="checkbox" name="perm_delete_template" value="1"<?php if ($perm["delete_template"]) { ?> checked<?php } ?>> Delete templates
+ <?php if ($permission == 2) { ?>
+ <input type="checkbox" name="perm_superuser" value="1"<?php if ($perm["raw"] == 2) { ?> checked<?php } ?>> <? echo _SUPERUSER; ?><br>
+ <input type="checkbox" name="perm_users" value="1"<?php if ($perm["users"]) { ?> checked<?php } ?>> <? echo _USERADMIN; ?><br><br>
+ <?php } ?>
+ <input type="checkbox" name="perm_new" value="1"<?php if ($perm["new"]) { ?> checked<?php } ?>> <? echo _NEWDOMAINS; ?><br>
+ <input type="checkbox" name="perm_new_template" value="1"<?php if ($perm["new_template"]) { ?> checked<?php } ?>> <? echo _NEWTEMPLATES; ?><br>
+ <input type="checkbox" name="perm_edit_own" value="1"<?php if ($perm["edit_own"]) { ?> checked<?php } ?>> <? echo _EDITOWNDOMS; ?><br>
+ <input type="checkbox" name="perm_edit_other" value="1"<?php if ($perm["edit_other"]) { ?> checked<?php } ?>> <? echo _EDITOTHERDOMS; ?><br>
+ <input type="checkbox" name="perm_edit_template" value="1"<?php if ($perm["edit_template"]) { ?> checked<?php } ?>> <? echo _EDITTEMPS; ?><br>
+ <input type="checkbox" name="perm_delete_own" value="1"<?php if ($perm["delete_own"]) { ?> checked<?php } ?>> <? echo _DELOWNDOMS; ?><br>
+ <input type="checkbox" name="perm_delete_other" value="1"<?php if ($perm["delete_other"]) { ?> checked<?php } ?>> <? echo _DELOTHERDOMS; ?><br>
+ <input type="checkbox" name="perm_delete_template" value="1"<?php if ($perm["delete_template"]) { ?> checked<?php } ?>> <? echo _DELTEMPS; ?>
</td>
</tr>
<tr>
<td colspan="2" height="15"> </td>
</tr>
<tr>
- <td colspan="2">Only type anything here if you want to<br>change password</td>
+ <td colspan="2"><? echo _TYPEIFNEED; ?><br><? echo _CHGPASS; ?></td>
</tr>
<tr>
- <td><b>Password:</b></td>
+ <? echo "<td><b>"._PASSWORD.":</b></td>"; ?>
<td><input type="password" name="password" size="20" maxlength="25" value=""></td>
</tr>
<tr>
- <td nowrap><b>Confirm password:</b></td>
+ <? echo "<td nowrap><b>"._CONFIRMPASSWORD.":</b></td>"; ?>
<td><input type="password" name="confirm_password" size="20" maxlength="25" value=""></td>
</tr>
<tr>
- <td colspan="2" align="right"><input type="submit" value="Update"></td>
+ <td colspan="2" align="right"><input type="submit" value="<? echo _UPDATE; ?>"></td>
</tr>
</table>
</form>
@@ -98,7 +100,7 @@
}
} else {
- echo "<p class=\"error\">· User not found</p>\n";
+ echo "<p class=\"error\">· "._USERNOTFND."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/edit_zone.php
diff -u publicdnsadmin/edit_zone.php:1.5 publicdnsadmin/edit_zone.php:1.6
--- publicdnsadmin/edit_zone.php:1.5 Sat Jul 19 06:46:31 2003
+++ publicdnsadmin/edit_zone.php Wed Aug 13 05:14:13 2003
@@ -17,12 +17,10 @@
$perms = getUserPermissions($_SESSION["_UID"]);
$zoneid = trim(addslashes($_GET["id"]));
-?>
-<h3>Edit domain</h3>
-<?php
+echo "<h3>"._EDITDOMAIN."</h3>";
if ($perms["raw"] == 2) {
?>
-<p><a href="zone_access.php?id=<?php echo $zoneid; ?>">Show zone users</a> - <a href="grant_access.php?id=<?php echo $zoneid; ?>">Grant user access</a></p>
+<p><a href="zone_access.php?id=<?php echo $zoneid; ?>"><? echo _SHOWZONE; ?></a> - <a href="grant_access.php?id=<?php echo $zoneid; ?>"><? echo _GRANTUSERACC; ?></a></p>
<?php
}
@@ -34,10 +32,10 @@
if ($perms["edit_other"] or userHasZoneAccess($_SESSION["_UID"], $zoneid) or ($perms["edit_own"] and $row["user_id"] == $_SESSION["_UID"])) {
$records = getRecords($zoneid);
- echo "<p>· <a href=\"new_record.php?zone=$zoneid\">New record</a></p>\n";
+ echo "<p>· <a href=\"new_record.php?zone=$zoneid\">"._NEWRECORDUP."</a></p>\n";
echo "<form action=\"delete_multi_records.php\" name=\"recdelform\" method=\"post\">\n";
- echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th><input type=\"submit\" name=\"delbut\" disabled=\"true\" value=\"Del\"></th><th>Record</th><th>Type</th><th>Content</th><th>Priority</th><th>TTL</th><th> </th></tr>\n";
+ echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th><input type=\"submit\" name=\"delbut\" disabled=\"true\" value=\""._DEL."\"></th><th>"._RECORD."</th><th>"._TYPE."</th><th>"._CONTENT."</th><th>"._PRIORITY."</th><th>"._TTL."</th><th> </th></tr>\n";
$row_id = 0;
$row_c = -1;
@@ -96,7 +94,7 @@
echo "<td bgcolor=\"$bgcolor\" height=\"20\">";
if ($record["type"] != "SOA") {
- echo "<a href=\"edit_record.php?id=".$record["id"]."\"><img src=\"images/edit.png\" alt=\"Edit record\" border=\"0\"></a> <a href=\"delete_record.php?id=".$record["id"]."\"><img src=\"images/trash.png\" alt=\"Delete record\" border=\"0\"></a>";
+ echo "<a href=\"edit_record.php?id=".$record["id"]."\"><img src=\"images/edit.png\" alt=\"Edit record\" border=\"0\"></a> <a href=\"delete_record.php?id=".$record["id"]."\"><img src=\"images/trash.png\" alt=\""._DELRECORD."\" border=\"0\"></a>";
} else {
echo " ";
}
@@ -109,11 +107,11 @@
echo "</table></td></tr></table></form>\n";
} else {
- echo "<p class=\"error\">· You don't have permission to edit this domain</p>\n";
+ echo "<p class=\"error\">· "._NOPERMSEDITDOM."</p>\n";
}
} else {
- echo "<p class=\"error\">· Zone not found</p>\n";
+ echo "<p class=\"error\">· "._ZONENOTFND."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/forgotten_pass.php
diff -u publicdnsadmin/forgotten_pass.php:1.2 publicdnsadmin/forgotten_pass.php:1.3
--- publicdnsadmin/forgotten_pass.php:1.2 Tue Aug 12 15:44:24 2003
+++ publicdnsadmin/forgotten_pass.php Wed Aug 13 05:14:13 2003
@@ -11,9 +11,8 @@
*/
require("lib/prepend.php");
require("lib/header.php");
-?>
-<h3>Forgotten Pass</h3>
-<?
+
+echo "<h3>". _FORGOTTENPASS ."</h3>";
if ($fetchpass == "1") {
$dbh = db_connect();
@@ -27,8 +26,8 @@
$md5_pass = md5($newpass);
$fromaddy = $contact_addy;
- $subject = "Requested PublicDNSAdmin Password";
- $content = "Your password for $site_address is: $newpass. Please login and change it ASAP.<br><br>DNS Administrator";
+ $subject = _REQUESTEDPASS;
+ $content = "". _PASSWORDFOR ." $site_address ". _IS .": $newpass. ". _LOGINANDCHANGE ."";
$headers .= "MIME-Version: 1.0\r\n";
$headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
@@ -42,18 +41,18 @@
$dbh->query("UPDATE users SET password = '$md5_pass' WHERE username='$dbuser'");
echo "Email Has Been Sent";
} else {
- echo "<p class=\"error\">Invalid username or email address.";
+ echo "<p class=\"error\">". _INVUSEROREMAIL .".";
}
$dbh->disconnect();
} else {
?>
<table>
<form name="forgotpass" method="post">
- <tr><td>Username:</td><td><input type="text" name="username"></td></tr>
- <tr><td>Email Address:</td><td><input type="text" name="emailaddy"></td><td>(The one we have in records)</td></tr>
+ <tr><td><? echo _USERNAME; ?>:</td><td><input type="text" name="username"></td></tr>
+ <tr><td><? echo _EMAIL; ?>:</td><td><input type="text" name="emailaddy"></td><td>(<? echo _ONEINRECORDS; ?>)</td></tr>
<input type="hidden" name="fetchpass" value="1">
- <tr><td></td><td align="right"><input type="reset" value="Reset">
- <input type="submit" value="Submit"></td></tr>
+ <tr><td></td><td align="right"><input type="reset" value="<? echo _RESET; ?>">
+ <input type="submit" value="<? echo _SUBMIT; ?>"></td></tr>
</form>
</table>
<?
Index: publicdnsadmin/gfx_code.php
diff -u publicdnsadmin/gfx_code.php:1.3 publicdnsadmin/gfx_code.php:1.4
--- publicdnsadmin/gfx_code.php:1.3 Wed Aug 6 06:17:40 2003
+++ publicdnsadmin/gfx_code.php Wed Aug 13 05:14:13 2003
@@ -25,7 +25,7 @@
if ($SHOW_GFXUSRCHK && ($NEWUSERS_GFXCHECK || $LOGIN_GFXCHECK)) {
$dbh = db_connect();
- if (!extension_loaded("gd")) { die("GD Library not present !"); }
+ if (!extension_loaded("gd")) { die("". _GDLIBUNAVAIL ." !"); }
$ENABLE_COOKIE_TABLE = 1;
$fontList = get_font_face_list();
@@ -42,9 +42,9 @@
img_label2($code_gen,$SPECIFIC_FONT2);
}
} else {
- img_label("INVALID CRC !!!",$SPECIFIC_FONT,24,"#ff1111","#ffffff");
+ img_label(_INVALIDCRC,$SPECIFIC_FONT,24,"#ff1111","#ffffff");
}
} else {
- die("Page is disabled.");
+ die("". _PAGEDISABLED .".");
}
?>
Index: publicdnsadmin/grant_access.php
diff -u publicdnsadmin/grant_access.php:1.1.1.1 publicdnsadmin/grant_access.php:1.2
--- publicdnsadmin/grant_access.php:1.1.1.1 Wed Apr 16 00:19:04 2003
+++ publicdnsadmin/grant_access.php Wed Aug 13 05:14:13 2003
@@ -17,9 +17,7 @@
if ($perms["raw"] == 2) {
-?>
-<h3>Grant zone access</h3>
-<?php
+ echo "<h3>". _GRANTUSERACC ."</h3>";
$dbh = db_connect();
$result = $dbh->query("SELECT * FROM domains WHERE id = '$zoneid'");
@@ -30,11 +28,11 @@
<form action="set_access.php?id=<?php echo $zoneid; ?>" method="post">
<table border="0" cellspacing="0" cellpadding="2">
<tr>
- <td><b>Zone:</b></td>
+ <? echo "<td><b>"._ZONE.":</b></td>"; ?>
<td><?php echo htmlentities($zone_row["name"]); ?></td>
</tr>
<tr>
- <td><b>User:</b></td>
+ <? echo "<td><b>"._USER.":</b></td>"; ?>
<td><select name="user">
<?php
$result = $dbh->query("SELECT id, username FROM users ORDER BY username");
@@ -47,14 +45,14 @@
</select></td>
</tr>
<tr>
- <td colspan="2" align="right"><input type="submit" value="Grant"></td>
+ <td colspan="2" align="right"><input type="submit" value="<? echo _GRANT; ?>"></td>
</tr>
</table>
</form>
<?php
} else {
- echo "<p class=\"error\">· Zone not found</p>\n";
+ echo "<p class=\"error\">· ". _ZONENOTFND ."</p>\n";
}
$dbh->disconnect();
Index: publicdnsadmin/index.php
diff -u publicdnsadmin/index.php:1.10 publicdnsadmin/index.php:1.11
--- publicdnsadmin/index.php:1.10 Tue Aug 12 19:56:57 2003
+++ publicdnsadmin/index.php Wed Aug 13 05:14:13 2003
@@ -20,13 +20,13 @@
if ($_SESSION["_UID"]) {
+echo "<h3>"._MYDOMAINS."</h3>";
?>
-<h3>My domains</h3>
-<p style="margin-bottom: 0px;"><b>Search:</b></p>
+<p style="margin-bottom: 0px;"><b><? echo _SEARCH; ?>:</b></p>
<form action="search.php" method="post" style="margin-top: 0px;">
<table border="0" cellspacing="0" cellpadding="6" class="row1" style="border: 1px solid #000000;">
<tr>
- <td align="right"><b>Criteria:</b> <input type="text" name="query" size="10" value=""><br><input type="submit" value="Search"></td>
+ <td align="right"><b><? echo _CRITERIA; ?>:</b> <input type="text" name="query" size="10" value=""><br><input type="submit" value=<? echo _SEARCH; ?>></td>
</tr>
</table>
</form>
@@ -41,7 +41,7 @@
$offsetmin = $offset;
$offsetmax = $offset + $domains_per_page;
- echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th>Domain</th><th>Current serial</th><th>Owner</th><th>Records</th><th> </th></tr>\n";
+ echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td style=\"background: #000000;\"><table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><th>"._DOMAIN."</th><th>"._CURRENTSERIAL."</th><th>"._OWNER."</th><th>"._RECORDS."</th><th> </th></tr>\n";
foreach ($zones as $zone) {
$row_id++;
@@ -83,10 +83,10 @@
echo "<td bgcolor=\"$bgcolor\" align=\"center\">";
if ($zone["delete"]) {
- echo " <a href=\"delete_zone.php?id=".$zone["id"]."\"><img src=\"images/trash.png\" alt=\"Delete zone\" border=\"0\"></a> ";
- echo " <a href=\"whois.php?id=".$zone["id"]."\"><img src=\"images/whois.gif\" height=20 width=20 alt=\"WHOIS Domain\" border=\"0\"></a> ";
+ echo " <a href=\"delete_zone.php?id=".$zone["id"]."\"><img src=\"images/trash.png\" alt=\""._DELZONE."\" border=\"0\"></a> ";
+ echo " <a href=\"whois.php?id=".$zone["id"]."\"><img src=\"images/whois.gif\" height=20 width=20 alt=\""._WHOISDOM."\" border=\"0\"></a> ";
} else {
- echo " <a href=\"whois.php?id=".$zone["id"]."\"><img src=\"images/whois.gif\" height=20 width=20 alt=\"WHOIS Domain\" border=\"0\"></a> ";
+ echo " <a href=\"whois.php?id=".$zone["id"]."\"><img src=\"images/whois.gif\" height=20 width=20 alt=\""._WHOISDOM."\" border=\"0\"></a> ";
}
echo "</td>\n";
@@ -125,38 +125,35 @@
echo "</table></td></tr></table>\n";
$dbh->disconnect();
} else {
- echo "<p>No zones available</p>\n";
+ echo "<p>"._NOZONES."</p>\n";
}
} else {
-?>
-
-<h3>Login</h3>
-<?php
+echo "<h3>"._LOGIN."</h3>";
if ($_GET["error"] == 1) {
if ($LOGIN_GFXCHECK) {
- echo "<p class=\"error\">Login failed: invalid username/password/gfx code</p>";
+ echo "<p class=\"error\">"._INVLOGINGFX."</p>";
} else {
- echo "<p class=\"error\">Login failed: invalid username/password</p>";
+ echo "<p class=\"error\">"._INVLOGIN."</p>";
}
} elseif ($_GET["logout"] == 1) {
- echo "<p>You have been logged out</p>";
+ echo "<p>"._LOGGEDOUT."</p>";
}
?>
<form action="login.php" method="post">
<table border="0" cellspacing="0" cellpadding="2">
<tr>
- <td><b>Username:</b></td>
+ <? echo "<td><b>"._USERNAME.":</b></td>"; ?>
<td><input type="text" name="username" size="25" maxlength="15" value=""></td>
</tr>
<tr>
- <td><b>Password:</b></td>
+ <? echo "<td><b>"._PASSWORD.":</b></td>"; ?>
<td><input type="password" name="password" size="25" maxlength="15" value=""></td>
</tr>
<tr><td>
<?
-echo "<b>Language:</b></td><td><select name='language'>";
+echo "<b>"._LANGUAGE.":</b></td><td><select name='language'>";
$handle=opendir('language');
while ($file = readdir($handle)) {
if (ereg("^lang\-(.+)\.php", $file, $matches)) {
@@ -182,7 +179,7 @@
if ($SHOW_GFXUSRCHK && $LOGIN_GFXCHECK) {
?>
<tr>
- <td><b>Security Check:</b></td>
+ <? echo "<td><b>"._SECCHECK.":</b></td>"; ?>
<td>
<?
$dbh = db_connect();
@@ -204,7 +201,7 @@
?>
</tr>
<tr>
- <td colspan="2" align="right"><input type="reset" value="Reset"> <input type="submit" value="Login"></td>
+ <td colspan="2" align="right"><input type="reset" value="<? echo _RESET; ?>"> <input type="submit" value="<? echo _LOGIN; ?>"></td>
</tr>
</table>
</form>
Index: publicdnsadmin/language/lang-english.php
diff -u publicdnsadmin/language/lang-english.php:1.1 publicdnsadmin/language/lang-english.php:1.2
--- publicdnsadmin/language/lang-english.php:1.1 Tue Aug 12 19:47:13 2003
+++ publicdnsadmin/language/lang-english.php Wed Aug 13 05:14:14 2003
@@ -46,6 +46,7 @@
define("_PASSWORD","Password");
define("_SECCHECK","Security Check");
define("_RESET","Reset");
+define("_SUBMIT","Submit");
define("_LOGIN","Login");
define("_RECORD","Record");
define("_TYPE","Type");
@@ -54,7 +55,8 @@
define("_TTL","TTL");
define("_TEMPLATENOTFND","Template not found");
define("_DELTEMPLATE","Delete template");
-define("_ALLRECDEL","and all records was successfully deleted");
+define("_THETEMPLATE","The template");
+define("_ALLRECDEL","and all records were successfully deleted");
define("_WISHTODELTEMPLATE","Are you sure you wish to delete the template");
define("_YES","Yes");
define("_NO","No");
@@ -81,7 +83,7 @@
define("_RECSUCESDEL","The record was successfully deleted");
define("_PROCEED","Proceed");
define("_NEWTEMPLATE","New template");
-define("_NEWRECORD","New record");
+define("_NEWRECORDUP","New record");
define("_NAME","Name");
define("_CREATE","Create");
define("_FORGOTTENPASS","Forgotten Pass");
@@ -146,7 +148,7 @@
define("_PERMISSIONS","Permissions");
define("_SUPERUSER","Superuser");
define("_NEWDOMAINS","New domains");
-define("_NEWTEMPLAYES","New templates");
+define("_NEWTEMPLATES","New templates");
define("_EDITOWNDOMS","Edit own domains");
define("_EDITOTHERDOMS","Edit other domains");
define("_EDITTEMPS","Edit templates");
@@ -176,8 +178,11 @@
define("_ZONERECNOTFND","Zone/record not found");
define("_BULKREG","Bulk registration");
define("_ONEDOMPERLINE","Type in one domain on each line");
-define("_NOTEMPSAVAIL","No templates are available. Please create a template");
-define("_BACKUPCREATED","The backup was successfully created. Click here to download");
+define("_NOTEMPSAVAIL","No templates are available. Please");
+define("_CREATEATEMP","create a template");
+define("_BEFORENEWDOM","before attempting to create a new domain");
+define("_BACKUPCREATED","The backup was successfully created.");
+define("_BACKUPDOWNLOAD","Click here to download");
define("_TEMPRECNOTFND","Template/record not found");
define("_DOMAINSEARCH","Domain search");
define("_REVOKEZONEACC","Revoke zone access");
@@ -205,12 +210,13 @@
define("_NODOMAINS","No domain names entered");
define("_MISSINGINVDOM","Missing or invalid domain name");
define("_ZONECREATED","The zone was successfully created. Click");
+define("_CLICK","Click");
define("_HERE","here");
define("_TOEDIT","to edit");
define("_FIELDSMISSINGFILL","Some fields were missing. You must fill out the username, name, email and password-fields");
define("_USERCREATED","The user was successfully created");
define("_TEMPLATECREATED","The template was successfully created");
-define("_DOSNOTRESOLVE","does not resolve to");
+define("_DOESNOTRESOLVE","does not resolve to");
define("_LICENSEDUNDER","Licensed Under");
define("_REPORTBUGS","Report Bugs To");
define("_DBUNAVAIL","Unable to connect to database");
@@ -233,5 +239,25 @@
define("_CONTACT","Contact");
define("_CONFIGTERMSAVAIL","config.php and/or terms.php cannot be accessed, please make sure they exist and are readable by the webserver");
define("_LANGUAGE","Language");
+define("_ADD","Add");
+define("_RECWASADDED","The record was added");
+define("_INVALIDCRC","INVALID CRC !!!");
+define("_EMAIL","E-mail");
+define("_RECORDS","Records");
+define("_DOMAIN","Domain");
+define("_REVOKEUSER","Revoke user");
+define("_RECWASUPDATED","The record was updated");
+define("_QUERY","Query");
+define("_OWNER","...
[truncated message content] |
|
From: Neil S. <sir...@us...> - 2003-08-13 03:28:57
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2003-08-13 02:57:07 UTC
Modified files:
index.php docs/CHANGELOG
Log message:
Author: SiRVulcaN <sir...@si...>
Log message:
- Default selected language on the main login page is now $language.
---------------------- diff included ----------------------
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.33 publicdnsadmin/docs/CHANGELOG:1.34
--- publicdnsadmin/docs/CHANGELOG:1.33 Tue Aug 12 19:47:13 2003
+++ publicdnsadmin/docs/CHANGELOG Tue Aug 12 19:56:57 2003
@@ -18,3 +18,4 @@
- Added index.(html|php) in images/docs/lib
SiRVulcaN <sir...@si...> - 13/08/2003 - Fixed up some hardcoded addresses in signup.php and forgotten_pass.php
- Added in first stage of multilanguage support.
+ - Default selected language on the main login page is now $language.
Index: publicdnsadmin/index.php
diff -u publicdnsadmin/index.php:1.9 publicdnsadmin/index.php:1.10
--- publicdnsadmin/index.php:1.9 Tue Aug 12 19:47:13 2003
+++ publicdnsadmin/index.php Tue Aug 12 19:56:57 2003
@@ -161,17 +161,18 @@
while ($file = readdir($handle)) {
if (ereg("^lang\-(.+)\.php", $file, $matches)) {
$langFound = $matches[1];
- $languageslist .= "$langFound ";
+ if ($langFound != $language) {
+ $languageslist .= "$langFound ";
+ }
}
}
closedir($handle);
$languageslist = explode(" ", $languageslist);
sort($languageslist);
+echo "<option name='language' value='$language' selected>".ucfirst($language)."\n";
for ($i=0; $i < sizeof($languageslist); $i++) {
if($languageslist[$i]!="") {
- echo "<option name='language' value='$languageslist[$i]' ";
- if($languageslist[$i]==$language) echo "selected";
- echo ">".ucfirst($languageslist[$i])."\n";
+ echo "<option name='language' value='$languageslist[$i]'>".ucfirst($languageslist[$i])."\n";
}
}
echo "</select></td>"
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2003-08-13 03:15:16
|
CVSROOT : /cvsroot/publicdnsadmin Module : publicdnsadmin Commit time: 2003-08-13 02:42:49 UTC Log message: Directory /cvsroot/publicdnsadmin/publicdnsadmin/language added to the repository |
|
From: Neil S. <sir...@us...> - 2003-08-13 02:53:02
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2003-08-13 02:47:23 UTC
Modified files:
index.php login.php docs/CHANGELOG docs/TODO lib/config.php-dist
lib/header.php
Added files:
language/index.html language/index.php language/lang-english.php
Log message:
Author: SiRVulcaN <sir...@si...>
Log message:
- Added in first stage of multilanguage support.
---------------------- diff included ----------------------
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.32 publicdnsadmin/docs/CHANGELOG:1.33
--- publicdnsadmin/docs/CHANGELOG:1.32 Tue Aug 12 15:44:25 2003
+++ publicdnsadmin/docs/CHANGELOG Tue Aug 12 19:47:13 2003
@@ -17,3 +17,4 @@
- Copied index.html as index.php just in case.
- Added index.(html|php) in images/docs/lib
SiRVulcaN <sir...@si...> - 13/08/2003 - Fixed up some hardcoded addresses in signup.php and forgotten_pass.php
+ - Added in first stage of multilanguage support.
Index: publicdnsadmin/docs/TODO
diff -u publicdnsadmin/docs/TODO:1.15 publicdnsadmin/docs/TODO:1.16
--- publicdnsadmin/docs/TODO:1.15 Tue Aug 12 02:06:52 2003
+++ publicdnsadmin/docs/TODO Tue Aug 12 19:47:13 2003
@@ -7,6 +7,6 @@
- ERR_TYPE, ie ERR_INVPASS (invalid pass)
- TYPE as in "general", "error", "critical" etc, each type has diff types of output styles
- multilanguage, use a code based system like the error codes which read off a file, lang.XX.php, then combine errors into the language file
- -- language table (language codes) "1" "English", users choose the code in config for default lang
- - users can choose to use another lang when opening the main page
+ > First Stage Complete.
+ - Adjust all files to use _VARS from the language files instead of the sentences/words.
- install.php - databases + configuration
Index: publicdnsadmin/index.php
diff -u publicdnsadmin/index.php:1.8 publicdnsadmin/index.php:1.9
--- publicdnsadmin/index.php:1.8 Sat Jul 19 06:46:31 2003
+++ publicdnsadmin/index.php Tue Aug 12 19:47:13 2003
@@ -154,6 +154,29 @@
<td><b>Password:</b></td>
<td><input type="password" name="password" size="25" maxlength="15" value=""></td>
</tr>
+<tr><td>
+<?
+echo "<b>Language:</b></td><td><select name='language'>";
+$handle=opendir('language');
+while ($file = readdir($handle)) {
+ if (ereg("^lang\-(.+)\.php", $file, $matches)) {
+ $langFound = $matches[1];
+ $languageslist .= "$langFound ";
+ }
+}
+closedir($handle);
+$languageslist = explode(" ", $languageslist);
+sort($languageslist);
+for ($i=0; $i < sizeof($languageslist); $i++) {
+ if($languageslist[$i]!="") {
+ echo "<option name='language' value='$languageslist[$i]' ";
+ if($languageslist[$i]==$language) echo "selected";
+ echo ">".ucfirst($languageslist[$i])."\n";
+ }
+}
+echo "</select></td>"
+?>
+</tr>
<?
if ($SHOW_GFXUSRCHK && $LOGIN_GFXCHECK) {
?>
Index: publicdnsadmin/language/index.html
diff -u /dev/null publicdnsadmin/language/index.html:1.1
--- /dev/null Tue Aug 12 19:47:23 2003
+++ publicdnsadmin/language/index.html Tue Aug 12 19:47:13 2003
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <title>Access Denied</title>
+ <meta http-equiv="REFRESH" content="0; url=../index.php">
+ </head>
+ <body>
+ you shouldnt be here :)
+ </body>
+</html>
Index: publicdnsadmin/language/index.php
diff -u /dev/null publicdnsadmin/language/index.php:1.1
--- /dev/null Tue Aug 12 19:47:23 2003
+++ publicdnsadmin/language/index.php Tue Aug 12 19:47:13 2003
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <title>Access Denied</title>
+ <meta http-equiv="REFRESH" content="0; url=../index.php">
+ </head>
+ <body>
+ you shouldnt be here :)
+ </body>
+</html>
Index: publicdnsadmin/language/lang-english.php
diff -u /dev/null publicdnsadmin/language/lang-english.php:1.1
--- /dev/null Tue Aug 12 19:47:23 2003
+++ publicdnsadmin/language/lang-english.php Tue Aug 12 19:47:13 2003
@@ -0,0 +1,237 @@
+<?
+
+/***************************************************************************/
+/* Public DNS Administator (English Language File) */
+/* Translator: PublicDNSAdmin Team <http://publicdnsadmin.sourceforge.net> */
+/* */
+/* Distributed under the GPL license, see LICENSE for */
+/* more information */
+/* */
+/* ======================================================================= */
+/* */
+/* If you made a translation, please send it to sir...@si... */
+/* */
+/* You need to change the second quoted phrase, not the capital one! */
+/* */
+/* If you need to use double quotes (") remember to add a backslash (\), */
+/* so your entry will look like: This is \"double quoted\" text. */
+/* And, if you use HTML code, please double check it. */
+/* */
+/***************************************************************************/
+
+
+define("_OCCURANCES","Any occurences of \$DOMAIN in the fields below will be replaced with the actual domain name when the template is used on a new domain");
+define("_REGGEDAS","You are now registered as");
+define("_EMAILDETAILS","a email has been sent containing your details");
+define("_REGGEDWITH","You are now registered with PublicDNSAdmin");
+define("_BRUSERNAME","<br><br>Username:");
+define("_BRPASSWORD","<Br>Password:");
+define("_PASSWORDFOR","Your password for");
+define("_IS","is");
+define("_LOGINANDCHANGE","Please login and change it ASAP.<br><br>DNS Administrator");
+define("_EACHDOMAIN","NOTE: Each Domain must use ");
+define("_AND","and");
+define("_FORITSNS","its nameservers, signup will be denied if the domains dont match to");
+define("_MYDOMAINS","My domains");
+define("_CRITERIA","Criteria");
+define("_SEARCH","Search");
+define("_UNKNOWN","Unknown");
+define("_DELZONE","Delete zone");
+define("_WHOISDOM","WHOIS Domain");
+define("_NOZONES","No zones available");
+define("_INVLOGINGFX","Login failed: invalid username/password/gfx code");
+define("_INVLOGIN","Login failed: invalid username/password");
+define("_LOGGEDOUT","You have been logged out");
+define("_USERNAME","Username");
+define("_PASSWORD","Password");
+define("_SECCHECK","Security Check");
+define("_RESET","Reset");
+define("_LOGIN","Login");
+define("_RECORD","Record");
+define("_TYPE","Type");
+define("_PRIO","Prio");
+define("_CONTENT","Content");
+define("_TTL","TTL");
+define("_TEMPLATENOTFND","Template not found");
+define("_DELTEMPLATE","Delete template");
+define("_ALLRECDEL","and all records was successfully deleted");
+define("_WISHTODELTEMPLATE","Are you sure you wish to delete the template");
+define("_YES","Yes");
+define("_NO","No");
+define("_EDITTEMPLATE","Edit template");
+define("_NEWRECORD","new record");
+define("_DELMULTIRECORDS","delete multiple records");
+define("_DELRECORD","delete record");
+define("_EDITRECORD","edit record");
+define("_EDITDOMAIN","Edit domain");
+define("_USERADMIN","User administration");
+define("_USERLIST","user list");
+define("_NEWUSER","new user");
+define("_EDITUSER","edit user");
+define("_DELETEDOM","Delete domain");
+define("_THEDOMAIN","The domain");
+define("_ANDALLRECSDEL","and all records was successfully deleted");
+define("_WISHTODELTHEDOM","Are you sure you wish to delete the domain");
+define("_NOPERMSDOMAIN","You don't have permission to delete this domain");
+define("_DELETEUSER","Delete user");
+define("_FTUSERDONTEXIST","Fatal Error, User Does Not Exist Most Likely");
+define("_ANDALLDOMRECDEL","and all their domains/records were successfully deleted");
+define("_WISHTODEL","Are you sure you wish to delete");
+define("_EDITSETTINGS","Edit Settings");
+define("_RECSUCESDEL","The record was successfully deleted");
+define("_PROCEED","Proceed");
+define("_NEWTEMPLATE","New template");
+define("_NEWRECORD","New record");
+define("_NAME","Name");
+define("_CREATE","Create");
+define("_FORGOTTENPASS","Forgotten Pass");
+define("_INVUSEROREMAIL","Invalid username or email address");
+define("_EMAILADDRESS","Email Address");
+define("_ONEINRECORDS","The one we have in records");
+define("_EMAILSENT","Email Has Been Sent");
+define("_WISHTODELTHISREC","Are you sure you wish to delete the record");
+define("_NOPERMSDELREC","You don't have permission to delete this record");
+define("_NOPERMSEDITDOM","You don't have permission to edit this domain");
+define("_ZONEUSERS","Zone users");
+define("_NOUSERSACCDOM","No users have access to this domain");
+define("_ZONENOTFND","Zone not found");
+define("_STATISTICS","Statistics");
+define("_DOMAINSHOSTED","Domains Hosted");
+define("_TOTALRECORDS","Total Records");
+define("_TOTALUSERS","Total Users");
+define("_EDITDOMAIN","Edit domain");
+define("_SHOWZONE","Show zone users");
+define("_GRANTUSERACC","Grant user access");
+define("_PRIORITY","Priority");
+define("_TTL","TTL");
+define("_DEL","Del");
+define("_TEMPRECNOTFND","Template/record not found");
+define("_ALLRECNOTDEL","Some records could not be deleted, please check make sure you have permission to access/delete them");
+define("_SOME","Some");
+define("_ALL","All");
+define("_SELECTTEMPDEL","selected template records were successfully deleted");
+define("_TOPLEVELDOMNOTSUP","Sorry but this top level domain is not \(yet\) supported");
+define("_CONNECTINGTO","Connecting to ");
+define("_TIMEDOUT","Timed-out connecting to");
+define("_PORT","port");
+define("_WHOISSERVER","Whois Server");
+define("_NOMATCH","NOT FOUND: No match for");
+define("_AMBIGUOUS","Ambiguous query, multiple matches for");
+define("_DEFERRED","Deferred to specific whois server");
+define("_DOMIDNOTFND","Domain id not found");
+define("_ALREADYHASUSERNAME","You Already Have A Username");
+define("_SIGNUPSDISABLED","New user signups are disabled, see an Administrator for further info");
+define("_DIDNTAGREETERMS","You Didnt Agree To The Terms and Conditions");
+define("_PASSWORDSDONTMATCH","The Passwords Entered Dont Match");
+define("_INVPASSWORD","Invalid password. May only contain characters a to z, dash, and numbers");
+define("_INVUSERNAME","Invalid username. Can only contain characters a to z and dash");
+define("_INVEMAILADDY","Invalid Email Address");
+define("_INVGFXCODE","Invalid GFX Code");
+define("_USERNAMEXISTS","Username Already Exists");
+define("_NAMESERVERSDONTPOINT","Nameservers Do Not Point To");
+define("_OR","or");
+define("_DOMAINEXISTS","The following domains already exists");
+define("_NEWACCOUNTCREATED","New PublicDNSAdmin Account Created");
+define("_DOMAINSADDEDIN","The following domains have been added in your account");
+define("_SOMEDOMAINSINVALID","One or more of the domains were invalid");
+define("_REQUESTEDPASS","Requested PublicDNSAdmin Password");
+define("_CONFIRM","Confirm");
+define("_CONFIRMPASSWORD","Confirm password");
+define("_REALNAME","Real Name");
+define("_COMPANY","Company");
+define("_DOMAINS","Domains");
+define("_DOMAIN","Domain");
+define("_TEMPLATE","Template");
+define("_CREATE","Create");
+define("_PERMISSIONS","Permissions");
+define("_SUPERUSER","Superuser");
+define("_NEWDOMAINS","New domains");
+define("_NEWTEMPLAYES","New templates");
+define("_EDITOWNDOMS","Edit own domains");
+define("_EDITOTHERDOMS","Edit other domains");
+define("_EDITTEMPS","Edit templates");
+define("_DELOWNDOMS","Delete own domains");
+define("_DELOTHERDOMS","Delete other domains");
+define("_DELTEMPS","Delete templates");
+define("_SIGNUPCOMPLETE","PublicDNSAdmin Signup Complete");
+define("_SUCESSSIGNEDUP","has successfully signed up for DNS hosting");
+define("_DOYOUAGREE","Do You Agree To The");
+define("_TERMSANDCOND","Terms And Conditions");
+define("_DELETEUSER","Delete User");
+define("_NOUSERSFND","No users found");
+define("_GRANTZONEACCESS","Grant zone access");
+define("_THEUSER","The user");
+define("_GRANTEDACCESS","was granted access to the domain");
+define("_USERNOTFND","User not found");
+define("_NOTEMPNAMEDEFINED","No template name defined");
+define("_TEMPLATEEXISTS","Another template with the same name already exists");
+define("_TEMPLATEUPDATED","The template was updated");
+define("_MYTEMPLATES","My templates");
+define("_DELTEMPLATE","Delete template");
+define("_NOTEMPLATESAVAL","No templates available");
+define("_INVALIDPOINTTYPE","Invalid pointer type");
+define("_INVALIDPOINTCONT","Invalid content for pointer type");
+define("_INVALIDPOINTREC","Invalid record data for pointer type");
+define("_NOPERMSEDITDOM","You don't have permission to edit this domain");
+define("_ZONERECNOTFND","Zone/record not found");
+define("_BULKREG","Bulk registration");
+define("_ONEDOMPERLINE","Type in one domain on each line");
+define("_NOTEMPSAVAIL","No templates are available. Please create a template");
+define("_BACKUPCREATED","The backup was successfully created. Click here to download");
+define("_TEMPRECNOTFND","Template/record not found");
+define("_DOMAINSEARCH","Domain search");
+define("_REVOKEZONEACC","Revoke zone access");
+define("_ACCTODOM","Access to the domain");
+define("_WASREMOVED","was removed from");
+define("_SUREYOUWANTTOREV","Are you sure you want to revoke access to");
+define("_FROM","from");
+define("_SELECTUSERNODOMACC","The selected user does not have access to this domain");
+define("_USERNOTFND","User not found");
+define("_PAGEDISABLED","Page is disabled");
+define("_GDLIBUNAVAIL","GD Library not present");
+define("_GRANTZONEACC","Grant zone access");
+define("_GRANT","Grant");
+define("_ZONE","Zone");
+define("_USER","User");
+define("_CANTEDITASUPERUSER","You don't have the permission to edit a superuser");
+define("_PASSESDONTMATCH","The passwords did not match");
+define("_FIELDSMISSING","Some fields were missing. You must enter both name and e-mail");
+define("_SETTINGSUPDATED","Settings Successfully Updated");
+define("_IDSDONTMATCH","ID's do not match, dont try and cheat the system");
+define("_DOMAINSINVALID","One or more of the domains were invalid");
+define("_DOMAINSEXIST","The following domains already exists");
+define("_DOMAINSADDED","The following domains was added");
+define("_TEMPLATEUNAVAIL","The specified template does not exist");
+define("_NODOMAINS","No domain names entered");
+define("_MISSINGINVDOM","Missing or invalid domain name");
+define("_ZONECREATED","The zone was successfully created. Click");
+define("_HERE","here");
+define("_TOEDIT","to edit");
+define("_FIELDSMISSINGFILL","Some fields were missing. You must fill out the username, name, email and password-fields");
+define("_USERCREATED","The user was successfully created");
+define("_TEMPLATECREATED","The template was successfully created");
+define("_DOSNOTRESOLVE","does not resolve to");
+define("_LICENSEDUNDER","Licensed Under");
+define("_REPORTBUGS","Report Bugs To");
+define("_DBUNAVAIL","Unable to connect to database");
+define("_ACCESSDENIED","Access denied");
+define("_NOPERMSFORTASK","You don't have permission to perform the chosen task");
+define("_MYDOMAINS","My domains");
+define("_MYTEMPLATES","My templates");
+define("_NEWDOMAIN","New domain");
+define("_NEWTEMPLATE","New template");
+define("_DBBACKUP","DB backup");
+define("_SETTINGS","Settings");
+define("_NS1STATS","NS1 stats");
+define("_NS2STATS","NS2 stats");
+define("_LOGOUT","Log out");
+define("_LOGIN","Login");
+define("_SIGNUP","Signup");
+define("_FORGOTPASS","Forgotten Pass");
+define("_STATISTICS","Statistics");
+define("_TERMS","Terms");
+define("_CONTACT","Contact");
+define("_CONFIGTERMSAVAIL","config.php and/or terms.php cannot be accessed, please make sure they exist and are readable by the webserver");
+define("_LANGUAGE","Language");
+
+?>
Index: publicdnsadmin/lib/config.php-dist
diff -u publicdnsadmin/lib/config.php-dist:1.11 publicdnsadmin/lib/config.php-dist:1.12
--- publicdnsadmin/lib/config.php-dist:1.11 Sat Jul 19 06:46:31 2003
+++ publicdnsadmin/lib/config.php-dist Tue Aug 12 19:47:13 2003
@@ -7,7 +7,7 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: config.php-dist,v 1.11 2003/07/19 13:46:31 sirvulcan Exp $
+ $Id: config.php-dist,v 1.12 2003/08/13 02:47:13 sirvulcan Exp $
*/
/*
@@ -50,6 +50,9 @@
/* Restrict new user signups, admins can still add users via the interface when logged in */
$allow_newusers = 1;
+
+/* Default interface language (must exist in language/ dir, lang-NAME.php */
+$default_lang = "english";
/* NS Server Addresses / Access Data, You Need Webserver Enabled On PowerDNS */
$ns1addy = "ns1.server.com";
Index: publicdnsadmin/lib/header.php
diff -u publicdnsadmin/lib/header.php:1.17 publicdnsadmin/lib/header.php:1.18
--- publicdnsadmin/lib/header.php:1.17 Tue Aug 12 02:06:52 2003
+++ publicdnsadmin/lib/header.php Tue Aug 12 19:47:13 2003
@@ -7,7 +7,7 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: header.php,v 1.17 2003/08/12 09:06:52 sirvulcan Exp $
+ $Id: header.php,v 1.18 2003/08/13 02:47:13 sirvulcan Exp $
*/
?>
@@ -26,6 +26,28 @@
<script language="javascript" src="functions.jss"></script>
</head>
<body>
+
+<?
+$language = $_SESSION[_LANGUAGE];
+if ($language == NULL) {
+ $language = $default_lang;
+}
+
+$curpath = realpath(".");
+require("$curpath/lib/config.php");
+if ((file_exists("$curpath/language/lang-" . $language . ".php")) && (is_readable("$curpath/language/lang-" . $language . ".php"))) {
+ require("$curpath/language/lang-" . $language . ".php");
+} else {
+ /* Default to the default lang if the choosen lang doesnt exist */
+ $language = $default_lang;
+ if ((file_exists("$curpath/language/lang-" . $language . ".php")) && (is_readable("$curpath/language/lang-" . $language . ".php"))) {
+ require("$curpath/language/lang-" . $default_lang . ".php");
+ } else {
+ die("Default Language File Choosen Doesnt Exist Or Is Unreadable By The Webserver");
+ }
+}
+
+?>
<table border="0" cellspacing="1" cellpadding="5" width="100%" height="95%">
<tr>
Index: publicdnsadmin/login.php
diff -u publicdnsadmin/login.php:1.3 publicdnsadmin/login.php:1.4
--- publicdnsadmin/login.php:1.3 Wed Jun 18 03:26:58 2003
+++ publicdnsadmin/login.php Tue Aug 12 19:47:13 2003
@@ -35,6 +35,7 @@
if (!$dbh->isError($result) && $result->numRows()) {
$row = $result->fetchRow();
$_SESSION["_UID"] = $row["id"];
+ $_SESSION["_LANGUAGE"] = $language;
$login_ok = 1;
}
}
@@ -44,6 +45,7 @@
if (!$dbh->isError($result) && $result->numRows()) {
$row = $result->fetchRow();
$_SESSION["_UID"] = $row["id"];
+ $_SESSION["_LANGUAGE"] = $language;
$login_ok = 1;
}
}
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2003-08-12 23:19:34
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2003-08-12 22:44:35 UTC
Modified files:
forgotten_pass.php signup.php docs/CHANGELOG
Log message:
Author: SiRVulcaN <sir...@si...>
Log message:
- Fixed up some hardcoded addresses in signup.php and forgotten_pass.php
---------------------- diff included ----------------------
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.31 publicdnsadmin/docs/CHANGELOG:1.32
--- publicdnsadmin/docs/CHANGELOG:1.31 Tue Aug 12 05:27:13 2003
+++ publicdnsadmin/docs/CHANGELOG Tue Aug 12 15:44:25 2003
@@ -16,3 +16,4 @@
OUTsider <out...@ke...> - 12/08/2003 - Modified index.html to redirect clients to mainpage
- Copied index.html as index.php just in case.
- Added index.(html|php) in images/docs/lib
+SiRVulcaN <sir...@si...> - 13/08/2003 - Fixed up some hardcoded addresses in signup.php and forgotten_pass.php
Index: publicdnsadmin/forgotten_pass.php
diff -u publicdnsadmin/forgotten_pass.php:1.1.1.1 publicdnsadmin/forgotten_pass.php:1.2
--- publicdnsadmin/forgotten_pass.php:1.1.1.1 Wed Apr 16 00:19:04 2003
+++ publicdnsadmin/forgotten_pass.php Tue Aug 12 15:44:24 2003
@@ -26,9 +26,9 @@
$newpass = time() * rand(0,100);
$md5_pass = md5($newpass);
- $fromaddy = "dns...@li...";
- $subject = "Requested Linux-Boxen DNS Admin Password";
- $content = "Your password for http://dnsadmin.linux-boxen.org is: $newpass. Please login and change it ASAP.<Br><br>Linux-Boxen DNS Admin";
+ $fromaddy = $contact_addy;
+ $subject = "Requested PublicDNSAdmin Password";
+ $content = "Your password for $site_address is: $newpass. Please login and change it ASAP.<br><br>DNS Administrator";
$headers .= "MIME-Version: 1.0\r\n";
$headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
@@ -36,7 +36,7 @@
$headers .= "Reply-To: ".$fromaddy." <".$fromaddy.">\r\n";
$headers .= "X-Priority: 1\r\n";
$headers .= "X-MSMail-Priority: High\r\n";
- $headers .= "X-Mailer: Linux-Boxen Networks HTML-Mailer v1.0";
+ $headers .= "X-Mailer: PublicDNSAdmin Mailer v1.0";
mail($dbemail, $subject, $content, $headers);
$dbh->query("UPDATE users SET password = '$md5_pass' WHERE username='$dbuser'");
Index: publicdnsadmin/signup.php
diff -u publicdnsadmin/signup.php:1.4 publicdnsadmin/signup.php:1.5
--- publicdnsadmin/signup.php:1.4 Thu Jun 19 02:43:50 2003
+++ publicdnsadmin/signup.php Tue Aug 12 15:44:24 2003
@@ -154,7 +154,7 @@
$exprecord = explode("\t", $nameservdata[$u]);
$nserv = substr("$exprecord[5]", 0, -2);
if (sizeof($exprecord) == 6) {
- if ((!strcasecmp($nserv,"ns1.linux-boxen.org")) ||(!strcasecmp($nserv[5],"ns2.linux-boxen.org"))) {
+ if ((!strcasecmp($nserv,$ns1addy)) ||(!strcasecmp($nserv[5],$ns2addy))) {
$nameservchk = 1;
}
}
@@ -162,7 +162,7 @@
$u++;
} while ($u < sizeof($nameservdata));
if ($nameservchk == 0) {
- echo "<p class=\"error\">$domain's Nameservers Do Not Point To ns1.linux-boxen.org or ns2.linux-boxen.org</p>";
+ echo "<p class=\"error\">$domain's Nameservers Do Not Point To $ns1addy or $ns2addy</p>";
}
}
}
@@ -238,9 +238,13 @@
echo "</p>\n";
// send email
- $fromaddy = "dns...@li...";
- $subject = "New Linux-Boxen DNS Admin Account Created";
- $content = "You are now registered with Linux-Boxen DNSAdmin (http://dnsadmin.linux-boxen.org)<br><br>Username: $username<Br>Password: $password";
+
+ $accsubject = "New PublicDNSAdmin Account Created";
+ $acccontent = "You are now registered with PublicDNSAdmin ($site_address)<br><br>Username: $username<Br>Password: $password";
+
+ $secondaddy = $contact_addy;
+ $secondsubject = "$username DNS Signup Complete";
+ $secondcontent = "$username ($name) - ($company) has successfully signed up for DNS hosting.";
$headers .= "MIME-Version: 1.0\r\n";
$headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
@@ -248,13 +252,9 @@
$headers .= "Reply-To: ".$fromaddy." <".$fromaddy.">\r\n";
$headers .= "X-Priority: 1\r\n";
$headers .= "X-MSMail-Priority: High\r\n";
- $headers .= "X-Mailer: Linux-Boxen Networks HTML-Mailer v1.0";
+ $headers .= "X-Mailer: PublicDNSAdmin Mailer v1.0";
- mail($dbemail, $subject, $content, $headers);
-
- $secondaddy = "ma...@li...";
- $secondcontent = "$username ($name) - ($company) has successfully signed up for DNS hosting. Client password is $password. DO NOT GIVE OUT";
- $secondsubject = "$username DNS Signup Complete";
+ mail($dbemail, $accsubject, $acccontent, $headers);
mail($secondaddy, $secondsubject, $secondcontent, $headers);
} else {
@@ -269,7 +269,7 @@
<tr><td>Real Name:</td><td><input type="text" name="realname" size="40" maxlength="40"></td><td>40 Chars Max</td></tr>
<tr><td>Company:</td><td><input type="text" name="company" size="40" maxlength="40"></td><td>40 Chars Max</td></tr>
<tr><td>Domains:</td><Td><textarea rows="5" cols="40" name="ldomains"></textarea></td><td>1 Domain Per Line</td></tr>
- <tr><td></td><td colspan="2">NOTE: Each Domain must use ns1.linux-boxen.org and ns2.linux-boxen.org for its nameservers, signup will be denied if the domains dont match to ns1.linux-boxen.org and ns2.linux-boxen.org</td></tr>
+ <? echo "<tr><td></td><td colspan=\"2\">NOTE: Each Domain must use $ns1addy and $ns2addy for its nameservers, signup will be denied if the domains dont match to $ns1addy and $ns2addy</td></tr>"; ?>
<?
if ($SHOW_GFXUSRCHK && $NEWUSERS_GFXCHECK) {
----------------------- End of diff -----------------------
|
|
From: Alexander M. <key...@us...> - 2003-08-12 12:27:25
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2003-08-12 12:27:24 UTC
Modified files:
data/index.html docs/CHANGELOG
Added files:
data/index.php docs/index.html docs/index.php images/index.html
images/index.php lib/index.html lib/index.php
Log message:
Author: Alexander Maassen <out...@ke...>
Log message:
Modified index.html to use proper html code and redirecting
Made copy of that file as index.php
Copied index.(html|php) into docs/images/lib
---------------------- diff included ----------------------
Index: publicdnsadmin/data/index.html
diff -u publicdnsadmin/data/index.html:1.1 publicdnsadmin/data/index.html:1.2
--- publicdnsadmin/data/index.html:1.1 Tue Aug 12 02:11:30 2003
+++ publicdnsadmin/data/index.html Tue Aug 12 05:27:13 2003
@@ -1 +1,9 @@
-you shouldnt be here :)
+<html>
+ <head>
+ <title>Access Denied</title>
+ <meta http-equiv="REFRESH" content="0; url=../index.php">
+ </head>
+ <body>
+ you shouldnt be here :)
+ </body>
+</html>
Index: publicdnsadmin/data/index.php
diff -u /dev/null publicdnsadmin/data/index.php:1.1
--- /dev/null Tue Aug 12 05:27:24 2003
+++ publicdnsadmin/data/index.php Tue Aug 12 05:27:13 2003
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <title>Access Denied</title>
+ <meta http-equiv="REFRESH" content="0; url=../index.php">
+ </head>
+ <body>
+ you shouldnt be here :)
+ </body>
+</html>
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.30 publicdnsadmin/docs/CHANGELOG:1.31
--- publicdnsadmin/docs/CHANGELOG:1.30 Tue Aug 12 02:11:30 2003
+++ publicdnsadmin/docs/CHANGELOG Tue Aug 12 05:27:13 2003
@@ -13,3 +13,6 @@
SiRVulcaN <sir...@si...> - 12/08/2003 - Disable prio field if a record type isnt MX.
- Deny loading publicdnsadmin index.php if config and term files are missing.
- Added index.html into the data dir to prevent the public from seeing the backups.
+OUTsider <out...@ke...> - 12/08/2003 - Modified index.html to redirect clients to mainpage
+ - Copied index.html as index.php just in case.
+ - Added index.(html|php) in images/docs/lib
Index: publicdnsadmin/docs/index.html
diff -u /dev/null publicdnsadmin/docs/index.html:1.1
--- /dev/null Tue Aug 12 05:27:24 2003
+++ publicdnsadmin/docs/index.html Tue Aug 12 05:27:13 2003
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <title>Access Denied</title>
+ <meta http-equiv="REFRESH" content="0; url=../index.php">
+ </head>
+ <body>
+ you shouldnt be here :)
+ </body>
+</html>
Index: publicdnsadmin/docs/index.php
diff -u /dev/null publicdnsadmin/docs/index.php:1.1
--- /dev/null Tue Aug 12 05:27:24 2003
+++ publicdnsadmin/docs/index.php Tue Aug 12 05:27:13 2003
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <title>Access Denied</title>
+ <meta http-equiv="REFRESH" content="0; url=../index.php">
+ </head>
+ <body>
+ you shouldnt be here :)
+ </body>
+</html>
Index: publicdnsadmin/images/index.html
diff -u /dev/null publicdnsadmin/images/index.html:1.1
--- /dev/null Tue Aug 12 05:27:24 2003
+++ publicdnsadmin/images/index.html Tue Aug 12 05:27:13 2003
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <title>Access Denied</title>
+ <meta http-equiv="REFRESH" content="0; url=../index.php">
+ </head>
+ <body>
+ you shouldnt be here :)
+ </body>
+</html>
Index: publicdnsadmin/images/index.php
diff -u /dev/null publicdnsadmin/images/index.php:1.1
--- /dev/null Tue Aug 12 05:27:24 2003
+++ publicdnsadmin/images/index.php Tue Aug 12 05:27:13 2003
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <title>Access Denied</title>
+ <meta http-equiv="REFRESH" content="0; url=../index.php">
+ </head>
+ <body>
+ you shouldnt be here :)
+ </body>
+</html>
Index: publicdnsadmin/lib/index.html
diff -u /dev/null publicdnsadmin/lib/index.html:1.1
--- /dev/null Tue Aug 12 05:27:24 2003
+++ publicdnsadmin/lib/index.html Tue Aug 12 05:27:14 2003
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <title>Access Denied</title>
+ <meta http-equiv="REFRESH" content="0; url=../index.php">
+ </head>
+ <body>
+ you shouldnt be here :)
+ </body>
+</html>
Index: publicdnsadmin/lib/index.php
diff -u /dev/null publicdnsadmin/lib/index.php:1.1
--- /dev/null Tue Aug 12 05:27:24 2003
+++ publicdnsadmin/lib/index.php Tue Aug 12 05:27:14 2003
@@ -0,0 +1,9 @@
+<html>
+ <head>
+ <title>Access Denied</title>
+ <meta http-equiv="REFRESH" content="0; url=../index.php">
+ </head>
+ <body>
+ you shouldnt be here :)
+ </body>
+</html>
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2003-08-12 09:34:14
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2003-08-12 09:11:41 UTC
Modified files:
docs/CHANGELOG
Added files:
data/index.html
Log message:
Author: SiRVulcaN <sir...@si...>
Log message:
- Added index.html into the data dir to prevent the public from seeing the backups.
---------------------- diff included ----------------------
Index: publicdnsadmin/data/index.html
diff -u /dev/null publicdnsadmin/data/index.html:1.1
--- /dev/null Tue Aug 12 02:11:41 2003
+++ publicdnsadmin/data/index.html Tue Aug 12 02:11:30 2003
@@ -0,0 +1 @@
+you shouldnt be here :)
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.29 publicdnsadmin/docs/CHANGELOG:1.30
--- publicdnsadmin/docs/CHANGELOG:1.29 Tue Aug 12 02:06:52 2003
+++ publicdnsadmin/docs/CHANGELOG Tue Aug 12 02:11:30 2003
@@ -11,4 +11,5 @@
- Fixed problem that some records/templates could not be updated
or created using postgres. This was coz prio was empty.
SiRVulcaN <sir...@si...> - 12/08/2003 - Disable prio field if a record type isnt MX.
- - deny loading publicdnsadmin index.php if config and term files are missing
+ - Deny loading publicdnsadmin index.php if config and term files are missing.
+ - Added index.html into the data dir to prevent the public from seeing the backups.
----------------------- End of diff -----------------------
|
|
From: Neil S. <sir...@us...> - 2003-08-12 09:20:55
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2003-08-12 09:07:02 UTC
Modified files:
edit_record.php edit_template_record.php functions.jss
new_record.php new_template_record.php docs/CHANGELOG docs/TODO
lib/header.php
Log message:
Author: SiRVulcaN <sir...@si...>
Log message:
- Disable prio field if a record type isnt MX.
- deny loading publicdnsadmin index.php if config and term files are missing or permissions arnt correct.
- added some things to TODO i had in a txt file.
---------------------- diff included ----------------------
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.28 publicdnsadmin/docs/CHANGELOG:1.29
--- publicdnsadmin/docs/CHANGELOG:1.28 Wed Aug 6 06:17:40 2003
+++ publicdnsadmin/docs/CHANGELOG Tue Aug 12 02:06:52 2003
@@ -10,3 +10,5 @@
thus gfxcheck was likely to fail.
- Fixed problem that some records/templates could not be updated
or created using postgres. This was coz prio was empty.
+SiRVulcaN <sir...@si...> - 12/08/2003 - Disable prio field if a record type isnt MX.
+ - deny loading publicdnsadmin index.php if config and term files are missing
Index: publicdnsadmin/docs/TODO
diff -u publicdnsadmin/docs/TODO:1.14 publicdnsadmin/docs/TODO:1.15
--- publicdnsadmin/docs/TODO:1.14 Wed Aug 6 06:17:40 2003
+++ publicdnsadmin/docs/TODO Tue Aug 12 02:06:52 2003
@@ -1,3 +1,12 @@
- Some sort of maintenence news system (displayed on the main login page).
- Syntax check records for validity to make it more fool proof.
-- Make the mouseoverthingie mozilla proof as well. (sucky on Firebird)
+- Make the mouseoverthingie mozilla proof as well. (sucky on Firebird) (working fine still for me -sirv)
+- poweradmin record validation dns.inc.php
+- use a error code system
+ -- client_message(CODE, TYPE);
+ - ERR_TYPE, ie ERR_INVPASS (invalid pass)
+ - TYPE as in "general", "error", "critical" etc, each type has diff types of output styles
+- multilanguage, use a code based system like the error codes which read off a file, lang.XX.php, then combine errors into the language file
+ -- language table (language codes) "1" "English", users choose the code in config for default lang
+ - users can choose to use another lang when opening the main page
+- install.php - databases + configuration
Index: publicdnsadmin/edit_record.php
diff -u publicdnsadmin/edit_record.php:1.6 publicdnsadmin/edit_record.php:1.7
--- publicdnsadmin/edit_record.php:1.6 Sat Jul 19 06:46:31 2003
+++ publicdnsadmin/edit_record.php Tue Aug 12 02:06:51 2003
@@ -38,7 +38,7 @@
}
?>
-<form action="update_record.php?id=<?php echo $recordid; ?>" method="post">
+<form action="update_record.php?id=<?php echo $recordid; ?>" method="post" name="recform">
<table border="0" cellspacing="0" cellpadding="2">
<tr>
<td><b>Record:</b></td>
@@ -80,7 +80,11 @@
</tr>
<tr>
<td><b>Prio:</b></td>
+ <? if ($row["type"] != "MX") { ?>
+ <td><input type="text" name="prio" disabled="true" size="5" maxlength="11" value="<?php if ($row["prio"]) { echo htmlentities($row["prio"]); } ?>"></td>
+ <? } else { ?>
<td><input type="text" name="prio" size="5" maxlength="11" value="<?php if ($row["prio"]) { echo htmlentities($row["prio"]); } ?>"></td>
+ <? } ?>
</tr>
<tr>
<td><b>Content:</b></td>
Index: publicdnsadmin/edit_template_record.php
diff -u publicdnsadmin/edit_template_record.php:1.4 publicdnsadmin/edit_template_record.php:1.5
--- publicdnsadmin/edit_template_record.php:1.4 Fri Jul 18 08:14:23 2003
+++ publicdnsadmin/edit_template_record.php Tue Aug 12 02:06:52 2003
@@ -33,7 +33,7 @@
$record_name = preg_replace("/\.+$/", "", $record_name);
?>
-<form action="update_template_record.php?id=<?php echo $recordid; ?>" method="post">
+<form action="update_template_record.php?id=<?php echo $recordid; ?>" method="post" name="recform">
<table border="0" cellspacing="0" cellpadding="2">
<tr>
<td><b>Record:</b></td>
@@ -63,7 +63,11 @@
</tr>
<tr>
<td><b>Prio:</b></td>
+ <? if ($row["type"] != "MX") { ?>
+ <td><input type="text" name="prio" disabled="true" size="5" maxlength="11" value="<?php if ($row["prio"]) { echo htmlentities($row["prio"]); } ?>"></td>
+ <? } else { ?>
<td><input type="text" name="prio" size="5" maxlength="11" value="<?php if ($row["prio"]) { echo htmlentities($row["prio"]); } ?>"></td>
+ <? } ?>
</tr>
<tr>
<td><b>Content:</b></td>
Index: publicdnsadmin/functions.jss
diff -u publicdnsadmin/functions.jss:1.3 publicdnsadmin/functions.jss:1.4
--- publicdnsadmin/functions.jss:1.3 Sat Jul 19 06:46:31 2003
+++ publicdnsadmin/functions.jss Tue Aug 12 02:06:52 2003
@@ -10,6 +10,16 @@
} else {
textObj.data = "@";
}
+
+ for(var e=0;e<document.recform.elements.length;e++) {
+ currentField = document.recform.elements[e];
+ if ((currentField.name == "prio") && (objchange == "MX")) {
+ document.recform.elements["prio"].disabled = false;
+ } else if ((currentField.name == "prio") && (objchange != "MX")) {
+ document.recform.elements["prio"].disabled = true;
+ document.recform.elements["prio"].value = "0";
+ }
+ }
}
function checkCount()
Index: publicdnsadmin/lib/header.php
diff -u publicdnsadmin/lib/header.php:1.16 publicdnsadmin/lib/header.php:1.17
--- publicdnsadmin/lib/header.php:1.16 Wed Aug 6 06:17:40 2003
+++ publicdnsadmin/lib/header.php Tue Aug 12 02:06:52 2003
@@ -7,7 +7,7 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: header.php,v 1.16 2003/08/06 13:17:40 key2peace Exp $
+ $Id: header.php,v 1.17 2003/08/12 09:06:52 sirvulcan Exp $
*/
?>
@@ -83,3 +83,33 @@
</td></tr><tr><td align="right">
<font face="verdana" size=1>Public DNS Administrator v1.3</font>
</td></tr></table>
+
+ <?
+
+ $config_check = 1;
+ $terms_check = 1;
+ $path = realpath(".");
+
+ if (file_exists("$path/lib/config.php")) {
+ if (!is_readable("$path/lib/config.php")) {
+ $config_check = 0;
+ }
+ } else {
+ $config_check = 0;
+ }
+
+ if (file_exists("$path/lib/terms.php")) {
+ if (!is_readable("$path/lib/terms.php")) {
+ $config_check = 0;
+ }
+ } else {
+ $config_check = 0;
+ }
+
+ if (($config_check == 0) || ($terms_check = 0)) {
+ echo "<p class=\"error\">config.php and/or terms.php cannot be accessed, please make sure they exist and are readable by the webserver";
+ require("lib/footer.php");
+ die();
+ }
+
+ ?>
Index: publicdnsadmin/new_record.php
diff -u publicdnsadmin/new_record.php:1.5 publicdnsadmin/new_record.php:1.6
--- publicdnsadmin/new_record.php:1.5 Fri Jul 18 08:14:23 2003
+++ publicdnsadmin/new_record.php Tue Aug 12 02:06:52 2003
@@ -31,7 +31,7 @@
global $default_ttl;
?>
-<form action="create_record.php?zone=<?php echo $zoneid; ?>" method="post">
+<form action="create_record.php?zone=<?php echo $zoneid; ?>" method="post" name="recform">
<table border="0" cellspacing="0" cellpadding="2">
<tr>
<td><b>Record:</b></td>
@@ -57,7 +57,11 @@
</tr>
<tr>
<td><b>Prio:</b></td>
+ <? if ($row["type"] != "MX") { ?>
+ <td><input type="text" name="prio" disabled="true" size="5" maxlength="11" value=""></td>
+ <? } else { ?>
<td><input type="text" name="prio" size="5" maxlength="11" value=""></td>
+ <? } ?>
</tr>
<tr>
<td><b>Content:</b></td>
Index: publicdnsadmin/new_template_record.php
diff -u publicdnsadmin/new_template_record.php:1.4 publicdnsadmin/new_template_record.php:1.5
--- publicdnsadmin/new_template_record.php:1.4 Fri Jul 18 08:14:23 2003
+++ publicdnsadmin/new_template_record.php Tue Aug 12 02:06:52 2003
@@ -29,7 +29,7 @@
global $default_ttl;
?>
-<form action="create_template_record.php?zone=<?php echo $zoneid; ?>" method="post">
+<form action="create_template_record.php?zone=<?php echo $zoneid; ?>" method="post" name="recform">
<table border="0" cellspacing="0" cellpadding="2">
<tr>
<td><b>Record:</b></td>
@@ -55,7 +55,11 @@
</tr>
<tr>
<td><b>Prio:</b></td>
+ <? if ($row["type"] != "MX") { ?>
+ <td><input type="text" name="prio" disabled="true" size="5" maxlength="11" value=""></td>
+ <? } else { ?>
<td><input type="text" name="prio" size="5" maxlength="11" value=""></td>
+ <? } ?>
</tr>
<tr>
<td><b>Content:</b></td>
----------------------- End of diff -----------------------
|
|
From: Alexander M. <key...@us...> - 2003-08-06 13:17:51
|
CVSROOT : /cvsroot/publicdnsadmin
Module : publicdnsadmin
Commit time: 2003-08-06 13:17:50 UTC
Modified files:
create_record.php create_template_record.php gfx_code.php
update_record.php update_template_record.php docs/CHANGELOG
docs/TODO lib/footer.php lib/header.php
Log message:
Author: Alexander Maassen <out...@ke...>
Log message: Lotsa updates, now it finally works perfect on postgres too.
Some Cosmetics and bumped version.
---------------------- diff included ----------------------
Index: publicdnsadmin/create_record.php
diff -u publicdnsadmin/create_record.php:1.4 publicdnsadmin/create_record.php:1.5
--- publicdnsadmin/create_record.php:1.4 Thu Jul 17 05:02:27 2003
+++ publicdnsadmin/create_record.php Wed Aug 6 06:17:40 2003
@@ -45,7 +45,7 @@
if (!$prio or !is_numeric($prio)) {
$prio = 10;
}
- } elseif ($prio) {
+ } elseif ($prio or !$prio or !is_numeric($prio)) {
$prio = 0;
}
Index: publicdnsadmin/create_template_record.php
diff -u publicdnsadmin/create_template_record.php:1.5 publicdnsadmin/create_template_record.php:1.6
--- publicdnsadmin/create_template_record.php:1.5 Thu Jul 17 05:02:27 2003
+++ publicdnsadmin/create_template_record.php Wed Aug 6 06:17:40 2003
@@ -43,7 +43,7 @@
if (!$prio or !is_numeric($prio)) {
$prio = 10;
}
- } elseif (!$prio) {
+ } elseif (!$prio or !$prio or !is_numeric($prio)) {
$prio = 0;
}
Index: publicdnsadmin/docs/CHANGELOG
diff -u publicdnsadmin/docs/CHANGELOG:1.27 publicdnsadmin/docs/CHANGELOG:1.28
--- publicdnsadmin/docs/CHANGELOG:1.27 Wed Jul 23 01:57:10 2003
+++ publicdnsadmin/docs/CHANGELOG Wed Aug 6 06:17:40 2003
@@ -1,19 +1,12 @@
$Id:
-OUTsider <out...@ke...> - 16/7/2003 - Released 1.1
-SiRVulcaN <sir...@si...> - 17/7/2003 - Allow users to delete multiple records at once.
- - Full MBOXFW support added.
- - Full URL support added.
- - Full RP support added.
- - Full HWINFO support added.
- - Full A6 support completed.
- - Full NS6 support completed.
-SiRVulcaN <sir...@si...> - 19/7/2003 - Change between '.' and '@' auto when changing from MBOXFW to
- another record type.
- - Made it so when you click on a template record you go into edit.
- - Split CSS into 2 files, one for IE and the other for other browsers.
- - Allow template admins to delete multiple records at once in templates.
- - Disable "Del" button if no checkboxes checked on record lists.
-SiRVulcaN <sir...@si...> - 20/7/2003 - Mouseover coloring added for tables (from PHPMyAdmin).
-SiRVulcaN <sir...@si...> - 23/7/2003 - SQL Tweak.
- - Released 1.2.
+SiRVulcaN <sir...@si...> - 23/07/2003 - SQL Tweak.
+ - Released 1.2.
+OUTsider <out...@ke...> - 03/08/2003 - Using ISO standard dates in CHANGELOG
+ (Let's agree that when a version gets release, we start with a fresh CHANGELOG)
+ - Bumped DEV version to 1.3
+ - Made suport links open in new window.
+OUTsider <out...@ke...> - 06/08/2003 - mysql does not support now()::abstime::int4,
+ thus gfxcheck was likely to fail.
+ - Fixed problem that some records/templates could not be updated
+ or created using postgres. This was coz prio was empty.
Index: publicdnsadmin/docs/TODO
diff -u publicdnsadmin/docs/TODO:1.13 publicdnsadmin/docs/TODO:1.14
--- publicdnsadmin/docs/TODO:1.13 Sat Jul 19 00:26:48 2003
+++ publicdnsadmin/docs/TODO Wed Aug 6 06:17:40 2003
@@ -1,2 +1,3 @@
- Some sort of maintenence news system (displayed on the main login page).
- Syntax check records for validity to make it more fool proof.
+- Make the mouseoverthingie mozilla proof as well. (sucky on Firebird)
Index: publicdnsadmin/gfx_code.php
diff -u publicdnsadmin/gfx_code.php:1.2 publicdnsadmin/gfx_code.php:1.3
--- publicdnsadmin/gfx_code.php:1.2 Wed Jun 18 03:26:58 2003
+++ publicdnsadmin/gfx_code.php Wed Aug 6 06:17:40 2003
@@ -31,7 +31,7 @@
$fontList = get_font_face_list();
unset($dFID); $dFID = rand(0,(count($fontList)-1)); // random available font face
- $dbh->query("DELETE FROM gfxcodes WHERE expire<now()::abstime::int4");
+ $dbh->query("DELETE FROM gfxcodes WHERE expire<".time());
$r = $dbh->query("SELECT code FROM gfxcodes WHERE crc='" . $_GET["crc"] . "'");
if ($o = $r->fetchRow()) {
$code_gen = $o["code"];
Index: publicdnsadmin/lib/footer.php
diff -u publicdnsadmin/lib/footer.php:1.6 publicdnsadmin/lib/footer.php:1.7
--- publicdnsadmin/lib/footer.php:1.6 Wed Jul 16 05:38:20 2003
+++ publicdnsadmin/lib/footer.php Wed Aug 6 06:17:40 2003
@@ -7,7 +7,7 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: footer.php,v 1.6 2003/07/16 12:38:20 sirvulcan Exp $
+ $Id: footer.php,v 1.7 2003/08/06 13:17:40 key2peace Exp $
*/
?>
</td>
@@ -22,7 +22,7 @@
<tr>
<td valign="top" class="menu" nowrap style="border-top: 1px solid #000000; border-left: 1px solid #000000;border-right: 1px solid #000000; border-bottom: 1px solid #000000;">
Powered By <a href="http://www.sirvulcan.org/" target="_new">Public DNS Administrator</a>, Licensed Under <a href="http://www.gnu.org" target="_new">GNU/GPL.</a> Report Bugs To:
- <a href="http://sourceforge.net/tracker/?func=add&group_id=78804&atid=554506">PublicDNSAdmin Bug Tracker</a>.
+ <a href="http://sourceforge.net/tracker/?func=add&group_id=78804&atid=554506" target="_new">PublicDNSAdmin Bug Tracker</a>.
</td>
</tr>
</table>
Index: publicdnsadmin/lib/header.php
diff -u publicdnsadmin/lib/header.php:1.15 publicdnsadmin/lib/header.php:1.16
--- publicdnsadmin/lib/header.php:1.15 Wed Jul 23 01:57:10 2003
+++ publicdnsadmin/lib/header.php Wed Aug 6 06:17:40 2003
@@ -7,7 +7,7 @@
Distributed under the GPL license, see LICENSE for
more information
- $Id: header.php,v 1.15 2003/07/23 08:57:10 sirvulcan Exp $
+ $Id: header.php,v 1.16 2003/08/06 13:17:40 key2peace Exp $
*/
?>
@@ -66,12 +66,12 @@
echo "\" class=\"menu\">Contact</a><br>";
}
echo "<br><br><center>";
- echo "<a href=\"http://httpd.apache.org\"><img src=\"images/apache.gif\" border=0></a><br><br>";
- echo "<a href=\"http://www.php.net\"><img src=\"images/php.gif\" border=0></a><br><br>";
+ echo "<a href=\"http://httpd.apache.org\" target=\"_new\"><img src=\"images/apache.gif\" border=0></a><br><br>";
+ echo "<a href=\"http://www.php.net\" target=\"_new\"><img src=\"images/php.gif\" border=0></a><br><br>";
if (db_type() == "mysql") {
- echo "<a href=\"http://www.mysql.com\"><img src=\"images/mysql.gif\" border=0></a><br>";
+ echo "<a href=\"http://www.mysql.com\" target=\"_new\"><img src=\"images/mysql.gif\" border=0></a><br>";
} else {
- echo "<a href=\"http://www.postgresql.org\"><img src=\"images/pgsql.gif\" border=0></a><br>";
+ echo "<a href=\"http://www.postgresql.org\" target=\"_new\"><img src=\"images/pgsql.gif\" border=0></a><br>";
}
echo "</center>";
?>
@@ -81,5 +81,5 @@
<table><tr><td>
<img src="images/logo.gif"><br>
</td></tr><tr><td align="right">
- <font face="verdana" size=1>Public DNS Administrator v1.2</font>
+ <font face="verdana" size=1>Public DNS Administrator v1.3</font>
</td></tr></table>
Index: publicdnsadmin/update_record.php
diff -u publicdnsadmin/update_record.php:1.4 publicdnsadmin/update_record.php:1.5
--- publicdnsadmin/update_record.php:1.4 Thu Jul 17 05:02:28 2003
+++ publicdnsadmin/update_record.php Wed Aug 6 06:17:40 2003
@@ -46,7 +46,7 @@
if (!$prio or !is_numeric($prio)) {
$prio = 10;
}
- } elseif ($prio) {
+ } elseif ($prio or !$prio or !is_numeric($prio)) {
$prio = 0;
}
Index: publicdnsadmin/update_template_record.php
diff -u publicdnsadmin/update_template_record.php:1.4 publicdnsadmin/update_template_record.php:1.5
--- publicdnsadmin/update_template_record.php:1.4 Thu Jul 17 05:02:28 2003
+++ publicdnsadmin/update_template_record.php Wed Aug 6 06:17:40 2003
@@ -43,7 +43,7 @@
if (!$prio or !is_numeric($prio)) {
$prio = 10;
}
- } elseif ($prio) {
+ } elseif ($prio or !$prio or !is_numeric($prio)) {
$prio = 0;
}
----------------------- End of diff -----------------------
|
