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

only call error_log() if DEBUG is true 

Signed-off-by: Florian Pritz <bluewind@xinu.at>
This commit is contained in:
Florian Pritz 2011-09-22 19:24:32 +02:00
parent 9c550e8e9f
commit 8648e3c43c
19 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/XML/RPC.php vendored
View File

@ -1365,7 +1365,7 @@ class XML_RPC_Message extends XML_RPC_Base
!preg_match('@^HTTP/[0-9\.]+ 10[0-9]([A-Za-z ]+)?[\r\n]+HTTP/[0-9\.]+ 200@', $data)) !preg_match('@^HTTP/[0-9\.]+ 10[0-9]([A-Za-z ]+)?[\r\n]+HTTP/[0-9\.]+ 200@', $data))
{ {
$errstr = substr($data, 0, strpos($data, "\n") - 1); $errstr = substr($data, 0, strpos($data, "\n") - 1);
error_log('HTTP error, got response: ' . $errstr); if(defined("DEBUG") && DEBUG) {error_log('HTTP error, got response: ' . $errstr);}
$r = new XML_RPC_Response(0, $XML_RPC_err['http_error'], $r = new XML_RPC_Response(0, $XML_RPC_err['http_error'],
$XML_RPC_str['http_error'] . ' (' . $XML_RPC_str['http_error'] . ' (' .
$errstr . ')'); $errstr . ')');
@ -1396,7 +1396,7 @@ class XML_RPC_Message extends XML_RPC_Base
xml_error_string(xml_get_error_code($parser_resource)), xml_error_string(xml_get_error_code($parser_resource)),
xml_get_current_line_number($parser_resource)); xml_get_current_line_number($parser_resource));
} }
error_log($errstr); if(defined("DEBUG") && DEBUG) {error_log($errstr);}
$r = new XML_RPC_Response(0, $XML_RPC_err['invalid_return'], $r = new XML_RPC_Response(0, $XML_RPC_err['invalid_return'],
$XML_RPC_str['invalid_return']); $XML_RPC_str['invalid_return']);
xml_parser_free($parser_resource); xml_parser_free($parser_resource);

2
apps/files_publiclink/lib_public.php
View File

@ -14,7 +14,7 @@ class OC_PublicLink{
if( PEAR::isError($result)) { if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />'; $entry = 'DB Error: "'.$result->getMessage().'"<br />';
$entry .= 'Offending command was: '.$result->getDebugInfo().'<br />'; $entry .= 'Offending command was: '.$result->getDebugInfo().'<br />';
error_log( $entry ); if(defined("DEBUG") && DEBUG) {error_log( $entry );}
die( $entry ); die( $entry );
} }
$this->token=$token; $this->token=$token;

4
apps/media/ajax/autoupdate.php
View File

@ -29,9 +29,9 @@ $RUNTIME_NOSETUPFS=true;
require_once('../../../lib/base.php'); require_once('../../../lib/base.php');
error_log($_GET['autoupdate']); if(defined("DEBUG") && DEBUG) {error_log($_GET['autoupdate']);}
$autoUpdate=(isset($_GET['autoupdate']) and $_GET['autoupdate']=='true'); $autoUpdate=(isset($_GET['autoupdate']) and $_GET['autoupdate']=='true');
error_log((integer)$autoUpdate); if(defined("DEBUG") && DEBUG) {error_log((integer)$autoUpdate);}
OC_Preferences::setValue(OC_User::getUser(),'media','autoupdate',(integer)$autoUpdate); OC_Preferences::setValue(OC_User::getUser(),'media','autoupdate',(integer)$autoUpdate);

2
apps/media/lib_ampache.php
View File

