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

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

Revision: 6469
          http://sourceforge.net/p/astlinux/code/6469
Author:   abelbeck
Date:     2014-03-18 21:19:00 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
web interface, add phoneprov templates directory to Basic Backup

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/phoneprov.php
    branches/1.0/package/webinterface/altweb/admin/system.php

Modified: branches/1.0/package/webinterface/altweb/admin/phoneprov.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/phoneprov.php	2014-03-18 12:58:39 UTC (rev 6468)
+++ branches/1.0/package/webinterface/altweb/admin/phoneprov.php	2014-03-18 21:19:00 UTC (rev 6469)
@@ -458,9 +458,7 @@
   <table class="layout"><tr><td><center>
   <form method="post" action="<?php echo $myself;?>">
 <?php
-  if (($phoneprov_base_dir = trim(shell_exec('. /etc/rc.conf; echo "$PHONEPROV_BASE_DIR"'))) === '') {
-    $phoneprov_base_dir = '/mnt/kd/phoneprov';
-  }
+  $phoneprov_base_dir = trim(shell_exec('. /etc/rc.conf; echo "${PHONEPROV_BASE_DIR:-/mnt/kd/phoneprov}"'));
 
   if (is_file($PHONEPROVCONFFILE)) {
     $vars = parseRCconf($PHONEPROVCONFFILE);

Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php	2014-03-18 12:58:39 UTC (rev 6468)
+++ branches/1.0/package/webinterface/altweb/admin/system.php	2014-03-18 21:19:00 UTC (rev 6469)
@@ -182,8 +182,14 @@
     $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 = $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') {
+      $firewall = is_dir('/mnt/kd/arno-iptables-firewall/plugins') ? ' "arno-iptables-firewall/plugins"' : '';
+      $phoneprov_base_dir = rtrim(trim(shell_exec('. /etc/rc.conf; echo "${PHONEPROV_BASE_DIR:-/mnt/kd/phoneprov}"')), '/');
+      if (is_dir("$phoneprov_base_dir/templates") && (strncmp($phoneprov_base_dir, '/mnt/kd', strlen('/mnt/kd')) == 0)) {
+        $templates = ' "'.substr("$phoneprov_base_dir/templates", strlen('/mnt/kd/')).'"';
+      } else {
+        $templates = '';
+      }
       $srcfile = '$(ls -1 /mnt/kd/ | sed -n -e "s/^rc.conf.d$/&/p" -e "s/^ssh_keys$/&/p"';
       $srcfile .= ' -e "s/^.*[.]conf$/&/p" -e "s/^webgui-prefs.txt$/&/p" -e "s/^ast.*/&/p"';
       $srcfile .= ' -e "s/^blocked-hosts$/&/p" -e "s/^dnsmasq.static$/&/p" -e "s/^hosts$/&/p" -e "s/^ethers$/&/p"';
@@ -191,6 +197,7 @@
       $srcfile .= ' -e "s/^crontabs$/&/p" -e "s/^snmp$/&/p" -e "s/^fop2$/&/p"';
       $srcfile .= ' -e "s/^openvpn$/&/p" -e "s/^ipsec$/&/p" -e "s/^dahdi$/&/p" -e "s/^ssl$/&/p" -e "s/^ups$/&/p")';
       $srcfile .= $firewall;
+      $srcfile .= $templates;
     } elseif ($backup_type === 'cdr') {
       $srcfile = '$(ls -1 /mnt/kd/ | sed -n -e "s/^cdr-.*/&/p")';
       $asturw = '';

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