Skip to content

Commit

Permalink
2.1.27
Browse files Browse the repository at this point in the history
Fix for #1870, #1872
  • Loading branch information
nilsteampassnet committed Aug 21, 2017
1 parent 7e0875a commit 73b5193
Show file tree
Hide file tree
Showing 59 changed files with 9 additions and 10,065 deletions.
4 changes: 2 additions & 2 deletions admin.php
Expand Up @@ -14,8 +14,8 @@

if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] != 1 ||
!isset($_SESSION['user_id']) || empty($_SESSION['user_id']) ||
!isset($_SESSION['key']) || empty($_SESSION['key']))
{
!isset($_SESSION['key']) || empty($_SESSION['key'])
) {
die('Hacking attempt...');
}

Expand Down
2 changes: 2 additions & 0 deletions changelog.md
Expand Up @@ -6,6 +6,8 @@
Database password is encrypted in settings.php file
PHPMailer library updated to 5.2.23
Configuration variables are not set in SESSION anymore. Now read from tp.config.php file.
#1872 New Admin User login not working -JSON Parse file failure
#1870 Logic issue in headers sending
#1866 CSV import with empty url leads to value 0
#1862 Import from Keepass.xml to Personalfolder no access to Item
#1857 API: Folders created at level 0 instead of correct level
Expand Down
4 changes: 2 additions & 2 deletions index.php
Expand Up @@ -31,7 +31,7 @@
if (!file_exists('includes/config/settings.php')) {
// This should never happen, but in case it does
// this means if headers are sent, redirect will fallback to JS
if (!headers_sent()) {
if (headers_sent()) {
echo '<script language="javascript" type="text/javascript">document.location.replace("install/install.php");</script>';
} else {
header('Location: install/install.php');
Expand Down Expand Up @@ -517,7 +517,7 @@ class="ui-state-highlight ui-corner-all" id="div_maintenance">
}
// Ask the user to change his password
} elseif (($session_validite_pw === null || $session_validite_pw === false)
&& empty($session_user_id) === false && $session_is_admin !== '1'
&& empty($session_user_id) === false
) {
//Check if password is valid
echo '
Expand Down
102 changes: 0 additions & 102 deletions install/css/install.css

This file was deleted.

Binary file removed install/css/overcast/images/animated-overlay.gif
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 0 additions & 5 deletions install/css/overcast/jquery-ui-1.10.3.custom.min.css

This file was deleted.

Binary file removed install/images/76.gif
Binary file not shown.
Binary file removed install/images/ajax-loader.gif
Binary file not shown.
Binary file removed install/images/cross.png
Binary file not shown.
Binary file removed install/images/error.png
Binary file not shown.
Binary file removed install/images/exclamation-red.png
Binary file not shown.
Binary file removed install/images/information-white.png
Binary file not shown.
Binary file removed install/images/minus-circle.png
Binary file not shown.
Binary file removed install/images/tick-circle.png
Binary file not shown.
Binary file removed install/images/tick.png
Binary file not shown.
88 changes: 0 additions & 88 deletions install/install.css

This file was deleted.

0 comments on commit 73b5193

Please sign in to comment.