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

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

Revision: 6145
          http://sourceforge.net/p/astlinux/code/6145
Author:   abelbeck
Date:     2013-07-21 22:52:03 +0000 (Sun, 21 Jul 2013)
Log Message:
-----------
web interface, add hostname and domain backup filename option

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/openvpn.php
    branches/1.0/package/webinterface/altweb/admin/prefs.php
    branches/1.0/package/webinterface/altweb/admin/staff.php
    branches/1.0/package/webinterface/altweb/admin/system.php
    branches/1.0/package/webinterface/altweb/admin/xmpp.php
    branches/1.0/package/webinterface/altweb/common/functions.php

Modified: branches/1.0/package/webinterface/altweb/admin/openvpn.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpn.php	2013-07-21 17:41:55 UTC (rev 6144)
+++ branches/1.0/package/webinterface/altweb/admin/openvpn.php	2013-07-21 22:52:03 UTC (rev 6145)
@@ -126,25 +126,6 @@
   'subnet' => '[subnet] latest, requires OpenVPN 2.1+ clients'
 );
 
-// Function: get_HOSTNAME_DOMAIN
-//
-function get_HOSTNAME_DOMAIN() {
-  $hostname_domain = '';
-  
-  // System location of gui.network.conf file
-  $NETCONFFILE = '/mnt/kd/rc.conf.d/gui.network.conf';
-  
-  if (is_file($NETCONFFILE)) {
-    $netvars = parseRCconf($NETCONFFILE);
-    if (($hostname = getVARdef($netvars, 'HOSTNAME')) !== '') {
-      if (($domain = getVARdef($netvars, 'DOMAIN')) !== '') {
-        $hostname_domain = $hostname.'.'.$domain;
-      }
-    }
-  }
-  return($hostname_domain);
-}
-
 // Function: saveOVPNsettings
 //
 function saveOVPNsettings($conf_dir, $conf_file, $disabled = NULL) {

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2013-07-21 17:41:55 UTC (rev 6144)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2013-07-21 22:52:03 UTC (rev 6145)
@@ -302,6 +302,10 @@
       fwrite($fp, $value."\n");
     }
     
+    if (isset($_POST['backup_hostname_domain'])) {
+      $value = 'system_backup_hostname_domain = yes';
+      fwrite($fp, $value."\n");
+    }
     if (! isset($_POST['backup_gzip'])) {
       $value = 'system_backup_compress_gzip = no';
       fwrite($fp, $value."\n");
@@ -916,6 +920,9 @@
   putHtml('<strong>System &amp; Staff Tab Options:</strong>');
   putHtml('</td></tr>');
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
+  $sel = (getPREFdef($global_prefs, 'system_backup_hostname_domain') === 'yes') ? ' checked="checked"' : '';
+  putHtml('<input type="checkbox" value="backup_hostname_domain" name="backup_hostname_domain"'.$sel.' /></td><td colspan="5">Backup filename uses both Hostname and Domain</td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   $sel = (getPREFdef($global_prefs, 'system_backup_compress_gzip') !== 'no') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="backup_gzip" name="backup_gzip"'.$sel.' /></td><td colspan="5">Backup tar archives compressed with gzip [.gz]</td></tr>');
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');

Modified: branches/1.0/package/webinterface/altweb/admin/staff.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/staff.php	2013-07-21 17:41:55 UTC (rev 6144)
+++ branches/1.0/package/webinterface/altweb/admin/staff.php	2013-07-21 22:52:03 UTC (rev 6145)
@@ -48,9 +48,17 @@
       $suffix = '.tar.gz';
       $tarcmd = 'tar czf ';
     }
+    if (($backup_name = get_HOSTNAME_DOMAIN()) === '') {
+      $backup_name = $_SERVER['SERVER_NAME'];
+    }
+    if (getPREFdef($global_prefs, 'system_backup_hostname_domain') !== 'yes') {
+      if (($pos = strpos($backup_name, '.')) !== FALSE) {
+        $backup_name = substr($backup_name, 0, $pos);
+      }
+    }
     $asturw = (getPREFdef($global_prefs, 'system_backup_asturw') === 'yes') ? '/mnt/kd/asturw'.$suffix : '';
     $prefix = '/mnt/kd/.';
