Merge branch 'master' of github.com:owncloud/apps

3 files changed, 16 insertions, 17 deletions

diff --git a/user_saml/appinfo/app.php b/user_saml/appinfo/app.php
index edaffda3c..05d82aa73 100644
--- a/user_saml/appinfo/app.php
+++ b/user_saml/appinfo/app.php
@@ -24,20 +24,20 @@
 
 if (OCP\App::isEnabled('user_saml')) {
 
-	require_once 'apps/user_saml/user_saml.php';
+	require_once 'user_saml/user_saml.php';
 
 	OCP\App::registerAdmin('user_saml', 'settings');
 
 	// register user backend
 	OC_User::useBackend( 'SAML' );
 
-	OC::$CLASSPATH['OC_USER_SAML_Hooks'] = 'apps/user_saml/lib/hooks.php';
+	OC::$CLASSPATH['OC_USER_SAML_Hooks'] = 'user_saml/lib/hooks.php';
 	OCP\Util::connectHook('OC_User', 'post_login', 'OC_USER_SAML_Hooks', 'post_login');
 	OCP\Util::connectHook('OC_User', 'logout', 'OC_USER_SAML_Hooks', 'logout');
 
 	if( isset($_GET['app']) && $_GET['app'] == 'user_saml' ) {
 
-		require_once 'apps/user_saml/auth.php';
+		require_once 'user_saml/auth.php';
 
 		if (!OC_User::login('', '')) {
 			$error = true;
diff --git a/user_saml/appinfo/info.xml b/user_saml/appinfo/info.xml
index e7f5c4182..ac5b8ba4c 100644
--- a/user_saml/appinfo/info.xml
+++ b/user_saml/appinfo/info.xml
@@ -5,8 +5,7 @@
 	<description>Authenticate Users by SAML</description>
 	<licence>AGPL</licence>
 	<author>Sixto Martin @ Yaco Sistemas</author>
-	<require>4.9</require>
-	<shipped>true</shipped>
+	<require>4.93</require>
 	<types>
         <prelogin/>
         <authentication/>
diff --git a/user_saml/templates/settings.php b/user_saml/templates/settings.php
index 249847c2a..9e1674488 100644
--- a/user_saml/templates/settings.php
+++ b/user_saml/templates/settings.php
@@ -3,23 +3,23 @@
 
 <form id="saml" action="#" method="post">
 	<div id="samlSettings" class="personalblock">
-    <strong><?php echo $l->t('SAML Authentication backend');?></strong>
+    <strong><?php p($l->t('SAML Authentication backend'));?></strong>
 	<ul>
-		<li><a href="#samlSettings-1"><?php echo $l->t('Basic');?></a></li>
-        <li><a href="#samlSettings-2"><?php echo $l->t('Mapping');?></a></li>
+		<li><a href="#samlSettings-1"><?php p($l->t('Basic'));?></a></li>
+        <li><a href="#samlSettings-2"><?php p($l->t('Mapping'));?></a></li>
 	</ul>
 	<fieldset id="samlSettings-1">
-		<p><label for="saml_ssp_path"><?php echo $l->t('SimpleSAMLphp path');?></label><input type="text" id="saml_ssp_path" name="saml_ssp_path" value="<?php echo $_['saml_ssp_path']; ?>"></p>
-        <p><label for="saml_sp_source"><?php echo $l->t('SimpleSAMLphp SP source');?></label><input type="text" id="saml_sp_source" name="saml_sp_source" value="<?php echo $_['saml_sp_source']; ?>"></p>
-	<p><label for="saml_autocreate"><?php echo $l->t('Autocreate user after saml login?');?></label><input type="checkbox" id="saml_autocreate" name="saml_autocreate" <?php echo (($_['saml_autocreate'] != false) ? 'checked="checked"' : ''); ?>></p>
-	<p><label for="saml_update_user_data"><?php echo $l->t('Update user data after login?');?></label><input type="checkbox" id="saml_update_user_data" name="saml_update_user_data" <?php echo (($_['saml_update_user_data'] != false) ? 'checked="checked"' : ''); ?>></p>
-	<p><label for="saml_protected_groups"><?php echo $l->t('Groups that will not be unlinked from the user when sync the IdP and the owncloud');?></label><input type="text" id="saml_protected_groups" name="saml_protected_groups" value="<?php echo $_['saml_protected_groups']; ?>" /></p> <?php echo $l->t('(protected grop are multivalued, use comma to separate the values)'); ?>
-        <p><label for="saml_default_group"><?php echo $l->t('Default group when autocreating users and not group data found for the user');?></label><input type="text" id="saml_default_group" name="saml_default_group" value="<?php echo $_['saml_default_group']; ?>"></p>
+		<p><label for="saml_ssp_path"><?php p($l->t('SimpleSAMLphp path'));?></label><input type="text" id="saml_ssp_path" name="saml_ssp_path" value="<?php p($_['saml_ssp_path']); ?>"></p>
+        <p><label for="saml_sp_source"><?php p($l->t('SimpleSAMLphp SP source'));?></label><input type="text" id="saml_sp_source" name="saml_sp_source" value="<?php p($_['saml_sp_source']); ?>"></p>
+	<p><label for="saml_autocreate"><?php p($l->t('Autocreate user after saml login?'));?></label><input type="checkbox" id="saml_autocreate" name="saml_autocreate" <?php p((($_['saml_autocreate'] != false) ? 'checked="checked"' : '')); ?>></p>
+	<p><label for="saml_update_user_data"><?php p($l->t('Update user data after login?'));?></label><input type="checkbox" id="saml_update_user_data" name="saml_update_user_data" <?php p((($_['saml_update_user_data'] != false) ? 'checked="checked"' : '')); ?>></p>
+	<p><label for="saml_protected_groups"><?php p($l->t('Groups that will not be unlinked from the user when sync the IdP and the owncloud'));?></label><input type="text" id="saml_protected_groups" name="saml_protected_groups" value="<?php p($_['saml_protected_groups']); ?>" /></p> <?php p($l->t('(protected grop are multivalued, use comma to separate the values)')); ?>
+        <p><label for="saml_default_group"><?php p($l->t('Default group when autocreating users and not group data found for the user'));?></label><input type="text" id="saml_default_group" name="saml_default_group" value="<?php p($_['saml_default_group']); ?>"></p>
 	</fieldset>
 	<fieldset id="samlSettings-2">
-		<p><label for="saml_username_mapping"><?php echo $l->t('Username');?></label><input type="text" id="saml_username_mapping" name="saml_username_mapping" value="<?php echo $_['saml_username_mapping']; ?>" /></p>
-		<p><label for="saml_email_mapping"><?php echo $l->t('Email');?></label><input type="text" id="saml_email_mapping" name="saml_email_mapping" value="<?php echo $_['saml_email_mapping']; ?>" /></p>
-		<p><label for="saml_group_mapping"><?php echo $l->t('Group');?></label><input type="text" id="saml_group_mapping" name="saml_group_mapping" value="<?php echo $_['saml_group_mapping']; ?>" /></p>
+		<p><label for="saml_username_mapping"><?php p($l->t('Username'));?></label><input type="text" id="saml_username_mapping" name="saml_username_mapping" value="<?php p($_['saml_username_mapping']); ?>" /></p>
+		<p><label for="saml_email_mapping"><?php p($l->t('Email'));?></label><input type="text" id="saml_email_mapping" name="saml_email_mapping" value="<?php p($_['saml_email_mapping']); ?>" /></p>
+		<p><label for="saml_group_mapping"><?php p($l->t('Group'));?></label><input type="text" id="saml_group_mapping" name="saml_group_mapping" value="<?php p($_['saml_group_mapping']); ?>" /></p>
 	</fieldset>
 	<input type="submit" value="Save" />
 	</div>