diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/lcdproc-dev/lcdproc.inc | 22 | ||||
-rw-r--r-- | config/lcdproc-dev/lcdproc.xml | 90 | ||||
-rw-r--r-- | config/squid3/33/check_ip.php | 85 |
3 files changed, 191 insertions, 6 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index 1436c07d..8b3ce28f 100644 --- a/config/lcdproc-dev/lcdproc.inc +++ b/config/lcdproc-dev/lcdproc.inc @@ -81,6 +81,7 @@ case "lpt1": case "ugen0.2": case "ugen1.2": + case "ugen1.3"; case "ugen2.2": continue; break; @@ -177,6 +178,9 @@ case "ugen1.2": $realport = "/dev/ugen1.2"; break; + case "ugen1.3": + $realport = "/dev/ugen1.3"; + break; case "ugen2.2": $realport = "/dev/ugen2.2"; break; @@ -303,9 +307,11 @@ case "hd44780": $config_text .= "[{$lcdproc_config['driver']}]\n"; $config_text .= "driverpath=/usr/local/lib/lcdproc/\n"; - $config_text .= "ConnectionType=lcd2usb\n"; + $config_text .= "ConnectionType={$lcdproc_config['connection_type']}\n"; + $config_text .= "Device={$realport}\n"; + $config_text .= "Port=0x378\n"; $config_text .= "Speed=0\n"; - $config_text .= "Keypad=no\n"; + $config_text .= "Keypad=yes\n"; $config_text .= set_lcd_value("contrast", 1000, 850); $config_text .= set_lcd_value("brightness", 1000, 800); $config_text .= set_lcd_value("offbrightness", 1000, 0); @@ -315,6 +321,16 @@ $config_text .= "DelayMult=1\n"; $config_text .= "DelayBus=true\n"; $config_text .= "Size={$lcdproc_config['size']}\n"; + if ($lcdproc_config[connection_type] == "winamp") + { + $config_text .= "KeyDirect_1=Enter\n"; + $config_text .= "KeyDirect_2=Up\n"; + $config_text .= "KeyDirect_3=Down\n"; + $config_text .= "KeyDirect_4=Escape\n"; + } + else + { + } break; case "icp_a106": $config_text .= "[{$lcdproc_config['driver']}]\n"; @@ -531,4 +547,4 @@ EOD; } return $returnvalue; } -?>
\ No newline at end of file +?> diff --git a/config/lcdproc-dev/lcdproc.xml b/config/lcdproc-dev/lcdproc.xml index 3db83ccd..e2476467 100644 --- a/config/lcdproc-dev/lcdproc.xml +++ b/config/lcdproc-dev/lcdproc.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" ?> <packagegui> - <title>Services: LCDproc 0.5.5 pkg v. 0.9.4</title> + <title>Services: LCDproc 0.5.6 pkg v. 0.9.7</title> <name>lcdproc</name> - <version>0.5.5 pkg v. 0.9.4</version> + <version>0.5.6 pkg v. 0.9.7</version> <savetext>Save</savetext> <include_file>/usr/local/pkg/lcdproc.inc</include_file> <tabs> @@ -100,9 +100,12 @@ <value>ugen1.2</value> <name>USB Com port 2 alternate (/dev/ugen1.2)</name> </option> + <value>ugen1.3</value> + <name>USB Com port 3 alternate (/dev/ugen1.3)</name> + </option> <option> <value>ugen2.2</value> - <name>USB Com port 3 alternate (/dev/ugen2.2)</name> + <name>USB Com port 4 alternate (/dev/ugen2.2)</name> </option> </options> <default_value>ucom1</default_value> @@ -302,6 +305,87 @@ <default_value>pyramid</default_value> </field> <field> + <fieldname>connection_type</fieldname> + <fielddescr>Connection Type</fielddescr> + <description>Set connection type for the HD44780 driver</description> + <type>select</type> + <options> + <option> + <value>4bit</value> + <name>4bit wiring to parallel port</name> + </option> + <option> + <value>8bit</value> + <name>8bit wiring to parallel port(lcdtime)</name> + </option> + <option> + <value>winamp</value> + <name>8bit wiring winamp style to parallel port</name> + </option> + <option> + <value>serialLpt</value> + <name>Serial LPT wiring</name> + </option> + <option> + <value>picanlcd</value> + <name>PIC-an-LCD serial device</name> + </option> + <option> + <value>lcdserializer</value> + <name>LCD serializer</name> + </option> + <option> + <value>los-panel</value> + <name>LCD on serial panel device</name> + </option> + <option> + <value>vdr-lcd</value> + <name>VDR LCD serial device</name> + </option> + <option> + <value>vdr-wakeup</value> + <name>VDR-Wakeup module</name> + </option> + <option> + <value>pertelian</value> + <name>Pertelian X2040 LCD</name> + </option> + <option> + <value>bwctusb</value> + <name>BWCT USB device</name> + </option> + <option> + <value>lcd2usb</value> + <name>Till Harbaum's LCD2USB</name> + </option> + <option> + <value>usbtiny</value> + <name>Dick Streefland's USBtiny</name> + </option> + <option> + <value>lis2</value> + <name>LIS2 from VLSystem</name> + </option> + <option> + <value>mplay</value> + <name>MPlay Blast from VLSystem</name> + </option> + <option> + <value>ftdi</value> + <name>LCD connected to FTDI 2232D USB chip</name> + </option> + <option> + <value>usblcd</value> + <name>USBLCD adapter from Adams IT Services</name> + </option> + <option> + <value>i2c</value> + <name>LCD driven by PCF8574/PCA9554 connected via i2c</name> + </option> + </options> + <default_value>lcd2usb</default_value> + </field> + <field> <fieldname>refresh_frequency</fieldname> <fielddescr>Refresh frequency</fielddescr> <description>Set the refresh frequency of the information on the LCD Panel</description> diff --git a/config/squid3/33/check_ip.php b/config/squid3/33/check_ip.php new file mode 100644 index 00000000..b8f64256 --- /dev/null +++ b/config/squid3/33/check_ip.php @@ -0,0 +1,85 @@ +#!/usr/local/bin/php -q +<?php +/* $Id$ */ +/* + check_ip.php + Copyright (C) 2013 Marcello Coutinho + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ + +// stdin loop +if (! defined(STDIN)) { + define("STDIN", fopen("php://stdin", "r")); +} +if (! defined(STDOUT)){ + define("STDOUT", fopen('php://stdout', 'w')); + } +while( !feof(STDIN)){ + $line = trim(fgets(STDIN)); + // %SRC + +$pf_version=substr(trim(file_get_contents("/etc/version")),0,3); +unset($cp_db); +if ($pf_version > 2.0){ + $dir="/var/db"; + $files=scandir($dir); + foreach ($files as $file){ + if (preg_match("/captive.*db/",$file)){ + $dbhandle = sqlite_open("$dir/$file", 0666, $error); + if ($dbhandle){ + $query = "select * from captiveportal"; + $result = sqlite_query($dbhandle, $query); + if ($result){ + $row = sqlite_fetch_array($result, SQLITE_ASSOC); + $cp_db[]=implode(",",$row); + sqlite_close($dbhandle); + } + } + } + } + } +else{ + $filename="/var/db/captiveportal.db"; + if (file_exists($filename)) + $cp_db=file($filename); +} + + $usuario=""; + // 1376630450,2,172.16.3.65,00:50:56:9c:00:c7,admin,e1779ea20d0a11c7,,,, + if (is_array($cp_db)){ + foreach ($cp_db as $cpl){ + $fields=explode(",",$cpl); + if ($fields[2] != "" && $fields[2]==$line) + $usuario=$fields[4]; + } + } + if ($usuario !="") + $resposta="OK user={$usuario}"; + else + $resposta="ERR"; + fwrite (STDOUT, "{$resposta}\n"); + unset($cp_db); +} +?> + |