wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'refactoring' of git.kde.org:owncloud into refactoring

Browse source
This commit is contained in:
Frank Karlitschek 2011-04-16 23:09:02 +02:00
commit af40d872ce
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/owncloud.sql
View file

@ -165,7 +165,6 @@ CREATE TABLE IF NOT EXISTS `properties` (
CREATE TABLE IF NOT EXISTS `users` (
`uid` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
`name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
`password` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
PRIMARY KEY (`uid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

2
lib/User/database.php
View file

@ -71,7 +71,7 @@ class OC_USER_DATABASE extends OC_USER_BACKEND {
* @param string $password The password of the user
*/
public static function login( $username, $password ){
$query = OC_DB::prepare( "SELECT `uid`, `name` FROM `*PREFIX*users` WHERE `uid` = ? AND `password` = ?" );
$query = OC_DB::prepare( "SELECT `uid` FROM `*PREFIX*users` WHERE `uid` = ? AND `password` = ?" );
$result = $query->execute( array( $username, sha1( $password )));
if( $result->numRows() > 0 ){

2
lib/database.php
View file

@ -152,7 +152,7 @@ class OC_DB {
// Die if we have an error (error means: bad query, not 0 results!)
if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />';
$entry .= 'Offending command was: '.$cmd.'<br />';
$entry .= 'Offending command was: '.$query.'<br />';
error_log( $entry );
die( $entry );
}