</field>
<field>
- <name>key</name>
+ <name>configkey</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
</field>
<field>
- <name>value</name>
+ <name>configvalue</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
</field>
<field>
- <name>timestamp</name>
+ <name>moment</name>
<type>timestamp</type>
<default>0000-00-00 00:00:00</default>
<notnull>true</notnull>
</field>
<field>
- <name>key</name>
+ <name>configkey</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
</field>
<field>
- <name>value</name>
+ <name>configvalue</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
*
* CREATE TABLE `appconfig` (
* `appid` VARCHAR( 255 ) NOT NULL ,
- * `key` VARCHAR( 255 ) NOT NULL ,
- * `value` VARCHAR( 255 ) NOT NULL
+ * `configkey` VARCHAR( 255 ) NOT NULL ,
+ * `configvalue` VARCHAR( 255 ) NOT NULL
* )
*
*/
*/
public static function getApps(){
// No magic in here!
- $query = OC_DB::prepare( 'SELECT DISTINCT( appid ) FROM `*PREFIX*appconfig`' );
+ $query = OC_DB::prepare( 'SELECT DISTINCT( appid ) FROM *PREFIX*appconfig' );
$result = $query->execute();
$apps = array();
*/
public static function getKeys( $app ){
// No magic in here as well
- $query = OC_DB::prepare( 'SELECT key FROM `*PREFIX*appconfig` WHERE `appid` = ?' );
+ $query = OC_DB::prepare( 'SELECT configkey FROM *PREFIX*appconfig WHERE appid = ?' );
$result = $query->execute( array( $app ));
$keys = array();
while( $row = $result->fetchRow()){
- $keys[] = $row["key"];
+ $keys[] = $row["configkey"];
}
return $keys;
*/
public static function getValue( $app, $key, $default = null ){
// At least some magic in here :-)
- $query = OC_DB::prepare( 'SELECT value FROM *PREFIX*appconfig WHERE appid = ? AND key = ?' );
+ $query = OC_DB::prepare( 'SELECT configvalue FROM *PREFIX*appconfig WHERE appid = ? AND configkey = ?' );
$result = $query->execute( array( $app, $key ));
if( !$result->numRows()){
$row = $result->fetchRow();
- return $row["value"];
+ return $row["configvalue"];
}
/**
// null: does not exist
if( is_null( $exists )){
- $query = OC_DB::prepare( 'INSERT INTO *PREFIX*appconfig ( `appid`, `key`, `value` ) VALUES( ?, ?, ? )' );
+ $query = OC_DB::prepare( 'INSERT INTO *PREFIX*appconfig ( appid, configkey, configvalue ) VALUES( ?, ?, ? )' );
$query->execute( array( $app, $key, $value ));
}
else{
- $query = OC_DB::prepare( 'UPDATE *PREFIX*appconfig SET value = ? WHERE appid = ? AND key = ?' );
+ $query = OC_DB::prepare( 'UPDATE *PREFIX*appconfig SET configvalue = ? WHERE appid = ? AND configkey = ?' );
$query->execute( array( $value, $app, $key ));
}
}
*/
public static function deleteKey( $app, $key ){
// Boring!
- $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `key` = ?' );
+ $query = OC_DB::prepare( 'DELETE FROM *PREFIX*appconfig WHERE appid = ? AND configkey = ?' );
$query->execute( array( $app, $key ));
return true;
*/
public static function deleteApp( $app ){
// Nothing special
- $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ?' );
+ $query = OC_DB::prepare( 'DELETE FROM *PREFIX*appconfig WHERE appid = ?' );
$query->execute( array( $app ));
return true;
// Include the file, save the data from $CONFIG
include( "$SERVERROOT/config/config.php" );
- self::$cache = $CONFIG;
+ if( isset( $CONFIG ) || is_array( $CONFIG )){
+ self::$cache = $CONFIG;
+ }
// We cached everything
self::$init = true;
*
* CREATE TABLE `log` (
* `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
- * `timestamp` DATETIME NOT NULL ,
+ * `moment` DATETIME NOT NULL ,
* `appid` VARCHAR( 255 ) NOT NULL ,
* `user` VARCHAR( 255 ) NOT NULL ,
* `action` VARCHAR( 255 ) NOT NULL ,
* This function adds another entry to the log database
*/
public static function add( $appid, $subject, $predicate, $object = ' ' ){
- $query=OC_DB::prepare("INSERT INTO *PREFIX*log(`timestamp`,appid,user,action,info) VALUES(NOW(),?,?,?,?)");
+ $query=OC_DB::prepare("INSERT INTO *PREFIX*log(moment,appid,user,action,info) VALUES(NOW(),?,?,?,?)");
$result=$query->execute(array($appid,$subject,$predicate,$object));
// Die if we have an error
if( PEAR::isError($result)) {
$queryString='SELECT * FROM *PREFIX*log WHERE 1=1 ';
$params=array();
if(isset($filter['from'])){
- $queryString.='AND `timestamp`>? ';
+ $queryString.='AND moment>? ';
array_push($params,$filter('from'));
}
if(isset($filter['until'])){
- $queryString.='AND `timestamp`<? ';
+ $queryString.='AND moment<? ';
array_push($params,$filter('until'));
}
if(isset($filter['user'])){
}
$query=OC_DB::prepare($queryString);
$result=$query->execute($params)->fetchAll();
- if(count($result)>0 and is_numeric($result[0]['timestamp'])){
+ if(count($result)>0 and is_numeric($result[0]['moment'])){
foreach($result as &$row){
- $row['timestamp']=OC_UTIL::formatDate($row['timestamp']);
+ $row['moment']=OC_UTIL::formatDate($row['moment']);
}
}
return $result;
* This function deletes all entries that are older than $date.
*/
public static function deleteBefore( $date ){
- $query=OC_DB::prepare("DELETE FROM *PREFIX*log WHERE `timestamp`<?");
+ $query=OC_DB::prepare("DELETE FROM *PREFIX*log WHERE moment<?");
$query->execute(array($date));
return true;
}
* CREATE TABLE `preferences` (
* `userid` VARCHAR( 255 ) NOT NULL ,
* `appid` VARCHAR( 255 ) NOT NULL ,
- * `key` VARCHAR( 255 ) NOT NULL ,
- * `value` VARCHAR( 255 ) NOT NULL
+ * `configkey` VARCHAR( 255 ) NOT NULL ,
+ * `configvalue` VARCHAR( 255 ) NOT NULL
* )
*
*/
*/
public static function getUsers(){
// No need for more comments
- $query = OC_DB::prepare( 'SELECT DISTINCT( `userid` ) FROM `*PREFIX*preferences`' );
+ $query = OC_DB::prepare( 'SELECT DISTINCT( userid ) FROM *PREFIX*preferences' );
$result = $query->execute();
$users = array();
*/
public static function getApps( $user ){
// No need for more comments
- $query = OC_DB::prepare( 'SELECT DISTINCT( `appid` ) FROM `*PREFIX*preferences` WHERE `userid` = ?' );
+ $query = OC_DB::prepare( 'SELECT DISTINCT( appid ) FROM *PREFIX*preferences WHERE userid = ?' );
$result = $query->execute( array( $user ));
$apps = array();
*/
public static function getKeys( $user, $app ){
// No need for more comments
- $query = OC_DB::prepare( 'SELECT `key` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?' );
+ $query = OC_DB::prepare( 'SELECT configkey FROM *PREFIX*preferences WHERE userid = ? AND appid = ?' );
$result = $query->execute( array( $user, $app ));
$keys = array();
while( $row = $result->fetchRow()){
- $keys[] = $row["key"];
+ $keys[] = $row["configkey"];
}
return $keys;
*/
public static function getValue( $user, $app, $key, $default = null ){
// Try to fetch the value, return default if not exists.
- $query = OC_DB::prepare( 'SELECT `value` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `key` = ?' );
+ $query = OC_DB::prepare( 'SELECT configvalue FROM *PREFIX*preferences WHERE userid = ? AND appid = ? AND configkey = ?' );
$result = $query->execute( array( $user, $app, $key ));
if( !$result->numRows()){
$row = $result->fetchRow();
- return $row["value"];
+ return $row["configvalue"];
}
/**
// null: does not exist. Insert.
if( is_null( $exists )){
- $query = OC_DB::prepare( 'INSERT INTO `*PREFIX*preferences` ( `userid`, `appid`, `key`, `value` ) VALUES( ?, ?, ?, ? )' );
+ $query = OC_DB::prepare( 'INSERT INTO *PREFIX*preferences ( userid, appid, configkey, configvalue ) VALUES( ?, ?, ?, ? )' );
$query->execute( array( $user, $app, $key, $value ));
}
else{
- $query = OC_DB::prepare( 'UPDATE `*PREFIX*preferences` SET `value` = ? WHERE `userid` = ? AND `appid` = ? AND `key` = ?' );
+ $query = OC_DB::prepare( 'UPDATE *PREFIX*preferences SET configvalue = ? WHERE userid = ? AND appid = ? AND configkey = ?' );
$query->execute( array( $value, $user, $app, $key ));
}
}
*/
public static function deleteKey( $user, $app, $key ){
// No need for more comments
- $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `key` = ?' );
+ $query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE userid = ? AND appid = ? AND configkey = ?' );
$result = $query->execute( array( $user, $app, $key ));
return true;
*/
public static function deleteApp( $user, $app ){
// No need for more comments
- $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?' );
+ $query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE userid = ? AND appid = ?' );
$result = $query->execute( array( $user, $app ));
return true;
*/
public static function deleteUser( $user ){
// No need for more comments
- $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `userid` = ?' );
+ $query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE userid = ?' );
$result = $query->execute( array( $user ));
return true;
*/
public static function deleteAppFromAllUsers( $app ){
// No need for more comments
- $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `appid` = ?' );
+ $query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE appid = ?' );
$result = $query->execute( array( $app ));
return true;