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

Fix indentation style

This commit is contained in:
Bart Visscher 2013-02-09 17:27:57 +01:00
parent 5c4a804ddb
commit d3ef967993
7 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_trashbin/lib/trash.php
View File

@ -349,7 +349,7 @@ class Trashbin {
$versionsName = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($filename); $versionsName = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($filename);
$versions = array(); $versions = array();
if ($timestamp ) { if ($timestamp ) {
// fetch for old versions // fetch for old versions
$matches = glob( $versionsName.'.v*.d'.$timestamp ); $matches = glob( $versionsName.'.v*.d'.$timestamp );
$offset = -strlen($timestamp)-2; $offset = -strlen($timestamp)-2;
} else { } else {

4
core/templates/exception.php
View File

@ -20,11 +20,11 @@
echo 'Request Method: ' . $_['sysinfo']['requestmethod'] . "\n"; echo 'Request Method: ' . $_['sysinfo']['requestmethod'] . "\n";
echo 'Database: ' . $_['sysinfo']['database'] . "\n"; echo 'Database: ' . $_['sysinfo']['database'] . "\n";
echo '</textarea>'; echo '</textarea>';
}else{ } else {
echo 'Your administrator has disabled systeminformations.'; echo 'Your administrator has disabled systeminformations.';
} }
?> ?>
</p> </p>
</details> </details>
</li> </li>
</ul> </ul>

38
lib/app.php
View File

@ -76,14 +76,14 @@ class OC_App{
&& empty(OC_Util::$core_scripts) && empty(OC_Util::$core_scripts)
&& empty(OC_Util::$core_styles)) { && empty(OC_Util::$core_styles)) {
OC_Util::$core_scripts = OC_Util::$scripts; OC_Util::$core_scripts = OC_Util::$scripts;
OC_Util::$scripts = array(); OC_Util::$scripts = array();
OC_Util::$core_styles = OC_Util::$styles; OC_Util::$core_styles = OC_Util::$styles;
OC_Util::$styles = array(); OC_Util::$styles = array();
}
} }
}
// return // return
return true; return true;
} }
/** /**
* load a single app * load a single app
@ -557,16 +557,16 @@ class OC_App{
$forms=array(); $forms=array();
switch($type) { switch($type) {
case 'settings': case 'settings':
$source=self::$settingsForms; $source=self::$settingsForms;
break; break;
case 'admin': case 'admin':
$source=self::$adminForms; $source=self::$adminForms;
break; break;
case 'personal': case 'personal':
$source=self::$personalForms; $source=self::$personalForms;
break; break;
default: default:
return array(); return array();
} }
foreach($source as $form) { foreach($source as $form) {
$forms[]=include $form; $forms[]=include $form;
@ -694,15 +694,15 @@ class OC_App{
// OR $app['ocs_id'] == $remote['ocs_id'] // OR $app['ocs_id'] == $remote['ocs_id']
) { ) {
unset( $remoteApps[$key]); unset( $remoteApps[$key]);
}
} }
} }
$combinedApps = array_merge( $appList, $remoteApps );
} else {
$combinedApps = $appList;
} }
$combinedApps = array_merge( $appList, $remoteApps ); return $combinedApps;
} else { }
$combinedApps = $appList;
}
return $combinedApps;
}
/** /**
* @brief: get a list of all apps on apps.owncloud.com * @brief: get a list of all apps on apps.owncloud.com

2
lib/files/storage/common.php
View File

@ -132,7 +132,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
//$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV //$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
if ( $empty == false ) { if ( $empty == false ) {
if ( !$this->rmdir( $directory ) ) { if ( !$this->rmdir( $directory ) ) {
return false; return false;
} }
} }
return true; return true;

2
lib/migrate.php
View File

@ -181,7 +181,7 @@ class OC_Migrate{
return json_encode( array( 'success' => false ) ); return json_encode( array( 'success' => false ) );
} }
return json_encode( array( 'success' => true, 'data' => self::$zippath ) ); return json_encode( array( 'success' => true, 'data' => self::$zippath ) );
} }
/** /**
* @brief imports a user, or owncloud instance * @brief imports a user, or owncloud instance

2
lib/ocs.php
View File

@ -173,7 +173,7 @@ class OC_OCS {
} }
} }
xmlwriter_end_element($writer); xmlwriter_end_element($writer);
} }
xmlwriter_end_element($writer); xmlwriter_end_element($writer);
}elseif($dimension=='3') { }elseif($dimension=='3') {

20
lib/public/iaddressbook.php
View File

@ -43,22 +43,22 @@ namespace OCP {
* @return array of contacts which are arrays of key-value-pairs * @return array of contacts which are arrays of key-value-pairs
*/ */
public function search($pattern, $searchProperties, $options); public function search($pattern, $searchProperties, $options);
// // dummy results // // dummy results
// return array( // return array(
// array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'), // array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),
// array('id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => array('d@e.f', 'g@h.i')), // array('id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => array('d@e.f', 'g@h.i')),
// ); // );
/** /**
* @param array $properties this array if key-value-pairs defines a contact * @param array $properties this array if key-value-pairs defines a contact
* @return array representing the contact just created or updated * @return array representing the contact just created or updated
*/ */
public function createOrUpdate($properties); public function createOrUpdate($properties);
// // dummy // // dummy
// return array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', // return array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c',
// 'PHOTO' => 'VALUE=uri:http://www.abc.com/pub/photos/jqpublic.gif', // 'PHOTO' => 'VALUE=uri:http://www.abc.com/pub/photos/jqpublic.gif',
// 'ADR' => ';;123 Main Street;Any Town;CA;91921-1234' // 'ADR' => ';;123 Main Street;Any Town;CA;91921-1234'
// ); // );
/** /**
* @return mixed * @return mixed