From cvs w lms.org.pl Wed Feb 1 23:37:58 2012 From: cvs w lms.org.pl (LMS CVS) Date: Wed, 1 Feb 2012 23:37:58 +0100 (CET) Subject: [lms-commits] CVS update of lms/modules (nodeprint.php) Message-ID: <20120201223758.D4DE530281A7@eftep.altec.pl> Date: Wednesday, February 1, 2012 @ 23:37:58 Author: chilek Path: /cvsroot/lms/modules Modified: nodeprint.php - BTS#0000903: fixed inproper network and group handling in nodeprint.php Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/modules/nodeprint.php.diff?&r1=1.15&r2=1.16 Index: lms/modules/nodeprint.php diff -u lms/modules/nodeprint.php:1.15 lms/modules/nodeprint.php:1.16 --- lms/modules/nodeprint.php:1.15 Mon Jan 2 12:01:35 2012 +++ lms/modules/nodeprint.php Wed Feb 1 23:37:58 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: nodeprint.php,v 1.15 2012/01/02 11:01:35 alec Exp $ + * $Id: nodeprint.php,v 1.16 2012/02/01 22:37:58 chilek Exp $ */ $type = isset($_GET['type']) ? $_GET['type'] : ''; @@ -65,21 +65,22 @@ case 'mac': $sqlord = ' ORDER BY mac'; break; - case 'ip': + case 'ip': $sqlord = ' ORDER BY ipaddr'; break; case 'ownerid': $sqlord = ' ORDER BY ownerid'; break; - case 'owner': + case 'owner': $sqlord = ' ORDER BY owner'; break; } - if($_POST['network']) + $net = intval($_POST['network']); + if ($net) $net = $LMS->GetNetworkParams($_POST['network']); - - $group = $_POST['customergroup']; + + $group = intval($_POST['customergroup']); $nodelist = $DB->GetAll('SELECT vnodes.id AS id, inet_ntoa(ipaddr) AS ip, mac, vnodes.name AS name, vnodes.info AS info, From cvs w lms.org.pl Thu Feb 2 17:55:05 2012 From: cvs w lms.org.pl (LMS CVS) Date: Thu, 2 Feb 2012 17:55:05 +0100 (CET) Subject: [lms-commits] CVS update of lms/modules (4 files) Message-ID: <20120202165505.2660030281AD@eftep.altec.pl> Date: Thursday, February 2, 2012 @ 17:55:05 Author: chilek Path: /cvsroot/lms/modules Modified: customeradd.php customeredit.php nodeadd.php nodeedit.php - new contact add and new mac add ported to javascript Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/modules/customeradd.php.diff?&r1=1.38&r2=1.39 http://cvs.lms.org.pl/viewvc/Development/lms/modules/customeredit.php.diff?&r1=1.48&r2=1.49 http://cvs.lms.org.pl/viewvc/Development/lms/modules/nodeadd.php.diff?&r1=1.102&r2=1.103 http://cvs.lms.org.pl/viewvc/Development/lms/modules/nodeedit.php.diff?&r1=1.123&r2=1.124 Index: lms/modules/customeradd.php diff -u lms/modules/customeradd.php:1.38 lms/modules/customeradd.php:1.39 --- lms/modules/customeradd.php:1.38 Mon Jan 2 12:01:34 2012 +++ lms/modules/customeradd.php Thu Feb 2 17:55:05 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: customeradd.php,v 1.38 2012/01/02 11:01:34 alec Exp $ + * $Id: customeradd.php,v 1.39 2012/02/02 16:55:05 chilek Exp $ */ if(isset($_GET['ajax'])) @@ -72,12 +72,7 @@ $customeradd = array(); -if(isset($_POST['customeradd']) && isset($_GET['newcontact'])) -{ - $customeradd = $_POST['customeradd']; - $customeradd['contacts'][] = array(); -} -elseif(isset($_POST['customeradd'])) +if (isset($_POST['customeradd'])) { $customeradd = $_POST['customeradd']; Index: lms/modules/customeredit.php diff -u lms/modules/customeredit.php:1.48 lms/modules/customeredit.php:1.49 --- lms/modules/customeredit.php:1.48 Mon Jan 2 12:01:34 2012 +++ lms/modules/customeredit.php Thu Feb 2 17:55:05 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: customeredit.php,v 1.48 2012/01/02 11:01:34 alec Exp $ + * $Id: customeredit.php,v 1.49 2012/02/02 16:55:05 chilek Exp $ */ $action = isset($_GET['action']) ? $_GET['action'] : ''; $exists = $LMS->CustomerExists($_GET['id']); @@ -34,7 +34,7 @@ { $SESSION->redirect('?m=customerlist'); } -elseif(isset($_POST['customerdata']) && !isset($_GET['newcontact'])) +elseif (isset($_POST['customerdata'])) { $customerdata = $_POST['customerdata']; foreach($customerdata as $key=>$value) @@ -192,13 +192,7 @@ foreach($customerinfo['messengers'] as $idx => $val) $customerinfo['uid'][$idx] = $val['uid']; - if(isset($_POST['customerdata']) && isset($_GET['newcontact'])) - { - $customerdata = $_POST['customerdata']; - $customerdata['contacts'][] = array(); - $customerinfo = array_merge($customerinfo, $customerdata); - } - elseif(empty($customerinfo['contacts'])) + if (empty($customerinfo['contacts'])) $customerinfo['contacts'][] = array(); } Index: lms/modules/nodeadd.php diff -u lms/modules/nodeadd.php:1.102 lms/modules/nodeadd.php:1.103 --- lms/modules/nodeadd.php:1.102 Mon Jan 2 12:01:35 2012 +++ lms/modules/nodeadd.php Thu Feb 2 17:55:05 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: nodeadd.php,v 1.102 2012/01/02 11:01:35 alec Exp $ + * $Id: nodeadd.php,v 1.103 2012/02/02 16:55:05 chilek Exp $ */ $nodedata['access'] = 1; @@ -48,7 +48,7 @@ if(isset($_GET['prename'])) $nodedata['name'] = $_GET['prename']; -if(isset($_POST['nodedata']) && !isset($_GET['newmac'])) +if (isset($_POST['nodedata'])) { $nodedata = $_POST['nodedata']; @@ -203,16 +203,6 @@ $nodedata['ipaddr_pub'] = ''; } } -else -{ - if(isset($_POST['nodedata']) && isset($_GET['newmac'])) - { - $nodedata = $_POST['nodedata']; - $nodedata['ipaddr'] = $_POST['nodedataipaddr']; - $nodedata['ipaddr_pub'] = $_POST['nodedataipaddr_pub']; - $nodedata['macs'][] = ''; - } -} if(empty($nodedata['macs'])) $nodedata['macs'][] = ''; Index: lms/modules/nodeedit.php diff -u lms/modules/nodeedit.php:1.123 lms/modules/nodeedit.php:1.124 --- lms/modules/nodeedit.php:1.123 Mon Jan 2 12:01:35 2012 +++ lms/modules/nodeedit.php Thu Feb 2 17:55:05 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: nodeedit.php,v 1.123 2012/01/02 11:01:35 alec Exp $ + * $Id: nodeedit.php,v 1.124 2012/02/02 16:55:05 chilek Exp $ */ $action = isset($_GET['action']) ? $_GET['action'] : ''; @@ -76,7 +76,7 @@ $layout['pagetitle'] = trans('Node Edit: $a', $nodeinfo['name']); -if(isset($_POST['nodeedit']) && !isset($_GET['newmac'])) +if (isset($_POST['nodeedit'])) { $nodeedit = $_POST['nodeedit']; @@ -247,17 +247,10 @@ } else { - if(isset($_POST['nodeedit']) && isset($_GET['newmac'])) - { - $nodeedit = $_POST['nodeedit']; - $nodeedit['macs'][] = ''; - $nodeinfo = array_merge($nodeinfo, $nodeedit); + if ($nodeinfo['city_name'] || $nodeinfo['street_name']) { + $nodeinfo['teryt'] = true; + $nodeinfo['location'] = location_str($nodeinfo); } - - if ($nodeinfo['city_name'] || $nodeinfo['street_name']) { - $nodeinfo['teryt'] = true; - $nodeinfo['location'] = location_str($nodeinfo); - } } if(empty($nodeinfo['macs'])) From cvs w lms.org.pl Thu Feb 2 17:55:05 2012 From: cvs w lms.org.pl (LMS CVS) Date: Thu, 2 Feb 2012 17:55:05 +0100 (CET) Subject: [lms-commits] CVS update of lms/templates (4 files) Message-ID: <20120202165505.4F93C30281B0@eftep.altec.pl> Date: Thursday, February 2, 2012 @ 17:55:05 Author: chilek Path: /cvsroot/lms/templates Modified: customeradd.html customereditbox.html nodeaddbox.html nodeeditbox.html - new contact add and new mac add ported to javascript Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/templates/customeradd.html.diff?&r1=1.50&r2=1.51 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customereditbox.html.diff?&r1=1.46&r2=1.47 http://cvs.lms.org.pl/viewvc/Development/lms/templates/nodeaddbox.html.diff?&r1=1.94&r2=1.95 http://cvs.lms.org.pl/viewvc/Development/lms/templates/nodeeditbox.html.diff?&r1=1.98&r2=1.99 Index: lms/templates/customeradd.html diff -u lms/templates/customeradd.html:1.50 lms/templates/customeradd.html:1.51 --- lms/templates/customeradd.html:1.50 Mon Jan 2 15:53:20 2012 +++ lms/templates/customeradd.html Thu Feb 2 17:55:05 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

