mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git://gitorious.org/owncloud/owncloud

This commit is contained in:
Bart Visscher 2012-05-03 23:26:43 +02:00
parent 077ea94f71 3d6909f372
commit 89c8316f8f
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
data data
owncloud owncloud
config/config.php config/config.php
config/mount.php
apps/inc.php apps/inc.php
# just sane ignores # just sane ignores

1
apps/user_ldap/settings.php
View File

@ -23,7 +23,6 @@
$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_display_name', 'ldap_tls', 'ldap_nocase'. 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr'); $params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_display_name', 'ldap_tls', 'ldap_nocase'. 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr');
OCP\Util::addscript('user_ldap', 'settings'); OCP\Util::addscript('user_ldap', 'settings');
OCP\Util::addStyle('user_ldap', 'settings');
if ($_POST) { if ($_POST) {
foreach($params as $param){ foreach($params as $param){

6
lib/app.php
View File

@ -125,11 +125,13 @@ class OC_App{
* get all enabled apps * get all enabled apps
*/ */
public static function getEnabledApps(){ public static function getEnabledApps(){
$apps=array(); $apps=array('files');
$query = OC_DB::prepare( 'SELECT appid FROM *PREFIX*appconfig WHERE configkey = \'enabled\' AND configvalue=\'yes\'' ); $query = OC_DB::prepare( 'SELECT appid FROM *PREFIX*appconfig WHERE configkey = \'enabled\' AND configvalue=\'yes\'' );
$result=$query->execute(); $result=$query->execute();
while($row=$result->fetchRow()){ while($row=$result->fetchRow()){
$apps[]=$row['appid']; if(array_search($row['appid'],$apps)===false){
$apps[]=$row['appid'];
}
} }
return $apps; return $apps;
} }

17
lib/filecache.php
View File

@ -110,8 +110,13 @@ class OC_FileCache{
$data['versioned']=false; $data['versioned']=false;
} }
$mimePart=dirname($data['mimetype']); $mimePart=dirname($data['mimetype']);
$data['size']=(int)$data['size'];
$data['ctime']=(int)$data['mtime'];
$data['writable']=(int)$data['writable'];
$data['encrypted']=(int)$data['encrypted'];
$data['versioned']=(int)$data['versioned'];
$user=OC_User::getUser(); $user=OC_User::getUser();
$query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, path_hash, size, mtime, ctime, mimetype, mimepart,user,writable,encrypted,versioned) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)'); $query=OC_DB::prepare('INSERT INTO *PREFIX*fscache(parent, name, path, path_hash, size, mtime, ctime, mimetype, mimepart,`user`,writable,encrypted,versioned) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)');
$result=$query->execute(array($parent,basename($path),$path,md5($path),$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user,$data['writable'],$data['encrypted'],$data['versioned'])); $result=$query->execute(array($parent,basename($path),$path,md5($path),$data['size'],$data['mtime'],$data['ctime'],$data['mimetype'],$mimePart,$user,$data['writable'],$data['encrypted'],$data['versioned']));
if(OC_DB::isError($result)){ if(OC_DB::isError($result)){
OC_Log::write('files','error while writing file('.$path.') to cache',OC_Log::ERROR); OC_Log::write('files','error while writing file('.$path.') to cache',OC_Log::ERROR);
@ -208,9 +213,9 @@ class OC_FileCache{
} }
$rootLen=strlen($root); $rootLen=strlen($root);
if(!$returnData){ if(!$returnData){
$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE name LIKE ? AND user=?'); $query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE name LIKE ? AND `user`=?');
}else{ }else{
$query=OC_DB::prepare('SELECT * FROM *PREFIX*fscache WHERE name LIKE ? AND user=?'); $query=OC_DB::prepare('SELECT * FROM *PREFIX*fscache WHERE name LIKE ? AND `user`=?');
} }
$result=$query->execute(array("%$search%",OC_User::getUser())); $result=$query->execute(array("%$search%",OC_User::getUser()));
$names=array(); $names=array();
@ -332,7 +337,7 @@ class OC_FileCache{
if(!$user){ if(!$user){
$user=OC_User::getUser(); $user=OC_User::getUser();
} }
$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE id=? AND user=?'); $query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE id=? AND `user`=?');
$result=$query->execute(array($id,$user)); $result=$query->execute(array($id,$user));
$row=$result->fetchRow(); $row=$result->fetchRow();
$path=$row['path']; $path=$row['path'];
@ -594,10 +599,10 @@ class OC_FileCache{
$root .= '%'; $root .= '%';
$user=OC_User::getUser(); $user=OC_User::getUser();
if(!$part2){ if(!$part2){
$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimepart=? AND user=? AND path LIKE ?'); $query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimepart=? AND `user`=? AND path LIKE ?');
$result=$query->execute(array($part1,$user, $root)); $result=$query->execute(array($part1,$user, $root));
}else{ }else{
$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimetype=? AND user=? AND path LIKE ? '); $query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimetype=? AND `user`=? AND path LIKE ? ');
$result=$query->execute(array($part1.'/'.$part2,$user, $root)); $result=$query->execute(array($part1.'/'.$part2,$user, $root));
} }
$names=array(); $names=array();