mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-06-18 12:28:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'array_replace_recursive' into dev

Browse Source
This commit is contained in:
Alexandre Alapetite
2016-01-26 19:34:56 +01:00
parent 1d4c9d3b3d dfd0b9e935
commit 56a80af242
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/install.php
View File

@@ -130,7 +130,7 @@ function saveStep2() {
$_SESSION['mail_login'] = filter_var(param('mail_login', ''), FILTER_VALIDATE_EMAIL);
$password_plain = param('passwordPlain', false);
if ($password_plain !== false) {
if ($password_plain !== false && cryptAvailable()) {
if (!function_exists('password_hash')) {
include_once(LIB_PATH . '/password_compat.php');
}
@@ -681,10 +681,10 @@ function printStep2() {
}
$auth_type = isset($_SESSION['auth_type']) ? $_SESSION['auth_type'] : '';
?>
<option value="form"<?php echo $auth_type === 'form' || no_auth($auth_type) ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('install.auth.form'); ?></option>
<option value="form"<?php echo $auth_type === 'form' || (no_auth($auth_type) && cryptAvailable()) ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('install.auth.form'); ?></option>
<option value="persona"<?php echo $auth_type === 'persona' ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.persona'); ?></option>
<option value="http_auth"<?php echo $auth_type === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('install.auth.http'); ?>(REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
<option value="none"<?php echo $auth_type === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.none'); ?></option>
<option value="none"<?php echo $auth_type === 'none' || (no_auth($auth_type) && !cryptAvailable()) ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.none'); ?></option>
</select>
</div>
</div>

26
lib/lib_rss.php
View File

@@ -15,20 +15,20 @@ if (!function_exists('json_encode')) {
}
}
if (!function_exists('array_replace_recursive')) {
function array_replace_recursive($array, $array1) { //http://php.net/manual/function.array-replace-recursive.php#92574
function recurse($array, $array1) {
foreach ($array1 as $key => $value) {
if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) {
$array[$key] = array(); //create new key in $array, if it is empty or not an array
}
if (is_array($value)) {
$value = recurse($array[$key], $value); // overwrite the value in the base array
}
$array[$key] = $value;
if (!function_exists('array_replace_recursive')) { //PHP 5.2
function arr_recurse($array, $array1) {
foreach ($array1 as $key => $value) {
if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) {
$array[$key] = array(); //create new key in $array, if it is empty or not an array
}
return $array;
if (is_array($value)) {
$value = arr_recurse($array[$key], $value); // overwrite the value in the base array
}
$array[$key] = $value;
}
return $array;
}
function array_replace_recursive($array, $array1) { //http://php.net/manual/function.array-replace-recursive.php#92574
// handle the arguments, merge one by one
$args = func_get_args();
$array = $args[0];
@@ -37,7 +37,7 @@ if (!function_exists('array_replace_recursive')) {
}
for ($i = 1; $i < count($args); $i++) {
if (is_array($args[$i])) {
$array = recurse($array, $args[$i]);
$array = arr_recurse($array, $args[$i]);
}
}
return $array;