Subversion Repositories slis

Compare Revisions

Ignore whitespace Rev 5592 → Rev 5633

/slim/sources/trunk/slis-slim/debian/changelog
5,6 → 5,8
* Removed no more needed configuraiton for postgresql (tcp_socket).
* Added listen_addresses to '*' by default.
* Added slis 4.1 for the version stat graph.
* Added cidr addresses expression (%cidr_lan%, %cidr_wan%) for the archive
generation).
 
-- Philippe Le Brouster <plb@ac-grenoble.fr> Mon, 13 Oct 2008 16:22:41 +0200
 
/slim/sources/trunk/slis-slim/scripts/ZDKS/make.php
354,8 → 354,10
$type = trim($slis->type);
$cnet = find_net($slis->ip_wan,$slis->netmask_wan);
$network_wan = $cnet[network];
$cidr_wan = $cnet[cidr];
$cnet = find_net($slis->ip_lan,$slis->netmask_lan);
$network_lan = $cnet[network];
$cidr_lan = $cnet[cidr];
$varlist += array(
"%slis_type%" => $type,
"%slis_name%" => $name,
365,9 → 367,11
"%slis_wan_ip%" => ( $slis->is_isdn == 't' ? $slis->ip_lan : $slis->ip_wan),
"%slis_wan_netmask%" => ( $slis->is_isdn == 't' ? $slis->netmask_lan : $slis->netmask_wan),
"%slis_wan_network%" => ( $slis->is_isdn == 't' ? $network_lan : $network_wan),
"%slis_wan_cidr%" => ( $slis->is_isdn == 't' ? $cidr_lan : $cidr_wan),
"%slis_lan_ip%" => $slis->ip_lan,
"%slis_lan_netmask%" => $slis->netmask_lan,
"%slis_lan_network%" => $network_lan,
"%slis_lan_cidr%" => $cidr_lan,
"%is_cyberschool%" => ( $slis->is_cyber_school != 't' ? '0' : '1'),
"%samba%" => ( $slis->is_cyber_school != 't' ? '0' : '1'),
"%fetchmail%" => ($slis->is_fetchmail != 't' ? '0' : '1' ),