Changeset 8742

Timestamp:

01/30/10 17:47:22 (2 years ago)

Author:

mbrevda

Message:

re #1386; inital checking of majpr backup improvements.
This probobly isnt done just yet, although simple testing seems rather posotive.
Basicly, this seeks to move all the backup settings from amportal.conf in to the
gui. DB structure is something along these lines, this MAY OR MAY NOT WORK for simple
migration, so BU first!:

CREATE TABLE IF NOT EXISTS backup ( name varchar(50) default NULL, voicemail  varchar(50) 
default NULL, recordings varchar(50) default NULL, configurations  varchar(50) default 
NULL, cdr varchar(55) default NULL, fop varchar(50)  default NULL, minutes varchar(50) 
default NULL, hours varchar(50) default NULL,  days varchar(50) default NULL, months 
varchar(50) default NULL, weekdays  varchar(50) default NULL, command varchar(200) default 
NULL, method varchar(50)  default NULL, id int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY 
(ID) );
insert into backup select * from Backup;
alter table backup add ftpuser varchar(50), add ftppass varchar(50), add ftphost  
varchar(50), add ftpdir  varchar(150), add sshuser  varchar(50), add sshkey  varchar(150), 
add sshhost  varchar(50), add sshdir  varchar(150), add emailaddr  varchar(75), add 
emailmaxsize  varchar(25), add emailmaxtype varchar(5),add admin  varchar(10), add include 
blob, add exclude blob, add sudo varchar(25);
drop table Backup;

following if a partial changelog up untill
this point:

• Add support for new db schema
  
• Rename functions to make them more freepbx complient
  
• Clean and disinfect code so that it doesnt look like it was the result of an accident
  

between nitroglycerine-powered penny-farthing bicycles, spring-loaded notebooks,
bulletproof chainmails, flying machines, steam tanks, and giant mechanical spiders

• Sort backups alphabeticaly
  
• More code cleenup
  
• More readable save query
  
• More readable cron string + bug fixes
  
• rename gui element names
  
• Handel missing backup names gracefully
  
• parts of the gui to enter additional settings
  
• update backup script to reflect new db/variable structure
  
• naming changes
  
• dont insert blank values in to the db, so that the db sets them to null
  
• Make 'now' backups use the db as its source of info
  
• fix admin setting not being saved
  
• fix email max type typo's
  

TODO:

• proper migration, taking in to account that sqlite cant alter table
  
• add all current amportal var settings in to migrated (pre-exisitngs) backups
  

Files:

• modules/branches/2.7/backup/functions.inc.php (modified) (2 diffs)
• modules/branches/2.7/backup/page.backup.php (modified) (7 diffs)
• modules/branches/2.7/backup/schedule_functions.php (modified) (9 diffs)

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

@@ -24 +24 @@
-//
-
- 
-
-global $db
+
+,$db
+$table_name = "backup"
-
-
-
-
+
-  $results = $db->getAll($sql, DB_FETCHMODE_ASSOC);
-
-  
+
-    // grab any other cronjobs that are running as asterisk and NOT associated with backups
-    // and issue the schedule to the cron scheduler
-    //
-    exec("/usr/bin/crontab -l | grep -v ^#\ | grep -v ampbackup.pl",$cron_out,$ret1);
-    $cron_out_string = implode("\n",$cron_out);
@@ -44 +41 @@
-
-  $backup_string = "";
-
-
-
+
-
-  // grab any other cronjobs that are running as asterisk and NOT associated with backups,
-  // combine with above and re-issue the schedule to the cron scheduler
-  //
-  exec("/usr/bin/crontab -l | grep -v '^# DO NOT' | grep -v ^'# ('  |  grep -v ampbackup.php",$cron_out,$ret1);
-  $cron_out_string = implode("\n",$cron_out);

modules/branches/2.7/backup/page.backup.php

