Changeset 9490

Timestamp:

04/12/10 16:02:32 (3 years ago)

Author:

mbrevda

Message:

re #4167 - make overwriting the backup table optional; version bump

Files:

• modules/branches/2.8/backup/bin/ampbackup.php (modified) (3 diffs)
• modules/branches/2.8/backup/functions.inc.php (modified) (4 diffs)
• modules/branches/2.8/backup/install.php (modified) (4 diffs)
• modules/branches/2.8/backup/module.xml (modified) (2 diffs)

modules/branches/2.8/backup/bin/ampbackup.php

@@ -92 +92 @@
-        $exec.=' --'.$key.'=';
-      break;
+      case 'overwritebackup':
+        $exec.=' --'.$key.'=yes';
+      break;
-      default:
-        $exec.=' --'.$key.'='.$val;
@@ -109 +112 @@
-  if(is_file($opts['budir'].'/'.$opts['name'].'/'.$opts['now'].'.tar.gz')){
-    $exec='/usr/bin/ssh -o StrictHostKeyChecking=no -i '.$opts['remotesshkey'].' '.$user.$opts['remotesshhost'];
-'
+
-    exec($exec,$ret);
-  }
@@ -146 +149 @@
-      exec($exec,$ret);
-    }
-
+
+
-  }
-  //backup cdr if requested

modules/branches/2.8/backup/functions.inc.php