@@ -202,7 +216,7 @@ {foreach from=$customeradd.contacts item=item key=key} - + @@ -215,9 +229,10 @@ {/foreach} - + + {trans("Add contact field")} »»» Index: lms/templates/customereditbox.html diff -u lms/templates/customereditbox.html:1.46 lms/templates/customereditbox.html:1.47 --- lms/templates/customereditbox.html:1.46 Mon Jan 2 15:53:20 2012 +++ lms/templates/customereditbox.html Thu Feb 2 17:55:05 2012 @@ -1,4 +1,4 @@ - + @@ -193,7 +209,7 @@ {foreach from=$customerinfo.contacts item=item key=key} - + @@ -209,6 +225,7 @@ + {trans("Add contact field")} »»» Index: lms/templates/nodeaddbox.html diff -u lms/templates/nodeaddbox.html:1.94 lms/templates/nodeaddbox.html:1.95 --- lms/templates/nodeaddbox.html:1.94 Mon Jan 2 15:53:20 2012 +++ lms/templates/nodeaddbox.html Thu Feb 2 17:55:05 2012 @@ -1,4 +1,4 @@ - +
@@ -41,11 +41,12 @@ @@ -224,8 +225,16 @@ function newmac() { - document.nodeadd.action += '&newmac=1'; - document.nodeadd.submit(); + var macscountelem = document.getElementById('macscount'); + var nr = macscountelem.value; + var lastmacelem = document.getElementById('mac' + (nr - 1)); + var newrow = lastmacelem.parentNode.insertRow(lastmacelem.rowIndex + 1); + newrow.id = 'mac' + nr; + newrow.innerHTML = ''; + macscountelem.value = parseInt(nr) + 1; } function reset_customer() Index: lms/templates/nodeeditbox.html diff -u lms/templates/nodeeditbox.html:1.98 lms/templates/nodeeditbox.html:1.99 --- lms/templates/nodeeditbox.html:1.98 Mon Jan 2 15:53:20 2012 +++ lms/templates/nodeeditbox.html Thu Feb 2 17:55:05 2012 @@ -1,4 +1,4 @@ - + @@ -41,11 +41,12 @@ @@ -235,8 +236,16 @@ function newmac() { - document.editnode.action += '&newmac=1'; - document.editnode.submit(); + var macscountelem = document.getElementById('macscount'); + var nr = macscountelem.value; + var lastmacelem = document.getElementById('mac' + (nr - 1)); + var newrow = lastmacelem.parentNode.insertRow(lastmacelem.rowIndex + 1); + newrow.id = 'mac' + nr; + newrow.innerHTML = ''; + macscountelem.value = parseInt(nr) + 1; } function reset_customer() From cvs w lms.org.pl Thu Feb 2 17:55:04 2012 From: cvs w lms.org.pl (LMS CVS) Date: Thu, 2 Feb 2012 17:55:04 +0100 (CET) Subject: [lms-commits] CVS update of lms/doc (ChangeLog) Message-ID: <20120202165505.05B6E30281A7@eftep.altec.pl> Date: Thursday, February 2, 2012 @ 17:55:04 Author: chilek Path: /cvsroot/lms/doc Modified: ChangeLog - new contact add and new mac add ported to javascript Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/doc/ChangeLog.diff?&r1=1.1631&r2=1.1632 Index: lms/doc/ChangeLog diff -u lms/doc/ChangeLog:1.1631 lms/doc/ChangeLog:1.1632 --- lms/doc/ChangeLog:1.1631 Wed Jan 18 09:14:23 2012 +++ lms/doc/ChangeLog Thu Feb 2 17:55:04 2012 @@ -1,4 +1,4 @@ -$Id: ChangeLog,v 1.1631 2012/01/18 08:14:23 alec Exp $ +$Id: ChangeLog,v 1.1632 2012/02/02 16:55:04 chilek Exp $ version ? (????-??-??): @@ -85,6 +85,7 @@ - ping: added selection of ping type thanks to Grzegorz Cichowski [chilan] - use more @@ -153,8 +154,16 @@ function newmac() { - document.editipaddr.action += '&newmac=1'; - document.editipaddr.submit(); + var macscountelem = document.getElementById('macscount'); + var nr = macscountelem.value; + var lastmacelem = document.getElementById('mac' + (nr - 1)); + var newrow = lastmacelem.parentNode.insertRow(lastmacelem.rowIndex + 1); + newrow.id = 'mac' + nr; + newrow.innerHTML = ''; + macscountelem.value = parseInt(nr) + 1; } //--> Index: lms/templates/netdevipeditbox.html diff -u lms/templates/netdevipeditbox.html:1.34 lms/templates/netdevipeditbox.html:1.35 --- lms/templates/netdevipeditbox.html:1.34 Mon Jan 2 15:53:20 2012 +++ lms/templates/netdevipeditbox.html Thu Feb 2 18:25:42 2012 @@ -1,4 +1,4 @@ - + @@ -60,11 +60,12 @@ @@ -182,8 +183,16 @@ function newmac() { - document.editipaddr.action += '&newmac=1'; - document.editipaddr.submit(); + var macscountelem = document.getElementById('macscount'); + var nr = macscountelem.value; + var lastmacelem = document.getElementById('mac' + (nr - 1)); + var newrow = lastmacelem.parentNode.insertRow(lastmacelem.rowIndex + 1); + newrow.id = 'mac' + nr; + newrow.innerHTML = ''; + macscountelem.value = parseInt(nr) + 1; } //--> From cvs w lms.org.pl Thu Feb 2 18:25:42 2012 From: cvs w lms.org.pl (LMS CVS) Date: Thu, 2 Feb 2012 18:25:42 +0100 (CET) Subject: [lms-commits] CVS update of lms/modules (netdevedit.php) Message-ID: <20120202172542.28DFF30281A7@eftep.altec.pl> Date: Thursday, February 2, 2012 @ 18:25:42 Author: chilek Path: /cvsroot/lms/modules Modified: netdevedit.php - new contact add and new mac add ported to javascript (netdevedit) Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/modules/netdevedit.php.diff?&r1=1.76&r2=1.77 Index: lms/modules/netdevedit.php diff -u lms/modules/netdevedit.php:1.76 lms/modules/netdevedit.php:1.77 --- lms/modules/netdevedit.php:1.76 Mon Jan 2 12:01:35 2012 +++ lms/modules/netdevedit.php Thu Feb 2 18:25:42 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: netdevedit.php,v 1.76 2012/01/02 11:01:35 alec Exp $ + * $Id: netdevedit.php,v 1.77 2012/02/02 17:25:42 chilek Exp $ */ if(! $LMS->NetDevExists($_GET['id'])) @@ -337,82 +337,75 @@ if($key != 'macs') $nodeipdata[$key] = trim($value); - if(!isset($_GET['newmac'])) + if ($nodeipdata['ipaddr'] == '' && empty($nodeipdata['macs']) && $nodeipdata['name'] == '' && $nodeipdata['passwd'] == '') { - if($nodeipdata['ipaddr']=='' && empty($nodeipdata['macs']) && $nodeipdata['name']=='' && $nodeipdata['passwd']=='') + $SESSION->redirect('?m=netdevedit&action=addip&id='.$_GET['id']); + } + + if ($nodeipdata['name'] == '') + $error['ipname'] = trans('Address field is required!'); + elseif (strlen($nodeipdata['name']) > 32) + $error['ipname'] = trans('Specified name is too long (max.$a characters)!','32'); + elseif ($LMS->GetNodeIDByName($nodeipdata['name'])) + $error['ipname'] = trans('Specified name is in use!'); + elseif (!preg_match('/^[_a-z0-9-]+$/i', $nodeipdata['name'])) + $error['ipname'] = trans('Name contains forbidden characters!'); + + if ($nodeipdata['ipaddr'] == '') + $error['ipaddr'] = trans('IP address is required!'); + elseif (!check_ip($nodeipdata['ipaddr'])) + $error['ipaddr'] = trans('Incorrect IP address!'); + elseif (!$LMS->IsIPValid($nodeipdata['ipaddr'])) + $error['ipaddr'] = trans('Specified address does not belongs to any network!'); + elseif (!$LMS->IsIPFree($nodeipdata['ipaddr'])) + $error['ipaddr'] = trans('Specified IP address is in use!'); + + if ($nodeipdata['ipaddr_pub'] != '0.0.0.0' && $nodeipdata['ipaddr_pub'] != '') + { + if (!check_ip($nodeipdata['ipaddr_pub'])) + $error['ipaddr_pub'] = trans('Incorrect IP address!'); + elseif (!$LMS->IsIPValid($nodeipdata['ipaddr_pub'])) + $error['ipaddr_pub'] = trans('Specified address does not belongs to any network!'); + elseif (!$LMS->IsIPFree($nodeipdata['ipaddr_pub'])) + $error['ipaddr_pub'] = trans('Specified IP address is in use!'); + } + else + $nodeipdata['ipaddr_pub'] = '0.0.0.0'; + + $macs = array(); + foreach ($nodeipdata['macs'] as $key => $value) + if (check_mac($value)) { - $SESSION->redirect('?m=netdevedit&action=addip&id='.$_GET['id']); - } + if ($value != '00:00:00:00:00:00' && !chkconfig($CONFIG['phpui']['allow_mac_sharing'])) + if ($LMS->GetNodeIDByMAC($value)) + $error['mac'.$key] = trans('MAC address is in use!'); + $macs[] = $value; + } + elseif ($value != '') + $error['mac'.$key] = trans('Incorrect MAC address!'); + if (empty($macs)) + $error['mac0'] = trans('MAC address is required!'); + $nodeipdata['macs'] = $macs; - if($nodeipdata['name']=='') - $error['ipname'] = trans('Address field is required!'); - elseif(strlen($nodeipdata['name']) > 32) - $error['ipname'] = trans('Specified name is too long (max.$a characters)!','32'); - elseif($LMS->GetNodeIDByName($nodeipdata['name'])) - $error['ipname'] = trans('Specified name is in use!'); - elseif(!preg_match('/^[_a-z0-9-]+$/i', $nodeipdata['name'])) - $error['ipname'] = trans('Name contains forbidden characters!'); - - if($nodeipdata['ipaddr']=='') - $error['ipaddr'] = trans('IP address is required!'); - elseif(!check_ip($nodeipdata['ipaddr'])) - $error['ipaddr'] = trans('Incorrect IP address!'); - elseif(!$LMS->IsIPValid($nodeipdata['ipaddr'])) - $error['ipaddr'] = trans('Specified address does not belongs to any network!'); - elseif(!$LMS->IsIPFree($nodeipdata['ipaddr'])) - $error['ipaddr'] = trans('Specified IP address is in use!'); - - if($nodeipdata['ipaddr_pub']!='0.0.0.0' && $nodeipdata['ipaddr_pub']!='') - { - if(!check_ip($nodeipdata['ipaddr_pub'])) - $error['ipaddr_pub'] = trans('Incorrect IP address!'); - elseif(!$LMS->IsIPValid($nodeipdata['ipaddr_pub'])) - $error['ipaddr_pub'] = trans('Specified address does not belongs to any network!'); - elseif(!$LMS->IsIPFree($nodeipdata['ipaddr_pub'])) - $error['ipaddr_pub'] = trans('Specified IP address is in use!'); - } - else - $nodeipdata['ipaddr_pub'] = '0.0.0.0'; + if (strlen($nodeipdata['passwd']) > 32) + $error['passwd'] = trans('Password is too long (max.32 characters)!'); - $macs = array(); - foreach($nodeipdata['macs'] as $key => $value) - if(check_mac($value)) - { - if($value!='00:00:00:00:00:00' && !chkconfig($CONFIG['phpui']['allow_mac_sharing'])) - if($LMS->GetNodeIDByMAC($value)) - $error['mac'.$key] = trans('MAC address is in use!'); - $macs[] = $value; - } - elseif($value!='') - $error['mac'.$key] = trans('Incorrect MAC address!'); - if(empty($macs)) - $error['mac0'] = trans('MAC address is required!'); - $nodeipdata['macs'] = $macs; - - if(strlen($nodeipdata['passwd']) > 32) - $error['passwd'] = trans('Password is too long (max.32 characters)!'); - - if(!isset($nodeipdata['chkmac'])) $nodeipdata['chkmac'] = 0; - if(!isset($nodeipdata['halfduplex'])) $nodeipdata['halfduplex'] = 0; - if(!isset($nodeipdata['nas'])) $nodeipdata['nas'] = 0; - - if(!$error) - { - $nodeipdata['warning'] = 0; - $nodeipdata['location'] = ''; - $nodeipdata['netdev'] = $_GET['id']; + if (!isset($nodeipdata['chkmac'])) $nodeipdata['chkmac'] = 0; + if (!isset($nodeipdata['halfduplex'])) $nodeipdata['halfduplex'] = 0; + if (!isset($nodeipdata['nas'])) $nodeipdata['nas'] = 0; - $LMS->NodeAdd($nodeipdata); - $SESSION->redirect('?m=netdevinfo&id='.$_GET['id']); - } - } - else + if (!$error) { - $nodeipdata['macs'][] = ''; + $nodeipdata['warning'] = 0; + $nodeipdata['location'] = ''; + $nodeipdata['netdev'] = $_GET['id']; + + $LMS->NodeAdd($nodeipdata); + $SESSION->redirect('?m=netdevinfo&id='.$_GET['id']); } $SMARTY->assign('nodeipdata',$nodeipdata); - $edit='addip'; + $edit = 'addip'; break; case 'formeditip': @@ -427,94 +420,83 @@ if($key != 'macs') $nodeipdata[$key] = trim($value); - if(!isset($_GET['newmac'])) - { - if($nodeipdata['ipaddr']=='' && empty($nodeipdata['macs']) && $nodeipdata['name']=='' && $nodeipdata['passwd']=='') - { - $SESSION->redirect('?m=netdevedit&action=editip&id='.$_GET['id'].'&ip='.$_GET['ip']); - } + if ($nodeipdata['ipaddr'] == '' && empty($nodeipdata['macs']) && $nodeipdata['name'] == '' && $nodeipdata['passwd'] == '') + $SESSION->redirect('?m=netdevedit&action=editip&id='.$_GET['id'].'&ip='.$_GET['ip']); - if($nodeipdata['name']=='') - $error['ipname'] = trans('Address field is required!'); - elseif(strlen($nodeipdata['name']) > 32) - $error['ipname'] = trans('Specified name is too long (max.$a characters)!','32'); - elseif( - $LMS->GetNodeIDByName($nodeipdata['name']) && - $LMS->GetNodeName($_GET['ip'])!=$nodeipdata['name'] - ) - $error['ipname'] = trans('Specified name is in use!'); - elseif(!preg_match('/^[_a-z0-9-]+$/i', $nodeipdata['name'])) - $error['ipname'] = trans('Name contains forbidden characters!'); - - if($nodeipdata['ipaddr']=='') - $error['ipaddr'] = trans('IP address is required!'); - elseif(!check_ip($nodeipdata['ipaddr'])) - $error['ipaddr'] = trans('Incorrect IP address!'); - elseif(!$LMS->IsIPValid($nodeipdata['ipaddr'])) - $error['ipaddr'] = trans('Specified address does not belongs to any network!'); - elseif(!$LMS->IsIPFree($nodeipdata['ipaddr']) && - $LMS->GetNodeIPByID($_GET['ip'])!=$nodeipdata['ipaddr']) - $error['ipaddr'] = trans('IP address is in use!'); + if ($nodeipdata['name'] == '') + $error['ipname'] = trans('Address field is required!'); + elseif (strlen($nodeipdata['name']) > 32) + $error['ipname'] = trans('Specified name is too long (max.$a characters)!','32'); + elseif ($LMS->GetNodeIDByName($nodeipdata['name']) && + $LMS->GetNodeName($_GET['ip']) != $nodeipdata['name']) + $error['ipname'] = trans('Specified name is in use!'); + elseif (!preg_match('/^[_a-z0-9-]+$/i', $nodeipdata['name'])) + $error['ipname'] = trans('Name contains forbidden characters!'); + + if ($nodeipdata['ipaddr'] == '') + $error['ipaddr'] = trans('IP address is required!'); + elseif (!check_ip($nodeipdata['ipaddr'])) + $error['ipaddr'] = trans('Incorrect IP address!'); + elseif (!$LMS->IsIPValid($nodeipdata['ipaddr'])) + $error['ipaddr'] = trans('Specified address does not belongs to any network!'); + elseif (!$LMS->IsIPFree($nodeipdata['ipaddr']) && + $LMS->GetNodeIPByID($_GET['ip']) != $nodeipdata['ipaddr']) + $error['ipaddr'] = trans('IP address is in use!'); - if($nodeipdata['ipaddr_pub']!='0.0.0.0' && $nodeipdata['ipaddr_pub']!='') + if ($nodeipdata['ipaddr_pub'] != '0.0.0.0' && $nodeipdata['ipaddr_pub'] != '') + { + if (check_ip($nodeipdata['ipaddr_pub'])) { - if(check_ip($nodeipdata['ipaddr_pub'])) + if ($LMS->IsIPValid($nodeipdata['ipaddr_pub'])) { - if($LMS->IsIPValid($nodeipdata['ipaddr_pub'])) - { - $ip = $LMS->GetNodePubIPByID($nodeipdata['id']); - if($ip!=$nodeipdata['ipaddr_pub'] && !$LMS->IsIPFree($nodeipdata['ipaddr_pub'])) - $error['ipaddr_pub'] = trans('Specified IP address is in use!'); - } - else - $error['ipaddr_pub'] = trans('Specified IP address doesn\'t overlap with any network!'); + $ip = $LMS->GetNodePubIPByID($nodeipdata['id']); + if ($ip != $nodeipdata['ipaddr_pub'] && !$LMS->IsIPFree($nodeipdata['ipaddr_pub'])) + $error['ipaddr_pub'] = trans('Specified IP address is in use!'); } else - $error['ipaddr_pub'] = trans('Incorrect IP address!'); + $error['ipaddr_pub'] = trans('Specified IP address doesn\'t overlap with any network!'); } else - $nodeipdata['ipaddr_pub'] = '0.0.0.0'; - - $macs = array(); - foreach($nodeipdata['macs'] as $key => $value) - if(check_mac($value)) - { - if($value!='00:00:00:00:00:00' && isset($CONFIG['phpui']['allow_mac_sharing']) && !chkconfig($CONFIG['phpui']['allow_mac_sharing'])) - if(($nodeid = $LMS->GetNodeIDByMAC($value)) != NULL && $nodeid != $_GET['ip']) - $error['mac'.$key] = trans('MAC address is in use!'); - $macs[] = $value; - } - elseif($value!='') - $error['mac'.$key] = trans('Incorrect MAC address!'); - if(empty($macs)) - $error['mac0'] = trans('MAC address is required!'); - $nodeipdata['macs'] = $macs; - - if(strlen($nodeipdata['passwd']) > 32) - $error['passwd'] = trans('Password is too long (max.32 characters)!'); - - if(!isset($nodeipdata['chkmac'])) $nodeipdata['chkmac'] = 0; - if(!isset($nodeipdata['halfduplex'])) $nodeipdata['halfduplex'] = 0; - if(!isset($nodeipdata['nas'])) $nodeipdata['nas'] = 0; - - if(!$error) - { - $nodeipdata['warning'] = 0; - $nodeipdata['location'] = ''; - $nodeipdata['netdev'] = $_GET['id']; - - $LMS->NodeUpdate($nodeipdata); - $SESSION->redirect('?m=netdevinfo&id='.$_GET['id']); - } + $error['ipaddr_pub'] = trans('Incorrect IP address!'); } else + $nodeipdata['ipaddr_pub'] = '0.0.0.0'; + + $macs = array(); + foreach ($nodeipdata['macs'] as $key => $value) + if (check_mac($value)) + { + if ($value != '00:00:00:00:00:00' && isset($CONFIG['phpui']['allow_mac_sharing']) && !chkconfig($CONFIG['phpui']['allow_mac_sharing'])) + if (($nodeid = $LMS->GetNodeIDByMAC($value)) != NULL && $nodeid != $_GET['ip']) + $error['mac'.$key] = trans('MAC address is in use!'); + $macs[] = $value; + } + elseif ($value != '') + $error['mac'.$key] = trans('Incorrect MAC address!'); + if (empty($macs)) + $error['mac0'] = trans('MAC address is required!'); + $nodeipdata['macs'] = $macs; + + if (strlen($nodeipdata['passwd']) > 32) + $error['passwd'] = trans('Password is too long (max.32 characters)!'); + + if (!isset($nodeipdata['chkmac'])) $nodeipdata['chkmac'] = 0; + if (!isset($nodeipdata['halfduplex'])) $nodeipdata['halfduplex'] = 0; + if (!isset($nodeipdata['nas'])) $nodeipdata['nas'] = 0; + + if (!$error) { - $nodeipdata['macs'][] = ''; + $nodeipdata['warning'] = 0; + $nodeipdata['location'] = ''; + $nodeipdata['netdev'] = $_GET['id']; + + $LMS->NodeUpdate($nodeipdata); + $SESSION->redirect('?m=netdevinfo&id='.$_GET['id']); } $nodeipdata['ip_pub'] = $nodeipdata['ipaddr_pub']; $SMARTY->assign('nodeipdata',$nodeipdata); - $edit='ip'; + $edit = 'ip'; break; default: From cvs w lms.org.pl Sun Feb 5 14:21:11 2012 From: cvs w lms.org.pl (LMS CVS) Date: Sun, 5 Feb 2012 14:21:11 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib (accesstable.php) Message-ID: <20120205132111.D8F5B309D4B5@eftep.altec.pl> Date: Sunday, February 5, 2012 @ 14:21:11 Author: chilek Path: /cvsroot/lms/lib Modified: accesstable.php - changed finances_management to hide_finances privilege Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/accesstable.php.diff?&r1=1.147&r2=1.148 Index: lms/lib/accesstable.php diff -u lms/lib/accesstable.php:1.147 lms/lib/accesstable.php:1.148 --- lms/lib/accesstable.php:1.147 Mon Jan 2 12:01:28 2012 +++ lms/lib/accesstable.php Sun Feb 5 14:21:11 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: accesstable.php,v 1.147 2012/01/02 11:01:28 alec Exp $ + * $Id: accesstable.php,v 1.148 2012/02/05 13:21:11 chilek Exp $ */ unset($access); @@ -39,7 +39,6 @@ $access['table'][3]['name'] = trans('finances management'); $access['table'][3]['allow_reg'] = '^((tariff|customerassignment)(add|info|list|move|edit|del)|(payment)(add|del|edit|info|list)|(balance|customerbalance)(new|add|ok|del|list|)|(cashreg(list|add|edit|del|info))|(invoice|invoice(list|new|edit|del|note|report|paid))|(note|note(list|add|edit|del|paid))|number|export|print|cashimport|cashimportparser|cashpackagedel)$'; -$access['table'][3]['privilege'] = 'finances_management'; $access['table'][4]['name'] = trans('configuration reload'); $access['table'][4]['allow_reg'] = '^reload$'; @@ -107,6 +106,9 @@ $access['table'][25]['name'] = trans('links hiding'); $access['table'][25]['privilege'] = 'hide_links'; +$access['table'][26]['name'] = trans('finances hiding'); +$access['table'][26]['privilege'] = 'hide_finances'; + $access['table'][253]['name'] = trans('users edition and addition forbidden'); $access['table'][253]['deny_reg'] = '^(user(add|del|edit|passwd))$'; From cvs w lms.org.pl Sun Feb 5 14:21:12 2012 From: cvs w lms.org.pl (LMS CVS) Date: Sun, 5 Feb 2012 14:21:12 +0100 (CET) Subject: [lms-commits] CVS update of lms/templates (10 files) Message-ID: <20120205132112.3EC74309D4B7@eftep.altec.pl> Date: Sunday, February 5, 2012 @ 14:21:12 Author: chilek Path: /cvsroot/lms/templates Modified: customerassignments.html customerassignmentsedit.html customerinfo.html customerinfobox.html customerinfoshort.html customerlist.html customersearchresults.html printcustomerlist.html printindex.html welcome.html - changed finances_management to hide_finances privilege Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerassignments.html.diff?&r1=1.48&r2=1.49 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerassignmentsedit.html.diff?&r1=1.30&r2=1.31 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerinfo.html.diff?&r1=1.11&r2=1.12 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerinfobox.html.diff?&r1=1.54&r2=1.55 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerinfoshort.html.diff?&r1=1.30&r2=1.31 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerlist.html.diff?&r1=1.22&r2=1.23 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customersearchresults.html.diff?&r1=1.19&r2=1.20 http://cvs.lms.org.pl/viewvc/Development/lms/templates/printcustomerlist.html.diff?&r1=1.10&r2=1.11 http://cvs.lms.org.pl/viewvc/Development/lms/templates/printindex.html.diff?&r1=1.106&r2=1.107 http://cvs.lms.org.pl/viewvc/Development/lms/templates/welcome.html.diff?&r1=1.92&r2=1.93 Index: lms/templates/customerassignments.html diff -u lms/templates/customerassignments.html:1.48 lms/templates/customerassignments.html:1.49 --- lms/templates/customerassignments.html:1.48 Mon Jan 2 12:01:39 2012 +++ lms/templates/customerassignments.html Sun Feb 5 14:21:12 2012 @@ -1,4 +1,4 @@ - + {assign var=today value=$smarty.now|date_format:"%x 00:00:00"}{assign var=today value=$today|date_format:"%s"}
{foreach from=$nodedata.macs item=item key=key} - + {/foreach}
»»»
+ {trans("Add MAC address")} »»»
' + + '»»» {foreach from=$nodeinfo.macs item=item key=key} - + {/foreach}
»»»
+ {trans("Add MAC address")} »»»
' + + '»»» {foreach from=$nodeipdata.macs item=item key=key} - + {/foreach}
»»»
+ {trans("Add MAC address")} »»»
' + + '»»» {foreach from=$nodeipdata.macs item=item key=key} - + {/foreach}
»»»
+ {trans("Add MAC address")} »»»
' + + '»»»
@@ -23,10 +23,10 @@ @@ -52,10 +52,10 @@ {if $a.nodes}({foreach from=$a.nodes item=item key=key}{$item.name}{if $key+1 Index: lms/templates/customerassignmentsedit.html diff -u lms/templates/customerassignmentsedit.html:1.30 lms/templates/customerassignmentsedit.html:1.31 --- lms/templates/customerassignmentsedit.html:1.30 Wed Jan 4 09:24:30 2012 +++ lms/templates/customerassignmentsedit.html Sun Feb 5 14:21:12 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

{include file="calendar_js.html"}

{/if} -{if ($printmenu=="customer" || $printmenu=="finances") && ($_config.privileges.finances_management|chkconfig || $adminuser)} +{if ($printmenu=="customer" || $printmenu=="finances") && (!$_config.privileges.hide_finances|chkconfig || $adminuser)}

{trans("Liability:")} - {if $_config.privileges.finances_management|chkconfig || 4adminuser}{trans("Value:")}{/if} + {if !$_config.privileges.hide_finances|chkconfig || $adminuser}{trans("Value:")}{/if} - {if $_config.privileges.finances_management|chkconfig || $adminuser}{trans("Discount:")}{/if} + {if !$_config.privileges.hide_finances|chkconfig || $adminuser}{trans("Discount:")}{/if} {trans("Accounting:")} {trans("Downceil:")} - {if $_config.privileges.finances_management|chkconfig || $adminuser}{$a.value|money_format}{/if} + {if !$_config.privileges.hide_finances|chkconfig || $adminuser}{$a.value|money_format}{/if} - {if $_config.privileges.finances_management|chkconfig || $adminuser}{if $a.pdiscount != 0}{$a.pdiscount}%{else}{if $a.vdiscount != 0}{$a.vdiscount|money_format}{else}-{/if}{/if}{/if} + {if !$_config.privileges.hide_finances|chkconfig || $adminuser}{if $a.pdiscount != 0}{$a.pdiscount}%{else}{if $a.vdiscount != 0}{$a.vdiscount|money_format}{else}-{/if}{/if}{/if} {$a.payday} @@ -92,12 +92,12 @@
{trans("Total:")} - {if $_config.privileges.finances_management|chkconfig || $adminuser} + {if !$_config.privileges.hide_finances|chkconfig || $adminuser} {sum array=$assignments column="real_value" string_format=$LANGDEFS.$_language.money_format} {/if} - {if $_config.privileges.finances_management|chkconfig || $adminuser} + {if !$_config.privileges.hide_finances|chkconfig || $adminuser} ({sum array=$assignments column="real_disc_value" string_format=$LANGDEFS.$_language.money_format}) {/if}
@@ -886,7 +886,7 @@

{/if} -{if ($printmenu=="customer" || $printmenu=="finances") && ($_config.privileges.finances_management|chkconfig || $adminuser)} +{if ($printmenu=="customer" || $printmenu=="finances") && (!$_config.privileges.hide_finances|chkconfig || $adminuser)}

Index: lms/templates/welcome.html diff -u lms/templates/welcome.html:1.92 lms/templates/welcome.html:1.93 --- lms/templates/welcome.html:1.92 Mon Jan 2 12:01:40 2012 +++ lms/templates/welcome.html Sun Feb 5 14:21:12 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

@@ -146,13 +146,13 @@ From cvs w lms.org.pl Sun Feb 5 14:21:12 2012 From: cvs w lms.org.pl (LMS CVS) Date: Sun, 5 Feb 2012 14:21:12 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib/locale/pl (strings.php) Message-ID: <20120205132112.0C976309D4B6@eftep.altec.pl> Date: Sunday, February 5, 2012 @ 14:21:12 Author: chilek Path: /cvsroot/lms/lib/locale/pl Modified: strings.php - changed finances_management to hide_finances privilege Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/locale/pl/strings.php.diff?&r1=1.412&r2=1.413 Index: lms/lib/locale/pl/strings.php diff -u lms/lib/locale/pl/strings.php:1.412 lms/lib/locale/pl/strings.php:1.413 --- lms/lib/locale/pl/strings.php:1.412 Sun Jan 22 20:46:13 2012 +++ lms/lib/locale/pl/strings.php Sun Feb 5 14:21:11 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: strings.php,v 1.412 2012/01/22 19:46:13 alec Exp $ + * $Id: strings.php,v 1.413 2012/02/05 13:21:11 chilek Exp $ */ $_LANG['$a ($b addresses)'] = '$a ($b adresów)'; @@ -564,6 +564,7 @@ $_LANG['Filter'] = 'Filtr'; $_LANG['Filter:'] = 'Filtr:'; $_LANG['Finances'] = 'Finanse'; +$_LANG['finances hiding'] = 'ukrywanie informacji finansowych'; $_LANG['finances management'] = 'zarządzanie finansami'; $_LANG['Find events matching the following search criteria:'] = 'Znajdź zdarzenia pasujące do następujących kryteriów:'; $_LANG['Find nodes matching the following search criteria:'] = 'Znajdź komputery pasujące do następujących kryteriów:'; From cvs w lms.org.pl Sun Feb 5 14:35:53 2012 From: cvs w lms.org.pl (LMS CVS) Date: Sun, 5 Feb 2012 14:35:53 +0100 (CET) Subject: [lms-commits] CVS update of lms/templates (customerlist.html) Message-ID: <20120205133553.30A84309D4B5@eftep.altec.pl> Date: Sunday, February 5, 2012 @ 14:35:53 Author: chilek Path: /cvsroot/lms/templates Modified: customerlist.html - hide_summaries hides only summaries in customer list Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerlist.html.diff?&r1=1.23&r2=1.24 Index: lms/templates/customerlist.html diff -u lms/templates/customerlist.html:1.23 lms/templates/customerlist.html:1.24 --- lms/templates/customerlist.html:1.23 Sun Feb 5 14:21:12 2012 +++ lms/templates/customerlist.html Sun Feb 5 14:35:53 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

{trans("Total:")}
- {if $_config.privileges.finances_management|chkconfig || $adminuser} + {if !$_config.privileges.hide_finances|chkconfig || $adminuser} {trans("Total Dues:")} {/if} 		{$customerstats.total}
- {if $_config.privileges.finances_management|chkconfig || $adminuser} + {if !$_config.privileges.hide_finances|chkconfig || $adminuser} {$customerstats.debt} ({trans("amount")} {$customerstats.debtvalue|money_format}) {/if}
@@ -36,7 +36,7 @@ - {if (!$_config.privileges.hide_finances|chkconfig && !$_config.privileges.hide_summaries|chkconfig) || $adminuser} + {if !$_config.privileges.hide_finances|chkconfig || $adminuser} @@ -176,7 +176,7 @@ {/if}
- {trans("Total:")} {$listdata.total} + {trans("Total:")} {$listdata.total}
From cvs w lms.org.pl Mon Feb 6 17:51:25 2012 From: cvs w lms.org.pl (LMS CVS) Date: Mon, 6 Feb 2012 17:51:25 +0100 (CET) Subject: [lms-commits] CVS update of lms/templates (useradd.html, useredit.html) Message-ID: <20120206165125.DE5E2309D4B6@eftep.altec.pl> Date: Monday, February 6, 2012 @ 17:51:25 Author: chilek Path: /cvsroot/lms/templates Modified: useradd.html useredit.html - more label's Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/templates/useradd.html.diff?&r1=1.76&r2=1.77 http://cvs.lms.org.pl/viewvc/Development/lms/templates/useredit.html.diff?&r1=1.28&r2=1.29 Index: lms/templates/useradd.html diff -u lms/templates/useradd.html:1.76 lms/templates/useradd.html:1.77 --- lms/templates/useradd.html:1.76 Mon Jan 2 15:53:20 2012 +++ lms/templates/useradd.html Mon Feb 6 17:51:25 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

@@ -86,13 +86,13 @@ {section name=acl loop=$accesslist} {if $smarty.section.acl.index <= floor(sizeof($accesslist)/2) - 1} - {$accesslist[acl].name}
+
{/if} {/section} {section name=acl loop=$accesslist} {if $smarty.section.acl.index > floor(sizeof($accesslist)/2) - 1} - {$accesslist[acl].name}
+
{/if} {/section} @@ -119,10 +119,6 @@ {include file="footer.html"} Index: lms/templates/useredit.html diff -u lms/templates/useredit.html:1.28 lms/templates/useredit.html:1.29 --- lms/templates/useredit.html:1.28 Mon Jan 2 15:53:20 2012 +++ lms/templates/useredit.html Mon Feb 6 17:51:25 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

@@ -86,13 +86,13 @@ {section name=acl loop=$accesslist} {if $smarty.section.acl.index <= floor(sizeof($accesslist)/2) - 1} - {$accesslist[acl].name}
+
{/if} {/section} {section name=acl loop=$accesslist} {if $smarty.section.acl.index > floor(sizeof($accesslist)/2) - 1} - {$accesslist[acl].name}
+
{/if} {/section} @@ -122,11 +122,6 @@ {include file="footer.html"} From cvs w lms.org.pl Mon Feb 6 18:14:42 2012 From: cvs w lms.org.pl (LMS CVS) Date: Mon, 6 Feb 2012 18:14:42 +0100 (CET) Subject: [lms-commits] CVS update of lms/templates (4 files) Message-ID: <20120206171442.E73BD309D4B6@eftep.altec.pl> Date: Monday, February 6, 2012 @ 18:14:42 Author: chilek Path: /cvsroot/lms/templates Modified: receiptadd.html receiptadv.html receiptedit.html receiptlist.html - more ui label's Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/templates/receiptadd.html.diff?&r1=1.59&r2=1.60 http://cvs.lms.org.pl/viewvc/Development/lms/templates/receiptadv.html.diff?&r1=1.5&r2=1.6 http://cvs.lms.org.pl/viewvc/Development/lms/templates/receiptedit.html.diff?&r1=1.41&r2=1.42 http://cvs.lms.org.pl/viewvc/Development/lms/templates/receiptlist.html.diff?&r1=1.29&r2=1.30 Index: lms/templates/receiptadd.html diff -u lms/templates/receiptadd.html:1.59 lms/templates/receiptadd.html:1.60 --- lms/templates/receiptadd.html:1.59 Wed Jan 4 09:24:30 2012 +++ lms/templates/receiptadd.html Mon Feb 6 18:14:42 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

{include file="calendar_js.html"} @@ -47,11 +47,6 @@ document.page.submit(); } {/if} - - function setType(type) - { - document.page.elements[type].checked = !document.page.elements[type].checked; - } //--> @@ -100,7 +95,7 @@ {trans("Period:")}  {trans("from")}  {trans("to")}   - {trans("not settled adv. only")}  +   »»» @@ -173,8 +168,8 @@ {trans("Print")}   - {trans("original")}  - {trans("copy")} +   + From cvs w lms.org.pl Mon Feb 6 18:29:35 2012 From: cvs w lms.org.pl (LMS CVS) Date: Mon, 6 Feb 2012 18:29:35 +0100 (CET) Subject: [lms-commits] CVS update of lms/templates (accountadd.html) Message-ID: <20120206172935.CF141309D4B6@eftep.altec.pl> Date: Monday, February 6, 2012 @ 18:29:35 Author: chilek Path: /cvsroot/lms/templates Modified: accountadd.html - added labels for account types Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/templates/accountadd.html.diff?&r1=1.48&r2=1.49 Index: lms/templates/accountadd.html diff -u lms/templates/accountadd.html:1.48 lms/templates/accountadd.html:1.49 --- lms/templates/accountadd.html:1.48 Mon Jan 2 15:53:20 2012 +++ lms/templates/accountadd.html Mon Feb 6 18:29:35 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - + {include file="calendar_js.html"} {include file="footer.html"} From cvs w lms.org.pl Mon Feb 6 18:45:06 2012 From: cvs w lms.org.pl (LMS CVS) Date: Mon, 6 Feb 2012 18:45:06 +0100 (CET) Subject: [lms-commits] CVS update of lms/templates (configedit.html) Message-ID: <20120206174506.20DD53035084@eftep.altec.pl> Date: Monday, February 6, 2012 @ 18:45:06 Author: chilek Path: /cvsroot/lms/templates Modified: configedit.html - ported to label Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/templates/configedit.html.diff?&r1=1.22&r2=1.23 Index: lms/templates/configedit.html diff -u lms/templates/configedit.html:1.22 lms/templates/configedit.html:1.23 --- lms/templates/configedit.html:1.22 Mon Jan 2 12:01:39 2012 +++ lms/templates/configedit.html Mon Feb 6 18:45:05 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

@@ -55,7 +55,7 @@ {trans("Status:")} - {trans("Off")} + @@ -69,14 +69,7 @@

{include file="footer.html"} From cvs w lms.org.pl Tue Feb 7 13:19:56 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 13:19:56 +0100 (CET) Subject: [lms-commits] CVS update of lms/daemon/modules/ewx-pt (ewx-pt.c) Message-ID: <20120207121956.940DF309D4B6@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 13:19:56 Author: alec Path: /cvsroot/lms/daemon/modules/ewx-pt Modified: ewx-pt.c - Fixed wrong check in update_node() Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/daemon/modules/ewx-pt/ewx-pt.c.diff?&r1=1.22&r2=1.23 Index: lms/daemon/modules/ewx-pt/ewx-pt.c diff -u lms/daemon/modules/ewx-pt/ewx-pt.c:1.22 lms/daemon/modules/ewx-pt/ewx-pt.c:1.23 --- lms/daemon/modules/ewx-pt/ewx-pt.c:1.22 Mon Jan 2 12:01:25 2012 +++ lms/daemon/modules/ewx-pt/ewx-pt.c Tue Feb 7 13:19:55 2012 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: ewx-pt.c,v 1.22 2012/01/02 11:01:25 alec Exp $ + * $Id: ewx-pt.c,v 1.23 2012/02/07 12:19:55 alec Exp $ */ #include @@ -510,7 +510,7 @@ if (status == STAT_SUCCESS && response->errstat == SNMP_ERR_NOERROR) { #ifdef LMS_SNMP_DEBUG - struct variable_list *vars; + struct variable_list *vars; for (vars = response->variables; vars; vars = vars->next_variable) print_variable(vars->name, vars->name_length, vars); #endif @@ -572,10 +572,10 @@ status = snmp_synch_response(sh, pdu, &response); // Process the response - if (status != STAT_SUCCESS || response->errstat != SNMP_ERR_NOERROR) + if (status == STAT_SUCCESS && response->errstat == SNMP_ERR_NOERROR) { #ifdef LMS_SNMP_DEBUG - struct variable_list *vars; + struct variable_list *vars; for (vars = response->variables; vars; vars = vars->next_variable) print_variable(vars->name, vars->name_length, vars); #endif @@ -633,7 +633,7 @@ if (status == STAT_SUCCESS && response->errstat == SNMP_ERR_NOERROR) { #ifdef LMS_SNMP_DEBUG - struct variable_list *vars; + struct variable_list *vars; for (vars = response->variables; vars; vars = vars->next_variable) print_variable(vars->name, vars->name_length, vars); #endif @@ -677,7 +677,7 @@ if(status == STAT_SUCCESS && response->errstat == SNMP_ERR_NOERROR) { #ifdef LMS_SNMP_DEBUG - struct variable_list *vars; + struct variable_list *vars; for (vars = response->variables; vars; vars = vars->next_variable) print_variable(vars->name, vars->name_length, vars); #endif From cvs w lms.org.pl Tue Feb 7 14:10:35 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 14:10:35 +0100 (CET) Subject: [lms-commits] CVS update of lms/userpanel (index.php) Message-ID: <20120207131035.61465309D4BA@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 14:10:35 Author: alec Path: /cvsroot/lms/userpanel Modified: index.php - Improved configuration handling in templates Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/index.php.diff?&r1=1.20&r2=1.21 Index: lms/userpanel/index.php diff -u lms/userpanel/index.php:1.20 lms/userpanel/index.php:1.21 --- lms/userpanel/index.php:1.20 Sat Jan 21 20:08:53 2012 +++ lms/userpanel/index.php Tue Feb 7 14:10:35 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: index.php,v 1.20 2012/01/21 19:08:53 alec Exp $ + * $Id: index.php,v 1.21 2012/02/07 13:10:35 alec Exp $ */ // REPLACE THIS WITH PATH TO YOUR CONFIG FILE @@ -108,7 +108,7 @@ // Redirect to SSL -$_FORCE_SSL = chkconfig($CONFIG['phpui']['force_ssl']); +$_FORCE_SSL = check_conf('phpui.force_ssl'); if($_FORCE_SSL && $_SERVER['HTTPS'] != 'on') { @@ -153,13 +153,12 @@ } }; -$SMARTY->assign('_config',$CONFIG); $SMARTY->assignByRef('LANGDEFS', $LANGDEFS); $SMARTY->assignByRef('_ui_language', $LMS->ui_lang); $SMARTY->assignByRef('_language', $LMS->lang); $SMARTY->template_dir = USERPANEL_DIR.'/templates/'; $SMARTY->compile_dir = SMARTY_COMPILE_DIR; -$SMARTY->debugging = chkconfig($CONFIG['phpui']['smarty_debug']); +$SMARTY->debugging = check_conf('phpui.smarty_debug'); require_once(USERPANEL_LIB_DIR.'/smarty_addons.php'); $layout['upv'] = $USERPANEL->_version.' ('.$USERPANEL->_revision.'/'.$SESSION->_revision.')'; @@ -184,7 +183,7 @@ $rights = $USERPANEL->GetCustomerRights($SESSION->id); $SMARTY->assign('rights', $rights); - if(isset($LMS->CONFIG['userpanel']['hide_nodes_modules']) && chkconfig($LMS->CONFIG['userpanel']['hide_nodes_modules'])) + if(check_conf('userpanel.hide_nodes_modules')) { if(!$DB->GetOne('SELECT COUNT(*) FROM nodes WHERE ownerid = ? LIMIT 1', array($SESSION->id))) { @@ -244,7 +243,7 @@ $SMARTY->assign('target','?'.$_SERVER['QUERY_STRING']); $SMARTY->display('login.html'); } - + $DB->Destroy(); ?> From cvs w lms.org.pl Tue Feb 7 14:10:34 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 14:10:34 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib (config.php) Message-ID: <20120207131034.731BF309D4B9@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 14:10:34 Author: alec Path: /cvsroot/lms/lib Modified: config.php - Improved configuration handling in templates Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/config.php.diff?&r1=1.17&r2=1.18 Index: lms/lib/config.php diff -u lms/lib/config.php:1.17 lms/lib/config.php:1.18 --- lms/lib/config.php:1.17 Mon Jan 2 12:01:28 2012 +++ lms/lib/config.php Tue Feb 7 14:10:34 2012 @@ -21,19 +21,76 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: config.php,v 1.17 2012/01/02 11:01:28 alec Exp $ + * $Id: config.php,v 1.18 2012/02/07 13:10:34 alec Exp $ */ -function chkconfig($value, $default = FALSE) +function chkconfig($value, $default = false) { - if($value == '') - return $default; - elseif(preg_match('/^(1|y|on|yes|true|tak|t|enabled)$/i', $value)) - return TRUE; - elseif(preg_match('/^(0|n|no|off|false|nie|disabled)$/i', $value)) - return FALSE; - else - trigger_error('Incorrect option value: '.$value); + if (is_bool($value)) { + return $value; + } + + if ($value == '') { + return $default; + } + + if (preg_match('/^(1|y|on|yes|true|tak|t|enabled)$/i', $value)) { + return true; + } + + if (preg_match('/^(0|n|no|off|false|nie|disabled)$/i', $value)) { + return false; + } + + trigger_error('Incorrect option value: '.$value); +} + +function check_conf($name) +{ + global $CONFIG; + + list($section, $name) = explode('.', $name, 2); + + if (empty($name)) { + return false; + } + + if ($section == 'privileges' && !empty($CONFIG['privileges']['superuser'])) { + return preg_match('/^hide/', $name) ? false : true; + } + + if (!array_key_exists($section, $CONFIG)) { + return false; + } + + if (!array_key_exists($name, $CONFIG[$section])) { + return false; + } + + return chkconfig($CONFIG[$section][$name]); +} + +function get_conf($name, $default = null) +{ + global $CONFIG; + + list($section, $name) = explode('.', $name, 2); + + if (empty($name)) { + return $default; + } + + if (!array_key_exists($section, $CONFIG)) { + return $default; + } + + if (!array_key_exists($name, $CONFIG[$section])) { + return $default; + } + + $value = $CONFIG[$section][$name]; + + return $value == '' ? $default : $value; } /* From cvs w lms.org.pl Tue Feb 7 14:10:35 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 14:10:35 +0100 (CET) Subject: [lms-commits] CVS update of lms/userpanel/modules/finances (2 files) Message-ID: <20120207131035.8035A309D4BB@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 14:10:35 Author: alec Path: /cvsroot/lms/userpanel/modules/finances Modified: invoice.php transferform.php - Improved configuration handling in templates Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/modules/finances/invoice.php.diff?&r1=1.10&r2=1.11 http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/modules/finances/transferform.php.diff?&r1=1.9&r2=1.10 Index: lms/userpanel/modules/finances/invoice.php diff -u lms/userpanel/modules/finances/invoice.php:1.10 lms/userpanel/modules/finances/invoice.php:1.11 --- lms/userpanel/modules/finances/invoice.php:1.10 Mon Jan 2 12:01:43 2012 +++ lms/userpanel/modules/finances/invoice.php Tue Feb 7 14:10:35 2012 @@ -21,12 +21,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: invoice.php,v 1.10 2012/01/02 11:01:43 alec Exp $ + * $Id: invoice.php,v 1.11 2012/02/07 13:10:35 alec Exp $ */ global $LMS,$SESSION,$CONFIG,$_CONFIG,$SMARTY,$invoice, $layout, $type; -$type = chkconfig($CONFIG['userpanel']['invoice_duplicate']) ? trans('DUPLICATE') : trans('ORIGINAL'); +$type = check_conf('userpanel.invoice_duplicate') ? trans('DUPLICATE') : trans('ORIGINAL'); if(strtolower($CONFIG['invoices']['type']) == 'pdf') { Index: lms/userpanel/modules/finances/transferform.php diff -u lms/userpanel/modules/finances/transferform.php:1.9 lms/userpanel/modules/finances/transferform.php:1.10 --- lms/userpanel/modules/finances/transferform.php:1.9 Mon Jan 2 12:01:43 2012 +++ lms/userpanel/modules/finances/transferform.php Tue Feb 7 14:10:35 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: transferform.php,v 1.9 2012/01/02 11:01:43 alec Exp $ + * $Id: transferform.php,v 1.10 2012/02/07 13:10:35 alec Exp $ */ global $LMS,$CONFIG,$SESSION; @@ -46,7 +46,7 @@ $USER_T1 = (!isset($CONFIG['finances']['pay_title']) ? 'Abonament - ID:%CID% %LongCID%' : iconv('UTF-8','ISO-8859-2',$CONFIG['finances']['pay_title'])); $CURR = 'PLN'; -$SHORT_TO_WORDS = chkconfig($CONFIG['phpui']['to_words_short_version']); +$SHORT_TO_WORDS = check_conf('phpui.to_words_short_version'); $Before = array ("%CID%", "%LongCID%"); $After = array ($customer['id'], sprintf('%04d',$customer['id'])); From cvs w lms.org.pl Tue Feb 7 14:10:34 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 14:10:34 +0100 (CET) Subject: [lms-commits] CVS update of lms (index.php) Message-ID: <20120207131034.55C4E309D4B8@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 14:10:34 Author: alec Path: /cvsroot/lms Modified: index.php - Improved configuration handling in templates Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/index.php.diff?&r1=1.232&r2=1.233 Index: lms/index.php diff -u lms/index.php:1.232 lms/index.php:1.233 --- lms/index.php:1.232 Sat Jan 21 20:08:52 2012 +++ lms/index.php Tue Feb 7 14:10:34 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: index.php,v 1.232 2012/01/21 19:08:52 alec Exp $ + * $Id: index.php,v 1.233 2012/02/07 13:10:34 alec Exp $ */ // REPLACE THIS WITH PATH TO YOUR CONFIG FILE @@ -169,7 +169,6 @@ $SMARTY->assignByRef('LANGDEFS', $LANGDEFS); $SMARTY->assignByRef('_ui_language', $LMS->ui_lang); $SMARTY->assignByRef('_language', $LMS->lang); -$SMARTY->assignByRef('_config',$CONFIG); $error = NULL; // initialize error variable needed for (almost) all modules @@ -206,14 +205,14 @@ { $allow = !$AUTH->id || (!empty($access['allow']) && preg_match('/'.$access['allow'].'/i', $module)); - $adminuser = FALSE; if($AUTH->id && ($rights = $LMS->GetUserRights($AUTH->id))) foreach($rights as $level) { - if($level === 0) - $adminuser = TRUE; - if(!$allow) - { + if($level === 0) { + $CONFIG['privileges']['superuser'] = true; + } + + if(!$allow) { if(isset($access['table'][$level]['deny_reg'])) $deny = (bool) preg_match('/'.$access['table'][$level]['deny_reg'].'/i', $module); elseif(isset($access['table'][$level]['allow_reg'])) @@ -228,7 +227,6 @@ { $layout['module'] = $module; $LMS->InitUI(); - $SMARTY->assign('adminuser', $adminuser); include(MODULES_DIR.'/'.$module.'.php'); } else From cvs w lms.org.pl Tue Feb 7 14:10:35 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 14:10:35 +0100 (CET) Subject: [lms-commits] CVS update of lms/userpanel/modules/helpdesk (functions.php) Message-ID: <20120207131035.BE08D309D4BD@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 14:10:35 Author: alec Path: /cvsroot/lms/userpanel/modules/helpdesk Modified: functions.php - Improved configuration handling in templates Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/modules/helpdesk/functions.php.diff?&r1=1.11&r2=1.12 Index: lms/userpanel/modules/helpdesk/functions.php diff -u lms/userpanel/modules/helpdesk/functions.php:1.11 lms/userpanel/modules/helpdesk/functions.php:1.12 --- lms/userpanel/modules/helpdesk/functions.php:1.11 Mon Jan 2 12:01:44 2012 +++ lms/userpanel/modules/helpdesk/functions.php Tue Feb 7 14:10:35 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: functions.php,v 1.11 2012/01/02 11:01:44 alec Exp $ + * $Id: functions.php,v 1.12 2012/02/07 13:10:35 alec Exp $ */ if (defined('USERPANEL_SETUPMODE')) @@ -124,7 +124,7 @@ $DB->Execute('INSERT INTO rtticketcategories (ticketid, categoryid) VALUES (?, ?)', array($id, $catid)); - if(isset($CONFIG['phpui']['newticket_notify']) && chkconfig($CONFIG['phpui']['newticket_notify'])) + if(check_conf('phpui.newticket_notify')) { $user = $LMS->GetUserInfo($CONFIG['userpanel']['default_userid']); @@ -150,7 +150,7 @@ $sms_body = $headers['Subject']."\n".$ticket['body']; $body = $ticket['body']."\n\n".$CONFIG['userpanel']['lms_url'].'/?m=rtticketview&id='.$id; - if (chkconfig($CONFIG['phpui']['helpdesk_customerinfo'])) { + if (check_conf('phpui.helpdesk_customerinfo')) { $info = $DB->GetRow('SELECT id AS customerid, '.$DB->Concat('UPPER(lastname)',"' '",'name').' AS customername, email, address, zip, city, (SELECT phone FROM customercontacts WHERE customerid = customers.id ORDER BY id LIMIT 1) AS phone From cvs w lms.org.pl Tue Feb 7 14:10:34 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 14:10:34 +0100 (CET) Subject: [lms-commits] CVS update of lms/modules (welcome.php) Message-ID: <20120207131034.8F1CA3023335@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 14:10:34 Author: alec Path: /cvsroot/lms/modules Modified: welcome.php - Improved configuration handling in templates Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/modules/welcome.php.diff?&r1=1.63&r2=1.64 Index: lms/modules/welcome.php diff -u lms/modules/welcome.php:1.63 lms/modules/welcome.php:1.64 --- lms/modules/welcome.php:1.63 Mon Jan 2 12:01:35 2012 +++ lms/modules/welcome.php Tue Feb 7 14:10:34 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: welcome.php,v 1.63 2012/01/02 11:01:35 alec Exp $ + * $Id: welcome.php,v 1.64 2012/02/07 13:10:34 alec Exp $ */ @include(LIB_DIR.'/locale/'.$_language.'/fortunes.php'); @@ -31,7 +31,7 @@ $layout['dbversion'] = $DB->GetDBVersion(); $layout['dbtype'] = $CONFIG['database']['type']; -if ($adminuser) { +if (check_conf('privileges.superuser')) { $content = $LMS->CheckUpdates(); if(isset($content['newer_version'])) { From cvs w lms.org.pl Tue Feb 7 14:10:36 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 14:10:36 +0100 (CET) Subject: [lms-commits] CVS update of lms/userpanel/modules/stats (functions.php) Message-ID: <20120207131036.0AB81309D4BF@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 14:10:36 Author: alec Path: /cvsroot/lms/userpanel/modules/stats Modified: functions.php - Improved configuration handling in templates Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/modules/stats/functions.php.diff?&r1=1.6&r2=1.7 Index: lms/userpanel/modules/stats/functions.php diff -u lms/userpanel/modules/stats/functions.php:1.6 lms/userpanel/modules/stats/functions.php:1.7 --- lms/userpanel/modules/stats/functions.php:1.6 Mon Jan 2 12:01:47 2012 +++ lms/userpanel/modules/stats/functions.php Tue Feb 7 14:10:35 2012 @@ -21,9 +21,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: functions.php,v 1.6 2012/01/02 11:01:47 alec Exp $ + * $Id: functions.php,v 1.7 2012/02/07 13:10:35 alec Exp $ */ - + if (defined('USERPANEL_SETUPMODE')) { function module_setup() @@ -32,7 +32,7 @@ $SMARTY->assign('owner_stats', $LMS->CONFIG['userpanel']['owner_stats']); $SMARTY->display('module:stats:setup.html'); } - + function module_submit_setup() { global $SMARTY,$DB; @@ -169,7 +169,7 @@ $SESSION->save('trafficorder', $_POST['order']); $bar = isset($_GET['bar']) ? $_GET['bar'] : ''; - $owner = chkconfig($CONFIG['userpanel']['owner_stats']) ? $SESSION->id : NULL; + $owner = check_conf('userpanel.owner_stats') ? $SESSION->id : NULL; switch($bar) { From cvs w lms.org.pl Tue Feb 7 14:10:35 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 14:10:35 +0100 (CET) Subject: [lms-commits] CVS update of lms/userpanel/modules/info/templates (4 files) Message-ID: <20120207131035.E2E2C309D4BE@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 14:10:35 Author: alec Path: /cvsroot/lms/userpanel/modules/info/templates Modified: consentbox.html info.html updateuser.html userinfobox.html - Improved configuration handling in templates Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/modules/info/templates/consentbox.html.diff?&r1=1.2&r2=1.3 http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/modules/info/templates/info.html.diff?&r1=1.2&r2=1.3 http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/modules/info/templates/updateuser.html.diff?&r1=1.1&r2=1.2 http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/modules/info/templates/userinfobox.html.diff?&r1=1.3&r2=1.4 Index: lms/userpanel/modules/info/templates/consentbox.html diff -u lms/userpanel/modules/info/templates/consentbox.html:1.2 lms/userpanel/modules/info/templates/consentbox.html:1.3 --- lms/userpanel/modules/info/templates/consentbox.html:1.2 Mon Jan 2 12:01:45 2012 +++ lms/userpanel/modules/info/templates/consentbox.html Tue Feb 7 14:10:35 2012 @@ -1,7 +1,7 @@ - + {box title="Personal data processing agreement"} - +
{$_config.userpanel.data_consent_text|replace:"\n":"
"}
{get_conf('userpanel.data_consent_text')|replace:"\n":"
"}
{trans("Confirm")} {img src="edit.gif" alt=""}
{/box} \ No newline at end of file Index: lms/userpanel/modules/info/templates/info.html diff -u lms/userpanel/modules/info/templates/info.html:1.2 lms/userpanel/modules/info/templates/info.html:1.3 --- lms/userpanel/modules/info/templates/info.html:1.2 Tue Jul 1 14:49:48 2008 +++ lms/userpanel/modules/info/templates/info.html Tue Feb 7 14:10:35 2012 @@ -1,13 +1,13 @@ {include file="header.html"} - + -{if !$usernodes.total && $_config.userpanel.hide_nodesbox} +{if !$usernodes.total && check_conf('userpanel.hide_nodesbox')} - {if $_config.userpanel.data_consent_text && !$userinfo.consentdate} + {if get_conf('userpanel.data_consent_text') && !$userinfo.consentdate}
{include file="module:userinfobox.html"}
{include file="module:consentbox.html"} @@ -20,7 +20,7 @@ {include file="module:userinfobox.html"} - {if $_config.userpanel.data_consent_text && !$userinfo.consentdate} + {if get_conf('userpanel.data_consent_text') && !$userinfo.consentdate} {include file="module:consentbox.html"}
{/if} {include file="module:usernodesbox.html"} Index: lms/userpanel/modules/info/templates/updateuser.html diff -u lms/userpanel/modules/info/templates/updateuser.html:1.1 lms/userpanel/modules/info/templates/updateuser.html:1.2 --- lms/userpanel/modules/info/templates/updateuser.html:1.1 Fri Jun 13 11:15:22 2008 +++ lms/userpanel/modules/info/templates/updateuser.html Tue Feb 7 14:10:35 2012 @@ -1,7 +1,7 @@ {include file="header.html"} - + -{if !$usernodes.total && $_config.userpanel.hide_nodesbox} +{if !$usernodes.total && check_conf('userpanel.hide_nodesbox')}
{include file="module:updateuserinfobox.html"} Index: lms/userpanel/modules/info/templates/userinfobox.html diff -u lms/userpanel/modules/info/templates/userinfobox.html:1.3 lms/userpanel/modules/info/templates/userinfobox.html:1.4 --- lms/userpanel/modules/info/templates/userinfobox.html:1.3 Mon Jan 2 12:01:45 2012 +++ lms/userpanel/modules/info/templates/userinfobox.html Tue Feb 7 14:10:35 2012 @@ -1,4 +1,4 @@ - + {box title="Informations about you"} {if $fields_changed} @@ -104,6 +104,8 @@ {if $userinfo.balance < 0}{$userinfo.balance|money_format}{else}{$userinfo.balance|money_format}{/if} +{$bankaccount = bankaccount($userinfo.id, $userinfo.account)} +{if $bankaccount} +{/if} {if $rights.info.edit_addr || $rights.info.edit_addr_ack || $rights.info.edit_contact || From cvs w lms.org.pl Tue Feb 7 14:10:35 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 14:10:35 +0100 (CET) Subject: [lms-commits] CVS update of lms/userpanel/modules/finances/templates (3 files) Message-ID: <20120207131035.A0956309D4BC@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 14:10:35 Author: alec Path: /cvsroot/lms/userpanel/modules/finances/templates Modified: balance.html userassignments.html userbalancebox.html - Improved configuration handling in templates Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/modules/finances/templates/balance.html.diff?&r1=1.2&r2=1.3 http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/modules/finances/templates/userassignments.html.diff?&r1=1.2&r2=1.3 http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/modules/finances/templates/userbalancebox.html.diff?&r1=1.6&r2=1.7 Index: lms/userpanel/modules/finances/templates/balance.html diff -u lms/userpanel/modules/finances/templates/balance.html:1.2 lms/userpanel/modules/finances/templates/balance.html:1.3 --- lms/userpanel/modules/finances/templates/balance.html:1.2 Mon Jan 2 12:01:43 2012 +++ lms/userpanel/modules/finances/templates/balance.html Tue Feb 7 14:10:35 2012 @@ -1,4 +1,4 @@ - + {box title="Balance"}

{if $userinfo.balance < 0} @@ -8,7 +8,7 @@ {/if}

{if $userinfo.balance < 0} - {if !$_config.userpanel.disable_transferform} + {if !check_conf('userpanel.disable_transferform')} {trans("Click here to print payment form")} Index: lms/userpanel/modules/finances/templates/userassignments.html diff -u lms/userpanel/modules/finances/templates/userassignments.html:1.2 lms/userpanel/modules/finances/templates/userassignments.html:1.3 --- lms/userpanel/modules/finances/templates/userassignments.html:1.2 Mon Jan 2 12:01:43 2012 +++ lms/userpanel/modules/finances/templates/userassignments.html Tue Feb 7 14:10:35 2012 @@ -1,12 +1,13 @@ - + {box title="Your subscriptions"} +{$show_speeds = check_conf('userpanel.show_speeds')}
{img src="cash.gif" alt=""} @@ -112,9 +114,10 @@ {trans("Bank account:")} - {bankaccount id=$userinfo.id account=$userinfo.account} + {$bankaccount}
- {if $_config.userpanel.show_speeds} + {if $show_speeds} {/if} @@ -16,11 +17,11 @@ {foreach from=$assignments item=assignment} {if ($assignment.tariffid || $assignment.liabilityid) && !($assignment.suspended || ($assignment.dateto < $smarty.now && $assignment.dateto) || ($assignment.datefrom > $smarty.now && $assignment.datefrom))} - + - {if $_config.userpanel.show_speeds} + {if $show_speeds} {/if} @@ -45,7 +46,7 @@ - {if $_config.userpanel.show_speeds} + {if $show_speeds} {/if} Index: lms/userpanel/modules/finances/templates/userbalancebox.html diff -u lms/userpanel/modules/finances/templates/userbalancebox.html:1.6 lms/userpanel/modules/finances/templates/userbalancebox.html:1.7 --- lms/userpanel/modules/finances/templates/userbalancebox.html:1.6 Wed Jan 4 09:24:30 2012 +++ lms/userpanel/modules/finances/templates/userbalancebox.html Tue Feb 7 14:10:35 2012 @@ -1,5 +1,6 @@ - + {box title="Your balance"} +{$disable_invoices = check_conf('userpanel.disable_invoices')}
{trans("Subscription:")} {trans("Value:")} {trans("Discount:")} {trans("Accounting day:")}{trans("Downrate (ceil):")} {trans("Uprate (ceil):")}
{if $_config.userpanel.show_tariffname}{$assignment.name}{/if}{if check_conf('userpanel.show_tariffname')}{$assignment.name}{/if} {$assignment.value|money_format} {if $assignment.discount > 0}{$assignment.discount}%{/if} {$assignment.payday}{$assignment.downrate|default:"-"}({$assignment.downceil|default:"-"}) kbit/s {$assignment.uprate|default:"-"}({$assignment.upceil|default:"-"}) kbit/s{sum array=$assignments column="real_value" string_format=$LANGDEFS.$_language.money_format} ({sum array=$assignments column="real_disc_value" string_format=$LANGDEFS.$_language.money_format})  {sum array=$assignments column="real_downrate" default="-"}({sum array=$assignments column="real_downceil" default="-"}) kbit/s {sum array=$assignments column="real_uprate" default="-"}({sum array=$assignments column="real_upceil" default="-"}) kbit/s
@@ -8,7 +9,7 @@ - {if !$_config.userpanel.disable_invoices} + {if !$disable_invoices} {/if} @@ -19,7 +20,7 @@ - {if !$_config.userpanel.disable_invoices} + {if !$disable_invoices} {/section} - {if !$_config.userpanel.disable_invoices} + {if !$disable_invoices}
» {trans("After:")} {trans("Description:")}
» {if $balancelist.after[balancelist] < 0}{/if}{$balancelist.after[balancelist]|money_format}{if $balancelist.after[balancelist] < 0}{/if} {$balancelist.comment[balancelist]} {if $balancelist.doctype[balancelist]==1 || $balancelist.doctype[balancelist]==3} {img src="print.gif" alt="[ Print ]" text=$balancelist.number[balancelist]} @@ -38,7 +39,7 @@
From cvs w lms.org.pl Tue Feb 7 14:10:35 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 14:10:35 +0100 (CET) Subject: [lms-commits] CVS update of lms/templates (49 files) Message-ID: <20120207131035.452B7309D4B7@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 14:10:35 Author: alec Path: /cvsroot/lms/templates Modified: accountadd.html accountedit.html balancelist.html balancenew.html choosegpscoords.html clearheader.html customerassignments.html customerassignmentsedit.html customerbalancebox.html customerinfo.html customerinfobox.html customerinfoshort.html customerlist.html customernodesbox.html customersearchresults.html header.html invoice.html invoiceedit.html invoiceheader.html invoicelist.html invoicenew.html invoicenote.html login.html netdevadd.html netdeveditbox.html netdevinfobox.html netdevipaddbox.html netdevipeditbox.html netdevipinfobox.html netdevmap.html nodeaddbox.html nodeeditbox.html nodelist.html nodelistshort.html nodesearchresults.html note.html noteheader.html notelist.html printcustomerlist.html printindex.html receipt.html receiptheader.html receiptlist.html scroller.html tariffadd.html tariffinfo.html tarifflist.html trafficgraph.html welcome.html - Improved configuration handling in templates Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/templates/accountadd.html.diff?&r1=1.49&r2=1.50 http://cvs.lms.org.pl/viewvc/Development/lms/templates/accountedit.html.diff?&r1=1.40&r2=1.41 http://cvs.lms.org.pl/viewvc/Development/lms/templates/balancelist.html.diff?&r1=1.101&r2=1.102 http://cvs.lms.org.pl/viewvc/Development/lms/templates/balancenew.html.diff?&r1=1.71&r2=1.72 http://cvs.lms.org.pl/viewvc/Development/lms/templates/choosegpscoords.html.diff?&r1=1.15&r2=1.16 http://cvs.lms.org.pl/viewvc/Development/lms/templates/clearheader.html.diff?&r1=1.19&r2=1.20 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerassignments.html.diff?&r1=1.49&r2=1.50 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerassignmentsedit.html.diff?&r1=1.31&r2=1.32 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerbalancebox.html.diff?&r1=1.56&r2=1.57 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerinfo.html.diff?&r1=1.12&r2=1.13 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerinfobox.html.diff?&r1=1.55&r2=1.56 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerinfoshort.html.diff?&r1=1.31&r2=1.32 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerlist.html.diff?&r1=1.24&r2=1.25 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customernodesbox.html.diff?&r1=1.33&r2=1.34 http://cvs.lms.org.pl/viewvc/Development/lms/templates/customersearchresults.html.diff?&r1=1.20&r2=1.21 http://cvs.lms.org.pl/viewvc/Development/lms/templates/header.html.diff?&r1=1.138&r2=1.139 http://cvs.lms.org.pl/viewvc/Development/lms/templates/invoice.html.diff?&r1=1.75&r2=1.76 http://cvs.lms.org.pl/viewvc/Development/lms/templates/invoiceedit.html.diff?&r1=1.47&r2=1.48 http://cvs.lms.org.pl/viewvc/Development/lms/templates/invoiceheader.html.diff?&r1=1.4&r2=1.5 http://cvs.lms.org.pl/viewvc/Development/lms/templates/invoicelist.html.diff?&r1=1.88&r2=1.89 http://cvs.lms.org.pl/viewvc/Development/lms/templates/invoicenew.html.diff?&r1=1.76&r2=1.77 http://cvs.lms.org.pl/viewvc/Development/lms/templates/invoicenote.html.diff?&r1=1.32&r2=1.33 http://cvs.lms.org.pl/viewvc/Development/lms/templates/login.html.diff?&r1=1.60&r2=1.61 http://cvs.lms.org.pl/viewvc/Development/lms/templates/netdevadd.html.diff?&r1=1.38&r2=1.39 http://cvs.lms.org.pl/viewvc/Development/lms/templates/netdeveditbox.html.diff?&r1=1.41&r2=1.42 http://cvs.lms.org.pl/viewvc/Development/lms/templates/netdevinfobox.html.diff?&r1=1.35&r2=1.36 http://cvs.lms.org.pl/viewvc/Development/lms/templates/netdevipaddbox.html.diff?&r1=1.37&r2=1.38 http://cvs.lms.org.pl/viewvc/Development/lms/templates/netdevipeditbox.html.diff?&r1=1.35&r2=1.36 http://cvs.lms.org.pl/viewvc/Development/lms/templates/netdevipinfobox.html.diff?&r1=1.26&r2=1.27 http://cvs.lms.org.pl/viewvc/Development/lms/templates/netdevmap.html.diff?&r1=1.37&r2=1.38 http://cvs.lms.org.pl/viewvc/Development/lms/templates/nodeaddbox.html.diff?&r1=1.95&r2=1.96 http://cvs.lms.org.pl/viewvc/Development/lms/templates/nodeeditbox.html.diff?&r1=1.99&r2=1.100 http://cvs.lms.org.pl/viewvc/Development/lms/templates/nodelist.html.diff?&r1=1.105&r2=1.106 http://cvs.lms.org.pl/viewvc/Development/lms/templates/nodelistshort.html.diff?&r1=1.24&r2=1.25 http://cvs.lms.org.pl/viewvc/Development/lms/templates/nodesearchresults.html.diff?&r1=1.56&r2=1.57 http://cvs.lms.org.pl/viewvc/Development/lms/templates/note.html.diff?&r1=1.4&r2=1.5 http://cvs.lms.org.pl/viewvc/Development/lms/templates/noteheader.html.diff?&r1=1.3&r2=1.4 http://cvs.lms.org.pl/viewvc/Development/lms/templates/notelist.html.diff?&r1=1.9&r2=1.10 http://cvs.lms.org.pl/viewvc/Development/lms/templates/printcustomerlist.html.diff?&r1=1.11&r2=1.12 http://cvs.lms.org.pl/viewvc/Development/lms/templates/printindex.html.diff?&r1=1.107&r2=1.108 http://cvs.lms.org.pl/viewvc/Development/lms/templates/receipt.html.diff?&r1=1.17&r2=1.18 http://cvs.lms.org.pl/viewvc/Development/lms/templates/receiptheader.html.diff?&r1=1.3&r2=1.4 http://cvs.lms.org.pl/viewvc/Development/lms/templates/receiptlist.html.diff?&r1=1.30&r2=1.31 http://cvs.lms.org.pl/viewvc/Development/lms/templates/scroller.html.diff?&r1=1.6&r2=1.7 http://cvs.lms.org.pl/viewvc/Development/lms/templates/tariffadd.html.diff?&r1=1.59&r2=1.60 http://cvs.lms.org.pl/viewvc/Development/lms/templates/tariffinfo.html.diff?&r1=1.66&r2=1.67 http://cvs.lms.org.pl/viewvc/Development/lms/templates/tarifflist.html.diff?&r1=1.72&r2=1.73 http://cvs.lms.org.pl/viewvc/Development/lms/templates/trafficgraph.html.diff?&r1=1.9&r2=1.10 http://cvs.lms.org.pl/viewvc/Development/lms/templates/welcome.html.diff?&r1=1.93&r2=1.94 Index: lms/templates/accountadd.html diff -u lms/templates/accountadd.html:1.49 lms/templates/accountadd.html:1.50 --- lms/templates/accountadd.html:1.49 Mon Feb 6 18:29:35 2012 +++ lms/templates/accountadd.html Tue Feb 7 14:10:34 2012 @@ -1,11 +1,11 @@ {include file="header.html"} - + {include file="calendar_js.html"} +{$default_printpage = get_conf('invoices.default_printpage')} +{$default_taxrate = get_conf('phpui.default_taxrate')}
@@ -155,16 +157,16 @@
@@ -183,7 +185,7 @@   Index: lms/templates/customerinfo.html diff -u lms/templates/customerinfo.html:1.12 lms/templates/customerinfo.html:1.13 --- lms/templates/customerinfo.html:1.12 Sun Feb 5 14:21:12 2012 +++ lms/templates/customerinfo.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

{include file="calendar_js.html"}
- {if $_config.phpui.delete_link_in_customerbalancebox|chkconfig} + {if check_conf('phpui.delete_link_in_customerbalancebox')} {trans("Delete")} {trans(  {/if} {trans("Print")}: {trans("invoices")}   {trans("cash receipts")}   {trans("debit notes")}   - - - + + +
@@ -43,7 +43,7 @@ {include file="customerassignments.html"} - {if !$_config.privileges.hide_finances|chkconfig || $adminuser} + {if !check_conf('privileges.hide_finances')}
{include file="customerbalancebox.html" limit=-10} Index: lms/templates/customerinfobox.html diff -u lms/templates/customerinfobox.html:1.55 lms/templates/customerinfobox.html:1.56 --- lms/templates/customerinfobox.html:1.55 Sun Feb 5 14:21:12 2012 +++ lms/templates/customerinfobox.html Tue Feb 7 14:10:34 2012 @@ -1,4 +1,4 @@ - + {/if} - {if !$_config.privileges.hide_finances|chkconfig || $adminuser} + {if !check_conf('privileges.hide_finances')} {/if} -{if !$_config.privileges.hide_finances|chkconfig || $adminuser} +{if !check_conf('privileges.hide_finances')}
@@ -314,7 +314,7 @@
Index: lms/templates/customerinfoshort.html diff -u lms/templates/customerinfoshort.html:1.31 lms/templates/customerinfoshort.html:1.32 --- lms/templates/customerinfoshort.html:1.31 Sun Feb 5 14:21:12 2012 +++ lms/templates/customerinfoshort.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ - + @@ -162,7 +162,7 @@
Index: lms/templates/customerlist.html diff -u lms/templates/customerlist.html:1.24 lms/templates/customerlist.html:1.25 --- lms/templates/customerlist.html:1.24 Sun Feb 5 14:35:53 2012 +++ lms/templates/customerlist.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

@@ -13,7 +13,7 @@ {trans("Services:")} +
- {if !$_config.privileges.hide_finances|chkconfig || $adminuser} + {if !check_conf('privileges.hide_finances')} {trans("Balance:")} {if $listdata.order eq "balance"}{/if}
{trans("Subscription:")} {if $listdata.order eq "tariff"}{/if} {/if} @@ -36,7 +36,7 @@ - {if !$_config.privileges.hide_finances|chkconfig || $adminuser} + {if !check_conf('privileges.hide_finances')} @@ -98,13 +98,13 @@ {/if} 		- {if !$_config.privileges.hide_finances|chkconfig || $adminuser} + {if !check_conf('privileges.hide_finances')} {if $customerlist[customerlist].balance < 0}{/if}{$customerlist[customerlist].balance|money_format}{if $customerlist[customerlist].balance < 0}{/if}
{$customerlist[customerlist].tariffvalue|money_format} {/if} - 		- {if !$_config.privileges.hide_finances|chkconfig || $adminuser} + {if !check_conf('privileges.hide_finances')} {if $customerlist[customerlist].balance < 0} [ {trans( {/if} @@ -164,13 +164,13 @@   - {if (!$_config.privileges.hide_finances|chkconfig && !$_config.privileges.hide_summaries|chkconfig) || $adminuser} + {if !check_conf('privileges.hide_finances') && !check_conf('privileges.hide_summaries')} {trans("Outstandings")}:
{trans("Overcharges")}: {/if} 		- {if (!$_config.privileges.hide_finances|chkconfig && !$_config.privileges.hide_summaries|chkconfig) || $adminuser} + {if !check_conf('privileges.hide_finances') && !check_conf('privileges.hide_summaries')} {$listdata.below|money_format}
{$listdata.over|money_format} {/if} Index: lms/templates/customernodesbox.html diff -u lms/templates/customernodesbox.html:1.33 lms/templates/customernodesbox.html:1.34 --- lms/templates/customernodesbox.html:1.33 Wed Jan 4 09:24:30 2012 +++ lms/templates/customernodesbox.html Tue Feb 7 14:10:34 2012 @@ -1,4 +1,4 @@ - + -{if $_config.phpui.ewx_support|chkconfig}{assign var=ewx value=1}{else}{assign var=ewx value=0}{/if} +{$lastonline_limit=get_conf('phpui.lastonline_limit')} +{if check_conf('phpui.ewx_support')}{assign var=ewx value=1}{else}{assign var=ewx value=0}{/if} Index: lms/templates/invoice.html diff -u lms/templates/invoice.html:1.75 lms/templates/invoice.html:1.76 --- lms/templates/invoice.html:1.75 Mon Jan 2 12:01:39 2012 +++ lms/templates/invoice.html Tue Feb 7 14:10:34 2012 @@ -1,4 +1,4 @@ - +
@@ -60,7 +61,7 @@
{if $customernodes[customernodes].lastonline} - {if ($smarty.now-$customernodes[customernodes].lastonline) > $_config.phpui.lastonline_limit} + {if ($smarty.now-$customernodes[customernodes].lastonline) > $lastonline_limit} {else} Index: lms/templates/customersearchresults.html diff -u lms/templates/customersearchresults.html:1.20 lms/templates/customersearchresults.html:1.21 --- lms/templates/customersearchresults.html:1.20 Sun Feb 5 14:21:12 2012 +++ lms/templates/customersearchresults.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

- + {if !$layout.popup} @@ -23,7 +23,7 @@

- LMS {$layout.lmsv}
+ LMS {$layout.lmsv}
LMS {$layout.lmsv}
 
@@ -41,7 +41,7 @@ {trans("Seller:")}

{$invoice.division_header|replace:"\n":"
"}
- {trans("Bank account:")} {bankaccount id=$invoice.customerid account=$invoice.account} + {trans("Bank account:")} {bankaccount($invoice.customerid, $invoice.account)}

{trans("Purchaser:")}

@@ -346,7 +346,7 @@ @@ -339,9 +341,9 @@ {/if}
{trans("In words:")} - {if $_config.phpui.to_words_short_version|chkconfig} + {if check_conf('phpui.to_words_short_version')} {$invoice.value|string_format:"%d"|to_words:0:"":1} {$invoice.valuep|string_format:"%02d"}/100 {else} {t a=$invoice.value|string_format:"%d"|to_words b=$invoice.valuep|to_words}$a dollars $b cents{/t} Index: lms/templates/invoiceedit.html diff -u lms/templates/invoiceedit.html:1.47 lms/templates/invoiceedit.html:1.48 --- lms/templates/invoiceedit.html:1.47 Mon Jan 2 12:01:39 2012 +++ lms/templates/invoiceedit.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

{include file="calendar_js.html"} +{$default_printpage = get_conf('invoices.default_printpage')} +{$default_taxrate = get_conf('phpui.default_taxrate')} @@ -325,7 +327,7 @@
- {trans("original")} - {trans("copy")} - {trans("duplicate")}  + {trans("original")} + {trans("copy")} + {trans("duplicate")}  {trans("Cancel")} {if !$customer} {trans("Save")} Index: lms/templates/invoiceheader.html diff -u lms/templates/invoiceheader.html:1.4 lms/templates/invoiceheader.html:1.5 --- lms/templates/invoiceheader.html:1.4 Mon May 24 09:43:18 2010 +++ lms/templates/invoiceheader.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ - + @@ -10,4 +10,4 @@ {foreach from=$css item=line}{$line}{/foreach} --> - + Index: lms/templates/invoicelist.html diff -u lms/templates/invoicelist.html:1.88 lms/templates/invoicelist.html:1.89 --- lms/templates/invoicelist.html:1.88 Wed Jan 4 09:24:30 2012 +++ lms/templates/invoicelist.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

{if $invoice.invoice} +{$default_printpage = get_conf('invoices.default_printpage')} @@ -188,9 +189,9 @@
{trans("Check/Uncheck as accounted")}   {trans("Print")}   - - - + + + Index: lms/templates/invoicenew.html diff -u lms/templates/invoicenew.html:1.76 lms/templates/invoicenew.html:1.77 --- lms/templates/invoicenew.html:1.76 Wed Jan 4 10:09:02 2012 +++ lms/templates/invoicenew.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

{if $newinvoice} +{$default_printpage = get_conf('invoices.default_printpage')} +{$default_taxrate = get_conf('phpui.default_taxrate')} @@ -389,7 +391,7 @@ @@ -402,8 +404,8 @@
- -   + +   {trans("Cancel")} {trans("Clear Contents")} {if !$customer} Index: lms/templates/invoicenote.html diff -u lms/templates/invoicenote.html:1.32 lms/templates/invoicenote.html:1.33 --- lms/templates/invoicenote.html:1.32 Wed Jan 4 10:09:02 2012 +++ lms/templates/invoicenote.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

{include file="calendar_js.html"} Index: lms/templates/nodeaddbox.html diff -u lms/templates/nodeaddbox.html:1.95 lms/templates/nodeaddbox.html:1.96 --- lms/templates/nodeaddbox.html:1.95 Thu Feb 2 17:55:05 2012 +++ lms/templates/nodeaddbox.html Tue Feb 7 14:10:34 2012 @@ -1,4 +1,4 @@ - + @@ -24,7 +24,7 @@ »»» - {if $_config.phpui.public_ip|chkconfig} + {if check_conf('phpui.public_ip')}
{trans( @@ -211,7 +211,7 @@ { var passwd = new Array(); var items = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - var length = {$_config.phpui.nodepassword_length|default:"16"}; + var length = {get_conf('phpui.nodepassword_length', '16')}; if (length > 32) length = 32; for (var i=0; i + @@ -222,7 +222,7 @@ var passwd = new Array(); var items = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - var length = {$_config.phpui.nodepassword_length|default:"16"}; + var length = {get_conf('phpui.nodepassword_length', '16')}; if (length > 32) length = 32; for (var i=0; i +

{$layout.pagetitle}

+{$lastonline_limit = get_conf('phpui.lastonline_limit')} - + {if $listdata.total != 0}
@@ -56,7 +57,7 @@
@@ -70,7 +71,7 @@ {if $nodelist[nodelist].lastonline} - {if ($smarty.now-$nodelist[nodelist].lastonline) > $_config.phpui.lastonline_limit} + {if ($smarty.now-$nodelist[nodelist].lastonline) > $lastonline_limit} {else} Index: lms/templates/nodelistshort.html diff -u lms/templates/nodelistshort.html:1.24 lms/templates/nodelistshort.html:1.25 --- lms/templates/nodelistshort.html:1.24 Mon Jan 2 12:01:40 2012 +++ lms/templates/nodelistshort.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ - + @@ -10,6 +10,7 @@ +{$lastonline_limit = get_conf('phpui.lastonline_limit')}
@@ -32,7 +33,7 @@ {if $customernodes[customernodes].lastonline} - {if ($smarty.now-$customernodes[customernodes].lastonline) > $_config.phpui.lastonline_limit} + {if ($smarty.now-$customernodes[customernodes].lastonline) > $lastonline_limit} {else} Index: lms/templates/nodesearchresults.html diff -u lms/templates/nodesearchresults.html:1.56 lms/templates/nodesearchresults.html:1.57 --- lms/templates/nodesearchresults.html:1.56 Mon Jan 2 12:01:40 2012 +++ lms/templates/nodesearchresults.html Tue Feb 7 14:10:34 2012 @@ -1,6 +1,7 @@ {include file="header.html"} - +

{$layout.pagetitle}

+{$lastonline_limit = get_conf('phpui.lastonline_limit')}

@@ -32,7 +33,7 @@ {if $nodelist[nodelist].lastonline} - {if ($smarty.now-$nodelist[nodelist].lastonline) > $_config.phpui.lastonline_limit} + {if ($smarty.now-$nodelist[nodelist].lastonline) > $lastonline_limit} {else} Index: lms/templates/note.html diff -u lms/templates/note.html:1.4 lms/templates/note.html:1.5 --- lms/templates/note.html:1.4 Mon Jan 2 12:01:40 2012 +++ lms/templates/note.html Tue Feb 7 14:10:34 2012 @@ -1,4 +1,4 @@ - +
{trans("Draw-up date:")} {$note.cdate|date_format:"%Y/%m/%d"}{if $note.division_cplace neq ""}, {$note.division_cplace}{/if} @@ -79,7 +79,7 @@
{trans("In words:")} - {if $_config.phpui.to_words_short_version|chkconfig} + {if check_conf('phpui.to_words_short_version')} {$note.value|string_format:"%d"|to_words:0:"":1} {$note.valuep|string_format:"%02d"}/100 {else} {t a=$note.value|string_format:"%d"|to_words b=$note.valuep|to_words}$a dollars $b cents{/t} Index: lms/templates/noteheader.html diff -u lms/templates/noteheader.html:1.3 lms/templates/noteheader.html:1.4 --- lms/templates/noteheader.html:1.3 Mon May 24 09:43:18 2010 +++ lms/templates/noteheader.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ - + @@ -8,4 +8,4 @@ ::: LMS :{if $layout.pagetitle neq ""} {$layout.pagetitle} :{/if}:: - + Index: lms/templates/notelist.html diff -u lms/templates/notelist.html:1.9 lms/templates/notelist.html:1.10 --- lms/templates/notelist.html:1.9 Wed Jan 4 09:24:30 2012 +++ lms/templates/notelist.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

{if $note}

{/if} -{if ($printmenu=="customer" || $printmenu=="finances") && (!$_config.privileges.hide_finances|chkconfig || $adminuser)} +{if ($printmenu=="customer" || $printmenu=="finances") && !check_conf('privileges.hide_finances')}

@@ -738,9 +739,9 @@
-    -    -   +    +    +  
@@ -886,7 +887,7 @@

{/if} -{if ($printmenu=="customer" || $printmenu=="finances") && (!$_config.privileges.hide_finances|chkconfig || $adminuser)} +{if ($printmenu=="customer" || $printmenu=="finances") && !check_conf('privileges.hide_finances')}

Index: lms/templates/receipt.html diff -u lms/templates/receipt.html:1.17 lms/templates/receipt.html:1.18 --- lms/templates/receipt.html:1.17 Mon Jan 2 12:01:40 2012 +++ lms/templates/receipt.html Tue Feb 7 14:10:34 2012 @@ -1,4 +1,4 @@ - + {if !$receipt.last}
{/if} {if !$type || $type == "original"}
@@ -79,7 +79,7 @@
Index: lms/templates/tariffinfo.html diff -u lms/templates/tariffinfo.html:1.66 lms/templates/tariffinfo.html:1.67 --- lms/templates/tariffinfo.html:1.66 Mon Jan 2 14:15:10 2012 +++ lms/templates/tariffinfo.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

Index: lms/templates/welcome.html diff -u lms/templates/welcome.html:1.93 lms/templates/welcome.html:1.94 --- lms/templates/welcome.html:1.93 Sun Feb 5 14:21:12 2012 +++ lms/templates/welcome.html Tue Feb 7 14:10:34 2012 @@ -1,10 +1,10 @@ {include file="header.html"} - +

{$layout.pagetitle}

{trans("In words:")} - {if $_config.phpui.to_words_short_version|chkconfig} + {if check_conf('phpui.to_words_short_version')} {$receipt.total|string_format:"%d"|to_words:0:"":1} {$receipt.totalg|string_format:"%02d"}/100 {else} {t a=$receipt.total|string_format:"%d"|to_words b=$receipt.totalg|to_words}$a dollars $b cents{/t} @@ -221,7 +221,7 @@
{trans("In words:")} - {if $_config.phpui.to_words_short_version|chkconfig} + {if check_conf('phpui.to_words_short_version')} {$receipt.total|string_format:"%d"|to_words:0:"":1} {$receipt.totalg|string_format:"%02d"}/100 {else} {t a=$receipt.total|string_format:"%d"|to_words b=$receipt.totalg|to_words}$a dollars $b cents{/t} Index: lms/templates/receiptheader.html diff -u lms/templates/receiptheader.html:1.3 lms/templates/receiptheader.html:1.4 --- lms/templates/receiptheader.html:1.3 Mon May 24 09:43:18 2010 +++ lms/templates/receiptheader.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ - + @@ -8,4 +8,4 @@ ::: LMS :{if $layout.pagetitle neq ""} {$layout.pagetitle} :{/if}:: - + Index: lms/templates/receiptlist.html diff -u lms/templates/receiptlist.html:1.30 lms/templates/receiptlist.html:1.31 --- lms/templates/receiptlist.html:1.30 Mon Feb 6 18:14:42 2012 +++ lms/templates/receiptlist.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

{if $receipt.receipt} @@ -32,7 +32,7 @@ document.page.submit(); } -{if $_config.phpui.short_pagescroller|chkconfig} +{if check_conf('phpui.short_pagescroller')} function pagechange1() { document.page.action="?m=receiptlist&page=" + document.forms['page'].elements['page1'].value; Index: lms/templates/scroller.html diff -u lms/templates/scroller.html:1.6 lms/templates/scroller.html:1.7 --- lms/templates/scroller.html:1.6 Mon Jan 2 12:01:40 2012 +++ lms/templates/scroller.html Tue Feb 7 14:10:34 2012 @@ -1,4 +1,4 @@ -{if $_config.phpui.short_pagescroller|chkconfig} +{if check_conf('phpui.short_pagescroller')} {trans("Page:")} {if $page > 1}«««{/if} {math assign=lastpage equation="ceil(x/y)" x=$listdata.total y=$pagelimit} Index: lms/templates/tariffadd.html diff -u lms/templates/tariffadd.html:1.59 lms/templates/tariffadd.html:1.60 --- lms/templates/tariffadd.html:1.59 Tue Jan 3 22:02:58 2012 +++ lms/templates/tariffadd.html Tue Feb 7 14:10:34 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - + +{$default_taxrate = get_conf('phpui.default_taxrate')}

{$layout.pagetitle}

@@ -50,7 +51,7 @@
- {if !$_config.privileges.hide_sysinfo|chkconfig} + {if !check_conf('privileges.hide_sysinfo')} + {/if} - {if !$_config.privileges.hide_summaries|chkconfig} + {if !check_conf('privileges.hide_summaries')} - {if !$_config.privileges.hide_links|chkconfig} + {if !check_conf('privileges.hide_links')}
@@ -107,11 +107,11 @@
-
@@ -146,13 +146,13 @@ @@ -285,7 +285,7 @@ {/if}
{trans("Total:")}
- {if !$_config.privileges.hide_finances|chkconfig || $adminuser} + {if !check_conf('privileges.hide_finances')} {trans("Total Dues:")} {/if} 		{$customerstats.total}
- {if !$_config.privileges.hide_finances|chkconfig || $adminuser} + {if !check_conf('privileges.hide_finances')} {$customerstats.debt} ({trans("amount")} {$customerstats.debtvalue|money_format}) {/if}
@@ -309,7 +309,7 @@ {/if} - {if $adminuser} + {if check_conf('privileges.superuser')}
From cvs w lms.org.pl Tue Feb 7 14:10:36 2012 From: cvs w lms.org.pl (LMS CVS) Date: Tue, 7 Feb 2012 14:10:36 +0100 (CET) Subject: [lms-commits] CVS update of lms/userpanel/templates (header.html, setup_rights.html) Message-ID: <20120207131036.29AA23035084@eftep.altec.pl> Date: Tuesday, February 7, 2012 @ 14:10:36 Author: alec Path: /cvsroot/lms/userpanel/templates Modified: header.html setup_rights.html - Improved configuration handling in templates Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/templates/header.html.diff?&r1=1.5&r2=1.6 http://cvs.lms.org.pl/viewvc/Development/lms/userpanel/templates/setup_rights.html.diff?&r1=1.5&r2=1.6 Index: lms/userpanel/templates/header.html diff -u lms/userpanel/templates/header.html:1.5 lms/userpanel/templates/header.html:1.6 --- lms/userpanel/templates/header.html:1.5 Mon Jan 2 12:01:48 2012 +++ lms/userpanel/templates/header.html Tue Feb 7 14:10:36 2012 @@ -1,12 +1,13 @@ - + - + {trans("Virtual Customer Service")} -{if $_config.userpanel.hint neq 'classic' and $_config.userpanel.hint neq 'none'} +{$hint_mode = get_conf('userpanel.hint')} +{if $hint_mode neq 'classic' and $hint_mode neq 'none'} @@ -23,9 +24,9 @@ -{elseif $_config.userpanel.hint eq 'classic'} +{elseif $hint_mode eq 'classic'} {/if} -{body} \ No newline at end of file +{body} Index: lms/userpanel/templates/setup_rights.html diff -u lms/userpanel/templates/setup_rights.html:1.5 lms/userpanel/templates/setup_rights.html:1.6 --- lms/userpanel/templates/setup_rights.html:1.5 Mon Jan 2 15:53:21 2012 +++ lms/userpanel/templates/setup_rights.html Tue Feb 7 14:10:36 2012 @@ -1,5 +1,5 @@ {include file="header.html"} - +

{$layout.pagetitle}

@@ -120,7 +114,7 @@
- {trans("Select All")} + {trans("Submit")} From cvs w lms.org.pl Wed Feb 8 08:53:01 2012 From: cvs w lms.org.pl (LMS CVS) Date: Wed, 8 Feb 2012 08:53:01 +0100 (CET) Subject: [lms-commits] CVS update of lms/daemon/modules/ewx-pt (ewx-pt.c) Message-ID: <20120208075301.C61333023335@eftep.altec.pl> Date: Wednesday, February 8, 2012 @ 08:53:01 Author: alec Path: /cvsroot/lms/daemon/modules/ewx-pt Modified: ewx-pt.c - Fixed memory leak Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/daemon/modules/ewx-pt/ewx-pt.c.diff?&r1=1.23&r2=1.24 Index: lms/daemon/modules/ewx-pt/ewx-pt.c diff -u lms/daemon/modules/ewx-pt/ewx-pt.c:1.23 lms/daemon/modules/ewx-pt/ewx-pt.c:1.24 --- lms/daemon/modules/ewx-pt/ewx-pt.c:1.23 Tue Feb 7 13:19:55 2012 +++ lms/daemon/modules/ewx-pt/ewx-pt.c Wed Feb 8 08:53:01 2012 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: ewx-pt.c,v 1.23 2012/02/07 12:19:55 alec Exp $ + * $Id: ewx-pt.c,v 1.24 2012/02/08 07:53:01 alec Exp $ */ #include @@ -376,6 +376,7 @@ free(hosts[i].name); free(hosts[i].mac); free(hosts[i].ip); + free(hosts[i].passwd); } free(hosts); From cvs w lms.org.pl Wed Feb 8 22:11:40 2012 From: cvs w lms.org.pl (LMS CVS) Date: Wed, 8 Feb 2012 22:11:40 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib/locale/pl (system.php) Message-ID: <20120208211140.8F48930350DF@eftep.altec.pl> Date: Wednesday, February 8, 2012 @ 22:11:40 Author: chilek Path: /cvsroot/lms/lib/locale/pl Modified: system.php - BTS#00000908: address smarty function beautify_bankaccount Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/locale/pl/system.php.diff?&r1=1.3&r2=1.4 Index: lms/lib/locale/pl/system.php diff -u lms/lib/locale/pl/system.php:1.3 lms/lib/locale/pl/system.php:1.4 --- lms/lib/locale/pl/system.php:1.3 Mon Jan 2 12:01:29 2012 +++ lms/lib/locale/pl/system.php Wed Feb 8 22:11:40 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: system.php,v 1.3 2012/01/02 11:01:29 alec Exp $ + * $Id: system.php,v 1.4 2012/02/08 21:11:40 chilek Exp $ */ function check_ten($ten) @@ -167,4 +167,9 @@ return $account; } +function beautify_bankaccount($account) +{ + return preg_replace('/(..)(....)(....)(....)(....)(....)(....)/i', '${1} ${2} ${3} ${4} ${5} ${6} ${7}', $account); +} + ?> From cvs w lms.org.pl Wed Feb 8 22:11:40 2012 From: cvs w lms.org.pl (LMS CVS) Date: Wed, 8 Feb 2012 22:11:40 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib/locale/en (system.php) Message-ID: <20120208211140.55ADC30350DD@eftep.altec.pl> Date: Wednesday, February 8, 2012 @ 22:11:40 Author: chilek Path: /cvsroot/lms/lib/locale/en Modified: system.php - BTS#00000908: address smarty function beautify_bankaccount Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/locale/en/system.php.diff?&r1=1.3&r2=1.4 Index: lms/lib/locale/en/system.php diff -u lms/lib/locale/en/system.php:1.3 lms/lib/locale/en/system.php:1.4 --- lms/lib/locale/en/system.php:1.3 Mon Jan 2 12:01:29 2012 +++ lms/lib/locale/en/system.php Wed Feb 8 22:11:40 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: system.php,v 1.3 2012/01/02 11:01:29 alec Exp $ + * $Id: system.php,v 1.4 2012/02/08 21:11:40 chilek Exp $ */ function check_ten($ten) @@ -87,4 +87,9 @@ return $account; } +function beautify_bankaccount($account) +{ + return $account; +} + ?> From cvs w lms.org.pl Wed Feb 8 22:11:40 2012 From: cvs w lms.org.pl (LMS CVS) Date: Wed, 8 Feb 2012 22:11:40 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib/locale/ro (system.php) Message-ID: <20120208211140.A9D4230350E0@eftep.altec.pl> Date: Wednesday, February 8, 2012 @ 22:11:40 Author: chilek Path: /cvsroot/lms/lib/locale/ro Modified: system.php - BTS#00000908: address smarty function beautify_bankaccount Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/locale/ro/system.php.diff?&r1=1.3&r2=1.4 Index: lms/lib/locale/ro/system.php diff -u lms/lib/locale/ro/system.php:1.3 lms/lib/locale/ro/system.php:1.4 --- lms/lib/locale/ro/system.php:1.3 Mon Jan 2 12:01:29 2012 +++ lms/lib/locale/ro/system.php Wed Feb 8 22:11:40 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: system.php,v 1.3 2012/01/02 11:01:29 alec Exp $ + * $Id: system.php,v 1.4 2012/02/08 21:11:40 chilek Exp $ */ function check_ten($ten) @@ -93,7 +93,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: system.php,v 1.3 2012/01/02 11:01:29 alec Exp $ + * $Id: system.php,v 1.4 2012/02/08 21:11:40 chilek Exp $ */ function bankaccount($id, $account=NULL) @@ -113,4 +113,9 @@ return $account; } +function beautify_bankaccount($account) +{ + return $account; +} + ?> From cvs w lms.org.pl Wed Feb 8 22:11:40 2012 From: cvs w lms.org.pl (LMS CVS) Date: Wed, 8 Feb 2012 22:11:40 +0100 (CET) Subject: [lms-commits] CVS update of lms/lib/locale/lt (system.php) Message-ID: <20120208211140.7054F30350DE@eftep.altec.pl> Date: Wednesday, February 8, 2012 @ 22:11:40 Author: chilek Path: /cvsroot/lms/lib/locale/lt Modified: system.php - BTS#00000908: address smarty function beautify_bankaccount Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/lib/locale/lt/system.php.diff?&r1=1.4&r2=1.5 Index: lms/lib/locale/lt/system.php diff -u lms/lib/locale/lt/system.php:1.4 lms/lib/locale/lt/system.php:1.5 --- lms/lib/locale/lt/system.php:1.4 Mon Jan 2 12:01:29 2012 +++ lms/lib/locale/lt/system.php Wed Feb 8 22:11:40 2012 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. * - * $Id: system.php,v 1.4 2012/01/02 11:01:29 alec Exp $ + * $Id: system.php,v 1.5 2012/02/08 21:11:40 chilek Exp $ */ function check_ten($ten) @@ -155,4 +155,9 @@ return $account; } +function beautify_bankaccount($account) +{ + return preg_replace('/(..)(....)(....)(....)(....)/i', '${1} ${2} ${3} ${4} ${5}', $account); +} + ?> From cvs w lms.org.pl Wed Feb 8 22:11:40 2012 From: cvs w lms.org.pl (LMS CVS) Date: Wed, 8 Feb 2012 22:11:40 +0100 (CET) Subject: [lms-commits] CVS update of lms/doc (ChangeLog) Message-ID: <20120208211140.23C7D30350DB@eftep.altec.pl> Date: Wednesday, February 8, 2012 @ 22:11:40 Author: chilek Path: /cvsroot/lms/doc Modified: ChangeLog - BTS#00000908: address smarty function beautify_bankaccount Diff URLs: http://cvs.lms.org.pl/viewvc/Development/lms/doc/ChangeLog.diff?&r1=1.1632&r2=1.1633 Index: lms/doc/ChangeLog diff -u lms/doc/ChangeLog:1.1632 lms/doc/ChangeLog:1.1633 --- lms/doc/ChangeLog:1.1632 Thu Feb 2 17:55:04 2012 +++ lms/doc/ChangeLog Wed Feb 8 22:11:39 2012 @@ -1,4 +1,4 @@ -$Id: ChangeLog,v 1.1632 2012/02/02 16:55:04 chilek Exp $ +$Id: ChangeLog,v 1.1633 2012/02/08 21:11:39 chilek Exp $ version ? (????-??-??): @@ -86,6 +86,7 @@ - use more