summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/files.js2
-rw-r--r--apps/files/l10n/eu.php1
-rw-r--r--apps/files/l10n/ru.php1
-rw-r--r--apps/files_external/l10n/ca.php2
-rw-r--r--apps/files_external/l10n/cs_CZ.php2
-rw-r--r--apps/files_external/l10n/ru.php2
-rwxr-xr-xapps/files_external/personal.php2
-rw-r--r--apps/files_external/settings.php2
-rw-r--r--apps/files_sharing/public.php2
-rw-r--r--apps/files_versions/history.php4
-rw-r--r--apps/files_versions/templates/history.php4
-rw-r--r--apps/user_ldap/appinfo/app.php3
-rw-r--r--apps/user_ldap/appinfo/info.xml4
-rw-r--r--apps/user_ldap/css/settings.css5
-rw-r--r--apps/user_ldap/lib/access.php26
-rw-r--r--apps/user_ldap/lib/connection.php8
-rw-r--r--apps/user_ldap/templates/settings.php7
-rwxr-xr-xapps/user_webdavauth/appinfo/info.xml4
-rwxr-xr-xapps/user_webdavauth/settings.php6
19 files changed, 58 insertions, 29 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index ece0b29ae16..33c775fc8ec 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -853,7 +853,7 @@ function getMimeIcon(mime, ready){
if(getMimeIcon.cache[mime]){
ready(getMimeIcon.cache[mime]);
}else{
- $.get( OC.filePath('files','ajax','mimeicon.php')+'&mime='+mime, function(path){
+ $.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path){
getMimeIcon.cache[mime]=path;
ready(getMimeIcon.cache[mime]);
});
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 1f1ea6da50b..0b223b93d8c 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"There is no error, the file uploaded with success" => "Ez da arazorik izan, fitxategia ongi igo da",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da",
"The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat baino gehiago ez da igo",
"No file was uploaded" => "Ez da fitxategirik igo",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 5a8f448dc36..4b6d0a8b151 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"There is no error, the file uploaded with success" => "Файл успешно загружен",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Файл превышает размер установленный upload_max_filesize в php.ini:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме",
"The uploaded file was only partially uploaded" => "Файл был загружен не полностью",
"No file was uploaded" => "Файл не был загружен",
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index fc6706381b7..e8a922ca0f9 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Ompliu els camps requerits",
"Please provide a valid Dropbox app key and secret." => "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
"Error configuring Google Drive storage" => "Error en configurar l'emmagatzemament Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Avís:</b> \"smbclient\" no està instal·lat. No es pot muntar la compartició CIFS/SMB. Demaneu a l'administrador del sistema que l'instal·li.",
+"<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." => "<b>Avís:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar la compartició FTP. Demaneu a l'administrador del sistema que l'instal·li.",
"External Storage" => "Emmagatzemament extern",
"Mount point" => "Punt de muntatge",
"Backend" => "Dorsal",
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 8006be1a2f5..9c647fad939 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Vyplňte všechna povinná pole",
"Please provide a valid Dropbox app key and secret." => "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
"Error configuring Google Drive storage" => "Chyba při nastavení úložiště Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován program \"smbclient\". Není možné připojení oddílů CIFS/SMB. Prosím požádejte svého správce systému ať jej nainstaluje.",
+"<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." => "<b>Varování:</b> není nainstalována, nebo povolena, podpora FTP v PHP. Není možné připojení oddílů FTP. Prosím požádejte svého správce systému ať ji nainstaluje.",
"External Storage" => "Externí úložiště",
"Mount point" => "Přípojný bod",
"Backend" => "Podpůrná vrstva",
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index 34d34a18eda..b8b5f5b1cb2 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Заполните все обязательные поля",
"Please provide a valid Dropbox app key and secret." => "Пожалуйста, предоставьте действующий ключ Dropbox и пароль.",
"Error configuring Google Drive storage" => "Ошибка при настройке хранилища Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> \"smbclient\" не установлен. Подключение по CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
+"<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." => "<b>Внимание:</b> Поддержка FTP не включена в PHP. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы включить.",
"External Storage" => "Внешний носитель",
"Mount point" => "Точка монтирования",
"Backend" => "Подсистема",
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 509c2977622..4215b28787e 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -29,6 +29,6 @@ $tmpl = new OCP\Template('files_external', 'settings');
$tmpl->assign('isAdminPage', false, false);
$tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
$tmpl->assign('certs', OC_Mount_Config::getCertificates());
-$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(),false);
+$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(), false);
$tmpl->assign('backends', $backends);
return $tmpl->fetchPage();
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 94222149a38..2f239f7cb95 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -30,6 +30,6 @@ $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
$tmpl->assign('backends', OC_Mount_Config::getBackends());
$tmpl->assign('groups', OC_Group::getGroups());
$tmpl->assign('users', OCP\User::getUsers());
-$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(),false);
+$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(), false);
$tmpl->assign('allowUserMounting', OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes'));
return $tmpl->fetchPage();
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 71c18380a3b..fef0ed8a8c2 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -160,7 +160,7 @@ if ($linkItem) {
exit();
}
}
- $basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files'));
+ $basePath = substr($pathAndUser['path'], strlen('/'.$fileOwner.'/files'));
$path = $basePath;
if (isset($_GET['path'])) {
$path .= $_GET['path'];
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index deff735cedc..d4c278ebd85 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -33,7 +33,7 @@ if ( isset( $_GET['path'] ) ) {
$versions = new OCA_Versions\Storage();
// roll back to old version if button clicked
- if( isset( $_GET['revert'] ) ) {
+ if( isset( $_GET['revert'] ) ) {
if( $versions->rollback( $path, $_GET['revert'] ) ) {
@@ -52,7 +52,7 @@ if ( isset( $_GET['path'] ) ) {
}
// show the history only if there is something to show
- if( OCA_Versions\Storage::isversioned( $path ) ) {
+ if( OCA_Versions\Storage::isversioned( $path ) ) {
$count = 999; //show the newest revisions
$versions = OCA_Versions\Storage::getVersions( $path, $count);
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 854d032da62..cc5a494f19e 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -23,7 +23,9 @@ if( isset( $_['message'] ) ) {
echo ' ';
echo OCP\Util::formatDate( doubleval($v['version']) );
echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />';
- if ( $v['cur'] ) { echo ' (<b>Current</b>)'; }
+ if ( $v['cur'] ) {
+ echo ' (<b>Current</b>)';
+ }
echo '<br /><br />';
}
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 0eec7829a4a..ce3079da0ba 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -42,3 +42,6 @@ $entry = array(
);
OCP\Backgroundjob::addRegularTask('OCA\user_ldap\lib\Jobs', 'updateGroups');
+if(OCP\App::isEnabled('user_webdavauth')) {
+ OCP\Util::writeLog('user_ldap', 'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour', OCP\Util::WARN);
+}
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 30fbf687dbe..a7605775274 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -2,7 +2,9 @@
<info>
<id>user_ldap</id>
<name>LDAP user and group backend</name>
- <description>Authenticate Users by LDAP</description>
+ <description>Authenticate users and groups by LDAP resp. Active Directoy.
+
+ This app is not compatible to the WebDAV user backend.</description>
<licence>AGPL</licence>
<author>Dominik Schmidt and Arthur Schiwon</author>
<require>4.9</require>
diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 30c5c175c9b..f3f41fb2d8b 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -7,4 +7,9 @@
#ldap fieldset input {
width: 70%;
display: inline-block;
+}
+
+.ldapwarning {
+ margin-left: 1.4em;
+ color: #FF3B3B;
} \ No newline at end of file
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 00183ac181b..f888577aedb 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -133,7 +133,7 @@ abstract class Access {
'\"' => '\5c22',
'\#' => '\5c23',
);
- $dn = str_replace(array_keys($replacements),array_values($replacements), $dn);
+ $dn = str_replace(array_keys($replacements), array_values($replacements), $dn);
return $dn;
}
@@ -347,20 +347,20 @@ abstract class Access {
}
private function findMappedGroup($dn) {
- static $query = null;
+ static $query = null;
if(is_null($query)) {
$query = \OCP\DB::prepare('
- SELECT `owncloud_name`
- FROM `'.$this->getMapTable(false).'`
- WHERE `ldap_dn` = ?'
- );
- }
- $res = $query->execute(array($dn))->fetchOne();
- if($res) {
- return $res;
- }
+ SELECT `owncloud_name`
+ FROM `'.$this->getMapTable(false).'`
+ WHERE `ldap_dn` = ?'
+ );
+ }
+ $res = $query->execute(array($dn))->fetchOne();
+ if($res) {
+ return $res;
+ }
return false;
- }
+ }
private function ldap2ownCloudNames($ldapObjects, $isUsers) {
@@ -619,7 +619,7 @@ abstract class Access {
//a) paged search insuccessful, though attempted
//b) no paged search, but limit set
if((!$this->pagedSearchedSuccessful
- && $pagedSearchOK)
+ && $pagedSearchOK)
|| (
!$pagedSearchOK
&& !is_null($limit)
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 687e2692270..b14cdafff89 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -338,11 +338,11 @@ class Connection {
}
$this->ldapConnectionRes = ldap_connect($this->config['ldapHost'], $this->config['ldapPort']);
if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
- if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
- if($this->config['ldapTLS']) {
- ldap_start_tls($this->ldapConnectionRes);
- }
+ if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
+ if($this->config['ldapTLS']) {
+ ldap_start_tls($this->ldapConnectionRes);
}
+ }
}
return $this->bind();
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index d10062c1d9d..8522d2f835c 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -4,6 +4,13 @@
<li><a href="#ldapSettings-1">LDAP Basic</a></li>
<li><a href="#ldapSettings-2">Advanced</a></li>
</ul>
+ <?php if(OCP\App::isEnabled('user_webdavauth')) {
+ echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'</p>';
+ }
+ if(!function_exists('ldap_connect')) {
+ echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>';
+ }
+ ?>
<fieldset id="ldapSettings-1">
<p><label for="ldap_host"><?php echo $l->t('Host');?></label><input type="text" id="ldap_host" name="ldap_host" value="<?php echo $_['ldap_host']; ?>" title="<?php echo $l->t('You can omit the protocol, except you require SSL. Then start with ldaps://');?>"></p>
<p><label for="ldap_base"><?php echo $l->t('Base DN');?></label><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" title="<?php echo $l->t('You can specify Base DN for users and groups in the Advanced tab');?>" /></p>
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
index 0d9f529ed1b..e51f2e9ec4f 100755
--- a/apps/user_webdavauth/appinfo/info.xml
+++ b/apps/user_webdavauth/appinfo/info.xml
@@ -2,7 +2,9 @@
<info>
<id>user_webdavauth</id>
<name>WebDAV user backend</name>
- <description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other webserver to authenticate. It should return http 200 for right credentials and http 401 for wrong ones.</description>
+ <description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other webserver to authenticate. It should return http 200 for right credentials and http 401 for wrong ones.
+
+ This app is not compatible to the LDAP user and group backend.</description>
<licence>AGPL</licence>
<author>Frank Karlitschek</author>
<require>4.9</require>
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
index 497a3385caa..910073c7841 100755
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@@ -23,9 +23,9 @@
if($_POST) {
- if(isset($_POST['webdav_url'])) {
- OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
- }
+ if(isset($_POST['webdav_url'])) {
+ OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
+ }
}
// fill template
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 06:53:26 +0000