Ticket #600: patch-600.diff

File patch-600.diff, 2.4 kB (added by nahuel, 3 years ago)

  • bureau/class/m_mysql.php

    old new  
    3636class m_mysql { 
    3737 
    3838  var $server; 
     39  var $client; 
    3940 
    4041  /*---------------------------------------------------------------------------*/ 
    4142  /** Constructor 
    …… 
    4344  */ 
    4445  function m_mysql() { 
    4546      $this->server = $GLOBALS['L_MYSQL_HOST']; 
     47      $this->client = $GLOBALS['L_MYSQL_CLIENT']; 
    4648  } 
    4749 
    4850  /* ----------------------------------------------------------------- */ 
    …… 
    153155    $db->query("INSERT INTO db (uid,login,pass,db,bck_mode) VALUES ('$cuid','$lo','$pa','$dbname',0);"); 
    154156    // give everything but GRANT on db.* 
    155157    // we assume there's already a user 
    156     $db->query("GRANT ALL PRIVILEGES ON `".$dbname."`.* TO '".$lo."'@'".$L_MYSQL_CLIENT."'"); 
     158    $db->query("GRANT ALL PRIVILEGES ON `".$dbname."`.* TO '".$lo."'@'$this->client'"); 
    157159    $db->query("CREATE DATABASE $dbname;"); 
    158160    return true; 
    159161  } 
    …… 
    185187    $db->query("DROP DATABASE $dbname;"); 
    186188    $db->query("SELECT COUNT(*) AS cnt FROM db WHERE uid='$cuid';"); 
    187189    $db->next_record(); 
    188     $db->query("REVOKE ALL PRIVILEGES ON `".$dbname."`.* FROM '".$login."'@'%'"); 
     190    $db->query("REVOKE ALL PRIVILEGES ON `".$dbname."`.* FROM '".$login."'@'$this->client'"); 
    189191    if ($db->f("cnt")==0) { 
    190192      $db->query("DELETE FROM mysql.user WHERE User='".$login."';"); 
    191193      $db->query("FLUSH PRIVILEGES;"); 
    …… 
    284286    // OK, creation now... 
    285287    $db->query("INSERT INTO db (uid,login,pass,db) VALUES ('$cuid','".$login."','$password','".$dbname."');"); 
    286288    // give everything but GRANT on $user.* 
    287     $db->query("GRANT ALL PRIVILEGES ON `".$dbname."`.* TO '".$login."'@'".$L_MYSQL_CLIENT."' IDENTIFIED BY '".$password."'"); 
     289    $db->query("GRANT ALL PRIVILEGES ON `".$dbname."`.* TO '".$login."'@'$this->client' IDENTIFIED BY '".$password."'"); 
    288290    $db->query("CREATE DATABASE ".$dbname.";"); 
    289291    return true; 
    290292  } 

  • bureau/class/local.php

    old new  
    77                'MYSQL_PASS' => 'MYSQL_PWD', 
    88               'NS1_HOSTNAME' => 'NS1', 
    99               'NS2_HOSTNAME' => 'NS2' 
     10               'MYSQL_CLIENT' => 'MYSQL_CLIENT' 
    1011              ); 
    1112 
    1213