[Astlinux-commits] SF.net SVN: astlinux:[6108] branches/1.0/package/webinterface/altweb/admin

[<abe...@us...>]

Revision: 6108
          http://sourceforge.net/p/astlinux/code/6108
Author:   abelbeck
Date:     2013-05-28 02:48:38 +0000 (Tue, 28 May 2013)
Log Message:
-----------
web interface, Network and Edit tabs, add 'LDAP Client System Defaults' support

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/edit.php
    branches/1.0/package/webinterface/altweb/admin/network.php

Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php	2013-05-27 15:52:55 UTC (rev 6107)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php	2013-05-28 02:48:38 UTC (rev 6108)
@@ -28,6 +28,7 @@
   'openvpnclient' => 'Restart OpenVPN Client',
   'racoon' => 'Restart IPsec VPN',
   'pptpd' => 'Restart PPTP VPN Server',
+  'ldap' => 'Reload LDAP Client',
   'snmpd' => 'Restart SNMP Server',
   'stunnel' => 'Restart Stunnel Proxy',
   'miniupnpd' => 'Restart Univ. Plug\'n\'Play',
@@ -43,6 +44,7 @@
   'misdn-init.conf' => 'mISDN Configuration',
   'ntpd.conf' => 'NTP Time Client/Server',
   'sshd.conf' => 'SSH Server sshd_config',
+  'ldap.conf' => 'LDAP Client System Defaults',
   'lighttpd.conf' => 'Web Server Configuration',
   'sensors.conf' => 'Lm_sensors Hardware Monitoring',
   'zaptel.conf' => 'Zaptel System Config',
@@ -220,6 +222,8 @@
         $result = restartPROCESS($process, 38, $result, 'init');
       } elseif ($process === 'snmpd') {
         $result = restartPROCESS($process, 39, $result, 'init');
+      } elseif ($process === 'ldap') {
+        $result = restartPROCESS($process, 40, $result, 'init');
       } elseif ($process === 'cron') {
         $result = updateCRON('root', 30, $result);
       }