@@ -31 +31 @@
-$file=isset($_REQUEST['file'])?$_REQUEST['file']:'';
-$filetype=isset($_REQUEST['filetype'])?$_REQUEST['filetype']:'';
-
-
+
-
-// Santity check passed params
-if (strstr($dir, '..') || strpos($dir, '\'') || strpos($dir, '"') || strpos($dir, '\'') || strpos($dir,'\`') ||
-    strstr($file, '..') || strpos($file, '\'') || strpos($file, '"') || strpos($file, '\'') || strpos($file,'\`') ||
-ID, '.') || strpos($ID, '\'') || strpos($ID, '"') || strpos($ID, '\'') || strpos($ID
+id, '.') || strpos($id, '\'') || strpos($id, '"') || strpos($id, '\'') || strpos($id
-    strpos($filetype, '.') || strpos($filetype, '\'') || strpos($filetype, '"') || strpos($filetype, '\'') || strpos($filetype,'\`')) {
-  print "You're trying to use an invalid character. Please don't.\n";
@@ -43 +42 @@
-}
-
-
-switch ($action) {
+  case "edited":
+    backup_delete_set($id);
-  case "addednew":
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  break;
-  case "delete":
-Delete_Backup_set($ID
+backup_delete_set($id
-  break;
-  case "deletedataset":
@@ -99 +67 @@
-  break;
-  case "restored":
-Message=Restore_Tar_Files
+message=backup_restore_tar
-    // Regenerate all the ASTDB stuff. Note, we need a way to do speedials and other astdb stuff here.
-    needreload();
@@ -115 +83 @@
-<?php 
-//get unique account rows for navigation menu
-Get_Backup_Sets
+backup_get
-
-if (isset($results)) {
@@ -138 +106 @@
-  <input type="hidden" name="action" value="addednew">
-        <table>
-Show_Backup_Option
+backup_showopt
-        </table>
-    <h5><?php echo _("Run Schedule")?><hr></h5>
@@ -169 +137 @@
-  <input type="hidden" name="type" value="<?php echo $type?>">
-        <table>
-Show_Backup_Option
+backup_showopt
-        </table>
-    <h5><?php echo _("Run Schedule")?><hr></h5>
@@ -192 +160 @@
-    if(!is_dir($dir)) mkdir($dir);
-  }
-Get_Tar_F
+backup_list_f
-}
-else
-{
-M
+m
-  ?>
-M
+m
-  <?php }
-  else{

modules/branches/2.7/backup/schedule_functions.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        }
-      }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-      }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  $error = false;
-  $tar='/bin/tar';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  backup_retrieve_backup_cron();
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  backup_retrieve_backup_cron();
-  
-}
-Get_Backup_String($name, $backup_schedule, $ALL_days, $ALL_months, $ALL_weekdays, $mins="", $hours="", $days="", $months="", $weekdays="") 
+backup_get_string($parms)
-  global $asterisk_conf;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  $tabindex=0;
-
-
-
-
-
-
+
+
+
+
+
-  }
-  ?>
-
-
-
-
-
+
+
+
+
+
+
-  <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>
-
-
-
-
-
+
-  </tr>
-  <tr>
-
-
-
-
-
-
+
+
-  </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>
-?php if ($sysconfig == "yes"){?
-   <td><input type="radio" name="bk_sysconfig" value="yes" checked=checked/> <?php echo _("yes");?> &nbsp;&nbsp;&nbsp;&nbsp;<input type="radio" name="bk_sysconfig" value="no"/> <?php echo _("no");?></td
- <?php } else{ ?
- <td><input type="radio" name="bk_sysconfig" value="yes" /> <?php echo _("yes");?> &nbsp;&nbsp;&nbsp;&nbsp;<input type="radio" name="bk_sysconfig" value="no" checked=checked/> <?php echo _("no");?>
-?php } ?
+td><input type="checkbox" name="configurations" value="yes" <?php echo ($opts['configurations']=='yes')?'checked':''; ?>/></td
+</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 usefull to have durring a restore to prevent a version mismatch, but can baloon the backup size.");?></span></a>: 
+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>
-
-
-
-
-
+
-  </tr>
-  <tr>
-    <td><a href="#" class="info"><?php echo _("Operator Panel");?><span><?php echo _("Backup the Operator Panel (HTML and Database)");?></span></a>: </td>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  <?php
-}
-
-
+
-  echo "<br><br><table> <tr>";
-  echo "<td valign=top><select multiple size=12 name=mins[]>";
-
-
-
-
-
-
-
-
+
+
+
+
+
-      echo "<option value=\"$minutes\" selected>$minutes";
-    else
@@ -494 +514 @@
-  echo "</tr></table></td>";
-}
-
-
+
-  echo "<br><br><table> <tr>";
-  echo "<td valign=top><select multiple size=12 name=hours[]>";
-  for ($hours=0; $hours<=23; $hours++)
-  {
-
-
-
-
-
-
+
+
-      echo "<option value=\"$hours\" selected>$hours";
-    else
@@ -514 +529 @@
-}
-
-
-
+
-  if (($Days_Set=="") || ($Days_Set=="*")){
-  echo "<input type=radio name=all_days value=1 checked>"; echo _("All"); echo "<br>";
@@ -529 +543 @@
-  for ($days=1; $days<=31; $days++)
-  {
-
-
-
-
-
-
+
+
-      echo "<option value=\"$days\" selected>$days";
-    else
@@ -543 +553 @@
-}
-
-
-
+
-  if (($Months_Set=="") || ($Months_Set=="*")){
-  echo "<input type=radio name=all_months value=1 checked>"; echo _("All"); echo "<br>";
@@ -572 +581 @@
-}
-
-
-
+
-  if (($Weekdays_Set=="") || ($Weekdays_Set=="*")){
-  echo "<input type=radio name=all_weekdays value=1 checked>";echo _("All"); echo "<br>";
@@ -595 +603 @@
-  echo "</tr></table></td>";
-}
-
-
+
-?>
-  <tr bgcolor=#b7b7b7> <td colspan=6><?php echo _("Run Backup");?> 
-  <select name=backup_schedule>
-Method == "follow_schedule" ? "SELECTED" : ""
-Method == "now" ? "SELECTED" : ""
-Method == "daily" ? "SELECTED" : ""
-Method == "weekly" ? "SELECTED" : ""
-Method == "monthly" ? "SELECTED" : ""
-Method == "yearly" ? "SELECTED" : ""
+method=="follow_schedule"?"SELECTED":''
+method=="now"?"SELECTED":''
+method=="daily"?"SELECTED":''
+method=="weekly"?"SELECTED":''
+method=="monthly"?"SELECTED":''
+method=="yearly"?"SELECTED":''
-  </select>
-  </td></tr>
-<?php
-}
-
-
+
-  if ($BackupID==""){
-    $Minutes="";
@@ -619 +625 @@
-    $Weekdays="";
-    $Method="follow_schedule";
-
-
+
-    $backup_times=Get_Backup_Times($BackupID);
-    foreach ($backup_times as $bk_times) 
@@ -647 +652 @@
-  Schedule_Show_Weekdays($Weekdays);
-}
-