Changeset 164

Timestamp:

09/01/06 17:37:35 (2 years ago)

Author:

ludo

Message:

backuppc v0.9.0: less clicks. Number of kept backups configurable (from r3647)

Files:

• trunk/webmin/backuppc/backuppc.js (added)
• trunk/webmin/backuppc/choix.cgi (modified) (5 diffs)
• trunk/webmin/backuppc/debian/changelog (modified) (1 diff)
• trunk/webmin/backuppc/gen_backupfun.php (modified) (6 diffs)
• trunk/webmin/backuppc/gen_conf.cgi (modified) (5 diffs)
• trunk/webmin/backuppc/host_config.cgi (modified) (4 diffs)
• trunk/webmin/backuppc/lang/fr (modified) (1 diff)
• trunk/webmin/backuppc/module.info (modified) (1 diff)
• trunk/webmin/backuppc/tmpl/en/choix.tpl (modified) (1 diff)
• trunk/webmin/backuppc/tmpl/en/gen_conf_lbs.tpl (modified) (1 diff)
• trunk/webmin/backuppc/tmpl/en/main.tpl (modified) (3 diffs)
• trunk/webmin/backuppc/tmpl/fr/choix.tpl (modified) (1 diff)
• trunk/webmin/backuppc/tmpl/fr/gen_conf_lbs.tpl (modified) (1 diff)
• trunk/webmin/backuppc/tmpl/fr/main.tpl (modified) (3 diffs)

trunk/webmin/backuppc/choix.cgi

@@ -1 @@
- 
+
-<?
-#
@@ -42 +42 @@
-
-  if ($lbs)
-GET['mac']."&host=".$_GE
+REQUEST['mac']."&host=".$_REQUES
-  else {
-GE
-GE
+REQUES
+REQUES
-  }
-  
-# configuration variables ---------------------
-GE
-GE
+REQUES
+REQUES
-   $get_data = $get_data . "&xfermethod=$xfermethod";
-  }
@@ -56 +56 @@
-  $t->set_var("GET_DATA_BREF", $get_data);  // needed for the cancel button
-
-GET['username']) && isset($_GE
-$username = $_GE
-
-$passwd = $_GE
-
+REQUEST['username']) && isset($_REQUES
+//$username = $_REQUES
+//
+//$passwd = $_REQUES
+//
-  }
- 
-GET['shares']) && $_GE
-GE
+REQUEST['shares']) && $_REQUES
+REQUES
-    if ($str != "") {
-      $shares = explode("|", $str);
@@ -74 +74 @@
- 
-  // now read the missing data
-GE
+REQUES
-
-GE
-GE
-GE
+REQUES
+REQUES
+REQUES
-      array_splice($shares, $i, 1);
-    }
-GET['found_name']) && ($_GE
-GE
-GE
+REQUEST['found_name']) && ($_REQUES
+REQUES
+REQUES
-      array_splice($shares, $i, 1);
-    }
-  }
-GE
+REQUES
-  $get_data = $get_data . "&shares="; 
-  for ($i=0; $i<count($shares); $i++) 
@@ -93 +93 @@
-      $get_data = $get_data . $shares[$i] . "|";
-
-GET['add']) && $_GE
-GE
-GE
+REQUEST['add']) && $_REQUES
+REQUES
+REQUES
-  }
-GET['found_name']) && ($_GE
-GE
-GE
+REQUEST['found_name']) && ($_REQUES
+REQUES
+REQUES
-  }
- 
-  $t->set_var("GET_DATA", $get_data);  
-  
-GE
+REQUES
-  $t->set_var("XFERMETHOD_NAME", $text{$xfermethod."_name"});
+  $t->set_var("USERNAME", $_REQUEST['username']);
+  $t->set_var("PASSWD", $_REQUEST['passwd']);
+  $t->set_var("MAC", $_REQUEST['mac']);
-
-    if ($xfermethod == 'smb') 
-GE
+REQUES
-    else if ($xfermethod == 'tar') 
-GE
+REQUES
-    else
-      $shares_all = array();