-    $tmpfile = $_SERVER['SERVER_NAME'].'-'.$backup_type.'-'.date('Y-m-d').$suffix;
+    $tmpfile = $backup_name.'-'.$backup_type.'-'.date('Y-m-d').$suffix;
     $srcfile = '$(ls -1 /mnt/kd/)';
     if ($asturw !== '') {
       $excludefile = tempnam("/tmp", "PHP_");

Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php	2013-07-21 17:41:55 UTC (rev 6144)
+++ branches/1.0/package/webinterface/altweb/admin/system.php	2013-07-21 22:52:03 UTC (rev 6145)
@@ -171,9 +171,17 @@
       $suffix = '.tar.gz';
       $tarcmd = 'tar czf ';
     }
+    if (($backup_name = get_HOSTNAME_DOMAIN()) === '') {
+      $backup_name = $_SERVER['SERVER_NAME'];
+    }
+    if (getPREFdef($global_prefs, 'system_backup_hostname_domain') !== 'yes') {
+      if (($pos = strpos($backup_name, '.')) !== FALSE) {
+        $backup_name = substr($backup_name, 0, $pos);
+      }
+    }
     $asturw = (getPREFdef($global_prefs, 'system_backup_asturw') === 'yes') ? '/mnt/kd/asturw'.$suffix : '';
     $prefix = (getPREFdef($global_prefs, 'system_backup_temp_disk') === 'yes') ? '/mnt/kd/.' : '/tmp/';
-    $tmpfile = $_SERVER['SERVER_NAME'].'-'.$backup_type.'-'.date('Y-m-d').$suffix;
+    $tmpfile = $backup_name.'-'.$backup_type.'-'.date('Y-m-d').$suffix;
     $firewall = is_dir('/mnt/kd/arno-iptables-firewall/plugins') ? ' "arno-iptables-firewall/plugins"' : '';
     if ($backup_type === 'basic') {
       $srcfile = '$(ls -1 /mnt/kd/ | sed -n -e "s/^rc.conf.d$/&/p" -e "s/^ssh_keys$/&/p"';

Modified: branches/1.0/package/webinterface/altweb/admin/xmpp.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/xmpp.php	2013-07-21 17:41:55 UTC (rev 6144)
+++ branches/1.0/package/webinterface/altweb/admin/xmpp.php	2013-07-21 22:52:03 UTC (rev 6145)
@@ -36,25 +36,6 @@
 
 require_once '../common/functions.php';
 
-// Function: get_HOSTNAME_DOMAIN
-//
-function get_HOSTNAME_DOMAIN() {
-  $hostname_domain = '';
-  
-  // System location of gui.network.conf file
-  $NETCONFFILE = '/mnt/kd/rc.conf.d/gui.network.conf';
-  
-  if (is_file($NETCONFFILE)) {
-    $netvars = parseRCconf($NETCONFFILE);
-    if (($hostname = getVARdef($netvars, 'HOSTNAME')) !== '') {
-      if (($domain = getVARdef($netvars, 'DOMAIN')) !== '') {
-        $hostname_domain = $hostname.'.'.$domain;
-      }
-    }
-  }
-  return($hostname_domain);
-}
-
 // Function: xmppGETclients
 //
 function xmppGETclients($vars) {

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2013-07-21 17:41:55 UTC (rev 6144)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2013-07-21 22:52:03 UTC (rev 6145)
@@ -524,6 +524,25 @@
   return($db_R);
 }
 
+// Function: get_HOSTNAME_DOMAIN
+//
+function get_HOSTNAME_DOMAIN() {
+  $hostname_domain = '';
+  
+  // System location of gui.network.conf file
+  $NETCONFFILE = '/mnt/kd/rc.conf.d/gui.network.conf';
+  
+  if (is_file($NETCONFFILE)) {
+    $netvars = parseRCconf($NETCONFFILE);
+    if (($hostname = getVARdef($netvars, 'HOSTNAME')) !== '') {
+      if (($domain = getVARdef($netvars, 'DOMAIN')) !== '') {
+        $hostname_domain = $hostname.'.'.$domain;
+      }
+    }
+  }
+  return($hostname_domain);
+}
+
 // Function: asteriskURLrepo
 //
 function asteriskURLrepo() {

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