FbIN/htmly
1
0
Fork 0
mirror of https://github.com/danpros/htmly.git synced 2026-04-19 20:16:22 +05:30
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #658 from bttrx/patch-4

Browse source 
Fixes i18n and unordered list; Provides i18n for feed error messages by @bttrx
This commit is contained in:
Dan 2023-12-10 07:46:38 +07:00 • committed by GitHub
commit 38533939d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
system/admin/admin.php
View file

@ -44,7 +44,7 @@ function session($user, $pass)
{
$user_file = 'config/users/' . $user . '.ini';
if (!file_exists($user_file)) {
return $str = '<div class="error-message"><ul><li class="alert alert-danger">' . i18n('Invalid_Error') . '</li></li></div>';
return $str = '<div class="error-message"><ul><li class="alert alert-danger">' . i18n('Invalid_Error') . '</li></ul></div>';
}
$user_enc = user('encryption', $user);
@ -60,7 +60,7 @@ function session($user, $pass)
$_SESSION[config("site.url")]['user'] = $user;
header('location: admin');
} else {
return $str = '<div class="error-message"><ul><li class="alert alert-danger">ERROR: Invalid username or password.</li></li></div>';
return $str = '<div class="error-message"><ul><li class="alert alert-danger">' . i18n('Invalid_Error') . '</li></ul></div>';
}
} else if (old_password_verify($pass, $user_enc, $user_pass)) {
if (session_status() == PHP_SESSION_NONE) session_start();
@ -68,7 +68,7 @@ function session($user, $pass)
$_SESSION[config("site.url")]['user'] = $user;
header('location: admin');
} else {
return $str = '<div class="error-message"><ul><li class="alert alert-danger">ERROR: Invalid username or password.</li></li></div>';
return $str = '<div class="error-message"><ul><li class="alert alert-danger">' . i18n('Invalid_Error') . '</li></ul></div>';
}
}
@ -854,7 +854,7 @@ function get_feed($feed_url, $credit)
} elseif (!empty($descriptionB)) {
$content = preg_replace('#<br\s*/?>#i', "\n", $descriptionB);
} else {
return $str = '<li>Can not read the feed content.</li>';
return $str = '<li>' . i18n('Cannot_read_feed_content') . '</li>';
}
$time = new DateTime($entry->pubDate);
$timestamp = $time->format("Y-m-d H:i:s");
@ -872,7 +872,7 @@ function get_feed($feed_url, $credit)
migrate($title, $time, $tags, $content, $url, $user, $source);
}
} else {
return $str = '<li>Unsupported feed.</li>';
return $str = '<li>' . i18n('Unknown_feed_format') . '</li>';
}
}
@ -1002,4 +1002,4 @@ function replace_key($arr, $oldkey, $newkey) {
return array_combine($keys, $arr);
}
return $arr;
}
}