trunk/webmin/backuppc/debian/changelog

@@ -1 @@
-8.4
+9.0
-
-New release
+See SVN history
-
- -- Linbox Team <libre@linbox.com>  Tue, 29 Jun 2004 10:32:37 +0200
-
-webmin-backuppc (0.1) stable; urgency=low
-
-  * First package
-
- -- Linbox Team <libre@linbox.com>  Fri, 16 Apr 2004 15:59:50 +0200

trunk/webmin/backuppc/gen_backupfun.php

@@ -28 +28 @@
- * $blackoutdays - BlackoutWeekDays - array[1..7] of booleans == true if the day is a blackout day
- * $dhcps - DHCPAddrRanges - array of string - addresses ranges (eg. 192.168.0.20-60)
-
-
+
+
+
-// values from config.pl
-  global $conf_filename;
@@ -65 +66 @@
-  preg_match($reg, $filestr, $m); 
-  $blackoutend = $m[1];
+  
+  // other opts
+  // todo: need to parse previous options here
+  foreach (array("FullKeepCnt", "IncrKeepCnt") as $o) {
+        $reg = "/[\$]Conf\{".$o."\}\s*=\s*(.+);/";
+        preg_match($reg, $filestr, $m);
+        $opts[$o] = $m[1];
+  }
-  
-  $reg = "/[\$]Conf\{BlackoutWeekDays\}\s*=\s*\[(.+)\];/";
@@ -101 +110 @@
- * $blackoutdays - BlackoutWeekDays
- * $dhcps - DHCPAddrRanges
+ * $opts - other options in a array (why not everything is in the array ? Ask the trainee...)
- * all variables are preformated strings that need no additional change before inserting them to the file.
-*/
-
-
+, $opts
-  global $conf_filename;
-  $filelines = @file($conf_filename);
@@ -113 +123 @@
-  
-  $new_filelines=array();
-.*$
+
-  $wakeup_reg = "/\s*[\$]Conf\{WakeupSchedule\}\s*=\s*\[.*\];/";
-  $maxbackups_reg = "/[\$]Conf\{MaxBackups\}\s*=\s*.+;/";
@@ -123 +133 @@
-  $dhcps_str=$dhcps;
-  
-
+
+
-   
-    if (preg_match($comment_reg, $filelines[$i], $m)) 
@@ -139 +150 @@
-    else if (preg_match($dhcps_reg, $filelines[$i], $m)) {
-      while (!preg_match("/\]/", $filelines[$i], $m)) $i++;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  } 
+  
-  $file_str=implode("", $new_filelines);
-  $file=fopen($conf_filename, 'w');

trunk/webmin/backuppc/gen_conf.cgi

@@ -62 +62 @@
-
-# gather the configuration variables ---------------------
+  $opts = array();
-  if (!isset($_POST["submitted"]))
-
+, $opts
-  else {
-    $wakeup=$_POST["wakeup"];
@@ -118 +119 @@
-    $last = $m[5];
-  } else {
-   
-   
-   
+
+
+
-    $first=-1;
-    $last=-1;
@@ -159 +160 @@
-      $t->parse("dhcp_hidden_rows", "dhcp_hidden_row", true);
-    }
+
+   # misc options
+   foreach (array("FullKeepCnt", "IncrKeepCnt") as $o) {
+        if (isset($opts[$o])) {
+          $t->set_var(strtoupper($o), $opts[$o]);
+        }
+   }
+
-  
-# --------------------------------------------
@@ -212 +221 @@
-    } else 
-      $blackoutdays="";
-
+
+
+
-    $i=0;
-    $dhcps_str="";
@@ -226 +237 @@
-    if ($dhcps_str != "")
-      $dhcps_str = "\n   ".$dhcps_str;
-
-
+
+
+
+
-    $t->set_var("WAKEUP", $wakeup);
-    $t->set_var("MAXBACKUPS", $maxbackups);

trunk/webmin/backuppc/host_config.cgi