@ -195,7 +195,7 @@ class OC_MEDIA_AMPACHE{
$filter=isset($params['filter'])?$params['filter']:''; $filter=isset($params['filter'])?$params['filter']:'';
$exact=isset($params['exact'])?($params['exact']=='true'):false; $exact=isset($params['exact'])?($params['exact']=='true'):false;
$artists=OC_MEDIA_COLLECTION::getArtists($filter,$exact); $artists=OC_MEDIA_COLLECTION::getArtists($filter,$exact);
error_log('artists found: '.print_r($artists,true)); if(defined("DEBUG") && DEBUG) {error_log('artists found: '.print_r($artists,true));}
echo('<root>'); echo('<root>');
foreach($artists as $artist){ foreach($artists as $artist){
self::printArtist($artist); self::printArtist($artist);

2
apps/media/lib_media.php
View File

@ -37,7 +37,7 @@ class OC_MEDIA{
*/ */
public static function loginListener($params){ public static function loginListener($params){
if(isset($_POST['user']) and $_POST['password']){ if(isset($_POST['user']) and $_POST['password']){
error_log('postlogin'); if(defined("DEBUG") && DEBUG) {error_log('postlogin');}
$name=$_POST['user']; $name=$_POST['user'];
$query=OC_DB::prepare("SELECT user_id from *PREFIX*media_users WHERE user_id LIKE ?"); $query=OC_DB::prepare("SELECT user_id from *PREFIX*media_users WHERE user_id LIKE ?");
$uid=$query->execute(array($name))->fetchAll(); $uid=$query->execute(array($name))->fetchAll();

8
apps/media/lib_scanner.php
View File

@ -97,25 +97,25 @@ class OC_MEDIA_SCANNER{
$data=@self::$getID3->analyze($file); $data=@self::$getID3->analyze($file);
getid3_lib::CopyTagsToComments($data); getid3_lib::CopyTagsToComments($data);
if(!isset($data['comments'])){ if(!isset($data['comments'])){
error_log("error reading id3 tags in '$file'"); if(defined("DEBUG") && DEBUG) {error_log("error reading id3 tags in '$file'");}
return; return;
} }
if(!isset($data['comments']['artist'])){ if(!isset($data['comments']['artist'])){
error_log("error reading artist tag in '$file'"); if(defined("DEBUG") && DEBUG) {error_log("error reading artist tag in '$file'");}
$artist='unknown'; $artist='unknown';
}else{ }else{
$artist=stripslashes($data['comments']['artist'][0]); $artist=stripslashes($data['comments']['artist'][0]);
$artist=utf8_encode($artist); $artist=utf8_encode($artist);
} }
if(!isset($data['comments']['album'])){ if(!isset($data['comments']['album'])){
error_log("error reading album tag in '$file'"); if(defined("DEBUG") && DEBUG) {error_log("error reading album tag in '$file'");}
$album='unknown'; $album='unknown';
}else{ }else{
$album=stripslashes($data['comments']['album'][0]); $album=stripslashes($data['comments']['album'][0]);
$album=utf8_encode($album); $album=utf8_encode($album);
} }
if(!isset($data['comments']['title'])){ if(!isset($data['comments']['title'])){
error_log("error reading title tag in '$file'"); if(defined("DEBUG") && DEBUG) {error_log("error reading title tag in '$file'");}
$title='unknown'; $title='unknown';
}else{ }else{
$title=stripslashes($data['comments']['title'][0]); $title=stripslashes($data['comments']['title'][0]);

2
apps/media/server/xml.server.php
View File

@ -36,7 +36,7 @@ foreach($arguments as &$argument){
} }
ob_clean(); ob_clean();
if(isset($arguments['action'])){ if(isset($arguments['action'])){
error_log($arguments['action']); if(defined("DEBUG") && DEBUG) {error_log($arguments['action']);}
switch($arguments['action']){ switch($arguments['action']){
case 'url_to_song': case 'url_to_song':
OC_MEDIA_AMPACHE::url_to_song($arguments); OC_MEDIA_AMPACHE::url_to_song($arguments);

8
apps/unhosted/lib_unhosted.php
View File

@ -7,7 +7,7 @@ class OC_UnhostedWeb {
if( PEAR::isError($result)) { if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />'; $entry = 'DB Error: "'.$result->getMessage().'"<br />';
$entry .= 'Offending command was: '.$result->getDebugInfo().'<br />'; $entry .= 'Offending command was: '.$result->getDebugInfo().'<br />';
error_log( $entry ); if(defined("DEBUG") && DEBUG) {error_log( $entry );}
die( $entry ); die( $entry );
} }
$ret = array(); $ret = array();
@ -24,7 +24,7 @@ class OC_UnhostedWeb {
if( PEAR::isError($result)) { if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />'; $entry = 'DB Error: "'.$result->getMessage().'"<br />';
$entry .= 'Offending command was: '.$result->getDebugInfo().'<br />'; $entry .= 'Offending command was: '.$result->getDebugInfo().'<br />';
error_log( $entry ); if(defined("DEBUG") && DEBUG) {error_log( $entry );}
die( $entry ); die( $entry );
} }
$ret = array(); $ret = array();
@ -45,7 +45,7 @@ class OC_UnhostedWeb {
if( PEAR::isError($result)) { if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />'; $entry = 'DB Error: "'.$result->getMessage().'"<br />';
$entry .= 'Offending command was: '.$result->getDebugInfo().'<br />'; $entry .= 'Offending command was: '.$result->getDebugInfo().'<br />';
error_log( $entry ); if(defined("DEBUG") && DEBUG) {error_log( $entry );}
die( $entry ); die( $entry );
} }
} }
@ -56,7 +56,7 @@ class OC_UnhostedWeb {
if( PEAR::isError($result)) { if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />'; $entry = 'DB Error: "'.$result->getMessage().'"<br />';
$entry .= 'Offending command was: '.$result->getDebugInfo().'<br />'; $entry .= 'Offending command was: '.$result->getDebugInfo().'<br />';
error_log( $entry ); if(defined("DEBUG") && DEBUG) {error_log( $entry );}
die( $entry ); die( $entry );
} }
} }

14
apps/user_openid/appinfo/app.php
View File

@ -26,14 +26,14 @@ OC_User::useBackend('openid');
//check for results from openid requests //check for results from openid requests
if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){ if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){
error_log('openid retured'); if(defined("DEBUG") && DEBUG) {error_log('openid retured');}
$openid = new SimpleOpenID; $openid = new SimpleOpenID;
$openid->SetIdentity($_GET['openid_identity']); $openid->SetIdentity($_GET['openid_identity']);
$openid_validation_result = $openid->ValidateWithServer(); $openid_validation_result = $openid->ValidateWithServer();
if ($openid_validation_result == true){ // OK HERE KEY IS VALID if ($openid_validation_result == true){ // OK HERE KEY IS VALID
error_log('auth sucessfull'); if(defined("DEBUG") && DEBUG) {error_log('auth sucessfull');}
$identity=$openid->GetIdentity(); $identity=$openid->GetIdentity();
error_log("auth as $identity"); if(defined("DEBUG") && DEBUG) {error_log("auth as $identity");}
$user=OC_USER_OPENID::findUserForIdentity($identity); $user=OC_USER_OPENID::findUserForIdentity($identity);
if($user){ if($user){
$_SESSION['user_id']=$user; $_SESSION['user_id']=$user;
@ -41,13 +41,13 @@ if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){
} }
}else if($openid->IsError() == true){ // ON THE WAY, WE GOT SOME ERROR }else if($openid->IsError() == true){ // ON THE WAY, WE GOT SOME ERROR
$error = $openid->GetError(); $error = $openid->GetError();
error_log("ERROR CODE: " . $error['code']); if(defined("DEBUG") && DEBUG) {error_log("ERROR CODE: " . $error['code']);}
error_log("ERROR DESCRIPTION: " . $error['description']); if(defined("DEBUG") && DEBUG) {error_log("ERROR DESCRIPTION: " . $error['description']);}
}else{ // Signature Verification Failed }else{ // Signature Verification Failed
error_log("INVALID AUTHORIZATION"); if(defined("DEBUG") && DEBUG) {error_log("INVALID AUTHORIZATION");}
} }
}else if (isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'cancel'){ // User Canceled your Request }else if (isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'cancel'){ // User Canceled your Request
error_log("USER CANCELED REQUEST"); if(defined("DEBUG") && DEBUG) {error_log("USER CANCELED REQUEST");}
return false; return false;
} }

8
apps/user_openid/phpmyid.php
View File

@ -1054,7 +1054,7 @@ function debug ($x, $m = null) {
$x .= "\n"; $x .= "\n";
} }
error_log($x . "\n", 3, $profile['logfile']); if(defined("DEBUG") && DEBUG) {error_log($x . "\n", 3, $profile['logfile']);}
} }
@ -1501,7 +1501,7 @@ function wrap_html ( $message ) {
</body> </body>
</html> </html>
'; ';
error_log($html); if(defined("DEBUG") && DEBUG) {error_log($html);}
echo $html; echo $html;
exit(0); exit(0);
} }
@ -1653,8 +1653,8 @@ $profile['req_url'] = sprintf("%s://%s%s",
// $profile['req_url']=str_replace($incompleteId,$fullId,$profile['req_url']); // $profile['req_url']=str_replace($incompleteId,$fullId,$profile['req_url']);
// } // }
// error_log('inc id: '.$fullId); // if(defined("DEBUG") && DEBUG) {error_log('inc id: '.$fullId);}
// error_log('req url: '.$profile['req_url']); // if(defined("DEBUG") && DEBUG) {error_log('req url: '.$profile['req_url']);}
// Set the default allowance for testing // Set the default allowance for testing
if (! array_key_exists('allow_test', $profile)) if (! array_key_exists('allow_test', $profile))

2
apps/user_openid/user.php
View File

@ -39,7 +39,7 @@ $RUNTIME_NOAPPS=false;
require_once '../../lib/base.php'; require_once '../../lib/base.php';
if(!OC_User::userExists($USERNAME)){ if(!OC_User::userExists($USERNAME)){
error_log($USERNAME.' doesn\'t exist'); if(defined("DEBUG") && DEBUG) {error_log($USERNAME.' doesn\'t exist');}
$USERNAME=''; $USERNAME='';
} }
$IDENTITY=OC_Helper::linkTo( "user_openid", "user.php", null, true ).'/'.$USERNAME; $IDENTITY=OC_Helper::linkTo( "user_openid", "user.php", null, true ).'/'.$USERNAME;

2
config/config.sample.php
View File

@ -1,5 +1,7 @@
<?php <?php
define("DEBUG", true);
$CONFIG = array( $CONFIG = array(
"installed" => false, "installed" => false,
"dbtype" => "sqlite", "dbtype" => "sqlite",

2
files/ajax/newfolder.php
View File

@ -20,7 +20,7 @@ if($foldername == '') {
echo json_encode( array( "status" => "error", "data" => array( "message" => "Empty Foldername" ))); echo json_encode( array( "status" => "error", "data" => array( "message" => "Empty Foldername" )));
exit(); exit();
} }
error_log('try to create ' . $foldername . ' in ' . $dir); if(defined("DEBUG") && DEBUG) {error_log('try to create ' . $foldername . ' in ' . $dir);}
if(OC_Files::newFile($dir, $foldername, 'dir')) { if(OC_Files::newFile($dir, $foldername, 'dir')) {
echo json_encode( array( "status" => "success", "data" => array())); echo json_encode( array( "status" => "success", "data" => array()));
exit(); exit();

4
index.php
View File

@ -55,7 +55,7 @@ elseif(OC_User::isLoggedIn()) {
// remember was checked after last login // remember was checked after last login
elseif(isset($_COOKIE["oc_remember_login"]) && $_COOKIE["oc_remember_login"]) { elseif(isset($_COOKIE["oc_remember_login"]) && $_COOKIE["oc_remember_login"]) {
OC_App::loadApps(); OC_App::loadApps();
error_log("Trying to login from cookie"); if(defined("DEBUG") && DEBUG) {error_log("Trying to login from cookie");}
// confirm credentials in cookie // confirm credentials in cookie
if(OC_User::userExists($_COOKIE['oc_username']) && if(OC_User::userExists($_COOKIE['oc_username']) &&
OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") == $_COOKIE['oc_token']) { OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") == $_COOKIE['oc_token']) {
@ -72,7 +72,7 @@ elseif(isset($_POST["user"]) && isset($_POST['password'])) {
OC_App::loadApps(); OC_App::loadApps();
if(OC_User::login($_POST["user"], $_POST["password"])) { if(OC_User::login($_POST["user"], $_POST["password"])) {
if(!empty($_POST["remember_login"])){ if(!empty($_POST["remember_login"])){
error_log("Setting remember login to cookie"); if(defined("DEBUG") && DEBUG) {error_log("Setting remember login to cookie");}
$token = md5($_POST["user"].time()); $token = md5($_POST["user"].time());
OC_Preferences::setValue($_POST['user'], 'login', 'token', $token); OC_Preferences::setValue($_POST['user'], 'login', 'token', $token);
OC_User::setMagicInCookie($_POST["user"], $token); OC_User::setMagicInCookie($_POST["user"], $token);

8
lib/db.php
View File

@ -92,8 +92,8 @@ class OC_DB {
if( PEAR::isError( self::$DBConnection )){ if( PEAR::isError( self::$DBConnection )){
echo( '<b>can not connect to database, using '.$CONFIG_DBTYPE.'. ('.self::$DBConnection->getUserInfo().')</center>'); echo( '<b>can not connect to database, using '.$CONFIG_DBTYPE.'. ('.self::$DBConnection->getUserInfo().')</center>');
$error = self::$DBConnection->getMessage(); $error = self::$DBConnection->getMessage();
error_log( $error); if(defined("DEBUG") && DEBUG) {error_log( $error);}
error_log( self::$DBConnection->getUserInfo()); if(defined("DEBUG") && DEBUG) {error_log( self::$DBConnection->getUserInfo());}
die( $error ); die( $error );
} }
@ -129,7 +129,7 @@ class OC_DB {
if( PEAR::isError($result)) { if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />'; $entry = 'DB Error: "'.$result->getMessage().'"<br />';
$entry .= 'Offending command was: '.$query.'<br />'; $entry .= 'Offending command was: '.$query.'<br />';
error_log( $entry ); if(defined("DEBUG") && DEBUG) {error_log( $entry );}
die( $entry ); die( $entry );
} }
@ -155,7 +155,7 @@ class OC_DB {
if( PEAR::isError($result)) { if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />'; $entry = 'DB Error: "'.$result->getMessage().'"<br />';
$entry .= 'Offending command was: '.$query.'<br />'; $entry .= 'Offending command was: '.$query.'<br />';
error_log( $entry ); if(defined("DEBUG") && DEBUG) {error_log( $entry );}
die( $entry ); die( $entry );
} }

2
lib/filestorage/local.php
View File

@ -195,7 +195,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
} }
private function delTree($dir) { private function delTree($dir) {
error_log('del'.$dir); if(defined("DEBUG") && DEBUG) {error_log('del'.$dir);}
$dirRelative=$dir; $dirRelative=$dir;
$dir=$this->datadir.$dir; $dir=$this->datadir.$dir;
if (!file_exists($dir)) return true; if (!file_exists($dir)) return true;

6
lib/filesystem.php
View File

@ -286,7 +286,7 @@ class OC_Filesystem{
return self::basicOperation('file_get_contents',$path,array('read')); return self::basicOperation('file_get_contents',$path,array('read'));
} }
static public function file_put_contents($path,$data){ static public function file_put_contents($path,$data){
error_log($data); if(defined("DEBUG") && DEBUG) {error_log($data);}
return self::basicOperation('file_put_contents',$path,array('create','write'),$data); return self::basicOperation('file_put_contents',$path,array('create','write'),$data);
} }
static public function unlink($path){ static public function unlink($path){
@ -393,7 +393,7 @@ class OC_Filesystem{
} }
} }
static public function fromUploadedFile($tmpFile,$path){ static public function fromUploadedFile($tmpFile,$path){
error_log('upload'); if(defined("DEBUG") && DEBUG) {error_log('upload');}
if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::canWrite($path) and $storage=self::getStorage($path)){ if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::canWrite($path) and $storage=self::getStorage($path)){
$run=true; $run=true;
$exists=self::file_exists($path); $exists=self::file_exists($path);
@ -403,7 +403,7 @@ class OC_Filesystem{
if($run){ if($run){
OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path, 'run' => &$run)); OC_Hook::emit( 'OC_Filesystem', 'write', array( 'path' => $path, 'run' => &$run));
} }
error_log('upload2'); if(defined("DEBUG") && DEBUG) {error_log('upload2');}
if($run){ if($run){
$result=$storage->fromUploadedFile($tmpFile,self::getInternalPath($path)); $result=$storage->fromUploadedFile($tmpFile,self::getInternalPath($path));
if(!$exists){ if(!$exists){

16
lib/installer.php
View File

@ -56,7 +56,7 @@ class OC_Installer{
*/ */
public static function installApp( $data = array()){ public static function installApp( $data = array()){
if(!isset($data['source'])){ if(!isset($data['source'])){
error_log("No source specified when installing app"); if(defined("DEBUG") && DEBUG) {error_log("No source specified when installing app");}
return false; return false;
} }
@ -64,13 +64,13 @@ class OC_Installer{
if($data['source']=='http'){ if($data['source']=='http'){
$path=tempnam(sys_get_temp_dir(),'oc_installer_'); $path=tempnam(sys_get_temp_dir(),'oc_installer_');
if(!isset($data['href'])){ if(!isset($data['href'])){
error_log("No href specified when installing app from http"); if(defined("DEBUG") && DEBUG) {error_log("No href specified when installing app from http");}
return false; return false;
} }
copy($data['href'],$path); copy($data['href'],$path);
}else{ }else{
if(!isset($data['path'])){ if(!isset($data['path'])){
error_log("No path specified when installing app from local file"); if(defined("DEBUG") && DEBUG) {error_log("No path specified when installing app from local file");}
return false; return false;
} }
$path=$data['path']; $path=$data['path'];
@ -85,7 +85,7 @@ class OC_Installer{
$zip->extractTo($extractDir); $zip->extractTo($extractDir);
$zip->close(); $zip->close();
} else { } else {
error_log("Failed to open archive when installing app"); if(defined("DEBUG") && DEBUG) {error_log("Failed to open archive when installing app");}
OC_Helper::rmdirr($extractDir); OC_Helper::rmdirr($extractDir);
if($data['source']=='http'){ if($data['source']=='http'){
unlink($path); unlink($path);
@ -95,7 +95,7 @@ class OC_Installer{
//load the info.xml file of the app //load the info.xml file of the app
if(!is_file($extractDir.'/appinfo/info.xml')){ if(!is_file($extractDir.'/appinfo/info.xml')){
error_log("App does not provide an info.xml file"); if(defined("DEBUG") && DEBUG) {error_log("App does not provide an info.xml file");}
OC_Helper::rmdirr($extractDir); OC_Helper::rmdirr($extractDir);
if($data['source']=='http'){ if($data['source']=='http'){
unlink($path); unlink($path);
@ -107,7 +107,7 @@ class OC_Installer{
//check if an app with the same id is already installed //check if an app with the same id is already installed
if(self::isInstalled( $info['id'] )){ if(self::isInstalled( $info['id'] )){
error_log("App already installed"); if(defined("DEBUG") && DEBUG) {error_log("App already installed");}
OC_Helper::rmdirr($extractDir); OC_Helper::rmdirr($extractDir);
if($data['source']=='http'){ if($data['source']=='http'){
unlink($path); unlink($path);
@ -117,7 +117,7 @@ class OC_Installer{
//check if the destination directory already exists //check if the destination directory already exists
if(is_dir($basedir)){ if(is_dir($basedir)){
error_log("App's directory already exists"); if(defined("DEBUG") && DEBUG) {error_log("App's directory already exists");}
OC_Helper::rmdirr($extractDir); OC_Helper::rmdirr($extractDir);
if($data['source']=='http'){ if($data['source']=='http'){
unlink($path); unlink($path);
@ -131,7 +131,7 @@ class OC_Installer{
//copy the app to the correct place //copy the app to the correct place
if(!mkdir($basedir)){ if(!mkdir($basedir)){
error_log('Can\'t create app folder ('.$basedir.')'); if(defined("DEBUG") && DEBUG) {error_log('Can\'t create app folder ('.$basedir.')');}
OC_Helper::rmdirr($extractDir); OC_Helper::rmdirr($extractDir);
if($data['source']=='http'){ if($data['source']=='http'){
unlink($path); unlink($path);

2
lib/preferences.php
View File

@ -140,7 +140,7 @@ class OC_Preferences{
// Check if the key does exist // Check if the key does exist
$query = OC_DB::prepare( 'SELECT configvalue FROM *PREFIX*preferences WHERE userid = ? AND appid = ? AND configkey = ?' ); $query = OC_DB::prepare( 'SELECT configvalue FROM *PREFIX*preferences WHERE userid = ? AND appid = ? AND configkey = ?' );
$values=$query->execute(array($user,$app,$key))->fetchAll(); $values=$query->execute(array($user,$app,$key))->fetchAll();
error_log(print_r($values,true)); if(defined("DEBUG") && DEBUG) {error_log(print_r($values,true));}
$exists=(count($values)>0); $exists=(count($values)>0);
if( !$exists ){ if( !$exists ){