diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-17 11:53:51 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-17 11:53:51 -0800 |
| commit | 8e76a98d2f2382f3ed958d9741953906e316c9e2 (patch) | |
| tree | c9eb6034e212bf83707b9281b58f5e2a1654e879 /apps/files_external | |
| parent | 55d6b963485f7fdeb315fa186061e18ff07ec88d (diff) | |
| parent | 6c197227d06d03403f335dbc23463ebf4b5f98a6 (diff) | |
| download | nextcloud-server-8e76a98d2f2382f3ed958d9741953906e316c9e2.tar.gz nextcloud-server-8e76a98d2f2382f3ed958d9741953906e316c9e2.zip | |
Merge pull request #1709 from owncloud/style-cleanup-files_external
Style cleanup files_external
Diffstat (limited to 'apps/files_external')
| -rwxr-xr-x | apps/files_external/lib/config.php | 16 | ||||
| -rw-r--r-- | apps/files_external/lib/sftp.php | 5 |
2 files changed, 15 insertions, 6 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 44e668a09c0..a3d1da68845 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -310,7 +310,9 @@ class OC_Mount_Config { foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) { $content .= "\t\t'".$group."' => array (\n"; foreach ($mounts as $mountPoint => $mount) { - $content .= "\t\t\t'".addcslashes($mountPoint, "'")."' => ".str_replace("\n", '', var_export($mount, true)).", \n"; + $content .= "\t\t\t'".addcslashes($mountPoint, "'") + ."' => " + .str_replace("\n", '', var_export($mount, true)).", \n"; } $content .= "\t\t),\n"; @@ -322,7 +324,9 @@ class OC_Mount_Config { foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) { $content .= "\t\t'".$user."' => array (\n"; foreach ($mounts as $mountPoint => $mount) { - $content .= "\t\t\t'".addcslashes($mountPoint, "'")."' => ".str_replace("\n", '', var_export($mount, true)).",\n"; + $content .= "\t\t\t'".addcslashes($mountPoint, "'") + ."' => " + .str_replace("\n", '', var_export($mount, true)).",\n"; } $content .= "\t\t),\n"; } @@ -410,8 +414,12 @@ class OC_Mount_Config { public static function checkDependencies() { $l= new OC_L10N('files_external'); $txt=''; - if(!OC_Mount_Config::checksmbclient()) $txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />'; - if(!OC_Mount_Config::checkphpftp()) $txt.=$l->t('<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.').'<br />'; + if(!OC_Mount_Config::checksmbclient()) { + $txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />'; + } + if(!OC_Mount_Config::checkphpftp()) { + $txt.=$l->t('<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.').'<br />'; + } return($txt); } diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php index 551a5a64ef2..3527f50ec98 100644 --- a/apps/files_external/lib/sftp.php +++ b/apps/files_external/lib/sftp.php @@ -7,8 +7,9 @@ */ namespace OC\Files\Storage; -set_include_path(get_include_path() . PATH_SEPARATOR . \OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib'); -require('Net/SFTP.php'); +set_include_path(get_include_path() . PATH_SEPARATOR . + \OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib'); +require 'Net/SFTP.php'; class SFTP extends \OC\Files\Storage\Common { private $host; |