Merge branch 'master' of gitorious.org:owncloud/owncloud

apps/contacts/css/contacts.css

@@ -91,7 +91,7 @@ dl.addresscard .action { float: right; }
 
 #file_upload_form { width: 0; height: 0; }
 #file_upload_target, #import_upload_target, #crop_target { display:none; }
-#file_upload_start, #import_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1001; /*position:absolute; left:0; top:0;*/ width:0; height:0;}
+#file_upload_start, #import_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1001; width:0; height:0;}
 #import_upload_start { width: 16px; height: 16px; margin: 0 0 0 0; }
 input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .big { font-weight:bold; font-size:1.2em; }

apps/files/css/files.css

@@ -28,7 +28,7 @@
 
 .file_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;}
 .file_upload_filename.active { border-bottom-right-radius:0 }
-.file_upload_filename { position: relative; z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; }
+.file_upload_filename { z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; }
 .file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 
 #upload { position:absolute; right:13.5em; top:0em; }

apps/user_ldap/appinfo/info.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <info>
 	<id>user_ldap</id>
-	<name>LDAP user backend</name>
+	<name>LDAP user and group backend</name>
 	<description>Authenticate Users by LDAP</description>
 	<licence>AGPL</licence>
 	<author>Dominik Schmidt and Arthur Schiwon</author>

apps/user_ldap/appinfo/install.php

@@ -0,0 +1,6 @@
+<?php
+
+$state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet');
+if($state == 'doSet'){
+	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
+}

apps/user_ldap/appinfo/update.php

@@ -12,22 +12,25 @@ if(!is_null($pw)) {
 
 //detect if we can switch on naming guidelines. We won't do it on conflicts.
 //it's a bit spaghetti, but hey.
-$sqlCleanMap = 'DELETE FROM *PREFIX*ldap_user_mapping';
+$state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doCheck');
+if($state == 'doCheck'){
+	$sqlCleanMap = 'DELETE FROM *PREFIX*ldap_user_mapping';
 
-require_once(OC::$APPSROOT.'/apps/user_ldap/lib_ldap.php');
-require_once(OC::$APPSROOT.'/apps/user_ldap/user_ldap.php');
+	require_once(OC::$APPSROOT.'/apps/user_ldap/lib_ldap.php');
+	require_once(OC::$APPSROOT.'/apps/user_ldap/user_ldap.php');
 
-OCP\Config::setSystemValue('ldapIgnoreNamingRules', true);
-$LDAP_USER = new OC_USER_LDAP();
-$users_old = $LDAP_USER->getUsers();
-$query = OCP\DB::prepare($sqlCleanMap);
-$query->execute();
-OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
-OC_LDAP::init(true);
-$users_new = $LDAP_USER->getUsers();
-$query = OCP\DB::prepare($sqlCleanMap);
-$query->execute();
-if($users_old !== $users_new) {
-	//we don't need to check Groups, because they were not supported in 3'
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', true);
+	$LDAP_USER = new OC_USER_LDAP();
+	$users_old = $LDAP_USER->getUsers();
+	$query = OCP\DB::prepare($sqlCleanMap);
+	$query->execute();
+	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
+	OC_LDAP::init(true);
+	$users_new = $LDAP_USER->getUsers();
+	$query = OCP\DB::prepare($sqlCleanMap);
+	$query->execute();
+	if($users_old !== $users_new) {
+		//we don't need to check Groups, because they were not supported in 3'
+		OCP\Config::setSystemValue('ldapIgnoreNamingRules', true);
+	}
 }

apps/user_ldap/appinfo/version

@@ -1 +1 @@
-0.1.92
+0.2

core/templates/login.php

@@ -1,7 +1,7 @@
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
 <form action="index.php" method="post">
 	<fieldset>
-		<?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?>
+		<?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.htmlentities($_['redirect']).'" />'; } ?>
 		<?php if($_['error']): ?>
 			<a href="./core/lostpassword/"><?php echo $l->t('Lost your password?'); ?></a>
 		<?php endif; ?>