[Pkg-owncloud-commits] [owncloud] 72/73: backport fix admin check
David Prévot
taffit at alioth.debian.org
Fri Nov 8 23:09:15 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag v4.0.10
in repository owncloud.
commit 8e4b301e0a75a27fcbbd0b1a1a602e0a8c66f882
Author: Frank Karlitschek <frank at owncloud.org>
Date: Mon Dec 17 15:33:45 2012 +0100
backport fix admin check
---
apps/files_encryption/settings.php | 2 ++
apps/user_ldap/settings.php | 3 +++
apps/user_migrate/settings.php | 5 ++++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
index 0a0d4d1..8594cfc 100644
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@@ -6,6 +6,8 @@
* See the COPYING-README file.
*/
+OC_Util::checkAdminUser();
+
$tmpl = new OCP\Template( 'files_encryption', 'settings');
$blackList=explode(',',OCP\Config::getAppValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
$enabled=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true');
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 0c29e70..f77fb0a 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -20,6 +20,9 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
+
+OC_Util::checkAdminUser();
+
$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute');
OCP\Util::addscript('user_ldap', 'settings');
diff --git a/apps/user_migrate/settings.php b/apps/user_migrate/settings.php
index 098927f..4772c27 100644
--- a/apps/user_migrate/settings.php
+++ b/apps/user_migrate/settings.php
@@ -22,6 +22,9 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
+
+OC_Util::checkLoggedIn();
+
OCP\App::checkAppEnabled('user_migrate');
if (isset($_POST['user_import'])) {
$root = OC::$SERVERROOT . "/";
@@ -86,4 +89,4 @@ if (isset($_POST['user_import'])) {
// fill template
$tmpl = new OCP\Template('user_migrate', 'settings');
return $tmpl->fetchPage();
-}
\ No newline at end of file
+}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list