make OC_HOOKS actually work

remotes/origin/stable
Robin Appelman 14 years ago
parent 3e47ce3cef
commit 4c0d6dc9e7
  1. 10
      lib/base.php
  2. 12
      lib/filesystem.php

@ -91,9 +91,9 @@ require_once('plugin.php');
$error=(count(OC_UTIL::checkServer())>0); $error=(count(OC_UTIL::checkServer())>0);
if(!$error){ // if(!$error){ //disable untill plugin system is proper converted to the new code base
OC_PLUGIN::loadPlugins( "" ); // OC_PLUGIN::loadPlugins( "" );
} // }
OC_USER::setBackend( OC_CONFIG::getValue( "userbackend", "database" )); OC_USER::setBackend( OC_CONFIG::getValue( "userbackend", "database" ));
OC_GROUP::setBackend( OC_CONFIG::getValue( "groupbackend", "database" )); OC_GROUP::setBackend( OC_CONFIG::getValue( "groupbackend", "database" ));
@ -191,7 +191,7 @@ class OC_UTIL {
* @return array * @return array
*/ */
public static function getVersion(){ public static function getVersion(){
return array(1,2,0); return array(1,60,0);
} }
/** /**
@ -406,7 +406,7 @@ class OC_HOOK{
} }
// Call all slots // Call all slots
foreach( $registered[$signalclass][$signalname] as $i ){ foreach( self::$registered[$signalclass][$signalname] as $i ){
call_user_func( array( $i["class"], $i["name"] ), $params ); call_user_func( array( $i["class"], $i["name"] ), $params );
} }

@ -194,6 +194,18 @@ class OC_FILESYSTEM{
} }
return $foundMountPoint; return $foundMountPoint;
} }
/**
* return the path to a local version of the file
* we need this because we can't know if a file is stored local or not from outside the filestorage and for some purposes a local file is needed
* @param string path
* @return string
*/
static public function getLocalFile($path){
$parent=substr($path,0,strrpos($path,'/'));
if(self::canRead($parent) and $storage=self::getStorage($path)){
return $storage->getLocalFile(self::getInternalPath($path));
}
}
static public function mkdir($path){ static public function mkdir($path){
$parent=substr($path,0,strrpos($path,'/')); $parent=substr($path,0,strrpos($path,'/'));

Loading…
Cancel
Save