Changeset 8773

Show
Ignore:
Timestamp:
02/03/10 02:51:04 (2 years ago)
Author:
mbrevda
Message:

re #1386; further tweaks to install script, versiovbump

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r8771 r8773  
    403403} 
    404404function backup_showopts($id=''){ 
     405  global $amp_conf; 
    405406  $tabindex=0; 
    406407  if ($id==''){ 
    …… 
    506507      </td> 
    507508  </tr> 
     509  <tr <?php echo $amp_conf['AMPBACKUPADVANCED']?'':'class="hide"'; ?>><td colspan="2"><h5><span class="tog advanced">+</span><?php echo _(' Advanced Options')?><hr></h5></td></tr> 
     510  <tr class="hide advanced"> 
     511    <td><a href="#" class="info"><?php echo _("Sudo");?><span><?php echo _("Use sudo when performing a backup. NOTE: THIS HAS SEVER SECUEIRY IMPLACATIONS!");?></span></a>: </td> 
     512    <td><input type="checkbox" name="sudo"  tabindex="<?php echo ++$tabindex;?>" value="yes" <?php echo ($opts['sudo']=='yes')?'checked':''; ?> /></td> 
     513  </tr> 
    508514  <style type="text/css"> 
    509515  .tog{cursor:pointer;color:black} 

  • modules/branches/2.7/backup/install.php

    r8758 r8773  
    124124  //get data from amportal and populate the table with it 
    125125  //ftp 
    126   if($amp_conf['FTPBACKUP']==strtolower('yes')){ 
     126  if(isset($amp_conf['FTPBACKUP']) && $amp_conf['FTPBACKUP']==strtolower('yes')){ 
    127127    $data['ftpuser']=$amp_conf['FTPUSER']; 
    128128    $data['ftppass']=$amp_conf['FTPPASSWORD']; 
    …… 
    147147    } 
    148148  } 
    149  
    150   $db_parms=$data; 
    151   $data=''; 
    152   //dont include empty values in the query 
    153   foreach(array_keys($db_parms) as $key){ 
    154     if($db_parms[$key]!=''){ 
    155       $data.=$key.'="'.$db->escapeSimple($db_parms[$key]).'",'; 
     149  if(isset($data)){ 
     150    $db_parms=$data; 
     151    $data=''; 
     152    //dont include empty values in the query 
     153    foreach(array_keys($db_parms) as $key){ 
     154      if($db_parms[$key]!=''){ 
     155        $data.=$key.'="'.$db->escapeSimple($db_parms[$key]).'",'; 
     156      } 
    156157    } 
     158    $data=substr($data,0,-1);//remove trailing , 
     159    $sql='UPDATE backup set '.$data; 
     160    $check = $db->query($sql); 
     161    if(DB::IsError($check)) { 
     162      die_freepbx('Can not migrate Backup table'); 
     163    } 
     164     
     165    out(_('Backup migration completed')); 
     166  }else{ 
     167    out(_('Nothing to migrate')); 
    157168  } 
    158   $data=substr($data,0,-1);//remove trailing , 
    159   $sql='UPDATE backup set '.$data; 
    160   $check = $db->query($sql); 
     169  $sql='DROP TABLE Backup'; 
     170/*  $check = $db->query($sql); 
    161171  if(DB::IsError($check)) { 
    162     die_freepbx("Can not migrate Backup table"); 
    163   } 
    164    
    165   $sql='DROP TABLE Backup'; 
    166   $check = $db->query($sql); 
    167   if(DB::IsError($check)) { 
    168     die_freepbx("Old Backup table not removed. Migration script will run again on next install."); 
    169   } 
     172    die_freepbx('Old Backup table not removed. Migration script will run again on next install.'); 
     173  }*/ 
    170174} 
    171175 

  • modules/branches/2.7/backup/module.xml

    r8752 r8773  
    22  <rawname>backup</rawname> 
    33  <name>Backup &amp; Restore</name> 
    4   <version>2.7.0.1beta1.0</version> 
     4  <version>2.7.0.1beta1.1</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    …… 
    1515  </depends> 
    1616  <changelog> 
     17    *2.7.0.1beta1.1* #1386 
    1718    *2.7.0.1beta1.0* #1386 
    1819    *2.7.0beta1.0* #3982, #3996, #3999