validate serverip depending on ipv4/ipv6

Florian Schaal

2016-02-25 d83abe0860e13d599b34e7e150e4ba2fd571db93

 interface/lib/classes/plugin_backuplist.inc.php

@@ -85,8 +85,8 @@
            $server_id = $this->form->dataRecord['server_id'];
            $backup = $app->db->queryOneRecord("SELECT * FROM web_backup WHERE backup_id = ?", $backup_id);
            if($backup['server_id'] > 0) $server_id = $backup['server_id'];
            $sql = "SELECT count(action_id) as number FROM sys_remoteaction WHERE action_state = 'pending' AND action_type = 'backup_restore' AND action_param = '$backup_id'";
            $tmp = $app->db->queryOneRecord($sql);
            $sql = "SELECT count(action_id) as number FROM sys_remoteaction WHERE action_state = 'pending' AND action_type = 'backup_restore' AND action_param = ?";
            $tmp = $app->db->queryOneRecord($sql, $backup_id);
            if($tmp['number'] == 0) {
               $message .= $wb['restore_info_txt'];
               $sql =  "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
@@ -96,11 +96,26 @@
               $error .= $wb['restore_pending_txt'];
            }
         }
         if($_GET['backup_action'] == 'delete' && $backup_id > 0) {
            $server_id = $this->form->dataRecord['server_id'];
            $backup = $app->db->queryOneRecord("SELECT * FROM web_backup WHERE backup_id = ?", $backup_id);
            if($backup['server_id'] > 0) $server_id = $backup['server_id'];
            $sql = "SELECT count(action_id) as number FROM sys_remoteaction WHERE action_state = 'pending' AND action_type = 'backup_delete' AND action_param = ?";
            $tmp = $app->db->queryOneRecord($sql, $backup_id);
            if($tmp['number'] == 0) {
               $message .= $wb['delete_info_txt'];
               $sql =  "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
                  "VALUES (?, UNIX_TIMESTAMP(), 'backup_delete', ?, 'pending', '')";
               $app->db->query($sql, $server_id, $backup_id);
            } else {
               $error .= $wb['delete_pending_txt'];
            }
         }

      }

      //* Get the data
      $server_ids = array_unique($server_ids);
      $server_ids = array();
      $web = $app->db->queryOneRecord("SELECT server_id FROM web_domain WHERE domain_id = ?", $this->form->id);
      $databases = $app->db->queryAllRecords("SELECT server_id FROM web_database WHERE parent_domain_id = ?", $this->form->id);
      if($app->functions->intval($web['server_id']) > 0) $server_ids[] = $app->functions->intval($web['server_id']);
@@ -126,6 +141,10 @@
            
            $rec['download_available'] = true;
            if($rec['server_id'] != $web['server_id']) $rec['download_available'] = false;
				
            if($rec['filesize'] > 0){
               $rec['filesize'] = $app->functions->currency_format($rec['filesize']/(1024*1024), 'client').' MB';
            }

            $records_new[] = $rec;
         }