Changeset 14248

Show
Ignore:
Timestamp:
07/10/12 04:05:05 (11 months ago)
Author:
mbrevda
Message:

upstream bug fixes - allow excludes to be an array; fix scp command

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.10/backup/functions.inc/class.backup.php

    r14150 r14248  
    370370          $cmd[] = fpbx_which('scp'); 
    371371          $cmd[] = '-o StrictHostKeyChecking=no -i'; 
     372          $cmd[] = $s['key']; 
    372373          $cmd[] = '-P ' . $s['port']; 
    373           $cmd[] = $s['key']; 
    374374          $cmd[] = $this->b['_tmpfile']; 
    375375          $cmd[] = $s['user'] . '\@' . $s['host']  

  • modules/branches/2.10/backup/functions.inc/templates.php

    r13908 r14248  
    188188         
    189189        //ensure excludes are unique and clean 
    190         $excludes = explode("\n", $var['exclude'][$e_id]); 
     190        if (!is_array($var['exclude'][$e_id])) { 
     191          $excludes = explode("\n", $var['exclude'][$e_id]); 
     192        } else { 
     193          $excludes = $var['exclude'][$e_id]; 
     194        } 
    191195        foreach ($excludes as $my => $e) { 
    192196          $excludes[$my] = trim($e);