Changeset 13908
- Timestamp:
- 03/26/12 13:02:04 (1 year ago)
- Files:
-
- modules/branches/2.10/backup/functions.inc/class.backup.php (modified) (1 diff)
- modules/branches/2.10/backup/functions.inc/servers.php (modified) (3 diffs)
- modules/branches/2.10/backup/functions.inc/templates.php (modified) (1 diff)
- modules/branches/2.10/backup/page.backup_servers.php (modified) (1 diff)
- modules/branches/2.10/backup/page.backup_templates.php (modified) (2 diffs)
- modules/branches/2.10/backup/views/servers/ftp.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.10/backup/functions.inc/class.backup.php
r13555 r13908 324 324 $ftp = ftp_connect($s['host'], $s['port']); 325 325 if (ftp_login($ftp, $s['user'], $s['password'])) { 326 // use pasivemode327 ftp_pasv($ftp, true);326 //chose pasive/active transfer mode 327 ftp_pasv($ftp, ($s['transfer'] == 'passive')); 328 328 329 329 //switch to directory. If we fail, build directory structure and try again modules/branches/2.10/backup/functions.inc/servers.php
r12414 r13908 23 23 'password' => '', 24 24 'path' => '', 25 'transfer' => 'passive', 25 26 'type' => 'ftp', 26 27 'readonly' => array(), … … 75 76 //dont delete if deleting has been blocked 76 77 $immortal = $db->getOne('SELECT immortal FROM backup_servers WHERE id = ?', $id); 78 db_e($immortal); 77 79 if ($immortal && $immortal == 'true') { 78 80 return $id; 79 } else {80 return false;//db error81 81 } 82 82 83 83 $sql = 'DELETE FROM backup_servers WHERE id = ?'; 84 84 $ret = $db->query($sql, $id); 85 if ($db->IsError($ret)){ 86 die_freepbx($ret->getDebugInfo()); 87 } 85 db_e($ret); 88 86 89 87 $sql = 'DELETE FROM backup_server_details WHERE server_id = ?'; 90 88 $ret = $db->query($sql, $id); 91 if ($db->IsError($ret)){ 92 die_freepbx($ret->getDebugInfo()); 93 } 89 db_e($ret); 94 90 95 91 //delete from backups_details 96 92 $sql = 'DELETE FROM backup_details WHERE `key` = "storage_servers" and value = ?'; 97 93 $ret = $db->query($sql, $id); 98 if ($db->IsError($ret)){ 99 die_freepbx($ret->getDebugInfo()); 100 } 94 db_e($ret); 101 95 102 96 //delete from backups_items 103 $sql = 'DELETE FROM backup_details WHERE type = "mysql" AND path = CONCAT("server-", ?)'; 104 $ret = $db->query($sql, $id); 105 if ($db->IsError($ret)){ 106 die_freepbx($ret->getDebugInfo()); 107 } 97 $sql = 'DELETE FROM backup_items WHERE type = "mysql" AND path = CONCAT("server-", ?)'; 98 $ret = $db->query($sql, $id); 99 db_e($ret); 108 100 109 101 //delete from templates 110 102 $sql = 'DELETE FROM backup_template_details WHERE type = "mysql" AND path = CONCAT("server-", ?)'; 111 103 $ret = $db->query($sql, $id); 112 dbug('temp', $db->last_query); 113 if ($db->IsError($ret)){ 114 die_freepbx($ret->getDebugInfo()); 115 } 104 //dbug('temp', $db->last_query); 105 db_e($ret); 116 106 117 107 return ''; … … 175 165 array($var['id'], 'user', $var['user']), 176 166 array($var['id'], 'path', $var['path']), 177 array($var['id'], 'password', $var['password']) 167 array($var['id'], 'password', $var['password']), 168 array($var['id'], 'transfer', $var['transfer']) 178 169 ); 179 170 break; modules/branches/2.10/backup/functions.inc/templates.php
r13482 r13908 12 12 $sql = 'DELETE FROM backup_templates WHERE id = ?'; 13 13 $ret = $db->query($sql, $id); 14 if ($db->IsError($ret)){ 15 die_freepbx($ret->getDebugInfo()); 16 } 14 db_e($ret); 17 15 18 16 $sql = 'DELETE FROM backup_template_details WHERE template_id = ?'; 19 17 $ret = $db->query($sql, $id); 20 if ($db->IsError($ret)){ 21 die_freepbx($ret->getDebugInfo()); 22 } 18 db_e($ret); 23 19 24 20 /*todo: select servers from backups modules/branches/2.10/backup/page.backup_servers.php
r12848 r13908 21 21 'server_type' => '', 22 22 'submit' => '', 23 'transfer' => '', 23 24 'type' => '' 24 25 ); modules/branches/2.10/backup/page.backup_templates.php
r12848 r13908 1 1 <?php 2 2 if (!defined('FREEPBX_IS_AUTH')) { die('No direct script access allowed'); } 3 dbug($_REQUEST); 3 4 $get_vars = array( 4 5 'action' => '', … … 42 43 case 'save': 43 44 $var = array_merge($var, backup_get_template($var['id'])); 45 46 //template id's are all prefixed by their module name for hooking reasons. Clear that past this point 47 if (strpos($var['id'], 'backup-') === 0) { 48 $var['id'] = substr($var['id'], 7); 49 } 50 44 51 echo load_view(dirname(__FILE__) . '/views/templates/template.php', $var); 45 52 break; modules/branches/2.10/backup/views/servers/ftp.php
r12445 r13908 70 70 $label = fpbx_label(_('Path'), _('Path where files are stored')); 71 71 $data = array( 72 'name' 73 'value' => $path72 'name' => 'path', 73 'value' => $path, 74 74 ); 75 75 $data = backup_server_writeable('path', $readonly, $data); 76 76 $table->add_row($label, form_input($data)); 77 78 //connection type key 79 $label = fpbx_label(_('Transfer Mode')); 80 $lableactive = form_label('Active', 'transferactive'); 81 $active = array( 82 'name' => 'transfer', 83 'value' => 'active', 84 'id' => 'transferactive' 85 ); 86 $transfer == 'active' ? $active['checked'] = 'checked' : ''; 87 $active = backup_server_writeable('transfer', $readonly, $active); 88 $lablepassive = form_label('Passive', 'transferpassive'); 89 $passive = array( 90 'name' => 'transfer', 91 'value' => 'passive', 92 'id' => 'transferpassive' 93 ); 94 $transfer == 'passive' ? $passive['checked'] = 'checked' : ''; 95 $passive = backup_server_writeable('transfer', $readonly, $passive); 96 $table->add_row($label, 97 '<span class="radioset">' 98 . $lableactive . form_radio($active) 99 . $lablepassive . form_radio($passive) 100 . '</span>'); 77 101 78 102 $html .= $table->generate();
