@ -463,7 +463,6 @@ class OC_OCS {
$xml[$i]['key']=$log['key']; $xml[$i]['key']=$log['key'];
$xml[$i]['app']=$log['app']; $xml[$i]['app']=$log['app'];
$xml[$i]['value']=$log['value']; $xml[$i]['value']=$log['value'];
$xml[$i]['timestamp']=$log['timestamp'];
} }
@ -511,28 +510,26 @@ class OC_OCS {
* @param bool $like use LIKE instead of = when comparing keys * @param bool $like use LIKE instead of = when comparing keys
* @return array * @return array
*/ */
public static function getData($user,$app="",$key="",$like=false) { public static function getData($user,$app="",$key="") {
$key="$user::$key";//ugly hack for the sake of keeping database scheme compatibiliy, needs to be replaced with a seperate user field the next time we break db compatibiliy
$compareFunction=($like)?'LIKE':'=';
if($app){ if($app){
if (!trim($key)) { $apps=array($app);
$query = OC_DB::prepare('select app, `key`,value,`timestamp` from *PREFIX*privatedata where app=? order by `timestamp` desc'); }else{
$result=$query->execute(array($app))->fetchAll(); $apps=OC_PREFERENCES::getApps($user);
} else {
$query = OC_DB::prepare("select app, `key`,value,`timestamp` from *PREFIX*privatedata where app=? and `key` $compareFunction ? order by `timestamp` desc");
$result=$query->execute(array($app,$key))->fetchAll();
} }
if($key){
$keys=array($key);
}else{ }else{
if (!trim($key)) { foreach($apps as $app){
$query = OC_DB::prepare('select app, `key`,value,`timestamp` from *PREFIX*privatedata order by `timestamp` desc'); $keys=OC_PREFERENCES::getKeys($user,$app);
$result=$query->execute()->fetchAll(); }
} else { }
$query = OC_DB::prepare("select app, `key`,value,`timestamp` from *PREFIX*privatedata where `key` $compareFunction ? order by `timestamp` desc"); $result=array();
$result=$query->execute(array($key))->fetchAll(); foreach($apps as $app){
foreach($keys as $key){
$value=OC_PREFERENCES::getValue($user,$app,$key);
$result[]=array('app'=>$app,'key'=>$key,'value'=>$value);
} }
} }
$result=self::trimKeys($result,$user);
return $result; return $result;
} }
@ -545,25 +542,7 @@ class OC_OCS {
* @return bool * @return bool
*/ */
public static function setData($user, $app, $key, $value) { public static function setData($user, $app, $key, $value) {
$key="$user::$key";//ugly hack for the sake of keeping database scheme compatibiliy return OC_PREFERENCES::setValue($user,$app,$key,$value);
//TODO: locking tables, fancy stuff, error checking/handling
$query=OC_DB::prepare("select count(*) as co from *PREFIX*privatedata where `key` = ? and app = ?");
$result=$query->execute(array($key,$app))->fetchAll();
$totalcount=$result[0]['co'];
if ($totalcount != 0) {
$query=OC_DB::prepare("update *PREFIX*privatedata set value=?, `timestamp` = now() where `key` = ? and app = ?");
} else {
$result = OC_DB::prepare("insert into *PREFIX*privatedata(value, `key`, app, `timestamp`) values(?, ?, ?, now())");
}
$result = $query->execute(array($value,$key,$app));
if (PEAR::isError($result)){
$entry='DB Error: "'.$result->getMessage().'"< br / > ';
error_log($entry);
return false;
}else{
return true;
}
} }
/** /**
@ -574,26 +553,7 @@ class OC_OCS {
* @return string xml/json * @return string xml/json
*/ */
public static function deleteData($user, $app, $key) { public static function deleteData($user, $app, $key) {
$key="$user::$key";//ugly hack for the sake of keeping database scheme compatibiliy return OC_PREFERENCES::deleteKey($user,$app,$key);
//TODO: prepared statements, locking tables, fancy stuff, error checking/handling
$query=OC_DB::prepare("delete from *PREFIX*privatedata where `key` = ? and app = ?");
$result = $query->execute(array($key,$app));
if (PEAR::isError($result)){
$entry='DB Error: "'.$result->getMessage().'"< br / > ';
error_log($entry);
return false;
}else{
return true;
}
}
//trim username prefixes from $array
private static function trimKeys($array,$user){
$length=strlen("$user::");
foreach($array as & $item){
$item['key']=substr($item['key'],$length);
}
return $array;
} }
} }
Jan-Christoph Borchardt
14 years ago