Fixed: FS#431 - jailkit users cannot login

tbrehm

2009-01-27 cbda30058c0f61ae2afbd9085afcf841f32751a5

 interface/web/sites/database_edit.php

@@ -157,8 +157,8 @@
      //* 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']);
      $dbname_prefix = replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
      $dbuser_prefix = replacePrefix($global_config['dbuser_prefix'], $this->dataRecord);
      
      if ($this->dataRecord['database_name'] != ""){
         /* REMOVE the restriction */
@@ -226,12 +226,12 @@
      //* 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']);
      $dbname_prefix = replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
      $dbuser_prefix = replacePrefix($global_config['dbuser_prefix'], $this->dataRecord);

      //* Prevent that the database name and charset is changed
      $old_record = $app->tform->getDataRecord($this->id);
      if($old_record["database_name"] != $restriction . $this->dataRecord["database_name"]) {
      if($old_record["database_name"] != $dbname_prefix . $this->dataRecord["database_name"]) {
         $app->tform->errorMessage .= $app->tform->wordbook["database_name_change_txt"].'<br />';
      }
      if($old_record["database_charset"] != $this->dataRecord["database_charset"]) {
@@ -251,8 +251,9 @@

      if ($app->tform->errorMessage == ''){
         /* restrict the names if there is no error */
         $this->dataRecord['database_name'] = $dbname_prefix . $this->dataRecord['database_name'];
         $this->dataRecord['database_user'] = $dbuser_prefix . $this->dataRecord['database_user'];
            /* crop user and db names if they are too long -> mysql: user: 16 chars / db: 64 chars */
         $this->dataRecord['database_name'] = substr($dbname_prefix . $this->dataRecord['database_name'], 0, 64);
         $this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
      }

      parent::onBeforeUpdate();
@@ -264,12 +265,13 @@
      //* 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']);
      $dbname_prefix = replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
      $dbuser_prefix = replacePrefix($global_config['dbuser_prefix'], $this->dataRecord);

      /* restrict the names */
      $this->dataRecord['database_name'] = $dbname_prefix . $this->dataRecord['database_name'];
      $this->dataRecord['database_user'] = $dbuser_prefix . $this->dataRecord['database_user'];
        /* crop user and db names if they are too long -> mysql: user: 16 chars / db: 64 chars */
      $this->dataRecord['database_name'] = substr($dbname_prefix . $this->dataRecord['database_name'], 0, 64);
      $this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);

      parent::onBeforeInsert();
   }
@@ -303,24 +305,6 @@
         $app->db->query("UPDATE web_database SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE database_id = ".$this->id);
      }

   }
	
   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);
	
   }

}