upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #76 from fmms/master

Browse source 
checkstyle: some more cleanups
This commit is contained in:
Lukas Reschke 2012-10-23 23:48:27 -07:00
commit a7eb56c799
6 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/index.php
View file

@ -87,7 +87,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
$freeSpace=OC_Filesystem::free_space($dir);
$freeSpace=max($freeSpace,0);
$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
$permissions = OCP\Share::PERMISSION_READ;
if (OC_Filesystem::isUpdatable($dir.'/')) {

2
apps/files_sharing/templates/public.php
View file

@ -19,7 +19,7 @@
<?php if (isset($_['folder'])): ?>
<?php echo $_['folder']; ?>
<?php else: ?>
<?php if (substr($_['mimetype'], 0 , strpos($_['mimetype'], '/')) == 'image'): ?>
<?php if (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'image'): ?>
<div id="imgframe">
<img src="<?php echo $_['downloadURL']; ?>" />
</div>

2
apps/user_webdavauth/user_webdavauth.php
View file

@ -51,7 +51,7 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
$url= 'http://'.urlencode($uid).':'.urlencode($password).'@'.$this->webdavauth_url;
$headers = get_headers($url);
if($headers==false) {
OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$this->webdavauth_url.'" ' ,3);
OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$this->webdavauth_url.'" ', 3);
return false;
}

2
index.php
View file

@ -21,7 +21,7 @@
*
*/
$RUNTIME_NOAPPS = TRUE; //no apps, yet
$RUNTIME_NOAPPS = true; //no apps, yet
require_once 'lib/base.php';

7
lib/app.php
View file

@ -549,17 +549,14 @@ class OC_App{
foreach ( OC::$APPSROOTS as $apps_dir ) {
if(! is_readable($apps_dir['path'])) {
OC_Log::write('core', 'unable to read app folder : ' .$apps_dir['path'] , OC_Log::WARN);
OC_Log::write('core', 'unable to read app folder : ' .$apps_dir['path'], OC_Log::WARN);
continue;
}
$dh = opendir( $apps_dir['path'] );
while( $file = readdir( $dh ) ) {
if (
$file[0] != '.'
and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php' )
) {
if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) {
$apps[] = $file;

6
lib/ocsclient.php
View file

@ -80,7 +80,7 @@ class OC_OCSClient{
}
$url=OC_OCSClient::getAppStoreURL().'/content/categories';
$xml=OC_OCSClient::getOCSresponse($url);
if($xml==FALSE) {
if($xml==false) {
return null;
}
$data=simplexml_load_string($xml);
@ -122,8 +122,8 @@ class OC_OCSClient{
$apps=array();
$xml=OC_OCSClient::getOCSresponse($url);
if($xml==FALSE) {
return NULL;
if($xml==false) {
return null;
}
$data=simplexml_load_string($xml);