some indention fixes
This commit is contained in:
parent
7967685771
commit
856d9c0b54
|
@ -368,9 +368,6 @@ class OC_DB {
|
|||
if( $definition instanceof MDB2_Schema_Error ){
|
||||
die( $definition->getMessage().': '.$definition->getUserInfo());
|
||||
}
|
||||
// if(OC_Config::getValue('dbtype','sqlite')=='sqlite'){
|
||||
// $definition['overwrite']=true;//always overwrite for sqlite
|
||||
// }
|
||||
$ret=self::$schema->createDatabase( $definition );
|
||||
|
||||
// Die in case something went wrong
|
||||
|
@ -528,7 +525,6 @@ class OC_DB {
|
|||
* @param $file string path to the MDB2 xml db export file
|
||||
*/
|
||||
public static function replaceDB( $file ){
|
||||
|
||||
$apps = OC_App::getAllApps();
|
||||
self::beginTransaction();
|
||||
// Delete the old tables
|
||||
|
|
|
@ -175,10 +175,8 @@ class OC_Helper {
|
|||
*/
|
||||
public static function mimetypeIcon( $mimetype ){
|
||||
$alias=array('application/xml'=>'code/xml');
|
||||
// echo $mimetype;
|
||||
if(isset($alias[$mimetype])){
|
||||
$mimetype=$alias[$mimetype];
|
||||
// echo $mimetype;
|
||||
}
|
||||
// Replace slash with a minus
|
||||
$mimetype = str_replace( "/", "-", $mimetype );
|
||||
|
|
|
@ -66,7 +66,6 @@ class OC_Image {
|
|||
public function __construct($imageref = null) {
|
||||
//OC_Log::write('core',__METHOD__.'(): start', OC_Log::DEBUG);
|
||||
if(!extension_loaded('gd') || !function_exists('gd_info')) {
|
||||
//if(!function_exists('imagecreatefromjpeg')) {
|
||||
OC_Log::write('core',__METHOD__.'(): GD module not installed', OC_Log::ERROR);
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -380,6 +380,4 @@ class OC_Installer{
|
|||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
15
lib/ocs.php
15
lib/ocs.php
|
@ -111,21 +111,6 @@ class OC_OCS {
|
|||
$login = self::readData($method, 'login', 'text');
|
||||
$passwd = self::readData($method, 'password', 'text');
|
||||
OC_OCS::personcheck($format,$login,$passwd);
|
||||
/*
|
||||
} else if ($method == 'post' && $ex[$paracount - 4] == 'v1.php' && $ex[$paracount - 3] == 'person' && $ex[$paracount - 2] == 'add') {
|
||||
if (OC_Group::inGroup(self::checkPassword(), 'admin')) {
|
||||
$login = self::readData($method, 'login', 'text');
|
||||
$password = self::readData($method, 'password', 'text');
|
||||
try {
|
||||
OC_User::createUser($login, $password);
|
||||
echo self::generateXml($format, 'ok', 201, '');
|
||||
} catch (Exception $exception) {
|
||||
echo self::generateXml($format, 'fail', 400, $exception->getMessage());
|
||||
}
|
||||
} else {
|
||||
echo self::generateXml($format, 'fail', 403, 'Permission denied');
|
||||
}
|
||||
*/
|
||||
|
||||
// ACTIVITY
|
||||
// activityget - GET ACTIVITY page,pagesize als urlparameter
|
||||
|
|
|
@ -442,7 +442,6 @@ class OC_Util {
|
|||
* Check if the htaccess file is working by creating a test file in the data directory and trying to access via http
|
||||
*/
|
||||
public static function ishtaccessworking() {
|
||||
|
||||
// testdata
|
||||
$filename='/htaccesstest.txt';
|
||||
$testcontent='testcontent';
|
||||
|
@ -467,13 +466,7 @@ class OC_Util {
|
|||
return(false);
|
||||
}else{
|
||||
return(true);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue