Jelajahi Sumber

HTTP Auth user

https://github.com/marienfressinaud/FreshRSS/issues/126
Alexandre Alapetite 12 tahun lalu
induk
melakukan
45b2decce0
3 mengubah file dengan 7 tambahan dan 3 penghapusan
  1. 2 2
      app/views/configure/users.phtml
  2. 4 0
      lib/lib_rss.php
  3. 1 1
      p/i/install.php

+ 2 - 2
app/views/configure/users.phtml

@@ -10,7 +10,7 @@
 			<label class="group-name" for="current_user"><?php echo Minz_Translate::t('current_user'); ?></label>
 			<div class="group-controls">
 				<input id="current_user" type="text" disabled="disabled" value="<?php echo Minz_Configuration::currentUser(); ?>" />
-				<code>$_SERVER['REMOTE_USER'] = <?php echo isset($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'] : ''; ?></code>
+				<code>$_SERVER['REMOTE_USER'] = <?php echo httpAuthUser(); ?></code>
 				<label class="checkbox" for="is_admin">
 					<input type="checkbox" id="is_admin" disabled="disabled"<?php echo Minz_Configuration::isAdmin() ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t('is_admin'); ?>
@@ -61,7 +61,7 @@
 			<div class="group-controls">
 				<select id="auth_type" name="auth_type">
 					<option value="none">None (dangerous)</option>
-					<option value="http_auth">HTTP Auth ($_SERVER['REMOTE_USER'])</option>
+					<option value="http_auth">HTTP Auth</option>
 					<option value="persona">Mozilla Persona</option>
 				</select>
 				(selector not implemented yet)

+ 4 - 0
lib/lib_rss.php

@@ -188,3 +188,7 @@ function usernameFromPath($userPath) {
 function listUsers() {
 	return array_map('usernameFromPath', glob(DATA_PATH . '/*_user.php'));
 }
+
+function httpAuthUser() {
+	return isset($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'] : '';
+}

+ 1 - 1
p/i/install.php

@@ -806,7 +806,7 @@ function printStep2 () {
 		<div class="form-group">
 			<label class="group-name" for="default_user"><?php echo _t ('default_user'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="default_user" name="default_user" maxlength="16" value="<?php echo isset ($_SESSION['default_user']) ? $_SESSION['default_user'] : ''; ?>" placeholder="user1" />
+				<input type="text" id="default_user" name="default_user" maxlength="16" value="<?php echo isset ($_SESSION['default_user']) ? $_SESSION['default_user'] : ''; ?>" placeholder="<?php echo httpAuthUser() == '' ? 'user1' : httpAuthUser(); ?>" />
 			</div>
 		</div>