Merge branch 'release-1.4.2' into stable
This commit is contained in:
commit
e05dc0b173
4 changed files with 53 additions and 2 deletions
|
@ -6,6 +6,9 @@
|
||||||
|
|
||||||
- [S] release are always compared to the previous [S] release.
|
- [S] release are always compared to the previous [S] release.
|
||||||
|
|
||||||
|
## Version 1.4.2 (2016-05-18) [S]
|
||||||
|
- [FIX]: Password verification not implemented in RCC login page
|
||||||
|
|
||||||
## Version 1.4.1 (2016-05-18) [S]
|
## Version 1.4.1 (2016-05-18) [S]
|
||||||
- Switch to HTTP Basic Auth for the RCC API
|
- Switch to HTTP Basic Auth for the RCC API
|
||||||
- Store password as hash
|
- Store password as hash
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "rangitaki",
|
"name": "rangitaki",
|
||||||
"version": "1.4.1",
|
"version": "1.4.2",
|
||||||
"description": "A simple PHP blogging engine without any database dependencies",
|
"description": "A simple PHP blogging engine without any database dependencies",
|
||||||
"main": "index.php",
|
"main": "index.php",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
|
@ -106,7 +106,7 @@ if ($config["rcc"]["rcc"] == "on") {
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
} else {
|
} else {
|
||||||
if ($passwd == $password) {
|
if (password_verify($passwd, $password)) {
|
||||||
$_SESSION['login'] = true;
|
$_SESSION['login'] = true;
|
||||||
include_once "./../res/php/BlogListGenerator.php";
|
include_once "./../res/php/BlogListGenerator.php";
|
||||||
?>
|
?>
|
||||||
|
|
48
update-scripts/1-4-1_1-4-2.sh
Executable file
48
update-scripts/1-4-1_1-4-2.sh
Executable file
|
@ -0,0 +1,48 @@
|
||||||
|
#!/bin/bash
|
||||||
|
# Update script for Rangitaki from version 1.4.0 to 1.4.1
|
||||||
|
|
||||||
|
version="1.4.2"
|
||||||
|
new="./rbe-new"
|
||||||
|
|
||||||
|
echo -n "Downloading version $version from GitLab... "
|
||||||
|
git clone -q https://gitlab.com/mmk2410/rangitaki.git "$new"
|
||||||
|
|
||||||
|
if [[ $1 == "--debug" ]]; then
|
||||||
|
cd $new
|
||||||
|
git checkout master
|
||||||
|
cd ../
|
||||||
|
fi
|
||||||
|
echo "done"
|
||||||
|
|
||||||
|
echo -n "Updating RCC... "
|
||||||
|
mv ./rcc/password.php ./
|
||||||
|
rm -rf ./rcc
|
||||||
|
mv $new/rcc ./
|
||||||
|
rm ./rcc/password.php
|
||||||
|
mv ./password.php ./rcc/
|
||||||
|
echo "done"
|
||||||
|
|
||||||
|
echo -n "Updating Changelog... "
|
||||||
|
|
||||||
|
if [ -f ./CHANGELOG.txt ]; then
|
||||||
|
rm CHANGELOG.txt
|
||||||
|
fi
|
||||||
|
|
||||||
|
mv $new/CHANGELOG.md ./
|
||||||
|
echo "done"
|
||||||
|
|
||||||
|
if [[ $1 != "--debug" ]]; then
|
||||||
|
echo -n "Cleaning up... "
|
||||||
|
rm -rf $new
|
||||||
|
echo "done"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -d "./update-scripts" ]; then
|
||||||
|
echo -n "Remove obsolete update scripts folder... "
|
||||||
|
rm -rf "./update-scripts"
|
||||||
|
echo "done"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$version" > ./VERSION
|
||||||
|
|
||||||
|
echo "Your Rangitaki installation is updated to version $version"
|
Reference in a new issue