devil-linux-commit — Mailing list for CVS commit messages.

[Devil-linux-commit] build CHANGES,1.807.2.35,1.807.2.36

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3503

Modified Files:
      Tag: rel-1-2-patches
	CHANGES 
Log Message:
- some init script where missing the Default-Start/Stop information (Heiko
Zuerker  + Zsiros Zolt)
- lcd4linux init script was missing (Heiko Zuerker  + Zsiros Zolt)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.807.2.35
retrieving revision 1.807.2.36
diff -u -d -r1.807.2.35 -r1.807.2.36
--- CHANGES	16 Sep 2004 13:37:48 -0000	1.807.2.35
+++ CHANGES	20 Sep 2004 18:33:10 -0000	1.807.2.36
@@ -21,6 +21,10 @@
 #
 #
 
+1.2rc2
+- some init script where missing the Default-Start/Stop information (Heiko Zuerker  + Zsiros Zolt)
+- lcd4linux init script was missing (Heiko Zuerker  + Zsiros Zolt)
+
 1.2rc1
 - fixed ntop (Roland Pabel)
 - updated loop-AES to v2.2a

[Devil-linux-commit] build CHANGES,1.858,1.859

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27923

Modified Files:
	CHANGES 
Log Message:
some init script where missing the Default-Start/Stop information (Heiko
Zuerker  + Zsiros Zolt)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.858
retrieving revision 1.859
diff -u -d -r1.858 -r1.859
--- CHANGES	20 Sep 2004 12:53:29 -0000	1.858
+++ CHANGES	20 Sep 2004 12:59:43 -0000	1.859
@@ -22,6 +22,7 @@
 #
 
 1.3.2
+- some init script where missing the Default-Start/Stop information (Heiko Zuerker  + Zsiros Zolt)
 - lcd4linux init script was missing (Heiko Zuerker  + Zsiros Zolt)
 - fixed ntop (Roland Pabel)
 - removed sysklogd

[Devil-linux-commit] build/scripts/scripts dnsmasq,1.1,1.2 ez-ipupdate,1.2,1.3 gpm,1.1,1.2 noip_updater,1.1,1.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27923/scripts/scripts

Modified Files:
	dnsmasq ez-ipupdate gpm noip_updater 
Log Message:
some init script where missing the Default-Start/Stop information (Heiko
Zuerker  + Zsiros Zolt)


Index: gpm
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/gpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gpm	8 Mar 2004 18:50:34 -0000	1.1
+++ gpm	20 Sep 2004 12:59:43 -0000	1.2
@@ -11,8 +11,8 @@
 # Provides:       gpm
 # Required-Start: $network $syslog
 # Required-Stop:  $network $syslog
-# Default-Start:  
-# Default-Stop:   
+# Default-Start:  3 5
+# Default-Stop:   0 1 6
 # Description:    starts something
 ### END INIT INFO
 

Index: dnsmasq
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/dnsmasq,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dnsmasq	22 Apr 2004 15:11:03 -0000	1.1
+++ dnsmasq	20 Sep 2004 12:59:43 -0000	1.2
@@ -11,8 +11,8 @@
 # Provides:       dnsmasq
 # Required-Start: $network $syslog
 # Required-Stop:  $network $syslog
-# Default-Start:  
-# Default-Stop:   
+# Default-Start:  3 5
+# Default-Stop:   0 1 6
 # Description:    starts dnsmasq
 ### END INIT INFO
 

Index: noip_updater
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/noip_updater,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- noip_updater	30 Dec 2003 20:40:15 -0000	1.1
+++ noip_updater	20 Sep 2004 12:59:43 -0000	1.2
@@ -11,8 +11,8 @@
 # Provides:       noip_updater
 # Required-Start: $network $syslog
 # Required-Stop:  $network $syslog
-# Default-Start:  
-# Default-Stop:   
+# Default-Start:  3 5
+# Default-Stop:   0 1 6 
 # Description:    starts noip_updater
 ### END INIT INFO
 

Index: ez-ipupdate
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/ez-ipupdate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ez-ipupdate	16 Jun 2004 02:29:20 -0000	1.2
+++ ez-ipupdate	20 Sep 2004 12:59:43 -0000	1.3
@@ -4,8 +4,8 @@
 # Provides:       ez-ipupdate
 # Required-Start: $network $syslog $named
 # Required-Stop:  $network $syslog
-# Default-Start:  
-# Default-Stop:   
+# Default-Start:  3 5
+# Default-Stop:   0 1 6
 # Description:    starts ez-ipupdate
 ### END INIT INFO
 

[Devil-linux-commit] build/scripts/scripts lcd4linux,1.1,1.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26401/scripts/scripts

Modified Files:
	lcd4linux 
Log Message:
- lcd4linux init script was missing (Heiko Zuerker  + Zsiros Zolt)


Index: lcd4linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/lcd4linux,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lcd4linux	26 Apr 2004 23:22:04 -0000	1.1
+++ lcd4linux	20 Sep 2004 12:53:30 -0000	1.2
@@ -4,8 +4,8 @@
 # Provides:       lcd4linux
 # Required-Start: $network $syslog
 # Required-Stop:  $network $syslog
-# Default-Start:
-# Default-Stop:
+# Default-Start: 3 5
+# Default-Stop: 0 1 6
 # Description:    starts LCD4Linux
 ### END INIT INFO
 
@@ -46,6 +46,11 @@
 
 case "$1" in
 	start)
+		if [ "`grep "^Port /dev/parport" $CONFIGFILE`" -a ! "`lsmod | grep ^ppdev`" ]; then
+			echo -n "Loadding kernel module ppdev:  "
+			modprobe ppdev >/dev/null
+			evaluate_retval
+		fi
 		echo -n "Starting $NAME: "
 		loadproc $DAEMON $PARAMETER
 		;;

[Devil-linux-commit] build/scripts lcd4linux,1.3,1.4

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26401/scripts

Modified Files:
	lcd4linux 
Log Message:
- lcd4linux init script was missing (Heiko Zuerker  + Zsiros Zolt)


Index: lcd4linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lcd4linux,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lcd4linux	27 Apr 2004 11:24:34 -0000	1.3
+++ lcd4linux	20 Sep 2004 12:53:30 -0000	1.4
@@ -44,6 +44,14 @@
 			cp -dpR lcd4linux.conf.sample $ETCDIR/etc/lcd4linux || exit 1
 			chmod 600 $ETCDIR/etc/lcd4linux/* || exit 1
 			rm -rf $WORKDIR/tmp || exit 1
+			
+			cp $MYDIR/scripts/lcd4linux $ETCDIR/etc/init.d || exit 1
+		
+			echo "# Start $MYNAME?" >> $CONFIGFILE
+			echo "START_$MYNAME=no" >> $CONFIGFILE
+			echo >> $CONFIGFILE
+						
+			echo "HELP_$MYNAME=\"$MYNAME is used to display information on a LCD Display\"" >> $SOFTWAREHELP 
 		fi
 		;;
 

[Devil-linux-commit] build CHANGES,1.857,1.858

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26401

Modified Files:
	CHANGES 
Log Message:
- lcd4linux init script was missing (Heiko Zuerker  + Zsiros Zolt)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.857
retrieving revision 1.858
diff -u -d -r1.857 -r1.858
--- CHANGES	16 Sep 2004 13:37:03 -0000	1.857
+++ CHANGES	20 Sep 2004 12:53:29 -0000	1.858
@@ -22,6 +22,7 @@
 #
 
 1.3.2
+- lcd4linux init script was missing (Heiko Zuerker  + Zsiros Zolt)
 - fixed ntop (Roland Pabel)
 - removed sysklogd
 - removed lilo

[Devil-linux-commit] build/docs/documentation documentation.xml,1.64,1.65

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/docs/documentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31935/documentation

Modified Files:
	documentation.xml 
Log Message:
added information about build problems on exec-shield or pax systems


Index: documentation.xml
===================================================================
RCS file: /cvsroot/devil-linux/build/docs/documentation/documentation.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- documentation.xml	8 Sep 2004 18:29:30 -0000	1.64
+++ documentation.xml	19 Sep 2004 15:31:17 -0000	1.65
@@ -17,7 +17,7 @@
 <book>
   <title>Devil-Linux Documentation</title>
   <bookinfo>
-    <subtitle>This documentation is for v1.2 and above</subtitle>
+    <subtitle>This documentation is for v1.3 and above</subtitle>
     <subtitle>$Revision$ $Date$ </subtitle>
     <mediaobject role="online">
       <imageobject>
@@ -1269,6 +1269,19 @@
         <para>FIXME</para>
       </sect2>
     </sect1>
+    <sect1>
+      <title>Build Problems</title>
+      <sect2>
+        <title>Exec-Shield</title>
+        <para>Recent Redhat Linux versions and other Distributions derived from Redhat (like Fedora) use a security feature called <ulink url="http://redhat.com/~mingo/exec-shield/">Exec-Shield</ulink>. Unfortunately you can't build Devil-Linux while this feature is enabled.</para>
+        <para>Turn it off via the command: <command moreinfo="none">echo 0 &gt; /proc/sys/kernel/exec-shield</command></para>
+        <para>before you enter the chroot environment.</para>
+      </sect2>
+      <sect2>
+        <title>GRSecurity / PAX</title>
+        <para>Devil-Linux can't be build on systems using <ulink url="http://www.grsecurity.net">GRSecurity</ulink> and/or <ulink url="http://pax.grsecurity.net">PAX</ulink>.</para>
+      </sect2>
+    </sect1>
   </chapter>
   <appendix>
     <title>Mailinglists</title>

[Devil-linux-commit] build/docs/documentation documentation.xml,1.59.2.5,1.59.2.6

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/docs/documentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31829/docs/documentation

Modified Files:
      Tag: rel-1-2-patches
	documentation.xml 
Log Message:
added information about build problems on exec-shield or pax systems


Index: documentation.xml
===================================================================
RCS file: /cvsroot/devil-linux/build/docs/documentation/documentation.xml,v
retrieving revision 1.59.2.5
retrieving revision 1.59.2.6
diff -u -d -r1.59.2.5 -r1.59.2.6
--- documentation.xml	8 Sep 2004 18:29:46 -0000	1.59.2.5
+++ documentation.xml	19 Sep 2004 15:30:50 -0000	1.59.2.6
@@ -1269,6 +1269,19 @@
         <para>FIXME</para>
       </sect2>
     </sect1>
+    <sect1>
+      <title>Build Problems</title>
+      <sect2>
+        <title>Exec-Shield</title>
+        <para>Recent Redhat Linux versions and other Distributions derived from Redhat (like Fedora) use a security feature called <ulink url="http://redhat.com/~mingo/exec-shield/">Exec-Shield</ulink>. Unfortunately you can't build Devil-Linux while this feature is enabled.</para>
+        <para>Turn it off via the command: <command>echo 0 &gt; /proc/sys/kernel/exec-shield</command></para>
+        <para>before you enter the chroot environment.</para>
+      </sect2>
+      <sect2>
+        <title>GRSecurity / PAX</title>
+        <para>Devil-Linux can't be build on systems using <ulink url="http://www.grsecurity.net">GRSecurity</ulink> and/or <ulink url="http://pax.grsecurity.net">PAX</ulink>.</para>
+      </sect2>
+    </sect1>
   </chapter>
   <appendix>
     <title>Mailinglists</title>

[Devil-linux-commit] build md5sum.lst,1.147,1.148

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9593

Modified Files:
	md5sum.lst 
Log Message:
added patch so modutils compiles fine with new flex 


Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- md5sum.lst	11 Sep 2004 13:21:49 -0000	1.147
+++ md5sum.lst	18 Sep 2004 20:25:05 -0000	1.148
@@ -246,6 +246,7 @@
 8ade81ae33ccbf75e096c1baeecfd153  src/mhash-0.9.1.tar.gz
 1c8f3b247c38fb16c3c2170df9fc102a  src/minicom-2.1.tar.gz
 f8bfc480c4168978eca7037cd341da07  src/module-init-tools-3.0.tar.bz2
+1433248318f5e4364af793ce39494f7c  src/modutils-2.4.25-flex-1.patch.bz2
 bac989c74ed10f3bf86177fc5b4b89b6  src/modutils-2.4.27.tar.bz2
 da4d0b4a79902d5a8cc38a0bdff943ed  src/motion-3.0.7-1.tar.gz
 ff125fb82118efc7c852f0d26d5552c6  src/mpeg_encode-1.5b-src.tar.gz

[Devil-linux-commit] build/scripts modutils,1.17,1.18

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9593/scripts

Modified Files:
	modutils 
Log Message:
added patch so modutils compiles fine with new flex 


Index: modutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/modutils,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- modutils	21 Jul 2004 23:33:19 -0000	1.17
+++ modutils	18 Sep 2004 20:25:05 -0000	1.18
@@ -26,6 +26,10 @@
 
 case $1 in
     build )
+	if [ ! -f .patches.done ]; then
+		bzcat $DL_DIR/src/modutils-2.4.25-flex-1.patch.bz2 | patch -p1 || exit 1
+		touch .patches.done
+	fi
 	./configure || exit 1
 	# Parallel jobs does not work ($PMAKE)
 	make all || exit 1

[Devil-linux-commit] build/scripts iputils,1.9,NONE

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21101

Removed Files:
	iputils 
Log Message:
replace iputils with inetutils


--- iputils DELETED ---

[Devil-linux-commit] build/scripts dosfstools,1.10,1.11

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10229

Modified Files:
	dosfstools 
Log Message:
use if statement, otherwise check for error is always true when kernel 2.6
is not used


Index: dosfstools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dosfstools,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dosfstools	10 Sep 2004 23:16:24 -0000	1.10
+++ dosfstools	18 Sep 2004 17:47:00 -0000	1.11
@@ -32,7 +32,9 @@
 	    if [ "$CONFIG_DOSFSTOOLS" = "y" ]; then
 		if [ ! -f dosfsutils-patches.done ]; then
 			bzcat $DL_DIR/src/dosfstools-2.10-llseek.patch.bz2 | patch -p1 || exit 1
-			test "$CONFIG_LINUX_VERSION" = "2.6" && bzcat $DL_DIR/src/dosfstools-2.10-kernel-2.6-1.patch.bz2 | patch -p1 || exit 1
+			if [ "$CONFIG_LINUX_VERSION" = "2.6" ]; then
+			    bzcat $DL_DIR/src/dosfstools-2.10-kernel-2.6-1.patch.bz2 | patch -p1 || exit 1
+			fi
 			touch dosfsutils-patches.done
 		fi
 

[Devil-linux-commit] web/include config.inc.php,1.3,1.4

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22922

Modified Files:
	config.inc.php 
Log Message:
point to merchandise as default for the webshop


Index: config.inc.php
===================================================================
RCS file: /cvsroot/devil-linux/web/include/config.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config.inc.php	18 Sep 2004 13:39:49 -0000	1.3
+++ config.inc.php	18 Sep 2004 16:08:23 -0000	1.4
@@ -14,7 +14,7 @@
 				"DOWNLOADS" => array("TITLE" => "Downloads", "LINK" => "../downloads/index.php", "SUBNAV" => array() ), 
 				"PARTNERS" => array("TITLE" => "Partners", "LINK" => "../partners/index.php", "SUBNAV" => array() ), 
 				"NEWS" => array("TITLE" => "News", "LINK" => "../news/index.php", "SUBNAV" => array() ), 
-				"WEBSHOP" => array("TITLE" => "Webshop", "LINK" => "../webshop/ordercd.php", "SUBNAV" => array() )
+				"WEBSHOP" => array("TITLE" => "Webshop", "LINK" => "../webshop/merchandise.php", "SUBNAV" => array() )
 			);
 			
 	//http://www.cafeshops.com/devil-linux			

[Devil-linux-commit] web/poll/admin admin_comment.php,1.1.1.1,1.2 admin_edit.php,1.1.1.1,1.2 admin_embed.php,1.1.1.1,1.2 admin_help.php,1.1.1.1,1.2 admin_license.php,1.1.1.1,1.2 admin_logout.php,1.1.1.1,1.2 admin_password.php,1.1.1.1,1.2 admin_preview.php,1.1.1.1,1.2 admin_settings.php,1.1.1.1,1.2 admin_stats.php,1.1.1.1,1.2 admin_templates.php,1.1.1.1,1.2 admin_templates_misc.php,1.1.1.1,1.2 admin_tpl_misc_new.php,1.1.1.1,1.2 admin_tpl_new.php,1.1.1.1,1.2 common.inc.php,1.1.1.1,1.2 index.php,1.1.1.1,1.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll/admin

Modified Files:
	admin_comment.php admin_edit.php admin_embed.php 
	admin_help.php admin_license.php admin_logout.php 
	admin_password.php admin_preview.php admin_settings.php 
	admin_stats.php admin_templates.php admin_templates_misc.php 
	admin_tpl_misc_new.php admin_tpl_new.php common.inc.php 
	index.php 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


Index: admin_stats.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/admin_stats.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_stats.php	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_stats.php	18 Sep 2004 16:00:40 -0000	1.2
@@ -1,74 +1,74 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-require "./common.inc.php";
-
-if (!isset($action)) {
-    $action='';
-}
-if ($action=="reset" and isset($poll_id)) {
-    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_log] where (poll_id = '$poll_id')");
-}
-
-$row = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT * FROM $POLLTBL[poll_index] WHERE (poll_id = '$poll_id')"));
-$logging = $row["logging"];
-$CLASS["db"]->free_result($CLASS["db"]->result);
-$time_offset = $pollvars["time_offset"]*3600;
-$poll_sum = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT SUM(votes) AS total FROM $POLLTBL[poll_data] WHERE (poll_id = '$poll_id')"));
-$CLASS["db"]->free_result($CLASS["db"]->result);
-list($wday,$mday,$month,$year,$hour,$minutes) = split("( )",date("w j n Y H i",$row['timestamp']+$time_offset));
-$newdate = "$weekday[$wday], $mday ".$months[$month-1]." $year $hour:$minutes";
-
-$CLASS["template"]->set_templatefiles(array(
-    "admin_stats" => "admin_stats.html"
-));
-$poll_stats = "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"2\">";
-$hours = (int) ((time()-$row['timestamp']+$time_offset)/3600);
-$days = (int) ($hours/24);
-$remain = $hours%24;
-$question = htmlspecialchars($row['question']);
-$poll_sum_total = $poll_sum["total"];
-$result = $CLASS["db"]->query("select * from $POLLTBL[poll_data] where (poll_id = '$poll_id') order by option_id asc");
-while ($data = $CLASS["db"]->fetch_array($result)) {
-    $percent = ($poll_sum['total'] == 0) ? "0%" : sprintf("%.2f",($data['votes']*100/$poll_sum['total']))."%";
-    $perday = ($days>0) ? sprintf("%.1f",($data["votes"]/$days)) : $data["votes"];
-    $poll_stats .= "<tr>
-                <td colspan=\"4\" class=\"td2\"><b>$lang[NewOption] $data[option_id]: $data[option_text]</b></td>
-              </tr>
-              <tr>
-                <td colspan=\"2\" class=\"td2\">- $lang[SetVotes]: <font color=\"#CC0000\">$data[votes]</font> ($percent)</td>
-                <td colspan=\"2\" class=\"td2\">- <font color=\"#0000FF\">$perday</font> $lang[StatDay]</td>
-              </tr>\n";
-    if ($logging == 1) {
-        $log_result = $CLASS["db"]->query("select * from $POLLTBL[poll_log] where (poll_id = '$poll_id' and option_id = '$data[option_id]')");
-        $row = $CLASS["db"]->num_rows($log_result);
-        if ($row != 0) {
-            $poll_stats .= "              <tr bgcolor=\"#CC9999\" class=\"td2\">
-                  <td width=\"15%\" class=\"td2\">$lang[IndexDate]</td>
-                  <td width=\"13%\" class=\"td2\">IP</td>
-                  <td width=\"22%\" class=\"td2\">Host</td>
-                  <td width=\"50%\" class=\"td2\">Browser</td>
-                </tr>\n";
-            while ($log_data = $CLASS["db"]->fetch_array($log_result)) {
-                $poll_stats .= "        <tr>
-                  <td width=\"15%\" class=\"td2\">".date("j-M-Y H:i",$log_data['timestamp']+$time_offset)."</td>
-                  <td width=\"13%\" class=\"td2\">$log_data[ip_addr]</td>
-                  <td width=\"22%\" class=\"td2\">$log_data[host]</td>
-                  <td width=\"50%\" class=\"td2\">$log_data[agent]</td>
-                </tr>\n";
-            }
-        }
-    }
-}
-$poll_stats .= "</table>\n";
-$admin_stats = $CLASS["template"]->pre_parse("admin_stats");
-no_cache_header();
-eval("echo \"$admin_stats\";");
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+
+require "./common.inc.php";
+
+if (!isset($action)) {
+    $action='';
+}
+if ($action=="reset" and isset($poll_id)) {
+    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_log] where (poll_id = '$poll_id')");
+}
+
+$row = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT * FROM $POLLTBL[poll_index] WHERE (poll_id = '$poll_id')"));
+$logging = $row["logging"];
+$CLASS["db"]->free_result($CLASS["db"]->result);
+$time_offset = $pollvars["time_offset"]*3600;
+$poll_sum = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT SUM(votes) AS total FROM $POLLTBL[poll_data] WHERE (poll_id = '$poll_id')"));
+$CLASS["db"]->free_result($CLASS["db"]->result);
+list($wday,$mday,$month,$year,$hour,$minutes) = split("( )",date("w j n Y H i",$row['timestamp']+$time_offset));
+$newdate = "$weekday[$wday], $mday ".$months[$month-1]." $year $hour:$minutes";
+
+$CLASS["template"]->set_templatefiles(array(
+    "admin_stats" => "admin_stats.html"
+));
+$poll_stats = "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"2\">";
+$hours = (int) ((time()-$row['timestamp']+$time_offset)/3600);
+$days = (int) ($hours/24);
+$remain = $hours%24;
+$question = htmlspecialchars($row['question']);
+$poll_sum_total = $poll_sum["total"];
+$result = $CLASS["db"]->query("select * from $POLLTBL[poll_data] where (poll_id = '$poll_id') order by option_id asc");
+while ($data = $CLASS["db"]->fetch_array($result)) {
+    $percent = ($poll_sum['total'] == 0) ? "0%" : sprintf("%.2f",($data['votes']*100/$poll_sum['total']))."%";
+    $perday = ($days>0) ? sprintf("%.1f",($data["votes"]/$days)) : $data["votes"];
+    $poll_stats .= "<tr>
+                <td colspan=\"4\" class=\"td2\"><b>$lang[NewOption] $data[option_id]: $data[option_text]</b></td>
+              </tr>
+              <tr>
+                <td colspan=\"2\" class=\"td2\">- $lang[SetVotes]: <font color=\"#CC0000\">$data[votes]</font> ($percent)</td>
+                <td colspan=\"2\" class=\"td2\">- <font color=\"#0000FF\">$perday</font> $lang[StatDay]</td>
+              </tr>\n";
+    if ($logging == 1) {
+        $log_result = $CLASS["db"]->query("select * from $POLLTBL[poll_log] where (poll_id = '$poll_id' and option_id = '$data[option_id]')");
+        $row = $CLASS["db"]->num_rows($log_result);
+        if ($row != 0) {
+            $poll_stats .= "              <tr bgcolor=\"#CC9999\" class=\"td2\">
+                  <td width=\"15%\" class=\"td2\">$lang[IndexDate]</td>
+                  <td width=\"13%\" class=\"td2\">IP</td>
+                  <td width=\"22%\" class=\"td2\">Host</td>
+                  <td width=\"50%\" class=\"td2\">Browser</td>
+                </tr>\n";
+            while ($log_data = $CLASS["db"]->fetch_array($log_result)) {
+                $poll_stats .= "        <tr>
+                  <td width=\"15%\" class=\"td2\">".date("j-M-Y H:i",$log_data['timestamp']+$time_offset)."</td>
+                  <td width=\"13%\" class=\"td2\">$log_data[ip_addr]</td>
+                  <td width=\"22%\" class=\"td2\">$log_data[host]</td>
+                  <td width=\"50%\" class=\"td2\">$log_data[agent]</td>
+                </tr>\n";
+            }
+        }
+    }
+}
+$poll_stats .= "</table>\n";
+$admin_stats = $CLASS["template"]->pre_parse("admin_stats");
+no_cache_header();
+eval("echo \"$admin_stats\";");
+
 ?>
\ No newline at end of file

Index: admin_settings.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/admin_settings.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_settings.php	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_settings.php	18 Sep 2004 16:00:40 -0000	1.2
@@ -1,92 +1,92 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-require "./common.inc.php";
-require "../include/class_input2db.php";
-
-function get_lang_list($dir) {
-    $lang_list = '';
-    chdir("$dir");
-    $hnd = opendir(".");
-    while ($file = readdir($hnd)) {
-        if(is_file($file)) {
-            $langlist[] = $file;
-        }
-    }
-    closedir($hnd);
-    if ($langlist) {
-        asort($langlist);
-        while (list ($key, $file) = each ($langlist)) {
-            if (ereg(".php|.php3",$file,$regs)) {
-                $lang_list .= "<option value=\"".$file."\">".str_replace("$regs[0]","","$file")."</option>\n";
-            }
-        }
-    }
-    return $lang_list;
-}
-
-function addspecialchars($input='') {
-    if(is_array($input)) {
-        reset($input);
-        while (list($var,$value) = each($input)) {
-            $input[$var] = htmlspecialchars($value);
-        }
-        return $input;
-    } else {
-        return false;
-    }
-}
-
-
-if (!isset($action)) {
-    $action='';
-}
-
-$message = $lang["SetText"];
-
-if ($action == "update") {
-    if (!eregi(".php|.php3", $cfg["lang"])) {
-        $cfg["lang"] = "english.php";
-    }
-    if (!eregi("^[0-9]+$", $cfg["entry_pp"]) || $cfg["entry_pp"]==0) {
-        $cfg["entry_pp"] = 1;
-    }
-    $CLASS["db_input"] = new input2db();
-    $result = $CLASS["db_input"]->update_db_row($POLLTBL["poll_config"],$cfg,"config_id",1);
-    if ($result) {
-        $pollvars = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT * FROM $POLLTBL[poll_config]"));
-        $pollvars['SELF'] = basename($PHP_SELF);
-        $CLASS["db"]->free_result($CLASS["db"]->result);
-        unset($lang);
-        include ("../lang/$pollvars[lang]");
-        $message = $lang["Updated"];
-    } else {
-        $message = $lang["NoUpdate"];
-    }
-}
-
-$CLASS["template"]->set_templatefiles(array(
-    "admin_settings" => "admin_settings.html"
-));
-
-$pollvars = addspecialchars($pollvars);
-$langlist = get_lang_list("../lang");
-$check_ip = ($pollvars["check_ip"] == 0) ? "selected" : "";
-$no_ip_check = ($pollvars["check_ip"] == 2) ? "selected" : "";
-$votes = ($pollvars["type"] == "votes") ? "checked" : "";
-$percent = ($pollvars["type"] == "percent") ? "checked" : "";
-$order_usort = ($pollvars["result_order"] == "usort") ? "selected" : "";
-$order_asc = ($pollvars["result_order"] == "asc") ? "selected" : "";
-$order_desc = ($pollvars["result_order"] == "desc") ? "selected" : "";
-
-$admin_settings = $CLASS["template"]->pre_parse("admin_settings");
-no_cache_header();
-eval("echo \"$admin_settings\";");
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+
+require "./common.inc.php";
+require "../include/class_input2db.php";
+
+function get_lang_list($dir) {
+    $lang_list = '';
+    chdir("$dir");
+    $hnd = opendir(".");
+    while ($file = readdir($hnd)) {
+        if(is_file($file)) {
+            $langlist[] = $file;
+        }
+    }
+    closedir($hnd);
+    if ($langlist) {
+        asort($langlist);
+        while (list ($key, $file) = each ($langlist)) {
+            if (ereg(".php|.php3",$file,$regs)) {
+                $lang_list .= "<option value=\"".$file."\">".str_replace("$regs[0]","","$file")."</option>\n";
+            }
+        }
+    }
+    return $lang_list;
+}
+
+function addspecialchars($input='') {
+    if(is_array($input)) {
+        reset($input);
+        while (list($var,$value) = each($input)) {
+            $input[$var] = htmlspecialchars($value);
+        }
+        return $input;
+    } else {
+        return false;
+    }
+}
+
+
+if (!isset($action)) {
+    $action='';
+}
+
+$message = $lang["SetText"];
+
+if ($action == "update") {
+    if (!eregi(".php|.php3", $cfg["lang"])) {
+        $cfg["lang"] = "english.php";
+    }
+    if (!eregi("^[0-9]+$", $cfg["entry_pp"]) || $cfg["entry_pp"]==0) {
+        $cfg["entry_pp"] = 1;
+    }
+    $CLASS["db_input"] = new input2db();
+    $result = $CLASS["db_input"]->update_db_row($POLLTBL["poll_config"],$cfg,"config_id",1);
+    if ($result) {
+        $pollvars = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT * FROM $POLLTBL[poll_config]"));
+        $pollvars['SELF'] = basename($PHP_SELF);
+        $CLASS["db"]->free_result($CLASS["db"]->result);
+        unset($lang);
+        include ("../lang/$pollvars[lang]");
+        $message = $lang["Updated"];
+    } else {
+        $message = $lang["NoUpdate"];
+    }
+}
+
+$CLASS["template"]->set_templatefiles(array(
+    "admin_settings" => "admin_settings.html"
+));
+
+$pollvars = addspecialchars($pollvars);
+$langlist = get_lang_list("../lang");
+$check_ip = ($pollvars["check_ip"] == 0) ? "selected" : "";
+$no_ip_check = ($pollvars["check_ip"] == 2) ? "selected" : "";
+$votes = ($pollvars["type"] == "votes") ? "checked" : "";
+$percent = ($pollvars["type"] == "percent") ? "checked" : "";
+$order_usort = ($pollvars["result_order"] == "usort") ? "selected" : "";
+$order_asc = ($pollvars["result_order"] == "asc") ? "selected" : "";
+$order_desc = ($pollvars["result_order"] == "desc") ? "selected" : "";
+
+$admin_settings = $CLASS["template"]->pre_parse("admin_settings");
+no_cache_header();
+eval("echo \"$admin_settings\";");
+
 ?>
\ No newline at end of file

Index: admin_comment.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/admin_comment.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_comment.php	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_comment.php	18 Sep 2004 16:00:40 -0000	1.2
@@ -1,70 +1,70 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-require "./common.inc.php";
-
-if (!isset($action)) {
-    $action='';
-}
-if ($action=="delete" and isset($mess_id) and isset($poll_id)) {
-    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_comment] where (com_id = '$mess_id' and poll_id='$poll_id')");
-}
-
-if(!isset($entry)) {
-    $entry = 0;
-}
-$record = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT question FROM $POLLTBL[poll_index] WHERE (poll_id = '$poll_id')"));
-$question = htmlspecialchars($record['question']);
-$CLASS["db"]->free_result($CLASS["db"]->result);
-$time_offset = $pollvars["time_offset"]*3600;
-$CLASS["db"]->fetch_array($CLASS["db"]->query("select count(*) as total from $POLLTBL[poll_comment] WHERE (poll_id = '$poll_id')"));
-$total = $CLASS["db"]->record['total'];
-$next_page = $entry+$pollvars["entry_pp"];
-$prev_page = $entry-$pollvars["entry_pp"];
-$navigation ='';
-if ($prev_page >= 0) {
-    $navigation = "   <img src=\"$pollvars[base_gif]/back.gif\" width=\"16\" height=\"14\">&nbsp;<a href=\"$pollvars[SELF]?session=$auth[session]&uid=$auth[uid]&poll_id=$poll_id&entry=$prev_page\">$lang[NavPrev]</a>\n";
-}
-if ($next_page < $total) {
-    $navigation = $navigation. " &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$pollvars[SELF]?session=$auth[session]&uid=$auth[uid]&poll_id=$poll_id&entry=$next_page\">$lang[NavNext]</a>&nbsp;<img src=\"$pollvars[base_gif]/next.gif\" width=\"16\" height=\"14\">\n";
-}
-$CLASS["template"]->set_templatefiles(array(
-    "admin_comment"    => "admin_comment.html",
-    "admin_comment_tr" => "admin_comment_tr.html"
-));
-$CLASS["template"]->register_vars("admin_comment_tr",array(
-    "message" => "\$row[message]",
-    "browser" => "\$row[browser]",
-    "name"    => "\$row[name]",
-    "host"    => "\$row[host]",
-    "com_id"  => "\$row[com_id]"
-));
-$admin_comment_tr = '';
-$comment_tr = $CLASS["template"]->pre_parse("admin_comment_tr");
-$results = $CLASS["db"]->query("select * from $POLLTBL[poll_comment] WHERE (poll_id = '$poll_id') order by com_id desc limit $entry, $pollvars[entry_pp]");
-while ($row = $CLASS["db"]->fetch_array($results)) {
-    $date = date("j-M-Y H:i",$row['time']+$time_offset);
-    $row['message'] = nl2br($row['message']);
-    $email = ($row['email']) ? "<a href=\"mailto:$row[email]\"><img src=\"$pollvars[base_gif]/email.gif\" width=\"15\" height=\"15\" border=\"0\" alt=\"$row[email]\"></a>\n" : "";
-    if (eregi("Opera",$row['browser'])) {
-        $image = "$pollvars[base_gif]/opera.gif";
-    } elseif (eregi("MSIE",$row['browser'])) {
-        $image = "$pollvars[base_gif]/msie.gif";
-    } elseif (eregi("Mozilla",$row['browser'])) {
-        $image = "$pollvars[base_gif]/netscape.gif";
-    } else {
-        $image = "$pollvars[base_gif]/unknown.gif";
-    }
-    eval("\$admin_comment_tr .= \"$comment_tr\";");
-}
-$comments = $CLASS["template"]->pre_parse("admin_comment");
-no_cache_header();
-eval("echo \"$comments\";");
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+
+require "./common.inc.php";
+
+if (!isset($action)) {
+    $action='';
+}
+if ($action=="delete" and isset($mess_id) and isset($poll_id)) {
+    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_comment] where (com_id = '$mess_id' and poll_id='$poll_id')");
+}
+
+if(!isset($entry)) {
+    $entry = 0;
+}
+$record = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT question FROM $POLLTBL[poll_index] WHERE (poll_id = '$poll_id')"));
+$question = htmlspecialchars($record['question']);
+$CLASS["db"]->free_result($CLASS["db"]->result);
+$time_offset = $pollvars["time_offset"]*3600;
+$CLASS["db"]->fetch_array($CLASS["db"]->query("select count(*) as total from $POLLTBL[poll_comment] WHERE (poll_id = '$poll_id')"));
+$total = $CLASS["db"]->record['total'];
+$next_page = $entry+$pollvars["entry_pp"];
+$prev_page = $entry-$pollvars["entry_pp"];
+$navigation ='';
+if ($prev_page >= 0) {
+    $navigation = "   <img src=\"$pollvars[base_gif]/back.gif\" width=\"16\" height=\"14\">&nbsp;<a href=\"$pollvars[SELF]?session=$auth[session]&uid=$auth[uid]&poll_id=$poll_id&entry=$prev_page\">$lang[NavPrev]</a>\n";
+}
+if ($next_page < $total) {
+    $navigation = $navigation. " &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$pollvars[SELF]?session=$auth[session]&uid=$auth[uid]&poll_id=$poll_id&entry=$next_page\">$lang[NavNext]</a>&nbsp;<img src=\"$pollvars[base_gif]/next.gif\" width=\"16\" height=\"14\">\n";
+}
+$CLASS["template"]->set_templatefiles(array(
+    "admin_comment"    => "admin_comment.html",
+    "admin_comment_tr" => "admin_comment_tr.html"
+));
+$CLASS["template"]->register_vars("admin_comment_tr",array(
+    "message" => "\$row[message]",
+    "browser" => "\$row[browser]",
+    "name"    => "\$row[name]",
+    "host"    => "\$row[host]",
+    "com_id"  => "\$row[com_id]"
+));
+$admin_comment_tr = '';
+$comment_tr = $CLASS["template"]->pre_parse("admin_comment_tr");
+$results = $CLASS["db"]->query("select * from $POLLTBL[poll_comment] WHERE (poll_id = '$poll_id') order by com_id desc limit $entry, $pollvars[entry_pp]");
+while ($row = $CLASS["db"]->fetch_array($results)) {
+    $date = date("j-M-Y H:i",$row['time']+$time_offset);
+    $row['message'] = nl2br($row['message']);
+    $email = ($row['email']) ? "<a href=\"mailto:$row[email]\"><img src=\"$pollvars[base_gif]/email.gif\" width=\"15\" height=\"15\" border=\"0\" alt=\"$row[email]\"></a>\n" : "";
+    if (eregi("Opera",$row['browser'])) {
+        $image = "$pollvars[base_gif]/opera.gif";
+    } elseif (eregi("MSIE",$row['browser'])) {
+        $image = "$pollvars[base_gif]/msie.gif";
+    } elseif (eregi("Mozilla",$row['browser'])) {
+        $image = "$pollvars[base_gif]/netscape.gif";
+    } else {
+        $image = "$pollvars[base_gif]/unknown.gif";
+    }
+    eval("\$admin_comment_tr .= \"$comment_tr\";");
+}
+$comments = $CLASS["template"]->pre_parse("admin_comment");
+no_cache_header();
+eval("echo \"$comments\";");
+
 ?>
\ No newline at end of file

Index: index.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- index.php	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ index.php	18 Sep 2004 16:00:40 -0000	1.2
@@ -1,187 +1,187 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-require "./common.inc.php";
-
-function delete_poll($poll_id) {
-    global $CLASS, $POLLTBL;
-    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_data] where (poll_id = '$poll_id')");
-    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_index] where (poll_id = '$poll_id')");
-    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_log] where (poll_id = '$poll_id')");
-    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_comment] where (poll_id = '$poll_id')");
-}
-
-function poll_index() {
-    global $CLASS, $auth, $pollvars, $entry, $lang, $weekday, $months, $POLLTBL;
-    if(!isset($entry)) {
-        $entry = 0;
-    }
-    $CLASS["db"]->fetch_array($CLASS["db"]->query("select count(*) as total from $POLLTBL[poll_index]"));
-    $total = $CLASS["db"]->record['total'];
-    $time_offset = $pollvars["time_offset"]*3600;
-    list($wday,$mday,$month,$year,$hour,$minutes) = split("( )",date("w j n Y H i",time()+$time_offset));
-    $newdate = "$weekday[$wday], $mday ".$months[$month-1]." $year $hour:$minutes";
-    $next_page = $entry+$pollvars['polls_pp'];
-    $prev_page = $entry-$pollvars['polls_pp'];
-    $navigation ='';
-    if ($prev_page >= 0) {
-        $navigation = "  <img src=\"$pollvars[base_gif]/back.gif\" width=\"16\" height=\"14\">&nbsp;<a href=\"$pollvars[SELF]?session=$auth[session]&uid=$auth[uid]&entry=$prev_page\">$lang[NavPrev]</a>\n";
-    }
-    if ($next_page < $total) {
-        $navigation = $navigation. "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$pollvars[SELF]?session=$auth[session]&uid=$auth[uid]&entry=$next_page\">$lang[NavNext]</a>&nbsp;<img src=\"$pollvars[base_gif]/next.gif\" width=\"16\" height=\"14\">\n";
-    }
-    $CLASS["template"]->set_templatefiles(array(
-        "index" => "admin_index.html",
-        "index_tr" => "admin_index_tr.html"
-    ));
-    $CLASS["template"]->register_vars("index_tr",array(
-        "poll_id" => "\$row[poll_id]"
-    ));
-    $index_tr = $CLASS["template"]->pre_parse("index_tr");
-    $results = $CLASS["db"]->query("select * from $POLLTBL[poll_index] order by poll_id desc limit $entry, $pollvars[polls_pp]");
-    $admin_index_tr = '';
-    while ($row = $CLASS["db"]->fetch_array($results)) {
-        $question = htmlspecialchars($row['question']);
-        $date = date("j-M-Y",$row['timestamp']+$time_offset);
-        if ($row['expire']==0) {
-            $exp_date = "<font color=\"#0000FF\">$lang[IndexNever]</font>";
-        } else {
-            $exp_date = (time()>$row['exp_time']) ? "<font color=\"#FF6600\">$lang[IndexExpire]</font>" : date("j-M-Y",$row['exp_time']+$time_offset)." (<font color=\"#FF0000\">".round(($row["exp_time"]-time())/86400)."</font>)";
-        }
-        $days = (int) ((time()-$row['timestamp']+$time_offset)/86400);
-        if ($row['status'] == 1) {
-            $image = "$pollvars[base_gif]/folder.gif";
-            $alt = "$lang[EditOn]";
-        } elseif ($row['status'] == 2) {
-            $image = "$pollvars[base_gif]/hidden.gif";
-            $alt = "$lang[EditHide]";
-        } else {
-            $image = "$pollvars[base_gif]/lock.gif";
-            $alt = "$lang[EditOff]";
-        }
-        $alt = htmlspecialchars($alt);
-        $image2 = ($row['logging'] == 1) ? "$pollvars[base_gif]/log.gif" : "$pollvars[base_gif]/log_off.gif";
-        $image3 = ($row['comments'] == 1) ? "$pollvars[base_gif]/reply.gif" : "$pollvars[base_gif]/co_dis.gif";
-        $image4 = ($row['status'] == 2) ? "$pollvars[base_gif]/text_off.gif" : "$pollvars[base_gif]/text.gif";
-        eval("\$admin_index_tr .= \"$index_tr\";");
-    }
-    $CLASS["template"]->register_vars("index", array(
-        "poll_user" => $CLASS["db"]->db['user'],
-        "poll_host" => $CLASS["db"]->db['host']
-    ));
-    $admin_index = $CLASS["template"]->pre_parse("index");
-    eval("echo \"$admin_index\";");
-}
-
-function poll_new($message) {
-    global $CLASS, $auth, $pollvars, $lang, $color_array;
-    $source_array = array(
-        "aqua","blue","brown","darkgreen","gold","green","grey","orange","pink","purple","red","yellow"
-    );
-    for ($i=0,$java_script='';$i<sizeof($source_array); $i++) {
-        $java_script .= "$source_array[$i] = new Image(); $source_array[$i].src = \"$pollvars[base_gif]/$source_array[$i].gif\";\n";
-    }
-    for ($i=1,$poll_options=''; $i < $pollvars['def_options']+1; $i++) {
-        $poll_options .= "        <tr>
-                 <td width=\"25%\" class=\"td1\">$lang[NewOption] $i</td>
-                 <td width=\"40%\">
-                   <input type=\"text\" name=\"option_id[$i]\" size=\"38\" class=\"input\" maxlength=\"100\">
-                 </td>
-                 <td class=\"td2\" width=\"10%\">
-                   <select class=\"select\" name=\"color[$i]\" onChange=\"javascript:ChangeBar(options[selectedIndex].value,$i)\">
-                    <option value=\"blank\">---</option>\n";
-        for ($j=0; $j <sizeof($source_array); $j++) {
-            $poll_options .= "<option value=\"$source_array[$j]\">$color_array[$j]</option>\n";
-        }
-        $poll_options .= "       </select></td>
-            <td width=\"25%\" align=\"left\"><img src=\"$pollvars[base_gif]/blank.gif\" name=\"bar$i\" width=\"35\" height=\"12\"></td>
-            </tr>\n";
-    }
-    $CLASS["template"]->set_templatefiles(array(
-        "admin_new" => "admin_new.html"
-    ));
-    $admin_new = $poll_login = $CLASS["template"]->pre_parse("admin_new");
-    eval("echo \"$admin_new\";");
-}
-
-function create_poll() {
-    global $CLASS, $POLLTBL;
-    global $logging, $expire, $exp_time, $status, $comments;
-    global $option_id, $question, $color;
-    $timestamp = time();
-    if (!isset($expire)) {
-        $expire=1;
-    }
-    if (!isset($comments)) {
-        $comments=0;
-    }
-    if (!isset($exp_time)) {
-        $exp_time=$timestamp;
-    } else {
-        $exp_time=$timestamp+$exp_time*86400;
-    }
-    if (!get_magic_quotes_gpc()) {
-        $question = addslashes($question);
-    }
-    $CLASS["db"]->query("INSERT INTO $POLLTBL[poll_index] (question,timestamp,status,logging,exp_time,expire,comments) VALUES ('$question','$timestamp','$status','$logging','$exp_time','$expire','$comments')");
-    $sql_result = $CLASS["db"]->query("SELECT poll_id FROM $POLLTBL[poll_index] WHERE timestamp=$timestamp");
-    $CLASS["db"]->fetch_array($sql_result);
-    $poll_id = $CLASS["db"]->record['poll_id'];
-    for($i=1; $i <= sizeof($option_id); $i++) {
-        $option_id[$i] = trim($option_id[$i]);
-        if (!empty($option_id[$i])) {
-            if (!get_magic_quotes_gpc()) {
-                $option_id[$i] = addslashes($option_id[$i]);
-            }
-            $CLASS["db"]->query("INSERT INTO $POLLTBL[poll_data] (poll_id, option_id, option_text, color, votes) VALUES('$poll_id', '$i', '$option_id[$i]','$color[$i]',0)");
-        }
-    }
-}
-
-if (!isset($action)) {
-    $action='';
-}
-
-no_cache_header();
-
-switch ($action) {
-
-    case "new":
-        $message = $lang["NewTitle"];
-        poll_new("$message");
-        break;
-
-    case "show":
-        poll_index();
-        break;
-
-    case "delete":
-        if (isset($id)) {
-            delete_poll($id);
-        }
-        poll_index();
-        break;
-
-    case "create":
-        $question = trim($question);
-        if (!empty($question)) {
-            create_poll();
-            poll_index();
-        } else {
-            $message = $lang["EditMis"];
-            poll_new("$message");
-        }
-        break;
-
-    default:
-        poll_index();
-        break;
-}
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+
+require "./common.inc.php";
+
+function delete_poll($poll_id) {
+    global $CLASS, $POLLTBL;
+    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_data] where (poll_id = '$poll_id')");
+    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_index] where (poll_id = '$poll_id')");
+    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_log] where (poll_id = '$poll_id')");
+    $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_comment] where (poll_id = '$poll_id')");
+}
+
+function poll_index() {
+    global $CLASS, $auth, $pollvars, $entry, $lang, $weekday, $months, $POLLTBL;
+    if(!isset($entry)) {
+        $entry = 0;
+    }
+    $CLASS["db"]->fetch_array($CLASS["db"]->query("select count(*) as total from $POLLTBL[poll_index]"));
+    $total = $CLASS["db"]->record['total'];
+    $time_offset = $pollvars["time_offset"]*3600;
+    list($wday,$mday,$month,$year,$hour,$minutes) = split("( )",date("w j n Y H i",time()+$time_offset));
+    $newdate = "$weekday[$wday], $mday ".$months[$month-1]." $year $hour:$minutes";
+    $next_page = $entry+$pollvars['polls_pp'];
+    $prev_page = $entry-$pollvars['polls_pp'];
+    $navigation ='';
+    if ($prev_page >= 0) {
+        $navigation = "  <img src=\"$pollvars[base_gif]/back.gif\" width=\"16\" height=\"14\">&nbsp;<a href=\"$pollvars[SELF]?session=$auth[session]&uid=$auth[uid]&entry=$prev_page\">$lang[NavPrev]</a>\n";
+    }
+    if ($next_page < $total) {
+        $navigation = $navigation. "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$pollvars[SELF]?session=$auth[session]&uid=$auth[uid]&entry=$next_page\">$lang[NavNext]</a>&nbsp;<img src=\"$pollvars[base_gif]/next.gif\" width=\"16\" height=\"14\">\n";
+    }
+    $CLASS["template"]->set_templatefiles(array(
+        "index" => "admin_index.html",
+        "index_tr" => "admin_index_tr.html"
+    ));
+    $CLASS["template"]->register_vars("index_tr",array(
+        "poll_id" => "\$row[poll_id]"
+    ));
+    $index_tr = $CLASS["template"]->pre_parse("index_tr");
+    $results = $CLASS["db"]->query("select * from $POLLTBL[poll_index] order by poll_id desc limit $entry, $pollvars[polls_pp]");
+    $admin_index_tr = '';
+    while ($row = $CLASS["db"]->fetch_array($results)) {
+        $question = htmlspecialchars($row['question']);
+        $date = date("j-M-Y",$row['timestamp']+$time_offset);
+        if ($row['expire']==0) {
+            $exp_date = "<font color=\"#0000FF\">$lang[IndexNever]</font>";
+        } else {
+            $exp_date = (time()>$row['exp_time']) ? "<font color=\"#FF6600\">$lang[IndexExpire]</font>" : date("j-M-Y",$row['exp_time']+$time_offset)." (<font color=\"#FF0000\">".round(($row["exp_time"]-time())/86400)."</font>)";
+        }
+        $days = (int) ((time()-$row['timestamp']+$time_offset)/86400);
+        if ($row['status'] == 1) {
+            $image = "$pollvars[base_gif]/folder.gif";
+            $alt = "$lang[EditOn]";
+        } elseif ($row['status'] == 2) {
+            $image = "$pollvars[base_gif]/hidden.gif";
+            $alt = "$lang[EditHide]";
+        } else {
+            $image = "$pollvars[base_gif]/lock.gif";
+            $alt = "$lang[EditOff]";
+        }
+        $alt = htmlspecialchars($alt);
+        $image2 = ($row['logging'] == 1) ? "$pollvars[base_gif]/log.gif" : "$pollvars[base_gif]/log_off.gif";
+        $image3 = ($row['comments'] == 1) ? "$pollvars[base_gif]/reply.gif" : "$pollvars[base_gif]/co_dis.gif";
+        $image4 = ($row['status'] == 2) ? "$pollvars[base_gif]/text_off.gif" : "$pollvars[base_gif]/text.gif";
+        eval("\$admin_index_tr .= \"$index_tr\";");
+    }
+    $CLASS["template"]->register_vars("index", array(
+        "poll_user" => $CLASS["db"]->db['user'],
+        "poll_host" => $CLASS["db"]->db['host']
+    ));
+    $admin_index = $CLASS["template"]->pre_parse("index");
+    eval("echo \"$admin_index\";");
+}
+
+function poll_new($message) {
+    global $CLASS, $auth, $pollvars, $lang, $color_array;
+    $source_array = array(
+        "aqua","blue","brown","darkgreen","gold","green","grey","orange","pink","purple","red","yellow"
+    );
+    for ($i=0,$java_script='';$i<sizeof($source_array); $i++) {
+        $java_script .= "$source_array[$i] = new Image(); $source_array[$i].src = \"$pollvars[base_gif]/$source_array[$i].gif\";\n";
+    }
+    for ($i=1,$poll_options=''; $i < $pollvars['def_options']+1; $i++) {
+        $poll_options .= "        <tr>
+                 <td width=\"25%\" class=\"td1\">$lang[NewOption] $i</td>
+                 <td width=\"40%\">
+                   <input type=\"text\" name=\"option_id[$i]\" size=\"38\" class=\"input\" maxlength=\"100\">
+                 </td>
+                 <td class=\"td2\" width=\"10%\">
+                   <select class=\"select\" name=\"color[$i]\" onChange=\"javascript:ChangeBar(options[selectedIndex].value,$i)\">
+                    <option value=\"blank\">---</option>\n";
+        for ($j=0; $j <sizeof($source_array); $j++) {
+            $poll_options .= "<option value=\"$source_array[$j]\">$color_array[$j]</option>\n";
+        }
+        $poll_options .= "       </select></td>
+            <td width=\"25%\" align=\"left\"><img src=\"$pollvars[base_gif]/blank.gif\" name=\"bar$i\" width=\"35\" height=\"12\"></td>
+            </tr>\n";
+    }
+    $CLASS["template"]->set_templatefiles(array(
+        "admin_new" => "admin_new.html"
+    ));
+    $admin_new = $poll_login = $CLASS["template"]->pre_parse("admin_new");
+    eval("echo \"$admin_new\";");
+}
+
+function create_poll() {
+    global $CLASS, $POLLTBL;
+    global $logging, $expire, $exp_time, $status, $comments;
+    global $option_id, $question, $color;
+    $timestamp = time();
+    if (!isset($expire)) {
+        $expire=1;
+    }
+    if (!isset($comments)) {
+        $comments=0;
+    }
+    if (!isset($exp_time)) {
+        $exp_time=$timestamp;
+    } else {
+        $exp_time=$timestamp+$exp_time*86400;
+    }
+    if (!get_magic_quotes_gpc()) {
+        $question = addslashes($question);
+    }
+    $CLASS["db"]->query("INSERT INTO $POLLTBL[poll_index] (question,timestamp,status,logging,exp_time,expire,comments) VALUES ('$question','$timestamp','$status','$logging','$exp_time','$expire','$comments')");
+    $sql_result = $CLASS["db"]->query("SELECT poll_id FROM $POLLTBL[poll_index] WHERE timestamp=$timestamp");
+    $CLASS["db"]->fetch_array($sql_result);
+    $poll_id = $CLASS["db"]->record['poll_id'];
+    for($i=1; $i <= sizeof($option_id); $i++) {
+        $option_id[$i] = trim($option_id[$i]);
+        if (!empty($option_id[$i])) {
+            if (!get_magic_quotes_gpc()) {
+                $option_id[$i] = addslashes($option_id[$i]);
+            }
+            $CLASS["db"]->query("INSERT INTO $POLLTBL[poll_data] (poll_id, option_id, option_text, color, votes) VALUES('$poll_id', '$i', '$option_id[$i]','$color[$i]',0)");
+        }
+    }
+}
+
+if (!isset($action)) {
+    $action='';
+}
+
+no_cache_header();
+
+switch ($action) {
+
+    case "new":
+        $message = $lang["NewTitle"];
+        poll_new("$message");
+        break;
+
+    case "show":
+        poll_index();
+        break;
+
+    case "delete":
+        if (isset($id)) {
+            delete_poll($id);
+        }
+        poll_index();
+        break;
+
+    case "create":
+        $question = trim($question);
+        if (!empty($question)) {
+            create_poll();
+            poll_index();
+        } else {
+            $message = $lang["EditMis"];
+            poll_new("$message");
+        }
+        break;
+
+    default:
+        poll_index();
+        break;
+}
+
 ?>
\ No newline at end of file

Index: admin_logout.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/admin_logout.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_logout.php	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_logout.php	18 Sep 2004 16:00:40 -0000	1.2
@@ -1,23 +1,23 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-require "./common.inc.php";
-
-srand((double)microtime()*1000000);
-$new_session = md5 (uniqid (rand()));
-$CLASS["db"]->query("UPDATE $POLLTBL[poll_user] SET session='$new_session' WHERE session='$session'");
-$CLASS["template"]->set_templatefiles(array(
-    "login" => "admin_login.html"
-));
-$message = $lang['FormEnter'];
-$poll_login = $CLASS["template"]->pre_parse("login");
-no_cache_header();
-eval("echo \"$poll_login\";");
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+
+require "./common.inc.php";
+
+srand((double)microtime()*1000000);
+$new_session = md5 (uniqid (rand()));
+$CLASS["db"]->query("UPDATE $POLLTBL[poll_user] SET session='$new_session' WHERE session='$session'");
+$CLASS["template"]->set_templatefiles(array(
+    "login" => "admin_login.html"
+));
+$message = $lang['FormEnter'];
+$poll_login = $CLASS["template"]->pre_parse("login");
+no_cache_header();
+eval("echo \"$poll_login\";");
+
 ?>
\ No newline at end of file

Index: admin_edit.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/admin_edit.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_edit.php	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_edit.php	18 Sep 2004 16:00:40 -0000	1.2
@@ -1,220 +1,220 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
- 
-require "./common.inc.php";
-
-$source_array = array(
-    "aqua","blue","brown","darkgreen","gold","green","grey","orange","pink","purple","red","yellow"
-);
-
-function add_options($poll_id,$last_id) {
-    global $CLASS, $POLLTBL;
-    global $option_id, $color;
-    for($i=$last_id; $i < $last_id+10; $i++) {
-        $option_id["$i"] = trim($option_id["$i"]);
-        if (!empty($option_id["$i"])) {
-            if (!get_magic_quotes_gpc()) {
-                $option_id["$i"] = addslashes($option_id["$i"]);
-            }
-            $CLASS["db"]->query("INSERT INTO $POLLTBL[poll_data] (poll_id, option_id, option_text, color, votes) VALUES('$poll_id', '$i', '$option_id[$i]','$color[$i]',0)");
-            $added = 1;
-        }
-    }
-    return (isset($added)) ? "EditOk" : "EditNo";
-}
-
-function save($poll_id) {
-    global $CLASS, $POLLTBL;
-    global $option_id, $votes, $color, $status, $logging, $question, $exp_time, $expire, $comments;
-    if (!isset($expire)) {
-        $expire=1;
-    }
-    if (!isset($comments)) {
-        $comments=0;
-    }
-    $exp_time=time()+$exp_time*86400;
-    $question = trim($question);
-    if (!empty($question)) {
-        if (!get_magic_quotes_gpc()) {
-            $question = addslashes($question);
-        }
-        $CLASS["db"]->query("UPDATE $POLLTBL[poll_index] set question='$question', status='$status', logging='$logging', exp_time='$exp_time', expire='$expire', comments='$comments' where (poll_id = '$poll_id')");
-        $CLASS["db"]->query("select max(option_id) as max_option from $POLLTBL[poll_data] where (poll_id = '$poll_id')");
-        $data = $CLASS["db"]->fetch_array($CLASS["db"]->result);
-        for($i=1; $i <= $data["max_option"]; $i++) {
-            if (!isset($option_id["$i"])) {
-                continue;
-            }
-            $option_id["$i"] = trim($option_id["$i"]);
-            if (!empty($option_id[$i])) {
-                if (!eregi("^[0-9]+$", $votes[$i])) {
-                    $votes[$i] = 0;
-                }
-                if (!get_magic_quotes_gpc()) {
-                    $option_id[$i] = addslashes($option_id[$i]);
-                }
-                $CLASS["db"]->query("UPDATE $POLLTBL[poll_data] set option_text='$option_id[$i]', color='$color[$i]', votes='$votes[$i]' where (poll_id = '$poll_id' and option_id = '$i')");
-            } elseif (sizeof($option_id) > 2) {
-                $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_data] where (poll_id = '$poll_id' and option_id = '$i')");
-            } else {
-                $message = "EditOp";
-            }
-        }
-        $message = "Updated";
-    } else {
-        $message = "NewNoQue";
-    }
-    return $message;
-}
-
-function create_javascript_array() {
-    global $pollvars, $source_array;
-    for ($i=0, $java_script=''; $i<sizeof($source_array); $i++) {
-        $java_script .= "$source_array[$i] = new Image(); $source_array[$i].src = \"$pollvars[base_gif]/$source_array[$i].gif\";\n";
-    }    
-    return $java_script;
-}
-
-function poll_extend($poll_id) {
-    global $CLASS, $POLLTBL, $source_array, $color_array, $lang, $pollvars, $auth;
-    $row = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT question as question FROM $POLLTBL[poll_index] WHERE (poll_id = '$poll_id')"));
-    $question = htmlspecialchars($row['question']);
-    $CLASS["db"]->free_result($CLASS["db"]->result);
-    $data = $CLASS["db"]->fetch_array($CLASS["db"]->query("select max(option_id) as option_id from $POLLTBL[poll_data] where (poll_id = '$poll_id')"));
-    $CLASS["db"]->free_result($CLASS["db"]->result);
-    $CLASS["template"]->set_templatefiles(array(
-        "admin_options" => "admin_options.html"
-    ));
-    $java_script = create_javascript_array();
-    $poll_options = '';
-    $data["option_id"] += 1;
-    $i = $data["option_id"];
-    $end = $i+$pollvars['def_options'];
-    for ($i; $i < $end; $i++) {
-        $poll_options .= "    <tr>
-                <td width=\"15%\" class=\"td1\">$lang[NewOption] $i</td>
-                <td width=\"48%\">
-                  <input type=\"text\" name=\"option_id[$i]\" size=\"38\" class=\"input\" maxlength=\"100\">
-                </td>
-                <td width=\"12%\" class=\"td2\">
-                  <select class=\"select\" name=\"color[$i]\" onChange=\"javascript:ChangeBar(options[selectedIndex].value,$i)\">
-                    <option value=\"blank\">---</option>\n";
-        for ($j=0; $j <sizeof($source_array); $j++) {
-            $poll_options .= "<option value=\"$source_array[$j]\">$color_array[$j]</option>\n";
-        }
-        $poll_options .= "       </select></td>
-            <td width=\"20%\"><img src=\"$pollvars[base_gif]/blank.gif\" name=\"bar$i\" width=35 height=12></td>
-        </tr>\n";
-    }
-    $last_option_id = $data["option_id"];
-    $admin_options = $CLASS["template"]->pre_parse("admin_options");
-    eval("echo \"$admin_options\";");    
-}
-
-function poll_edit($poll_id,$message) {
-    global $CLASS, $auth, $pollvars, $color_array, $source_array, $lang, $POLLTBL;
-    $row = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT * FROM $POLLTBL[poll_index] WHERE (poll_id = '$poll_id')"));
-    $question = htmlspecialchars($row['question']);
-    $CLASS["db"]->free_result($CLASS["db"]->result);
-    $java_script = create_javascript_array();
-    $CLASS["db"]->query("select * from $POLLTBL[poll_data] where (poll_id = '$poll_id') order by option_id asc");
-    $i=1;
-    $poll_options = '';
-    $status_0 = ($row['status'] == 0) ? "selected" : "";
-    $status_1 = ($row['status'] == 1) ? "selected" : "";
-    $status_2 = ($row['status'] == 2) ? "selected" : "";
-    $logging_0 = ($row['logging'] == 0) ? "selected" : "";
-    $logging_1 = ($row['logging'] == 1) ? "selected" : "";
-    $poll_comments = ($row['comments'] == 1) ? "checked" : "";
-    $poll_expire = ($row['expire'] == 0) ? "checked" : "";
-    while ($data = $CLASS["db"]->fetch_array($CLASS["db"]->result)) {
-        $i++;
-        $data["option_text"] = htmlspecialchars($data["option_text"]);
-        $poll_options .= "         <tr>
-                 <td width=\"20%\" class=\"td1\">$lang[NewOption] $data[option_id]</td>
-                 <td width=\"49%\">
-                   <input type=\"text\" name=\"option_id[$data[option_id]]\" size=\"35\" class=\"input\" value=\"$data[option_text]\">
-                 </td>
-                 <td width=\"11%\" class=\"td2\">
-                   <input type=\"text\" name=\"votes[$data[option_id]]\" class=\"input2\" size=\"10\" value=\"$data[votes]\">
-                 </td>
-                 <td width=\"11%\" class=\"td2\">
-                  <select name=\"color[$data[option_id]]\" class=\"select\" onChange=\"javascript:ChangeBar(options[selectedIndex].value,$data[option_id])\">
-                  <option value=\"blank\">---</option>\n";
-        for ($j=0; $j<sizeof($source_array); $j++) {
-            if ($data["color"] == $source_array["$j"]) {
-                $poll_options .= "<option value=\"$source_array[$j]\" selected>$color_array[$j]</option>\n";
-            } else {
-                $poll_options .= "<option value=\"$source_array[$j]\">$color_array[$j]</option>\n";
-            }
-        }
-        $poll_options .= "          </select>
-                  </td>
-                  <td width=\"9%\"><img src=\"$pollvars[base_gif]/$data[color].gif\" name=\"bar$data[option_id]\" width=35 height=12></td>
-                </tr>\n";
-    }
-    $expiration = round (($row['exp_time']-time())/86400);
-    if ($expiration<=0) {
-        $expiration = 0;
-    }
-    $timestamp = '';
-    $CLASS["template"]->set_templatefiles(array(
-        "admin_edit" => "admin_edit.html"
-    ));
-    $admin_edit = $CLASS["template"]->pre_parse("admin_edit");
-    eval("echo \"$admin_edit\";");
-}
-
-function is_valid_poll_id($poll_id) {
-    global $CLASS, $POLLTBL;
-    if ($poll_id>0) {
-        $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT poll_id FROM $POLLTBL[poll_index] WHERE poll_id=$poll_id"));
-        return ($CLASS["db"]->record['poll_id']) ? true : false;
-    } else {
-        return false;
-    }
-}
-
-if (!isset($poll_id) || !is_valid_poll_id($poll_id)) {
-    $redirect = "index.php?session=$auth[session]&uid=$auth[uid]";
-    header ("Location: $redirect");
-    exit();
-}
-
-if (!isset($action)) {
-    $action='';
-}
-
-no_cache_header();
-
-switch ($action) {
-
-    case "save":
-        $message = save($poll_id);
-        $message = $lang[$message];
-        poll_edit($poll_id,"$message");
-        break;
-
-    case "extend":
-        poll_extend($poll_id);
-        break;
-
-    case "add":
-        $message = add_options($poll_id,$last_id);
-        $message = $lang[$message];
-        poll_edit($poll_id,"$message");
-        break;
-
-    default:
-        $message = $lang["EditText"];
-        poll_edit($poll_id,"$message");
-}
-
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+ 
+require "./common.inc.php";
+
+$source_array = array(
+    "aqua","blue","brown","darkgreen","gold","green","grey","orange","pink","purple","red","yellow"
+);
+
+function add_options($poll_id,$last_id) {
+    global $CLASS, $POLLTBL;
+    global $option_id, $color;
+    for($i=$last_id; $i < $last_id+10; $i++) {
+        $option_id["$i"] = trim($option_id["$i"]);
+        if (!empty($option_id["$i"])) {
+            if (!get_magic_quotes_gpc()) {
+                $option_id["$i"] = addslashes($option_id["$i"]);
+            }
+            $CLASS["db"]->query("INSERT INTO $POLLTBL[poll_data] (poll_id, option_id, option_text, color, votes) VALUES('$poll_id', '$i', '$option_id[$i]','$color[$i]',0)");
+            $added = 1;
+        }
+    }
+    return (isset($added)) ? "EditOk" : "EditNo";
+}
+
+function save($poll_id) {
+    global $CLASS, $POLLTBL;
+    global $option_id, $votes, $color, $status, $logging, $question, $exp_time, $expire, $comments;
+    if (!isset($expire)) {
+        $expire=1;
+    }
+    if (!isset($comments)) {
+        $comments=0;
+    }
+    $exp_time=time()+$exp_time*86400;
+    $question = trim($question);
+    if (!empty($question)) {
+        if (!get_magic_quotes_gpc()) {
+            $question = addslashes($question);
+        }
+        $CLASS["db"]->query("UPDATE $POLLTBL[poll_index] set question='$question', status='$status', logging='$logging', exp_time='$exp_time', expire='$expire', comments='$comments' where (poll_id = '$poll_id')");
+        $CLASS["db"]->query("select max(option_id) as max_option from $POLLTBL[poll_data] where (poll_id = '$poll_id')");
+        $data = $CLASS["db"]->fetch_array($CLASS["db"]->result);
+        for($i=1; $i <= $data["max_option"]; $i++) {
+            if (!isset($option_id["$i"])) {
+                continue;
+            }
+            $option_id["$i"] = trim($option_id["$i"]);
+            if (!empty($option_id[$i])) {
+                if (!eregi("^[0-9]+$", $votes[$i])) {
+                    $votes[$i] = 0;
+                }
+                if (!get_magic_quotes_gpc()) {
+                    $option_id[$i] = addslashes($option_id[$i]);
+                }
+                $CLASS["db"]->query("UPDATE $POLLTBL[poll_data] set option_text='$option_id[$i]', color='$color[$i]', votes='$votes[$i]' where (poll_id = '$poll_id' and option_id = '$i')");
+            } elseif (sizeof($option_id) > 2) {
+                $CLASS["db"]->query("DELETE FROM $POLLTBL[poll_data] where (poll_id = '$poll_id' and option_id = '$i')");
+            } else {
+                $message = "EditOp";
+            }
+        }
+        $message = "Updated";
+    } else {
+        $message = "NewNoQue";
+    }
+    return $message;
+}
+
+function create_javascript_array() {
+    global $pollvars, $source_array;
+    for ($i=0, $java_script=''; $i<sizeof($source_array); $i++) {
+        $java_script .= "$source_array[$i] = new Image(); $source_array[$i].src = \"$pollvars[base_gif]/$source_array[$i].gif\";\n";
+    }    
+    return $java_script;
+}
+
+function poll_extend($poll_id) {
+    global $CLASS, $POLLTBL, $source_array, $color_array, $lang, $pollvars, $auth;
+    $row = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT question as question FROM $POLLTBL[poll_index] WHERE (poll_id = '$poll_id')"));
+    $question = htmlspecialchars($row['question']);
+    $CLASS["db"]->free_result($CLASS["db"]->result);
+    $data = $CLASS["db"]->fetch_array($CLASS["db"]->query("select max(option_id) as option_id from $POLLTBL[poll_data] where (poll_id = '$poll_id')"));
+    $CLASS["db"]->free_result($CLASS["db"]->result);
+    $CLASS["template"]->set_templatefiles(array(
+        "admin_options" => "admin_options.html"
+    ));
+    $java_script = create_javascript_array();
+    $poll_options = '';
+    $data["option_id"] += 1;
+    $i = $data["option_id"];
+    $end = $i+$pollvars['def_options'];
+    for ($i; $i < $end; $i++) {
+        $poll_options .= "    <tr>
+                <td width=\"15%\" class=\"td1\">$lang[NewOption] $i</td>
+                <td width=\"48%\">
+                  <input type=\"text\" name=\"option_id[$i]\" size=\"38\" class=\"input\" maxlength=\"100\">
+                </td>
+                <td width=\"12%\" class=\"td2\">
+                  <select class=\"select\" name=\"color[$i]\" onChange=\"javascript:ChangeBar(options[selectedIndex].value,$i)\">
+                    <option value=\"blank\">---</option>\n";
+        for ($j=0; $j <sizeof($source_array); $j++) {
+            $poll_options .= "<option value=\"$source_array[$j]\">$color_array[$j]</option>\n";
+        }
+        $poll_options .= "       </select></td>
+            <td width=\"20%\"><img src=\"$pollvars[base_gif]/blank.gif\" name=\"bar$i\" width=35 height=12></td>
+        </tr>\n";
+    }
+    $last_option_id = $data["option_id"];
+    $admin_options = $CLASS["template"]->pre_parse("admin_options");
+    eval("echo \"$admin_options\";");    
+}
+
+function poll_edit($poll_id,$message) {
+    global $CLASS, $auth, $pollvars, $color_array, $source_array, $lang, $POLLTBL;
+    $row = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT * FROM $POLLTBL[poll_index] WHERE (poll_id = '$poll_id')"));
+    $question = htmlspecialchars($row['question']);
+    $CLASS["db"]->free_result($CLASS["db"]->result);
+    $java_script = create_javascript_array();
+    $CLASS["db"]->query("select * from $POLLTBL[poll_data] where (poll_id = '$poll_id') order by option_id asc");
+    $i=1;
+    $poll_options = '';
+    $status_0 = ($row['status'] == 0) ? "selected" : "";
+    $status_1 = ($row['status'] == 1) ? "selected" : "";
+    $status_2 = ($row['status'] == 2) ? "selected" : "";
+    $logging_0 = ($row['logging'] == 0) ? "selected" : "";
+    $logging_1 = ($row['logging'] == 1) ? "selected" : "";
+    $poll_comments = ($row['comments'] == 1) ? "checked" : "";
+    $poll_expire = ($row['expire'] == 0) ? "checked" : "";
+    while ($data = $CLASS["db"]->fetch_array($CLASS["db"]->result)) {
+        $i++;
+        $data["option_text"] = htmlspecialchars($data["option_text"]);
+        $poll_options .= "         <tr>
+                 <td width=\"20%\" class=\"td1\">$lang[NewOption] $data[option_id]</td>
+                 <td width=\"49%\">
+                   <input type=\"text\" name=\"option_id[$data[option_id]]\" size=\"35\" class=\"input\" value=\"$data[option_text]\">
+                 </td>
+                 <td width=\"11%\" class=\"td2\">
+                   <input type=\"text\" name=\"votes[$data[option_id]]\" class=\"input2\" size=\"10\" value=\"$data[votes]\">
+                 </td>
+                 <td width=\"11%\" class=\"td2\">
+                  <select name=\"color[$data[option_id]]\" class=\"select\" onChange=\"javascript:ChangeBar(options[selectedIndex].value,$data[option_id])\">
+                  <option value=\"blank\">---</option>\n";
+        for ($j=0; $j<sizeof($source_array); $j++) {
+            if ($data["color"] == $source_array["$j"]) {
+                $poll_options .= "<option value=\"$source_array[$j]\" selected>$color_array[$j]</option>\n";
+            } else {
+                $poll_options .= "<option value=\"$source_array[$j]\">$color_array[$j]</option>\n";
+            }
+        }
+        $poll_options .= "          </select>
+                  </td>
+                  <td width=\"9%\"><img src=\"$pollvars[base_gif]/$data[color].gif\" name=\"bar$data[option_id]\" width=35 height=12></td>
+                </tr>\n";
+    }
+    $expiration = round (($row['exp_time']-time())/86400);
+    if ($expiration<=0) {
+        $expiration = 0;
+    }
+    $timestamp = '';
+    $CLASS["template"]->set_templatefiles(array(
+        "admin_edit" => "admin_edit.html"
+    ));
+    $admin_edit = $CLASS["template"]->pre_parse("admin_edit");
+    eval("echo \"$admin_edit\";");
+}
+
+function is_valid_poll_id($poll_id) {
+    global $CLASS, $POLLTBL;
+    if ($poll_id>0) {
+        $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT poll_id FROM $POLLTBL[poll_index] WHERE poll_id=$poll_id"));
+        return ($CLASS["db"]->record['poll_id']) ? true : false;
+    } else {
+        return false;
+    }
+}
+
+if (!isset($poll_id) || !is_valid_poll_id($poll_id)) {
+    $redirect = "index.php?session=$auth[session]&uid=$auth[uid]";
+    header ("Location: $redirect");
+    exit();
+}
+
+if (!isset($action)) {
+    $action='';
+}
+
+no_cache_header();
+
+switch ($action) {
+
+    case "save":
+        $message = save($poll_id);
+        $message = $lang[$message];
+        poll_edit($poll_id,"$message");
+        break;
+
+    case "extend":
+        poll_extend($poll_id);
+        break;
+
+    case "add":
+        $message = add_options($poll_id,$last_id);
+        $message = $lang[$message];
+        poll_edit($poll_id,"$message");
+        break;
+
+    default:
+        $message = $lang["EditText"];
+        poll_edit($poll_id,"$message");
+}
+
+
 ?>
\ No newline at end of file

Index: admin_embed.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/admin_embed.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_embed.php	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_embed.php	18 Sep 2004 16:00:40 -0000	1.2
@@ -1,39 +1,39 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
- 
-require "./common.inc.php";
-
-$record = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT * FROM $POLLTBL[poll_index] WHERE (poll_id = '$poll_id')"));
-if (!isset($poll_id) || ($record['status']==2)) {
-    $redirect = "index.php?session=$auth[session]&uid=$auth[uid]";
-    header ("Location: $redirect");
-    exit();
-}
-$path = dirname(__file__);
-$path = dirname("$path");
-if (eregi("WIN",PHP_OS)) {
-    $path = str_replace("\\","/",$path);
-}
-if (ereg("^3.",PHP_VERSION)) {
-    $include_statement = "include";
-} else {
-    $version = ereg_replace("([^0-9])", "", PHP_VERSION);
-    $version = $version / pow (10, strlen($version) - 1);
-    $include_statement = ($version >= 4.02) ? "include_once" : "include";
-}
-$question = htmlspecialchars($record['question']);
-$CLASS["db"]->free_result($CLASS["db"]->result);
-$CLASS["template"]->set_templatefiles(array(
-    "admin_embed" => "admin_embed.html"
-));
-$admin_embed = $CLASS["template"]->pre_parse("admin_embed");
-no_cache_header();
-eval("echo \"$admin_embed\";");
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+ 
+require "./common.inc.php";
+
+$record = $CLASS["db"]->fetch_array($CLASS["db"]->query("SELECT * FROM $POLLTBL[poll_index] WHERE (poll_id = '$poll_id')"));
+if (!isset($poll_id) || ($record['status']==2)) {
+    $redirect = "index.php?session=$auth[session]&uid=$auth[uid]";
+    header ("Location: $redirect");
+    exit();
+}
+$path = dirname(__file__);
+$path = dirname("$path");
+if (eregi("WIN",PHP_OS)) {
+    $path = str_replace("\\","/",$path);
+}
+if (ereg("^3.",PHP_VERSION)) {
+    $include_statement = "include";
+} else {
+    $version = ereg_replace("([^0-9])", "", PHP_VERSION);
+    $version = $version / pow (10, strlen($version) - 1);
+    $include_statement = ($version >= 4.02) ? "include_once" : "include";
+}
+$question = htmlspecialchars($record['question']);
+$CLASS["db"]->free_result($CLASS["db"]->result);
+$CLASS["template"]->set_templatefiles(array(
+    "admin_embed" => "admin_embed.html"
+));
+$admin_embed = $CLASS["template"]->pre_parse("admin_embed");
+no_cache_header();
+eval("echo \"$admin_embed\";");
+
 ?>
\ No newline at end of file

Index: admin_templates_misc.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/admin_templates_misc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_templates_misc.php	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_templates_misc.php	18 Sep 2004 16:00:40 -0000	1.2
@@ -1,84 +1,84 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
- 
-require "./common.inc.php";
-
-fun...
 
[truncated message content]

[Devil-linux-commit] web/poll comments.php,1.1.1.1,1.2 png.php,1.1.1.1,1.2 poll_cookie.php,1.1.1.1,1.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll

Modified Files:
	comments.php png.php poll_cookie.php 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


Index: comments.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/comments.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- comments.php	2 Jun 2004 13:05:48 -0000	1.1.1.1
+++ comments.php	18 Sep 2004 16:00:35 -0000	1.2
@@ -1,73 +1,73 @@
-<?php
-global $HTTP_SERVER_VARS, $HTTP_GET_VARS, $HTTP_POST_VARS;
-$include_path = dirname(__FILE__);
-if ($include_path == "/") {
-    $include_path = ".";
-}
-
-$id = (isset($HTTP_POST_VARS['id'])) ? intval($HTTP_POST_VARS['id']) : "";
-if ($id == "") {
-	if (isset($HTTP_GET_VARS['id'])) {
-		$id = intval($HTTP_GET_VARS['id']);
-	}
-}
-
-$template_set = (isset($HTTP_POST_VARS['template_set'])) ? trim($HTTP_POST_VARS['template_set']) : "";
-if ($template_set == "") {
-	if (isset($HTTP_GET_VARS['template_set'])) {
-		$template_set = trim($HTTP_GET_VARS['template_set']);
-	}
-}
-
-$action = (isset($HTTP_POST_VARS['action'])) ? trim($HTTP_POST_VARS['action']) : "";
-if ($action == "") {
-	if (isset($HTTP_GET_VARS['action'])) {
-		$action = trim($HTTP_GET_VARS['action']);
-	}
-}
-
-require $include_path."/include/config.inc.php";
-require $include_path."/include/$POLLDB[class]";
-require $include_path."/include/class_poll.php";
-require $include_path."/include/class_pollcomment.php";
-$CLASS["db"] = new polldb_sql;
-$CLASS["db"]->connect();
-
-$my_comment = new pollcomment();
-
-if (!empty($template_set)) {
-    $my_comment->set_template_set("$template_set");
-}
-if (empty($id)) {
-    echo $my_comment->print_message("Poll ID <b>".$id."</b> does not exist or is disabled!");
-} elseif ($my_comment->is_comment_allowed($id)) {
-    if ($action == "add") {
-        $poll_input = array("message","name","email");
-        for($i=0;$i<sizeof($poll_input);$i++) {
-            if (isset($HTTP_POST_VARS[$poll_input[$i]])) {     
-                $HTTP_POST_VARS[$poll_input[$i]] = trim($HTTP_POST_VARS[$poll_input[$i]]);    
-            } else {
-                $HTTP_POST_VARS[$poll_input[$i]] = '';
-            }
-        }
-        if (empty($HTTP_POST_VARS['name'])) {
-            echo $my_comment->print_message("Please enter your name.<br><a href=\"javascript:history.back()\">Go back</a>");
-        }
-        elseif (empty($HTTP_POST_VARS['message'])) {
-            echo $my_comment->print_message("You forgot to fill in the message field!<br><a href=\"javascript:history.back()\">Go back</a>");
-        }
-    /*
-        elseif (empty($HTTP_POST_VARS['email'])) {
-            echo $my_comment->print_message("You must specify your e-mail address.!<br><a href=\"javascript:history.back()\">Go back</a>");
-        }
-    */
-        else {
-            $my_comment->add_comment($id);
-            echo $my_comment->print_message("Your message has been sent!",1);
-        }
-    } else {
-        echo $my_comment->poll_form($id);
-    }
-}
-
+<?php
+global $HTTP_SERVER_VARS, $HTTP_GET_VARS, $HTTP_POST_VARS;
+$include_path = dirname(__FILE__);
+if ($include_path == "/") {
+    $include_path = ".";
+}
+
+$id = (isset($HTTP_POST_VARS['id'])) ? intval($HTTP_POST_VARS['id']) : "";
+if ($id == "") {
+	if (isset($HTTP_GET_VARS['id'])) {
+		$id = intval($HTTP_GET_VARS['id']);
+	}
+}
+
+$template_set = (isset($HTTP_POST_VARS['template_set'])) ? trim($HTTP_POST_VARS['template_set']) : "";
+if ($template_set == "") {
+	if (isset($HTTP_GET_VARS['template_set'])) {
+		$template_set = trim($HTTP_GET_VARS['template_set']);
+	}
+}
+
+$action = (isset($HTTP_POST_VARS['action'])) ? trim($HTTP_POST_VARS['action']) : "";
+if ($action == "") {
+	if (isset($HTTP_GET_VARS['action'])) {
+		$action = trim($HTTP_GET_VARS['action']);
+	}
+}
+
+require $include_path."/include/config.inc.php";
+require $include_path."/include/$POLLDB[class]";
+require $include_path."/include/class_poll.php";
+require $include_path."/include/class_pollcomment.php";
+$CLASS["db"] = new polldb_sql;
+$CLASS["db"]->connect();
+
+$my_comment = new pollcomment();
+
+if (!empty($template_set)) {
+    $my_comment->set_template_set("$template_set");
+}
+if (empty($id)) {
+    echo $my_comment->print_message("Poll ID <b>".$id."</b> does not exist or is disabled!");
+} elseif ($my_comment->is_comment_allowed($id)) {
+    if ($action == "add") {
+        $poll_input = array("message","name","email");
+        for($i=0;$i<sizeof($poll_input);$i++) {
+            if (isset($HTTP_POST_VARS[$poll_input[$i]])) {     
+                $HTTP_POST_VARS[$poll_input[$i]] = trim($HTTP_POST_VARS[$poll_input[$i]]);    
+            } else {
+                $HTTP_POST_VARS[$poll_input[$i]] = '';
+            }
+        }
+        if (empty($HTTP_POST_VARS['name'])) {
+            echo $my_comment->print_message("Please enter your name.<br><a href=\"javascript:history.back()\">Go back</a>");
+        }
+        elseif (empty($HTTP_POST_VARS['message'])) {
+            echo $my_comment->print_message("You forgot to fill in the message field!<br><a href=\"javascript:history.back()\">Go back</a>");
+        }
+    /*
+        elseif (empty($HTTP_POST_VARS['email'])) {
+            echo $my_comment->print_message("You must specify your e-mail address.!<br><a href=\"javascript:history.back()\">Go back</a>");
+        }
+    */
+        else {
+            $my_comment->add_comment($id);
+            echo $my_comment->print_message("Your message has been sent!",1);
+        }
+    } else {
+        echo $my_comment->poll_form($id);
+    }
+}
+
 ?>
\ No newline at end of file

Index: poll_cookie.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/poll_cookie.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- poll_cookie.php	2 Jun 2004 13:05:48 -0000	1.1.1.1
+++ poll_cookie.php	18 Sep 2004 16:00:36 -0000	1.2
@@ -1,25 +1,25 @@
-<?php
-/**
- * ----------------------------------------------
- * this code is optional
- * Important! You have to include it 
- * before your html code
- * ----------------------------------------------
- */
-
-$cookie_expire = 96; // hours
-
-$action = (isset($HTTP_GET_VARS['action'])) ? $HTTP_GET_VARS['action'] : '';
-$action = (isset($HTTP_POST_VARS['action'])) ? $HTTP_POST_VARS['action'] : $action;
-$poll_ident = (isset($HTTP_GET_VARS['poll_ident'])) ? $HTTP_GET_VARS['poll_ident'] : '';
-$poll_ident = (isset($HTTP_POST_VARS['poll_ident'])) ? $HTTP_POST_VARS['poll_ident'] : $poll_ident;
-
-if ($action=="vote" && (isset($HTTP_POST_VARS['option_id']) || isset($HTTP_GET_VARS['option_id']))) {
-    $cookie_name = "AdvancedPoll".$poll_ident;
-    if (!isset($HTTP_COOKIE_VARS[$cookie_name])) {
-        $endtime = time()+3600*$cookie_expire;
-        setcookie($cookie_name, "1", $endtime);
-    }
-}
-
+<?php
+/**
+ * ----------------------------------------------
+ * this code is optional
+ * Important! You have to include it 
+ * before your html code
+ * ----------------------------------------------
+ */
+
+$cookie_expire = 96; // hours
+
+$action = (isset($HTTP_GET_VARS['action'])) ? $HTTP_GET_VARS['action'] : '';
+$action = (isset($HTTP_POST_VARS['action'])) ? $HTTP_POST_VARS['action'] : $action;
+$poll_ident = (isset($HTTP_GET_VARS['poll_ident'])) ? $HTTP_GET_VARS['poll_ident'] : '';
+$poll_ident = (isset($HTTP_POST_VARS['poll_ident'])) ? $HTTP_POST_VARS['poll_ident'] : $poll_ident;
+
+if ($action=="vote" && (isset($HTTP_POST_VARS['option_id']) || isset($HTTP_GET_VARS['option_id']))) {
+    $cookie_name = "AdvancedPoll".$poll_ident;
+    if (!isset($HTTP_COOKIE_VARS[$cookie_name])) {
+        $endtime = time()+3600*$cookie_expire;
+        setcookie($cookie_name, "1", $endtime);
+    }
+}
+
 ?>
\ No newline at end of file

Index: png.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/png.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- png.php	2 Jun 2004 13:05:48 -0000	1.1.1.1
+++ png.php	18 Sep 2004 16:00:36 -0000	1.2
@@ -1,34 +1,34 @@
-<?php
-$include_path = dirname(__FILE__);
-
-if (!isset($PHP_SELF)) {
-    $PHP_SELF = $HTTP_SERVER_VARS["PHP_SELF"];
-    if (isset($HTTP_GET_VARS)) {
-        while (list($name, $value)=each($HTTP_GET_VARS)) {
-            $$name=$value;
-        }
-    }
-    if (isset($HTTP_POST_VARS)) {
-        while (list($name, $value)=each($HTTP_POST_VARS)) {
-            $$name=$value;
-        }
-    }
-    if(isset($HTTP_COOKIE_VARS)){
-        while (list($name, $value)=each($HTTP_COOKIE_VARS)){
-            $$name=$value;
-        }
-    }
-}
-
-require $include_path."/include/config.inc.php";
-require $include_path."/include/$POLLDB[class]";
-require $include_path."/include/class_poll.php";
-require $include_path."/include/class_pgfx.php";
-
-$CLASS["db"] = new polldb_sql;
-$CLASS["db"]->connect();
-$php_poll = new pgfx();
-if (isset($poll_id)) {
-    $php_poll->output_png($poll_id,100);
-}
+<?php
+$include_path = dirname(__FILE__);
+
+if (!isset($PHP_SELF)) {
+    $PHP_SELF = $HTTP_SERVER_VARS["PHP_SELF"];
+    if (isset($HTTP_GET_VARS)) {
+        while (list($name, $value)=each($HTTP_GET_VARS)) {
+            $$name=$value;
+        }
+    }
+    if (isset($HTTP_POST_VARS)) {
+        while (list($name, $value)=each($HTTP_POST_VARS)) {
+            $$name=$value;
+        }
+    }
+    if(isset($HTTP_COOKIE_VARS)){
+        while (list($name, $value)=each($HTTP_COOKIE_VARS)){
+            $$name=$value;
+        }
+    }
+}
+
+require $include_path."/include/config.inc.php";
+require $include_path."/include/$POLLDB[class]";
+require $include_path."/include/class_poll.php";
+require $include_path."/include/class_pgfx.php";
+
+$CLASS["db"] = new polldb_sql;
+$CLASS["db"]->connect();
+$php_poll = new pgfx();
+if (isset($poll_id)) {
+    $php_poll->output_png($poll_id,100);
+}
 ?>
\ No newline at end of file

[Devil-linux-commit] web/poll/lang albanian.php,1.1.1.1,1.2 arabic.php,1.1.1.1,1.2 bulgarian.php,1.1.1.1,1.2 chinesebig5.php,1.1.1.1,1.2 croatian.php,1.1.1.1,1.2 czech.php,1.1.1.1,1.2 danish.php,1.1.1.1,1.2 dutch.php,1.1.1.1,1.2 english.php,1.1.1.1,1.2 estonia.php,1.1.1.1,1.2 french.php,1.1.1.1,1.2 gb2312.php,1.1.1.1,1.2 german.php,1.1.1.1,1.2 hungarian.php,1.1.1.1,1.2 indonesian.php,1.1.1.1,1.2 italian.php,1.1.1.1,1.2 japanese_euc.php,1.1.1.1,1.2 japanese_sjis.php,1.1.1.1,1.2 korean.php,1.1.1.1,1.2 macedonian.php,1.1.1.1,1.2 norwegian.php,1.1.1.1,1.2 polish.php,1.1.1.1,1.2 poll_translation.txt,1.1.1.1,1.2 portuguese.php,1.1.1.1,1.2 russian.php,1.1.1.1,1.2 slovak.php,1.1.1.1,1.2 slovenian.php,1.1.1.1,1.2 spanish.php,1.1.1.1,1.2 swedish.php,1.1.1.1,1.2 turkish.php,1.1.1.1,1.2 ukrainian.php,1.1.1.1,1.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll/lang

Modified Files:
	albanian.php arabic.php bulgarian.php chinesebig5.php 
	croatian.php czech.php danish.php dutch.php english.php 
	estonia.php french.php gb2312.php german.php hungarian.php 
	indonesian.php italian.php japanese_euc.php japanese_sjis.php 
	korean.php macedonian.php norwegian.php polish.php 
	poll_translation.txt portuguese.php russian.php slovak.php 
	slovenian.php spanish.php swedish.php turkish.php 
	ukrainian.php 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


Index: bulgarian.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/lang/bulgarian.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- bulgarian.php	2 Jun 2004 13:05:49 -0000	1.1.1.1
+++ bulgarian.php	18 Sep 2004 16:00:42 -0000	1.2
@@ -1,178 +1,178 @@
-<?php
-
-/* Charset */
-$lang['charset']   = "windows-1251";
-
-
-/* General */
-$lang['Logout']    = "Èçõîä";
-$lang['FormUndo']  = "Îòêàæè ïðîìåíèòå";
-$lang['FromClear'] = "Íóëèðàíå";
-$lang['FormEnter'] = "Ìîëÿ, âúâåäåòå ïðàâèëíè ïîòðåáèòåë è ïàðîëà";
-$lang['FormWrong'] = "Ãðåøíè ïîòðåáèòåë èëè ïàðîëà";
-$lang['FormOK']    = "Âõîä";
-$lang['Updated']   = "Ïðîìåíèòå ñà ïîòâüðäåíè!";
-$lang['NoUpdate']  = "Ãðåøêà! Íÿìà ïðîìåíè!";
-$lang['Confirm']   = "Ñèãóðåí ëè ñòå?";
-$lang['NavNext']   = "Ñëåäâàùà ñòðàíèöà";
-$lang['NavPrev']   = "Ïðåäèøíà ñòðàíèöà";
-$lang['License']   = "";
-$lang['ScrollTxt'] = "Íàòèñíåòå PAGE DOWN êëàâèøà çà äà âèäèòå öÿëîòî ëèöåíçíî ñïîðàçóìåíèå";
-
-/* Templates */
-$lang['Templates']  = "Øàáëîíè";
-$lang['tpl_exist']  = "Èìåòî íà øàáëîíúò âå÷å ñúùåñòâóâà.";
-$lang['tpl_new']    = "Äîáàâè øàáëîí.";
-$lang['tpl_succes'] = "Çàïèñúò å äîáàâåí!"; 
-$lang['tpl_bad']    = "Èìåòî íà øàáëîíúò å íåâàëèäíî!";
-$lang['tpl_save']   = "Çàïèñ";
-$lang['preview']    = "Ïðåãëåä";
-$lang['newtpl']     = "Íîâ øàáëîí";
-
-/* Poll List */
-$lang['IndexTitle']  = "Àíêåòåí ñïèñúê";
-$lang['IndexQuest']  = "Âúïðîñ";
-$lang['IndexID']     = "Àíêåòà ¹";
-$lang['IndexDate']   = "Äàòà";
-$lang['IndexDays']   = "Äíè";
-$lang['IndexExp']    = "Èçòè÷à íà";
-$lang['IndexExpire'] = "èçòåêëà";
-$lang['IndexNever']  = "íèêîãà";
-$lang['IndexStat']   = "Ñòàòèñòèêà";
-$lang['IndexCom']    = "Êîìåíòàð";
-$lang['IndexAct']    = "Äåéñòâèå";
-$lang['IndexDel']    = "èçòðèâàíå";
-
-/* Create A New Poll */
-$lang['NewTitle']  = "Ñúçäàé íîâà àíêåòà";
-$lang['NewOption'] = "Îïöèÿ";
-$lang['NewNoQue']  = "Çàáðàâèëè ñòå äà ïîïúëíèòå ïîëåòî ñ âúïðîñà";
-$lang['NewNoOpt']  = "Çàáðàâèëè ñòå äà ïîïúëíèòå ïîëåòî ñ îïöèéòå";
-
-/* Poll Edit */
-$lang['EditStat']  = "Ñòàòóñ";
-$lang['EditText']  = "Ðåäàêòèðàé àíêåòàòà";
-$lang['EditReset'] = "Èç÷èñòè àíêåòàòà";
-$lang['EditOn']    = "âêëþ÷åíî";
-$lang['EditOff']   = "èçêëþ÷åíî";
-$lang['EditHide']  = "ñêðèò";
-$lang['EditLgOff'] = "logging off";
-$lang['EditLgOn']  = "logging on";
-$lang['EditAdd']   = "Äîáàâè îïöèè";
-$lang['EditNo']    = "Äîáàâåíà å íîâà îïöèÿ!";
-$lang['EditOk']    = "Îïöèÿòÿ å äîáàâåíà!";
-$lang['EditSave']  = "Çàïèñ íà ïðîìåíèòå";
-$lang['EditOp']    = "Íåîáõîäèìè ñà íàé-ìàëêî äâå îïöèè!";
-$lang['EditMis']   = "Íå îïðåäåëåí âúïðîñà è îïöèèòå ìó!";
-$lang['EditDel']   = "Çà äà èçòðèåòå îïöèÿ, îñòàâåòå ïîëåòî è ïðàçíî";
-$lang['EditCom']   = "Ðàçðåøè êîìåíòàðè";
-
-/* General Settings */
-$lang['SetTitle']   = "Îñíîâíè íàñòðîéêè";
-$lang['SetOption']  = "Òàáëèöà, øðèôò è öâåòîâè îïöèè";
-$lang['SetMisc']    = "Ðàçíè";
-$lang['SetText']    = "Ïðîìåíè îñíîâíèòå íàñòðîéêè";
-$lang['SetURL']     = "ïúò äî êàðòèíêàòà";
-$lang['SetBURL']    = "ïúò äî àíêåòàòà";
-$lang['SetNo']      = "No trailing slash";
-$lang['SetLang']    = "Åçèê";
-$lang['SetPoll']    = "Çàãëàâèå íà àíêåòà";
-$lang['SetButton']  = "Áóòîí çà ãëàñóâàíå";
-$lang['SetResult']  = "Ëèíê çà ðåçóëòàòè";
-$lang['SetVoted']   = "Âå÷å å ãëàñóâàíî";
-$lang['SetComment'] = "Èýïðàòåòå âàøåòî ìíåíèå";
-$lang['SetTab']     = "Ùèðî÷èíà íà òàáëèöàòà";
-$lang['SetBarh']    = "Âèñî÷èíà íà áàð-à";
-$lang['SetBarMax']  = "Ìàêñ. äúëæèíà íà áàð-à";
-$lang['SetTabBg']   = "Öâÿò íà ôîíà";
-$lang['SetFrmCol']  = "Öâÿò íà ðàìêàòà";
-$lang['SetFontCol'] = "Öâÿò íà øðèôòà";
-$lang['SetFace']    = "Øðèôò";
-$lang['SetShow']    = "Ïîêàæè ðåçóëòàòèòå â";
-$lang['SetPerc']    = "ïðîöåíòè";
-$lang['SetVotes']   = "áðîé ãëàñîâå";
-$lang['SetCheck']   = "Ïðîâåðè";
-$lang['SetNoCheck'] = "áåç ïðîâåðêà";
-$lang['SetIP']      = "IP òàáëèöà";
-$lang['SetTime']    = "âðåìå íà çàêëþ÷âîíå";
-$lang['SetHours']   = "÷àñà";
-$lang['SetOffset']  = "×àñîâà çîíà íà ñúðâúðà";
-$lang['SetEntry']   = "Áðîé êîìåíòàðè íà ñòðàíèöà";
-$lang['SetSubmit']  = "Ïîòâúðäè ïðîìåíèòå";
-$lang['SetEmpty']   = "Íåâàëèäíà ñòîéíîñò";
-$lang['SetSort']    = "Ðåä íî ïîêàçâàíå";
-$lang['SetAsc']     = "íàðàñòâàùî";
-$lang['SetDesc']    = "íàìàëÿâàùî";
-$lang['Setusort']   = "áåç ñîðòèðàíå";
-$lang['SetOptions'] = "Îïöèè ïîçâîëåíè â íîâèòå àíêåòè";
-$lang['SetPolls']   = "Àíêåòè íà ñòðàíèöà";
-
-/* Change Password */
-$lang['PwdTitle'] = "Ñìÿíà íà ïàðîëà";
-$lang['PwdText']  = "Ñìÿíà íà ïîòðåáèòåë èëè ïàðîëà";
-$lang['PwdUser']  = "Ïîòðåáèòåë";
-$lang['PwdPass']  = "Ïàðîëà";
-$lang['PwdConf']  = "Ïîòâúðäè ïàðîëàòà";
-$lang['PwdNoUsr'] = "Çàáðàâèëè ñòå äà ïîïúëíèòå ïîëåòî ïîòðåáèòåë";
-$lang['PwdNoPwd'] = "Çàáðàâèëè ñòå äà ïîïúëíèòå ïîëåòî ïàðîëà";
-$lang['PwdBad']   = "Ïàðîëèòå íå ñúâïàäàò";
-
-/* Poll Stats */
-$lang['StatCrea']  = "Ñúýäàäåí";
-$lang['StatAct']   = "Àêòèâåí";
-$lang['StatReset'] = "Íóëèðàé ñòàòèñòèêàòà";
-$lang['StatDis']   = "íÿìÿ âõîä çà òàçè àíêåòà";
-$lang['StatTotal'] = "îáùî ãëàñóâàëè";
-$lang['StatDay']   = "ãëàñóâàëè íà äåí";
-
-/* Poll Comments */
-$lang['ComTotal']  = "Îáùî ìíåíèÿ";
-$lang['ComName']   = "Èìå";
-$lang['ComPost']   = "ïðàòåíî";
-$lang['ComDel']    = "Ñèãóðåí ëè ñòå, ÷å èñêàòå äà èçòðèåòå ñúîáùåíèåòî?";
-
-/* Help */
-$lang['Help']       = "Ïîìîù";
-$lang['HelpPoll']   = "Çà äà âíåäðèòå àíêåòàòà â óåá ñòðàíèöà âêàðàéòå êîäà ïîêàçàí äîëó";
-$lang['HelpRand']   = "Èìà âúçìîæíîñò äà ïîêàçâàòå ðàçëè÷íè àíêåòè";
-$lang['HelpNew']    = "Âèíàãè ïîêàçâàé ïåñëåäíàòà àíêåòà";
-$lang['HelpSyntax'] = "Ñèíòàêñèñ";
-
-/* Days */
-$weekday[0] = "Íåäåëÿ";
-$weekday[1] = "Ïîíåäåëíèê";
-$weekday[2] = "Âòîðíèê";
-$weekday[3] = "Ñðÿäà";
-$weekday[4] = "×åòâúðòúê";
-$weekday[5] = "Ïåòúê";
-$weekday[6] = "Ñúáîòà";
-
-/* Months */
-$months[0]  = "ßíóàðè";
-$months[1]  = "Ôåâðóàðè";
-$months[2]  = "Ìàðò";
-$months[3]  = "Àïðèë";
-$months[4]  = "Ìàé";
-$months[5]  = "Þíè";
-$months[6]  = "Þëè";
-$months[7]  = "Àâãóñò";
-$months[8]  = "Ñåïòåìâðè";
-$months[9]  = "Îêòîìâðè";
-$months[10] = "Íîåìâðè";
-$months[11] = "Äåêåìâðè";
-
-/* Colors */
-$color_array[0]  = "àêâà";
-$color_array[1]  = "ñèí";
-$color_array[2]  = "êàôÿâ";
-$color_array[3]  = "òúìíî-çåëåí";
-$color_array[4]  = "çëàòíî";
-$color_array[5]  = "çåëåí";
-$color_array[6]  = "ñèâ";
-$color_array[7]  = "îðàíæåâ";
-$color_array[8]  = "ðîçîâ";
-$color_array[9]  = "ïóðïóð";
-$color_array[10] = "÷åðâåí";
-$color_array[11] = "æúëò";
-
+<?php
+
+/* Charset */
+$lang['charset']   = "windows-1251";
+
+
+/* General */
+$lang['Logout']    = "Èçõîä";
+$lang['FormUndo']  = "Îòêàæè ïðîìåíèòå";
+$lang['FromClear'] = "Íóëèðàíå";
+$lang['FormEnter'] = "Ìîëÿ, âúâåäåòå ïðàâèëíè ïîòðåáèòåë è ïàðîëà";
+$lang['FormWrong'] = "Ãðåøíè ïîòðåáèòåë èëè ïàðîëà";
+$lang['FormOK']    = "Âõîä";
+$lang['Updated']   = "Ïðîìåíèòå ñà ïîòâüðäåíè!";
+$lang['NoUpdate']  = "Ãðåøêà! Íÿìà ïðîìåíè!";
+$lang['Confirm']   = "Ñèãóðåí ëè ñòå?";
+$lang['NavNext']   = "Ñëåäâàùà ñòðàíèöà";
+$lang['NavPrev']   = "Ïðåäèøíà ñòðàíèöà";
+$lang['License']   = "";
+$lang['ScrollTxt'] = "Íàòèñíåòå PAGE DOWN êëàâèøà çà äà âèäèòå öÿëîòî ëèöåíçíî ñïîðàçóìåíèå";
+
+/* Templates */
+$lang['Templates']  = "Øàáëîíè";
+$lang['tpl_exist']  = "Èìåòî íà øàáëîíúò âå÷å ñúùåñòâóâà.";
+$lang['tpl_new']    = "Äîáàâè øàáëîí.";
+$lang['tpl_succes'] = "Çàïèñúò å äîáàâåí!"; 
+$lang['tpl_bad']    = "Èìåòî íà øàáëîíúò å íåâàëèäíî!";
+$lang['tpl_save']   = "Çàïèñ";
+$lang['preview']    = "Ïðåãëåä";
+$lang['newtpl']     = "Íîâ øàáëîí";
+
+/* Poll List */
+$lang['IndexTitle']  = "Àíêåòåí ñïèñúê";
+$lang['IndexQuest']  = "Âúïðîñ";
+$lang['IndexID']     = "Àíêåòà ¹";
+$lang['IndexDate']   = "Äàòà";
+$lang['IndexDays']   = "Äíè";
+$lang['IndexExp']    = "Èçòè÷à íà";
+$lang['IndexExpire'] = "èçòåêëà";
+$lang['IndexNever']  = "íèêîãà";
+$lang['IndexStat']   = "Ñòàòèñòèêà";
+$lang['IndexCom']    = "Êîìåíòàð";
+$lang['IndexAct']    = "Äåéñòâèå";
+$lang['IndexDel']    = "èçòðèâàíå";
+
+/* Create A New Poll */
+$lang['NewTitle']  = "Ñúçäàé íîâà àíêåòà";
+$lang['NewOption'] = "Îïöèÿ";
+$lang['NewNoQue']  = "Çàáðàâèëè ñòå äà ïîïúëíèòå ïîëåòî ñ âúïðîñà";
+$lang['NewNoOpt']  = "Çàáðàâèëè ñòå äà ïîïúëíèòå ïîëåòî ñ îïöèéòå";
+
+/* Poll Edit */
+$lang['EditStat']  = "Ñòàòóñ";
+$lang['EditText']  = "Ðåäàêòèðàé àíêåòàòà";
+$lang['EditReset'] = "Èç÷èñòè àíêåòàòà";
+$lang['EditOn']    = "âêëþ÷åíî";
+$lang['EditOff']   = "èçêëþ÷åíî";
+$lang['EditHide']  = "ñêðèò";
+$lang['EditLgOff'] = "logging off";
+$lang['EditLgOn']  = "logging on";
+$lang['EditAdd']   = "Äîáàâè îïöèè";
+$lang['EditNo']    = "Äîáàâåíà å íîâà îïöèÿ!";
+$lang['EditOk']    = "Îïöèÿòÿ å äîáàâåíà!";
+$lang['EditSave']  = "Çàïèñ íà ïðîìåíèòå";
+$lang['EditOp']    = "Íåîáõîäèìè ñà íàé-ìàëêî äâå îïöèè!";
+$lang['EditMis']   = "Íå îïðåäåëåí âúïðîñà è îïöèèòå ìó!";
+$lang['EditDel']   = "Çà äà èçòðèåòå îïöèÿ, îñòàâåòå ïîëåòî è ïðàçíî";
+$lang['EditCom']   = "Ðàçðåøè êîìåíòàðè";
+
+/* General Settings */
+$lang['SetTitle']   = "Îñíîâíè íàñòðîéêè";
+$lang['SetOption']  = "Òàáëèöà, øðèôò è öâåòîâè îïöèè";
+$lang['SetMisc']    = "Ðàçíè";
+$lang['SetText']    = "Ïðîìåíè îñíîâíèòå íàñòðîéêè";
+$lang['SetURL']     = "ïúò äî êàðòèíêàòà";
+$lang['SetBURL']    = "ïúò äî àíêåòàòà";
+$lang['SetNo']      = "No trailing slash";
+$lang['SetLang']    = "Åçèê";
+$lang['SetPoll']    = "Çàãëàâèå íà àíêåòà";
+$lang['SetButton']  = "Áóòîí çà ãëàñóâàíå";
+$lang['SetResult']  = "Ëèíê çà ðåçóëòàòè";
+$lang['SetVoted']   = "Âå÷å å ãëàñóâàíî";
+$lang['SetComment'] = "Èýïðàòåòå âàøåòî ìíåíèå";
+$lang['SetTab']     = "Ùèðî÷èíà íà òàáëèöàòà";
+$lang['SetBarh']    = "Âèñî÷èíà íà áàð-à";
+$lang['SetBarMax']  = "Ìàêñ. äúëæèíà íà áàð-à";
+$lang['SetTabBg']   = "Öâÿò íà ôîíà";
+$lang['SetFrmCol']  = "Öâÿò íà ðàìêàòà";
+$lang['SetFontCol'] = "Öâÿò íà øðèôòà";
+$lang['SetFace']    = "Øðèôò";
+$lang['SetShow']    = "Ïîêàæè ðåçóëòàòèòå â";
+$lang['SetPerc']    = "ïðîöåíòè";
+$lang['SetVotes']   = "áðîé ãëàñîâå";
+$lang['SetCheck']   = "Ïðîâåðè";
+$lang['SetNoCheck'] = "áåç ïðîâåðêà";
+$lang['SetIP']      = "IP òàáëèöà";
+$lang['SetTime']    = "âðåìå íà çàêëþ÷âîíå";
+$lang['SetHours']   = "÷àñà";
+$lang['SetOffset']  = "×àñîâà çîíà íà ñúðâúðà";
+$lang['SetEntry']   = "Áðîé êîìåíòàðè íà ñòðàíèöà";
+$lang['SetSubmit']  = "Ïîòâúðäè ïðîìåíèòå";
+$lang['SetEmpty']   = "Íåâàëèäíà ñòîéíîñò";
+$lang['SetSort']    = "Ðåä íî ïîêàçâàíå";
+$lang['SetAsc']     = "íàðàñòâàùî";
+$lang['SetDesc']    = "íàìàëÿâàùî";
+$lang['Setusort']   = "áåç ñîðòèðàíå";
+$lang['SetOptions'] = "Îïöèè ïîçâîëåíè â íîâèòå àíêåòè";
+$lang['SetPolls']   = "Àíêåòè íà ñòðàíèöà";
+
+/* Change Password */
+$lang['PwdTitle'] = "Ñìÿíà íà ïàðîëà";
+$lang['PwdText']  = "Ñìÿíà íà ïîòðåáèòåë èëè ïàðîëà";
+$lang['PwdUser']  = "Ïîòðåáèòåë";
+$lang['PwdPass']  = "Ïàðîëà";
+$lang['PwdConf']  = "Ïîòâúðäè ïàðîëàòà";
+$lang['PwdNoUsr'] = "Çàáðàâèëè ñòå äà ïîïúëíèòå ïîëåòî ïîòðåáèòåë";
+$lang['PwdNoPwd'] = "Çàáðàâèëè ñòå äà ïîïúëíèòå ïîëåòî ïàðîëà";
+$lang['PwdBad']   = "Ïàðîëèòå íå ñúâïàäàò";
+
+/* Poll Stats */
+$lang['StatCrea']  = "Ñúýäàäåí";
+$lang['StatAct']   = "Àêòèâåí";
+$lang['StatReset'] = "Íóëèðàé ñòàòèñòèêàòà";
+$lang['StatDis']   = "íÿìÿ âõîä çà òàçè àíêåòà";
+$lang['StatTotal'] = "îáùî ãëàñóâàëè";
+$lang['StatDay']   = "ãëàñóâàëè íà äåí";
+
+/* Poll Comments */
+$lang['ComTotal']  = "Îáùî ìíåíèÿ";
+$lang['ComName']   = "Èìå";
+$lang['ComPost']   = "ïðàòåíî";
+$lang['ComDel']    = "Ñèãóðåí ëè ñòå, ÷å èñêàòå äà èçòðèåòå ñúîáùåíèåòî?";
+
+/* Help */
+$lang['Help']       = "Ïîìîù";
+$lang['HelpPoll']   = "Çà äà âíåäðèòå àíêåòàòà â óåá ñòðàíèöà âêàðàéòå êîäà ïîêàçàí äîëó";
+$lang['HelpRand']   = "Èìà âúçìîæíîñò äà ïîêàçâàòå ðàçëè÷íè àíêåòè";
+$lang['HelpNew']    = "Âèíàãè ïîêàçâàé ïåñëåäíàòà àíêåòà";
+$lang['HelpSyntax'] = "Ñèíòàêñèñ";
+
+/* Days */
+$weekday[0] = "Íåäåëÿ";
+$weekday[1] = "Ïîíåäåëíèê";
+$weekday[2] = "Âòîðíèê";
+$weekday[3] = "Ñðÿäà";
+$weekday[4] = "×åòâúðòúê";
+$weekday[5] = "Ïåòúê";
+$weekday[6] = "Ñúáîòà";
+
+/* Months */
+$months[0]  = "ßíóàðè";
+$months[1]  = "Ôåâðóàðè";
+$months[2]  = "Ìàðò";
+$months[3]  = "Àïðèë";
+$months[4]  = "Ìàé";
+$months[5]  = "Þíè";
+$months[6]  = "Þëè";
+$months[7]  = "Àâãóñò";
+$months[8]  = "Ñåïòåìâðè";
+$months[9]  = "Îêòîìâðè";
+$months[10] = "Íîåìâðè";
+$months[11] = "Äåêåìâðè";
+
+/* Colors */
+$color_array[0]  = "àêâà";
+$color_array[1]  = "ñèí";
+$color_array[2]  = "êàôÿâ";
+$color_array[3]  = "òúìíî-çåëåí";
+$color_array[4]  = "çëàòíî";
+$color_array[5]  = "çåëåí";
+$color_array[6]  = "ñèâ";
+$color_array[7]  = "îðàíæåâ";
+$color_array[8]  = "ðîçîâ";
+$color_array[9]  = "ïóðïóð";
+$color_array[10] = "÷åðâåí";
+$color_array[11] = "æúëò";
+
 ?>
\ No newline at end of file

Index: russian.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/lang/russian.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- russian.php	2 Jun 2004 13:05:49 -0000	1.1.1.1
+++ russian.php	18 Sep 2004 16:00:42 -0000	1.2
@@ -1,177 +1,177 @@
-<?php
-
-/* Êîäèðîâêà */
-$lang["charset"]   = "windows-1251";
-
-/* Îñíîâíîå */
-$lang["Logout"]    = "Âûõîä";
-$lang["FormUndo"]  = "Îòìåíèòü èçìåíåíèÿ";
-$lang["FromClear"] = "Ñáðîñ";
-$lang["FormEnter"] = "Ââåäèòå ëîãèí è ïàðîëü";
-$lang["FormWrong"] = "Íåâåðíûé ëîãèí èëè ïàðîëü!";
-$lang["FormOK"]    = "OK";
-$lang["Updated"]   = "Èçìåíåíèÿ âíåñåíû!";
-$lang["NoUpdate"]  = "Îøèáêà! Èçìåíåíè íå áûëè âíåñåíû!";
-$lang["Confirm"]   = "Âû óâåðåíû?";
-$lang["NavNext"]   = "Ñëåä. ñòð.";
-$lang["NavPrev"]   = "Ïðåä. ñòð.";
-$lang["License"]   = "Ëèöåíçèîííîå ñîãëàøåíèå";
-$lang["ScrollTxt"] = "Ïðî÷òèòå ñîãëàøåíèå äî êîíöà.";
-
-/* Øàáëîíû */
-$lang["Templates"]  = "Øàáëîíû";
-$lang["tpl_exist"]  = "Èìÿ øàáëîíà óæå ñóùåñòâóåò!";
-$lang["tpl_new"]    = "Äîáàâèòü íîâûé øàáëîí";
-$lang["tpl_succes"] = "Çàïèñü óñïåøíî äîáàëåíà!"; 
-$lang["tpl_bad"]    = "Èìÿ øàáëîíà íåêîððåêòíîå!";
-$lang["tpl_save"]   = "Ñîõðàíèòü";
-$lang["preview"]    = "Ïðåâüþ";
-$lang["newtpl"]     = "Íîâûé øàáëîí";
-
-/* Ïàðàìåòðû ãîëîñîâàíèÿ */
-$lang["IndexTitle"]  = "Ñïèñîê ãîëîñîâàíèé";
-$lang["IndexQuest"]  = "Âîïðîñ";
-$lang["IndexID"]     = "ID ãîëîñîâàíèÿ";
-$lang["IndexDate"]   = "Äàòà";
-$lang["IndexDays"]   = "Äíåé";
-$lang["IndexExp"]    = "Èñòå÷åíèå";
-$lang["IndexExpire"] = "Îêîí÷åíî";
-$lang["IndexNever"]  = "Íèêîãäà";
-$lang["IndexStat"]   = "Ñòàòèñòèêà";
-$lang["IndexCom"]    = "Êîììíåòàðèè";
-$lang["IndexAct"]    = "Äåéñòâèå";
-$lang["IndexDel"]    = "Óäàëèòü";
-
-/* Ñîçäàíèå ãîëîñîâàíèÿ */
-$lang["NewTitle"]  = "Ñîçäàòü ãîëîñîâàíèå";
-$lang["NewOption"] = "Âàðèàíò";
-$lang["NewNoQue"]  = "Âû çàáûëè óêàçàòü âîïðîñ ãîëîñîâàíèÿ";
-$lang["NewNoOpt"]  = "Âû çàáûëè óêàçàòü âàðèàíòû îòâåòîâ";
-
-/* Ðåäàêòèðîâàíèå ãîëîñîâàíèÿ */
-$lang["EditStat"]  = "Ñòàòóñ";
-$lang["EditText"]  = "Ðåäàêòèðîâàòü";
-$lang["EditReset"] = "Ñáðîñèòü ðåçóëüòàòû";
-$lang["EditOn"]    = "âêë.";
-$lang["EditOff"]   = "âûêë.";
-$lang["EditHide"]  = "ñêðûòîå";
-$lang["EditLgOff"] = "log âûêë.";
-$lang["EditLgOn"]  = "log âêë.";
-$lang["EditAdd"]   = "Äîáàâèòü âàðèàíòû";
-$lang["EditNo"]    = "Íåò âàðèàíòîâ äëÿ äîáàâëåíèÿ!";
-$lang["EditOk"]    = "Âàðèàíò äîáâëåí!";
-$lang["EditSave"]  = "Ñîõð. èçìåíåíèÿ";
-$lang["EditOp"]    = "Äîëæíî áûòü íå ìåíüøå 2-óõ âàðèàíòîâ!";
-$lang["EditMis"]   = "Âîïðîñ è âàðèàíòû íå îïðåäåëåíû!";
-$lang["EditDel"]   = "Äëÿ óäàëåíèÿ âàðèàíòà îñòàâüòå ïîëå ïóñòûì";
-$lang["EditCom"]   = "Ðàçðåøèòü êîììåíòèðîâàíèå";
-
-/* Îñíîâíûå íàñòðîéêè */
-$lang["SetTitle"]   = "Îñíîâíûå íàñòðîéêè";
-$lang["SetOption"]  = "Îôîðìëåíèå";
-$lang["SetMisc"]    = "Ðàçíîå";
-$lang["SetText"]    = "Ðåäàêòèðîâàòü îñíîâíûå íàñòðîéêè";
-$lang["SetURL"]     = "URL äèðèêòîðèè ñ êàðòèíêàìè";
-$lang["SetBURL"]    = "URL äèðèêòîðèè ãîëîñîâàíèÿ";
-$lang["SetNo"]      = "Áåç ñëýøà íà êîíöå";
-$lang["SetLang"]    = "ßçûê";
-$lang["SetPoll"]    = "Çàãîëîâîê ãîëîñîâàíèÿ";
-$lang["SetButton"]  = "Êíîïêà ãîëîñîâàíèÿ";
-$lang["SetResult"]  = "Ññûëêà íà ðåçóëüòàòû";
-$lang["SetVoted"]   = "Óæå ãîëîñîâàë";
-$lang["SetComment"] = "Ññûëêà äëÿ êîììåíòàðèåâ";
-$lang["SetTab"]     = "Øèðèíà òàáëèöû";
-$lang["SetBarh"]    = "Âûñîòà ïðîöåíòíîé ñòðîêè";
-$lang["SetBarMax"]  = "Ìàêñ. äëèííà ïðîöåíòíîé ñòðîêè";
-$lang["SetTabBg"]   = "Ôîí òàáëèöû";
-$lang["SetFrmCol"]  = "Öâåò ðàìêè";
-$lang["SetFontCol"] = "Öâåò øðèôòà";
-$lang["SetFace"]    = "Øðèôò";
-$lang["SetShow"]    = "Ïîêàçûâàòü ðåçóëüòàòû êàê";
-$lang["SetPerc"]    = "ïðîöåíòû";
-$lang["SetVotes"]   = "ãîëîñà";
-$lang["SetCheck"]   = "Ïðîâåðêà";
-$lang["SetNoCheck"] = "íå ïðîâåðÿòü";
-$lang["SetIP"]      = "IP-àäðåñà";
-$lang["SetTime"]    = "Âðåìÿ áëîêèðîâêè";
-$lang["SetHours"]   = "(â ÷àñàõ)";
-$lang["SetOffset"]  = "Ðàçíèöà âî âðåìåíè ñ ñåðâåðîì";
-$lang["SetEntry"]   = "Êîììåíòàðèåâ íà ñòðàíèöå";
-$lang["SetSubmit"]  = "Âíåñòè èçìåíåíèÿ";
-$lang["SetEmpty"]   = "Íåâåðíîå çíà÷åíèå";
-$lang["SetSort"]    = "Ïîðÿäîê";
-$lang["SetAsc"]     = "ïî âîçðàñòàíèþ";
-$lang["SetDesc"]    = "ïî óáûâàíèþ";
-$lang["Setusort"]   = "íå ñîðòèðîâàòü";
-$lang["SetOptions"] = "Âàðèàíòû íîâîãî ãîëîñîâàíèÿ";
-$lang["SetPolls"]   = "Ãîëîñîâàíèé íà ñòðàíèöå";
-
-/* Èçìåíåíèå äàííûõ äîñòóïà */
-$lang["PwdTitle"] = "Ëîãèí è ïàðîëü";
-$lang["PwdText"]  = "Èçìåíèòü ëîãèí èëè ïàðîëü";
-$lang["PwdUser"]  = "Ëîãèí";
-$lang["PwdPass"]  = "Ïàðîëü";
-$lang["PwdConf"]  = "Ïàðîëü åùå ðàç";
-$lang["PwdNoUsr"] = "Íå ââåäåí ëîãèí";
-$lang["PwdNoPwd"] = "Íå ââåäåí ïàðîëü";
-$lang["PwdBad"]   = "Ïàðîëü ñîäåðæèò çàïðåùåííûå ñèìâîëû";
-
-/* Ñòàòèñòèêà ãîëîñîâàíèé */
-$lang["StatCrea"]  = "Ñîçäàíî";
-$lang["StatAct"]   = "Àêòèâíî";
-$lang["StatReset"] = "Ñáðîñèòü log ñòàòèñòèêó";
-$lang["StatDis"]   = "log âûêë. äëÿ ýòîãî ãîëîñîâàíèÿ";
-$lang["StatTotal"] = "Âñåãî ãîëîñîâ";
-$lang["StatDay"]   = "Ãîëîñîâ â äåíü";
-
-/* Êîììåíòàðèè ê ãîëîñîâàíèÿì */
-$lang["ComTotal"]  = "Âñåãî êîììåíòàðèåâ";
-$lang["ComName"]   = "Èìÿ";
-$lang["ComPost"]   = "îòïðàâëåíî";
-$lang["ComDel"]    = "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü ýòî ñîîáùåíèå?";
-
-/* Ïîìîùü */
-$lang["Help"]       = "Ïîìîùü";
-$lang["HelpPoll"]   = "Äëÿ óñòàíîâêè ãîëîñîâàíèÿ âñòàâüòå ñîîòâåòñâóþùèé êîä";
-$lang["HelpRand"]   = "Âîçìîæåí ñëó÷àéíûé âûáîð ãîëîñîâíèÿ";
-$lang["HelpNew"]    = "Ïîêàçûâàòü ïîñëåäíåå ãîëîñîâàíèå";
-$lang["HelpSyntax"] = "Ñèíòàêñèñ";
-
-/* Äíè */
-$weekday[0] = "Âñ";
-$weekday[1] = "Ïí";
-$weekday[2] = "Âò";
-$weekday[3] = "Ñð";
-$weekday[4] = "×ò";
-$weekday[5] = "Ïò";
-$weekday[6] = "Ñá";
-
-/* Ìåñÿöà */
-$months[0]  = "ÿíâ";
-$months[1]  = "ôåâ";
-$months[2]  = "ìàðò";
-$months[3]  = "àïð";
-$months[4]  = "ìàé";
-$months[5]  = "èþíü";
-$months[6]  = "èþëü";
-$months[7]  = "àâã";
-$months[8]  = "ñåíò";
-$months[9]  = "îêò";
-$months[10] = "íîÿá";
-$months[11] = "äåê";
-
-/* ïåðåâîä ýòîãî ìàññèâà íå èçìåíèò ññûëîê */
-$color_array[0]  = "ãîëóáîé";
-$color_array[1]  = "ñèíèé";
-$color_array[2]  = "êîðè÷íåâûé";
-$color_array[3]  = "òåìíî-çåëåíûé";
-$color_array[4]  = "çîëîòîé";
-$color_array[5]  = "çåëåíûé";
-$color_array[6]  = "ñåðûé";
-$color_array[7]  = "îðàíæåâûé";
-$color_array[8]  = "ðîçîâûé";
-$color_array[9]  = "ïóðïóðíûé";
-$color_array[10] = "êðàñíûé";
-$color_array[11] = "æåëòûé";
-
+<?php
+
+/* Êîäèðîâêà */
+$lang["charset"]   = "windows-1251";
+
+/* Îñíîâíîå */
+$lang["Logout"]    = "Âûõîä";
+$lang["FormUndo"]  = "Îòìåíèòü èçìåíåíèÿ";
+$lang["FromClear"] = "Ñáðîñ";
+$lang["FormEnter"] = "Ââåäèòå ëîãèí è ïàðîëü";
+$lang["FormWrong"] = "Íåâåðíûé ëîãèí èëè ïàðîëü!";
+$lang["FormOK"]    = "OK";
+$lang["Updated"]   = "Èçìåíåíèÿ âíåñåíû!";
+$lang["NoUpdate"]  = "Îøèáêà! Èçìåíåíè íå áûëè âíåñåíû!";
+$lang["Confirm"]   = "Âû óâåðåíû?";
+$lang["NavNext"]   = "Ñëåä. ñòð.";
+$lang["NavPrev"]   = "Ïðåä. ñòð.";
+$lang["License"]   = "Ëèöåíçèîííîå ñîãëàøåíèå";
+$lang["ScrollTxt"] = "Ïðî÷òèòå ñîãëàøåíèå äî êîíöà.";
+
+/* Øàáëîíû */
+$lang["Templates"]  = "Øàáëîíû";
+$lang["tpl_exist"]  = "Èìÿ øàáëîíà óæå ñóùåñòâóåò!";
+$lang["tpl_new"]    = "Äîáàâèòü íîâûé øàáëîí";
+$lang["tpl_succes"] = "Çàïèñü óñïåøíî äîáàëåíà!"; 
+$lang["tpl_bad"]    = "Èìÿ øàáëîíà íåêîððåêòíîå!";
+$lang["tpl_save"]   = "Ñîõðàíèòü";
+$lang["preview"]    = "Ïðåâüþ";
+$lang["newtpl"]     = "Íîâûé øàáëîí";
+
+/* Ïàðàìåòðû ãîëîñîâàíèÿ */
+$lang["IndexTitle"]  = "Ñïèñîê ãîëîñîâàíèé";
+$lang["IndexQuest"]  = "Âîïðîñ";
+$lang["IndexID"]     = "ID ãîëîñîâàíèÿ";
+$lang["IndexDate"]   = "Äàòà";
+$lang["IndexDays"]   = "Äíåé";
+$lang["IndexExp"]    = "Èñòå÷åíèå";
+$lang["IndexExpire"] = "Îêîí÷åíî";
+$lang["IndexNever"]  = "Íèêîãäà";
+$lang["IndexStat"]   = "Ñòàòèñòèêà";
+$lang["IndexCom"]    = "Êîììíåòàðèè";
+$lang["IndexAct"]    = "Äåéñòâèå";
+$lang["IndexDel"]    = "Óäàëèòü";
+
+/* Ñîçäàíèå ãîëîñîâàíèÿ */
+$lang["NewTitle"]  = "Ñîçäàòü ãîëîñîâàíèå";
+$lang["NewOption"] = "Âàðèàíò";
+$lang["NewNoQue"]  = "Âû çàáûëè óêàçàòü âîïðîñ ãîëîñîâàíèÿ";
+$lang["NewNoOpt"]  = "Âû çàáûëè óêàçàòü âàðèàíòû îòâåòîâ";
+
+/* Ðåäàêòèðîâàíèå ãîëîñîâàíèÿ */
+$lang["EditStat"]  = "Ñòàòóñ";
+$lang["EditText"]  = "Ðåäàêòèðîâàòü";
+$lang["EditReset"] = "Ñáðîñèòü ðåçóëüòàòû";
+$lang["EditOn"]    = "âêë.";
+$lang["EditOff"]   = "âûêë.";
+$lang["EditHide"]  = "ñêðûòîå";
+$lang["EditLgOff"] = "log âûêë.";
+$lang["EditLgOn"]  = "log âêë.";
+$lang["EditAdd"]   = "Äîáàâèòü âàðèàíòû";
+$lang["EditNo"]    = "Íåò âàðèàíòîâ äëÿ äîáàâëåíèÿ!";
+$lang["EditOk"]    = "Âàðèàíò äîáâëåí!";
+$lang["EditSave"]  = "Ñîõð. èçìåíåíèÿ";
+$lang["EditOp"]    = "Äîëæíî áûòü íå ìåíüøå 2-óõ âàðèàíòîâ!";
+$lang["EditMis"]   = "Âîïðîñ è âàðèàíòû íå îïðåäåëåíû!";
+$lang["EditDel"]   = "Äëÿ óäàëåíèÿ âàðèàíòà îñòàâüòå ïîëå ïóñòûì";
+$lang["EditCom"]   = "Ðàçðåøèòü êîììåíòèðîâàíèå";
+
+/* Îñíîâíûå íàñòðîéêè */
+$lang["SetTitle"]   = "Îñíîâíûå íàñòðîéêè";
+$lang["SetOption"]  = "Îôîðìëåíèå";
+$lang["SetMisc"]    = "Ðàçíîå";
+$lang["SetText"]    = "Ðåäàêòèðîâàòü îñíîâíûå íàñòðîéêè";
+$lang["SetURL"]     = "URL äèðèêòîðèè ñ êàðòèíêàìè";
+$lang["SetBURL"]    = "URL äèðèêòîðèè ãîëîñîâàíèÿ";
+$lang["SetNo"]      = "Áåç ñëýøà íà êîíöå";
+$lang["SetLang"]    = "ßçûê";
+$lang["SetPoll"]    = "Çàãîëîâîê ãîëîñîâàíèÿ";
+$lang["SetButton"]  = "Êíîïêà ãîëîñîâàíèÿ";
+$lang["SetResult"]  = "Ññûëêà íà ðåçóëüòàòû";
+$lang["SetVoted"]   = "Óæå ãîëîñîâàë";
+$lang["SetComment"] = "Ññûëêà äëÿ êîììåíòàðèåâ";
+$lang["SetTab"]     = "Øèðèíà òàáëèöû";
+$lang["SetBarh"]    = "Âûñîòà ïðîöåíòíîé ñòðîêè";
+$lang["SetBarMax"]  = "Ìàêñ. äëèííà ïðîöåíòíîé ñòðîêè";
+$lang["SetTabBg"]   = "Ôîí òàáëèöû";
+$lang["SetFrmCol"]  = "Öâåò ðàìêè";
+$lang["SetFontCol"] = "Öâåò øðèôòà";
+$lang["SetFace"]    = "Øðèôò";
+$lang["SetShow"]    = "Ïîêàçûâàòü ðåçóëüòàòû êàê";
+$lang["SetPerc"]    = "ïðîöåíòû";
+$lang["SetVotes"]   = "ãîëîñà";
+$lang["SetCheck"]   = "Ïðîâåðêà";
+$lang["SetNoCheck"] = "íå ïðîâåðÿòü";
+$lang["SetIP"]      = "IP-àäðåñà";
+$lang["SetTime"]    = "Âðåìÿ áëîêèðîâêè";
+$lang["SetHours"]   = "(â ÷àñàõ)";
+$lang["SetOffset"]  = "Ðàçíèöà âî âðåìåíè ñ ñåðâåðîì";
+$lang["SetEntry"]   = "Êîììåíòàðèåâ íà ñòðàíèöå";
+$lang["SetSubmit"]  = "Âíåñòè èçìåíåíèÿ";
+$lang["SetEmpty"]   = "Íåâåðíîå çíà÷åíèå";
+$lang["SetSort"]    = "Ïîðÿäîê";
+$lang["SetAsc"]     = "ïî âîçðàñòàíèþ";
+$lang["SetDesc"]    = "ïî óáûâàíèþ";
+$lang["Setusort"]   = "íå ñîðòèðîâàòü";
+$lang["SetOptions"] = "Âàðèàíòû íîâîãî ãîëîñîâàíèÿ";
+$lang["SetPolls"]   = "Ãîëîñîâàíèé íà ñòðàíèöå";
+
+/* Èçìåíåíèå äàííûõ äîñòóïà */
+$lang["PwdTitle"] = "Ëîãèí è ïàðîëü";
+$lang["PwdText"]  = "Èçìåíèòü ëîãèí èëè ïàðîëü";
+$lang["PwdUser"]  = "Ëîãèí";
+$lang["PwdPass"]  = "Ïàðîëü";
+$lang["PwdConf"]  = "Ïàðîëü åùå ðàç";
+$lang["PwdNoUsr"] = "Íå ââåäåí ëîãèí";
+$lang["PwdNoPwd"] = "Íå ââåäåí ïàðîëü";
+$lang["PwdBad"]   = "Ïàðîëü ñîäåðæèò çàïðåùåííûå ñèìâîëû";
+
+/* Ñòàòèñòèêà ãîëîñîâàíèé */
+$lang["StatCrea"]  = "Ñîçäàíî";
+$lang["StatAct"]   = "Àêòèâíî";
+$lang["StatReset"] = "Ñáðîñèòü log ñòàòèñòèêó";
+$lang["StatDis"]   = "log âûêë. äëÿ ýòîãî ãîëîñîâàíèÿ";
+$lang["StatTotal"] = "Âñåãî ãîëîñîâ";
+$lang["StatDay"]   = "Ãîëîñîâ â äåíü";
+
+/* Êîììåíòàðèè ê ãîëîñîâàíèÿì */
+$lang["ComTotal"]  = "Âñåãî êîììåíòàðèåâ";
+$lang["ComName"]   = "Èìÿ";
+$lang["ComPost"]   = "îòïðàâëåíî";
+$lang["ComDel"]    = "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü ýòî ñîîáùåíèå?";
+
+/* Ïîìîùü */
+$lang["Help"]       = "Ïîìîùü";
+$lang["HelpPoll"]   = "Äëÿ óñòàíîâêè ãîëîñîâàíèÿ âñòàâüòå ñîîòâåòñâóþùèé êîä";
+$lang["HelpRand"]   = "Âîçìîæåí ñëó÷àéíûé âûáîð ãîëîñîâíèÿ";
+$lang["HelpNew"]    = "Ïîêàçûâàòü ïîñëåäíåå ãîëîñîâàíèå";
+$lang["HelpSyntax"] = "Ñèíòàêñèñ";
+
+/* Äíè */
+$weekday[0] = "Âñ";
+$weekday[1] = "Ïí";
+$weekday[2] = "Âò";
+$weekday[3] = "Ñð";
+$weekday[4] = "×ò";
+$weekday[5] = "Ïò";
+$weekday[6] = "Ñá";
+
+/* Ìåñÿöà */
+$months[0]  = "ÿíâ";
+$months[1]  = "ôåâ";
+$months[2]  = "ìàðò";
+$months[3]  = "àïð";
+$months[4]  = "ìàé";
+$months[5]  = "èþíü";
+$months[6]  = "èþëü";
+$months[7]  = "àâã";
+$months[8]  = "ñåíò";
+$months[9]  = "îêò";
+$months[10] = "íîÿá";
+$months[11] = "äåê";
+
+/* ïåðåâîä ýòîãî ìàññèâà íå èçìåíèò ññûëîê */
+$color_array[0]  = "ãîëóáîé";
+$color_array[1]  = "ñèíèé";
+$color_array[2]  = "êîðè÷íåâûé";
+$color_array[3]  = "òåìíî-çåëåíûé";
+$color_array[4]  = "çîëîòîé";
+$color_array[5]  = "çåëåíûé";
+$color_array[6]  = "ñåðûé";
+$color_array[7]  = "îðàíæåâûé";
+$color_array[8]  = "ðîçîâûé";
+$color_array[9]  = "ïóðïóðíûé";
+$color_array[10] = "êðàñíûé";
+$color_array[11] = "æåëòûé";
+
 ?>
\ No newline at end of file

Index: portuguese.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/lang/portuguese.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- portuguese.php	2 Jun 2004 13:05:49 -0000	1.1.1.1
+++ portuguese.php	18 Sep 2004 16:00:42 -0000	1.2
@@ -1,177 +1,177 @@
-<?php
-
-/* Charset */
-$lang["charset"]   = "iso-8859-1";
-
-/* Geral */
-$lang["Logout"]    = "Sair";
-$lang["FormUndo"]  = "Desfazer alterações";
-$lang["FromClear"] = "LIMPAR";
-$lang["FormEnter"] = "Por favor, informe seu nome e sua senha";
-$lang["FormWrong"] = "Usuário ou Senha inválida";
-$lang["FormOK"]    = "OK";
-$lang["Updated"]   = "Alterações efetuadas com sucesso!";
-$lang["NoUpdate"]  = "Ocorreu um erro! Alterações não efetuadas!";
-$lang["Confirm"]   = "Tem certeza?";
-$lang["NavNext"]   = "Próxima Página";
-$lang["NavPrev"]   = "Página Anterior";
-$lang["License"]   = "Têrmos de Utilização";
-$lang["ScrollTxt"] = "Puxe o texto para baixo para lêr o resto dos têrmos.";
-
-/* modêlos */
-$lang["Templates"]  = "Modêlos";
-$lang["tpl_exist"]  = "O nome escolhido já existe.";
-$lang["tpl_new"]    = "Adiciona um novo modêlo.";
-$lang["tpl_succes"] = "Foi adicionado com sucesso!"; 
-$lang["tpl_bad"]    = "O nome do modêlo inválido!";
-$lang["tpl_save"]   = "Salvar";
-$lang["preview"]    = "Visualizar";
-$lang["newtpl"]     = "Novo modêlo";
-
-/* Lista de Pesquisa */
-$lang["IndexTitle"]  = "Lista de pesquisas";
-$lang["IndexQuest"]  = "Pergunta";
-$lang["IndexID"]     = "ID";
-$lang["IndexDate"]   = "Data";
-$lang["IndexDays"]   = "dias";
-$lang["IndexExp"]    = "Vence em";
-$lang["IndexExpire"] = "vencido";
-$lang["IndexNever"]  = "nunca";
-$lang["IndexStat"]   = "Estatísticas";
-$lang["IndexCom"]    = "Comentários";
-$lang["IndexAct"]    = "Ação";
-$lang["IndexDel"]    = "Apagar";
-
-/* Criar uma nova Pesquisa */
-$lang["NewTitle"]  = "Nova Pesquisa";
-$lang["NewOption"] = "Opção";
-$lang["NewNoQue"]  = "Você não preencheu a pergunta";
-$lang["NewNoOpt"]  = "Você não preencheu as opções";
-
-/* Editar a pesquisa */
-$lang["EditStat"]  = "Estado";
-$lang["EditText"]  = "Editar esta pesquisa";
-$lang["EditReset"] = "Voltar a 0";
-$lang["EditOn"]    = "ativo";
-$lang["EditOff"]   = "inativo";
-$lang["EditHide"]  = "oculto";
-$lang["EditLgOff"] = "logging off";
-$lang["EditLgOn"]  = "logging on";
-$lang["EditAdd"]   = "Adicionar opções";
-$lang["EditNo"]    = "As novas opções não foram adicionadas!";
-$lang["EditOk"]    = "Opções adicionadas!";
-$lang["EditSave"]  = "Salvar alterações";
-$lang["EditOp"]    = "São OBRIGATÓRIAS pelo menos 2 opções!";
-$lang["EditMis"]   = "Pergunta e Opções não definidas!";
-$lang["EditDel"]   = "Para remover uma opção deixe o campo em branco";
-$lang["EditCom"]   = "Permitir comentários?";
-
-/* Condições Gerais */
-$lang["SetTitle"]   = "Configurações Gerais";
-$lang["SetOption"]  = "Tabelas, Fontes e Cores";
-$lang["SetMisc"]    = "Vários";
-$lang["SetText"]    = "Configurações Gerais";
-$lang["SetURL"]     = "URL do diretório das imagens";
-$lang["SetBURL"]    = "URL do diretório da pesquisa";
-$lang["SetNo"]      = "Não recorte arrastando";
-$lang["SetLang"]    = "Idioma";
-$lang["SetPoll"]    = "Título da pesquisa";
-$lang["SetButton"]  = "Botão de voto";
-$lang["SetResult"]  = "Link dos resultados";
-$lang["SetVoted"]   = "Para quem já votou...";
-$lang["SetComment"] = "Comentários";
-$lang["SetTab"]     = "Largura da tabela";
-$lang["SetBarh"]    = "Altura da barra";
-$lang["SetBarMax"]  = "Máximo cumprimento da";
-$lang["SetTabBg"]   = "Cor: Fundo da Tabela";
-$lang["SetFrmCol"]  = "Cor do Título";
-$lang["SetFontCol"] = "Cor da fonte";
-$lang["SetFace"]    = "Típo da fonte";
-$lang["SetShow"]    = "Mostrar resultados como";
-$lang["SetPerc"]    = "porcentagem";
-$lang["SetVotes"]   = "número de votos";
-$lang["SetCheck"]   = "Verificar";
-$lang["SetNoCheck"] = "não foi verificado";
-$lang["SetIP"]      = "IP da tabéla";
-$lang["SetTime"]    = "tempo entre votos";
-$lang["SetHours"]   = "horas";
-$lang["SetOffset"]  = "Offset do tempo do servidor";
-$lang["SetEntry"]   = "Comentário por página";
-$lang["SetSubmit"]  = "Submeter alterações";
-$lang["SetEmpty"]   = "Valor inválido";
-$lang["SetSort"]    = "Ordem";
-$lang["SetAsc"]     = "Ascendente";
-$lang["SetDesc"]    = "Descendente";
-$lang["Setusort"]   = "Não ordenar";
-$lang["SetOptions"] = "Número de opções permitidas por pesquisa";
-$lang["SetPolls"]   = "Votações por página";
-
-/* Alterar a senha */
-$lang["PwdTitle"] = "Alterar a senha";
-$lang["PwdText"]  = "Mudar o USUÁRIO ou a SENHA";
-$lang["PwdUser"]  = "Usuário";
-$lang["PwdPass"]  = "Senha";
-$lang["PwdConf"]  = "Confirmar a senha";
-$lang["PwdNoUsr"] = "Você não preencheu o campo do USUÁRIO";
-$lang["PwdNoPwd"] = "Você não preencheu o campo da SENHA";
-$lang["PwdBad"]   = "A senha não confere";
-
-/* Poll Stats */
-$lang["StatCrea"]  = "Criado em";
-$lang["StatAct"]   = "Ativa";
-$lang["StatReset"] = "Recomeçar o Log das Estatísticas";
-$lang["StatDis"]   = "logging invalido para esta pesquisa";
-$lang["StatTotal"] = "Total de Votos";
-$lang["StatDay"]   = "votos por dia";
-
-/* Poll Comments */
-$lang["ComTotal"]  = "Total de Comentários";
-$lang["ComName"]   = "Nome";
-$lang["ComPost"]   = "colocada";
-$lang["ComDel"]    = "Você quer apagar o comentário atual?";
-
-/* Help */
-$lang["Help"]       = "Ajuda";
-$lang["HelpPoll"]   = "Para incluir uma pesquisa em uma webpage inclua o código0 abaixo";
-$lang["HelpRand"]   = "Também é possível colocar uma pesquisa aleatória";
-$lang["HelpNew"]    = "Mostrar sempre a última pesquisa";
-$lang["HelpSyntax"] = "Syntax";
-
-/* Days */
-$weekday[0] = "Domingo";
-$weekday[1] = "Segunda";
-$weekday[2] = "Terça";
-$weekday[3] = "Quarta";
-$weekday[4] = "Quinta";
-$weekday[5] = "Sexta";
-$weekday[6] = "Sábado";
-
-/* Months */
-$months[0]  = "Janeiro";
-$months[1]  = "Fevereiro";
-$months[2]  = "Março";
-$months[3]  = "Abril";
-$months[4]  = "Maio";
-$months[5]  = "Junho";
-$months[6]  = "Julho";
-$months[7]  = "Agosto";
-$months[8]  = "Setembro";
-$months[9]  = "Outubro";
-$months[10] = "Novembro";
-$months[11] = "Dezembro";
-
-/* não mude a referência */
-$color_array[0]  = "azul claro";
-$color_array[1]  = "azul escuro";
-$color_array[2]  = "castanho";
-$color_array[3]  = "verde escuro";
-$color_array[4]  = "ouro";
-$color_array[5]  = "verde claro";
-$color_array[6]  = "cinzento";
-$color_array[7]  = "laranja";
-$color_array[8]  = "rosa";
-$color_array[9]  = "violeta";
-$color_array[10] = "vermelho";
-$color_array[11] = "amarelo";
-
+<?php
+
+/* Charset */
+$lang["charset"]   = "iso-8859-1";
+
+/* Geral */
+$lang["Logout"]    = "Sair";
+$lang["FormUndo"]  = "Desfazer alterações";
+$lang["FromClear"] = "LIMPAR";
+$lang["FormEnter"] = "Por favor, informe seu nome e sua senha";
+$lang["FormWrong"] = "Usuário ou Senha inválida";
+$lang["FormOK"]    = "OK";
+$lang["Updated"]   = "Alterações efetuadas com sucesso!";
+$lang["NoUpdate"]  = "Ocorreu um erro! Alterações não efetuadas!";
+$lang["Confirm"]   = "Tem certeza?";
+$lang["NavNext"]   = "Próxima Página";
+$lang["NavPrev"]   = "Página Anterior";
+$lang["License"]   = "Têrmos de Utilização";
+$lang["ScrollTxt"] = "Puxe o texto para baixo para lêr o resto dos têrmos.";
+
+/* modêlos */
+$lang["Templates"]  = "Modêlos";
+$lang["tpl_exist"]  = "O nome escolhido já existe.";
+$lang["tpl_new"]    = "Adiciona um novo modêlo.";
+$lang["tpl_succes"] = "Foi adicionado com sucesso!"; 
+$lang["tpl_bad"]    = "O nome do modêlo inválido!";
+$lang["tpl_save"]   = "Salvar";
+$lang["preview"]    = "Visualizar";
+$lang["newtpl"]     = "Novo modêlo";
+
+/* Lista de Pesquisa */
+$lang["IndexTitle"]  = "Lista de pesquisas";
+$lang["IndexQuest"]  = "Pergunta";
+$lang["IndexID"]     = "ID";
+$lang["IndexDate"]   = "Data";
+$lang["IndexDays"]   = "dias";
+$lang["IndexExp"]    = "Vence em";
+$lang["IndexExpire"] = "vencido";
+$lang["IndexNever"]  = "nunca";
+$lang["IndexStat"]   = "Estatísticas";
+$lang["IndexCom"]    = "Comentários";
+$lang["IndexAct"]    = "Ação";
+$lang["IndexDel"]    = "Apagar";
+
+/* Criar uma nova Pesquisa */
+$lang["NewTitle"]  = "Nova Pesquisa";
+$lang["NewOption"] = "Opção";
+$lang["NewNoQue"]  = "Você não preencheu a pergunta";
+$lang["NewNoOpt"]  = "Você não preencheu as opções";
+
+/* Editar a pesquisa */
+$lang["EditStat"]  = "Estado";
+$lang["EditText"]  = "Editar esta pesquisa";
+$lang["EditReset"] = "Voltar a 0";
+$lang["EditOn"]    = "ativo";
+$lang["EditOff"]   = "inativo";
+$lang["EditHide"]  = "oculto";
+$lang["EditLgOff"] = "logging off";
+$lang["EditLgOn"]  = "logging on";
+$lang["EditAdd"]   = "Adicionar opções";
+$lang["EditNo"]    = "As novas opções não foram adicionadas!";
+$lang["EditOk"]    = "Opções adicionadas!";
+$lang["EditSave"]  = "Salvar alterações";
+$lang["EditOp"]    = "São OBRIGATÓRIAS pelo menos 2 opções!";
+$lang["EditMis"]   = "Pergunta e Opções não definidas!";
+$lang["EditDel"]   = "Para remover uma opção deixe o campo em branco";
+$lang["EditCom"]   = "Permitir comentários?";
+
+/* Condições Gerais */
+$lang["SetTitle"]   = "Configurações Gerais";
+$lang["SetOption"]  = "Tabelas, Fontes e Cores";
+$lang["SetMisc"]    = "Vários";
+$lang["SetText"]    = "Configurações Gerais";
+$lang["SetURL"]     = "URL do diretório das imagens";
+$lang["SetBURL"]    = "URL do diretório da pesquisa";
+$lang["SetNo"]      = "Não recorte arrastando";
+$lang["SetLang"]    = "Idioma";
+$lang["SetPoll"]    = "Título da pesquisa";
+$lang["SetButton"]  = "Botão de voto";
+$lang["SetResult"]  = "Link dos resultados";
+$lang["SetVoted"]   = "Para quem já votou...";
+$lang["SetComment"] = "Comentários";
+$lang["SetTab"]     = "Largura da tabela";
+$lang["SetBarh"]    = "Altura da barra";
+$lang["SetBarMax"]  = "Máximo cumprimento da";
+$lang["SetTabBg"]   = "Cor: Fundo da Tabela";
+$lang["SetFrmCol"]  = "Cor do Título";
+$lang["SetFontCol"] = "Cor da fonte";
+$lang["SetFace"]    = "Típo da fonte";
+$lang["SetShow"]    = "Mostrar resultados como";
+$lang["SetPerc"]    = "porcentagem";
+$lang["SetVotes"]   = "número de votos";
+$lang["SetCheck"]   = "Verificar";
+$lang["SetNoCheck"] = "não foi verificado";
+$lang["SetIP"]      = "IP da tabéla";
+$lang["SetTime"]    = "tempo entre votos";
+$lang["SetHours"]   = "horas";
+$lang["SetOffset"]  = "Offset do tempo do servidor";
+$lang["SetEntry"]   = "Comentário por página";
+$lang["SetSubmit"]  = "Submeter alterações";
+$lang["SetEmpty"]   = "Valor inválido";
+$lang["SetSort"]    = "Ordem";
+$lang["SetAsc"]     = "Ascendente";
+$lang["SetDesc"]    = "Descendente";
+$lang["Setusort"]   = "Não ordenar";
+$lang["SetOptions"] = "Número de opções permitidas por pesquisa";
+$lang["SetPolls"]   = "Votações por página";
+
+/* Alterar a senha */
+$lang["PwdTitle"] = "Alterar a senha";
+$lang["PwdText"]  = "Mudar o USUÁRIO ou a SENHA";
+$lang["PwdUser"]  = "Usuário";
+$lang["PwdPass"]  = "Senha";
+$lang["PwdConf"]  = "Confirmar a senha";
+$lang["PwdNoUsr"] = "Você não preencheu o campo do USUÁRIO";
+$lang["PwdNoPwd"] = "Você não preencheu o campo da SENHA";
+$lang["PwdBad"]   = "A senha não confere";
+
+/* Poll Stats */
+$lang["StatCrea"]  = "Criado em";
+$lang["StatAct"]   = "Ativa";
+$lang["StatReset"] = "Recomeçar o Log das Estatísticas";
+$lang["StatDis"]   = "logging invalido para esta pesquisa";
+$lang["StatTotal"] = "Total de Votos";
+$lang["StatDay"]   = "votos por dia";
+
+/* Poll Comments */
+$lang["ComTotal"]  = "Total de Comentários";
+$lang["ComName"]   = "Nome";
+$lang["ComPost"]   = "colocada";
+$lang["ComDel"]    = "Você quer apagar o comentário atual?";
+
+/* Help */
+$lang["Help"]       = "Ajuda";
+$lang["HelpPoll"]   = "Para incluir uma pesquisa em uma webpage inclua o código0 abaixo";
+$lang["HelpRand"]   = "Também é possível colocar uma pesquisa aleatória";
+$lang["HelpNew"]    = "Mostrar sempre a última pesquisa";
+$lang["HelpSyntax"] = "Syntax";
+
+/* Days */
+$weekday[0] = "Domingo";
+$weekday[1] = "Segunda";
+$weekday[2] = "Terça";
+$weekday[3] = "Quarta";
+$weekday[4] = "Quinta";
+$weekday[5] = "Sexta";
+$weekday[6] = "Sábado";
+
+/* Months */
+$months[0]  = "Janeiro";
+$months[1]  = "Fevereiro";
+$months[2]  = "Março";
+$months[3]  = "Abril";
+$months[4]  = "Maio";
+$months[5]  = "Junho";
+$months[6]  = "Julho";
+$months[7]  = "Agosto";
+$months[8]  = "Setembro";
+$months[9]  = "Outubro";
+$months[10] = "Novembro";
+$months[11] = "Dezembro";
+
+/* não mude a referência */
+$color_array[0]  = "azul claro";
+$color_array[1]  = "azul escuro";
+$color_array[2]  = "castanho";
+$color_array[3]  = "verde escuro";
+$color_array[4]  = "ouro";
+$color_array[5]  = "verde claro";
+$color_array[6]  = "cinzento";
+$color_array[7]  = "laranja";
+$color_array[8]  = "rosa";
+$color_array[9]  = "violeta";
+$color_array[10] = "vermelho";
+$color_array[11] = "amarelo";
+
 ?>
\ No newline at end of file

Index: turkish.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/lang/turkish.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- turkish.php	2 Jun 2004 13:05:48 -0000	1.1.1.1
+++ turkish.php	18 Sep 2004 16:00:42 -0000	1.2
@@ -1,177 +1,177 @@
-<?php
-
-/* Charset */
-$lang["charset"]   = "windows-1254";
-
-/* General */
-$lang["Logout"]    = "Sistemden Çýkýþ";
-$lang["FormUndo"]  = "Deðiþiklikleri Geri Al";
-$lang["FromClear"] = "Yenile";
-$lang["FormEnter"] = "Lütfen geçerli bir kullanýcý adý veya þifresi giriniz";
-$lang["FormWrong"] = "Yanlýþ Kullanýcý adý veya Þifresi";
-$lang["FormOK"]    = "Tamam";
-$lang["Updated"]   = "Deðiþiklikler Gerçekleþtirildi!";
-$lang["NoUpdate"]  = "Hata! Hiçbir deðiþiklik yapýlmadý!";
-$lang["Confirm"]   = "Emin misiniz?";
-$lang["NavNext"]   = "Sonraki sayfa";
-$lang["NavPrev"]   = "Önceki sayfa";
-$lang["License"]   = "Lisans Anlaþmasý";
-$lang["ScrollTxt"] = "Anlaþmanýn devamýný okumak için PAGE DOWN tuþuna basýnýz.";
-
-/* Templates */
-$lang["Templates"]  = "Arayüz Seçenekleri";
-$lang["tpl_exist"]  = "Arayüz adý zaten var.";
-$lang["tpl_new"]    = "Yeni bir arayüz ekle.";
-$lang["tpl_succes"] = "Kayýt baþarýyla eklendi!"; 
-$lang["tpl_bad"]    = "arayüz adý geçersiz!";
-$lang["tpl_save"]   = "Kaydet";
-$lang["preview"]    = "Önizleme";
-$lang["newtpl"]     = "Yeni bir arayüz";
-
-/* Poll List */
-$lang["IndexTitle"]  = "Anket Listesi";
-$lang["IndexQuest"]  = "Soru";
-$lang["IndexID"]     = "Anket No";
-$lang["IndexDate"]   = "Tarih";
-$lang["IndexDays"]   = "Günler";
-$lang["IndexExp"]    = "Son oy tarihi";
-$lang["IndexExpire"] = "kapandý";
-$lang["IndexNever"]  = "hiçbir zaman";
-$lang["IndexStat"]   = "Ýstatistikler";
-$lang["IndexCom"]    = "Yorumlar";
-$lang["IndexAct"]    = "Eylem";
-$lang["IndexDel"]    = "Sil";
-
-/* Create A New Poll */
-$lang["NewTitle"]  = "Yeni anket oluþtur";
-$lang["NewOption"] = "Seçenekler";
-$lang["NewNoQue"]  = "Soru alanýný doldurmayý unuttunuz";
-$lang["NewNoOpt"]  = "Seçenekler alanýný doldurmayý unuttunuz";
-
-/* Poll Edit */
-$lang["EditStat"]  = "Durum";
-$lang["EditText"]  = "Bu anketi düzenle";
-$lang["EditReset"] = "Bu anketi yenile";
-$lang["EditOn"]    = "açýk";
-$lang["EditOff"]   = "kapalý";
-$lang["EditHide"]  = "gizli";
-$lang["EditLgOff"] = "Kayýt tutma";
-$lang["EditLgOn"]  = "Kayýt tut";
-$lang["EditAdd"]   = "Ekleme Seçenekleri";
-$lang["EditNo"]    = "Hiçbir seçenek eklenmedi!";
-$lang["EditOk"]    = "Seçenekler Eklendi!";
-$lang["EditSave"]  = "Deðiþiklikleri Kaydet";
-$lang["EditOp"]    = "En az iki seçenek belirtmeniz gerekli!";
-$lang["EditMis"]   = "Soru ve seçenekler belirtilmedi!";
-$lang["EditDel"]   = "Bir seçeneði kaldýrmak için alaný boþ býrakmanýz yeterlidir.";
-$lang["EditCom"]   = "Yorumlara izin ver";
-
-/* General Settings */
-$lang["SetTitle"]   = "Genel Ayarlar";
-$lang["SetOption"]  = "Tablo, Yazý Renk Ayarlarý";
-$lang["SetMisc"]    = "Diðer Ayarlar";
-$lang["SetText"]    = "Genel ayarlarý deðiþtir";
-$lang["SetURL"]     = "Resim klasörü ";
-$lang["SetBURL"]    = "Anket klasörü";
-$lang["SetNo"]      = "Sonu taksim(slash [/]) iþaretiyle bitmesin";
-$lang["SetLang"]    = "Lisan";
-$lang["SetPoll"]    = "Anket Baþlýðý";
-$lang["SetButton"]  = "Oy Ver (gönder) Butonu";
-$lang["SetResult"]  = "Sonuçlar linki";
-$lang["SetVoted"]   = "Daha önce oy verilmiþ";
-$lang["SetComment"] = "Yorumlarýnýzý gönderin";
-$lang["SetTab"]     = "Tablo geniþliði";
-$lang["SetBarh"]    = "Çubuk (bar) yüksekliði";
-$lang["SetBarMax"]  = "Maks. çubuk (bar) uzunluðu";
-$lang["SetTabBg"]   = "Tablo arkaplan rengi";
-$lang["SetFrmCol"]  = "Frame rengi";
-$lang["SetFontCol"] = "Yazý Rengi";
-$lang["SetFace"]    = "Yazý tipi";
-$lang["SetShow"]    = "Sonuçlarý gösterme þekli";
-$lang["SetPerc"]    = "yüzdelik";
-$lang["SetVotes"]   = "oylar";
-$lang["SetCheck"]   = "Seç";
-$lang["SetNoCheck"] = "Seçme yok";
-$lang["SetIP"]      = "IP tablosu";
-$lang["SetTime"]    = "kitleme zaman uzunluðu";
-$lang["SetHours"]   = "saatler";
-$lang["SetOffset"]  = "Sunucu (Server) zamaný düzenlemesi";
-$lang["SetEntry"]   = "Her Sayfada görünecek yorum sayýsý";
-$lang["SetSubmit"]  = "Ayarlarý Gönder";
-$lang["SetEmpty"]   = "Geçersiz deðer";
-$lang["SetSort"]    = "Görüntüleme sýrasý";
-$lang["SetAsc"]     = "baþlangýçtan sona";
-$lang["SetDesc"]    = "sondan baþa";
-$lang["Setusort"]   = "sýralama";
-$lang["SetOptions"] = "Ankette izin verilen seçenekler";
-$lang["SetPolls"]   = "Her sayfada gösterilecek Anket sayýsý";
-
-/* Change Password */
-$lang["PwdTitle"] = "Þifre Deðiþtirme";
-$lang["PwdText"]  = "Þifre ya da kullanýcý adýný deðiþtirin";
-$lang["PwdUser"]  = "Kullanýcý Adý";
-$lang["PwdPass"]  = "Þifre";
-$lang["PwdConf"]  = "Þifreyi Onaylayýn";
-$lang["PwdNoUsr"] = "Kullanýcý adýný girmeyi unuttunuz";
-$lang["PwdNoPwd"] = "Þifre girmeyi unuttunuz";
-$lang["PwdBad"]   = "Girdiðiniz þifreler birbirini tutmuyor";
-
-/* Poll Stats */
-$lang["StatCrea"]  = "Oluþturuldu";
-$lang["StatAct"]   = "Aktif";
-$lang["StatReset"] = "Kayýt istatistiklerini yenile";
-$lang["StatDis"]   = "Bu anket için kayýt tutma özelliði kapatýldý";
-$lang["StatTotal"] = "Toplam oy";
-$lang["StatDay"]   = "Günlük oy";
-
-/* Poll Comments */
-$lang["ComTotal"]  = "Toplam Yorum";
-$lang["ComName"]   = "Adý";
-$lang["ComPost"]   = "gönderdi";
-$lang["ComDel"]    = "Bu mesajý silmek istediðinizden emin misiniz?";
-
-/* Help */
-$lang["Help"]       = "Yardým";
-$lang["HelpPoll"]   = "Bir anketi sayfaya eklemek için aþaðýdaki kodu web sayfasýna ekleyin";
-$lang["HelpRand"]   = "Rastgele bir anket göstermeniz de mümkün";
-$lang["HelpNew"]    = "Her zaman en son açýlan anketi göster";
-$lang["HelpSyntax"] = "Kod (Syntax)";
-
-/* Days */
-$weekday[0] = "Pazar";
-$weekday[1] = "Pazartesi";
-$weekday[2] = "Salý";
-$weekday[3] = "Çarþamba";
-$weekday[4] = "Perþembe";
-$weekday[5] = "Cuma";
-$weekday[6] = "Cumartes";
-
-/* Months */
-$months[0]  = "Ocak";
-$months[1]  = "Þubat";
-$months[2]  = "Mart";
-$months[3]  = "Nisan";
-$months[4]  = "Mayýs";
-$months[5]  = "Haziran";
-$months[6]  = "Temmuz";
-$months[7]  = "Aðustos";
-$months[8]  = "Eylül";
-$months[9]  = "Ekim";
-$months[10] = "Kasým";
-$months[11] = "Aralýk";
-
-/* Colors */
-$color_array[0]  = "aqua";
-$color_array[1]  = "mavi";
-$color_array[2]  = "kahverengi";
-$color_array[3]  = "koyu yeþil";
-$color_array[4]  = "altýn";
-$color_array[5]  = "yeþil";
-$color_array[6]  = "gri";
-$color_array[7]  = "portakal";
-$color_array[8]  = "pembe";
-$color_array[9]  = "lacivert";
-$color_array[10] = "kýrmýzý";
-$color_array[11] = "sarý";
-
+<?php
+
+/* Charset */
+$lang["charset"]   = "windows-1254";
+
+/* General */
+$lang["Logout"]    = "Sistemden Çýkýþ";
+$lang["FormUndo"]  = "Deðiþiklikleri Geri Al";
+$lang["FromClear"] = "Yenile";
+$lang["FormEnter"] = "Lütfen geçerli bir kullanýcý adý veya þifresi giriniz";
+$lang["FormWrong"] = "Yanlýþ Kullanýcý adý veya Þifresi";
+$lang["FormOK"]    = "Tamam";
+$lang["Updated"]   = "Deðiþiklikler Gerçekleþtirildi!";
+$lang["NoUpdate"]  = "Hata! Hiçbir deðiþiklik yapýlmadý!";
+$lang["Confirm"]   = "Emin misiniz?";
+$lang["NavNext"]   = "Sonraki sayfa";
+$lang["NavPrev"]   = "Önceki sayfa";
+$lang["License"]   = "Lisans Anlaþmasý";
+$lang["ScrollTxt"] = "Anlaþmanýn devamýný okumak için PAGE DOWN tuþuna basýnýz.";
+
+/* Templates */
+$lang["Templates"]  = "Arayüz Seçenekleri";
+$lang["tpl_exist"]  = "Arayüz adý zaten var.";
+$lang["tpl_new"]    = "Yeni bir arayüz ekle.";
+$lang["tpl_succes"] = "Kayýt baþarýyla eklendi!"; 
+$lang["tpl_bad"]    = "arayüz adý geçersiz!";
+$lang["tpl_save"]   = "Kaydet";
+$lang["preview"]    = "Önizleme";
+$lang["newtpl"]     = "Yeni bir arayüz";
+
+/* Poll List */
+$lang["IndexTitle"]  = "Anket Listesi";
+$lang["IndexQuest"]  = "Soru";
+$lang["IndexID"]     = "Anket No";
+$lang["IndexDate"]   = "Tarih";
+$lang["IndexDays"]   = "Günler";
+$lang["IndexExp"]    = "Son oy tarihi";
+$lang["IndexExpire"] = "kapandý";
+$lang["IndexNever"]  = "hiçbir zaman";
+$lang["IndexStat"]   = "Ýstatistikler";
+$lang["IndexCom"]    = "Yorumlar";
+$lang["IndexAct"]    = "Eylem";
+$lang["IndexDel"]    = "Sil";
+
+/* Create A New Poll */
+$lang["NewTitle"]  = "Yeni anket oluþtur";
+$lang["NewOption"] = "Seçenekler";
+$lang["NewNoQue"]  = "Soru alanýný doldurmayý unuttunuz";
+$lang["NewNoOpt"]  = "Seçenekler alanýný doldurmayý unuttunuz";
+
+/* Poll Edit */
+$lang["EditStat"]  = "Durum";
+$lang["EditText"]  = "Bu anketi düzenle";
+$lang["EditReset"] = "Bu anketi yenile";
+$lang["EditOn"]    = "açýk";
+$lang["EditOff"]   = "kapalý";
+$lang["EditHide"]  = "gizli";
+$lang["EditLgOff"] = "Kayýt tutma";
+$lang["EditLgOn"]  = "Kayýt tut";
+$lang["EditAdd"]   = "Ekleme Seçenekleri";
+$lang["EditNo"]    = "Hiçbir seçenek eklenmedi!";
+$lang["EditOk"]    = "Seçenekler Eklendi!";
+$lang["EditSave"]  = "Deðiþiklikleri Kaydet";
+$lang["EditOp"]    = "En az iki seçenek belirtmeniz gerekli!";
+$lang["EditMis"]   = "Soru ve seçenekler belirtilmedi!";
+$lang["EditDel"]   = "Bir seçeneði kaldýrmak için alaný boþ býrakmanýz yeterlidir.";
+$lang["EditCom"]   = "Yorumlara izin ver";
+
+/* General Settings */
+$lang["SetTitle"]   = "Genel Ayarlar";
+$lang["SetOption"]  = "Tablo, Yazý Renk Ayarlarý";
+$lang["SetMisc"]    = "Diðer Ayarlar";
+$lang["SetText"]    = "Genel ayarlarý deðiþtir";
+$lang["SetURL"]     = "Resim klasörü ";
+$lang["SetBURL"]    = "Anket klasörü";
+$lang["SetNo"]      = "Sonu taksim(slash [/]) iþaretiyle bitmesin";
+$lang["SetLang"]    = "Lisan";
+$lang["SetPoll"]    = "Anket Baþlýðý";
+$lang["SetButton"]  = "Oy Ver (gönder) Butonu";
+$lang["SetResult"]  = "Sonuçlar linki";
+$lang["SetVoted"]   = "Daha önce oy verilmiþ";
+$lang["SetComment"] = "Yorumlarýnýzý gönderin";
+$lang["SetTab"]     = "Tablo geniþliði";
+$lang["SetBarh"]    = "Çubuk (bar) yüksekliði";
+$lang["SetBarMax"]  = "Maks. çubuk (bar) uzunluðu";
+$lang["SetTabBg"]   = "Tablo arkaplan rengi";
+$lang["SetFrmCol"]  = "Frame rengi";
+$lang["SetFontCol"] = "Yazý Rengi";
+$lang["SetFace"]    = "Yazý tipi";
+$lang["SetShow"]    = "Sonuçlarý gösterme þekli";
+$lang["SetPerc"]    = "yüzdelik";
+$lang["SetVotes"]   = "oylar";
+$lang["SetCheck"]   = "Seç";
+$lang["SetNoCheck"] = "Seçme yok";
+$lang["SetIP"]      = "IP tablosu";
+$lang["SetTime"]    = "kitleme zaman uzunluðu";
+$lang["SetHours"]   = "saatler";
+$lang["SetOffset"]  = "Sunucu (Server) zamaný düzenlemesi";
+$lang["SetEntry"]   = "Her Sayfada görünecek yorum sayýsý";
+$lang["SetSubmit"]  = "Ayarlarý Gönder";
+$lang["SetEmpty"]   = "Geçersiz deðer";
+$lang["SetSort"]    = "Görüntüleme sýrasý";
+$lang["SetAsc"]     = "baþlangýçtan sona";
+$lang["SetDesc"]    = "sondan baþa";
+$lang["Setusort"]   = "sýralama";
+$lang["SetOptions"] = "Ankette izin verilen seçenekler";
+$lang["SetPolls"]   = "Her sayfada gösterilecek Anket sayýsý";
+
+/* Change Password */
+$lang["PwdTitle"] = "Þifre Deðiþtirme";
+$lang["PwdText"]  = "Þifre ya da kullanýcý adýný deðiþtirin";
+$lang["PwdUser"]  = "Kullanýcý Adý";
+$lang["PwdPass"]  = "Þifre";
+$lang["PwdConf"]  = "Þifreyi Onaylayýn";
+$lang["PwdNoUsr"] = "Kullanýcý adýný girmeyi unuttunuz";
+$lang["PwdNoPwd"] = "Þifre girmeyi unuttunuz";
+$lang["PwdBad"]   = "Girdiðiniz þifreler birbirini tutmuyor";
+
+/* Poll Stats */
+$lang["StatCrea"]  = "Oluþturuldu";
+$lang["StatAct"]   = "Aktif";
+$lang["StatReset"] = "Kayýt istatistiklerini yenile";
+$lang["StatDis"]   = "Bu anket için kayýt tutma özelliði kapatýldý";
+$lang["StatTotal"] = "Toplam oy";
+$lang["StatDay"]   = "Günlük oy";
+
+/* Poll Comments */
+$lang["ComTotal"]  = "Toplam Yorum";
+$lang["ComName"]   = "Adý";
+$lang["ComPost"]   = "gönderdi";
+$lang["ComDel"]    = "Bu mesajý silmek istediðinizden emin misiniz?";
+
+/* Help */
+$lang["Help"]       = "Yardým";
+$lang["HelpPoll"]   = "Bir anketi sayfaya eklemek için aþaðýdaki kodu web sayfasýna ekleyin";
+$lang["HelpRand"]   = "Rastgele bir anket göstermeniz de mümkün";
+$lang["HelpNew"]    = "Her zaman en son açýlan anketi göster";
+$lang["HelpSyntax"] = "Kod (Syntax)";
+
+/* Days */
+$weekday[0] = "Pazar";
+$weekday[1] = "Pazartesi";
+$weekday[2] = "Salý";
+$weekday[3] = "Çarþamba";
+$weekday[4] = "Perþembe";
+$weekday[5] = "Cuma";
+$weekday[6] = "Cumartes";
+
+/* Months */
+$months[0]  = "Ocak";
+$months[1]  = "Þubat";
+$months[2]  = "Mart";
+$months[3]  = "Nisan";
+$months[4]  = "Mayýs";
+$months[5]  = "Haziran";
+$months[6]  = "Temmuz";
+$months[7]  = "Aðustos";
+$months[8]  = "Eylül";
+$months[9]  = "Ekim";
+$months[10] = "Kasým";
+$months[11] = "Aralýk";
+
+/* Colors */
+$color_array[0]  = "aqua";
+$color_array[1]  = "mavi";
+$color_array[2]  = "kahverengi";
+$color_array[3]  = "koyu yeþil";
+$color_array[4]  = "altýn";
+$color_array[5]  = "yeþil";
+$color_array[6]  = "gri";
+$color_array[7]  = "portakal";
+$color_array[8]  = "pembe";
+$color_array[9]  = "lacivert";
+$color_array[10] = "kýrmýzý";
+$color_array[11] = "sarý";
+
 ?>
\ No newline at end of file

Index: korean.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/lang/korean.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- korean.php	2 Jun 2004 13:05:49 -0000	1.1.1.1
+++ korean.php	18 Sep 2004 16:00:42 -0000	1.2
@@ -1,177 +1,177 @@
-<?php
-
-/* Charset */
-$lang["charset"]   = "euc-kr";
-
-/* General */
-$lang["Logout"]    = "·Î±×¾Æ¿ô";
-$lang["FormUndo"]  = "µÇ»ì¸®±â";
-$lang["FromClear"] = "´Ù½Ã½ÃÀÛÇϱâ";
-$lang["FormEnter"] = "»ç¿ëÀÚÀ̸§°ú ºñ¹Ð¹øÈ£¸¦ ÀÔ·ÂÇØÁֽʽÿä.";
-$lang["FormWrong"] = "»ç¿ëÀÚÀ̸§À̳ª ºñ¹Ð¹øÈ£°¡ Ʋ·È½À´Ï´Ù.";
-$lang["FormOK"]    = "OK";
-$lang["Updated"]   = "¾÷µ¥ÀÌÆ® µÇ¾ú½À´Ï´Ù!";
-$lang["NoUpdate"]  = "¿¡·¯°¡ ³µ½À´Ï´Ù! ¾Æ¹«°Íµµ º¯°æµÇÁö ¾Ê¾Ò½À´Ï´Ù!";
-$lang["Confirm"]   = "°è¼ÓÇϽðڽÀ´Ï±î?";
-$lang["NavNext"]   = "´ÙÀ½ ÆäÀÌÁö·Î";
-$lang["NavPrev"]   = "Àü ÆäÀÌÁö·Î";
-$lang["License"]   = "°è¾à¼­";
-$lang["ScrollTxt"] = "¹®¼­Àüü¸¦ º¸·Á¸é PAGE DOWN Å°¸¦ ´­·¯¼­ º¸½Ê½Ã¿ä.";
-
-/* Templates */
-$lang["Templates"]  = "ÅÛÇ÷¿";
-$lang["tpl_exist"]  = "ÅÛÇ÷¿ À̸§ÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù.";
-$lang["tpl_new"]    = "»õ·Î¿î ÅÛÇ÷¿ ¼¼Æ® ´õÇϱâ.";
-$lang["tpl_succes"] = "Á¤º¸°¡ Ãß°¡µÇ¾ú½À´Ï´Ù!"; 
-$lang["tpl_bad"]    = "ÅÛÇ÷¿ÀÌ À߸øµÇ¾ú½À´Ï´Ù!";
-$lang["tpl_save"]   = "ÀúÀåÇϱâ";
-$lang["preview"]    = "¹Ì¸®º¸±â";
-$lang["newtpl"]     = "»õ·Î¿î ÅÛÇ÷¿ ¼¼Æ®";
-
-/* Poll List */
-$lang["IndexTitle"]  = "ÅõÇ¥ÇÔ ¸ñ·Ï";
-$lang["IndexQuest"]  = "Áú¹®";
-$lang["IndexID"]     = "ÅõÇ¥ÇÔ ¾ÆÀ̵ð";
-$lang["IndexDate"]   = "³¯Â¥";
-$lang["IndexDays"]   = "ÀÏ";
-$lang["IndexExp"]    = "³¡³ª´Â ³¯Â¥";
-$lang["IndexExpire"] = "³¡³µ½À´Ï´Ù";
-$lang["IndexNever"]  = "³¡³ªÁö¾Ê½À´Ï´Ù";
-$lang["IndexStat"]   = "Åë°è";
-$lang["IndexCom"]    = "ÄÚ¸àÆ®";
-$lang["IndexAct"]    = "¾×¼Ç";
-$lang["IndexDel"]    = "Áö¿ì±â";
-
-/* Create A New Poll */
-$lang["NewTitle"]  = "»õ·Î¿î ÅõÇ¥ÇÔ ¸¸µé±â";
-$lang["NewOption"] = "¿É¼Ç";
-$lang["NewNoQue"]  = "Áú¹®³­ÀÌ ºñ¾îÀÖ½À´Ï´Ù.";
-$lang["NewNoOpt"]  = "¿É¼Ç³­ÀÌ ºñ¾îÀÖ½À´Ï´Ù.";
-
-/* Poll Edit */
-$lang["EditStat"]  = "»óÅÂ";
-$lang["EditText"]  = "ÅõÇ¥ÇÔ °íÄ¡±â";
-$lang["EditReset"] = "ÅõÇ¥ÇÔÀ» óÀ½À¸·Î µÇµ¹¸®±â";
-$lang["EditOn"]    = "»ç¿ë°¡´É";
-$lang["EditOff"]   = "»ç¿ëºÒ°¡´É";
-$lang["EditHide"]  = "¼û±â±â";
-$lang["EditLgOff"] = "·Î±×¿ÀÇÁ";
-$lang["EditLgOn"]  = "·Î±×¿Â";
-$lang["EditAdd"]   = "¿É¼Çµé ´õÇϱâ";
-$lang["EditNo"]    = "¿É¼ÇµéÀÌ ´õÇØÁöÁö ¾Ê¾Ò½À´Ï´Ù!";
-$lang["EditOk"]    = "¿é¼ÇµéÀÌ ´õÇØÁ³½À´Ï´Ù!";
-$lang["EditSave"]  = "ÀúÀåÇϱâ";
-$lang["EditOp"]    = "Àû¾îµµ 2°³ÀÇ ¿É¼ÇµéÀÌ ÇÊ¿äÇÕ´Ï´Ù!";
-$lang["EditMis"]   = "Áú¹®°ú ¿É¼ÇµéÀÌ ¾ø½À´Ï´Ù!";
-$lang["EditDel"]   = "¿É¼ÇÀ» Áö¿ì·Á¸é ºó°ø°£ÀÎ »óÅ·ΠÀúÀåÇϽʽÿä.";
-$lang["EditCom"]   = "Àǰߺ¸³»±â¸¦ Çã¿ëÇÕ´Ï´Ù.";
-
-/* General Settings */
-$lang["SetTitle"]   = "ÀϹÝȯ°æ";
-$lang["SetOption"]  = "Å×À̺í, ±Û²Ã ±×¸®°í »ö»ó ¿É¼Ç";
-$lang["SetMisc"]    = "±×¿ÜÀÇ È¯°æµé";
-$lang["SetText"]    = "ÀϹÝȯ°æ ¹Ù²Ù±â";
-$lang["SetURL"]     = "À̹ÌÁö Æú´õ ÁÖ¼Ò(URL)";
-$lang["SetBURL"]    = "ÅõÇ¥ÇÔ Æú´õ ÁÖ¼Ò(URL)";
-$lang["SetNo"]      = "½½·¡½¬(»ç¼±)Àº »ç¿ëºÒ°¡´ÉÀÔ´Ï´Ù.";
-$lang["SetLang"]    = "¾ð¾î";
-$lang["SetPoll"]    = "ÅõÇ¥ÇÔ À̸§";
-$lang["SetButton"]  = "ÅõÇ¥Çϱ⠹öÆ°";
-$lang["SetResult"]  = "ÅõÇ¥°á°ú ¸µÅ©";
-$lang["SetVoted"]   = "ÀÌ¹Ì ÅõÇ¥ÇÏ¿´½À´Ï´Ù.";
-$lang["SetComment"] = "ÀÇ°ß º¸³»±â";
-$lang["SetTab"]     = "Å×ÀÌºí ³Êºñ";
-$lang["SetBarh"]    = "¸·´ë±â ³ôÀÌ";
-$lang["SetBarMax"]  = "¸·´ë±âÀÇ ÃÖ°í±æÀÌ";
-$lang["SetTabBg"]   = "Å×À̺í¹è°æ »ö°¥";
-$lang["SetFrmCol"]  = "ÇÁ·¹ÀÓ »ö°¥";
-$lang["SetFontCol"] = "±Û²Ã »ö°¥";
-$lang["SetFace"]    = "±Û²Ã";
-$lang["SetShow"]    = "°á°ú¸¦ Ç¥½ÃÇÒ¶§ ";
-$lang["SetPerc"]    = "ÆÛ¼¾Æ®";
-$lang["SetVotes"]   = "ÅõÇ¥¼ö";
-$lang["SetCheck"]   = "ýũÇϱâ";
-$lang["SetNoCheck"] = "ýũ¾ÈÇϱâ";
-$lang["SetIP"]      = "IP Å×À̺í";
-$lang["SetTime"]    = "½Ã°£Á¾·á";
-$lang["SetHours"]   = "½Ã°£";
-$lang["SetOffset"]  = "¼­¹ö¿ÍÀÇ ½Ã°£Â÷ÀÌ";
-$lang["SetEntry"]   = "ÇÑÆäÀÌÁö¿¡ º¸¿©Áú ÀÇ°ß±Û °¹¼ö";
-$lang["SetSubmit"]  = "ȯ°æÀúÀåÇϱâ";
-$lang["SetEmpty"]   = "À߸øµÈ °ªÀÔ´Ï´Ù";
-$lang["SetSort"]    = "¼ø¼­ º¸¿©ÁÖ±â";
-$lang["SetAsc"]     = "¿À¸§Â÷";
-$lang["SetDesc"]    = "³»¸²Â÷";
-$lang["Setusort"]   = "¼ø¼­´ë·Î ¾Èº¸¿©ÁÖ±â";
-$lang["SetOptions"] = "»õ·Î¿î ÅõÇ¥ÇÔ¿¡ Çã¿ëµÉ ¿É¼Çµé";
-$lang["SetPolls"]   = "ÇÑÆäÀÌÁö¿¡ º¸¿©ÁÙ ÅõÇ¥ÇÔ °¹¼ö";
-
-/* Change Password */
-$lang["PwdTitle"] = "ºñ¹Ð¹øÈ£ ¹Ù²Ù±â";
-$lang["PwdText"]  = "»ç¿ëÀÚ¸íÀ̳ª ºñ¹Ð¹øÈ£ ¹Ù²Ù±â";
-$lang["PwdUser"]  = "»ç¿ëÀÚ¸í";
-$lang["PwdPass"]  = "ºñ¹Ð¹øÈ£";
-$lang["PwdConf"]  = "ºñ¹Ð¹øÈ£ ´Ù½Ã È®ÀÎ";
-$lang["PwdNoUsr"] = "»ç¿ëÀÚ¸íÀÌ ºñ¾ú½À´Ï´Ù.";
-$lang["PwdNoPwd"] = "ºñ¹Ð¹øÈ£°¡ ºñ¾ú½À´Ï´Ù.";
-$lang["PwdBad"]   = "ºñ¹Ð¹øÈ£°¡ ´Ù¸¨´Ï´Ù.";
-
-/* Poll Stats */
-$lang["StatCrea"]  = "¸¸µé¾îÁ³½À´Ï´Ù.";
-$lang["StatAct"]   = "»ç¿ëÁßÀÔ´Ï´Ù.";
-$lang["StatReset"] = "·Î±×Åë°è¸¦ ´Ù½Ã½ÃÀÛÇÕ´Ï´Ù";
-$lang["StatDis"]   = "·Î±×°¡ Çã¿ëµÇÁö¾Ê½À´Ï´Ù.";
-$lang["StatTotal"] = "ÅõÇ¥¼ö ÇÕ°è ";
-$lang["StatDay"]   = "ÇÏ·íµ¿¾ÈÀÇ ÅõÇ¥¼ö";
-
-/* Poll Comments */
-$lang["ComTotal"]  = "ÀÇ°ß±Û ÇÕ°è";
-$lang["ComName"]   = "À̸§";
-$lang["ComPost"]   = "±Û¿Ã¸²";
-$lang["ComDel"]    = "±Û Áö¿ì½Ã±æ ¿øÇϽʴϱî?";
-
-/* Help */
-$lang["Help"]       = "µµ¿ì¹Ì";
-$lang["HelpPoll"]   = "ÅõÇ¥ÇÔÀ» À¥ÆäÀÌÁö¿¡ ³ÖÀ¸·Á¸é ¾Æ·¡ Äڵ带 º¹»çÇؼ­ »ç¿ëÇϽʽÿä.";
-$lang["HelpRand"]   = "¹«ÀÛÀ§·Î ÅõÇ¥ÇÔ º¸¿©Áֱ⵵ °¡´ÉÇÕ´Ï´Ù.";
-$lang["HelpNew"]    = "Ç×»ó ÃÖ±Ù ÅõÇ¥ÇÔÀ» º¸¿©ÁÖ±â";
-$lang["HelpSyntax"] = "Syntax";
-
-/* Days */
-$weekday[0] = "ÀÏ¿äÀÏ";
-$weekday[1] = "¿ù¿äÀÏ";
-$weekday[2] = "È­¿äÀÏ";
-$weekday[3] = "¼ö¿äÀÏ";
-$weekday[4] = "¸ñ¿äÀÏ";
-$weekday[5] = "±Ý¿äÀÏ";
-$weekday[6] = "Åä¿äÀÏ";
-
-/* Months */
-$months[0]  = "1¿ù";
-$months[1]  = "2¿ù";
-$months[2]  = "3¿ù";
-$months[3]  = "4¿ù";
-$months[4]  = "5¿ù";
-$months[5]  = "6¿ù";
-$months[6]  = "7¿ù";
-$months[7]  = "8¿ù";
-$months[8]  = "9¿ù";
-$months[9]  = "10¿ù";
-$months[10] = "11¿ù";
-$months[11] = "12¿ù";
-
-/* translating this array does not change the reference */
-$color_array[0]  = "¾ÆÄí¾Æ»ö";
-$color_array[1]  = "ÆĶû»ö";
-$color_array[2]  = "°¥»ö";
-$color_array[3]  = "Áø³ì»ö";
-$color_array[4]  = "±Ý»ö";
-$color_array[5]  = "ÃÊ·Ï»ö";
-$color_array[6]  = "ȸ»ö";
-$color_array[7]  = "ÁÖȲ»ö";
-$color_array[8]  = "ºÐÈ«»ö";
-$color_array[9]  = "ÀÚÁÖ»ö";
-$color_array[10] = "»¡°£»ö";
-$color_array[11] = "³ë¶õ»ö";
-
+<?php
+
+/* Charset */
+$lang["charset"]   = "euc-kr";
+
+/* General */
+$lang["Logout"]    = "·Î±×¾Æ¿ô";
+$lang["FormUndo"]  = "µÇ»ì¸®±â";
+$lang["FromClear"] = "´Ù½Ã½ÃÀÛÇϱâ";
+$lang["FormEnter"] = "»ç¿ëÀÚÀ̸§°ú ºñ¹Ð¹øÈ£¸¦ ÀÔ·ÂÇØÁֽʽÿä.";
+$lang["FormWrong"] = "»ç¿ëÀÚÀ̸§À̳ª ºñ¹Ð¹øÈ£°¡ Ʋ·È½À´Ï´Ù.";
+$lang["FormOK"]    = "OK";
+$lang["Updated"]   = "¾÷µ¥ÀÌÆ® µÇ¾ú½À´Ï´Ù!";
+$lang["NoUpdate"]  = "¿¡·¯°¡ ³µ½À´Ï´Ù! ¾Æ¹«°Íµµ º¯°æµÇÁö ¾Ê¾Ò½À´Ï´Ù!";
+$lang["Confirm"]   = "°è¼ÓÇϽðڽÀ´Ï±î?";
+$lang["NavNext"]   = "´ÙÀ½ ÆäÀÌÁö·Î";
+$lang["NavPrev"]   = "Àü ÆäÀÌÁö·Î";
+$lang["License"]   = "°è¾à¼­";
+$lang["ScrollTxt"] = "¹®¼­Àüü¸¦ º¸·Á¸é PAGE DOWN Å°¸¦ ´­·¯¼­ º¸½Ê½Ã¿ä.";
+
+/* Templates */
+$lang["Templates"]  = "ÅÛÇ÷¿";
+$lang["tpl_exist"]  = "ÅÛÇ÷¿ À̸§ÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù.";
+$lang["tpl_new"]    = "»õ·Î¿î ÅÛÇ÷¿ ¼¼Æ® ´õÇϱâ.";
+$lang["tpl_succes"] = "Á¤º¸°¡ Ãß°¡µÇ¾ú½À´Ï´Ù!"; 
+$lang["tpl_bad"]    = "ÅÛÇ÷¿ÀÌ À߸øµÇ¾ú½À´Ï´Ù!";
+$lang["tpl_save"]   = "ÀúÀåÇϱâ";
+$lang["preview"]    = "¹Ì¸®º¸±â";
+$lang["newtpl"]     = "»õ·Î¿î ÅÛÇ÷¿ ¼¼Æ®";
+
+/* Poll List */
+$lang["IndexTitle"]  = "ÅõÇ¥ÇÔ ¸ñ·Ï";
+$lang["IndexQuest"]  = "Áú¹®";
+$lang["IndexID"]     = "ÅõÇ¥ÇÔ ¾ÆÀ̵ð";
+$lang["IndexDate"]   = "³¯Â¥";
+$lang["IndexDays"]   = "ÀÏ";
+$lang["IndexExp"]    = "³¡³ª´Â ³¯Â¥";
+$lang["IndexExpire"] = "³¡³µ½À´Ï´Ù";
+$lang["IndexNever"]  = "³¡³ªÁö¾Ê½À´Ï´Ù";
+$lang["IndexStat"]   = "Åë°è";
+$lang["IndexCom"]    = "ÄÚ¸àÆ®";
+$lang["IndexAct"]    = "¾×¼Ç";
+$lang["IndexDel"]    = "Áö¿ì±â";
+
+/* Create A New Poll */
+$lang["NewTitle"]  = "»õ·Î¿î ÅõÇ¥ÇÔ ¸¸µé±â";
+$lang["NewOption"] = "¿É¼Ç";
+$lang["NewNoQue"]  = "Áú¹®³­ÀÌ ºñ¾îÀÖ½À´Ï´Ù.";
+$lang["NewNoOpt"]  = "¿É¼Ç³­ÀÌ ºñ¾îÀÖ½À´Ï´Ù.";
+
+/* Poll Edit */
+$lang["EditStat"]  = "»óÅÂ";
+$lang["EditText"]  = "ÅõÇ¥ÇÔ °íÄ¡±â";
+$lang["EditReset"] = "ÅõÇ¥ÇÔÀ» óÀ½À¸·Î µÇµ¹¸®±â";
+$lang["EditOn"]    = "»ç¿ë°¡´É";
+$lang["EditOff"]   = "»ç¿ëºÒ°¡´É";
+$lang["EditHide"]  = "¼û±â±â";
+$lang["EditLgOff"] = "·Î±×¿ÀÇÁ";
+$lang["EditLgOn"]  = "·Î±×¿Â";
+$lang["EditAdd"]   = "¿É¼Çµé ´õÇϱâ";
+$lang["EditNo"]    = "¿É¼ÇµéÀÌ ´õÇØÁöÁö ¾Ê¾Ò½À´Ï´Ù!";
+$lang["EditOk"]    = "¿é¼ÇµéÀÌ ´õÇØÁ³½À´Ï´Ù!";
+$lang["EditSave"]  = "ÀúÀåÇϱâ";
+$lang["EditOp"]    = "Àû¾îµµ 2°³ÀÇ ¿É¼ÇµéÀÌ ÇÊ¿äÇÕ´Ï´Ù!";
+$lang["EditMis"]   = "Áú¹®°ú ¿É¼ÇµéÀÌ ¾ø½À´Ï´Ù!";
+$lang["EditDel"]   = "¿É¼ÇÀ» Áö¿ì·Á¸é ºó°ø°£ÀÎ »óÅ·ΠÀúÀåÇϽʽÿä.";
+$lang["EditCom"]   = "Àǰߺ¸³»±â¸¦ Çã¿ëÇÕ´Ï´Ù.";
+
+/* General Settings */
+$lang["SetTitle"]   = "...
 
[truncated message content]

[Devil-linux-commit] web/poll/admin/templates admin_comment.html,1.1.1.1,1.2 admin_comment_tr.html,1.1.1.1,1.2 admin_edit.html,1.1.1.1,1.2 admin_embed.html,1.1.1.1,1.2 admin_help.html,1.1.1.1,1.2 admin_index.html,1.1.1.1,1.2 admin_index_tr.html,1.1.1.1,1.2 admin_license.html,1.1.1.1,1.2 admin_login.html,1.1.1.1,1.2 admin_new.html,1.1.1.1,1.2 admin_options.html,1.1.1.1,1.2 admin_password.html,1.1.1.1,1.2 admin_preview.html,1.1.1.1,1.2 admin_settings.html,1.1.1.1,1.2 admin_stats.html,1.1.1.1,1.2 admin_tpl_comment.html,1.1.1.1,1.2 admin_tpl_display.html,1.1.1.1,1.2 admin_tpl_misc.html,1.1.1.1,1.2 admin_tpl_misc_edit.html,1.1.1.1,1.2 admin_tpl_misc_new.html,1.1.1.1,1.2 admin_tpl_new.html,1.1.1.1,1.2 admin_tpl_result.html,1.1.1.1,1.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll/admin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll/admin/templates

Modified Files:
	admin_comment.html admin_comment_tr.html admin_edit.html 
	admin_embed.html admin_help.html admin_index.html 
	admin_index_tr.html admin_license.html admin_login.html 
	admin_new.html admin_options.html admin_password.html 
	admin_preview.html admin_settings.html admin_stats.html 
	admin_tpl_comment.html admin_tpl_display.html 
	admin_tpl_misc.html admin_tpl_misc_edit.html 
	admin_tpl_misc_new.html admin_tpl_new.html 
	admin_tpl_result.html 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


Index: admin_index.html
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/templates/admin_index.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_index.html	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_index.html	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,93 +1,93 @@
-<html>
-<head>
-<title>Advanced Poll $pollvars[poll_version]</title>
-<meta http-equiv="Content-Type" content="text/html; charset=$lang[charset]">
-<style type="text/css">
-<!--
-a {text-decoration: none}
-.td1 {  font-family: "MS Sans Serif"; font-size: 10pt}
-.td2 {  font-family: "MS Sans Serif"; font-size: 9pt}
-a:hover {  color: #FF0033; text-decoration: underline}
--->
-</style>
-<script language="Javascript">
-<!--
-function del_entry(entry) {
- if (window.confirm("$lang[Confirm]")) {
-    window.location.href = "http://"+window.location.host+window.location.pathname+"?session=$auth[session]&uid=$auth[uid]&action=delete&id="+entry+"&no_cache="+Math.random()
- }
-}
-// -->
-</script>
-</head>
-<body bgcolor="#3A6EA5" link="#000000" vlink="#000000">
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="750">
-  <tr bgcolor="#C6C3C6" valign="top">
-    <td>
-      <table width="750" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td2" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll $pollvars[poll_version]</font></b></td>
-          <td height="20" align="right" bgcolor="#000084">
-          <img src="$pollvars[base_gif]/min.gif" width="16" height="14"><img src="$pollvars[base_gif]/max.gif" width="16" height="14">&nbsp;<a href="admin_logout.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/cross.gif" width="16" height="14" border="0" alt="$lang[Logout]"></a></td>
-        </tr>
-        <tr valign="top">
-          <td colspan="2">
-            <table border="0" cellspacing="0" cellpadding="1">
-              <tr>
-                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
-              </tr>
-              <tr>
-                <td align="center" rowspan="2" width="5"><img src="$pollvars[base_gif]/v_line.gif" width="5" height="50"></td>
-                <td align="center" width="120"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=show"><img src="$pollvars[base_gif]/index.gif" width="32" height="32" border="0" alt="$lang[IndexTitle]"></a></td>
-                <td align="center" width="131"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=new"><img src="$pollvars[base_gif]/new.gif" width="32" height="32" border="0" alt="$lang[NewTitle]"></a></td>
-                <td align="center" width="153"><a href="admin_settings.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/settings.gif" width="32" height="32" border="0" alt="$lang[SetTitle]"></a></td>
-                <td align="center" width="121"><a href="admin_templates.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/templates.gif" width="32" height="32" border="0" alt="$lang[Templates]"></a></td>
-                <td align="center" width="127"><a href="admin_password.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/password.gif" width="32" height="32" border="0" alt="$lang[PwdTitle]"></a></td>
-                <td align="center" width="89"><a href="admin_help.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/howto.gif" width="32" height="32" border="0" alt="$lang[Help]"></a></td>
-              </tr>
-              <tr align="center" valign="top">
-                <td width="120" class="td2">$lang[IndexTitle]</td>
-                <td width="131" class="td2">$lang[NewTitle]</td>
-                <td width="153" class="td2">$lang[SetTitle]</td>
-                <td width="121" class="td2">$lang[Templates]</td>
-                <td width="127" class="td2">$lang[PwdTitle]</td>
-                <td width="89" class="td2">$lang[Help]</td>
-              </tr>
-              <tr align="left">
-                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
-              </tr>
-            </table>
-    <table border="0" cellspacing="0" cellpadding="4" align="center" width="100%">
-      <tr>
-        <td colspan="5" class="td1"><img src="$pollvars[base_gif]/h_line.gif" width="15" height="18">
-          $lang[IndexTitle] <img src="$pollvars[base_gif]/h_line.gif" width="300" height="18"></td>
-        <td colspan="3" class="td2" align="right">$newdate</td>
-      </tr>
-      <tr>
-        <td bgcolor="#9999CC">&nbsp;</td>
-        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexQuest]</b></td>
-        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexID]</b></td>
-        <td class="td2" bgcolor="#9999CC"><b>$lang[StatCrea]</b></td>
-        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexDays]</b></td>
-        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexExp]</b></td>
-        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexStat]</b></td>
-        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexAct]</b></td>
-      </tr>
-      $admin_index_tr
-      <tr>
-        <td align="right"><img src="$pollvars[base_gif]/ip.gif" width="16" height="16"></td>
-        <td class="td2">{poll_user}@{poll_host}</td>
-        <td colspan="6" align="right" class="td2">&nbsp;$navigation</td>
-      </tr>
-    </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-</body>
-</html>
+<html>
+<head>
+<title>Advanced Poll $pollvars[poll_version]</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$lang[charset]">
+<style type="text/css">
+<!--
+a {text-decoration: none}
+.td1 {  font-family: "MS Sans Serif"; font-size: 10pt}
+.td2 {  font-family: "MS Sans Serif"; font-size: 9pt}
+a:hover {  color: #FF0033; text-decoration: underline}
+-->
+</style>
+<script language="Javascript">
+<!--
+function del_entry(entry) {
+ if (window.confirm("$lang[Confirm]")) {
+    window.location.href = "http://"+window.location.host+window.location.pathname+"?session=$auth[session]&uid=$auth[uid]&action=delete&id="+entry+"&no_cache="+Math.random()
+ }
+}
+// -->
+</script>
+</head>
+<body bgcolor="#3A6EA5" link="#000000" vlink="#000000">
+<table border="1" cellspacing="0" cellpadding="0" align="center" width="750">
+  <tr bgcolor="#C6C3C6" valign="top">
+    <td>
+      <table width="750" border="0" cellspacing="0" cellpadding="1" align="center">
+        <tr bgcolor="#400080">
+          <td height="20" class="td2" bgcolor="#000084"><b><font color="#FFFFFF">
+            &nbsp;Advanced Poll $pollvars[poll_version]</font></b></td>
+          <td height="20" align="right" bgcolor="#000084">
+          <img src="$pollvars[base_gif]/min.gif" width="16" height="14"><img src="$pollvars[base_gif]/max.gif" width="16" height="14">&nbsp;<a href="admin_logout.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/cross.gif" width="16" height="14" border="0" alt="$lang[Logout]"></a></td>
+        </tr>
+        <tr valign="top">
+          <td colspan="2">
+            <table border="0" cellspacing="0" cellpadding="1">
+              <tr>
+                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
+              </tr>
+              <tr>
+                <td align="center" rowspan="2" width="5"><img src="$pollvars[base_gif]/v_line.gif" width="5" height="50"></td>
+                <td align="center" width="120"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=show"><img src="$pollvars[base_gif]/index.gif" width="32" height="32" border="0" alt="$lang[IndexTitle]"></a></td>
+                <td align="center" width="131"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=new"><img src="$pollvars[base_gif]/new.gif" width="32" height="32" border="0" alt="$lang[NewTitle]"></a></td>
+                <td align="center" width="153"><a href="admin_settings.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/settings.gif" width="32" height="32" border="0" alt="$lang[SetTitle]"></a></td>
+                <td align="center" width="121"><a href="admin_templates.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/templates.gif" width="32" height="32" border="0" alt="$lang[Templates]"></a></td>
+                <td align="center" width="127"><a href="admin_password.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/password.gif" width="32" height="32" border="0" alt="$lang[PwdTitle]"></a></td>
+                <td align="center" width="89"><a href="admin_help.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/howto.gif" width="32" height="32" border="0" alt="$lang[Help]"></a></td>
+              </tr>
+              <tr align="center" valign="top">
+                <td width="120" class="td2">$lang[IndexTitle]</td>
+                <td width="131" class="td2">$lang[NewTitle]</td>
+                <td width="153" class="td2">$lang[SetTitle]</td>
+                <td width="121" class="td2">$lang[Templates]</td>
+                <td width="127" class="td2">$lang[PwdTitle]</td>
+                <td width="89" class="td2">$lang[Help]</td>
+              </tr>
+              <tr align="left">
+                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
+              </tr>
+            </table>
+    <table border="0" cellspacing="0" cellpadding="4" align="center" width="100%">
+      <tr>
+        <td colspan="5" class="td1"><img src="$pollvars[base_gif]/h_line.gif" width="15" height="18">
+          $lang[IndexTitle] <img src="$pollvars[base_gif]/h_line.gif" width="300" height="18"></td>
+        <td colspan="3" class="td2" align="right">$newdate</td>
+      </tr>
+      <tr>
+        <td bgcolor="#9999CC">&nbsp;</td>
+        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexQuest]</b></td>
+        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexID]</b></td>
+        <td class="td2" bgcolor="#9999CC"><b>$lang[StatCrea]</b></td>
+        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexDays]</b></td>
+        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexExp]</b></td>
+        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexStat]</b></td>
+        <td class="td2" bgcolor="#9999CC"><b>$lang[IndexAct]</b></td>
+      </tr>
+      $admin_index_tr
+      <tr>
+        <td align="right"><img src="$pollvars[base_gif]/ip.gif" width="16" height="16"></td>
+        <td class="td2">{poll_user}@{poll_host}</td>
+        <td colspan="6" align="right" class="td2">&nbsp;$navigation</td>
+      </tr>
+    </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<br>
+<br>
+</body>
+</html>

Index: admin_preview.html
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/templates/admin_preview.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_preview.html	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_preview.html	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,14 +1,14 @@
-<html>
-<head>
-<title>Advanced Poll</title>
-</head>
-<body bgcolor="#3A6EA5">
-<table width="100%" border="0" cellspacing="0" cellpadding="0" height="350" align="center">
-  <tr>
-    <td align="center">$preview</td>
-  </tr>
-</table>
-<br>
-<br>
-</body>
-</html>
+<html>
+<head>
+<title>Advanced Poll</title>
+</head>
+<body bgcolor="#3A6EA5">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" height="350" align="center">
+  <tr>
+    <td align="center">$preview</td>
+  </tr>
+</table>
+<br>
+<br>
+</body>
+</html>

Index: admin_comment.html
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/templates/admin_comment.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_comment.html	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_comment.html	18 Sep 2004 16:00:40 -0000	1.2
@@ -1,92 +1,92 @@
-<html>
-<head>
-<title>Advanced Poll $pollvars[poll_version]</title>
-<meta http-equiv="Content-Type" content="text/html; charset=$lang[charset]">
-<style type="text/css">
-<!--
-a {text-decoration: none}
-.td1 {  font-family: "MS Sans Serif"; font-size: 10pt}
-.td2 {  font-family: "MS Sans Serif"; font-size: 9pt}
-a:hover {  color: #FF0033; text-decoration: underline}
--->
-</style>
-<script language="Javascript">
-<!--
-function del_entry(entry) {
- if (window.confirm("$lang[ComDel]")) {
-    window.location.href = "http://"+window.location.host+window.location.pathname+"?session=$auth[session]&uid=$auth[uid]&action=delete&poll_id=$poll_id&mess_id="+entry+"&no_cache="+Math.random()
- }
-}
-// -->
-</script>
-</head>
-<body bgcolor="#3A6EA5" link="#000000" vlink="#000000">
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="750">
-  <tr bgcolor="#C6C3C6" valign="top">
-    <td>
-      <table width="750" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td2" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll $pollvars[poll_version]</font></b></td>
-          <td height="20" align="right" bgcolor="#000084">
-          <img src="$pollvars[base_gif]/min.gif" width="16" height="14"><img src="$pollvars[base_gif]/max.gif" width="16" height="14">&nbsp;<a href="admin_logout.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/cross.gif" width="16" height="14" border="0" alt="$lang[Logout]"></a></td>
-        </tr>
-        <tr valign="top">
-          <td colspan="2">
-            <table border="0" cellspacing="0" cellpadding="1">
-              <tr>
-                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
-              </tr>
-              <tr>
-                <td align="center" rowspan="2" width="5"><img src="$pollvars[base_gif]/v_line.gif" width="5" height="50"></td>
-                <td align="center" width="120"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=show"><img src="$pollvars[base_gif]/index.gif" width="32" height="32" border="0" alt="$lang[IndexTitle]"></a></td>
-                <td align="center" width="131"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=new"><img src="$pollvars[base_gif]/new.gif" width="32" height="32" border="0" alt="$lang[NewTitle]"></a></td>
-                <td align="center" width="153"><a href="admin_settings.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/settings.gif" width="32" height="32" border="0" alt="$lang[SetTitle]"></a></td>
-                <td align="center" width="121"><a href="admin_templates.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/templates.gif" width="32" height="32" border="0" alt="$lang[Templates]"></a></td>
-                <td align="center" width="127"><a href="admin_password.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/password.gif" width="32" height="32" border="0" alt="$lang[PwdTitle]"></a></td>
-                <td align="center" width="89"><a href="admin_help.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/howto.gif" width="32" height="32" border="0" alt="$lang[Help]"></a></td>
-              </tr>
-              <tr align="center" valign="top">
-                <td width="120" class="td2">$lang[IndexTitle]</td>
-                <td width="131" class="td2">$lang[NewTitle]</td>
-                <td width="153" class="td2">$lang[SetTitle]</td>
-                <td width="121" class="td2">$lang[Templates]</td>
-                <td width="127" class="td2">$lang[PwdTitle]</td>
-                <td width="89" class="td2">$lang[Help]</td>
-              </tr>
-              <tr align="left">
-                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
-              </tr>
-            </table>
-            <table border="0" cellspacing="1" cellpadding="3" width="100%">
-              <tr> 
-                <td class="td1" colspan="3" height="30">
-                  <img src="$pollvars[base_gif]/h_line.gif" width="15" height="18">&nbsp;$question&nbsp;<img src="$pollvars[base_gif]/h_line.gif" width="250" height="18"></td>
-              </tr>
-              <tr> 
-                <td width="200" class="td2">$lang[ComTotal]: <b><font color="#006699">$total</font></b></td>
-                <td colspan="2" class="td2" align="right">$navigation</td>
-              </tr>
-              <tr>
-                <td width="200" bgcolor="#999999" class="td2"><b>$lang[ComName]</b></td>
-                <td width="457" class="td2" bgcolor="#999999" valign="top"><b>$lang[IndexCom]</b></td>
-                <td width="66" class="td2" bgcolor="#999999" valign="top">&nbsp;</td>
-              </tr>
-              
-$admin_comment_tr
-              
-              <tr bgcolor="#CCCCCC"> 
-                <td width="200" class="td2">$lang[SetEntry]: <b><font color="#006699">$pollvars[entry_pp]</font></b></td>
-                <td colspan="2" class="td2" align="right">&nbsp;$navigation</td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-</body>
-</html>
+<html>
+<head>
+<title>Advanced Poll $pollvars[poll_version]</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$lang[charset]">
+<style type="text/css">
+<!--
+a {text-decoration: none}
+.td1 {  font-family: "MS Sans Serif"; font-size: 10pt}
+.td2 {  font-family: "MS Sans Serif"; font-size: 9pt}
+a:hover {  color: #FF0033; text-decoration: underline}
+-->
+</style>
+<script language="Javascript">
+<!--
+function del_entry(entry) {
+ if (window.confirm("$lang[ComDel]")) {
+    window.location.href = "http://"+window.location.host+window.location.pathname+"?session=$auth[session]&uid=$auth[uid]&action=delete&poll_id=$poll_id&mess_id="+entry+"&no_cache="+Math.random()
+ }
+}
+// -->
+</script>
+</head>
+<body bgcolor="#3A6EA5" link="#000000" vlink="#000000">
+<table border="1" cellspacing="0" cellpadding="0" align="center" width="750">
+  <tr bgcolor="#C6C3C6" valign="top">
+    <td>
+      <table width="750" border="0" cellspacing="0" cellpadding="1" align="center">
+        <tr bgcolor="#400080">
+          <td height="20" class="td2" bgcolor="#000084"><b><font color="#FFFFFF">
+            &nbsp;Advanced Poll $pollvars[poll_version]</font></b></td>
+          <td height="20" align="right" bgcolor="#000084">
+          <img src="$pollvars[base_gif]/min.gif" width="16" height="14"><img src="$pollvars[base_gif]/max.gif" width="16" height="14">&nbsp;<a href="admin_logout.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/cross.gif" width="16" height="14" border="0" alt="$lang[Logout]"></a></td>
+        </tr>
+        <tr valign="top">
+          <td colspan="2">
+            <table border="0" cellspacing="0" cellpadding="1">
+              <tr>
+                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
+              </tr>
+              <tr>
+                <td align="center" rowspan="2" width="5"><img src="$pollvars[base_gif]/v_line.gif" width="5" height="50"></td>
+                <td align="center" width="120"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=show"><img src="$pollvars[base_gif]/index.gif" width="32" height="32" border="0" alt="$lang[IndexTitle]"></a></td>
+                <td align="center" width="131"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=new"><img src="$pollvars[base_gif]/new.gif" width="32" height="32" border="0" alt="$lang[NewTitle]"></a></td>
+                <td align="center" width="153"><a href="admin_settings.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/settings.gif" width="32" height="32" border="0" alt="$lang[SetTitle]"></a></td>
+                <td align="center" width="121"><a href="admin_templates.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/templates.gif" width="32" height="32" border="0" alt="$lang[Templates]"></a></td>
+                <td align="center" width="127"><a href="admin_password.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/password.gif" width="32" height="32" border="0" alt="$lang[PwdTitle]"></a></td>
+                <td align="center" width="89"><a href="admin_help.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/howto.gif" width="32" height="32" border="0" alt="$lang[Help]"></a></td>
+              </tr>
+              <tr align="center" valign="top">
+                <td width="120" class="td2">$lang[IndexTitle]</td>
+                <td width="131" class="td2">$lang[NewTitle]</td>
+                <td width="153" class="td2">$lang[SetTitle]</td>
+                <td width="121" class="td2">$lang[Templates]</td>
+                <td width="127" class="td2">$lang[PwdTitle]</td>
+                <td width="89" class="td2">$lang[Help]</td>
+              </tr>
+              <tr align="left">
+                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
+              </tr>
+            </table>
+            <table border="0" cellspacing="1" cellpadding="3" width="100%">
+              <tr> 
+                <td class="td1" colspan="3" height="30">
+                  <img src="$pollvars[base_gif]/h_line.gif" width="15" height="18">&nbsp;$question&nbsp;<img src="$pollvars[base_gif]/h_line.gif" width="250" height="18"></td>
+              </tr>
+              <tr> 
+                <td width="200" class="td2">$lang[ComTotal]: <b><font color="#006699">$total</font></b></td>
+                <td colspan="2" class="td2" align="right">$navigation</td>
+              </tr>
+              <tr>
+                <td width="200" bgcolor="#999999" class="td2"><b>$lang[ComName]</b></td>
+                <td width="457" class="td2" bgcolor="#999999" valign="top"><b>$lang[IndexCom]</b></td>
+                <td width="66" class="td2" bgcolor="#999999" valign="top">&nbsp;</td>
+              </tr>
+              
+$admin_comment_tr
+              
+              <tr bgcolor="#CCCCCC"> 
+                <td width="200" class="td2">$lang[SetEntry]: <b><font color="#006699">$pollvars[entry_pp]</font></b></td>
+                <td colspan="2" class="td2" align="right">&nbsp;$navigation</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<br>
+<br>
+</body>
+</html>

Index: admin_help.html
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/templates/admin_help.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_help.html	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_help.html	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,124 +1,124 @@
-<html>
-<head>
-<title>Advanced Poll $pollvars[poll_version]</title>
-<meta http-equiv="Content-Type" content="text/html; charset=$lang[charset]">
-<style type="text/css">
-<!--
-.td1 {  font-family: "MS Sans Serif"; font-size: 10pt}
-.td2 {  font-family: "MS Sans Serif"; font-size: 9pt}
-.code {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; font-weight: normal; height: 200px; width: 600px;; background-color: #E9E9E9}
-.code2 {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; height: 90px; width: 600px; background-color: #E9E9E9}
--->
-</style>
-</head>
-<body bgcolor="#3A6EA5">
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="750">
-  <tr bgcolor="#C6C3C6" valign="top">
-    <td>
-      <table width="750" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td2" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll $pollvars[poll_version]</font></b></td>
-          <td height="20" align="right" bgcolor="#000084">
-          <img src="$pollvars[base_gif]/min.gif" width="16" height="14"><img src="$pollvars[base_gif]/max.gif" width="16" height="14">&nbsp;<a href="admin_logout.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/cross.gif" width="16" height="14" border="0" alt="$lang[Logout]"></a></td>
-        </tr>
-        <tr valign="top">
-          <td colspan="2">
-            <table border="0" cellspacing="0" cellpadding="1">
-              <tr>
-                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
-              </tr>
-              <tr>
-                <td align="center" rowspan="2" width="5"><img src="$pollvars[base_gif]/v_line.gif" width="5" height="50"></td>
-                <td align="center" width="120"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=show"><img src="$pollvars[base_gif]/index.gif" width="32" height="32" border="0" alt="$lang[IndexTitle]"></a></td>
-                <td align="center" width="131"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=new"><img src="$pollvars[base_gif]/new.gif" width="32" height="32" border="0" alt="$lang[NewTitle]"></a></td>
-                <td align="center" width="153"><a href="admin_settings.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/settings.gif" width="32" height="32" border="0" alt="$lang[SetTitle]"></a></td>
-                <td align="center" width="121"><a href="admin_templates.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/templates.gif" width="32" height="32" border="0" alt="$lang[Templates]"></a></td>
-                <td align="center" width="127"><a href="admin_password.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/password.gif" width="32" height="32" border="0" alt="$lang[PwdTitle]"></a></td>
-                <td align="center" width="89"><a href="admin_help.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/howto.gif" width="32" height="32" border="0" alt="$lang[Help]"></a></td>
-              </tr>
-              <tr align="center" valign="top">
-                <td width="120" class="td2">$lang[IndexTitle]</td>
-                <td width="131" class="td2">$lang[NewTitle]</td>
-                <td width="153" class="td2">$lang[SetTitle]</td>
-                <td width="121" class="td2">$lang[Templates]</td>
-                <td width="127" class="td2">$lang[PwdTitle]</td>
-                <td width="89" class="td2">$lang[Help]</td>
-              </tr>
-              <tr align="left">
-                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
-              </tr>
-            </table>
-            <form method="post" name="form">
-              <table border="0" cellspacing="0" cellpadding="3" align="center" width="680">
-                <tr> 
-                  <td class="td1"><img src="$pollvars[base_gif]/h_line.gif" width="15" height="18"> 
-                    $lang[Help] <img src="$pollvars[base_gif]/h_line.gif" width="550" height="18"></td>
-                </tr>
-                <tr> 
-                  <td class="td2"><a href="admin_license.php?session=$auth[session]&amp;uid=$auth[uid]">$lang[License]</a></td>
-                </tr>
-                <tr> 
-                  <td class="td2">$lang[HelpSyntax]:</td>
-                </tr>
-                <tr> 
-                  <td> 
-                    <table width="600" border="0" cellspacing="1" cellpadding="4" bgcolor="#E9E9E9" bordercolor="#333333">
-                      <tr> 
-                        <td height="35"><font face="Courier New, Courier, mono" size="2" color="#003366">string</font><font face="Courier New, Courier, mono" size="2"> 
-                          <font color="#009900"><b>poll_process</b></font><b>(</b>mix 
-                          <font color="#996633">var</font><b>)</b></font></td>
-                      </tr>
-                    </table>
-                    <img src="$pollvars[base_gif]/h_line.gif" width="600" height="18"> 
-                    <textarea cols="72" rows="6" wrap="VIRTUAL" class="code2" name="textarea">&lt;?php
-$include_statement &quot;$path/booth.php&quot;;
-echo \$php_poll->poll_process(x);        // x = Poll ID
-?&gt;
-</textarea>
-                  </td>
-                </tr>
-                <tr> 
-                  <td><img src="$pollvars[base_gif]/h_line.gif" width="600" height="18"></td>
-                </tr>
-                <tr> 
-                  <td class="td2">$lang[HelpRand]</td>
-                </tr>
-                <tr> 
-                  <td> 
-                    <textarea cols="72" rows="6" wrap="VIRTUAL" class="code2">&lt;?php
-$include_statement &quot;$path/booth.php&quot;;
-echo \$php_poll->poll_process("random");
-?&gt;
-</textarea>
-                    <br>
-                  </td>
-                </tr>
-                <tr> 
-                  <td><img src="$pollvars[base_gif]/h_line.gif" width="600" height="18"></td>
-                </tr>
-                <tr> 
-                  <td class="td2">$lang[HelpNew]</td>
-                </tr>
-                <tr> 
-                  <td> 
-                    <textarea cols="72" rows="6" wrap="VIRTUAL" class="code2">&lt;?php
-$include_statement &quot;$path/booth.php&quot;;
-echo \$php_poll->poll_process("newest");
-?&gt;
-</textarea>
-                    <br>
-                  </td>
-                </tr>
-              </table>
-            </form>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-</body>
-</html>
+<html>
+<head>
+<title>Advanced Poll $pollvars[poll_version]</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$lang[charset]">
+<style type="text/css">
+<!--
+.td1 {  font-family: "MS Sans Serif"; font-size: 10pt}
+.td2 {  font-family: "MS Sans Serif"; font-size: 9pt}
+.code {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; font-weight: normal; height: 200px; width: 600px;; background-color: #E9E9E9}
+.code2 {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; height: 90px; width: 600px; background-color: #E9E9E9}
+-->
+</style>
+</head>
+<body bgcolor="#3A6EA5">
+<table border="1" cellspacing="0" cellpadding="0" align="center" width="750">
+  <tr bgcolor="#C6C3C6" valign="top">
+    <td>
+      <table width="750" border="0" cellspacing="0" cellpadding="1" align="center">
+        <tr bgcolor="#400080">
+          <td height="20" class="td2" bgcolor="#000084"><b><font color="#FFFFFF">
+            &nbsp;Advanced Poll $pollvars[poll_version]</font></b></td>
+          <td height="20" align="right" bgcolor="#000084">
+          <img src="$pollvars[base_gif]/min.gif" width="16" height="14"><img src="$pollvars[base_gif]/max.gif" width="16" height="14">&nbsp;<a href="admin_logout.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/cross.gif" width="16" height="14" border="0" alt="$lang[Logout]"></a></td>
+        </tr>
+        <tr valign="top">
+          <td colspan="2">
+            <table border="0" cellspacing="0" cellpadding="1">
+              <tr>
+                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
+              </tr>
+              <tr>
+                <td align="center" rowspan="2" width="5"><img src="$pollvars[base_gif]/v_line.gif" width="5" height="50"></td>
+                <td align="center" width="120"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=show"><img src="$pollvars[base_gif]/index.gif" width="32" height="32" border="0" alt="$lang[IndexTitle]"></a></td>
+                <td align="center" width="131"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=new"><img src="$pollvars[base_gif]/new.gif" width="32" height="32" border="0" alt="$lang[NewTitle]"></a></td>
+                <td align="center" width="153"><a href="admin_settings.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/settings.gif" width="32" height="32" border="0" alt="$lang[SetTitle]"></a></td>
+                <td align="center" width="121"><a href="admin_templates.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/templates.gif" width="32" height="32" border="0" alt="$lang[Templates]"></a></td>
+                <td align="center" width="127"><a href="admin_password.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/password.gif" width="32" height="32" border="0" alt="$lang[PwdTitle]"></a></td>
+                <td align="center" width="89"><a href="admin_help.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/howto.gif" width="32" height="32" border="0" alt="$lang[Help]"></a></td>
+              </tr>
+              <tr align="center" valign="top">
+                <td width="120" class="td2">$lang[IndexTitle]</td>
+                <td width="131" class="td2">$lang[NewTitle]</td>
+                <td width="153" class="td2">$lang[SetTitle]</td>
+                <td width="121" class="td2">$lang[Templates]</td>
+                <td width="127" class="td2">$lang[PwdTitle]</td>
+                <td width="89" class="td2">$lang[Help]</td>
+              </tr>
+              <tr align="left">
+                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
+              </tr>
+            </table>
+            <form method="post" name="form">
+              <table border="0" cellspacing="0" cellpadding="3" align="center" width="680">
+                <tr> 
+                  <td class="td1"><img src="$pollvars[base_gif]/h_line.gif" width="15" height="18"> 
+                    $lang[Help] <img src="$pollvars[base_gif]/h_line.gif" width="550" height="18"></td>
+                </tr>
+                <tr> 
+                  <td class="td2"><a href="admin_license.php?session=$auth[session]&amp;uid=$auth[uid]">$lang[License]</a></td>
+                </tr>
+                <tr> 
+                  <td class="td2">$lang[HelpSyntax]:</td>
+                </tr>
+                <tr> 
+                  <td> 
+                    <table width="600" border="0" cellspacing="1" cellpadding="4" bgcolor="#E9E9E9" bordercolor="#333333">
+                      <tr> 
+                        <td height="35"><font face="Courier New, Courier, mono" size="2" color="#003366">string</font><font face="Courier New, Courier, mono" size="2"> 
+                          <font color="#009900"><b>poll_process</b></font><b>(</b>mix 
+                          <font color="#996633">var</font><b>)</b></font></td>
+                      </tr>
+                    </table>
+                    <img src="$pollvars[base_gif]/h_line.gif" width="600" height="18"> 
+                    <textarea cols="72" rows="6" wrap="VIRTUAL" class="code2" name="textarea">&lt;?php
+$include_statement &quot;$path/booth.php&quot;;
+echo \$php_poll->poll_process(x);        // x = Poll ID
+?&gt;
+</textarea>
+                  </td>
+                </tr>
+                <tr> 
+                  <td><img src="$pollvars[base_gif]/h_line.gif" width="600" height="18"></td>
+                </tr>
+                <tr> 
+                  <td class="td2">$lang[HelpRand]</td>
+                </tr>
+                <tr> 
+                  <td> 
+                    <textarea cols="72" rows="6" wrap="VIRTUAL" class="code2">&lt;?php
+$include_statement &quot;$path/booth.php&quot;;
+echo \$php_poll->poll_process("random");
+?&gt;
+</textarea>
+                    <br>
+                  </td>
+                </tr>
+                <tr> 
+                  <td><img src="$pollvars[base_gif]/h_line.gif" width="600" height="18"></td>
+                </tr>
+                <tr> 
+                  <td class="td2">$lang[HelpNew]</td>
+                </tr>
+                <tr> 
+                  <td> 
+                    <textarea cols="72" rows="6" wrap="VIRTUAL" class="code2">&lt;?php
+$include_statement &quot;$path/booth.php&quot;;
+echo \$php_poll->poll_process("newest");
+?&gt;
+</textarea>
+                    <br>
+                  </td>
+                </tr>
+              </table>
+            </form>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<br>
+<br>
+</body>
+</html>

Index: admin_comment_tr.html
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/templates/admin_comment_tr.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_comment_tr.html	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_comment_tr.html	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,18 +1,18 @@
-   <tr>
-     <td width="200" bgcolor="#CCCCCC" valign="top"> 
-       <table width="200" border="0" cellspacing="0" cellpadding="3">
-         <tr> 
-           <td><img src="$pollvars[base_gif]/host.gif" width="16" height="15">
-               <img src="$image" width="16" height="16" alt="{browser}">
-                 $email    
-          </td>
-         </tr>
-         <tr><td class="td2"><font color="#990033">{name}</font></td></tr>
-         <tr><td class="td2">{host}</td></tr>
-       </table>
-     </td>
-     <td width="457" class="td2" bgcolor="#E6E6E6" valign="top"><img src="$pollvars[base_gif]/post.gif" width="9" height="9">$lang[ComPost]: $date 
-       <hr size="1" noshade>{message}
-     </td>
-     <td width="66" class="td2" align="center"><a href="javascript:del_entry({com_id})">$lang[IndexDel]</a></td>
-   </tr>
+   <tr>
+     <td width="200" bgcolor="#CCCCCC" valign="top"> 
+       <table width="200" border="0" cellspacing="0" cellpadding="3">
+         <tr> 
+           <td><img src="$pollvars[base_gif]/host.gif" width="16" height="15">
+               <img src="$image" width="16" height="16" alt="{browser}">
+                 $email    
+          </td>
+         </tr>
+         <tr><td class="td2"><font color="#990033">{name}</font></td></tr>
+         <tr><td class="td2">{host}</td></tr>
+       </table>
+     </td>
+     <td width="457" class="td2" bgcolor="#E6E6E6" valign="top"><img src="$pollvars[base_gif]/post.gif" width="9" height="9">$lang[ComPost]: $date 
+       <hr size="1" noshade>{message}
+     </td>
+     <td width="66" class="td2" align="center"><a href="javascript:del_entry({com_id})">$lang[IndexDel]</a></td>
+   </tr>

Index: admin_login.html
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/templates/admin_login.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_login.html	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_login.html	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,80 +1,80 @@
-<html>
-<head>
-<title>Advanced Poll $pollvars[poll_version]</title>
-<meta http-equiv="Content-Type" content="text/html; charset=$lang[charset]">
-<style type="text/css">
-<!--
-.td1 {  font-family: "MS Sans Serif"; font-size: 9pt}
-.button {  font-family: "MS Sans Serif"; font-size: 9pt; height: 22px; width: 75px}
-.input {  font-family: "MS Sans Serif"; font-size: 9pt; height: 22px; width: 200px}
--->
-</style>
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-function set_focus() {
-  document.pass.username.focus();
-}
-// -->
-</SCRIPT>
-</head>
-<body bgcolor="#3A6EA5" onload="set_focus()">
-<br>
-<br>
-<br>
-<br>
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="450">
-  <tr bgcolor="#C6C3C6">
-    <td>
-      <table width="450" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll $pollvars[poll_version]</font></b></td>
-          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="$pollvars[base_gif]/help.gif" width="16" height="14">
-            <img src="$pollvars[base_gif]/cross.gif" width="16" height="14"> </td>
-        </tr>
-        <tr align="center">
-          <td colspan="2">
-            <form method="post" name="pass" action="index.php">
-              <table border="0" cellspacing="0" cellpadding="1" width="100%">
-                <tr>
-                  <td rowspan="3" valign="top" align="right" width="12%"><img src="$pollvars[base_gif]/key.gif" width="35" height="40">
-                  </td>
-                  <td colspan="2" class="td1" height="42">$message</td>
-                </tr>
-                <tr>
-                  <td class="td1" width="18%">$lang[PwdUser]</td>
-                  <td width="70%">
-                    <input type="text" name="username" size="25" class="input">
-                  </td>
-                </tr>
-                <tr>
-                  <td class="td1" height="35" width="18%">$lang[PwdPass]</td>
-                  <td height="35" width="70%">
-                    <input type="password" name="password" size="25" class="input">
-                    <input type="hidden" name="enter" value="1">
-                  </td>
-                </tr>
-              </table>
-              <table width="100%" border="0" cellspacing="0" cellpadding="1">
-                <tr>
-                  <td align="right" width="47%">
-                    <input type="submit" value="   $lang[FormOK]   " class="button">
-                  </td>
-                  <td align="right" width="1%">&nbsp;</td>
-                  <td width="52%">
-                    <input type="reset" value="$lang[FromClear]" class="button">
-                  </td>
-                </tr>
-              </table>
-            </form>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-<br>
-</body>
-</html>
+<html>
+<head>
+<title>Advanced Poll $pollvars[poll_version]</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$lang[charset]">
+<style type="text/css">
+<!--
+.td1 {  font-family: "MS Sans Serif"; font-size: 9pt}
+.button {  font-family: "MS Sans Serif"; font-size: 9pt; height: 22px; width: 75px}
+.input {  font-family: "MS Sans Serif"; font-size: 9pt; height: 22px; width: 200px}
+-->
+</style>
+<SCRIPT LANGUAGE="JavaScript">
+<!--
+function set_focus() {
+  document.pass.username.focus();
+}
+// -->
+</SCRIPT>
+</head>
+<body bgcolor="#3A6EA5" onload="set_focus()">
+<br>
+<br>
+<br>
+<br>
+<table border="1" cellspacing="0" cellpadding="0" align="center" width="450">
+  <tr bgcolor="#C6C3C6">
+    <td>
+      <table width="450" border="0" cellspacing="0" cellpadding="1" align="center">
+        <tr bgcolor="#400080">
+          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
+            &nbsp;Advanced Poll $pollvars[poll_version]</font></b></td>
+          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="$pollvars[base_gif]/help.gif" width="16" height="14">
+            <img src="$pollvars[base_gif]/cross.gif" width="16" height="14"> </td>
+        </tr>
+        <tr align="center">
+          <td colspan="2">
+            <form method="post" name="pass" action="index.php">
+              <table border="0" cellspacing="0" cellpadding="1" width="100%">
+                <tr>
+                  <td rowspan="3" valign="top" align="right" width="12%"><img src="$pollvars[base_gif]/key.gif" width="35" height="40">
+                  </td>
+                  <td colspan="2" class="td1" height="42">$message</td>
+                </tr>
+                <tr>
+                  <td class="td1" width="18%">$lang[PwdUser]</td>
+                  <td width="70%">
+                    <input type="text" name="username" size="25" class="input">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="td1" height="35" width="18%">$lang[PwdPass]</td>
+                  <td height="35" width="70%">
+                    <input type="password" name="password" size="25" class="input">
+                    <input type="hidden" name="enter" value="1">
+                  </td>
+                </tr>
+              </table>
+              <table width="100%" border="0" cellspacing="0" cellpadding="1">
+                <tr>
+                  <td align="right" width="47%">
+                    <input type="submit" value="   $lang[FormOK]   " class="button">
+                  </td>
+                  <td align="right" width="1%">&nbsp;</td>
+                  <td width="52%">
+                    <input type="reset" value="$lang[FromClear]" class="button">
+                  </td>
+                </tr>
+              </table>
+            </form>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<br>
+<br>
+<br>
+</body>
+</html>

Index: admin_license.html
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/templates/admin_license.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_license.html	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_license.html	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,107 +1,107 @@
-<html>
-<head>
-<title>Advanced Poll $pollvars[poll_version]</title>
-<meta http-equiv="Content-Type" content="text/html; charset=$lang[charset]">
-<style type="text/css">
-<!--
-.td1 {  font-family: "MS Sans Serif"; font-size: 10pt}
-.td2 {  font-family: "MS Sans Serif"; font-size: 9pt}
-.license {  height: 220px; width: 650px; font-family: "MS Sans Serif"; font-size: 9pt;; background-color: #E9E9E9}
--->
-</style>
-</head>
-<body bgcolor="#3A6EA5">
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="750">
-  <tr bgcolor="#C6C3C6" valign="top" class="code2">
-    <td>
-      <table width="750" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td2" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll $pollvars[poll_version]</font></b></td>
-          <td height="20" align="right" bgcolor="#000084">
-          <img src="$pollvars[base_gif]/min.gif" width="16" height="14"><img src="$pollvars[base_gif]/max.gif" width="16" height="14">&nbsp;<a href="admin_logout.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/cross.gif" width="16" height="14" border="0" alt="$lang[Logout]"></a></td>
-        </tr>
-        <tr valign="top">
-          <td colspan="2">
-            <table border="0" cellspacing="0" cellpadding="1">
-              <tr>
-                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
-              </tr>
-              <tr>
-                <td align="center" rowspan="2" width="5"><img src="$pollvars[base_gif]/v_line.gif" width="5" height="50"></td>
-                <td align="center" width="120"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=show"><img src="$pollvars[base_gif]/index.gif" width="32" height="32" border="0" alt="$lang[IndexTitle]"></a></td>
-                <td align="center" width="131"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=new"><img src="$pollvars[base_gif]/new.gif" width="32" height="32" border="0" alt="$lang[NewTitle]"></a></td>
-                <td align="center" width="153"><a href="admin_settings.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/settings.gif" width="32" height="32" border="0" alt="$lang[SetTitle]"></a></td>
-                <td align="center" width="121"><a href="admin_templates.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/templates.gif" width="32" height="32" border="0" alt="$lang[Templates]"></a></td>
-                <td align="center" width="127"><a href="admin_password.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/password.gif" width="32" height="32" border="0" alt="$lang[PwdTitle]"></a></td>
-                <td align="center" width="89"><a href="admin_help.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/howto.gif" width="32" height="32" border="0" alt="$lang[Help]"></a></td>
-              </tr>
-              <tr align="center" valign="top">
-                <td width="120" class="td2">$lang[IndexTitle]</td>
-                <td width="131" class="td2">$lang[NewTitle]</td>
-                <td width="153" class="td2">$lang[SetTitle]</td>
-                <td width="121" class="td2">$lang[Templates]</td>
-                <td width="127" class="td2">$lang[PwdTitle]</td>
-                <td width="89" class="td2">$lang[Help]</td>
-              </tr>
-              <tr align="left">
-                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
-              </tr>
-            </table>
-            <form method="post" name="license">
-              <table border="0" cellspacing="0" cellpadding="3" align="center">
-                <tr>
-                  <td class="td1"><img src="$pollvars[base_gif]/h_line.gif" width="15" height="18">
-                    $lang[License] <img src="$pollvars[base_gif]/h_line.gif" width="500" height="18"></td>
-                </tr>
-                <tr class="td2">
-                  <td class="td2">$lang[ScrollTxt]</td>
-                </tr>
-                <tr>
-                  <td><font face="MS sans serif" size="1">
-                    <textarea name="textfield" cols="70" rows="16" wrap="VIRTUAL" class="license">
-You should carefully read the following terms and conditions before using this software. Your use of this software indicates your acceptance of this license agreement. If you do not agree to all the terms of this agreement, do not use this software.
-
-1. This script may be used and modified free of charge for personal, academic and non-profit use.
-Commercial use must register the script for a one time fee of $15 US or 15 EUR.
---> http://www.proxy2.de/register
-Registered users receive support, free upgrades and also do not have to display the text link. 
-
-2. You may copy and distribute verbatim copies of the Program's source code as 
-you receive it, in any medium, provided that you conspicuously and appropriately 
-publish on each copy an appropriate copyright notice. Keep intact all the notices
-that refer to this License and give any other recipients of the Program a copy of this License 
-along with the Program.
-
-3. Selling the code for this program, or a program derived from Advanced Poll, without 
-prior written consent is expressly forbidden.
-
-THIS SOFTWARE AND THE ACCOMPANYING FILES ARE PROVIDED "AS IS" 
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING 
-BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-FITNESS FOR A PARTICULAR PURPOSE. THE AUTHOR DOES NOT WARRANT THAT THE 
-FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET YOUR REQUIREMENTS, OR THAT 
-THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT 
-ANY DEFECTS DISCOVERED IN THE SOFTWARE WILL BE CORRECTED. FURTHERMORE, THE 
-AUTHOR DOES NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE OR 
-THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, 
-RELIABILITY, OR OTHERWISE. YOU ASSUME ALL RISKS IN USING THE SOFTWARE. 
-NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY THE AUTHOR OR ANY OF THEIR 
-AUTHORIZED REPRESENTATIVES SHALL CREATE A WARRANTY OR IN ANY WAY INCREASE THE 
-SCOPE OF THIS WARRANTY. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES.
-</textarea>
-                    </font></td>
-                </tr>
-              </table>
-            </form>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-</body>
-</html>
+<html>
+<head>
+<title>Advanced Poll $pollvars[poll_version]</title>
+<meta http-equiv="Content-Type" content="text/html; charset=$lang[charset]">
+<style type="text/css">
+<!--
+.td1 {  font-family: "MS Sans Serif"; font-size: 10pt}
+.td2 {  font-family: "MS Sans Serif"; font-size: 9pt}
+.license {  height: 220px; width: 650px; font-family: "MS Sans Serif"; font-size: 9pt;; background-color: #E9E9E9}
+-->
+</style>
+</head>
+<body bgcolor="#3A6EA5">
+<table border="1" cellspacing="0" cellpadding="0" align="center" width="750">
+  <tr bgcolor="#C6C3C6" valign="top" class="code2">
+    <td>
+      <table width="750" border="0" cellspacing="0" cellpadding="1" align="center">
+        <tr bgcolor="#400080">
+          <td height="20" class="td2" bgcolor="#000084"><b><font color="#FFFFFF">
+            &nbsp;Advanced Poll $pollvars[poll_version]</font></b></td>
+          <td height="20" align="right" bgcolor="#000084">
+          <img src="$pollvars[base_gif]/min.gif" width="16" height="14"><img src="$pollvars[base_gif]/max.gif" width="16" height="14">&nbsp;<a href="admin_logout.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/cross.gif" width="16" height="14" border="0" alt="$lang[Logout]"></a></td>
+        </tr>
+        <tr valign="top">
+          <td colspan="2">
+            <table border="0" cellspacing="0" cellpadding="1">
+              <tr>
+                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
+              </tr>
+              <tr>
+                <td align="center" rowspan="2" width="5"><img src="$pollvars[base_gif]/v_line.gif" width="5" height="50"></td>
+                <td align="center" width="120"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=show"><img src="$pollvars[base_gif]/index.gif" width="32" height="32" border="0" alt="$lang[IndexTitle]"></a></td>
+                <td align="center" width="131"><a href="index.php?session=$auth[session]&amp;uid=$auth[uid]&amp;action=new"><img src="$pollvars[base_gif]/new.gif" width="32" height="32" border="0" alt="$lang[NewTitle]"></a></td>
+                <td align="center" width="153"><a href="admin_settings.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/settings.gif" width="32" height="32" border="0" alt="$lang[SetTitle]"></a></td>
+                <td align="center" width="121"><a href="admin_templates.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/templates.gif" width="32" height="32" border="0" alt="$lang[Templates]"></a></td>
+                <td align="center" width="127"><a href="admin_password.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/password.gif" width="32" height="32" border="0" alt="$lang[PwdTitle]"></a></td>
+                <td align="center" width="89"><a href="admin_help.php?session=$auth[session]&amp;uid=$auth[uid]"><img src="$pollvars[base_gif]/howto.gif" width="32" height="32" border="0" alt="$lang[Help]"></a></td>
+              </tr>
+              <tr align="center" valign="top">
+                <td width="120" class="td2">$lang[IndexTitle]</td>
+                <td width="131" class="td2">$lang[NewTitle]</td>
+                <td width="153" class="td2">$lang[SetTitle]</td>
+                <td width="121" class="td2">$lang[Templates]</td>
+                <td width="127" class="td2">$lang[PwdTitle]</td>
+                <td width="89" class="td2">$lang[Help]</td>
+              </tr>
+              <tr align="left">
+                <td colspan="7"><img src="$pollvars[base_gif]/top_line.gif" width="745" height="3"></td>
+              </tr>
+            </table>
+            <form method="post" name="license">
+              <table border="0" cellspacing="0" cellpadding="3" align="center">
+                <tr>
+                  <td class="td1"><img src="$pollvars[base_gif]/h_line.gif" width="15" height="18">
+                    $lang[License] <img src="$pollvars[base_gif]/h_line.gif" width="500" height="18"></td>
+                </tr>
+                <tr class="td2">
+                  <td class="td2">$lang[ScrollTxt]</td>
+                </tr>
+                <tr>
+                  <td><font face="MS sans serif" size="1">
+                    <textarea name="textfield" cols="70" rows="16" wrap="VIRTUAL" class="license">
+You should carefully read the following terms and conditions before using this software. Your use of this software indicates your acceptance of this license agreement. If you do not agree to all the terms of this agreement, do not use this software.
+
+1. This script may be used and modified free of charge for personal, academic and non-profit use.
+Commercial use must register the script for a one time fee of $15 US or 15 EUR.
+--> http://www.proxy2.de/register
+Registered users receive support, free upgrades and also do not have to display the text link. 
+
+2. You may copy and distribute verbatim copies of the Program's source code as 
+you receive it, in any medium, provided that you conspicuously and appropriately 
+publish on each copy an appropriate copyright notice. Keep intact all the notices
+that refer to this License and give any other recipients of the Program a copy of this License 
+along with the Program.
+
+3. Selling the code for this program, or a program derived from Advanced Poll, without 
+prior written consent is expressly forbidden.
+
+THIS SOFTWARE AND THE ACCOMPANYING FILES ARE PROVIDED "AS IS" 
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING 
+BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+FITNESS FOR A PARTICULAR PURPOSE. THE AUTHOR DOES NOT WARRANT THAT THE 
+FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET YOUR REQUIREMENTS, OR THAT 
+THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT 
+ANY DEFECTS DISCOVERED IN THE SOFTWARE WILL BE CORRECTED. FURTHERMORE, THE 
+AUTHOR DOES NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE OR 
+THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, 
+RELIABILITY, OR OTHERWISE. YOU ASSUME ALL RISKS IN USING THE SOFTWARE. 
+NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY THE AUTHOR OR ANY OF THEIR 
+AUTHORIZED REPRESENTATIVES SHALL CREATE A WARRANTY OR IN ANY WAY INCREASE THE 
+SCOPE OF THIS WARRANTY. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES.
+</textarea>
+                    </font></td>
+                </tr>
+              </table>
+            </form>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<br>
+<br>
+</body>
+</html>

Index: admin_tpl_comment.html
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/admin/templates/admin_tpl_comment.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- admin_tpl_comment.html	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ admin_tpl_comment.html	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,138 +1,138 @@
-<html>
-<head>
-<title>Advanced Poll $pollvars[poll_version]</title>
-<meta http-equiv="Content-Type" content="text/html; charset=$lang[charset]">
-<style type="text/css">
-<!--
-.td1 {  font-family: "MS Sans Serif"; font-size: 10pt}
-.td2 {  ...
 
[truncated message content]

[Devil-linux-commit] web/poll/misc dump_mysql.sql,1.1.1.1,1.2 get_admin.php,1.1.1.1,1.2 index.html,1.1.1.1,1.2 info.php,1.1.1.1,1.2 tb_mysql.php,1.1.1.1,1.2 uninstall.php,1.1.1.1,1.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll/misc

Modified Files:
	dump_mysql.sql get_admin.php index.html info.php tb_mysql.php 
	uninstall.php 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


Index: uninstall.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/misc/uninstall.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- uninstall.php	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ uninstall.php	18 Sep 2004 16:00:42 -0000	1.2
@@ -1,441 +1,441 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-$version = "v2.03";
-if (!isset($PHP_SELF)) {
-  $PHP_SELF = $HTTP_SERVER_VARS["PHP_SELF"];
-  if (isset($HTTP_GET_VARS)) {
-    while (list($name, $value)=each($HTTP_GET_VARS)) {
-      $$name=$value;
-    }
-  }
-  if (isset($HTTP_POST_VARS)) {
-    while (list($name, $value)=each($HTTP_POST_VARS)) {
-      $$name=$value;
-    }
-  }
-}
-if (!file_exists("../install/cross.gif")) {
-  $img_loc="http://www.proxy2.de/poll/install";
-} else {
-  $img_loc="../install";
-}
-
-function print_header() {
-global $PHP_SELF, $version;
-?>
-<html>
-<head>
-<title>Advanced Poll <?php echo $version; ?> Uninstall</title>
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="Cache-Control" content="no-cache">
-<meta http-equiv="Expires" content="-1">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.td1 {  font-family: "MS Sans Serif"; font-size: 9pt}
--->
-</style>
-<script language="Javascript">
-<!--
-function abort() {
- if (window.confirm("Are you sure you want to cancel the uninstall?")) {
-    window.location.href = "http://"+window.location.host+window.location.pathname+"?action=cancel"
- }
-}
-// -->
-</script>
-</head>
-<?php
-}
-
-function sql_error() {
-global $PHP_SELF, $version, $img_loc;
-$description = mysql_error();
-?>
-<body bgcolor="#3A6EA5">
-<br>
-<br>
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="500">
-  <tr bgcolor="#C6C3C6">
-    <td>
-      <table width="500" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll <?php echo $version; ?> Uninstall</font></b></td>
-          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0" usemap="#close"><map name="close"><area shape="rect" coords="1,1,14,12" href="javascript:abort()"></map>
-          </td>
-        </tr>
-        <tr align="center">
-          <td colspan="2">
-            <form method="post" action="<?php echo $PHP_SELF; ?>">
-              <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
-                <tr bgcolor="#FFFFFF" valign="bottom">
-                  <td class="td1" height="30"><b>&nbsp;&nbsp;&nbsp;&nbsp;Error
-                    occured!</b></td>
-                </tr>
-                <tr bgcolor="#FFFFFF">
-                  <td class="td1" height="30">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    The following error occured...</td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td class="td1" align="center">
-                    <table width="400" border="0" cellspacing="0" cellpadding="0" align="center">
-                      <tr>
-                        <td class="td1" height="75"><?php echo $description; ?>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td height="140" class="td1">&nbsp;
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="center" height="20">
-                    <img src="<?php echo $img_loc; ?>/h_line.gif" height="18" width="490">
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="right"><img src="<?php echo $img_loc; ?>/back.gif" width="75" height="22" border="0" usemap="#Back" alt="Back"><map name="Back"><area shape="rect" coords="1,1,73,20" href="javascript:history.go(-1)"></map>
-                    &nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/cancel.gif" width="75" height="22" usemap="#Cancel" border="0" alt="Cancel"><map name="Cancel"><area shape="rect" coords="1,1,73,20" href="javascript:abort()"></map>
-                    &nbsp;&nbsp; </td>
-                </tr>
-              </table>
-            </form>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-<br>
-</body>
-</html>
-<?php
-exit();
-}
-
-function db_config() {
-global $PHP_SELF, $version, $img_loc;
-?>
-<body bgcolor="#3A6EA5">
-<br>
-<br>
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="500">
-  <tr bgcolor="#C6C3C6">
-    <td>
-      <table width="500" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll <?php echo $version; ?> Uninstall</font></b></td>
-          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0" usemap="#close"><map name="close"><area shape="rect" coords="1,1,14,12" href="javascript:abort()"></map>
-          </td>
-        </tr>
-        <tr align="center">
-          <td colspan="2">
-            <form method="post" action="<?php echo $PHP_SELF; ?>">
-              <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
-                <tr bgcolor="#FFFFFF" valign="bottom">
-                  <td class="td1" height="30"><b>&nbsp;&nbsp;&nbsp;&nbsp;Welcome to the Advanced Poll uninstall script.</b></td>
-                </tr>
-                <tr bgcolor="#FFFFFF">
-                  <td class="td1" height="30">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    This script removes all the tables that Advanced Poll is using from your database.</td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td class="td1" align="center">
-                    <table width="400" border="0" cellspacing="0" cellpadding="0" align="center">
-                      <tr>
-                        <td class="td1" height="75">Please enter your database settings...</td>
-                      </tr>
-                      <tr>
-                        <td height="140" class="td1">
-                          <table width="100%" border="0" cellspacing="0" cellpadding="3">
-                            <tr>
-                              <td width="18%" class="td1">Hostname:</td>
-                              <td width="82%">
-                                <input type="text" name="mysql_host" size="25" value="localhost">
-                              </td>
-                            </tr>
-                            <tr>
-                              <td width="18%" class="td1">Database:</td>
-                              <td width="82%">
-                                <input type="text" name="db_name" size="25">
-                              </td>
-                            </tr>
-                            <tr>
-                              <td width="18%" class="td1">Username:</td>
-                              <td width="82%">
-                                <input type="text" name="mysql_user" size="25">
-                              </td>
-                            </tr>
-                            <tr>
-                              <td width="18%" class="td1">Password:</td>
-                              <td width="82%">
-                                <input type="password" name="mysql_pass" size="25">
-                                <input type="hidden" name="action" value="connect">
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="center" height="20">
-                    <img src="<?php echo $img_loc; ?>/h_line.gif" height="18" width="490">
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="right"><img src="<?php echo $img_loc; ?>/disabled.gif" width="75" height="22" border="0" alt="Back"><input type="image" src="<?php echo $img_loc; ?>/next.gif" width="75" height="22" border="0" alt="Next">
-                    &nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/cancel.gif" width="75" height="22" usemap="#Cancel" border="0" alt="Cancel"><map name="Cancel"><area shape="rect" coords="1,1,73,20" href="javascript:abort()"></map>
-                    &nbsp;&nbsp; </td>
-                </tr>
-              </table>
-            </form>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-<br>
-</body>
-</html>
-<?php
-}
-
-function confirm_uninstall() {
-global $PHP_SELF, $version, $img_loc;
-global $POLLTBL;
-global $db_name, $mysql_host, $mysql_user, $mysql_pass;
-?>
-<body bgcolor="#3A6EA5">
-<br>
-<br>
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="500">
-  <tr bgcolor="#C6C3C6">
-    <td>
-      <table width="500" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll <?php echo $version; ?> Uninstall</font></b></td>
-          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0" usemap="#close"><map name="close"><area shape="rect" coords="1,1,14,12" href="javascript:abort()"></map>
-          </td>
-        </tr>
-        <tr align="center">
-          <td colspan="2">
-            <form method="post" action="<?php echo $PHP_SELF; ?>">
-              <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
-                <tr bgcolor="#FFFFFF" valign="bottom">
-                  <td class="td1" height="30"><b>&nbsp;&nbsp;&nbsp;&nbsp;Connection
-                    established</b></td>
-                </tr>
-                <tr bgcolor="#FFFFFF">
-                  <td class="td1" height="30">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <?php echo "$mysql_user"."@"."$mysql_host"; ?></td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td class="td1" align="center">
-                    <table width="400" border="0" cellspacing="0" cellpadding="0" align="center">
-                      <tr>
-                        <td class="td1" height="75">Are you sure you want to remove
-                          the following tables from your database?</td>
-                      </tr>
-                      <tr>
-                        <td height="140" class="td1" valign="top">
-                          <table width="100%" border="0" cellspacing="0" cellpadding="1">
-                            <tr>
-                              <td class="td1">- <?php echo $POLLTBL["poll_index"]; ?></td>
-                            </tr>
-                            <tr>
-                              <td class="td1">- <?php echo $POLLTBL["poll_data"]; ?></td>
-                            </tr>
-                            <tr>
-                              <td class="td1">- <?php echo $POLLTBL["poll_config"]; ?></td>
-                            </tr>
-                            <tr>
-                              <td class="td1">- <?php echo $POLLTBL["poll_ip"]; ?></td>
-                            </tr>
-                            <tr>
-                              <td class="td1">- <?php echo $POLLTBL["poll_log"]; ?></td>
-                            </tr>
-                            <tr>
-                              <td class="td1">- <?php echo $POLLTBL["poll_comment"]; ?></td>
-                            </tr>
-                            <tr>
-                              <td class="td1">- <?php echo $POLLTBL["poll_tpl"]; ?></td>
-                            </tr>
-                            <tr>
-                              <td class="td1">- <?php echo $POLLTBL["poll_tplset"]; ?></td>
-                            </tr>
-                            <tr>
-                              <td class="td1">- <?php echo $POLLTBL["poll_user"]; ?></td>
-                                <input type="hidden" name="db_name" value="<?php echo $db_name; ?>">
-                                <input type="hidden" name="mysql_host" value="<?php echo $mysql_host; ?>">
-                                <input type="hidden" name="mysql_user" value="<?php echo $mysql_user; ?>">
-                                <input type="hidden" name="mysql_pass" value="<?php echo $mysql_pass; ?>">
-                                <input type="hidden" name="action" value="delete">
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="center" height="20">
-                    <img src="<?php echo $img_loc; ?>/h_line.gif" height="18" width="490">
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="right"><img src="<?php echo $img_loc; ?>/disabled.gif" width="75" height="22" border="0" alt="Back"><input type="image" src="<?php echo $img_loc; ?>/next.gif" width="75" height="22" border="0" alt="Next">
-                    &nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/cancel.gif" width="75" height="22" usemap="#Cancel" border="0" alt="Cancel"><map name="Cancel"><area shape="rect" coords="1,1,73,20" href="javascript:abort()"></map>
-                    &nbsp;&nbsp; </td>
-                </tr>
-              </table>
-            </form>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-<br>
-</body>
-</html>
-<?php
-}
-
-function message_box($msg) {
-global $version, $img_loc;
-?>
-<body bgcolor="#3A6EA5">
-<br><br><br><br><br><br>
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="300">
-  <tr bgcolor="#C6C3C6">
-    <td>
-      <table width="300" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll <?php echo $version; ?> Uninstall</font></b></td>
-          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0">
-          </td>
-        </tr>
-        <tr align="center">
-          <td>
-            <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
-              <tr bgcolor="#C6C3C6">
-                <td align="center" height="75" width="20%"><img src="<?php echo $img_loc; ?>/info.gif" width="35" height="35"></td>
-                <td align="left" height="75" width="80%" class="td1"><?php echo $msg; ?></td>
-              </tr>
-              <tr bgcolor="#C6C3C6" align="center">
-                <td colspan="2" height="40"><img src="<?php echo $img_loc; ?>/disabled.gif" width="75" height="22" border="0" alt="Back">&nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/ok.gif" width="75" height="22" border="0" alt="Ok"></td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-<br>
-</body>
-</html>
-<?php
-exit();
-}
-
-if (!isset($action)) {
-  $action ='';
-}
-
-switch ($action) {
-
-case "cancel":
-  print_header();
-  message_box("The operation has been cancelled!");
-  break;
-
-case "connect":
-  print_header(); 
-  if (file_exists("../include/config.inc.php")) {
-    include ("../include/config.inc.php");
-    include "../include/$POLLDB[class]";
-  } elseif (file_exists("./include/config.inc.php")) {
-    include ("./include/config.inc.php");
-    include "./include/$POLLDB[class]";
-  } else {
-    message_box("Cannot find the configuration file <u>config.inc.php</u>.");
-  }
-  if (empty($POLLTBL["poll_index"]) || empty($POLLTBL["poll_data"]) || empty($POLLTBL["poll_config"]) || empty($POLLTBL["poll_ip"]) || empty($POLLTBL["poll_log"]) || empty($POLLTBL["poll_user"]) || empty($POLLTBL["poll_comment"])) {
-    message_box("Some tables are not defined. Please check the configuration file.");
-  }
-  $POLLDB["dbName"] = $db_name;
-  $POLLDB["host"]   = $mysql_host;
-  $POLLDB["user"]   = $mysql_user;
-  $POLLDB["pass"]   = $mysql_pass;
-  $poll_db = new polldb_sql();
-  $poll_db->connect();  
-  confirm_uninstall();
-  break;
-
-case "delete":
-  print_header();
-  if (file_exists("../include/config.inc.php")) {
-    include ("../include/config.inc.php");
-    include "../include/$POLLDB[class]";
-  } elseif (file_exists("./include/config.inc.php")) {
-    include ("./include/config.inc.php");
-    include "./include/$POLLDB[class]";
-  } else {
-    message_box("Cannot find the configuration file <u>config.inc.php</u>.");
-  }
-  $POLLDB["dbName"] = $db_name;
-  $POLLDB["host"]   = $mysql_host;
-  $POLLDB["user"]   = $mysql_user;
-  $POLLDB["pass"]   = $mysql_pass;
-  $poll_db = new polldb_sql();
-  $poll_db->connect();  
-
-  for (reset($POLLTBL); $key=key($POLLTBL); next($POLLTBL)) {
-    $poll_db->query("DROP TABLE $POLLTBL[$key]");
-  }
-
-  if (ereg("class_pgsql",$POLLDB["class"])) {
-    $poll_db->query("DROP SEQUENCE poll_comment_seq");
-    $poll_db->query("DROP SEQUENCE poll_index_seq");
-    $poll_db->query("DROP SEQUENCE poll_templateset_seq");
-    $poll_db->query("DROP SEQUENCE poll_data_seq");
-    $poll_db->query("DROP SEQUENCE poll_templates_seq");
-  }
-  
-  message_box("The tables have been removed from your database!");
-  break;
-
-default:
-  print_header();
-  db_config();
-  break;
-
-}
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+
+$version = "v2.03";
+if (!isset($PHP_SELF)) {
+  $PHP_SELF = $HTTP_SERVER_VARS["PHP_SELF"];
+  if (isset($HTTP_GET_VARS)) {
+    while (list($name, $value)=each($HTTP_GET_VARS)) {
+      $$name=$value;
+    }
+  }
+  if (isset($HTTP_POST_VARS)) {
+    while (list($name, $value)=each($HTTP_POST_VARS)) {
+      $$name=$value;
+    }
+  }
+}
+if (!file_exists("../install/cross.gif")) {
+  $img_loc="http://www.proxy2.de/poll/install";
+} else {
+  $img_loc="../install";
+}
+
+function print_header() {
+global $PHP_SELF, $version;
+?>
+<html>
+<head>
+<title>Advanced Poll <?php echo $version; ?> Uninstall</title>
+<meta http-equiv="Pragma" content="no-cache">
+<meta http-equiv="Cache-Control" content="no-cache">
+<meta http-equiv="Expires" content="-1">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<style type="text/css">
+<!--
+.td1 {  font-family: "MS Sans Serif"; font-size: 9pt}
+-->
+</style>
+<script language="Javascript">
+<!--
+function abort() {
+ if (window.confirm("Are you sure you want to cancel the uninstall?")) {
+    window.location.href = "http://"+window.location.host+window.location.pathname+"?action=cancel"
+ }
+}
+// -->
+</script>
+</head>
+<?php
+}
+
+function sql_error() {
+global $PHP_SELF, $version, $img_loc;
+$description = mysql_error();
+?>
+<body bgcolor="#3A6EA5">
+<br>
+<br>
+<table border="1" cellspacing="0" cellpadding="0" align="center" width="500">
+  <tr bgcolor="#C6C3C6">
+    <td>
+      <table width="500" border="0" cellspacing="0" cellpadding="1" align="center">
+        <tr bgcolor="#400080">
+          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
+            &nbsp;Advanced Poll <?php echo $version; ?> Uninstall</font></b></td>
+          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0" usemap="#close"><map name="close"><area shape="rect" coords="1,1,14,12" href="javascript:abort()"></map>
+          </td>
+        </tr>
+        <tr align="center">
+          <td colspan="2">
+            <form method="post" action="<?php echo $PHP_SELF; ?>">
+              <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
+                <tr bgcolor="#FFFFFF" valign="bottom">
+                  <td class="td1" height="30"><b>&nbsp;&nbsp;&nbsp;&nbsp;Error
+                    occured!</b></td>
+                </tr>
+                <tr bgcolor="#FFFFFF">
+                  <td class="td1" height="30">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    The following error occured...</td>
+                </tr>
+                <tr bgcolor="#C6C3C6">
+                  <td class="td1" align="center">
+                    <table width="400" border="0" cellspacing="0" cellpadding="0" align="center">
+                      <tr>
+                        <td class="td1" height="75"><?php echo $description; ?>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td height="140" class="td1">&nbsp;
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                </tr>
+                <tr bgcolor="#C6C3C6">
+                  <td align="center" height="20">
+                    <img src="<?php echo $img_loc; ?>/h_line.gif" height="18" width="490">
+                  </td>
+                </tr>
+                <tr bgcolor="#C6C3C6">
+                  <td align="right"><img src="<?php echo $img_loc; ?>/back.gif" width="75" height="22" border="0" usemap="#Back" alt="Back"><map name="Back"><area shape="rect" coords="1,1,73,20" href="javascript:history.go(-1)"></map>
+                    &nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/cancel.gif" width="75" height="22" usemap="#Cancel" border="0" alt="Cancel"><map name="Cancel"><area shape="rect" coords="1,1,73,20" href="javascript:abort()"></map>
+                    &nbsp;&nbsp; </td>
+                </tr>
+              </table>
+            </form>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<br>
+<br>
+<br>
+</body>
+</html>
+<?php
+exit();
+}
+
+function db_config() {
+global $PHP_SELF, $version, $img_loc;
+?>
+<body bgcolor="#3A6EA5">
+<br>
+<br>
+<table border="1" cellspacing="0" cellpadding="0" align="center" width="500">
+  <tr bgcolor="#C6C3C6">
+    <td>
+      <table width="500" border="0" cellspacing="0" cellpadding="1" align="center">
+        <tr bgcolor="#400080">
+          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
+            &nbsp;Advanced Poll <?php echo $version; ?> Uninstall</font></b></td>
+          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0" usemap="#close"><map name="close"><area shape="rect" coords="1,1,14,12" href="javascript:abort()"></map>
+          </td>
+        </tr>
+        <tr align="center">
+          <td colspan="2">
+            <form method="post" action="<?php echo $PHP_SELF; ?>">
+              <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
+                <tr bgcolor="#FFFFFF" valign="bottom">
+                  <td class="td1" height="30"><b>&nbsp;&nbsp;&nbsp;&nbsp;Welcome to the Advanced Poll uninstall script.</b></td>
+                </tr>
+                <tr bgcolor="#FFFFFF">
+                  <td class="td1" height="30">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    This script removes all the tables that Advanced Poll is using from your database.</td>
+                </tr>
+                <tr bgcolor="#C6C3C6">
+                  <td class="td1" align="center">
+                    <table width="400" border="0" cellspacing="0" cellpadding="0" align="center">
+                      <tr>
+                        <td class="td1" height="75">Please enter your database settings...</td>
+                      </tr>
+                      <tr>
+                        <td height="140" class="td1">
+                          <table width="100%" border="0" cellspacing="0" cellpadding="3">
+                            <tr>
+                              <td width="18%" class="td1">Hostname:</td>
+                              <td width="82%">
+                                <input type="text" name="mysql_host" size="25" value="localhost">
+                              </td>
+                            </tr>
+                            <tr>
+                              <td width="18%" class="td1">Database:</td>
+                              <td width="82%">
+                                <input type="text" name="db_name" size="25">
+                              </td>
+                            </tr>
+                            <tr>
+                              <td width="18%" class="td1">Username:</td>
+                              <td width="82%">
+                                <input type="text" name="mysql_user" size="25">
+                              </td>
+                            </tr>
+                            <tr>
+                              <td width="18%" class="td1">Password:</td>
+                              <td width="82%">
+                                <input type="password" name="mysql_pass" size="25">
+                                <input type="hidden" name="action" value="connect">
+                              </td>
+                            </tr>
+                          </table>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                </tr>
+                <tr bgcolor="#C6C3C6">
+                  <td align="center" height="20">
+                    <img src="<?php echo $img_loc; ?>/h_line.gif" height="18" width="490">
+                  </td>
+                </tr>
+                <tr bgcolor="#C6C3C6">
+                  <td align="right"><img src="<?php echo $img_loc; ?>/disabled.gif" width="75" height="22" border="0" alt="Back"><input type="image" src="<?php echo $img_loc; ?>/next.gif" width="75" height="22" border="0" alt="Next">
+                    &nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/cancel.gif" width="75" height="22" usemap="#Cancel" border="0" alt="Cancel"><map name="Cancel"><area shape="rect" coords="1,1,73,20" href="javascript:abort()"></map>
+                    &nbsp;&nbsp; </td>
+                </tr>
+              </table>
+            </form>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<br>
+<br>
+<br>
+</body>
+</html>
+<?php
+}
+
+function confirm_uninstall() {
+global $PHP_SELF, $version, $img_loc;
+global $POLLTBL;
+global $db_name, $mysql_host, $mysql_user, $mysql_pass;
+?>
+<body bgcolor="#3A6EA5">
+<br>
+<br>
+<table border="1" cellspacing="0" cellpadding="0" align="center" width="500">
+  <tr bgcolor="#C6C3C6">
+    <td>
+      <table width="500" border="0" cellspacing="0" cellpadding="1" align="center">
+        <tr bgcolor="#400080">
+          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
+            &nbsp;Advanced Poll <?php echo $version; ?> Uninstall</font></b></td>
+          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0" usemap="#close"><map name="close"><area shape="rect" coords="1,1,14,12" href="javascript:abort()"></map>
+          </td>
+        </tr>
+        <tr align="center">
+          <td colspan="2">
+            <form method="post" action="<?php echo $PHP_SELF; ?>">
+              <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
+                <tr bgcolor="#FFFFFF" valign="bottom">
+                  <td class="td1" height="30"><b>&nbsp;&nbsp;&nbsp;&nbsp;Connection
+                    established</b></td>
+                </tr>
+                <tr bgcolor="#FFFFFF">
+                  <td class="td1" height="30">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <?php echo "$mysql_user"."@"."$mysql_host"; ?></td>
+                </tr>
+                <tr bgcolor="#C6C3C6">
+                  <td class="td1" align="center">
+                    <table width="400" border="0" cellspacing="0" cellpadding="0" align="center">
+                      <tr>
+                        <td class="td1" height="75">Are you sure you want to remove
+                          the following tables from your database?</td>
+                      </tr>
+                      <tr>
+                        <td height="140" class="td1" valign="top">
+                          <table width="100%" border="0" cellspacing="0" cellpadding="1">
+                            <tr>
+                              <td class="td1">- <?php echo $POLLTBL["poll_index"]; ?></td>
+                            </tr>
+                            <tr>
+                              <td class="td1">- <?php echo $POLLTBL["poll_data"]; ?></td>
+                            </tr>
+                            <tr>
+                              <td class="td1">- <?php echo $POLLTBL["poll_config"]; ?></td>
+                            </tr>
+                            <tr>
+                              <td class="td1">- <?php echo $POLLTBL["poll_ip"]; ?></td>
+                            </tr>
+                            <tr>
+                              <td class="td1">- <?php echo $POLLTBL["poll_log"]; ?></td>
+                            </tr>
+                            <tr>
+                              <td class="td1">- <?php echo $POLLTBL["poll_comment"]; ?></td>
+                            </tr>
+                            <tr>
+                              <td class="td1">- <?php echo $POLLTBL["poll_tpl"]; ?></td>
+                            </tr>
+                            <tr>
+                              <td class="td1">- <?php echo $POLLTBL["poll_tplset"]; ?></td>
+                            </tr>
+                            <tr>
+                              <td class="td1">- <?php echo $POLLTBL["poll_user"]; ?></td>
+                                <input type="hidden" name="db_name" value="<?php echo $db_name; ?>">
+                                <input type="hidden" name="mysql_host" value="<?php echo $mysql_host; ?>">
+                                <input type="hidden" name="mysql_user" value="<?php echo $mysql_user; ?>">
+                                <input type="hidden" name="mysql_pass" value="<?php echo $mysql_pass; ?>">
+                                <input type="hidden" name="action" value="delete">
+                              </td>
+                            </tr>
+                          </table>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                </tr>
+                <tr bgcolor="#C6C3C6">
+                  <td align="center" height="20">
+                    <img src="<?php echo $img_loc; ?>/h_line.gif" height="18" width="490">
+                  </td>
+                </tr>
+                <tr bgcolor="#C6C3C6">
+                  <td align="right"><img src="<?php echo $img_loc; ?>/disabled.gif" width="75" height="22" border="0" alt="Back"><input type="image" src="<?php echo $img_loc; ?>/next.gif" width="75" height="22" border="0" alt="Next">
+                    &nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/cancel.gif" width="75" height="22" usemap="#Cancel" border="0" alt="Cancel"><map name="Cancel"><area shape="rect" coords="1,1,73,20" href="javascript:abort()"></map>
+                    &nbsp;&nbsp; </td>
+                </tr>
+              </table>
+            </form>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<br>
+<br>
+<br>
+</body>
+</html>
+<?php
+}
+
+function message_box($msg) {
+global $version, $img_loc;
+?>
+<body bgcolor="#3A6EA5">
+<br><br><br><br><br><br>
+<table border="1" cellspacing="0" cellpadding="0" align="center" width="300">
+  <tr bgcolor="#C6C3C6">
+    <td>
+      <table width="300" border="0" cellspacing="0" cellpadding="1" align="center">
+        <tr bgcolor="#400080">
+          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
+            &nbsp;Advanced Poll <?php echo $version; ?> Uninstall</font></b></td>
+          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0">
+          </td>
+        </tr>
+        <tr align="center">
+          <td>
+            <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
+              <tr bgcolor="#C6C3C6">
+                <td align="center" height="75" width="20%"><img src="<?php echo $img_loc; ?>/info.gif" width="35" height="35"></td>
+                <td align="left" height="75" width="80%" class="td1"><?php echo $msg; ?></td>
+              </tr>
+              <tr bgcolor="#C6C3C6" align="center">
+                <td colspan="2" height="40"><img src="<?php echo $img_loc; ?>/disabled.gif" width="75" height="22" border="0" alt="Back">&nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/ok.gif" width="75" height="22" border="0" alt="Ok"></td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<br>
+<br>
+<br>
+</body>
+</html>
+<?php
+exit();
+}
+
+if (!isset($action)) {
+  $action ='';
+}
+
+switch ($action) {
+
+case "cancel":
+  print_header();
+  message_box("The operation has been cancelled!");
+  break;
+
+case "connect":
+  print_header(); 
+  if (file_exists("../include/config.inc.php")) {
+    include ("../include/config.inc.php");
+    include "../include/$POLLDB[class]";
+  } elseif (file_exists("./include/config.inc.php")) {
+    include ("./include/config.inc.php");
+    include "./include/$POLLDB[class]";
+  } else {
+    message_box("Cannot find the configuration file <u>config.inc.php</u>.");
+  }
+  if (empty($POLLTBL["poll_index"]) || empty($POLLTBL["poll_data"]) || empty($POLLTBL["poll_config"]) || empty($POLLTBL["poll_ip"]) || empty($POLLTBL["poll_log"]) || empty($POLLTBL["poll_user"]) || empty($POLLTBL["poll_comment"])) {
+    message_box("Some tables are not defined. Please check the configuration file.");
+  }
+  $POLLDB["dbName"] = $db_name;
+  $POLLDB["host"]   = $mysql_host;
+  $POLLDB["user"]   = $mysql_user;
+  $POLLDB["pass"]   = $mysql_pass;
+  $poll_db = new polldb_sql();
+  $poll_db->connect();  
+  confirm_uninstall();
+  break;
+
+case "delete":
+  print_header();
+  if (file_exists("../include/config.inc.php")) {
+    include ("../include/config.inc.php");
+    include "../include/$POLLDB[class]";
+  } elseif (file_exists("./include/config.inc.php")) {
+    include ("./include/config.inc.php");
+    include "./include/$POLLDB[class]";
+  } else {
+    message_box("Cannot find the configuration file <u>config.inc.php</u>.");
+  }
+  $POLLDB["dbName"] = $db_name;
+  $POLLDB["host"]   = $mysql_host;
+  $POLLDB["user"]   = $mysql_user;
+  $POLLDB["pass"]   = $mysql_pass;
+  $poll_db = new polldb_sql();
+  $poll_db->connect();  
+
+  for (reset($POLLTBL); $key=key($POLLTBL); next($POLLTBL)) {
+    $poll_db->query("DROP TABLE $POLLTBL[$key]");
+  }
+
+  if (ereg("class_pgsql",$POLLDB["class"])) {
+    $poll_db->query("DROP SEQUENCE poll_comment_seq");
+    $poll_db->query("DROP SEQUENCE poll_index_seq");
+    $poll_db->query("DROP SEQUENCE poll_templateset_seq");
+    $poll_db->query("DROP SEQUENCE poll_data_seq");
+    $poll_db->query("DROP SEQUENCE poll_templates_seq");
+  }
+  
+  message_box("The tables have been removed from your database!");
+  break;
+
+default:
+  print_header();
+  db_config();
+  break;
+
+}
+
 ?>
\ No newline at end of file

Index: index.html
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/misc/index.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- index.html	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ index.html	18 Sep 2004 16:00:42 -0000	1.2
@@ -1,42 +1,42 @@
-<html>
-<head>
-<title>Content of this directory</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.td1 {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 8.5pt}
--->
-</style>
-</head>
-
-<body bgcolor="#3A6EA5" text="#333333" link="#0000FF">
-<br>
-<table width="600" border="0" cellspacing="0" cellpadding="1" align="center" bgcolor="#FFFFFF">
-  <tr>
-    <td>
-      <table border="0" cellspacing="0" cellpadding="5" align="center" width="598" bgcolor="#C6C3C6">
-        <tr bgcolor="#000084"> 
-          <td colspan="3" class="td1"><b><font color="#FFFFFF">Content of this 
-            directory:</font></b> </td>
-        </tr>
-        <tr> 
-          <td class="td1" align="right" width="17">&#0149;</td>
-          <td class="td1" width="184"><a href="get_admin.php">get_admin.php</a></td>
-          <td width="367" class="td1">script to recover lost admin abilities</td>
-        </tr>
-        <tr> 
-          <td align="right" class="td1" width="17">&#0149;</td>
-          <td width="184" class="td1"><a href="info.php">info.php</a></td>
-          <td width="367" class="td1">script to display the php environment</td>
-        </tr>
-        <tr> 
-          <td align="right" class="td1" width="17">&#0149;</td>
-          <td width="184" class="td1"><a href="uninstall.php">uninstall.php</a></td>
-          <td width="367" class="td1">script to remove the tables from the database</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
+<html>
+<head>
+<title>Content of this directory</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<style type="text/css">
+<!--
+.td1 {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 8.5pt}
+-->
+</style>
+</head>
+
+<body bgcolor="#3A6EA5" text="#333333" link="#0000FF">
+<br>
+<table width="600" border="0" cellspacing="0" cellpadding="1" align="center" bgcolor="#FFFFFF">
+  <tr>
+    <td>
+      <table border="0" cellspacing="0" cellpadding="5" align="center" width="598" bgcolor="#C6C3C6">
+        <tr bgcolor="#000084"> 
+          <td colspan="3" class="td1"><b><font color="#FFFFFF">Content of this 
+            directory:</font></b> </td>
+        </tr>
+        <tr> 
+          <td class="td1" align="right" width="17">&#0149;</td>
+          <td class="td1" width="184"><a href="get_admin.php">get_admin.php</a></td>
+          <td width="367" class="td1">script to recover lost admin abilities</td>
+        </tr>
+        <tr> 
+          <td align="right" class="td1" width="17">&#0149;</td>
+          <td width="184" class="td1"><a href="info.php">info.php</a></td>
+          <td width="367" class="td1">script to display the php environment</td>
+        </tr>
+        <tr> 
+          <td align="right" class="td1" width="17">&#0149;</td>
+          <td width="184" class="td1"><a href="uninstall.php">uninstall.php</a></td>
+          <td width="367" class="td1">script to remove the tables from the database</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+</body>
+</html>

Index: info.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/misc/info.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- info.php	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ info.php	18 Sep 2004 16:00:42 -0000	1.2
@@ -1,8 +1,8 @@
-<html>
-<head>
-<title>PHP Info</title>
-</head>
-<body bgcolor="#3A6EA5">
-<?php
-phpinfo();
+<html>
+<head>
+<title>PHP Info</title>
+</head>
+<body bgcolor="#3A6EA5">
+<?php
+phpinfo();
 ?>
\ No newline at end of file

Index: get_admin.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/misc/get_admin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- get_admin.php	2 Jun 2004 13:05:50 -0000	1.1.1.1
+++ get_admin.php	18 Sep 2004 16:00:42 -0000	1.2
@@ -1,449 +1,449 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-$version = "v2.03";
-if (!isset($PHP_SELF)) {
-  $PHP_SELF = $HTTP_SERVER_VARS["PHP_SELF"];
-  if (isset($HTTP_GET_VARS)) {
-    while (list($name, $value)=each($HTTP_GET_VARS)) {
-      $$name=$value;
-    }
-  }
-  if (isset($HTTP_POST_VARS)) {
-    while (list($name, $value)=each($HTTP_POST_VARS)) {
-      $$name=$value;
-    }
-  }
-}
-if (!file_exists("../install/cross.gif")) {
-  $img_loc="http://www.proxy2.de/poll/install";
-} else {
-  $img_loc="../install";
-}
-
-function print_header() {
-global $PHP_SELF, $version;
-?>
-<html>
-<head>
-<title>Advanced Poll <?php echo $version; ?></title>
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="Cache-Control" content="no-cache">
-<meta http-equiv="Expires" content="-1">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.td1 {  font-family: "MS Sans Serif"; font-size: 9pt}
--->
-</style>
-<script language="Javascript">
-<!--
-function abort() {
- if (window.confirm("Do you wish to cancel the operation?")) {
-    window.location.href = "http://"+window.location.host+window.location.pathname+"?action=cancel"
- }
-}
-function trim(value) {
- startpos=0;
- while((value.charAt(startpos)==" ")&&(startpos<value.length)) {
-   startpos++;
- }
- if(startpos==value.length) {
-   value="";
- } else {
-   value=value.substring(startpos,value.length);
-   endpos=(value.length)-1;
-   while(value.charAt(endpos)==" ") {
-     endpos--;
-   }
-   value=value.substring(0,endpos+1);
- }
- return(value);
-}
-function check_data() {
-  document.FormPwd.username.value = trim(document.FormPwd.username.value);
-  document.FormPwd.password.value = trim(document.FormPwd.password.value);
-  if (document.FormPwd.username.value == "") {
-    alert("You forgot to fill in the username field!");
-    document.FormPwd.username.focus();
-    return false;
-  } else if (document.FormPwd.password.value == "") {
-    alert("You forgot to fill in the password field!");
-    document.FormPwd.password.focus();
-    return false;
-  } else if (document.FormPwd.password.value != document.FormPwd.confirm.value) {
-    alert("The passwords do not match!");
-    return false;
-  }
-}
-function set_focus() {
-  document.FormPwd.username.focus();
-}
-// -->
-</script>
-</head>
-<?php
-}
-
-function sql_error() {
-global $PHP_SELF, $version, $img_loc;
-$description = mysql_error();
-?>
-<body bgcolor="#3A6EA5">
-<br>
-<br>
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="500">
-  <tr bgcolor="#C6C3C6">
-    <td>
-      <table width="500" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll <?php echo $version; ?></font></b></td>
-          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0" usemap="#close"><map name="close"><area shape="rect" coords="1,1,14,12" href="javascript:abort()"></map>
-          </td>
-        </tr>
-        <tr align="center">
-          <td colspan="2">
-            <form method="post" action="<?php echo $PHP_SELF; ?>">
-              <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
-                <tr bgcolor="#FFFFFF" valign="bottom">
-                  <td class="td1" height="30"><b>&nbsp;&nbsp;&nbsp;&nbsp;Error
-                    occured!</b></td>
-                </tr>
-                <tr bgcolor="#FFFFFF">
-                  <td class="td1" height="30">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    The following error occured...</td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td class="td1" align="center">
-                    <table width="400" border="0" cellspacing="0" cellpadding="0" align="center">
-                      <tr>
-                        <td class="td1" height="75"><?php echo $description; ?>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td height="140" class="td1">&nbsp;
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="center" height="20">
-                    <img src="<?php echo $img_loc; ?>/h_line.gif" height="18" width="490">
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="right"><img src="<?php echo $img_loc; ?>/back.gif" width="75" height="22" border="0" usemap="#Back" alt="Back"><map name="Back"><area shape="rect" coords="1,1,73,20" href="javascript:history.go(-1)"></map>
-                    &nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/cancel.gif" width="75" height="22" usemap="#Cancel" border="0" alt="Cancel"><map name="Cancel"><area shape="rect" coords="1,1,73,20" href="javascript:abort()"></map>
-                    &nbsp;&nbsp; </td>
-                </tr>
-              </table>
-            </form>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-<br>
-</body>
-</html>
-<?php
-exit();
-}
-
-function db_config() {
-global $PHP_SELF, $version, $img_loc;
-?>
-<body bgcolor="#3A6EA5">
-<br>
-<br>
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="500">
-  <tr bgcolor="#C6C3C6">
-    <td>
-      <table width="500" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll <?php echo $version; ?></font></b></td>
-          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0" usemap="#close"><map name="close"><area shape="rect" coords="1,1,14,12" href="javascript:abort()"></map>
-          </td>
-        </tr>
-        <tr align="center">
-          <td colspan="2">
-            <form method="post" action="<?php echo $PHP_SELF; ?>">
-              <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
-                <tr bgcolor="#FFFFFF" valign="bottom">
-                  <td class="td1" height="30"><b>&nbsp;&nbsp;&nbsp;&nbsp;Forgot the password?</b></td>
-                </tr>
-                <tr bgcolor="#FFFFFF">
-                  <td class="td1" height="30">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    This script can be used to recover lost admin abilities.</td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td class="td1" align="center">
-                    <table width="400" border="0" cellspacing="0" cellpadding="0" align="center">
-                      <tr>
-                        <td class="td1" height="75">Please enter your database settings...</td>
-                      </tr>
-                      <tr>
-                        <td height="140" class="td1">
-                          <table width="100%" border="0" cellspacing="0" cellpadding="3">
-                            <tr>
-                              <td width="18%" class="td1">Hostname:</td>
-                              <td width="82%">
-                                <input type="text" name="sql_hostname" size="25" value="localhost">
-                              </td>
-                            </tr>
-                            <tr>
-                              <td width="18%" class="td1">Database:</td>
-                              <td width="82%">
-                                <input type="text" name="dbName" size="25">
-                              </td>
-                            </tr>
-                            <tr>
-                              <td width="18%" class="td1">Username:</td>
-                              <td width="82%">
-                                <input type="text" name="sql_username" size="25">
-                              </td>
-                            </tr>
-                            <tr>
-                              <td width="18%" class="td1">Password:</td>
-                              <td width="82%">
-                                <input type="password" name="sql_password" size="25">
-                                <input type="hidden" name="action" value="connect">
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="center" height="20">
-                    <img src="<?php echo $img_loc; ?>/h_line.gif" height="18" width="490">
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="right"><img src="<?php echo $img_loc; ?>/disabled.gif" width="75" height="22" border="0" alt="Back"><input type="image" src="<?php echo $img_loc; ?>/next.gif" width="75" height="22" border="0" alt="Next">
-                    &nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/cancel.gif" width="75" height="22" usemap="#Cancel" border="0" alt="Cancel"><map name="Cancel"><area shape="rect" coords="1,1,73,20" href="javascript:abort()"></map>
-                    &nbsp;&nbsp; </td>
-                </tr>
-              </table>
-            </form>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-<br>
-</body>
-</html>
-<?php
-}
-
-function new_admin() {
-global $PHP_SELF, $version, $img_loc;
-global $dbName, $sql_hostname, $sql_username, $sql_password;
-?>
-<body bgcolor="#3A6EA5" onload="set_focus()">
-<br>
-<br>
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="500">
-  <tr bgcolor="#C6C3C6">
-    <td>
-      <table width="500" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll <?php echo $version; ?></font></b></td>
-          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0" usemap="#close"><map name="close"><area shape="rect" coords="1,1,14,12" href="javascript:abort()"></map>
-          </td>
-        </tr>
-        <tr align="center">
-          <td colspan="2">
-            <form method="post" action="<?php echo $PHP_SELF; ?>" name="FormPwd" onsubmit="return check_data()">
-              <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
-                <tr bgcolor="#FFFFFF" valign="bottom">
-                  <td class="td1" height="30"><b>&nbsp;&nbsp;&nbsp;&nbsp;Connection
-                    established</b></td>
-                </tr>
-                <tr bgcolor="#FFFFFF">
-                  <td class="td1" height="30">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <?php echo "$sql_username"."@"."$sql_hostname"; ?></td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td class="td1" align="center">
-                    <table width="400" border="0" cellspacing="0" cellpadding="0" align="center">
-                      <tr>
-                        <td class="td1" height="75">Please enter a new
-                          username and password for the admin control panel.</td>
-                      </tr>
-                      <tr>
-                        <td height="140" class="td1">
-                          <table width="100%" border="0" cellspacing="0" cellpadding="3">
-                            <tr>
-                              <td width="18%" class="td1">Username:</td>
-                              <td width="82%">
-                                <input type="text" name="username" size="25">
-                              </td>
-                            </tr>
-                            <tr>
-                              <td width="18%" class="td1">Password:</td>
-                              <td width="82%">
-                                <input type="password" name="password" size="25">
-                              </td>
-                            </tr>
-                            <tr>
-                              <td width="18%" class="td1">Confirm:</td>
-                              <td width="82%">
-                                <input type="password" name="confirm" size="25">
-                                <input type="hidden" name="dbName" value="<?php echo $dbName; ?>">
-                                <input type="hidden" name="sql_hostname" value="<?php echo $sql_hostname; ?>">
-                                <input type="hidden" name="sql_username" value="<?php echo $sql_username; ?>">
-                                <input type="hidden" name="sql_password" value="<?php echo $sql_password; ?>">
-                                <input type="hidden" name="action" value="account">
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="center" height="20">
-                    <img src="<?php echo $img_loc; ?>/h_line.gif" height="18" width="490">
-                  </td>
-                </tr>
-                <tr bgcolor="#C6C3C6">
-                  <td align="right"><img src="<?php echo $img_loc; ?>/disabled.gif" width="75" height="22" border="0" alt="Back"><input type="image" src="<?php echo $img_loc; ?>/next.gif" width="75" height="22" border="0" alt="Next">
-                    &nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/cancel.gif" width="75" height="22" usemap="#Cancel" border="0" alt="Cancel"><map name="Cancel"><area shape="rect" coords="1,1,73,20" href="javascript:abort()"></map>
-                    &nbsp;&nbsp; </td>
-                </tr>
-              </table>
-            </form>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-<br>
-</body>
-</html>
-<?php
-}
-
-function message_box($msg) {
-global $version, $img_loc;
-?>
-<body bgcolor="#3A6EA5">
-<br><br><br><br><br><br>
-<table border="1" cellspacing="0" cellpadding="0" align="center" width="300">
-  <tr bgcolor="#C6C3C6">
-    <td>
-      <table width="300" border="0" cellspacing="0" cellpadding="1" align="center">
-        <tr bgcolor="#400080">
-          <td height="20" class="td1" bgcolor="#000084"><b><font color="#FFFFFF">
-            &nbsp;Advanced Poll <?php echo $version; ?></font></b></td>
-          <td height="20" class="td1" align="right" bgcolor="#000084"><img src="<?php echo $img_loc; ?>/cross.gif" width="16" height="14" border="0">
-          </td>
-        </tr>
-        <tr align="center">
-          <td>
-            <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
-              <tr bgcolor="#C6C3C6">
-                <td align="center" height="75" width="20%"><img src="<?php echo $img_loc; ?>/info.gif" width="35" height="35"></td>
-                <td align="left" height="75" width="80%" class="td1"><?php echo $msg; ?></td>
-              </tr>
-              <tr bgcolor="#C6C3C6" align="center">
-                <td colspan="2" height="40"><img src="<?php echo $img_loc; ?>/disabled.gif" width="75" height="22" border="0" alt="Back">&nbsp;&nbsp;<img src="<?php echo $img_loc; ?>/ok.gif" width="75" height="22" border="0" alt="Ok"></td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<br>
-<br>
-<br>
-</body>
-</html>
-<?php
-}
-if (!isset($action)) {
-  $action ='';
-}
-
-if (file_exists("../include/config.inc.php")) {
-    include "../include/config.inc.php";
-    include "../include/$POLLDB[class]";
-} elseif (file_exists("./include/config.inc.php")) {
-    include "./include/config.inc.php";
-    include "./include/$POLLDB[class]";
-} else {
-    message_box("Cannot find configuration file");
-    exit;
-}
-
-switch ($action) {
-
-case "cancel":
-  print_header();
-  message_box("The operation has been cancelled!");
-  break;
-
-case "connect":
-  print_header();
-  $POLLDB["dbName"] = $dbName;
-  $POLLDB["host"]   = $sql_hostname;
-  $POLLDB["user"]   = $sql_username;
-  $POLLDB["pass"]   = $sql_password;
-  $poll_db = new polldb_sql();
-  $poll_db->connect();
-  new_admin();
-  break;
-
-case "account":
-  print_header();
-  srand((double)microtime()*1000000);
-  $session = md5 (uniqid (rand()));
-  if (get_magic_quotes_gpc()) {
-     $password = stripslashes($password);
-  }
-  $password = md5($password);
-  $POLLDB["dbName"] = $dbName;
-  $POLLDB["host"]   = $sql_hostname;
-  $POLLDB["user"]   = $sql_username;
-  $POLLDB["pass"]   = $sql_password;
-  $poll_db = new polldb_sql();
-  $poll_db->connect();  
-  $sql_query = "UPDATE ".$POLLTBL["poll_user"]." SET username='$username', userpass='$password', session='$session' WHERE user_id='1'";
-  $poll_db->query($sql_query);
-  message_box("The username and password have been changed!");
-  break;
-
-default:
-  print_header();
-  db_config();
-  break;
-
-}
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+
+$version = "v2.03";
+if (!isset($PHP_SELF)) {
+  $PHP_SELF = $HTTP_SERVER_VARS["PHP_SELF"];
+  if (isset($HTTP_GET_VARS)) {
+    while (list($name, $value)=each($HTTP_GET_VARS)) {
+      $$name=$value;
+    }
+  }
+  if (isset($HTTP_POST_VARS)) {
+    while (list($name, $value)=each($HTTP_POST_VARS)) {
+      $$name=$value;
+    }
+  }
+}
+if (!file_exists("../install/cross.gif")) {
+  $img_loc="http://www.proxy2.de/poll/install";
+} else {
+  $img_loc="../install";
+}
+
+function print_header() {
+global $PHP_SELF, $version;
+?>
+<html>
+<head>
+<title>Advanced Poll <?php echo $version; ?></title>
+<meta http-equiv="Pragma" content="no-cache">
+<meta http-equiv="Cache-Control" content="no-cache">
+<meta http-equiv="Expires" content="-1">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<style type="text/css">
+<!--
+.td1 {  font-family: "MS Sans Serif"; font-size: 9pt}
+-->
+</style>
+<script language="Javascript">
+<!--
+function abort() {
+ if (window.confirm("Do you wish to cancel the operation?")) {
+    window.location.href = "http://"+window.location.host+window.location.pathname+"?action=cancel"
+ }
+}
+function trim(value) {
+ startpos=0;
+ while((value.charAt(startpos)==" ")&&(startpos<value.length)) {
+   startpos++;
+ }
+ if(startpos==value....
 
[truncated message content]

[Devil-linux-commit] web/poll/include class_input2db.php,1.1.1.1,1.2 class_mysql.php,1.1.1.1,1.2 class_pgfx.php,1.1.1.1,1.2 class_pgsql.php,1.1.1.1,1.2 class_plist.php,1.1.1.1,1.2 class_poll.php,1.1.1.1,1.2 class_session.php,1.1.1.1,1.2 class_template.php,1.1.1.1,1.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll/include

Modified Files:
	class_input2db.php class_mysql.php class_pgfx.php 
	class_pgsql.php class_plist.php class_poll.php 
	class_session.php class_template.php 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


Index: class_plist.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/include/class_plist.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- class_plist.php	2 Jun 2004 13:05:52 -0000	1.1.1.1
+++ class_plist.php	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,120 +1,120 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-class plist extends pollcomment {
-
-    var $poll_list_html;
-    var $plist_data;
-    var $list_index;
-    var $list_page_html;
-    var $poll_records;
-
-    function plist() {
-        global $HTTP_GET_VARS, $HTTP_POST_VARS;
-        $this->poll_list_html = array();
-        $this->plist_data = array();
-        $this->list_page_html = '';
-        $this->poll_records = '';        
-        $this->list_index = (isset($HTTP_GET_VARS['l_page'])) ? trim($HTTP_GET_VARS['l_page']) : 0;
-        $this->list_index = (isset($HTTP_POST_VARS['l_page'])) ? trim($HTTP_POST_VARS['l_page']) : $this->list_index;
-        if (empty($this->list_index) || $this->list_index<0) {
-            $this->list_index = 0;
-        }
-        $this->pollcomment();
-    }
-
-    function get_poll_list() {
-        if (sizeof($this->plist_data)<1) {
-            $record = ($this->poll_records>0) ? $this->poll_records : $this->pollvars['polls_pp'];
-            $this->db->query("SELECT * FROM ".$this->tbl['poll_index']." WHERE (status < '2') ORDER BY poll_id DESC LIMIT ".$this->list_index.",$record");
-            $total_polls = $this->db->num_rows($this->db->result);
-            if ($total_polls>0) {
-                for ($i=0; $i<$record; $i++) {
-                    if ($this->db->fetch_array($this->db->result)) {
-                        $poll_id_arr[] = $this->db->record['poll_id'];
-                        $question_arr[] = $this->db->record['question'];
-                        $timestamp_arr[] = $this->db->record['timestamp'];
-                        $exp_time_arr[] = $this->db->record['exp_time'];
-                        $expire_arr[] = $this->db->record['expire'];
-                        $comments_arr[] = $this->db->record['comments'];
-                    } else {
-                        break;
-                    }
-                }
-                $this->plist_data['poll_id'] = $poll_id_arr;
-                $this->plist_data['question'] = $question_arr;
-                $this->plist_data['timestamp'] = $timestamp_arr;
-                $this->plist_data['exp_time'] = $exp_time_arr;
-                $this->plist_data['expire'] = $expire_arr;
-                $this->plist_data['comments'] = $comments_arr;
-            } else {
-                $this->plist_data = array();
-            }
-        }
-        return $this->plist_data;
-    }
-
-    function view_poll_list() {
-        global $HTTP_SERVER_VARS;
-        $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
-        if (!isset($this->poll_list_html[$this->comment_tpl])) {            
-            $row = $this->db->fetch_array($this->db->query("SELECT template FROM ".$this->tbl['poll_tpl']." WHERE (title = '".$this->comment_tpl."' and tplset_id='0')"));            
-            $row['template'] = ereg_replace("\"", "\\\"", $row['template']);
-            $list_html = '';
-            if (sizeof($this->plist_data<1)) {
-                $this->get_poll_list();
-            }
-            if (sizeof($this->plist_data>0)) {
-                for ($i=0;$i<sizeof($this->plist_data['poll_id']);$i++) {
-                    $data['timestamp'] = date($this->date_format,$this->plist_data['timestamp'][$i]+$this->pollvars['time_offset']*3600);
-                    $data['exp_time'] = date($this->date_format,$this->plist_data['exp_time'][$i]+$this->pollvars['time_offset']*3600);                    
-                    $data['poll_id'] = $this->plist_data['poll_id'][$i];
-                    $data['question'] = $this->plist_data['question'][$i];
-                    $data['comments'] = $this->plist_data['comments'][$i];
-                    $data['expire'] = $this->plist_data['expire'][$i];
-                    eval("\$list_html .= \"$row[template]\";");
-                }
-                $this->poll_list_html[$this->comment_tpl] = $list_html;
-            } else {
-                $this->poll_list_html[$this->comment_tpl] = '';
-            }
-        }
-        return $this->poll_list_html[$this->comment_tpl];
-    }
-
-    function set_polls_per_page($records) {
-        if (is_integer($records) && $records>0) {
-            $this->poll_records = $records;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function get_total_polls() {
-        $this->db->fetch_array($this->db->query("SELECT COUNT(*) AS total FROM ".$this->tbl['poll_index']." WHERE (status < '2')"));
-        return $this->db->record["total"];      
-    }
-
-    function get_list_pages($max_pages=10, $separate=" | ") {
-        if (empty($this->list_page_html)) {
-            $record = ($this->poll_records>0) ? $this->poll_records : $this->pollvars['polls_pp'];
-            $total_polls = $this->get_total_polls();
-            if ($total_polls>0) {
-                $this->list_page_html = $this->get_pages($total_polls, $this->list_index, $record, "l_page", $max_pages, $separate);
-            } else {
-                $this->list_page_html = '';
-            }
-        }
-        return $this->list_page_html;        
-    }
-    
-}
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+
+class plist extends pollcomment {
+
+    var $poll_list_html;
+    var $plist_data;
+    var $list_index;
+    var $list_page_html;
+    var $poll_records;
+
+    function plist() {
+        global $HTTP_GET_VARS, $HTTP_POST_VARS;
+        $this->poll_list_html = array();
+        $this->plist_data = array();
+        $this->list_page_html = '';
+        $this->poll_records = '';        
+        $this->list_index = (isset($HTTP_GET_VARS['l_page'])) ? trim($HTTP_GET_VARS['l_page']) : 0;
+        $this->list_index = (isset($HTTP_POST_VARS['l_page'])) ? trim($HTTP_POST_VARS['l_page']) : $this->list_index;
+        if (empty($this->list_index) || $this->list_index<0) {
+            $this->list_index = 0;
+        }
+        $this->pollcomment();
+    }
+
+    function get_poll_list() {
+        if (sizeof($this->plist_data)<1) {
+            $record = ($this->poll_records>0) ? $this->poll_records : $this->pollvars['polls_pp'];
+            $this->db->query("SELECT * FROM ".$this->tbl['poll_index']." WHERE (status < '2') ORDER BY poll_id DESC LIMIT ".$this->list_index.",$record");
+            $total_polls = $this->db->num_rows($this->db->result);
+            if ($total_polls>0) {
+                for ($i=0; $i<$record; $i++) {
+                    if ($this->db->fetch_array($this->db->result)) {
+                        $poll_id_arr[] = $this->db->record['poll_id'];
+                        $question_arr[] = $this->db->record['question'];
+                        $timestamp_arr[] = $this->db->record['timestamp'];
+                        $exp_time_arr[] = $this->db->record['exp_time'];
+                        $expire_arr[] = $this->db->record['expire'];
+                        $comments_arr[] = $this->db->record['comments'];
+                    } else {
+                        break;
+                    }
+                }
+                $this->plist_data['poll_id'] = $poll_id_arr;
+                $this->plist_data['question'] = $question_arr;
+                $this->plist_data['timestamp'] = $timestamp_arr;
+                $this->plist_data['exp_time'] = $exp_time_arr;
+                $this->plist_data['expire'] = $expire_arr;
+                $this->plist_data['comments'] = $comments_arr;
+            } else {
+                $this->plist_data = array();
+            }
+        }
+        return $this->plist_data;
+    }
+
+    function view_poll_list() {
+        global $HTTP_SERVER_VARS;
+        $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
+        if (!isset($this->poll_list_html[$this->comment_tpl])) {            
+            $row = $this->db->fetch_array($this->db->query("SELECT template FROM ".$this->tbl['poll_tpl']." WHERE (title = '".$this->comment_tpl."' and tplset_id='0')"));            
+            $row['template'] = ereg_replace("\"", "\\\"", $row['template']);
+            $list_html = '';
+            if (sizeof($this->plist_data<1)) {
+                $this->get_poll_list();
+            }
+            if (sizeof($this->plist_data>0)) {
+                for ($i=0;$i<sizeof($this->plist_data['poll_id']);$i++) {
+                    $data['timestamp'] = date($this->date_format,$this->plist_data['timestamp'][$i]+$this->pollvars['time_offset']*3600);
+                    $data['exp_time'] = date($this->date_format,$this->plist_data['exp_time'][$i]+$this->pollvars['time_offset']*3600);                    
+                    $data['poll_id'] = $this->plist_data['poll_id'][$i];
+                    $data['question'] = $this->plist_data['question'][$i];
+                    $data['comments'] = $this->plist_data['comments'][$i];
+                    $data['expire'] = $this->plist_data['expire'][$i];
+                    eval("\$list_html .= \"$row[template]\";");
+                }
+                $this->poll_list_html[$this->comment_tpl] = $list_html;
+            } else {
+                $this->poll_list_html[$this->comment_tpl] = '';
+            }
+        }
+        return $this->poll_list_html[$this->comment_tpl];
+    }
+
+    function set_polls_per_page($records) {
+        if (is_integer($records) && $records>0) {
+            $this->poll_records = $records;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function get_total_polls() {
+        $this->db->fetch_array($this->db->query("SELECT COUNT(*) AS total FROM ".$this->tbl['poll_index']." WHERE (status < '2')"));
+        return $this->db->record["total"];      
+    }
+
+    function get_list_pages($max_pages=10, $separate=" | ") {
+        if (empty($this->list_page_html)) {
+            $record = ($this->poll_records>0) ? $this->poll_records : $this->pollvars['polls_pp'];
+            $total_polls = $this->get_total_polls();
+            if ($total_polls>0) {
+                $this->list_page_html = $this->get_pages($total_polls, $this->list_index, $record, "l_page", $max_pages, $separate);
+            } else {
+                $this->list_page_html = '';
+            }
+        }
+        return $this->list_page_html;        
+    }
+    
+}
+
 ?>
\ No newline at end of file

Index: class_mysql.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/include/class_mysql.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- class_mysql.php	2 Jun 2004 13:05:52 -0000	1.1.1.1
+++ class_mysql.php	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,101 +1,101 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-class polldb_sql {
-
-    var $conn_id;
-    var $result;
-    var $record;
-    var $db;
-    var $port;
-    var $query_count;
-
-    function polldb_sql() {
-        global $POLLDB;
-        $this->query_count=0;
-        $this->db = $POLLDB;
-        if(ereg(":",$this->db['host'])) {
-            list($host,$port) = explode(":",$this->db['host']);
-            $this->port = $port;
-        } else {
-            $this->port = 3306;
-        }
-    }
-
-    function connect() {
-        $this->conn_id = mysql_connect($this->db['host'].":".$this->port,$this->db['user'],$this->db['pass']);
-        if ($this->conn_id == 0) {
-            $this->sql_error("Connection Error");
-        }
-        if (!mysql_select_db($this->db['dbName'], $this->conn_id)) {
-            $this->sql_error("Database Error");
-        }
-        return $this->conn_id;
-    }
-
-    function query($query_string) {
-        $this->result = mysql_query($query_string,$this->conn_id);
-        $this->query_count++;
-        if (!$this->result) {
-            $this->sql_error("Query Error");
-        }
-        return $this->result;
-    }
-
-    function fetch_array($query_id) {
-        $this->record = mysql_fetch_array($query_id,MYSQL_ASSOC);
-        return $this->record;
-    }
-
-    function num_rows($query_id) {
-        return ($query_id) ? mysql_num_rows($query_id) : 0;
-    }
-
-    function num_fields($query_id) {
-        return ($query_id) ? mysql_num_fields($query_id) : 0;
-    }
-
-    function free_result($query_id) {
-        return mysql_free_result($query_id);
-    }
-
-    function affected_rows() {
-        return mysql_affected_rows($this->conn_id);
-    }
-
-    function close_db() {
-        if($this->conn_id) {
-            return mysql_close($this->conn_id);
-        } else {
-            return false;
-        }
-    }
-
-    function sql_error($message) {
-        $description = mysql_error();
-        $number = mysql_errno();
-        $error ="MySQL Error : $message\n";
-        $error.="Error Number: $number $description\n";
-        $error.="Date        : ".date("D, F j, Y H:i:s")."\n";
-        $error.="IP          : ".getenv("REMOTE_ADDR")."\n";
-        $error.="Browser     : ".getenv("HTTP_USER_AGENT")."\n";
-        $error.="Referer     : ".getenv("HTTP_REFERER")."\n";
-        $error.="PHP Version : ".PHP_VERSION."\n";
-        $error.="OS          : ".PHP_OS."\n";
-        $error.="Server      : ".getenv("SERVER_SOFTWARE")."\n";
-        $error.="Server Name : ".getenv("SERVER_NAME")."\n";
-        $error.="Script Name : ".getenv("SCRIPT_NAME")."\n";
-        echo "<b><font size=4 face=Arial>$message</font></b><hr>";
-        echo "<pre>$error</pre>";
-        exit();
-    }
-
-}
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+
+class polldb_sql {
+
+    var $conn_id;
+    var $result;
+    var $record;
+    var $db;
+    var $port;
+    var $query_count;
+
+    function polldb_sql() {
+        global $POLLDB;
+        $this->query_count=0;
+        $this->db = $POLLDB;
+        if(ereg(":",$this->db['host'])) {
+            list($host,$port) = explode(":",$this->db['host']);
+            $this->port = $port;
+        } else {
+            $this->port = 3306;
+        }
+    }
+
+    function connect() {
+        $this->conn_id = mysql_connect($this->db['host'].":".$this->port,$this->db['user'],$this->db['pass']);
+        if ($this->conn_id == 0) {
+            $this->sql_error("Connection Error");
+        }
+        if (!mysql_select_db($this->db['dbName'], $this->conn_id)) {
+            $this->sql_error("Database Error");
+        }
+        return $this->conn_id;
+    }
+
+    function query($query_string) {
+        $this->result = mysql_query($query_string,$this->conn_id);
+        $this->query_count++;
+        if (!$this->result) {
+            $this->sql_error("Query Error");
+        }
+        return $this->result;
+    }
+
+    function fetch_array($query_id) {
+        $this->record = mysql_fetch_array($query_id,MYSQL_ASSOC);
+        return $this->record;
+    }
+
+    function num_rows($query_id) {
+        return ($query_id) ? mysql_num_rows($query_id) : 0;
+    }
+
+    function num_fields($query_id) {
+        return ($query_id) ? mysql_num_fields($query_id) : 0;
+    }
+
+    function free_result($query_id) {
+        return mysql_free_result($query_id);
+    }
+
+    function affected_rows() {
+        return mysql_affected_rows($this->conn_id);
+    }
+
+    function close_db() {
+        if($this->conn_id) {
+            return mysql_close($this->conn_id);
+        } else {
+            return false;
+        }
+    }
+
+    function sql_error($message) {
+        $description = mysql_error();
+        $number = mysql_errno();
+        $error ="MySQL Error : $message\n";
+        $error.="Error Number: $number $description\n";
+        $error.="Date        : ".date("D, F j, Y H:i:s")."\n";
+        $error.="IP          : ".getenv("REMOTE_ADDR")."\n";
+        $error.="Browser     : ".getenv("HTTP_USER_AGENT")."\n";
+        $error.="Referer     : ".getenv("HTTP_REFERER")."\n";
+        $error.="PHP Version : ".PHP_VERSION."\n";
+        $error.="OS          : ".PHP_OS."\n";
+        $error.="Server      : ".getenv("SERVER_SOFTWARE")."\n";
+        $error.="Server Name : ".getenv("SERVER_NAME")."\n";
+        $error.="Script Name : ".getenv("SCRIPT_NAME")."\n";
+        echo "<b><font size=4 face=Arial>$message</font></b><hr>";
+        echo "<pre>$error</pre>";
+        exit();
+    }
+
+}
+
 ?>
\ No newline at end of file

Index: class_pgsql.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/include/class_pgsql.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- class_pgsql.php	2 Jun 2004 13:05:52 -0000	1.1.1.1
+++ class_pgsql.php	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,124 +1,124 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-class polldb_sql {
-    
-    var $conn_id;
-    var $result;
-    var $record;
-    var $db;
-    var $row;
-    var $end_row;
-    var $port;
-
-    function polldb_sql() {
-        global $POLLDB;
-        $this->db = $POLLDB;
-        $this->row = array();
-        $this->end_row = array();
-        if(ereg(":",$this->db['host'])) {
-            list($host,$port) = explode(":",$this->db['host']);
-            $this->port = $port;
-        } else {
-            $this->port = 5432;
-        }
-    }
-
-    function connect() {
-        $pg_connect_str = "";
-        if($this->db['user']) {
-            $pg_connect_str .= "user=".$this->db['user']." ";
-        }
-        if($this->db['pass']) {
-            $pg_connect_str .= "password=".$this->db['pass']." ";
-        }
-        if($this->db['host'] != "localhost") {
-            $pg_connect_str .= "host=".$this->db['host']." ";
-        }
-        $pg_connect_str .= "port=$this->port ";
-        $pg_connect_str .= "dbname=".$this->db['dbName']." ";
-        $this->conn_id = pg_connect($pg_connect_str);
-        if (!$this->conn_id) {
-            $this->sql_error("Connection Error");
-        }
-        return $this->conn_id;
-    }
-
-    function query($query_strg) {
-        $query_strg = eregi_replace("limit ([0-9]+),([ 0-9]+)", "limit \\2, \\1", $query_strg);
-        $this->result = pg_exec($this->conn_id,$query_strg);
-        if (!$this->result) {
-            $this->sql_error("Query Error");
-        }
-        return $this->result;
-    }
-
-    function fetch_array($query_id) {        
-        if (!isset($this->row[$query_id])) {
-            $this->row[$query_id] = 0;
-            $this->end_row[$query_id] = $this->num_rows($query_id);
-        }
-        if ($this->end_row[$query_id] > $this->row[$query_id]) {
-            $this->record = pg_fetch_array($query_id,$this->row[$query_id],PGSQL_ASSOC);
-            $this->row[$query_id] ++;
-            return $this->record;
-        } else {
-            unset($this->row[$query_id]);
-            $this->record = false;
-            return $this->record;
-        }
-    }
-
-    function num_rows($query_id) {
-        return ($query_id) ? pg_NumRows($query_id) : 0;
-    }
-
-    function num_fields($query_id) {
-        return ($query_id) ? pg_NumFields($query_id) : 0;
-    }
-
-    function free_result($query_id) {
-        return pg_FreeResult($query_id);
-    }
-
-    function affected_rows($query_id='') {
-        if (empty($query_id)) {
-            $query_id = $this->result;
-        }
-        return pg_cmdTuples($query_id);
-    }
-
-    function close_db() {
-        if($this->conn_id) {
-            return pg_close($this->conn_id);
-        } else {
-            return false;
-        }
-    }
-   
-    function sql_error($message) {
-        $description = pg_errormessage();
-        $error ="MySQL Error : $message\n";
-        $error.="Message     : $description\n";
-        $error.="Date        : ".date("D, F j, Y H:i:s")."\n";
-        $error.="IP          : ".getenv("REMOTE_ADDR")."\n";
-        $error.="Browser     : ".getenv("HTTP_USER_AGENT")."\n";
-        $error.="Referer     : ".getenv("HTTP_REFERER")."\n";
-        $error.="PHP Version : ".PHP_VERSION."\n";
-        $error.="OS          : ".PHP_OS."\n";
-        $error.="Server      : ".getenv("SERVER_SOFTWARE")."\n";
-        $error.="Server Name : ".getenv("SERVER_NAME")."\n";
-        echo "<b><font size=4 face=Arial>$message</font></b><hr>";
-        echo "<pre>$error</pre>";
-        exit();
-    }
-
-}
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+
+class polldb_sql {
+    
+    var $conn_id;
+    var $result;
+    var $record;
+    var $db;
+    var $row;
+    var $end_row;
+    var $port;
+
+    function polldb_sql() {
+        global $POLLDB;
+        $this->db = $POLLDB;
+        $this->row = array();
+        $this->end_row = array();
+        if(ereg(":",$this->db['host'])) {
+            list($host,$port) = explode(":",$this->db['host']);
+            $this->port = $port;
+        } else {
+            $this->port = 5432;
+        }
+    }
+
+    function connect() {
+        $pg_connect_str = "";
+        if($this->db['user']) {
+            $pg_connect_str .= "user=".$this->db['user']." ";
+        }
+        if($this->db['pass']) {
+            $pg_connect_str .= "password=".$this->db['pass']." ";
+        }
+        if($this->db['host'] != "localhost") {
+            $pg_connect_str .= "host=".$this->db['host']." ";
+        }
+        $pg_connect_str .= "port=$this->port ";
+        $pg_connect_str .= "dbname=".$this->db['dbName']." ";
+        $this->conn_id = pg_connect($pg_connect_str);
+        if (!$this->conn_id) {
+            $this->sql_error("Connection Error");
+        }
+        return $this->conn_id;
+    }
+
+    function query($query_strg) {
+        $query_strg = eregi_replace("limit ([0-9]+),([ 0-9]+)", "limit \\2, \\1", $query_strg);
+        $this->result = pg_exec($this->conn_id,$query_strg);
+        if (!$this->result) {
+            $this->sql_error("Query Error");
+        }
+        return $this->result;
+    }
+
+    function fetch_array($query_id) {        
+        if (!isset($this->row[$query_id])) {
+            $this->row[$query_id] = 0;
+            $this->end_row[$query_id] = $this->num_rows($query_id);
+        }
+        if ($this->end_row[$query_id] > $this->row[$query_id]) {
+            $this->record = pg_fetch_array($query_id,$this->row[$query_id],PGSQL_ASSOC);
+            $this->row[$query_id] ++;
+            return $this->record;
+        } else {
+            unset($this->row[$query_id]);
+            $this->record = false;
+            return $this->record;
+        }
+    }
+
+    function num_rows($query_id) {
+        return ($query_id) ? pg_NumRows($query_id) : 0;
+    }
+
+    function num_fields($query_id) {
+        return ($query_id) ? pg_NumFields($query_id) : 0;
+    }
+
+    function free_result($query_id) {
+        return pg_FreeResult($query_id);
+    }
+
+    function affected_rows($query_id='') {
+        if (empty($query_id)) {
+            $query_id = $this->result;
+        }
+        return pg_cmdTuples($query_id);
+    }
+
+    function close_db() {
+        if($this->conn_id) {
+            return pg_close($this->conn_id);
+        } else {
+            return false;
+        }
+    }
+   
+    function sql_error($message) {
+        $description = pg_errormessage();
+        $error ="MySQL Error : $message\n";
+        $error.="Message     : $description\n";
+        $error.="Date        : ".date("D, F j, Y H:i:s")."\n";
+        $error.="IP          : ".getenv("REMOTE_ADDR")."\n";
+        $error.="Browser     : ".getenv("HTTP_USER_AGENT")."\n";
+        $error.="Referer     : ".getenv("HTTP_REFERER")."\n";
+        $error.="PHP Version : ".PHP_VERSION."\n";
+        $error.="OS          : ".PHP_OS."\n";
+        $error.="Server      : ".getenv("SERVER_SOFTWARE")."\n";
+        $error.="Server Name : ".getenv("SERVER_NAME")."\n";
+        echo "<b><font size=4 face=Arial>$message</font></b><hr>";
+        echo "<pre>$error</pre>";
+        exit();
+    }
+
+}
+
 ?>
\ No newline at end of file

Index: class_poll.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/include/class_poll.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- class_poll.php	2 Jun 2004 13:05:52 -0000	1.1.1.1
+++ class_poll.php	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,365 +1,365 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-class poll {
-
-    var $db;
-    var $tbl;
-    var $pollvars;
-    var $poll_view_html;
-    var $poll_result_html;
-    var $options;
-    var $options_text;
-    var $poll_question;
-    var $form_forward;
-    var $template_set;
-    var $ip;
-
-    function poll() {
-        global $POLLTBL, $CLASS, $HTTP_SERVER_VARS;
-        $this->tbl = $POLLTBL;
-        $this->poll_view_html = array();
-        $this->poll_result_html = array();
-        $this->options = array();
-        $this->options_text = array();
-        $this->poll_question = array();
-        $this->form_forward = '';
-        $this->template_set = '';
-
-        if (isset($HTTP_SERVER_VARS['HTTP_X_FORWARDED_FOR']) && eregi("^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}$",$HTTP_SERVER_VARS['HTTP_X_FORWARDED_FOR'])) {
-            $this->ip = $HTTP_SERVER_VARS['HTTP_X_FORWARDED_FOR'];
-        } else {
-            $this->ip = getenv("REMOTE_ADDR");
-        }
-        $this->db = $CLASS["db"];
-        $this->pollvars = $this->db->fetch_array($this->db->query("SELECT * FROM ".$this->tbl['poll_config']));
-        $this->template_set = "default";
-        $this->form_forward = basename($HTTP_SERVER_VARS['PHP_SELF']);
-        if ($this->pollvars['result_order'] == "asc") {
-            $this->pollvars['result_order'] = "ORDER BY votes ASC";
-        } elseif ($this->pollvars['result_order'] == "desc") {
-            $this->pollvars['result_order'] = "ORDER BY votes DESC";
-        } else {
-            $this->pollvars['result_order'] = '';
-        }
-    }
-
-    function set_template_set($template_set='') {
-        if (!empty($template_set)) {
-            $this->db->fetch_array($this->db->query("SELECT * FROM ".$this->tbl['poll_tplset']." WHERE tplset_name='$template_set'"));
-            if ($this->db->record) {
-                $this->template_set = $template_set;
-            } else {
-                $this->template_set = "default";
-            }
-        } else {
-            $this->template_set = "default";
-        }
-        return $this->template_set;
-    }
-
-    function set_display_order($order='') {
-        switch ($order) {
-            case "asc":
-                $this->pollvars['result_order'] = "ORDER BY votes ASC";
-                break;
-            case "desc":
-                $this->pollvars['result_order'] = "ORDER BY votes DESC";
-                break;
-            default:
-                $this->pollvars['result_order'] = "";
-                return false;
-        }
-        return true;
-    }
-
-    function set_display_result($result='') {
-        switch ($result) {
-            case "votes":
-                $this->pollvars['type'] = "votes";
-                break;
-            case "percent":
-                $this->pollvars['type'] = "percent";
-                break;
-            default:
-                return false;
-        }
-        return true;
-    }
-
-    function set_max_bar_length($max_bar_length='') {
-        if ($max_bar_length && $max_bar_length>0) {
-            $this->pollvars['img_length'] = $max_bar_length;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function set_max_bar_height($max_bar_height='') {
-        if ($max_bar_height && $max_bar_height>0) {
-            $this->pollvars['img_height'] = $max_bar_height;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function get_poll_tpl($tpl) {
-        $this->db->fetch_array($this->db->query("SELECT x.*, y.* from ".$this->tbl['poll_tplset']." x, ".$this->tbl['poll_tpl']." y where x.tplset_name='$this->template_set' and x.tplset_id=y.tplset_id AND y.title='$tpl'"));
-        if ($this->db->record['template']) {
-            $this->db->record['template'] = ereg_replace("\"", "\\\"", $this->db->record['template']);
-            return $this->db->record['template'];
-        } else {
-            return false;
-        }
-    }
-
-    function get_poll_data($poll_id) {
-        if (!isset($this->options[$poll_id])) {
-            $this->db->query("SELECT SUM(votes) as total FROM ".$this->tbl['poll_data']." WHERE (poll_id = '$poll_id')");
-            $this->db->fetch_array($this->db->result);
-            $this->options[$poll_id]['total'] = $this->db->record['total'];
-            $this->db->query("SELECT * FROM ".$this->tbl['poll_data']." WHERE (poll_id = '$poll_id') ".$this->pollvars['result_order']);
-            while ($this->db->fetch_array($this->db->result)) {
-                $option_id_arr[] = $this->db->record['option_id'];
-                $option_text_arr[] = $this->db->record['option_text'];
-                $option_votes_arr[] = $this->db->record['votes'];
-                $option_color_arr[] = $this->db->record['color'];
-            }
-            $this->options[$poll_id]['option_id'] = $option_id_arr;
-            $this->options[$poll_id]['option_text'] = $option_text_arr;
-            $this->options[$poll_id]['votes'] = $option_votes_arr;
-            $this->options[$poll_id]['color'] = $option_color_arr;
-            for ($i=0,$maxvote=0; $i<sizeof($option_votes_arr); $i++) {
-                $maxvote = ($option_votes_arr[$i]>$maxvote) ? $option_votes_arr[$i] : $maxvote;
-            }
-            $this->options[$poll_id]['maxvote'] = $maxvote;
-        }
-        return $this->options[$poll_id];
-    }
-
-    function get_poll_option($poll_id) {
-        if (!isset($this->options_text[$poll_id])) {
-            $query = $this->db->query("SELECT option_id, option_text FROM ".$this->tbl['poll_data']." WHERE (poll_id = '$poll_id') order by option_id asc");
-            while ($data = $this->db->fetch_array($query)) {
-                $option_id_arr[] = $this->db->record['option_id'];
-                $option_text_arr[] = $this->db->record['option_text'];
-            }
-            $this->options_text[$poll_id]['option_id'] = $option_id_arr;
-            $this->options_text[$poll_id]['option_text'] = $option_text_arr;
-        }
-        return $this->options_text[$poll_id];
-    }
-
-    function get_poll_question($poll_id) {
-        if (!isset($this->poll_question[$poll_id])) {
-            $row = $this->db->fetch_array($this->db->query("SELECT question FROM ".$this->tbl['poll_index']." WHERE (poll_id = '$poll_id')"));
-            $this->poll_question[$poll_id] = htmlspecialchars($row['question']);
-        }
-        return $this->poll_question[$poll_id];
-    }
-
-    function display_poll($poll_id) {
-        if (!isset($this->poll_view_html[$poll_id]) || !isset($this->poll_view_html[$poll_id][$this->template_set])) {
-            $pollvars = $this->pollvars;
-            if (!isset($this->options_text[$poll_id])) {
-                $this->get_poll_option($poll_id);
-            }
-            $question = $this->get_poll_question($poll_id);
-            eval("\$display_html = \"".$this->get_poll_tpl("display_head")."\";");
-            $loop_html = $this->get_poll_tpl("display_loop");
-            for ($i=0;$i<sizeof($this->options_text[$poll_id]['option_id']);$i++) {
-                $data['option_text'] = $this->options_text[$poll_id]['option_text'][$i];
-                $data['option_id'] = $this->options_text[$poll_id]['option_id'][$i];
-                eval("\$display_html .= \"$loop_html\";");
-            }
-            eval("\$display_html .= \"".$this->get_poll_tpl("display_foot")."\";");
-            $this->poll_view_html[$poll_id][$this->template_set] = $display_html;
-        }
-        return $this->poll_view_html[$poll_id][$this->template_set];
-    }
-
-    function view_poll_result($poll_id,$vote_stat=0) {
-        if (!isset($this->poll_result_html[$poll_id]) || !isset($this->poll_result_html[$poll_id][$this->template_set])) {
-            $pollvars = $this->pollvars;
-            $row = $this->db->fetch_array($this->db->query("SELECT * FROM ".$this->tbl['poll_index']." WHERE (poll_id = '$poll_id')"));
-            $question = $row['question'];
-            $VOTE = ($vote_stat==1) ? $this->pollvars['voted'] : '';
-            $COMMENT = ($row['comments']==1) ? "<a href=\"javascript:void(window.open('$pollvars[base_url]/comments.php?action=send&amp;id=$poll_id&amp;template_set=$this->template_set','$poll_id','width=230,height=320,toolbar=no,statusbar=no'))\">".$this->pollvars['send_com']."</a>" : '';
-            eval("\$result_html = \"".$this->get_poll_tpl("result_head")."\";");
-            $i=0;
-            $loop_html = $this->get_poll_tpl("result_loop");
-            if (!isset($this->options[$poll_id])) {
-                $this->get_poll_data($poll_id);
-            }
-            $maxvote = ($this->options[$poll_id]['maxvote'] == 0) ? 1 : $this->options[$poll_id]['maxvote'];
-            $totalvotes = ($this->options[$poll_id]['total'] == 0) ? 1 : $this->options[$poll_id]['total'];
-            for ($i=0;$i<sizeof($this->options[$poll_id]['option_id']);$i++) {
-                $img_width = (int) ($this->options[$poll_id]['votes'][$i]*$this->pollvars['img_length']/$maxvote);
-                $vote_count = $this->options[$poll_id]['votes'][$i];
-                $vote_percent = sprintf("%.2f",($this->options[$poll_id]['votes'][$i]*100/$totalvotes));
-                $vote_val = ($this->pollvars['type'] == "percent") ? sprintf("%.1f",($this->options[$poll_id]['votes'][$i]*100/$totalvotes))."%" : $vote_count;
-                $option_text = $this->options[$poll_id]['option_text'][$i];
-                $option_votes = $this->options[$poll_id]['votes'][$i];
-                $poll_color = $this->options[$poll_id]['color'][$i];
-                eval("\$result_html .= \"$loop_html\";");
-            }
-            $total_votes = $this->options[$poll_id]['total'];
-            eval("\$result_html .= \"".$this->get_poll_tpl("result_foot")."\";");
-            $this->poll_result_html[$poll_id][$this->template_set] = $result_html;
-        }
-        return $this->poll_result_html[$poll_id][$this->template_set];
-    }
-
-    function update_poll($poll_id,$option_id) {
-        $this->db->query("UPDATE ".$this->tbl['poll_data']." SET votes=votes+1 WHERE (poll_id='$poll_id') AND (option_id='$option_id')");
-        $row = $this->db->fetch_array($this->db->query("SELECT logging as logging FROM ".$this->tbl['poll_index']." WHERE (poll_id = '$poll_id')"));
-        $timestamp = time();
-        if ($this->pollvars['check_ip'] == 2) {
-            $this->db->query("INSERT INTO ".$this->tbl['poll_ip']." (poll_id,ip_addr,timestamp) VALUES ('$poll_id','$this->ip','$timestamp')");
-        }
-        if ($row['logging'] == 1) {
-            $host = @gethostbyaddr($this->ip);
-            $agent = getenv("HTTP_USER_AGENT");
-            $this->db->query("INSERT INTO ".$this->tbl['poll_log']." (poll_id,option_id,timestamp,ip_addr,host,agent) VALUES ('$poll_id','$option_id','$timestamp','$this->ip','$host','$agent')");
-        }
-    }
-
-    function get_latest_poll_id() {
-        $this->db->query("SELECT poll_id FROM ".$this->tbl['poll_index']." WHERE (status < '2') ORDER BY TIMESTAMP DESC LIMIT 1");
-        $this->db->fetch_array($this->db->result);
-        return (!isset($this->db->record['poll_id'])) ? 0 : $this->db->record['poll_id'];
-    }
-
-    function get_random_poll_id() {
-        $timestamp = time();
-        $this->db->query("SELECT poll_id FROM ".$this->tbl['poll_index']." WHERE (status=1 AND exp_time>$timestamp) OR (status=1 AND expire=0)");
-        while ($this->db->fetch_array($this->db->result)) {
-            $poll_id_arr[] = $this->db->record['poll_id'];
-        }
-        if (!isset($poll_id_arr)) {
-            return 0;
-        }
-        $available = sizeof($poll_id_arr)-1;
-        srand((double) microtime() * 1000000);
-        $random_id = ($available>0) ? rand(0,$available) : 0;
-        return $poll_id_arr[$random_id];
-    }
-
-    function is_active_poll_id($poll_id) {
-        $this->db->fetch_array($this->db->query("SELECT * FROM ".$this->tbl['poll_index']." WHERE (poll_id='$poll_id' AND status=1)"));
-        if (!$this->db->record) {
-            return false;
-        } elseif ($this->db->record['expire']==0) {
-            return true;
-        }
-        return ($this->db->record['exp_time']<time()) ? false : true;
-    }
-
-    function is_valid_poll_id($poll_id) {
-        if ($poll_id>0) {
-            $this->db->fetch_array($this->db->query("SELECT poll_id FROM ".$this->tbl['poll_index']." WHERE poll_id=$poll_id AND status<'2'"));
-            return ($this->db->record['poll_id']) ? true : false;
-        } else {
-            return false;
-        }
-    }
-
-    function has_voted($poll_id) {
-        global $HTTP_COOKIE_VARS;
-        $pollcookie = "AdvancedPoll".$poll_id;
-        if (isset($HTTP_COOKIE_VARS[$pollcookie])) {
-            return true;
-        }
-        if ($this->pollvars['check_ip']==2) {
-            $today = time()-$this->pollvars['lock_timeout']*3600;
-            $this->db->query("DELETE FROM ".$this->tbl['poll_ip']." WHERE (timestamp < $today)");
-            $this->db->fetch_array($this->db->query("SELECT * FROM ".$this->tbl['poll_ip']." WHERE (ip_addr = '$this->ip' and poll_id='$poll_id')"));
-            return ($this->db->record) ? true : false;
-        }
-    }
-
-    function get_query_strg($self) {
-        global $HTTP_SERVER_VARS;
-        if (isset($HTTP_SERVER_VARS['QUERY_STRING']) && !empty($HTTP_SERVER_VARS['QUERY_STRING'])) {
-            if (ereg("($self=[0-9]+)",$HTTP_SERVER_VARS['QUERY_STRING'],$regs)) {
-                $HTTP_SERVER_VARS['QUERY_STRING'] = str_replace($regs[1], "", $HTTP_SERVER_VARS['QUERY_STRING']);
-            }
-            $HTTP_SERVER_VARS['QUERY_STRING'] = str_replace("$self=", "", $HTTP_SERVER_VARS['QUERY_STRING']);
-            if (empty($HTTP_SERVER_VARS['QUERY_STRING'])) {
-                $append = $HTTP_SERVER_VARS['PHP_SELF']."?";
-            } else {
-                $query_vars = explode("&",$HTTP_SERVER_VARS['QUERY_STRING']);
-                $append = $HTTP_SERVER_VARS['PHP_SELF']."?";
-                for ($i=0; $i<sizeof($query_vars); $i++) {
-                    if (!empty($query_vars[$i])) {
-                        $append .= $query_vars[$i]."&";
-                    }
-                }
-            }
-        } else {
-            $append = $HTTP_SERVER_VARS['PHP_SELF']."?";
-        }
-        return $append;
-    }
-
-    function poll_process($poll_id='') {
-        global $HTTP_GET_VARS, $HTTP_POST_VARS;
-
-        $poll_ident = (isset($HTTP_POST_VARS['poll_ident'])) ? intval($HTTP_POST_VARS['poll_ident']) : "";
-        if ($poll_ident == "") {
-        	if (isset($HTTP_GET_VARS['poll_ident'])) {
-        		$poll_ident = intval($HTTP_GET_VARS['poll_ident']);
-        	}
-        }
-
-        $option_id = (isset($HTTP_POST_VARS['option_id'])) ? intval($HTTP_POST_VARS['option_id']) : "";
-        if ($option_id == "") {
-        	if (isset($HTTP_GET_VARS['option_id'])) {
-        		$option_id = intval($HTTP_GET_VARS['option_id']);
-        	}
-        }
-
-        $action = (isset($HTTP_POST_VARS['action'])) ? trim($HTTP_POST_VARS['action']) : "";
-        if ($action == "") {
-        	if (isset($HTTP_GET_VARS['action'])) {
-        		$action = trim($HTTP_GET_VARS['action']);
-        	}
-        }
-
-        if ($poll_id=="random") {
-            $poll_id = (empty($poll_ident)) ? $this->get_random_poll_id() : $poll_ident;
-        } elseif ($poll_id=="newest") {
-            $poll_id = $this->get_latest_poll_id();
-        }
-        if ($this->is_valid_poll_id($poll_id)) {
-            $voted = $this->has_voted($poll_id);
-            $is_active = $this->is_active_poll_id($poll_id);
-            if ($action=="results" && $poll_id==$poll_ident) {
-                return $this->view_poll_result($poll_id,0);
-            } elseif (!$is_active) {
-                return $this->view_poll_result($poll_id,0);
-            } elseif ($is_active && $voted) {
-                return $this->view_poll_result($poll_id,1);
-            } elseif (!$voted && isset($option_id) && $action=="vote" && $poll_id==$poll_ident) {
-                $this->update_poll($poll_id,$option_id);
-                return $this->view_poll_result($poll_id,0);
-            } else {
-                return $this->display_poll($poll_id);
-            }
-        } else {
-            $error = "<b>Poll ID <font color=red>$poll_id</font> does not exist.</b>";
-            return $error;
-        }
-    }
-
-}
-
+<?php
+/**
+ * ----------------------------------------------
+ * Advanced Poll 2.0.3 (PHP/MySQL)
+ * Copyright (c)2001 Chi Kien Uong
+ * URL: http://www.proxy2.de
+ * ----------------------------------------------
+ */
+
+class poll {
+
+    var $db;
+    var $tbl;
+    var $pollvars;
+    var $poll_view_html;
+    var $poll_result_html;
+    var $options;
+    var $options_text;
+    var $poll_question;
+    var $form_forward;
+    var $template_set;
+    var $ip;
+
+    function poll() {
+        global $POLLTBL, $CLASS, $HTTP_SERVER_VARS;
+        $this->tbl = $POLLTBL;
+        $this->poll_view_html = array();
+        $this->poll_result_html = array();
+        $this->options = array();
+        $this->options_text = array();
+        $this->poll_question = array();
+        $this->form_forward = '';
+        $this->template_set = '';
+
+        if (isset($HTTP_SERVER_VARS['HTTP_X_FORWARDED_FOR']) && eregi("^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}$",$HTTP_SERVER_VARS['HTTP_X_FORWARDED_FOR'])) {
+            $this->ip = $HTTP_SERVER_VARS['HTTP_X_FORWARDED_FOR'];
+        } else {
+            $this->ip = getenv("REMOTE_ADDR");
+        }
+        $this->db = $CLASS["db"];
+        $this->pollvars = $this->db->fetch_array($this->db->query("SELECT * FROM ".$this->tbl['poll_config']));
+        $this->template_set = "default";
+        $this->form_forward = basename($HTTP_SERVER_VARS['PHP_SELF']);
+        if ($this->pollvars['result_order'] == "asc") {
+            $this->pollvars['result_order'] = "ORDER BY votes ASC";
+        } elseif ($this->pollvars['result_order'] == "desc") {
+            $this->pollvars['result_order'] = "ORDER BY votes DESC";
+        } else {
+            $this->pollvars['result_order'] = '';
+        }
+    }
+
+    function set_template_set($template_set='') {
+        if (!empty($template_set)) {
+            $this->db->fetch_array($this->db->query("SELECT * FROM ".$this->tbl['poll_tplset']." WHERE tplset_name='$template_set'"));
+            if ($this->db->record) {
+                $this->template_set = $template_set;
+            } else {
+                $this->template_set = "default";
+            }
+        } else {
+            $this->template_set = "default";
+        }
+        return $this->template_set;
+    }
+
+    function set_display_order($order='') {
+        switch ($order) {
+            case "asc":
+                $this->pollvars['result_order'] = "ORDER BY votes ASC";
+                break;
+            case "desc":
+                $this->pollvars['result_order'] = "ORDER BY votes DESC";
+                break;
+            default:
+                $this->pollvars['result_order'] = "";
+                return false;
+        }
+        return true;
+    }
+
+    function set_display_result($result='') {
+        switch ($result) {
+            case "votes":
+                $this->pollvars['type'] = "votes";
+                break;
+            case "percent":
+                $this->pollvars['type'] = "percent";
+                break;
+            default:
+                return false;
+        }
+        return true;
+    }
+
+    function set_max_bar_length($max_bar_length='') {
+        if ($max_bar_length && $max_bar_length>0) {
+            $this->pollvars['img_length'] = $max_bar_length;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function set_max_bar_height($max_bar_height='') {
+        if ($max_bar_height && $max_bar_height>0) {
+            $this->pollvars['img_height'] = $max_bar_height;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function get_poll_tpl($tpl) {
+        $this->db->fetch_array($this->db->query("SELECT x.*, y.* from ".$this->tbl['poll_tplset']." x, ".$this->tbl['poll_tpl']." y where x.tplset_name='$this->template_set' and x.tplset_id=y.tplset_id AND y.title='$tpl'"));
+        if ($this->db->record['template']) {
+            $this->db->record['template'] = ereg_replace("\"", "\\\"", $this->db->record['template']);
+            return $this->db->record['template'];
+        } else {
+            return false;
+        }
+    }
+
+    function get_poll_data($poll_id) {
+        if (!isset($this->options[$poll_id])) {
+            $this->db->query("SELECT SUM(votes) as total FROM ".$this->tbl['poll_data']." WHERE (poll_id = '$poll_id')");
+            $this->db->fetch_array($this->db->result);
+            $this->options[$poll_id]['total'] = $this->db->record['total'];
+            $this->db->query("SELECT * FROM ".$this->tbl['poll_data']." WHERE (poll_id = '$poll_id') ".$this->pollvars['result_order']);
+            while ($this->db->fetch_array($this->db->result)) {
+                $option_id_arr[] = $this->db->record['option_id'];
+                $option_text_arr[] = $this->db->record['option_text'];
+                $option_votes_arr[] = $this->db->record['votes'];
+                $option_color_arr[] = $this->db->record['color'];
+            }
+            $this->options[$poll_id]['option_id'] = $option_id_arr;
+            $this->options[$poll_id]['option_text'] = $option_text_arr;
+            $this->options[$poll_id]['votes'] = $option_votes_arr;
+            $this->options[$poll_id]['color'] = $option_color_arr;
+            for ($i=0,$maxvote=0; $i<sizeof($option_votes_arr); $i++) {
+                $maxvote = ($option_votes_arr[$i]>$maxvote) ? $option_votes_arr[$i] : $maxvote;
+            }
+            $this->options[$poll_id]['maxvote'] = $maxvote;
+        }
+        return $this->options[$poll_id];
+    }
+
+    function get_poll_option($poll_id) {
+        if (!isset($this->options_text[$poll_id])) {
+            $query = $this->db->query("SELECT option_id, option_text FROM ".$this->tbl['poll_data']." WHERE (poll_id = '$poll_id') order by option_id asc");
+            while ($data = $this->db->fetch_array($query)) {
+                $option_id_arr[] = $this->db->record['option_id'];
+                $option_text_arr[] = $this->db->record['option_text'];
+            }
+            $this->options_text[$poll_id]['option_id'] = $option_id_arr;
+            $this->options_text[$poll_id]['option_text'] = $option_text_arr;
+        }
+        return $this->options_text[$poll_id];
+    }
+
+    function get_poll_question($poll_id) {
+        if (!isset($this->poll_question[$poll_id])) {
+            $row = $this->db->fetch_array($this->db->query("SELECT question FROM ".$this->tbl['poll_index']." WHERE (poll_id = '$poll_id')"));
+            $this->poll_question[$poll_id] = htmlspecialchars($row['question']);
+        }
+        return $this->poll_question[$poll_id];
+    }
+
+    function display_poll($poll_id) {
+        if (!isset($this->poll_view_html[$poll_id]) || !isset($this->poll_view_html[$poll_id][$this->template_set])) {
+            $pollvars = $this->pollvars;
+            if (!isset($this->options_text[$poll_id])) {
+                $this->get_poll_option($poll_id);
+            }
+            $question = $this->get_poll_question($poll_id);
+            eval("\$display_html = \"".$this->get_poll_tpl("display_head")."\";");
+            $loop_html = $this->get_poll_tpl("display_loop");
+            for ($i=0;$i<sizeof($this->options_text[$poll_id]['option_id']);$i++) {
+                $data['option_text'] = $this->options_text[$poll_id]['option_text'][$i];
+                $data['option_id'] = $this->options_text[$poll_id]['option_id'][$i];
+                eval("\$display_html .= \"$loop_html\";");
+            }
+            eval("\$display_html .= \"".$this->get_poll_tpl("display_foot")."\";");
+            $this->poll_view_html[$poll_id][$this->template_set] = $display_html;
+        }
+        return $this->poll_view_html[$poll_id][$this->template_set];
+    }
+
+    function view_poll_result($poll_id,$vote_stat=0) {
+        if (!isset($this->poll_result_html[$poll_id]) || !isset($this->poll_result_html[$poll_id][$this->template_set])) {
+            $pollvars = $this->pollvars;
+            $row = $this->db->fetch_array($this->db->query("SELECT * FROM ".$this->tbl['poll_index']." WHERE (poll_id = '$poll_id')"));
+            $question = $row['question'];
+            $VOTE = ($vote_stat==1) ? $this->pollvars['voted'] : '';
+            $COMMENT = ($row['comments']==1) ? "<a href=\"javascript:void(window.open('$pollvars[base_url]/comments.php?action=send&amp;id=$poll_id&amp;template_set=$this->template_set','$poll_id','width=230,height=320,toolbar=no,statusbar=no'))\">".$this->pollvars['send_com']."</a>" : '';
+            eval("\$result_html = \"".$this->get_poll_tpl("result_head")."\";");
+            $i=0;
+            $loop_html = $this->get_poll_tpl("result_loop");
+            if (!isset($this->options[$poll_id])) {
+                $this->get_poll_data($poll_id);
+            }
+            $maxvote = ($this->options[$poll_id]['maxvote'] == 0) ? 1 : $this->options[$poll_id]['maxvote'];
+            $totalvotes = ($this->options[$poll_id]['total'] == 0) ? 1 : $this->options[$poll_id]['total'];
+            for ($i=0;$i<sizeof($this->options[$poll_id]['option_id']);$i++) {
+                $img_width = (int) ($this->options[$poll_id]['votes'][$i]*$this->pollvars['img_length']/$maxvote);
+                $vote_count = $this->options[$poll_id]['votes'][$i];
+                $vote_percent = sprintf("%.2f",($this->options[$poll_id]['votes'][$i]*100/$totalvotes));
+                $vote_val = ($this->pollvars['type'] == "percent") ? sprintf("%.1f",($this->options[$poll_id]['votes'][$i]*100/$totalvotes))."%" : $vote_count;
+                $option_text = $this->options[$poll_id]['option_text'][$i];
+                $option_votes = $this->options[$poll_id]['votes'][$i];
+                $poll_color = $this->options[$poll_id]['color'][$i];
+                eval("\$result_html .= \"$loop_html\";");
+            }
+            $total_votes = $this->options[$poll_id]['total'];
+            eval("\$result_html .= \"".$this->get_poll_tpl("result_foot")."\";");
+            $this->poll_result_html[$poll_id][$this->template_set] = $result_html;
+        }
+        return $this->poll_result_html[$poll_id][$this->template_set];
+    }
+
+    function update_poll($poll_id,$option_id) {
+        $this->db->query("UPDATE ".$this->tbl['poll_data']." SET votes=votes+1 WHERE (poll_id='$poll_id') AND (option_id='$option_id')");
+        $row = $this->db->fetch_array($this->db->query("SELECT logging as logging FROM ".$this->tbl['poll_index']." WHERE (poll_id = '$poll_id')"));
+        $timestamp = time();
+        if ($this->pollvars['check_ip'] == 2) {
+            $this->db->query("INSERT INTO ".$this->tbl['poll_ip']." (poll_id,ip_addr,timestamp) VALUES ('$poll_id','$this->ip','$timestamp')");
+        }
+        if ($row['logging'] == 1) {
+            $host = @gethostbyaddr($this->ip);
+            $agent = getenv("HTTP_USER_AGENT");
+            $this->db->query("INSERT INTO ".$this->tbl['poll_log']." (poll_id,option_id,timestamp,ip_addr,host,agent) VALUES ('$poll_id','$option_id','$timestamp','$this->ip','$host','$agent')");
+        }
+    }
+
+    function get_latest_poll_id() {
+        $this->db->query("SELECT poll_id FROM ".$this->tbl['poll_index']." WHERE (status < '2') ORDER BY TIMESTAMP DESC LIMIT 1");
+        $this->db->fetch_array($this->db->result);
+        return (!isset($this->db->record['poll_id'])) ? 0 : $this->db->record['poll_id'];
+    }
+
+    function get_random_poll_id() {
+        $timestamp = time();
+        $this->db->query("SELECT poll_id FROM ".$this->tbl['poll_index']." WHERE (status=1 AND exp_time>$timestamp) OR (status=1 AND expire=0)");
+        while ($this->db->fetch_array($this->db->result)) {
+            $poll_id_arr[] = $this->db->record['poll_id'];
+        }
+        if (!isset($poll_id_arr)) {
+            return 0;
+        }
+        $available = sizeof($poll_id_arr)-1;
+        srand((double) microtime() * 1000000);
+        $random_id = ($available>0) ? rand(0,$available) : 0;
+        return $poll_id_arr[$random_id];
+    }
+
+    function is_active_poll_id($poll_id) {
+        $this->db->fetch_array($this->db->query("SELECT * FROM ".$this->tbl['poll_index']." WHERE (poll_id='$poll_id' AND status=1)"));
+        if (!$this->db->record) {
+            return false;
+        } elseif ($this->db->record['expire']==0) {
+            return true;
+        }
+        return ($this->db->record['exp_time']<time()) ? false : true;
+    }
+
+    function is_valid_poll_id($poll_id) {
+        if ($poll_id>0) {
+            $this->db->fetch_array($this->db->query("SELECT poll_id FROM ".$this->tbl['poll_index']." WHERE poll_id=$poll_id AND status<'2'"));
+            return ($this->db->record['poll_id']) ? true : false;
+        } else {
+            return false;
+        }
+    }
+
+    function has_voted($poll_id) {
+        global $HTTP_COOKIE_VARS;
+        $pollcookie = "AdvancedPoll".$poll_id;
+        if (isset($HTTP_COOKIE_VARS[$pollcookie])) {
+            return true;
+        }
+        if ($this->pollvars['check_ip']==2) {
+            $today = time()-$this->pollvars['lock_timeout']*3600;
+            $this->db->query("DELETE FROM ".$this->tbl['poll_ip']." WHERE (timestamp < $today)");
+            $this->db->fetch_array($this->db->query("SELECT * FROM ".$this->tbl['poll_ip']." WHERE (ip_addr = '$this->ip' and poll_id='$poll_id')"));
+            return ($this->db->record) ? true : false;
+        }
+    }
+
+    function get_query_strg($self) {
+        global $HTTP_SERVER_VARS;
+        if (isset($HTTP_SERVER_VARS['QUERY_STRING']) && !empty($HTTP_SERVER_VARS['QUERY_STRING'])) {
+            if (ereg("($self=[0-9]+)",$HTTP_SERVER_VARS['QUERY_STRING'],$regs)) {
+                $HTTP_SERVER_VARS['QUERY_STRING'] = str_replace($regs[1], "", $HTTP_SERVER_VARS['QUERY_STRING']);
+            }
+            $HTTP_SERVER_VARS['QUERY_STRING'] = str_replace("$self=", "", $HTTP_SERVER_VARS['QUERY_STRING']);
+            if (empty($HTTP_SERVER_VARS['QUERY_STRING'])) {
+                $append = $HTTP_SERVER_VARS['PHP_SELF']."?";
+            } else {
+                $query_vars = explode("&",$HTTP_SERVER_VARS['QUERY_STRING']);
+                $append = $HTTP_SERVER_VARS['PHP_SELF']."?";
+                for ($i=0; $i<sizeof($query_vars); $i++) {
+                    if (!empty($query_vars[$i])) {
+                        $append .= $query_vars[$i]."&";
+                    }
+                }
+            }
+        } else {
+            $append = $HTTP_SERVER_VARS['PHP_SELF']."?";
+        }
+        return $append;
+    }
+
+    function poll_process($poll_id='') {
+        global $HTTP_GET_VARS, $HTTP_POST_VARS;
+
+        $poll_ident = (isset($HTTP_POST_VARS['poll_ident'])) ? intval($HTTP_POST_VARS['poll_ident']) : "";
+        if ($poll_ident == "") {
+        	if (isset($HTTP_GET_VARS['poll_ident'])) {
+        		$poll_ident = intval($HTTP_GET_VARS['poll_ident']);
+        	}
+        }
+
+        $option_id = (isset($HTTP_POST_VARS['option_id'])) ? intval($HTTP_POST_VARS['option_id']) : "";
+        if ($option_id == "") {
+        	if (isset($HTTP_GET_VARS['option_id'])) {
+        		$option_id = intval($HTTP_GET_VARS['option_id']);
+        	}
+        }
+
+        $action = (isset($HTTP_POST_VARS['action'])) ? trim($HTTP_POST_VARS['action']) : "";
+        if ($action == "") {
+        	if (isset($HTTP_GET_VARS['action'])) {
+        		$action = trim($HTTP_GET_VARS['action']);
+        	}
+        }
+
+        if ($poll_id=="random") {
+            $poll_id = (empty($poll_ident)) ? $this->get_random_poll_id() : $poll_ident;
+        } elseif ($poll_id=="newest") {
+            $poll_id = $this->get_latest_poll_id();
+        }
+        if ($this->is_valid_poll_id($poll_id)) {
+            $voted = $this->has_voted($poll_id);
+            $is_active = $this->is_active_poll_id($poll_id);
+            if ($action=="results" && $poll_id==$poll_ident) {
+                return $this->view_poll_result($poll_id,0);
+            } elseif (!$is_active) {
+                return $this->view_poll_result($poll_id,0);
+            } elseif ($is_active && $voted) {
+                return $this->view_poll_result($poll_id,1);
+            } elseif (!$voted && isset($option_id) && $action=="vote" && $poll_id==$poll_ident) {
+                $this->update_poll($poll_id,$option_id);
+                return $this->view_poll_result($poll_id,0);
+            } else {
+                return $this->display_poll($poll_id);
+            }
+        } else {
+            $error = "<b>Poll ID <font color=red>$poll_id</font> does not exist.</b>";
+            return $error;
+        }
+    }
+
+}
+
 ?>
\ No newline at end of file

Index: class_session.php
===================================================================
RCS file: /cvsroot/devil-linux/web/poll/include/class_session.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- class_session.php	2 Jun 2004 13:05:52 -0000	1.1.1.1
+++ class_session.php	18 Sep 2004 16:00:41 -0000	1.2
@@ -1,84 +1,84 @@
-<?php
-/**
- * ----------------------------------------------
- * Advanced Poll 2.0.3 (PHP/MySQL)
- * Copyright (c)2001 Chi Kien Uong
- * URL: http://www.proxy2.de
- * ----------------------------------------------
- */
-
-class poll_session {
-
-    var $expire;
-    var $table;
-    var $db;
-
-    function poll_session() {
-        global $POLLTBL;
-        $this->table = $POLLTBL;
-        $this->expire = 7200;
-    }
-
-    function set_session_time($expire_time='') {
-        if ($expire_time>0) {
-            $this->expire = $expire_time;
-        }
-    }
-
-    function is_valid_session($session,$user_id) {
-        $this->db->query("SELECT session, last_visit from ".$this->table['poll_user']." WHERE session='$session' and user_id='$user_id'");
-       ...
 
[truncated message content]

[Devil-linux-commit] web/poll/NewFolder1/templates/simple comment.html,1.1.1.1,NONE display_foot.html,1.1.1.1,NONE display_head.html,1.1.1.1,NONE display_loop.html,1.1.1.1,NONE result_foot.html,1.1.1.1,NONE result_head.html,1.1.1.1,NONE result_loop.html,1.1.1.1,NONE

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll/NewFolder1/templates/simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll/NewFolder1/templates/simple

Removed Files:
	comment.html display_foot.html display_head.html 
	display_loop.html result_foot.html result_head.html 
	result_loop.html 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


--- comment.html DELETED ---

--- display_head.html DELETED ---

--- display_loop.html DELETED ---

--- display_foot.html DELETED ---

--- result_head.html DELETED ---

--- result_foot.html DELETED ---

--- result_loop.html DELETED ---

[Devil-linux-commit] web/poll/NewFolder1/templates/popup comment.html,1.1.1.1,NONE display_foot.html,1.1.1.1,NONE display_head.html,1.1.1.1,NONE display_loop.html,1.1.1.1,NONE result_foot.html,1.1.1.1,NONE result_head.html,1.1.1.1,NONE result_loop.html,1.1.1.1,NONE

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll/NewFolder1/templates/popup
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll/NewFolder1/templates/popup

Removed Files:
	comment.html display_foot.html display_head.html 
	display_loop.html result_foot.html result_head.html 
	result_loop.html 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


--- comment.html DELETED ---

--- display_head.html DELETED ---

--- display_loop.html DELETED ---

--- display_foot.html DELETED ---

--- result_head.html DELETED ---

--- result_foot.html DELETED ---

--- result_loop.html DELETED ---

[Devil-linux-commit] web/poll/NewFolder1/templates/plain comment.html,1.1.1.1,NONE display_foot.html,1.1.1.1,NONE display_head.html,1.1.1.1,NONE display_loop.html,1.1.1.1,NONE result_foot.html,1.1.1.1,NONE result_head.html,1.1.1.1,NONE result_loop.html,1.1.1.1,NONE

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll/NewFolder1/templates/plain
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll/NewFolder1/templates/plain

Removed Files:
	comment.html display_foot.html display_head.html 
	display_loop.html result_foot.html result_head.html 
	result_loop.html 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


--- comment.html DELETED ---

--- display_head.html DELETED ---

--- display_loop.html DELETED ---

--- display_foot.html DELETED ---

--- result_head.html DELETED ---

--- result_foot.html DELETED ---

--- result_loop.html DELETED ---

[Devil-linux-commit] web/poll/NewFolder1/templates/homepage comment.html,1.1.1.1,NONE display_foot.html,1.1.1.1,NONE display_head.html,1.1.1.1,NONE display_loop.html,1.1.1.1,NONE result_foot.html,1.1.1.1,NONE result_head.html,1.1.1.1,NONE result_loop.html,1.1.1.1,NONE

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll/NewFolder1/templates/homepage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll/NewFolder1/templates/homepage

Removed Files:
	comment.html display_foot.html display_head.html 
	display_loop.html result_foot.html result_head.html 
	result_loop.html 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


--- comment.html DELETED ---

--- display_head.html DELETED ---

--- display_loop.html DELETED ---

--- display_foot.html DELETED ---

--- result_head.html DELETED ---

--- result_foot.html DELETED ---

--- result_loop.html DELETED ---

[Devil-linux-commit] web/poll/NewFolder1/templates/graphic comment.html,1.1.1.1,NONE display_foot.html,1.1.1.1,NONE display_head.html,1.1.1.1,NONE display_loop.html,1.1.1.1,NONE result_foot.html,1.1.1.1,NONE result_head.html,1.1.1.1,NONE result_loop.html,1.1.1.1,NONE

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll/NewFolder1/templates/graphic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll/NewFolder1/templates/graphic

Removed Files:
	comment.html display_foot.html display_head.html 
	display_loop.html result_foot.html result_head.html 
	result_loop.html 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


--- comment.html DELETED ---

--- display_head.html DELETED ---

--- display_loop.html DELETED ---

--- display_foot.html DELETED ---

--- result_head.html DELETED ---

--- result_foot.html DELETED ---

--- result_loop.html DELETED ---

[Devil-linux-commit] web/poll/NewFolder1/templates/default comment.html,1.1.1.1,NONE display_foot.html,1.1.1.1,NONE display_head.html,1.1.1.1,NONE display_loop.html,1.1.1.1,NONE result_foot.html,1.1.1.1,NONE result_head.html,1.1.1.1,NONE result_loop.html,1.1.1.1,NONE

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/web/poll/NewFolder1/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20723/poll/NewFolder1/templates/default

Removed Files:
	comment.html display_foot.html display_head.html 
	display_loop.html result_foot.html result_head.html 
	result_loop.html 
Log Message:
updated advanced poll to v2.03
didn't go through the dos2unix hassle this time, it seems to work just fine


--- comment.html DELETED ---

--- display_head.html DELETED ---

--- display_loop.html DELETED ---

--- display_foot.html DELETED ---

--- result_head.html DELETED ---

--- result_foot.html DELETED ---

--- result_loop.html DELETED ---