- Changed: - added lost password button to login form - added back button...

mcramer

2013-07-09 15af404ea2ad11f72e3e2bb61c5511b832f66de4

 interface/web/sites/database_edit.php

@@ -206,6 +206,10 @@
         $app->tform->errorMessage .= $app->tform->wordbook["database_charset_change_txt"].'<br />';
      }
      
        if(!$this->dataRecord['database_user_id']) {
            $app->tform->errorMessage .= $app->tform->wordbook["database_user_missing_txt"].'<br />';
        }
        
      //* Database username and database name shall not be empty
      if($this->dataRecord['database_name'] == '') $app->tform->errorMessage .= $app->tform->wordbook["database_name_error_empty"].'<br />';
      
@@ -244,11 +248,28 @@
            // we need remote access rights for this server, so get it's ip address
            $server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
            if($server_config['ip_address']!='') {
            /*
                if($this->dataRecord['remote_access'] != 'y') $this->dataRecord['remote_ips'] = '';
                $this->dataRecord['remote_access'] = 'y';
                if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
                    $this->dataRecord['remote_ips'] .= ($this->dataRecord['remote_ips'] != '' ? ',' : '') . $server_config['ip_address'];
                }
            */
				
            if($this->dataRecord['remote_access'] != 'y'){
               $this->dataRecord['remote_ips'] = $server_config['ip_address'];
               $this->dataRecord['remote_access'] = 'y';
            } else {
               if($this->dataRecord['remote_ips'] != ''){
                  if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
                     $this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address'];
                  }
                        $tmp = preg_split('/\s*,\s*/', $this->dataRecord['remote_ips']);
                        $tmp = array_unique($tmp);
                        $this->dataRecord['remote_ips'] = implode(',', $tmp);
                        unset($tmp);
               }
            }
            }
        }
        
@@ -295,11 +316,28 @@
            // we need remote access rights for this server, so get it's ip address
            $server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
            if($server_config['ip_address']!='') {
            /*
                if($this->dataRecord['remote_access'] != 'y') $this->dataRecord['remote_ips'] = '';
                $this->dataRecord['remote_access'] = 'y';
                if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
                    $this->dataRecord['remote_ips'] .= ($this->dataRecord['remote_ips'] != '' ? ',' : '') . $server_config['ip_address'];
                }
            */
				
            if($this->dataRecord['remote_access'] != 'y'){
               $this->dataRecord['remote_ips'] = $server_config['ip_address'];
               $this->dataRecord['remote_access'] = 'y';
            } else {
               if($this->dataRecord['remote_ips'] != ''){
                  if(preg_match('/(^|,)' . preg_quote($server_config['ip_address'], '/') . '(,|$)/', $this->dataRecord['remote_ips']) == false) {
                     $this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address'];
                  }
                        $tmp = preg_split('/\s*,\s*/', $this->dataRecord['remote_ips']);
                        $tmp = array_unique($tmp);
                        $this->dataRecord['remote_ips'] = implode(',', $tmp);
                        unset($tmp);
               }
            }
            }
        }
        
@@ -311,7 +349,7 @@
        
        $app->uses('sites_database_plugin');
        
        $app->sites_database_plugin->processDatabaseInsert($this);
        //$app->sites_database_plugin->processDatabaseInsert($this);
        
        $app->db->query($sql);
        if($app->db->errorMessage != '') die($app->db->errorMessage);
@@ -325,7 +363,7 @@
        if(!empty($sql) && !$app->tform->isReadonlyTab($app->tform->getCurrentTab(),$this->id)) {
            
            $app->uses('sites_database_plugin');
            $app->sites_database_plugin->processDatabaseUpdate($this);
            //$app->sites_database_plugin->processDatabaseUpdate($this);

            $app->db->query($sql);
            if($app->db->errorMessage != '') die($app->db->errorMessage);