@@ -102 +102 @@
-    if (isset($_GET['username']) && isset($_GET['passwd'])) { // needed by smbclient in choix.php
-      $username = $_GET['username'];
-      $get_data = $get_data . "&username=$username";
-      $passwd = $_GET['passwd'];
-      $get_data = $get_data . "&passwd=$passwd"; 
-    }
-    if (isset($_GET['shares'])) { // got share from rsync or from multiple changes
@@ -116 +114 @@
-  readConfFile($host, $xfermethod, $shares, $username, $passwd, $full, $incr, $blackout_begin, $blackout_end, $blackout_days);
-
-
+
+
-  for ($i=0; $i<count($shares); $i++) 
-
+ {
-      $get_data = $get_data . $shares[$i] . "|";
+      $fshares .= $shares[$i] . "|";
+    }
- 
-# set the configuration variables in the template ---------------------
-  $t->set_var("GET_DATA", $get_data);  
-  $t->set_var("HOST", $host);
+  $t->set_var("MAC", $_REQUEST['mac']);
+  $t->set_var("SHARES", $fshares);
- 
-  if (getDHCP($host) == 1) {
@@ -144 +147 @@
-    }
-  
-  if ($xfermethod == "smb" || $xfermethod == "rsyncd") { 
-    $t->set_block("main", "configure", "configure_full");
-    $t->set_var("configure_full", "");
-  } else {
-    $t->set_block("main", "user_pass_configure", "user_pass_configure_full");
-    $t->set_var("user_pass_configure_full", "");
-  }
-  if ($xfermethod == "smb") {
-    $t->set_block("main", "auth_ssh", "auth_ssh_full");
@@ -231 +227 @@
-}
-
- 
+
-
-# insertion of menu header

trunk/webmin/backuppc/lang/fr

@@ -137 +137 @@
-err_gcr_not_running=The 'getClientResponse' daemon is not running. You probably have a license problem. Check that your licences are correct and then restart the lbs service by clicking <a href="restart.cgi">here</a>.
-
- est vide.<BR>Ve
+est vide.<BR>V&eacute;
-backup_reg=Cette machine n'est pas sauvegardée. Ajouter cette machine au fichier '/etc/backuppc/hosts'?
-

trunk/webmin/backuppc/module.info

@@ -4 +4 @@
-category=Webmin
-depends=0.94 lbs_common
-8.4
+9.0

trunk/webmin/backuppc/tmpl/en/choix.tpl

@@ -1 +1 @@
-<BR>
-<FORM METHOD="post" ACTION="host_config.cgi{GET_DATA}">
+  <INPUT TYPE="hidden" NAME="username" VALUE="{USERNAME}">
+  <INPUT TYPE="hidden" NAME="passwd" VALUE="{PASSWD}">
+  <INPUT TYPE="hidden" NAME="mac" VALUE="{MAC}">
+  <INPUT TYPE="hidden" NAME="host" VALUE="{HOST}">
-
-  <TABLE BORDER=1 CELLPADDING=5 ALIGN="center">

trunk/webmin/backuppc/tmpl/en/gen_conf_lbs.tpl

@@ -1 +1 @@
-<BR>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <INPUT TYPE="button" VALUE="Apply" onClick="register.value=1; main_form.submit()">
-        <INPUT TYPE="button" VALUE="Cancel" onClick="window.location.href='gen_conf.cgi';">
-
-
-
+
-</FORM>
-<BR>

trunk/webmin/backuppc/tmpl/en/main.tpl

@@ +1 @@
+<script type="text/javascript" language="JavaScript" src="backuppc.js"></script>
+
-<BR>
-<FORM METHOD="post" ACTION="affiche.cgi{GET_DATA}" name="backuppc_configform">
-
+
+
+
-  <table cellpadding="2" cellspacing="0" border="0" width="100%" class="cadre">
-    <tr>
@@ -28 +32 @@
-        <a HREF="" onClick="window.open('/help.cgi/backuppc/index#shares','help','width=450,height=250,scrollbars=yes')" ALT="Aide" TITLE="Aide"><IMG SRC="images/qm.png" BORDER="0"></A> Shared folders :
-          <UL>
+              <!-- BEGIN share_row -->
-            <li>
-<!-- BEGIN share_row -->
-     {SHARE},
+   {SHARE}
+</li>
-              <!-- END share_row -->
-
-
-
-
-
-
-
-
-
+
+
-      </li>
-      <!-- BEGIN auth_ssh -->
@@ -87 +85 @@
-  <table cellpadding="2" cellspacing="0" border="0" width="100%" class="cadre">
-    <tr>
-Is {HOST} using DHC
+Has {HOST} a dynamic I
-        <a HREF="" onClick="window.open('/help.cgi/backuppc/index#dhcp','help','width=450,height=250,scrollbars=yes')" ALT="Aide" TITLE="Aide"><IMG SRC="images/qm.png" BORDER="0"></A>
-      </td>

trunk/webmin/backuppc/tmpl/fr/choix.tpl

@@ -1 +1 @@
-<BR>
-<FORM METHOD="post" ACTION="host_config.cgi{GET_DATA}">
+  <INPUT TYPE="hidden" NAME="username" VALUE="{USERNAME}">
+  <INPUT TYPE="hidden" NAME="passwd" VALUE="{PASSWD}">
+  <INPUT TYPE="hidden" NAME="mac" VALUE="{MAC}">
+  <INPUT TYPE="hidden" NAME="host" VALUE="{HOST}">
-
-  <TABLE BORDER=1 CELLPADDING=5 ALIGN="center">

trunk/webmin/backuppc/tmpl/fr/gen_conf_lbs.tpl

@@ -22 +22 @@
-        Nombre max. de sauvegardes simultanés : <INPUT TYPE="text" NAME="maxbackups" VALUE="{MAXBACKUPS}" SIZE="2"
-                                                 style="vertical-align:middle;">
+     </li>
+     <li>Nombre de sauvegardes &agrave; garder. 
+       Compl&egrave;tes: <INPUT TYPE="text" NAME="FullKeepCnt" VALUE="{FULLKEEPCNT}" SIZE="3" style="vertical-align:middle;">
+       Incr&eacute;mentales: <INPUT TYPE="text" NAME="IncrKeepCnt" VALUE="{INCRKEEPCNT}" SIZE="3" style="vertical-align:middle;">
-     </li>
-     <li>

trunk/webmin/backuppc/tmpl/fr/main.tpl

@@ +1 @@
+<script type="text/javascript" language="JavaScript" src="backuppc.js"></script>
+
-<BR>
-<FORM METHOD="post" ACTION="affiche.cgi{GET_DATA}" name="backuppc_configform">
-
-
+
+
+
-  <table cellpadding="2" cellspacing="0" border="0" width="100%" class="cadre">
-    <tr>
@@ -29 +32 @@
-        <a HREF="" onClick="window.open('/help.cgi/backuppc/index#shares','help','width=450,height=250,scrollbars=yes')" ALT="Aide" TITLE="Aide"><IMG SRC="images/qm.png" BORDER="0"></A> Dossiers partag&eacute;s :
-          <UL>
+              <!-- BEGIN share_row -->
-            <li>
-<!-- BEGIN share_row -->
-     {SHARE},
+   {SHARE}
+</li>
-              <!-- END share_row -->
-
-
-
-
-
-
-
-
-
+
+
-      </li>
-      <!-- BEGIN auth_ssh -->
@@ -88 +85 @@
-  <table cellpadding="2" cellspacing="0" border="0" width="100%" class="cadre">
-    <tr>
-Configurer en DHCP
+IP dynamique
-        <a HREF="" onClick="window.open('/help.cgi/backuppc/index#dhcp','help','width=450,height=250,scrollbars=yes')" ALT="Aide" TITLE="Aide"><IMG SRC="images/qm.png" BORDER="0"></A>
-      </td>