- Added a global system settings storage in ini format. - Updated the user ...

tbrehm

2008-12-15 db5aa62b7faa2685f29215d4d08e13d28fd481a1

 interface/web/sites/database_edit.php

@@ -150,37 +150,28 @@
      }

      /*
       * If the names are restricted -> remove the client, so that the
       * If the names are restricted -> remove the restriction, so that the
       * data can be edited
       */
      if ($interfaceConf['restrict_names'] == true){
         /* Get the group-id */
         if($_SESSION["s"]["user"]["typ"] != 'admin') {
            // Get the group-id of the user
            $client_group_id = $_SESSION["s"]["user"]["default_group"];
         }
         else {
            // Get the group-id from the data itself
            $client_group_id = $this->dataRecord['sys_groupid'];
         }
         /* get the name of the client */
         $tmp = $app->db->queryOneRecord("SELECT name FROM sys_group WHERE groupid = " . $client_group_id);
         $clientName = $tmp['name'];
         if ($clientName == "") $clientName = 'default';
         $clientName = convertClientName($clientName);
         if ($this->dataRecord['database_name'] != ""){
            /* REMOVE the restriction */
            $app->tpl->setVar("database_name", str_replace($clientName . '_' , '', $this->dataRecord['database_name']));
            $app->tpl->setVar("database_user", str_replace($clientName . '_' , '', $this->dataRecord['database_user']));
         }
         if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
            $app->tpl->setVar("database_name_prefix", '{client}_');
            $app->tpl->setVar("database_user_prefix", '{client}_');
         }
         else {
            $app->tpl->setVar("database_name_prefix", $clientName . '_');
            $app->tpl->setVar("database_user_prefix", $clientName . '_');
         }
		
      //* Get the database name and database user prefix
      $app->uses('getconf');
      $global_config = $app->getconf->get_global_config('sites');
      $dbname_prefix = ($global_config['dbname_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['dbname_prefix']);
      $dbuser_prefix = ($global_config['dbuser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['dbuser_prefix']);
		
      if ($this->dataRecord['database_name'] != ""){
         /* REMOVE the restriction */
         $app->tpl->setVar("database_name", str_replace($dbname_prefix , '', $this->dataRecord['database_name']));
         $app->tpl->setVar("database_user", str_replace($dbuser_prefix , '', $this->dataRecord['database_user']));
      }
		
      if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
         $app->tpl->setVar("database_name_prefix", $global_config['dbname_prefix']);
         $app->tpl->setVar("database_user_prefix", $global_config['dbuser_prefix']);
      } else {
         $app->tpl->setVar("database_name_prefix", $dbname_prefix);
         $app->tpl->setVar("database_user_prefix", $dbuser_prefix);
      }

      parent::onShowEnd();
@@ -228,40 +219,23 @@
      global $app, $conf, $interfaceConf;

      /*
       * If the names should be restricted -> do it!
       */
      if ($interfaceConf['restrict_names'] == true){
         /* Get the group-id */
         if($_SESSION["s"]["user"]["typ"] != 'admin') {
            // Get the group-id of the user
            $client_group_id = $_SESSION["s"]["user"]["default_group"];
         }
         else {
            // Get the group-id from the data itself
            $client_group_id = $this->dataRecord['client_group_id'];
         }
         /* get the name of the client */
         $tmp = $app->db->queryOneRecord("SELECT name FROM sys_group WHERE groupid = " . $client_group_id);
         $clientName = $tmp['name'];
         if ($clientName == "") $clientName = 'default';
         $clientName = convertClientName($clientName);
         $nameSuffix = $clientName . '_';
      }
      else {
         $nameSuffix = '';
      }

      $error = false;
      * If the names should be restricted -> do it!
      */
		
		
      //* Get the database name and database user prefix
      $app->uses('getconf');
      $global_config = $app->getconf->get_global_config('sites');
      $dbname_prefix = ($global_config['dbname_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['dbname_prefix']);
      $dbuser_prefix = ($global_config['dbuser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['dbuser_prefix']);

      //* Prevent that the database name and charset is changed
      $old_record = $app->tform->getDataRecord($this->id);
      if($old_record["database_name"] != $nameSuffix . $this->dataRecord["database_name"]) {
      if($old_record["database_name"] != $restriction . $this->dataRecord["database_name"]) {
         $app->tform->errorMessage .= $app->tform->wordbook["database_name_change_txt"].'<br />';
         $error = true;
      }
      if($old_record["database_charset"] != $this->dataRecord["database_charset"]) {
         $app->tform->errorMessage .= $app->tform->wordbook["database_charset_change_txt"].'<br />';
         $error = true;
      }

      //* Check if the server has been changed
@@ -271,15 +245,14 @@
            //* Add a error message and switch back to old server
            $app->tform->errorMessage .= $app->lng('The Server can not be changed.');
            $this->dataRecord["server_id"] = $rec['server_id'];
            $error = true;
         }
      }
      unset($old_record);

      if ($error == false){
      if ($app->tform->errorMessage == ''){
         /* restrict the names if there is no error */
         $this->dataRecord['database_name'] = $nameSuffix . $this->dataRecord['database_name'];
         $this->dataRecord['database_user'] = $nameSuffix . $this->dataRecord['database_user'];
         $this->dataRecord['database_name'] = $dbname_prefix . $this->dataRecord['database_name'];
         $this->dataRecord['database_user'] = $dbuser_prefix . $this->dataRecord['database_user'];
      }

      parent::onBeforeUpdate();
@@ -287,30 +260,17 @@

   function onBeforeInsert() {
      global $app, $conf, $interfaceConf;
      global $interfaceConf;

      /*
       * If the names should be restricted -> do it!
       */
      if ($interfaceConf['restrict_names'] == true){
         /* Get the group-id */
         if($_SESSION["s"]["user"]["typ"] != 'admin') {
            // Get the group-id of the user
            $client_group_id = $_SESSION["s"]["user"]["default_group"];
         }
         else {
            // Get the group-id from the data itself
            $client_group_id = $this->dataRecord['client_group_id'];
         }
         /* get the name of the client */
         $tmp = $app->db->queryOneRecord("SELECT name FROM sys_group WHERE groupid = " . $client_group_id);
         $clientName = $tmp['name'];
         if ($clientName == "") $clientName = 'default';
         $clientName = convertClientName($clientName);
         /* restrict the names */
         $this->dataRecord['database_name'] = $clientName . '_' . $this->dataRecord['database_name'];
         $this->dataRecord['database_user'] = $clientName . '_' . $this->dataRecord['database_user'];
      }
      //* Get the database name and database user prefix
      $app->uses('getconf');
      $global_config = $app->getconf->get_global_config('sites');
      $dbname_prefix = ($global_config['dbname_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['dbname_prefix']);
      $dbuser_prefix = ($global_config['dbuser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['dbuser_prefix']);

      /* restrict the names */
      $this->dataRecord['database_name'] = $dbname_prefix . $this->dataRecord['database_name'];
      $this->dataRecord['database_user'] = $dbuser_prefix . $this->dataRecord['database_user'];

      parent::onBeforeInsert();
   }

@@ -344,6 +304,24 @@
      }

   }
	
   function getClientName() {
      global $app, $conf;
	
      if($_SESSION["s"]["user"]["typ"] != 'admin') {
         // Get the group-id of the user
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
      } else {
         // Get the group-id from the data itself
         $client_group_id = $this->dataRecord['client_group_id'];
      }
      /* get the name of the client */
      $tmp = $app->db->queryOneRecord("SELECT name FROM sys_group WHERE groupid = " . $client_group_id);
      $clientName = $tmp['name'];
      if ($clientName == "") $clientName = 'default';
      $clientName = convertClientName($clientName);
	
   }

}