{$layout.pagetitle}

- +

@@ -15,14 +15,16 @@

{t}Enter IP address:{/t}

- +
+ icmp + arp

+ From cvs w lms.org.pl Fri Dec 30 09:08:26 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 09:08:26 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib/upgradedb (postgres.2011091100.php) Message-ID: <20111230080826.2E55B30281A1@eftep.altec.pl> Date: Friday, December 30, 2011 @ 09:08:26 Author: alec Path: /cvsroot/lms/lib/upgradedb Modified: postgres.2011091100.php - Use the ssame default value for voipaccounts.access column in both databases Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/upgradedb/postgres.2011091100.php.diff?&r1=1.1&r2=1.2 Index: lms/lib/upgradedb/postgres.2011091100.php diff -u lms/lib/upgradedb/postgres.2011091100.php:1.1 lms/lib/upgradedb/postgres.2011091100.php:1.2 --- lms/lib/upgradedb/postgres.2011091100.php:1.1 Thu Sep 15 18:26:11 2011 +++ lms/lib/upgradedb/postgres.2011091100.php Fri Dec 30 09:08:25 2011 @@ -21,16 +21,16 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: postgres.2011091100.php,v 1.1 2011/09/15 16:26:11 maniac Exp $ + * $Id: postgres.2011091100.php,v 1.2 2011/12/30 08:08:25 alec Exp $ */ $DB->BeginTrans(); $DB->Execute(" ALTER TABLE voipaccounts ADD COLUMN access smallint; - UPDATE voipaccounts SET access = 0; + UPDATE voipaccounts SET access = 1; ALTER TABLE voipaccounts ALTER access SET NOT NULL; - ALTER TABLE voipaccounts ALTER access SET DEFAULT 0; + ALTER TABLE voipaccounts ALTER access SET DEFAULT 1; "); $DB->Execute("UPDATE dbinfo SET keyvalue = ? WHERE keytype = ?",array('2011091100', 'dbversion')); From cvs w lms.org.pl Fri Dec 30 10:09:40 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 10:09:40 +0100 (CET) Subject: [lms-commits] CVS update of lms/modules (3 files) Message-ID: <20111230090940.5AF5930281A1@eftep.altec.pl> Date: Friday, December 30, 2011 @ 10:09:40 Author: alec Path: /cvsroot/lms/modules Modified: rtqueueview.php rtticketadd.php welcome.php - Some improvements Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/modules/rtqueueview.php.diff?&r1=1.52&r2=1.53 http://cvs.lms.org.pl/viewvc/Development/lms/modules/rtticketadd.php.diff?&r1=1.60&r2=1.61 http://cvs.lms.org.pl/viewvc/Development/lms/modules/welcome.php.diff?&r1=1.61&r2=1.62 Index: lms/modules/rtqueueview.php diff -u lms/modules/rtqueueview.php:1.52 lms/modules/rtqueueview.php:1.53 --- lms/modules/rtqueueview.php:1.52 Fri Sep 16 22:48:17 2011 +++ lms/modules/rtqueueview.php Fri Dec 30 10:09:40 2011 @@ -21,20 +21,21 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: rtqueueview.php,v 1.52 2011/09/16 20:48:17 chilek Exp $ + * $Id: rtqueueview.php,v 1.53 2011/12/30 09:09:40 alec Exp $ */ if(isset($_GET['id'])) - $queuedata['id'] = ($_GET['id'] == '' ? 0 : $_GET['id']); + $queuedata['id'] = intval($_GET['id']); + if(isset($_GET['catid'])) - $queuedata['catid'] = ($_GET['catid'] == '' ? 0 : $_GET['catid']); + $queuedata['catid'] = intval($_GET['catid']); if(! $LMS->QueueExists($queuedata['id']) && $queuedata['id'] != 0) { $SESSION->redirect('?m=rtqueuelist'); } -if($queuedata['id'] != 0) +if($queuedata['id']) { $right = $LMS->GetUserRightsRT($AUTH->id, $queuedata['id']); @@ -59,7 +60,7 @@ $queuedata['id'] = $queues; } -if($queuedata['catid'] != 0) +if($queuedata['catid']) { $catrights = $LMS->GetUserRightsToCategory($AUTH->id, $queuedata['catid']); @@ -73,14 +74,15 @@ else { $categories = $DB->GetCol('SELECT categoryid FROM rtcategoryusers WHERE userid=?', array($AUTH->id)); + $all_cat = $DB->GetOne('SELECT COUNT(*) FROM rtcategories'); - if (!$categories) { + if (!$categories && $all_cat) { $SMARTY->display('noaccess.html'); $SESSION->close(); die; } - if(sizeof($categories) != $DB->GetOne('SELECT COUNT(*) FROM rtcategories')) + if(sizeof($categories) != $all_cat) $queuedata['catid'] = $categories; } Index: lms/modules/rtticketadd.php diff -u lms/modules/rtticketadd.php:1.60 lms/modules/rtticketadd.php:1.61 --- lms/modules/rtticketadd.php:1.60 Fri Dec 9 11:47:24 2011 +++ lms/modules/rtticketadd.php Fri Dec 30 10:09:40 2011 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: rtticketadd.php,v 1.60 2011/12/09 10:47:24 chilek Exp $ + * $Id: rtticketadd.php,v 1.61 2011/12/30 09:09:40 alec Exp $ */ $queue = isset($_GET['id']) ? intval($_GET['id']) : 0; @@ -171,11 +171,17 @@ $categories = $LMS->GetCategoryListByUser($AUTH->id); +if (!$categories) { + $SMARTY->display('noaccess.html'); + $SESSION->close(); + die; +} + // handle category id got from welcome module so this category will be selected if (isset($_GET['catid']) && intval($_GET['catid'])) $ticket['categories'][intval($_GET['catid'])] = true; -foreach ($categories as $category) +if ($categories) foreach ($categories as $category) { $category['checked'] = isset($ticket['categories'][$category['id']]) || count($categories) == 1; $ncategories[] = $category; Index: lms/modules/welcome.php diff -u lms/modules/welcome.php:1.61 lms/modules/welcome.php:1.62 --- lms/modules/welcome.php:1.61 Fri Sep 9 20:16:52 2011 +++ lms/modules/welcome.php Fri Dec 30 10:09:40 2011 @@ -21,40 +21,43 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: welcome.php,v 1.61 2011/09/09 18:16:52 chilek Exp $ + * $Id: welcome.php,v 1.62 2011/12/30 09:09:40 alec Exp $ */ -require_once(LIB_DIR.'/Sysinfo.class.php'); @include(LIB_DIR.'/locale/'.$_language.'/fortunes.php'); -$SI = new Sysinfo; - $layout['pagetitle'] = 'LAN Management System'; $layout['dbversion'] = $DB->GetDBVersion(); $layout['dbtype'] = $CONFIG['database']['type']; -$content = $LMS->CheckUpdates(); +if ($adminuser) { + $content = $LMS->CheckUpdates(); + + if(isset($content['newer_version'])) { + list($v, ) = preg_split('/\s+/', $LMS->_version); -if(isset($content['newer_version'])) -{ - list($v, ) = preg_split('/\s+/', $LMS->_version); + if(version_compare($content['newer_version'], $v) > 0) + $SMARTY->assign('newer_version', $content['newer_version']); + } - if(version_compare($content['newer_version'], $v)>0) - $SMARTY->assign('newer_version', $content['newer_version']); + $SMARTY->assign('regdata', $LMS->GetRegisterData()); } $SMARTY->assign('_dochref', is_dir('doc/html/'.$LMS->ui_lang) ? 'doc/html/'.$LMS->ui_lang.'/' : 'doc/html/en/'); -if ($adminuser) - $SMARTY->assign('regdata', $LMS->GetRegisterData()); $SMARTY->assign('rtstats', $LMS->RTStats()); -if (!$CONFIG['phpui']['hide_sysinfo']) - $SMARTY->assign('sysinfo',$SI->get_sysinfo()); -if (!$CONFIG['phpui']['hide_summaries']) -{ - $SMARTY->assign('customerstats',$LMS->CustomerStats()); - $SMARTY->assign('nodestats',$LMS->NodeStats()); + +if (!$CONFIG['phpui']['hide_sysinfo']) { + require_once LIB_DIR.'/Sysinfo.class.php'; + $SI = new Sysinfo; + $SMARTY->assign('sysinfo', $SI->get_sysinfo()); +} + +if (!$CONFIG['phpui']['hide_summaries']) { + $SMARTY->assign('customerstats', $LMS->CustomerStats()); + $SMARTY->assign('nodestats', $LMS->NodeStats()); } + $SMARTY->display('welcome.html'); ?> From cvs w lms.org.pl Fri Dec 30 11:48:21 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 11:48:21 +0100 (CET) Subject: [lms-commits] CVS update of lms/templates (messageadd.html) Message-ID: <20111230104821.6449630281A1@eftep.altec.pl> Date: Friday, December 30, 2011 @ 11:48:21 Author: alec Path: /cvsroot/lms/templates Modified: messageadd.html - Hide users selector if there are no users with phone number Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/templates/messageadd.html.diff?&r1=1.10&r2=1.11 Index: lms/templates/messageadd.html diff -u lms/templates/messageadd.html:1.10 lms/templates/messageadd.html:1.11 --- lms/templates/messageadd.html:1.10 Sat Nov 26 14:30:40 2011 +++ lms/templates/messageadd.html Fri Dec 30 11:48:21 2011 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

