Changeset 8453

Timestamp:

12/27/09 08:31:51 (3 years ago)

Author:

mbrevda

Message:

closes #3975; add option to email backups; remove Undefined variable\'s; see #3975, r8438, r8439, r8440, and r8441 for more details

Files:

• modules/branches/2.6/backup/bin/ampbackup.php (modified) (7 diffs)
• modules/branches/2.6/backup/module.xml (modified) (2 diffs)
• modules/branches/2.6/backup/page.backup.php (modified) (1 diff)
• modules/branches/2.6/backup/schedule_functions.php (modified) (5 diffs)

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

@@ -32 +32 @@
-$amp_conf=getconf((isset($_ENV['FREEPBXCONFIG']) && strlen($_ENV['FREEPBXCONFIG']))?$_ENV['FREEPBXCONFIG']:'/etc/amportal.conf');
-$ast_conf=getconf((isset($_ENV['ASTERISKCONFIG']) && strlen($_ENV['ASTERISKCONFIG']))?$_ENV['ASTERISKCONFIG']:'/etc/asterisk/asterisk.conf');
+//default some options if they are blank
-if(!isset($amp_conf['AMPBACKADMIN'])){$amp_conf['AMPBACKADMIN']=true;}
+if(!isset($amp_conf['AMPBACKUPEMAILFROM'])){$amp_conf['AMPBACKUPEMAILFROM']='backup@freepbx.org';}
+if(!isset($amp_conf['AMPBACKUPEMAILMAX'])){$amp_conf['AMPBACKUPEMAILMAX']='10MB';}
-//var_dump($amp_conf);
-//$opts=getOpts();
@@ -40 +43 @@
-if($amp_conf['AMPBACKUPSUDO']==true){$sudo='/usr/bin/sudo';}
-//connect to database
-
-$db = DB::connect('mysql://'.$amp_conf['AMPDBUSER'].':'.$amp_conf['AMPDBPASS'].'@'.$amp_conf['AMPDBHOST'].'/'.$amp_conf['AMPDBNAME']);
+_once
+if(!isset($db)){$db = DB::connect('mysql://'.$amp_conf['AMPDBUSER'].':'.$amp_conf['AMPDBPASS'].'@'.$amp_conf['AMPDBHOST'].'/'.$amp_conf['AMPDBNAME']);}
-
-if($argc == 1){//no args recieved - show help text
-
-
-
-
-
-
-
-
-
+
-}elseif($argc == 2){//one arg recievied. Hmm, this sounds like a backup schedules id... Lets look in the DB for more details
-  $sql = "SELECT Name, Voicemail, Recordings, Configurations, CDR, FOP from Backup where ID= ?";
@@ -74 +69 @@
-
-//if all options are set to no/false, return an error
-You need to set at least one option to yes\n";exit(1
+Backup Error: You need to set at least one option to yes\n";showopts(
-system('/bin/rm -rf /tmp/ampbackups.'.$opts['now'].' > /dev/null  2>&1');//remove stale backup
-system('/bin/mkdir /tmp/ampbackups.'.$opts['now'].' > /dev/null  2>&1');//create directory for current backup
@@ -93 +88 @@
-  if ($amp_conf['AMPPROVROOT']){
-  $xfile='';
-
-
+isset($amp_conf['AMPPROVEXCLUDE']) && 
+isset($amp_conf['AMPPROVEXCLUDELIST']) && 
-      $exclude='';
-      $ex=explode(' ',$amp_conf['AMPPROVEXCLUDELIST']);
@@ -136 +131 @@
-}
-
+//SSH backup
-if(isset($amp_conf['SSHBACKUP']) && $amp_conf['SSHBACKUP']=='yes'){
-  if(($amp_conf['SSHRSAKEY']!='') && ($amp_conf['SSHSERVER']!='')){
@@ -148 +144 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function getconf($filename) {
-  $file = file($filename);
@@ -172 +241 @@
-
-function dbug($disc=null,$msg=null){
-fals
+tru
-  if ($debug){
-  $fh = fopen("/tmp/freepbx_debug.log", 'a') or die("can't open file");

modules/branches/2.6/backup/module.xml

@@ -2 +2 @@
-  <rawname>backup</rawname>
-  <name>Backup &amp; Restore</name>
-3
+4
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -15 +15 @@
-  </depends>
-  <changelog>
+    *2.6.0.4* #3975 - multipal backup improvements
-    *2.6.0.3* #3839
-    *2.6.0.2* #3577

modules/branches/2.6/backup/page.backup.php

@@ -74 +74 @@
-
-    $backup_schedule=$_REQUEST['backup_schedule'];
-$_REQUEST['mins']
-$_REQUEST['hours']
-$_REQUEST['days']
-$_REQUEST['months']
-$_REQUEST['weekdays']
+isset($_REQUEST['mins'])?$_REQUEST['mins']:''
+isset($_REQUEST['hours'])?$_REQUEST['hours']:''
+isset($_REQUEST['days'])?$_REQUEST['days']:''
+isset($_REQUEST['months'])?$_REQUEST['months']:''
+isset($_REQUEST['weekdays'])?$_REQUEST['weekdays']:''
-    
-    $backup_options[]=$_REQUEST['bk_voicemail'];

modules/branches/2.6/backup/schedule_functions.php

@@ -297 +297 @@
-  if ($Backup_Parms[1]=="now")
-  {
-l
+hp
-    //echo "$Cron_Script";
-
+
+
+
+
+
-  }
-  $sql = "INSERT INTO Backup (Name, Voicemail, Recordings, Configurations, CDR, FOP, Minutes, Hours, Days, Months,Weekdays, Command, Method ) VALUES (";
@@ -327 +331 @@
-  global $asterisk_conf;
-  if ($backup_schedule=="hourly")
-l
+hp
-  else if ($backup_schedule=="daily")
-l
+hp
-  else if ($backup_schedule=="weekly")
-l
+hp
-  else if ($backup_schedule=="monthly")
-l
+hp
-  else if ($backup_schedule=="yearly")
-l
+hp
-  else if ($backup_schedule=="follow_schedule")
-  {
@@ -369 +373 @@
-              $weekdays_string.=":$value:";
-    }
-
-
+
-    $cron_hours_string=trim($hours_string,":");
-    $cron_days_string=trim($days_string,":");
-    $cron_months_string=trim($months_string,":");
-    $cron_weekdays_string=trim($weekdays_string,":");
-l
+hp
-  }
-  else if ($backup_schedule=="now")
- $Cron_String="0 0 0 0 0 ".$asterisk_conf['astvarlibdir']."/bin/ampbackup.pl
-"$name"
-"$backup_schedule"
-"$mins_string"
-"$hours_string"
-"$days_string"
-"$months_string"
-"$weekdays_string"
-"$Cron_String"
+$Cron_String="0 0 0 0 0 ".$asterisk_conf['astvarlibdir']."/bin/ampbackup.php
+$name
+$backup_schedule
+isset($mins_string)?$mins_string:''
+isset($hours_string)?$hours_string:''
+isset($days_string)?$days_string:''
+isset($months_string)?$months_string:''
+isset($weekdays_string)?$weekdays_string:''
+$Cron_String
-
-  return ($Backup_String);
@@ -412 +415 @@
-function Show_Backup_Options($ID="")
-{
+  $tabindex=0;
-  if ($ID==""){
-    $name=""; $voicemail="no"; $sysrecordings="no"; $sysconfig="no"; $cdr="no"; $fop="no";}
@@ -615 +619 @@
-    $backup_times=Get_Backup_Times($BackupID);
-    foreach ($backup_times as $bk_times) 
-
+
+
+
+
+
+
-    
-  }