composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed two bugs:

Browse Source 
- Trac#80 Misleading messages when using the back button during the setup (added back button in any error case)
 - Trac#72 Revised the setup to consider any installation scenario regarding Database and user privileges (user rights tracked into the log file)

SVN:trunk[291]
This commit is contained in:
Romain Quetiez
2010-01-28 17:10:39 +00:00
parent 68b9446fdd
commit f61ac3f4a0
6 changed files with 114 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/cmdbsource.class.inc.php
View File

@@ -20,6 +20,7 @@ class MySQLException extends CoreException
public function __construct($sIssue, $aContext)
{
$aContext['mysql_error'] = mysql_error();
$aContext['mysql_errno'] = mysql_errno();
parent::__construct($sIssue, $aContext);
}
}
@@ -41,13 +42,13 @@ class CMDBSource
self::$m_sDBName = $sSource;
if (!self::$m_resDBLink = @mysql_pconnect($sServer, $sUser, $sPwd))
{
throw new MySQLException('Could not connect to the DB server', array('host'=>$sServer));
throw new MySQLException('Could not connect to the DB server', array('host'=>$sServer, 'user'=>$sUser));
}
if (!empty($sSource))
{
if (!mysql_select_db($sSource, self::$m_resDBLink))
{
throw new MySQLException('Could not select DB', array('db_name'=>$sSource));
throw new MySQLException('Could not select DB', array('host'=>$sServer, 'user'=>$sUser, 'db_name'=>$sSource));
}
}
}
@@ -464,6 +465,33 @@ class CMDBSource
}
return $result;
}
/**
* Returns the privileges of the current user
* @return string privileges in a raw format
*/
public static function GetRawPrivileges()
{
try
{
$result = self::Query('SHOW GRANTS'); // [ FOR CURRENT_USER()]
}
catch(MySQLException $e)
{
return "Current user not allowed to see his own privileges (could not access to the database 'mysql' - $iCode)";
}
$aRes = array();
while ($aRow = mysql_fetch_array($result, MYSQL_NUM))
{
// so far, only one column...
$aRes[] = implode('/', $aRow);
}
mysql_free_result($result);
// so far, only one line...
return implode(', ', $aRes);
}
}