@@ -18,22 +18,24 @@ function typesel(elem) { + alert(elem); if(elem == 'typesms' || elem == 'typeanysms') { document.getElementById('mailbody').style.display = 'none'; document.getElementById('mailfrom').style.display = 'none'; document.getElementById('mailsender').style.display = 'none'; document.getElementById('attachment').style.display = 'none'; {if !$message.customerid} + var users = document.getElementById('users'); if (elem == 'typeanysms') { - document.getElementById('phonenumber').style.display = 'table-row'; - document.getElementById('users').style.display = 'table-row'; + document.getElementById('phonenumber').style.display = ''; + if (users) users.style.display = ''; } else { document.getElementById('phonenumber').style.display = 'none'; - document.getElementById('users').style.display = 'none'; + if (users) users.style.display = 'none'; } {/if} - document.getElementById('smsbody').style.display = 'table-row'; - document.getElementById('charscount').style.display = 'table-row'; + document.getElementById('smsbody').style.display = ''; + document.getElementById('charscount').style.display = ''; } else { document.getElementById('mailbody').style.display = ''; document.getElementById('mailfrom').style.display = ''; @@ -169,6 +171,7 @@ {if !$message.customerid} + {if $users}

- {$nodeinfo.ip} + {$nodeinfo.ip} +

From cvs w lms.org.pl Fri Dec 30 14:24:59 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 14:24:59 +0100 (CET) Subject: [lms-commits] CVS update of lms/templates (dberrors.html) Message-ID: <20111230132459.322AD30281A6@eftep.altec.pl> Date: Friday, December 30, 2011 @ 14:24:59 Author: alec Path: /cvsroot/lms/templates Modified: dberrors.html - Add sql queries execution time debuging, some improvements Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/templates/dberrors.html.diff?&r1=1.1&r2=1.2 Index: lms/templates/dberrors.html diff -u lms/templates/dberrors.html:1.1 lms/templates/dberrors.html:1.2 --- lms/templates/dberrors.html:1.1 Wed Jun 8 08:23:37 2005 +++ lms/templates/dberrors.html Fri Dec 30 14:24:59 2011 @@ -1,4 +1,4 @@ - +

@@ -8,8 +8,12 @@ From cvs w lms.org.pl Fri Dec 30 14:24:58 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 14:24:58 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib/Smarty/plugins (function.gentime.php) Message-ID: <20111230132458.DE05A30281A4@eftep.altec.pl> Date: Friday, December 30, 2011 @ 14:24:58 Author: alec Path: /cvsroot/lms/lib/Smarty/plugins Modified: function.gentime.php - Add sql queries execution time debuging, some improvements Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/Smarty/plugins/function.gentime.php.diff?&r1=1.8&r2=1.9 Index: lms/lib/Smarty/plugins/function.gentime.php diff -u lms/lib/Smarty/plugins/function.gentime.php:1.8 lms/lib/Smarty/plugins/function.gentime.php:1.9 --- lms/lib/Smarty/plugins/function.gentime.php:1.8 Fri Oct 14 18:08:56 2011 +++ lms/lib/Smarty/plugins/function.gentime.php Fri Dec 30 14:24:58 2011 @@ -21,16 +21,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: function.gentime.php,v 1.8 2011/10/14 16:08:56 chilek Exp $ + * $Id: function.gentime.php,v 1.9 2011/12/30 13:24:58 alec Exp $ */ function smarty_function_gentime($params, $template) { - $time = microtime(); - return sprintf('%.4f',((substr($time,0,9)) - + (substr($time,-10)) - - (substr(START_TIME,0,9)) - - (substr(START_TIME,-10)))); + return sprintf('%.4f', microtime(true) - START_TIME); } ?> From cvs w lms.org.pl Fri Dec 30 14:24:59 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 14:24:59 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib/locale/pl (strings.php) Message-ID: <20111230132459.11C6F30281A5@eftep.altec.pl> Date: Friday, December 30, 2011 @ 14:24:59 Author: alec Path: /cvsroot/lms/lib/locale/pl Modified: strings.php - Add sql queries execution time debuging, some improvements Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/locale/pl/strings.php.diff?&r1=1.409&r2=1.410 Index: lms/lib/locale/pl/strings.php diff -u lms/lib/locale/pl/strings.php:1.409 lms/lib/locale/pl/strings.php:1.410 --- lms/lib/locale/pl/strings.php:1.409 Sun Dec 18 14:31:55 2011 +++ lms/lib/locale/pl/strings.php Fri Dec 30 14:24:58 2011 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: strings.php,v 1.409 2011/12/18 13:31:55 chilek Exp $ + * $Id: strings.php,v 1.410 2011/12/30 13:24:58 alec Exp $ */ $_LANG['$a ($b addresses)'] = '$a ($b adresów)'; @@ -253,7 +253,7 @@ $_LANG['Connection limit:'] = 'Limit połączeń:'; $_LANG['Content:'] = 'Treść:'; $_LANG['Customer notice content'] = 'Treść powiadomienia dla klienta'; -$_LANG['Content-type for document. If you enter "application/octet-stream", browser will send file to save on disk, instead of displaying it. It\'s useful if you use your own template which generate e.g. rtf or xls file. Default: "text/html".'] = 'Content-type dokumentu. Jeżeli wpiszecie tutaj \"application/octet-stream\", to przeglądarka zechce wam wysłać plik do zapisania na dysku, zamiast go wyświetlić. Przydatne jeżeli użyjecie własnego template\'a który wygeneruje np. rtf\'a czy xls\'a. Domyślnie: "text/html"'; +$_LANG['Content-type for document. If you enter "application/octet-stream", browser will send file to save on disk, instead of displaying it. It\'s useful if you use your own template which generate e.g. rtf or xls file. Default: "text/html".'] = 'Content-type dokumentu. Jeżeli wpiszecie tutaj "application/octet-stream", to przeglądarka zechce wam wysłać plik do zapisania na dysku, zamiast go wyświetlić. Przydatne jeżeli użyjecie własnego template\'a który wygeneruje np. rtf\'a czy xls\'a. Domyślnie: "text/html"'; $_LANG['Contract'] = 'Umowa'; $_LANG['Contractor'] = 'Klient'; $_LANG['copy'] = 'kopia'; @@ -2493,8 +2493,8 @@ $_LANG['Category'] = 'Kategoria'; $_LANG['Category:'] = 'Kategoria'; $_LANG['Owners'] = 'Właściciele'; -$_LANG['There are no categories.'] = 'Nie ma kategorii'; -$_LANG['Category name must be defined!'] = 'Kategoria musi posiadać swoją nazwę!'; +$_LANG['There are no categories.'] = 'Brak kategorii w bazie danych.'; +$_LANG['Category name must be defined!'] = 'Kategoria musi posiadać nazwę!'; $_LANG['Category with specified name already exists!'] = 'Kategoria o podanej nazwie już istnieje!'; $_LANG['New Category'] = 'Nowa kategoria'; $_LANG['Remove category ID: $a'] = 'Usuń kategorię: $a'; From cvs w lms.org.pl Fri Dec 30 14:24:58 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 14:24:58 +0100 (CET) Subject: [lms-commits] CVS update of lms (index.php) Message-ID: <20111230132458.845C430281A1@eftep.altec.pl> Date: Friday, December 30, 2011 @ 14:24:58 Author: alec Path: /cvsroot/lms Modified: index.php - Add sql queries execution time debuging, some improvements Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/index.php.diff?&r1=1.229&r2=1.230 Index: lms/index.php diff -u lms/index.php:1.229 lms/index.php:1.230 --- lms/index.php:1.229 Thu Nov 24 18:15:37 2011 +++ lms/index.php Fri Dec 30 14:24:58 2011 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: index.php,v 1.229 2011/11/24 17:15:37 chilek Exp $ + * $Id: index.php,v 1.230 2011/12/30 13:24:58 alec Exp $ */ // REPLACE THIS WITH PATH TO YOUR CONFIG FILE @@ -32,7 +32,7 @@ // *EXACTLY* WHAT ARE YOU DOING!!! // ******************************************************************* -define('START_TIME', microtime()); +define('START_TIME', microtime(true)); define('LMS-UI', true); ini_set('error_reporting', E_ALL&~E_NOTICE); @@ -70,16 +70,17 @@ require_once(LIB_DIR.'/config.php'); // Init database - + $_DBTYPE = $CONFIG['database']['type']; $_DBHOST = $CONFIG['database']['host']; $_DBUSER = $CONFIG['database']['user']; $_DBPASS = $CONFIG['database']['password']; $_DBNAME = $CONFIG['database']['database']; +$_DBDEBUG = (isset($CONFIG['database']['debug']) ? chkconfig($CONFIG['database']['debug']) : FALSE); require(LIB_DIR.'/LMSDB.php'); -$DB = DBInit($_DBTYPE, $_DBHOST, $_DBUSER, $_DBPASS, $_DBNAME); +$DB = DBInit($_DBTYPE, $_DBHOST, $_DBUSER, $_DBPASS, $_DBNAME, $_DBDEBUG); if(!$DB) { @@ -161,6 +162,7 @@ $layout['lmsv'] = '1.11-cvs'; $layout['lmsvr'] = $LMS->_revision.'/'.$AUTH->_revision; $layout['dberrors'] =& $DB->errors; +$layout['dbdebug'] = $_DBDEBUG; $layout['popup'] = isset($_GET['popup']) ? true : false; $SMARTY->assignByRef('layout', $layout); From cvs w lms.org.pl Fri Dec 30 14:24:58 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 14:24:58 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib (4 files) Message-ID: <20111230132458.C38C930281A2@eftep.altec.pl> Date: Friday, December 30, 2011 @ 14:24:58 Author: alec Path: /cvsroot/lms/lib Modified: LMS.class.php LMSDB.php LMSDB_common.class.php config.php - Add sql queries execution time debuging, some improvements Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/LMS.class.php.diff?&r1=1.1090&r2=1.1091 http://cvs.lms.org.pl/viewvc/Development/lms/lib/LMSDB.php.diff?&r1=1.22&r2=1.23 http://cvs.lms.org.pl/viewvc/Development/lms/lib/LMSDB_common.class.php.diff?&r1=1.59&r2=1.60 http://cvs.lms.org.pl/viewvc/Development/lms/lib/config.php.diff?&r1=1.15&r2=1.16 Index: lms/lib/LMS.class.php diff -u lms/lib/LMS.class.php:1.1090 lms/lib/LMS.class.php:1.1091 --- lms/lib/LMS.class.php:1.1090 Fri Dec 16 15:53:04 2011 +++ lms/lib/LMS.class.php Fri Dec 30 14:24:58 2011 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: LMS.class.php,v 1.1090 2011/12/16 14:53:04 chilek Exp $ + * $Id: LMS.class.php,v 1.1091 2011/12/30 13:24:58 alec Exp $ */ // LMS Class - contains internal LMS database functions used @@ -35,7 +35,7 @@ var $cache = array(); // internal cache var $hooks = array(); // registered plugin hooks var $_version = '1.11-cvs'; // class version - var $_revision = '$Revision: 1.1090 $'; + var $_revision = '$Revision: 1.1091 $'; function LMS(&$DB, &$AUTH, &$CONFIG) // class variables setting { @@ -3746,8 +3746,12 @@ function GetCategoryListByUser($userid=NULL) { - return $this->DB->GetAll('SELECT c.id, name FROM rtcategories c LEFT JOIN rtcategoryusers cu - ON c.id = cu.categoryid '.($userid ? 'WHERE userid = '.$userid : '' ).' ORDER BY name'); + return $this->DB->GetAll('SELECT c.id, name + FROM rtcategories c + LEFT JOIN rtcategoryusers cu + ON c.id = cu.categoryid ' + .($userid ? 'WHERE userid = '.intval($userid) : '' ) + .' ORDER BY name'); } function RTStats() Index: lms/lib/LMSDB.php diff -u lms/lib/LMSDB.php:1.22 lms/lib/LMSDB.php:1.23 --- lms/lib/LMSDB.php:1.22 Tue Jan 18 09:12:05 2011 +++ lms/lib/LMSDB.php Fri Dec 30 14:24:58 2011 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: LMSDB.php,v 1.22 2011/01/18 08:12:05 alec Exp $ + * $Id: LMSDB.php,v 1.23 2011/12/30 13:24:58 alec Exp $ */ /* @@ -35,7 +35,7 @@ require_once(LMSDB_DIR.'/LMSDB_common.class.php'); -function DBInit($dbtype, $dbhost, $dbuser, $dbpasswd, $dbname) +function DBInit($dbtype, $dbhost, $dbuser, $dbpasswd, $dbname, $debug = false) { $dbtype = strtolower($dbtype); @@ -51,6 +51,8 @@ else if (!$DB->_dblink) trigger_error('Unable to connect to database!', E_USER_WARNING); else { + $DB->debug = $debug; + // set client encoding $DB->SetEncoding('UTF8'); Index: lms/lib/LMSDB_common.class.php diff -u lms/lib/LMSDB_common.class.php:1.59 lms/lib/LMSDB_common.class.php:1.60 --- lms/lib/LMSDB_common.class.php:1.59 Mon Oct 17 23:15:56 2011 +++ lms/lib/LMSDB_common.class.php Fri Dec 30 14:24:58 2011 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: LMSDB_common.class.php,v 1.59 2011/10/17 21:15:56 chilek Exp $ + * $Id: LMSDB_common.class.php,v 1.60 2011/12/30 13:24:58 alec Exp $ */ /* @@ -31,12 +31,12 @@ Class LMSDB_common { var $_version = '1.11-cvs'; - var $_revision = '$Revision: 1.59 $'; - + var $_revision = '$Revision: 1.60 $'; + // Driver powinien nadpisać tą zmienną wartością TRUE, żeby // funkcja inicjująca baze danych wiedziała że driver się poprawnie // załadował - + var $_loaded = FALSE; // Wewnętrzne zmienne bazy danych, tj, resource, link, itp. @@ -58,7 +58,7 @@ // zabezpieczmy się przed inicjowaniem tej klasy samej w sobie die(); } - + function Connect($dbhost,$dbuser,$dbpasswd,$dbname) { if(method_exists($this, '_driver_shutdown')) @@ -86,16 +86,21 @@ function Execute($query, $inputarray = NULL) { - if(! $this->_driver_execute($this->_query_parser($query, $inputarray))) + if ($this->debug) + $start = microtime(true); + + if (!$this->_driver_execute($this->_query_parser($query, $inputarray))) $this->errors[] = array( 'query' => $this->_query, - 'error' => $this->_driver_geterror() + 'error' => $this->_driver_geterror(), ); elseif($this->debug) $this->errors[] = array( 'query' => $this->_query, - 'error' => 'DEBUG: NOERROR' + 'error' => 'DEBUG: NOERROR', + 'time' => microtime(true) - $start, ); + return $this->_driver_affected_rows(); } @@ -108,7 +113,7 @@ while($row = $this->_driver_fetchrow_assoc()) $result[] = $row; - + return $result; } @@ -142,7 +147,7 @@ while($row = $this->_driver_fetchrow_num()) $result[] = $row[0]; - + return $result; } @@ -162,6 +167,9 @@ // in less memory consumptive way than using GetAll() & foreach() function Exec($query, $inputarray = NULL) { + if ($this->debug) + $start = microtime(true); + if(! $this->_driver_execute($this->_query_parser($query, $inputarray))) $this->errors[] = array( 'query' => $this->_query, @@ -170,9 +178,10 @@ elseif($this->debug) $this->errors[] = array( 'query' => $this->_query, - 'error' => 'DEBUG: NOERROR' + 'error' => 'DEBUG: NOERROR', + 'time' => microtime(true) - $start, ); - + if($this->_driver_num_rows()) return $this->_result; else @@ -183,7 +192,7 @@ { return $this->_driver_fetchrow_assoc($result); } - + function Concat() { return $this->_driver_concat(func_get_args()); Index: lms/lib/config.php diff -u lms/lib/config.php:1.15 lms/lib/config.php:1.16 --- lms/lib/config.php:1.15 Tue Jan 18 09:12:05 2011 +++ lms/lib/config.php Fri Dec 30 14:24:58 2011 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: config.php,v 1.15 2011/01/18 08:12:05 alec Exp $ + * $Id: config.php,v 1.16 2011/12/30 13:24:58 alec Exp $ */ function chkconfig($value, $default = FALSE) @@ -158,10 +158,10 @@ ), ); -foreach($DEFAULTS as $section => $values) - foreach($values as $key => $val) - if(!isset($CONFIG[$section][$key])) - $CONFIG[$section][$key] = $val; +foreach ($DEFAULTS as $section => $values) + foreach ($values as $key => $val) + if (!isset($CONFIG[$section][$key])) + $CONFIG[$section][$key] = $val; unset($DEFAULTS); ?> From cvs w lms.org.pl Fri Dec 30 14:40:24 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 14:40:24 +0100 (CET) Subject: [lms-commits] CVS update of lms/templates (messageadd.html) Message-ID: <20111230134024.6968930281A1@eftep.altec.pl> Date: Friday, December 30, 2011 @ 14:40:24 Author: chilek Path: /cvsroot/lms/templates Modified: messageadd.html - some improvement which is very small but very important ;-) Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/templates/messageadd.html.diff?&r1=1.11&r2=1.12 Index: lms/templates/messageadd.html diff -u lms/templates/messageadd.html:1.11 lms/templates/messageadd.html:1.12 --- lms/templates/messageadd.html:1.11 Fri Dec 30 11:48:21 2011 +++ lms/templates/messageadd.html Fri Dec 30 14:40:24 2011 @@ -1,5 +1,5 @@ {include file="header.html"} - +
{$layout.pagetitle}
@@ -18,7 +18,6 @@ function typesel(elem) { - alert(elem); if(elem == 'typesms' || elem == 'typeanysms') { document.getElementById('mailbody').style.display = 'none'; document.getElementById('mailfrom').style.display = 'none'; From cvs w lms.org.pl Fri Dec 30 15:19:37 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 15:19:37 +0100 (CET) Subject: [lms-commits] CVS update of lms/devel (smarty_install.sh) Message-ID: <20111230141937.A8D9330281A1@eftep.altec.pl> Date: Friday, December 30, 2011 @ 15:19:37 Author: alec Path: /cvsroot/lms/devel Modified: smarty_install.sh - Updated DDL files, updated documentation Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/devel/smarty_install.sh.diff?&r1=1.12&r2=1.13 Index: lms/devel/smarty_install.sh diff -u lms/devel/smarty_install.sh:1.12 lms/devel/smarty_install.sh:1.13 --- lms/devel/smarty_install.sh:1.12 Wed Dec 7 13:22:46 2011 +++ lms/devel/smarty_install.sh Fri Dec 30 15:19:37 2011 @@ -3,7 +3,7 @@ # Smarty templates library quick installation (with sources download) # -SMARTYVER="3.1.6" +SMARTYVER="3.1.7" cd ../lib # download @@ -19,7 +19,6 @@ # merging echo -n "Merging... " mv Smarty-$SMARTYVER/libs/* Smarty/ -mv Smarty-$SMARTYVER/libs/sysplugins/* Smarty/sysplugins/ mv Smarty-$SMARTYVER/libs/plugins/* Smarty/plugins/ echo "done." From cvs w lms.org.pl Fri Dec 30 15:19:38 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 15:19:38 +0100 (CET) Subject: [lms-commits] CVS update of lms/doc/html/en (devel-db.html, menu-netdevices.html) Message-ID: <20111230141938.1E48A30281A4@eftep.altec.pl> Date: Friday, December 30, 2011 @ 15:19:38 Author: alec Path: /cvsroot/lms/doc/html/en Modified: devel-db.html menu-netdevices.html - Updated DDL files, updated documentation Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/doc/html/en/devel-db.html.diff?&r1=1.70&r2=1.71 http://cvs.lms.org.pl/viewvc/Development/lms/doc/html/en/menu-netdevices.html.diff?&r1=1.13&r2=1.14 Index: lms/doc/html/en/devel-db.html diff -u lms/doc/html/en/devel-db.html:1.70 lms/doc/html/en/devel-db.html:1.71 --- lms/doc/html/en/devel-db.html:1.70 Thu Dec 1 09:33:54 2011 +++ lms/doc/html/en/devel-db.html Fri Dec 30 15:19:37 2011 @@ -498,7 +498,23 @@ >location - physical location text

{t}Database errors occurred!{/t}
{foreach from=$layout.dberrors item=dberror} - {t}Query:{/t} {$dberror.query}
- {t}Error:{/t} {$dberror.error}
+ {if $layout.dbdebug} + ({math equation="x*1000" x=$dberror.time format="%.4f"} ms): {$dberror.query}
+ {else} + {t}Query:{/t} {$dberror.query}
+ {t}Error:{/t} {$dberror.error}
+ {/if} {/foreach}

location - physical location
location_city - city identifier
location_street - street identifier
location_house - house number
location_flat - flat number
channelid - STM channel identifier (ewx_channels table)
longitude - geog. longitude
latitude - geog latitude

location_address - address - street, apartment, flat, etc

location_zip - address - zip code

location_city - address - location (city)

location_house - house number

location_flat - flat number

nas - NAS flag (1/0)

longitude - geog. longitude

latitude - geog latitude

[phpui]. Ustaw "flash" jeśli używasz biblioteki - Ming lub "gd" jeśli chcesz generować obrazki przy pomocy gdlib. Domyślnie + Ming, "gd" jeśli chcesz generować obrazki przy pomocy gdlib lub "openlayers" jeśli + chcesz używać biblioteki OpenLayers do generowania mapy. Domyślnie (opcja nieustawiona) LMS spróbuje wykryć jaką bibliotekę masz dostępną w systemie, przy czym w pierwszej kolejności szuka możliwości wygenerowania mapy we flashu, a jak się to nie uda, to użyje GD. Index: lms/doc/html/pl/user.html diff -u lms/doc/html/pl/user.html:1.36 lms/doc/html/pl/user.html:1.37 --- lms/doc/html/pl/user.html:1.36 Thu Dec 1 09:33:55 2011 +++ lms/doc/html/pl/user.html Fri Dec 30 15:19:38 2011 @@ -10,8 +10,8 @@ TITLE="LMS - LAN Management System 1.11-cvs" HREF="index.html">Poprzedni PoprzedniDokumentyBaza podziału terytorialnego (TERYT) Date: Friday, December 30, 2011 @ 15:19:37 Author: alec Path: /cvsroot/lms/doc Modified: README README.pl lms.mysql lms.pgsql - Updated DDL files, updated documentation Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/doc/README.diff?&r1=1.237&r2=1.238 http://cvs.lms.org.pl/viewvc/Development/lms/doc/README.pl.diff?&r1=1.69&r2=1.70 http://cvs.lms.org.pl/viewvc/Development/lms/doc/lms.mysql.diff?&r1=1.187&r2=1.188 http://cvs.lms.org.pl/viewvc/Development/lms/doc/lms.pgsql.diff?&r1=1.186&r2=1.187 Index: lms/doc/README diff -u lms/doc/README:1.237 lms/doc/README:1.238 --- lms/doc/README:1.237 Thu Dec 1 09:33:53 2011 +++ lms/doc/README Fri Dec 30 15:19:37 2011 @@ -1271,9 +1271,10 @@ You need GD or Ming library compiled in PHP to be able to use graphical map. Use 'map_type' option in section [phpui] section to specify type of - map. Set it to "flash" if you've got Ming library or "gd" for graphic - images. By default (option not set) LMS will try to generate flash map, - and when this fails, t will fallback to GD. + map. Set it to "flash" if you've got Ming library, "gd" for graphic + images or "openlayers" if you want to use map based on this library. By + default (option not set) LMS will try to generate flash map, and when + this fails, t will fallback to GD. Device status is shown on the map - computers in black are offline. Question mark on device icon means that its status is unknown (device @@ -5414,7 +5415,11 @@ id - serial number name - name - location - physical location + location - physical location text + location_city - city identifier + location_street - street identifier + location_house - house number + location_flat - flat number description - device summary producer - manufacturer's name model - model number @@ -5428,6 +5433,8 @@ secret - password (radius) community - SNMP community channelid - STM channel identifier (ewx_channels table) + longitude - geog. longitude + latitude - geog latitude __________________________________________________________________ 7.2.8. Network connections ('netlinks') @@ -5460,10 +5467,14 @@ halfduplex - half/full duplex mode (0/1) lastonline - last network activity timestamp info - additional information - location_address - address - street, apartment, flat, etc - location_zip - address - zip code - location_city - address - location (city) + location_address - address string + location_city - city identifier + location_street - street identifier + location_house - house number + location_flat - flat number nas - NAS flag (1/0) + longitude - geog. longitude + latitude - geog latitude __________________________________________________________________ 7.2.10. MAC addresses ('macs') @@ -5639,7 +5650,8 @@ datefrom - start date for assignment dateto - end date for assignment invoice - invoice writeout? (1 - yes, 0 - no) - discount - discount percentage + pdiscount - discount percentage + vdiscount - discount value suspended - is this payment suspended? (1 - yes, 0 - no) settlement - do deficient period settlement? (1 - yes, 0 - no) paytype - invoice payment type identifier @@ -5753,7 +5765,8 @@ docid - invoice serial number itemid - invoice item identifier value - amount - discount - discount percentage + pdiscount - discount percentage + vdiscount - discount value taxid - tax rate identifier prodid - product/service classification number content - used unit (usually 'pc.') @@ -5873,6 +5886,7 @@ login - login passwd - password phone - phone number + access - enabled/disabled (1/0) creationdate - date of account creation moddate - date of last account modification creatorid - creator (user) identifier Index: lms/doc/README.pl diff -u lms/doc/README.pl:1.69 lms/doc/README.pl:1.70 --- lms/doc/README.pl:1.69 Thu Dec 1 09:33:53 2011 +++ lms/doc/README.pl Fri Dec 30 15:19:37 2011 @@ -26,6 +26,7 @@ 2.7. Prawa dostępu 2.8. Upgrade 2.9. Dokumenty + 2.10. Baza podziału terytorialnego (TERYT) 3. Interfejs Użytkownika (LMS-UI) @@ -1129,6 +1130,14 @@ dokumencie. __________________________________________________________________ +2.10. Baza podziału terytorialnego (TERYT) + + LMS obsługuje bazę podziału terytorialnego TERYT w sposób umożliwiający + przypisanie adresów zgodnych z zawartością tej bazy do komputerów oraz + urządzeń sieciowych. Aby mieć możliwość wyboru adresów z listy należy + zaimportować bazę TERYT. Służy do tego skrypt lms-teryt. + __________________________________________________________________ + Rozdział 3. Interfejs Użytkownika (LMS-UI) LMS'owy Interfejs Użytkownika to panel administracyjny do tworzenia i @@ -1422,8 +1431,9 @@ Do wygenerowania mapy potrzebna jest wbudowana w PHP obsługa biblioteki graficznej GD lub Ming. Aby wybrać typ mapy musisz skorzystać z opcji map_type z sekcji - [phpui]. Ustaw "flash" jeśli używasz biblioteki Ming lub "gd" jeśli - chcesz generować obrazki przy pomocy gdlib. Domyślnie (opcja + [phpui]. Ustaw "flash" jeśli używasz biblioteki Ming, "gd" jeśli chcesz + generować obrazki przy pomocy gdlib lub "openlayers" jeśli chcesz + używać biblioteki OpenLayers do generowania mapy. Domyślnie (opcja nieustawiona) LMS spróbuje wykryć jaką bibliotekę masz dostępną w systemie, przy czym w pierwszej kolejności szuka możliwości wygenerowania mapy we flashu, a jak się to nie uda, to użyje GD. @@ -6430,7 +6440,11 @@ id - identyfikator name - nazwa - location - lokalizacja + location - lokalizacja, tekst + location_city - identyfikator miejscowości (TERYT) + location_street - identyfikator ulicy (TERYT) + location_house - numer domu + location_flat - numer mieszkania description - opis producer - producent model - model @@ -6445,6 +6459,8 @@ secret - hasło (radius) community - community SNMP channelid - identyfikator kanału STM (tabela ewx_channels) + longitude - długość geograficzna + latitude - szerokość geograficzna __________________________________________________________________ 7.2.8. Połączenia sieciowe ('netlinks') @@ -6478,10 +6494,14 @@ warning - ostrzegaj/nie ostrzegaj (1/0) lastonline - znacznik czasu ostatniej obecności w sieci info - informacje dodatkowe - location_address - adres lokalizacji - ulica, nr domu, nr lokalu - location_zip - adres lokalizacji - kod pocztowy - location_city - adres lokalizacji - miasto + location - adres lokalizacji, tekst + location_city - identyfikator miejscowości (TERYT) + location_street - identyfikator ulicy (TERYT) + location_house - numer domu + location_flat - numer mieszkania nas - flaga NAS (0/1) + longitude - długość geograficzna + latitude - szerokość geograficzna __________________________________________________________________ 7.2.10. Adresy MAC ('macs') @@ -6666,7 +6686,8 @@ datefrom - data obowiązywania zobowiązania dateto - data obowiązywania zobowiązania invoice - określa czy ma być wystawiana faktura (1 - tak, 0 - nie) - discount - wartość procentowa rabatu + pdiscount - wartość procentowa rabatu + vdiscount - wartość kwotowa rabatu suspended - zawieszenie płatności (1 - tak, 0 - nie) settlement - rozliczenie okresu niepełnego (1 - tak, 0 - nie) paytype - identyfikator typu płatności faktury @@ -6771,7 +6792,8 @@ docid - identyfikator faktury itemid - nr pozycji value - kwota pozycji - discount - wartość procentowa rabatu + pdiscount - wartość procentowa rabatu + vdiscount - wartość kwotowa rabatu taxid - identyfikator stawki podatkowej prodid - numer PKWiU content - użyta jednostka (najczęściej 'szt.') @@ -6891,6 +6913,7 @@ login - login passwd - hasło phone - numer telefonu + access - włączone/wyłączone (1/0) creationdate - data utworzenia moddate - date ostatniej zmiany creatorid - identyfikator użytkownika Index: lms/doc/lms.mysql diff -u lms/doc/lms.mysql:1.187 lms/doc/lms.mysql:1.188 --- lms/doc/lms.mysql:1.187 Fri Apr 15 19:47:27 2011 +++ lms/doc/lms.mysql Fri Dec 30 15:19:37 2011 @@ -1,5 +1,5 @@ # -------------------------------------------------------- -# $Id: lms.mysql,v 1.187 2011/04/15 17:47:27 alec Exp $ +# $Id: lms.mysql,v 1.188 2011/12/30 14:19:37 alec Exp $ # -------------------------------------------------------- # -- Drop tables first, MySQL doesn't support CASCADE @@ -9,13 +9,14 @@ DROP VIEW IF EXISTS vnodes; DROP VIEW IF EXISTS vmacs; DROP VIEW IF EXISTS customersview; +DROP VIEW IF EXISTS teryt_terc; +DROP VIEW IF EXISTS teryt_ulic; +DROP VIEW IF EXISTS teryt_simc; DROP TABLE IF EXISTS ewx_stm_nodes; DROP TABLE IF EXISTS ewx_stm_channels; DROP TABLE IF EXISTS ewx_pt_config; DROP TABLE IF EXISTS ewx_channels; -DROP TABLE IF EXISTS users; -DROP TABLE IF EXISTS customers; DROP TABLE IF EXISTS numberplans; DROP TABLE IF EXISTS nodeassignments; DROP TABLE IF EXISTS assignments; @@ -28,6 +29,12 @@ DROP TABLE IF EXISTS documents; DROP TABLE IF EXISTS documentcontents; DROP TABLE IF EXISTS receiptcontents; +DROP TABLE IF EXISTS location_street_types; +DROP TABLE IF EXISTS location_streets; +DROP TABLE IF EXISTS location_cities; +DROP TABLE IF EXISTS location_boroughs; +DROP TABLE IF EXISTS location_districts; +DROP TABLE IF EXISTS location_states; DROP TABLE IF EXISTS netdevices; DROP TABLE IF EXISTS netlinks; DROP TABLE IF EXISTS networks; @@ -36,6 +43,9 @@ DROP TABLE IF EXISTS nodegroups; DROP TABLE IF EXISTS nodegroupassignments; DROP TABLE IF EXISTS payments; +DROP TABLE IF EXISTS rtticketcategories; +DROP TABLE IF EXISTS rtcategoryusers; +DROP TABLE IF EXISTS rtcategories; DROP TABLE IF EXISTS rtattachments; DROP TABLE IF EXISTS rtmessages; DROP TABLE IF EXISTS rtnotes; @@ -86,6 +96,8 @@ DROP TABLE IF EXISTS up_help; DROP TABLE IF EXISTS up_info_changes; DROP TABLE IF EXISTS supermasters; +DROP TABLE IF EXISTS users; +DROP TABLE IF EXISTS customers; # -------------------------------------------------------- # @@ -189,7 +201,8 @@ invoice tinyint(1) NOT NULL DEFAULT '0', suspended tinyint(1) NOT NULL DEFAULT '0', settlement tinyint(1) NOT NULL DEFAULT '0', - discount decimal(4,2) NOT NULL DEFAULT '0', + pdiscount decimal(4,2) NOT NULL DEFAULT '0', + vdiscount decimal(9,2) NOT NULL DEFAULT '0', paytype smallint DEFAULT NULL, numberplanid int(11) DEFAULT NULL REFERENCES numberplans (id) ON DELETE SET NULL ON UPDATE CASCADE, @@ -222,7 +235,7 @@ time int(11) NOT NULL DEFAULT '0', type smallint NOT NULL DEFAULT '0', userid int(11) NOT NULL DEFAULT '0', - value decimal(9,2) NOT NULL DEFAULT '0.00', + value decimal(9,2) NOT NULL DEFAULT '0', taxid int(11) NOT NULL DEFAULT '0', customerid int(11) NOT NULL DEFAULT '0', comment text NOT NULL DEFAULT '', @@ -268,12 +281,13 @@ CREATE TABLE invoicecontents ( docid int(11) NOT NULL DEFAULT '0', itemid smallint NOT NULL DEFAULT '0', - value decimal(9,2) NOT NULL DEFAULT '0.00', - discount decimal(4,2) NOT NULL DEFAULT '0.00', + value decimal(9,2) NOT NULL DEFAULT '0', + pdiscount decimal(4,2) NOT NULL DEFAULT '0', + vdiscount decimal(9,2) NOT NULL DEFAULT '0', taxid int(11) NOT NULL DEFAULT '0', prodid varchar(255) NOT NULL DEFAULT '', content varchar(16) NOT NULL DEFAULT '', - count decimal(9,2) NOT NULL DEFAULT '0.00', + count decimal(9,2) NOT NULL DEFAULT '0', description text NOT NULL DEFAULT '', tariffid int(11) NOT NULL DEFAULT '0', INDEX docid (docid) @@ -287,7 +301,7 @@ id int(11) NOT NULL auto_increment, docid int(11) NOT NULL DEFAULT '0', itemid smallint NOT NULL DEFAULT '0', - value decimal(9,2) NOT NULL DEFAULT '0.00', + value decimal(9,2) NOT NULL DEFAULT '0', description text NOT NULL DEFAULT '', PRIMARY KEY (id), UNIQUE KEY docid (docid, itemid) @@ -362,6 +376,89 @@ # -------------------------------------------------------- # +# Structure of table location_states +# +CREATE TABLE location_states ( + id int(11) NOT NULL auto_increment, + ident varchar(8) NOT NULL, -- TERYT: WOJ + name varchar(64) NOT NULL, -- TERYT: NAZWA + PRIMARY KEY (id), + UNIQUE KEY name (name) +) ENGINE=INNODB; + +# -------------------------------------------------------- +# +# Structure of table location_districts +# +CREATE TABLE location_districts ( + id int(11) NOT NULL auto_increment, + name varchar(64) NOT NULL, -- TERYT: NAZWA + ident varchar(8) NOT NULL, -- TERYT: POW + stateid int(11) NOT NULL -- TERYT: WOJ + REFERENCES location_states (id) ON DELETE CASCADE ON UPDATE CASCADE, + PRIMARY KEY (id), + UNIQUE KEY stateid (stateid, name) +) ENGINE=INNODB; + +# -------------------------------------------------------- +# +# Structure of table location_boroughs +# +CREATE TABLE location_boroughs ( + id int(11) NOT NULL auto_increment, + name varchar(64) NOT NULL, -- TERYT: NAZWA + ident varchar(8) NOT NULL, -- TERYT: GMI + districtid int(11) NOT NULL + REFERENCES location_districts (id) ON DELETE CASCADE ON UPDATE CASCADE, + type smallint NOT NULL, -- TERYT: RODZ + PRIMARY KEY (id), + UNIQUE KEY districtid (districtid, name, type) +) ENGINE=INNODB; + +# -------------------------------------------------------- +# +# Structure of table location_cities +# +CREATE TABLE location_cities ( + id int(11) NOT NULL auto_increment, + ident varchar(8) NOT NULL, -- TERYT: SYM / SYMPOD + name varchar(64) NOT NULL, -- TERYT: NAZWA + cityid int(11) DEFAULT NULL, + boroughid int(11) DEFAULT NULL + REFERENCES location_boroughs (id) ON DELETE CASCADE ON UPDATE CASCADE, + PRIMARY KEY (id), + INDEX cityid (cityid), + INDEX boroughid (boroughid, name) +) ENGINE=INNODB; + +# -------------------------------------------------------- +# +# Structure of table location_street_types +# +CREATE TABLE location_street_types ( + id int(11) NOT NULL auto_increment, + name varchar(8) NOT NULL, -- TERYT: CECHA + PRIMARY KEY (id) +) ENGINE=INNODB; + +# -------------------------------------------------------- +# +# Structure of table location_streets +# +CREATE TABLE location_streets ( + id int(11) NOT NULL auto_increment, + name varchar(128) NOT NULL, -- TERYT: NAZWA_1 + ident varchar(8) NOT NULL, -- TERYT: SYM_UL + typeid int(11) DEFAULT NULL + REFERENCES location_street_types (id) ON DELETE SET NULL ON UPDATE CASCADE, + cityid int(11) NOT NULL + REFERENCES location_cities (id) ON DELETE CASCADE ON UPDATE CASCADE, + PRIMARY KEY (id), + UNIQUE (cityid, name, ident) +) ENGINE=INNODB; + +# -------------------------------------------------------- +# # Structure of tables ewx_* (EtherWerX(R)) # CREATE TABLE ewx_stm_nodes ( @@ -420,6 +517,12 @@ id int(11) NOT NULL auto_increment, name varchar(32) NOT NULL DEFAULT '', location varchar(255) NOT NULL DEFAULT '', + location_city int(11) DEFAULT NULL + REFERENCES location_cities (id) ON DELETE SET NULL ON UPDATE CASCADE, + location_street int(11) DEFAULT NULL + REFERENCES location_streets (id) ON DELETE SET NULL ON UPDATE CASCADE, + location_house varchar(8) DEFAULT NULL, + location_flat varchar(8) DEFAULT NULL, description text NOT NULL DEFAULT '', producer varchar(64) NOT NULL DEFAULT '', model varchar(32) NOT NULL DEFAULT '', @@ -434,8 +537,12 @@ community varchar(50) NOT NULL DEFAULT '', channelid int(11) DEFAULT NULL REFERENCES ewx_channels (id) ON DELETE SET NULL ON UPDATE CASCADE, + longitude decimal(10, 6) DEFAULT NULL, + latitude decimal(10, 6) DEFAULT NULL, PRIMARY KEY (id), - INDEX channelid (channelid) + INDEX channelid (channelid), + INDEX location_city (location_city, location_street, location_house, location_flat), + INDEX location_street (location_street) ) ENGINE=InnoDB; # -------------------------------------------------------- @@ -501,16 +608,24 @@ halfduplex tinyint(1) NOT NULL DEFAULT '0', lastonline int(11) NOT NULL DEFAULT '0', info text NOT NULL DEFAULT '', - location_address varchar(255) DEFAULT NULL, - location_zip varchar(10) DEFAULT NULL, - location_city varchar(32) DEFAULT NULL, + location varchar(255) DEFAULT NULL, + location_city int(11) DEFAULT NULL + REFERENCES location_cities (id) ON DELETE SET NULL ON UPDATE CASCADE, + location_street int(11) DEFAULT NULL + REFERENCES location_streets (id) ON DELETE SET NULL ON UPDATE CASCADE, + location_house varchar(8) DEFAULT NULL, + location_flat varchar(8) DEFAULT NULL, nas tinyint(1) NOT NULL DEFAULT '0', + longitude decimal(10, 6) DEFAULT NULL, + latitude decimal(10, 6) DEFAULT NULL, PRIMARY KEY (id), UNIQUE KEY name (name), UNIQUE KEY ipaddr (ipaddr), INDEX netdev (netdev), INDEX ownerid (ownerid), - INDEX ipaddr_pub (ipaddr_pub) + INDEX ipaddr_pub (ipaddr_pub), + INDEX location_city (location_city, location_street, location_house, location_flat), + INDEX location_street (location_street) ) ENGINE=InnoDB; # -------------------------------------------------------- @@ -574,7 +689,7 @@ CREATE TABLE payments ( id int(11) NOT NULL auto_increment, name varchar(255) NOT NULL DEFAULT '', - value decimal(9,2) NOT NULL DEFAULT '0.00', + value decimal(9,2) NOT NULL DEFAULT '0', creditor varchar(255) NOT NULL DEFAULT '', period smallint NOT NULL DEFAULT '0', at smallint NOT NULL DEFAULT '0', @@ -687,6 +802,46 @@ # -------------------------------------------------------- # +# Structure of table rtcategories +# +CREATE TABLE rtcategories ( + id int(11) NOT NULL auto_increment, + name varchar(255) DEFAULT '' NOT NULL, + description text DEFAULT '' NOT NULL, + PRIMARY KEY (id), + UNIQUE KEY (name) +) ENGINE=INNODB; + +# -------------------------------------------------------- +# +# Structure of table rtcategoryusers +# +CREATE TABLE rtcategoryusers ( + id int(11) NOT NULL auto_increment, + userid int(11) NOT NULL + REFERENCES users (id) ON DELETE CASCADE ON UPDATE CASCADE, + categoryid int(11) NOT NULL + REFERENCES rtcategories (id) ON DELETE CASCADE ON UPDATE CASCADE, + PRIMARY KEY (id), + UNIQUE KEY userid (userid, categoryid) +) ENGINE=INNODB; + +# -------------------------------------------------------- +# +# Structure of table rtticketcategories +# +CREATE TABLE rtticketcategories ( + id int(11) NOT NULL auto_increment, + ticketid int(11) NOT NULL + REFERENCES rttickets (id) ON DELETE CASCADE ON UPDATE CASCADE, + categoryid int(11) NOT NULL + REFERENCES rtcategories (id) ON DELETE CASCADE ON UPDATE CASCADE, + PRIMARY KEY (id), + UNIQUE KEY ticketid (ticketid, categoryid) +) ENGINE=INNODB; + +# -------------------------------------------------------- +# # Structure of table stats # CREATE TABLE stats ( @@ -706,7 +861,7 @@ id int(11) NOT NULL auto_increment, name varchar(255) NOT NULL DEFAULT '', type tinyint NOT NULL DEFAULT '1', - value decimal(9,2) NOT NULL DEFAULT '0.00', + value decimal(9,2) NOT NULL DEFAULT '0', taxid int(11) NOT NULL DEFAULT '0', period smallint DEFAULT NULL, prodid varchar(255) NOT NULL DEFAULT '', @@ -997,7 +1152,7 @@ CREATE TABLE cashimport ( id int(11) NOT NULL auto_increment, date int(11) NOT NULL DEFAULT '0', - value decimal(9,2) NOT NULL DEFAULT '0.00', + value decimal(9,2) NOT NULL DEFAULT '0', customer varchar(150) NOT NULL DEFAULT '', description varchar(150) NOT NULL DEFAULT '', customerid int(11) DEFAULT NULL @@ -1235,6 +1390,7 @@ login varchar(255) NOT NULL DEFAULT '', passwd varchar(255) NOT NULL DEFAULT '', phone varchar(255) NOT NULL DEFAULT '', + access tinyint(1) NOT NULL DEFAULT '1', creationdate int(11) NOT NULL DEFAULT 0, moddate int(11) NOT NULL DEFAULT 0, creatorid int(11) NOT NULL DEFAULT 0, @@ -1287,6 +1443,37 @@ UNIQUE KEY name (name) ) ENGINE=InnoDB; +# -------------------------------------------------------- +# +# Structure of table records +# +CREATE TABLE records ( + id INT(11) auto_increment, + domain_id INT(11) DEFAULT NULL, + name VARCHAR(255) DEFAULT NULL, + type VARCHAR(6) DEFAULT NULL, + content VARCHAR(255) DEFAULT NULL, + ttl INT(11) DEFAULT NULL, + prio INT(11) DEFAULT NULL, + change_date INT(11) DEFAULT NULL, + PRIMARY KEY(id), + FOREIGN KEY (domain_id) REFERENCES domains (id) ON DELETE CASCADE ON UPDATE CASCADE, + INDEX domain_id (domain_id), + INDEX name_type (name, type, domain_id) +) ENGINE=InnoDB; + +# -------------------------------------------------------- +# +# Structure of table supermasters +# +CREATE TABLE supermasters ( + id INT(11) auto_increment, + ip VARCHAR(25) NOT NULL, + nameserver VARCHAR(255) NOT NULL, + account VARCHAR(40) DEFAULT NULL, + PRIMARY KEY (id) +) ENGINE=InnoDB; + CREATE VIEW nas AS SELECT n.id, inet_ntoa(n.ipaddr) AS nasname, d.shortname, d.nastype AS type, d.clients AS ports, d.secret, d.community, d.description @@ -1319,6 +1506,42 @@ JOIN excludedgroups e ON (a.customergroupid = e.customergroupid) WHERE e.userid = lms_current_user() AND a.customerid = c.id); +CREATE VIEW teryt_terc AS +SELECT ident AS woj, '0' AS pow, '0' AS gmi, 0 AS rodz, + UPPER(name) AS nazwa + FROM location_states + UNION + SELECT s.ident AS woj, d.ident AS pow, '0' AS gmi, 0 AS rodz, + d.name AS nazwa + FROM location_districts d + JOIN location_states s ON (d.stateid = s.id) + UNION + SELECT s.ident AS woj, d.ident AS pow, b.ident AS gmi, b.type AS rodz, + b.name AS nazwa + FROM location_boroughs b + JOIN location_districts d ON (b.districtid = d.id) + JOIN location_states s ON (d.stateid = s.id); + +CREATE VIEW teryt_simc AS +SELECT s.ident AS woj, d.ident AS pow, b.ident AS gmi, b.type AS rodz_gmi, + c.ident AS sym, c.name AS nazwa, + (CASE WHEN cc.ident IS NOT NULL THEN cc.ident ELSE c.ident END) AS sympod + FROM location_cities c + JOIN location_boroughs b ON (c.boroughid = b.id) + JOIN location_districts d ON (b.districtid = d.id) + JOIN location_states s ON (d.stateid = s.id) + LEFT JOIN location_cities cc ON (c.cityid = cc.id); + +CREATE VIEW teryt_ulic AS +SELECT st.ident AS woj, d.ident AS pow, b.ident AS gmi, b.type AS rodz_gmi, + c.ident AS sym, s.ident AS sym_ul, s.name AS nazwa_1, t.name AS cecha, s.id + FROM location_streets s + JOIN location_street_types t ON (s.typeid = t.id) + JOIN location_cities c ON (s.cityid = c.id) + JOIN location_boroughs b ON (c.boroughid = b.id) + JOIN location_districts d ON (b.districtid = d.id) + JOIN location_states st ON (d.stateid = st.id); + DROP FUNCTION IF EXISTS mask2prefix; CREATE FUNCTION mask2prefix(mask bigint) RETURNS smallint DETERMINISTIC RETURN bit_count(mask); @@ -1421,6 +1644,7 @@ VALUES ('userpanel', 'logout_url', '', '', 0); INSERT INTO uiconfig (section, var, value, description, disabled) VALUES ('userpanel', 'owner_stats', '0', '', 0); +INSERT INTO uiconfig (section, var) VALUES ('userpanel', 'default_categories'); INSERT INTO up_rights(module, name, description) VALUES ('info', 'edit_addr_ack', 'Customer can change address information with admin acknowlegment'); INSERT INTO up_rights(module, name, description) @@ -1451,36 +1675,4 @@ INSERT INTO nastypes (name) VALUES ('other'); # -------------------------------------------------------- -# -# Structure of table records -# -CREATE TABLE records ( - id INT(11) auto_increment, - domain_id INT(11) DEFAULT NULL, - name VARCHAR(255) DEFAULT NULL, - type VARCHAR(6) DEFAULT NULL, - content VARCHAR(255) DEFAULT NULL, - ttl INT(11) DEFAULT NULL, - prio INT(11) DEFAULT NULL, - change_date INT(11) DEFAULT NULL, - PRIMARY KEY(id), - FOREIGN KEY (domain_id) REFERENCES domains (id) ON DELETE CASCADE ON UPDATE CASCADE, - INDEX domain_id (domain_id), - INDEX name_type (name, type, domain_id) -) ENGINE=InnoDB; - -# -------------------------------------------------------- -# -# Structure of table supermasters -# -CREATE TABLE supermasters ( - id INT(11) auto_increment, - ip VARCHAR(25) NOT NULL, - nameserver VARCHAR(255) NOT NULL, - account VARCHAR(40) DEFAULT NULL, - PRIMARY KEY (id) -) ENGINE=InnoDB; - - -# -------------------------------------------------------- -INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2011041500'); +INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2011113000'); Index: lms/doc/lms.pgsql diff -u lms/doc/lms.pgsql:1.186 lms/doc/lms.pgsql:1.187 --- lms/doc/lms.pgsql:1.186 Mon Aug 29 13:30:35 2011 +++ lms/doc/lms.pgsql Fri Dec 30 15:19:37 2011 @@ -1,4 +1,4 @@ -/* $Id: lms.pgsql,v 1.186 2011/08/29 11:30:35 alec Exp $ */ +/* $Id: lms.pgsql,v 1.187 2011/12/30 14:19:37 alec Exp $ */ /* -------------------------------------------------------- Structure of table "users" @@ -110,7 +110,8 @@ invoice smallint DEFAULT 0 NOT NULL, suspended smallint DEFAULT 0 NOT NULL, settlement smallint DEFAULT 0 NOT NULL, - discount numeric(4,2) DEFAULT 0 NOT NULL, + pdiscount numeric(4,2) DEFAULT 0 NOT NULL, + vdiscount numeric(9,2) DEFAULT 0 NOT NULL, paytype smallint DEFAULT NULL, numberplanid integer DEFAULT NULL REFERENCES numberplans (id) ON DELETE SET NULL ON UPDATE CASCADE, @@ -148,7 +149,102 @@ CREATE INDEX cash_time_idx ON cash (time); /* -------------------------------------------------------- - Structure of table "networks" + Structure of table "location_states" +-------------------------------------------------------- */ +DROP SEQUENCE IF EXISTS location_states_id_seq; +CREATE SEQUENCE location_states_id_seq; +DROP TABLE IF EXISTS location_states CASCADE; +CREATE TABLE location_states ( + id integer DEFAULT nextval('location_states_id_seq'::text) NOT NULL, + ident varchar(8) NOT NULL, -- TERYT: WOJ + name varchar(64) NOT NULL, -- TERYT: NAZWA + PRIMARY KEY (id), + UNIQUE (name) +); + +/* -------------------------------------------------------- + Structure of table "location_districts" +-------------------------------------------------------- */ +DROP SEQUENCE IF EXISTS location_districts_id_seq; +CREATE SEQUENCE location_districts_id_seq; +DROP TABLE IF EXISTS location_districts CASCADE; +CREATE TABLE location_districts ( + id integer DEFAULT nextval('location_districts_id_seq'::text) NOT NULL, + name varchar(64) NOT NULL, --TERYT: NAZWA + ident varchar(8) NOT NULL, --TERYT: POW + stateid integer NOT NULL --TERYT: WOJ + REFERENCES location_states (id) ON DELETE CASCADE ON UPDATE CASCADE, + PRIMARY KEY (id), + UNIQUE (stateid, name) +); + +/* -------------------------------------------------------- + Structure of table "location_boroughs" +-------------------------------------------------------- */ +DROP SEQUENCE IF EXISTS location_boroughs_id_seq; +CREATE SEQUENCE location_boroughs_id_seq; +DROP TABLE IF EXISTS location_boroughs CASCADE; +CREATE TABLE location_boroughs ( + id integer DEFAULT nextval('location_boroughs_id_seq'::text) NOT NULL, + name varchar(64) NOT NULL, -- TERYT: NAZWA + ident varchar(8) NOT NULL, -- TERYT: GMI + districtid integer NOT NULL + REFERENCES location_districts (id) ON DELETE CASCADE ON UPDATE CASCADE, + type smallint NOT NULL, -- TERYT: RODZ + PRIMARY KEY (id), + UNIQUE (districtid, name, type) +); + +/* -------------------------------------------------------- + Structure of table "location_cities" +-------------------------------------------------------- */ +DROP SEQUENCE IF EXISTS location_cities_id_seq; +CREATE SEQUENCE location_cities_id_seq; +DROP TABLE IF EXISTS location_cities CASCADE; +CREATE TABLE location_cities ( + id integer DEFAULT nextval('location_cities_id_seq'::text) NOT NULL, + ident varchar(8) NOT NULL, -- TERYT: SYM / SYMPOD + name varchar(64) NOT NULL, -- TERYT: NAZWA + cityid integer DEFAULT NULL, + boroughid integer DEFAULT NULL + REFERENCES location_boroughs (id) ON DELETE CASCADE ON UPDATE CASCADE, + PRIMARY KEY (id) +); +CREATE INDEX location_cities_cityid ON location_cities (cityid); +CREATE INDEX location_cities_boroughid ON location_cities (boroughid, name); + +/* -------------------------------------------------------- + Structure of table "location_street_types" +-------------------------------------------------------- */ +DROP SEQUENCE IF EXISTS location_street_types_id_seq; +CREATE SEQUENCE location_street_types_id_seq; +DROP TABLE IF EXISTS location_street_types CASCADE; +CREATE TABLE location_street_types ( + id integer DEFAULT nextval('location_street_types_id_seq'::text) NOT NULL, + name varchar(8) NOT NULL, -- TERYT: CECHA + PRIMARY KEY (id) +); + +/* -------------------------------------------------------- + Structure of table "location_streets" +-------------------------------------------------------- */ +DROP SEQUENCE IF EXISTS location_streets_id_seq; +CREATE SEQUENCE location_streets_id_seq; +DROP TABLE IF EXISTS location_streets CASCADE; +CREATE TABLE location_streets ( + id integer DEFAULT nextval('location_streets_id_seq'::text) NOT NULL, + name varchar(128) NOT NULL, -- TERYT: NAZWA_1 + ident varchar(8) NOT NULL, -- TERYT: SYM_UL + typeid integer DEFAULT NULL + REFERENCES location_street_types (id) ON DELETE SET NULL ON UPDATE CASCADE, + cityid integer NOT NULL + REFERENCES location_cities (id) ON DELETE CASCADE ON UPDATE CASCADE, + PRIMARY KEY (id), + UNIQUE (cityid, name, ident) +); + +/* -------------------------------------------------------- + Structure of table "networks" -------------------------------------------------------- */ DROP SEQUENCE IF EXISTS networks_id_seq; CREATE SEQUENCE networks_id_seq; @@ -174,7 +270,7 @@ ); /* -------------------------------------------------------- - Structure of table "nodes" + Structure of table "nodes" -------------------------------------------------------- */ DROP SEQUENCE IF EXISTS nodes_id_seq; CREATE SEQUENCE nodes_id_seq; @@ -199,10 +295,16 @@ halfduplex smallint DEFAULT 0 NOT NULL, lastonline integer DEFAULT 0 NOT NULL, info text DEFAULT '' NOT NULL, - location_address varchar(255) DEFAULT NULL, - location_zip varchar(10) DEFAULT NULL, - location_city varchar(32) DEFAULT NULL, + location varchar(255) DEFAULT NULL, + location_city integer DEFAULT NULL + REFERENCES location_cities (id) ON DELETE SET NULL ON UPDATE CASCADE, + location_street integer DEFAULT NULL + REFERENCES location_streets (id) ON DELETE SET NULL ON UPDATE CASCADE, + location_house varchar(8) DEFAULT NULL, + location_flat varchar(8) DEFAULT NULL, nas smallint DEFAULT 0 NOT NULL, + longitude numeric(10, 6) DEFAULT NULL, + latitude numeric(10, 6) DEFAULT NULL, PRIMARY KEY (id), UNIQUE (name), UNIQUE (ipaddr) @@ -210,6 +312,8 @@ CREATE INDEX nodes_netdev_idx ON nodes (netdev); CREATE INDEX nodes_ownerid_idx ON nodes (ownerid); CREATE INDEX nodes_ipaddr_pub_idx ON nodes (ipaddr_pub); +CREATE INDEX nodes_location_street_idx ON nodes (location_street); +CREATE INDEX nodes_location_city_idx ON nodes (location_city, location_street, location_house, location_flat); /* -------------------------------------------------------- Structure of table "macs" @@ -505,8 +609,9 @@ count numeric(9,2) DEFAULT 0 NOT NULL, description text DEFAULT '' NOT NULL, tariffid integer DEFAULT 0 NOT NULL, - discount numeric(4,2) DEFAULT 0 NOT NULL -); + pdiscount numeric(4,2) DEFAULT 0 NOT NULL, + vdiscount numeric(9,2) DEFAULT 0 NOT NULL +); CREATE INDEX invoicecontents_docid_idx ON invoicecontents (docid); /* -------------------------------------------------------- @@ -736,6 +841,43 @@ CREATE INDEX rtattachments_message_idx ON rtattachments (messageid); +DROP SEQUENCE IF EXISTS rtcategories_id_seq; +CREATE SEQUENCE rtcategories_id_seq; +DROP TABLE IF EXISTS rtcategories CASCADE; +CREATE TABLE rtcategories ( + id integer DEFAULT nextval('rtcategories_id_seq'::text) NOT NULL, + name varchar(255) DEFAULT '' NOT NULL, + description text DEFAULT '' NOT NULL, + PRIMARY KEY (id), + UNIQUE (name) +); + +DROP SEQUENCE IF EXISTS rtcategoryusers_id_seq; +CREATE SEQUENCE rtcategoryusers_id_seq; +DROP TABLE IF EXISTS rtcategoryusers CASCADE; +CREATE TABLE rtcategoryusers ( + id integer DEFAULT nextval('rtcategoryusers_id_seq'::text) NOT NULL, + userid integer NOT NULL + REFERENCES users (id) ON DELETE CASCADE ON UPDATE CASCADE, + categoryid integer NOT NULL + REFERENCES rtcategories (id) ON DELETE CASCADE ON UPDATE CASCADE, + PRIMARY KEY (id), + CONSTRAINT rtcategories_userid_key UNIQUE (userid, categoryid) +); + +DROP SEQUENCE IF EXISTS rtticketcategories_id_seq; +CREATE SEQUENCE rtticketcategories_id_seq; +DROP TABLE IF EXISTS rtticketcategories CASCADE; +CREATE TABLE rtticketcategories ( + id integer DEFAUlT nextval('rtticketcategories_id_seq'::text) NOT NULL, + ticketid integer NOT NULL + REFERENCES rttickets (id) ON DELETE CASCADE ON UPDATE CASCADE, + categoryid integer NOT NULL + REFERENCES rtcategories (id) ON DELETE CASCADE ON UPDATE CASCADE, + PRIMARY KEY (id), + CONSTRAINT rtticketcategories_ticketid_key UNIQUE (ticketid, categoryid) +); + /* --------------------------------------------------- Structure of table "passwd" (accounts) ------------------------------------------------------*/ @@ -1175,6 +1317,12 @@ id integer default nextval('netdevices_id_seq'::text) NOT NULL, name varchar(32) DEFAULT '' NOT NULL, location varchar(255) DEFAULT '' NOT NULL, + location_city integer DEFAULT NULL + REFERENCES location_cities (id) ON DELETE SET NULL ON UPDATE CASCADE, + location_street integer DEFAULT NULL + REFERENCES location_streets (id) ON DELETE SET NULL ON UPDATE CASCADE, + location_house varchar(8) DEFAULT NULL, + location_flat varchar(8) DEFAULT NULL, description text DEFAULT '' NOT NULL, producer varchar(64) DEFAULT '' NOT NULL, model varchar(32) DEFAULT '' NOT NULL, @@ -1189,10 +1337,13 @@ community varchar(50) DEFAULT '' NOT NULL, channelid integer DEFAULT NULL REFERENCES ewx_channels (id) ON DELETE SET NULL ON UPDATE CASCADE, + longitude numeric(10, 6) DEFAULT NULL, + latitude numeric(10, 6) DEFAULT NULL, PRIMARY KEY (id) ); - CREATE INDEX netdevices_channelid_idx ON netdevices (channelid); +CREATE INDEX netdevices_location_street_idx ON netdevices (location_street); +CREATE INDEX netdevices_location_city_idx ON netdevices (location_city, location_street, location_house, location_flat); /* --------------------------------------------------- Structure of table "dbinfo" @@ -1337,6 +1488,7 @@ login varchar(255) NOT NULL DEFAULT '', passwd varchar(255) NOT NULL DEFAULT '', phone varchar(255) NOT NULL DEFAULT '', + access smallint NOT NULL DEFAULT 1, creationdate integer NOT NULL DEFAULT 0, moddate integer NOT NULL DEFAULT 0, creatorid integer NOT NULL DEFAULT 0, @@ -1523,6 +1675,44 @@ FROM nodes n JOIN macs m ON (n.id = m.nodeid); + +CREATE VIEW teryt_terc AS +SELECT ident AS woj, 0::text AS pow, 0::text AS gmi, 0 AS rodz, + UPPER(name) AS nazwa + FROM location_states + UNION + SELECT s.ident AS woj, d.ident AS pow, 0::text AS gmi, 0 AS rodz, + d.name AS nazwa + FROM location_districts d + JOIN location_states s ON (d.stateid = s.id) + UNION + SELECT s.ident AS woj, d.ident AS pow, b.ident AS gmi, b.type AS rodz, + b.name AS nazwa + FROM location_boroughs b + JOIN location_districts d ON (b.districtid = d.id) + JOIN location_states s ON (d.stateid = s.id); + +CREATE VIEW teryt_simc AS +SELECT s.ident AS woj, d.ident AS pow, b.ident AS gmi, b.type AS rodz_gmi, + c.ident AS sym, c.name AS nazwa, + (CASE WHEN cc.ident IS NOT NULL THEN cc.ident ELSE c.ident END) AS sympod + FROM location_cities c + JOIN location_boroughs b ON (c.boroughid = b.id) + JOIN location_districts d ON (b.districtid = d.id) + JOIN location_states s ON (d.stateid = s.id) + LEFT JOIN location_cities cc ON (c.cityid = cc.id); + +CREATE VIEW teryt_ulic AS +SELECT st.ident AS woj, d.ident AS pow, b.ident AS gmi, b.type AS rodz_gmi, + c.ident AS sym, s.ident AS sym_ul, s.name AS nazwa_1, t.name AS cecha, s.id + FROM location_streets s + JOIN location_street_types t ON (s.typeid = t.id) + JOIN location_cities c ON (s.cityid = c.id) + JOIN location_boroughs b ON (c.boroughid = b.id) + JOIN location_districts d ON (b.districtid = d.id) + JOIN location_states st ON (d.stateid = st.id); + + /* --------------------------------------------------- Data records ------------------------------------------------------*/ @@ -1552,6 +1742,7 @@ VALUES ('userpanel', 'logout_url', '', '', 0); INSERT INTO uiconfig (section, var, value, description, disabled) VALUES ('userpanel', 'owner_stats', '0', '', 0); +INSERT INTO uiconfig (section, var) VALUES ('userpanel', 'default_categories'); INSERT INTO up_rights(module, name, description) VALUES ('info', 'edit_addr_ack', 'Customer can change address information with admin acknowlegment'); INSERT INTO up_rights(module, name, description) @@ -1581,4 +1772,4 @@ INSERT INTO nastypes (name) VALUES ('usrhiper'); INSERT INTO nastypes (name) VALUES ('other'); -INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2011041500'); +INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2011113000'); From cvs w lms.org.pl Fri Dec 30 15:19:38 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 15:19:38 +0100 (CET) Subject: [lms-commits] CVS update of lms/doc/sgml (advanced.sgml) Message-ID: <20111230141938.694BD30281A6@eftep.altec.pl> Date: Friday, December 30, 2011 @ 15:19:38 Author: alec Path: /cvsroot/lms/doc/sgml Modified: advanced.sgml - Updated DDL files, updated documentation Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/doc/sgml/advanced.sgml.diff?&r1=1.123&r2=1.124 Index: lms/doc/sgml/advanced.sgml diff -u lms/doc/sgml/advanced.sgml:1.123 lms/doc/sgml/advanced.sgml:1.124 --- lms/doc/sgml/advanced.sgml:1.123 Fri Apr 15 19:47:27 2011 +++ lms/doc/sgml/advanced.sgml Fri Dec 30 15:19:38 2011 @@ -1,4 +1,4 @@ - + For curious @@ -183,7 +183,11 @@ id - serial number name - name - location - physical location + location - physical location text + location_city - city identifier + location_street - street identifier + location_house - house number + location_flat - flat number description - device summary producer - manufacturer's name model - model number @@ -197,6 +201,8 @@ secret - password (radius) community - SNMP community channelid - STM channel identifier (ewx_channels table) + longitude - geog. longitude + latitude - geog latitude @@ -231,10 +237,14 @@ halfduplex - half/full duplex mode (0/1) lastonline - last network activity timestamp info - additional information - location_address - address - street, apartment, flat, etc - location_zip - address - zip code - location_city - address - location (city) + location_address - address string + location_city - city identifier + location_street - street identifier + location_house - house number + location_flat - flat number nas - NAS flag (1/0) + longitude - geog. longitude + latitude - geog latitude @@ -422,7 +432,8 @@ datefrom - start date for assignment dateto - end date for assignment invoice - invoice writeout? (1 - yes, 0 - no) - discount - discount percentage + pdiscount - discount percentage + vdiscount - discount value suspended - is this payment suspended? (1 - yes, 0 - no) settlement - do deficient period settlement? (1 - yes, 0 - no) paytype - invoice payment type identifier @@ -544,7 +555,8 @@ docid - invoice serial number itemid - invoice item identifier value - amount - discount - discount percentage + pdiscount - discount percentage + vdiscount - discount value taxid - tax rate identifier prodid - product/service classification number content - used unit (usually 'pc.') @@ -675,6 +687,7 @@ login - login passwd - password phone - phone number + access - enabled/disabled (1/0) creationdate - date of account creation moddate - date of last account modification creatorid - creator (user) identifier From cvs w lms.org.pl Fri Dec 30 15:19:38 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 15:19:38 +0100 (CET) Subject: [lms-commits] CVS update of lms/doc/sgml/pl (advanced.sgml, install.sgml) Message-ID: <20111230141938.96E1C30281A7@eftep.altec.pl> Date: Friday, December 30, 2011 @ 15:19:38 Author: alec Path: /cvsroot/lms/doc/sgml/pl Modified: advanced.sgml install.sgml - Updated DDL files, updated documentation Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/doc/sgml/pl/advanced.sgml.diff?&r1=1.85&r2=1.86 http://cvs.lms.org.pl/viewvc/Development/lms/doc/sgml/pl/install.sgml.diff?&r1=1.102&r2=1.103 Index: lms/doc/sgml/pl/advanced.sgml diff -u lms/doc/sgml/pl/advanced.sgml:1.85 lms/doc/sgml/pl/advanced.sgml:1.86 --- lms/doc/sgml/pl/advanced.sgml:1.85 Fri Apr 15 19:47:28 2011 +++ lms/doc/sgml/pl/advanced.sgml Fri Dec 30 15:19:38 2011 @@ -1,4 +1,4 @@ - + Dla dociekliwych @@ -187,7 +187,11 @@ id - identyfikator name - nazwa - location - lokalizacja + location - lokalizacja, tekst + location_city - identyfikator miejscowości (TERYT) + location_street - identyfikator ulicy (TERYT) + location_house - numer domu + location_flat - numer mieszkania description - opis producer - producent model - model @@ -201,6 +205,8 @@ secret - hasło (radius) community - community SNMP channelid - identyfikator kanału STM (tabela ewx_channels) + longitude - długość geograficzna + latitude - szerokość geograficzna @@ -235,10 +241,14 @@ warning - ostrzegaj/nie ostrzegaj (1/0) lastonline - znacznik czasu ostatniej obecności w sieci info - informacje dodatkowe - location_address - adres lokalizacji - ulica, nr domu, nr lokalu - location_zip - adres lokalizacji - kod pocztowy - location_city - adres lokalizacji - miasto + location - adres lokalizacji, tekst + location_city - identyfikator miejscowości (TERYT) + location_street - identyfikator ulicy (TERYT) + location_house - numer domu + location_flat - numer mieszkania nas - flaga NAS (0/1) + longitude - długość geograficzna + latitude - szerokość geograficzna @@ -436,7 +446,8 @@ datefrom - data obowiązywania zobowiązania dateto - data obowiązywania zobowiązania invoice - określa czy ma być wystawiana faktura (1 - tak, 0 - nie) - discount - wartość procentowa rabatu + pdiscount - wartość procentowa rabatu + vdiscount - wartość kwotowa rabatu suspended - zawieszenie płatności (1 - tak, 0 - nie) settlement - rozliczenie okresu niepełnego (1 - tak, 0 - nie) paytype - identyfikator typu płatności faktury @@ -547,7 +558,8 @@ docid - identyfikator faktury itemid - nr pozycji value - kwota pozycji - discount - wartość procentowa rabatu + pdiscount - wartość procentowa rabatu + vdiscount - wartość kwotowa rabatu taxid - identyfikator stawki podatkowej prodid - numer PKWiU content - użyta jednostka (najczęściej 'szt.') @@ -677,6 +689,7 @@ login - login passwd - hasło phone - numer telefonu + access - włączone/wyłączone (1/0) creationdate - data utworzenia moddate - date ostatniej zmiany creatorid - identyfikator użytkownika Index: lms/doc/sgml/pl/install.sgml diff -u lms/doc/sgml/pl/install.sgml:1.102 lms/doc/sgml/pl/install.sgml:1.103 --- lms/doc/sgml/pl/install.sgml:1.102 Fri Oct 14 18:31:02 2011 +++ lms/doc/sgml/pl/install.sgml Fri Dec 30 15:19:38 2011 @@ -1,4 +1,4 @@ - + Instalacja i konfiguracja @@ -894,4 +894,12 @@ domyślnym dokumencie. + + Baza podziału terytorialnego (TERYT) + LMS obsługuje bazę podziału terytorialnego TERYT w sposób umożliwiający przypisanie + adresów zgodnych z zawartością tej bazy do komputerów oraz urządzeń sieciowych. + Aby mieć możliwość wyboru adresów z listy należy zaimportować bazę TERYT. + Służy do tego skrypt . + + From cvs w lms.org.pl Fri Dec 30 15:19:38 2011 From: cvs w lms.org.pl (LMS CVS) Date: Fri, 30 Dec 2011 15:19:38 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib (LMS.class.php) Message-ID: <20111230141938.BBA8A30281A1@eftep.altec.pl> Date: Friday, December 30, 2011 @ 15:19:38 Author: alec Path: /cvsroot/lms/lib Modified: LMS.class.php - Updated DDL files, updated documentation Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/LMS.class.php.diff?&r1=1.1091&r2=1.1092 Index: lms/lib/LMS.class.php diff -u lms/lib/LMS.class.php:1.1091 lms/lib/LMS.class.php:1.1092 --- lms/lib/LMS.class.php:1.1091 Fri Dec 30 14:24:58 2011 +++ lms/lib/LMS.class.php Fri Dec 30 15:19:38 2011 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: LMS.class.php,v 1.1091 2011/12/30 13:24:58 alec Exp $ + * $Id: LMS.class.php,v 1.1092 2011/12/30 14:19:38 alec Exp $ */ // LMS Class - contains internal LMS database functions used @@ -35,7 +35,7 @@ var $cache = array(); // internal cache var $hooks = array(); // registered plugin hooks var $_version = '1.11-cvs'; // class version - var $_revision = '$Revision: 1.1091 $'; + var $_revision = '$Revision: 1.1092 $'; function LMS(&$DB, &$AUTH, &$CONFIG) // class variables setting { @@ -52,21 +52,21 @@ return TRUE; } - function InitUI() + function InitUI() + { + // set current user + switch ($this->CONFIG['database']['type']) { - // set current user - switch ($this->CONFIG['database']['type']) - { - case 'postgres': - $this->DB->Execute('SELECT set_config(\'lms.current_user\', ?, false)', - array($this->AUTH->id)); - break; - case 'mysql': - case 'mysqli': - $this->DB->Execute('SET @lms_current_user=?', array($this->AUTH->id)); - break; - } + case 'postgres': + $this->DB->Execute('SELECT set_config(\'lms.current_user\', ?, false)', + array($this->AUTH->id)); + break; + case 'mysql': + case 'mysqli': + $this->DB->Execute('SET @lms_current_user=?', array($this->AUTH->id)); + break; } + } /* * Logging