@@ -336,6 +340,8 @@
       putHtml('<p style="color: green;">XMPP Server has Restarted.</p>');
     } elseif ($result == 39) {
       putHtml('<p style="color: green;">SNMP Server has Restarted.</p>');
+    } elseif ($result == 40) {
+      putHtml('<p style="color: green;">LDAP Client Defaults has been Reloaded.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 999) {

Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2013-05-27 15:52:55 UTC (rev 6107)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2013-05-28 02:48:38 UTC (rev 6108)
@@ -81,6 +81,20 @@
   'External Interface' => 'interface'
 );
 
+$select_ldap_deref = array (
+  'never' => 'never',
+  'searching' => 'searching',
+  'finding' => 'finding',
+  'always' => 'always'
+);
+
+$select_ldap_tls_reqcert = array (
+  'never' => 'never',
+  'allow' => 'allow',
+  'try' => 'try',
+  'demand' => 'demand'
+);
+
 $select_ups_type = array (
   'disabled' => '',
   'usb' => 'usb',
@@ -541,7 +555,32 @@
   fwrite($fp, $value."\n");
   $value = 'MONITOR_ASTERISK_SIP_STATUS_UPDATES="'.$_POST['monitor_status_updates'].'"';
   fwrite($fp, $value."\n");
-  
+
+  fwrite($fp, "### LDAP Client System Defaults\n");
+  if (isset($_POST['ldap_uri'], $_POST['ldap_base'])) {
+    $value = 'LDAP_URI="'.tuq($_POST['ldap_uri']).'"';
+    fwrite($fp, $value."\n");
+    $value = 'LDAP_BASE="'.tuq($_POST['ldap_base']).'"';
+    fwrite($fp, $value."\n");
+    $value = 'LDAP_DEREF="'.$_POST['ldap_deref'].'"';
+    fwrite($fp, $value."\n");
+    $value = 'LDAP_TLS_CACERT="'.tuq($_POST['ldap_tls_cacert']).'"';
+    fwrite($fp, $value."\n");
+    $value = 'LDAP_TLS_REQCERT="'.$_POST['ldap_tls_reqcert'].'"';
+    fwrite($fp, $value."\n");
+  } else {
+    $value = 'LDAP_URI=""';
+    fwrite($fp, $value."\n");
+    $value = 'LDAP_BASE=""';
+    fwrite($fp, $value."\n");
+    $value = 'LDAP_DEREF=""';
+    fwrite($fp, $value."\n");
+    $value = 'LDAP_TLS_CACERT=""';
+    fwrite($fp, $value."\n");
+    $value = 'LDAP_TLS_REQCERT=""';
+    fwrite($fp, $value."\n");
+  }
+
   fwrite($fp, "### APC UPS Monitoring - Shutdown\n");
   if (isset($_POST['ups_type'], $_POST['ups_cable'], $_POST['ups_device'])) {
     $value = 'UPSTYPE="'.$_POST['ups_type'].'"';
@@ -819,6 +858,12 @@
     $result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
     header('Location: /admin/pptp.php');
     exit;
+  } elseif (isset($_POST['submit_edit_ldap'])) {
+    $result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
+    if (is_writable($file = '/mnt/kd/ldap.conf')) {
+      header('Location: /admin/edit.php?file='.$file);
+      exit;
+    }
   } elseif (isset($_POST['submit_edit_ups'])) {
     $result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
     if (is_writable($file = '/mnt/kd/apcupsd/apcupsd.conf')) {
@@ -898,6 +943,8 @@
         $result = restartPROCESS($process, 38, $result, 'init');
       } elseif ($process === 'snmpd') {
         $result = restartPROCESS($process, 39, $result, 'init');
+      } elseif ($process === 'ldap') {
+        $result = restartPROCESS($process, 40, $result, 'init');
       }
     } else {
       $result = 2;
@@ -974,6 +1021,8 @@
       putHtml('<p style="color: green;">XMPP Server has Restarted.</p>');
     } elseif ($result == 39) {
       putHtml('<p style="color: green;">SNMP Server has Restarted.</p>');
+    } elseif ($result == 40) {
+      putHtml('<p style="color: green;">LDAP Client Defaults has been Reloaded.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 100) {
@@ -1051,6 +1100,8 @@
   putHtml('<option value="racoon"'.$sel.'>Restart IPsec VPN</option>');
   $sel = ($reboot_restart === 'pptpd') ? ' selected="selected"' : '';
   putHtml('<option value="pptpd"'.$sel.'>Restart PPTP VPN Server</option>');
+  $sel = ($reboot_restart === 'ldap') ? ' selected="selected"' : '';
+  putHtml('<option value="ldap"'.$sel.'>Reload LDAP Client</option>');
   $sel = ($reboot_restart === 'snmpd') ? ' selected="selected"' : '';
   putHtml('<option value="snmpd"'.$sel.'>Restart SNMP Server</option>');
   $sel = ($reboot_restart === 'stunnel') ? ' selected="selected"' : '';
@@ -1705,7 +1756,49 @@
   putHtml('<tr class="dtrow0"><td colspan="6">&nbsp;</td></tr>');
   
   putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
+
+  putHtml('<strong>LDAP Client System Defaults:</strong>');
+  putHtml('</td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+  if (! is_file('/mnt/kd/ldap.conf')) {
+    $value = getVARdef($db, 'LDAP_URI', $cur_db);
+    putHtml('LDAP Server URI(s):<input type="text" size="82" maxlength="256" value="'.$value.'" name="ldap_uri" /></td></tr>');
+    putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+    $value = getVARdef($db, 'LDAP_BASE', $cur_db);
+    putHtml('LDAP Base DN:<input type="text" size="82" maxlength="256" value="'.$value.'" name="ldap_base" /></td></tr>');
+
+    putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+    putHtml('LDAP Dereferencing:');
+    $ldap_deref = getVARdef($db, 'LDAP_DEREF', $cur_db);
+    putHtml('<select name="ldap_deref">');
+    foreach ($select_ldap_deref as $key => $value) {
+      $sel = ($ldap_deref === $value) ? ' selected="selected"' : '';
+      putHtml('<option value="'.$value.'"'.$sel.'>'.$key.'</option>');
+    }
+    putHtml('</select>');
+    putHtml('</td></tr>');
+
+    putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+    putHtml('LDAP TLS Cert Check:');
+    $ldap_tls_reqcert = getVARdef($db, 'LDAP_TLS_REQCERT', $cur_db);
+    putHtml('<select name="ldap_tls_reqcert">');
+    foreach ($select_ldap_tls_reqcert as $key => $value) {
+      $sel = ($ldap_tls_reqcert === $value) ? ' selected="selected"' : '';
+      putHtml('<option value="'.$value.'"'.$sel.'>'.$key.'</option>');
+    }
+    putHtml('</select>');
+    putHtml('&ndash;&nbsp;Server CA Cert File:');
+    $value = getVARdef($db, 'LDAP_TLS_CACERT', $cur_db);
+    putHtml('<input type="text" size="24" maxlength="64" value="'.$value.'" name="ldap_tls_cacert" /></td></tr>');
+  } else {
+    putHtml('LDAP Defaults:');
+    putHtml('<input type="submit" value="LDAP Configuration" name="submit_edit_ldap" class="button" /></td></tr>');
+  }
+
+  putHtml('<tr class="dtrow0"><td colspan="6">&nbsp;</td></tr>');
   
+  putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
+  
   putHtml('<strong>APC UPS Monitoring &amp; Shutdown:</strong>');
   putHtml('</td></tr>');
   putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.