Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-07 03:07:59 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Compare result are already true/false

Browse Source
This commit is contained in:
Bart Visscher 2013-08-17 12:58:10 +02:00
parent c538ac3081
commit 29b6dd53a0
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/ajax/download.php
View File

@ -39,4 +39,4 @@ if (!is_array($files_list)) {
$files_list = array($files); $files_list = array($files);
} }
OC_Files::get($dir, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); OC_Files::get($dir, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');

2
apps/files/ajax/list.php
View File

@ -10,7 +10,7 @@ OCP\JSON::checkLoggedIn();
// Load the files // Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
$doBreadcrumb = isset( $_GET['breadcrumb'] ) ? true : false; $doBreadcrumb = isset( $_GET['breadcrumb'] );
$data = array(); $data = array();
// Make breadcrumb // Make breadcrumb

2
apps/files_encryption/settings-personal.php
View File

@ -16,7 +16,7 @@ $view = new \OC_FilesystemView('/');
$util = new \OCA\Encryption\Util($view, $user); $util = new \OCA\Encryption\Util($view, $user);
$session = new \OCA\Encryption\Session($view); $session = new \OCA\Encryption\Session($view);
$privateKeySet = ($session->getPrivateKey() !== false) ? true : false; $privateKeySet = $session->getPrivateKey() !== false;
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'); $recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
$recoveryEnabledForUser = $util->recoveryEnabledForUser(); $recoveryEnabledForUser = $util->recoveryEnabledForUser();

2
apps/files_external/lib/amazons3.php
View File

@ -79,7 +79,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$this->bucket = $params['bucket']; $this->bucket = $params['bucket'];
$scheme = ($params['use_ssl'] === 'false') ? 'http' : 'https'; $scheme = ($params['use_ssl'] === 'false') ? 'http' : 'https';
$this->test = ( isset($params['test'])) ? true : false; $this->test = isset($params['test']);
$this->timeout = ( ! isset($params['timeout'])) ? 15 : $params['timeout']; $this->timeout = ( ! isset($params['timeout'])) ? 15 : $params['timeout'];
$params['region'] = ( ! isset($params['region'])) ? 'eu-west-1' : $params['region']; $params['region'] = ( ! isset($params['region'])) ? 'eu-west-1' : $params['region'];
$params['hostname'] = ( !isset($params['hostname'])) ? 's3.amazonaws.com' : $params['hostname']; $params['hostname'] = ( !isset($params['hostname'])) ? 's3.amazonaws.com' : $params['hostname'];

12
apps/files_external/lib/config.php
View File

@ -418,9 +418,9 @@ class OC_Mount_Config {
public static function checksmbclient() { public static function checksmbclient() {
if(function_exists('shell_exec')) { if(function_exists('shell_exec')) {
$output=shell_exec('which smbclient'); $output=shell_exec('which smbclient');
return (empty($output)?false:true); return !empty($output);
}else{ }else{
return(false); return false;
} }
} }
@ -429,9 +429,9 @@ class OC_Mount_Config {
*/ */
public static function checkphpftp() { public static function checkphpftp() {
if(function_exists('ftp_login')) { if(function_exists('ftp_login')) {
return(true); return true;
}else{ }else{
return(false); return false;
} }
} }
@ -439,7 +439,7 @@ class OC_Mount_Config {
* check if curl is installed * check if curl is installed
*/ */
public static function checkcurl() { public static function checkcurl() {
return (function_exists('curl_init')); return function_exists('curl_init');
} }
/** /**
@ -460,6 +460,6 @@ class OC_Mount_Config {
$txt.=$l->t('<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it.').'<br />'; $txt.=$l->t('<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it.').'<br />';
} }
return($txt); return $txt;
} }
} }

2
apps/files_external/lib/sftp.php
View File

@ -170,7 +170,7 @@ class SFTP extends \OC\Files\Storage\Common {
public function file_exists($path) { public function file_exists($path) {
try { try {
return $this->client->stat($this->abs_path($path)) === false ? false : true; return $this->client->stat($this->abs_path($path)) !== false;
} catch (\Exception $e) { } catch (\Exception $e) {
return false; return false;
} }

6
apps/files_sharing/public.php
View File

@ -112,9 +112,9 @@ if (isset($path)) {
if ($files_list === NULL ) { if ($files_list === NULL ) {
$files_list = array($files); $files_list = array($files);
} }
OC_Files::get($path, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); OC_Files::get($path, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
} else { } else {
OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD');
} }
exit(); exit();
} else { } else {
@ -133,7 +133,7 @@ if (isset($path)) {
$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path)); $tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
$tmpl->assign('fileTarget', basename($linkItem['file_target'])); $tmpl->assign('fileTarget', basename($linkItem['file_target']));
$tmpl->assign('dirToken', $linkItem['token']); $tmpl->assign('dirToken', $linkItem['token']);
$allowPublicUploadEnabled = (($linkItem['permissions'] & OCP\PERMISSION_CREATE) ? true : false ); $allowPublicUploadEnabled = ($linkItem['permissions'] & OCP\PERMISSION_CREATE) !== 0;
if (\OCP\App::isEnabled('files_encryption')) { if (\OCP\App::isEnabled('files_encryption')) {
$allowPublicUploadEnabled = false; $allowPublicUploadEnabled = false;
} }

2
settings/admin.php
View File

@ -18,7 +18,7 @@ $forms=OC_App::getForms('admin');
$htaccessworking=OC_Util::ishtaccessworking(); $htaccessworking=OC_Util::ishtaccessworking();
$entries=OC_Log_Owncloud::getEntries(3); $entries=OC_Log_Owncloud::getEntries(3);
$entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false; $entriesremain=count(OC_Log_Owncloud::getEntries(4)) > 3;
$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 )); $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
$tmpl->assign('entries', $entries); $tmpl->assign('entries', $entries);

2
settings/ajax/getlog.php
View File

@ -16,6 +16,6 @@ $data = array();
OC_JSON::success( OC_JSON::success(
array( array(
"data" => $entries, "data" => $entries,
"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $count)) !== 0) ? true : false "remain"=>count(OC_Log_Owncloud::getEntries(1, $offset + $count)) !== 0
) )
); );