@@ -419 +419 @@
-  $advanced=($amp_conf['AMPBACKUPADVANCED']||$opts['sudo']);
-  ?>
+  <style type="text/css">
+    tr .tog{cursor:pointer;}
+    tr .tog span{color:black}
+    <?php
+      $sections=array('files','ftp','ssh','email','remote','advanced');
+      foreach($sections as $sec){
+        if(!$$sec){echo '.hide.'.$sec.'{display:none}'."\n";}
+      }
+      if(!$advanced){echo '.advanced{display:none}'."\n";}
+    ?>
+    h5{margin-top:10px;margin-bottom:10px}
+  </style>
+  <script language="javascript" type="text/javascript">
+    $(document).ready(function() {
+      $('.tog').click(function(){
+        var tclass = $(this).attr('class'); tclass = tclass.replace('tog ', '');
+        var togspan = $(this).find('span');
+        if(togspan.text()=='+'){
+          togspan.text('- ');
+          $('.'+tclass).show();
+        }else{
+          togspan.text('+');
+          $('.'+tclass).not('.tog').hide();
+        }
+       });
+       $('.sysconfigdep').click(function(){
+          if($(this).is(':checked')){
+            $('.sysconfig').attr('checked', true);
+          }
+       })
+       $('.sysconfig').click(function(){
+          if(!$(this).is(':checked')){
+            $('.sysconfigdep').attr('checked', false);
+          }
+       })
+    });
+  </script>
-  <table>
-  <tr><td colspan="2"><h5><?php echo _("Basic Settings")?><hr></h5></td></tr>
@@ -426 +463 @@
-  </tr>
-  <tr>
-
-
-
-
-
-
-
-
-
-
+
+
-  </tr>
-  <tr>
-    <td><a href="#" class="info"><?php echo _("Admin Web Directory");?><span><?php echo _("Backup the admin web directory (i.e. the static FreePBX web files). This is useful to have during a restore to prevent a version mismatch, but can dramatically increase the backup size.");?></span></a>: </td>
-    <td><input type="checkbox" name="admin" value="yes" <?php echo ($opts['admin']=='yes')?'checked':''; ?>/></td>
-  </tr>
-  <tr>
-    <td><a href="#" class="info"><?php echo _("CDR");?><span><?php echo _("Backup the System Call Detail Reporting (HTML and Database)");?></span></a>: </td>
-    <td><input type="checkbox" name="cdr" value="yes" <?php echo ($opts['cdr']=='yes')?'checked':''; ?>/></td>
@@ -449 +474 @@
-    <td><input type="checkbox" name="fop" value="yes" <?php echo ($opts['fop']=='yes')?'checked':''; ?>/></td>
-  </tr>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Ovewrite Backup Settings");?><span><?php echo _("When restoring the backup, if this option is selected, all saved backups and their scheduals will be overwriten. Leaving this unchecked will restore all other configurations EXCEPT for thoes related to backup. WHen doing a remote backup and restore, this option is always forced.");?></span></a>: </td>
+    <td><input type="checkbox" name="overwritebackup" value="yes" class="sysconfigdep" <?php echo ($opts['overwritebackup']=='yes')?'checked':''; ?>/></td>
+  </tr> 
+  <tr>
+    <td><a href="#" class="info"><?php echo _("System Recordings");?><span><?php echo _("Backup the System Recordings (AutoAttendant, Music On Hold, System Recordings)");?></span></a>: </td>
+    <td><input type="checkbox" name="recordings" value="yes" <?php echo ($opts['recordings']=='yes')?'checked':''; ?> /></td>
+  </tr>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("VoiceMail");?><span><?php echo _("Backup the System VoiceMail Boxes... CAUTION: Could result in large file");?></span></a>: </td>
+    <td><input type="checkbox" name="voicemail"  tabindex="<?php echo ++$tabindex;?>" value="yes" <?php echo ($opts['voicemail']=='yes')?'checked':''; ?> /></td>
+  </tr>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("System Configuration");?><span><?php echo _("Backup the System Configurations (Database, etc files, SQL Database, astdb)");?></span></a>: </td>
+    <td><input type="checkbox" name="configurations" value="yes" class="sysconfig" <?php echo ($opts['configurations']=='yes')?'checked':''; ?>/></td>
+  </tr>
-
-  <tr><td colspan="2" class="tog files"><h5><span><?php echo $files?'-':'+';?></span><?php echo _(' Additional Files')?><hr></h5></td></tr>
@@ -539 +580 @@
-    <td><input type="checkbox" name="sudo"  tabindex="<?php echo ++$tabindex;?>" value="yes" <?php echo ($opts['sudo']=='yes')?'checked':''; ?> /></td>
-  </tr>
-  <style type="text/css">
-  tr .tog{cursor:pointer;}
-  tr .tog span{color:black}
-  <?php
-    $sections=array('files','ftp','ssh','email','remote','advanced');
-    foreach($sections as $sec){
-      if(!$$sec){echo '.hide.'.$sec.'{display:none}'."\n";}
-    }
-    if(!$advanced){echo '.advanced{display:none}'."\n";}
-  ?>
-  h5{margin-top:10px;margin-bottom:10px}
-  </style>
-  <script language="javascript" type="text/javascript">
-    $(document).ready(function() {
-      $('.tog').click(function(){
-        var tclass = $(this).attr('class'); tclass = tclass.replace('tog ', '');
-        var togspan = $(this).find('span');
-        if(togspan.text()=='+'){
-          togspan.text('- ');
-          $('.'+tclass).show();
-        }else{
-          togspan.text('+');
-          $('.'+tclass).not('.tog').hide();
-        }
-       });
-    });
-  </script>
-  <?php
-}

modules/branches/2.8/backup/install.php

@@ -68 +68 @@
-    emailmaxtype varchar(5),
-    admin varchar(10),
+    overwritebackup varchar(5) default NULL,
-    include blob,
-    exclude blob,
-    sudo varchar(25),
-
+r
-    remotesshuser varchar(50) default NULL, 
-    remotesshkey varchar(150) default NULL, 
@@ -106 +107 @@
-    emailmaxtype varchar(5),
-    admin varchar(10),
+    overwritebackup varchar(5) default NULL,
-    include blob,
-    exclude blob,
@@ -236 +238 @@
-}
-
-for 2.6-style table
+remote backup field
-$sql='describe backup';
-$fields=$db->getAssoc($sql);
@@ -249 +251 @@
-    out(_('WARNING: backup table not migrated'));
-  } else {
-fax_incoming
+backup
-  }
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-?>

modules/branches/2.8/backup/module.xml

@@ -2 +2 @@
-  <rawname>backup</rawname>
-  <name>Backup &amp; Restore</name>
-2
+3
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -15 +15 @@
-  </depends>
-  <changelog>
+    *2.8.0.3* #4167
-    *2.8.0.2* #4167
-    *2.8.0.1* #4167