2.1.27

Fix: issue on offline export Fix for #1882
nilsteampassnet · Sep 6, 2017 · a2214c1 · a2214c1
1 parent 7decf3c
commit a2214c1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM richarvey/nginx-php-fpm:1.2.1
+FROM richarvey/nginx-php-fpm:1.3.5
 
 # The location of the web files
 ARG VOL=/var/www/html

diff --git a/changelog.md b/changelog.md
@@ -12,6 +12,7 @@
  #1886 JSON Error when importing with an apostrophe (‘)
  #1885 Undefined index: SSL_SERVER_CERT
  #1884 Cannot delete custom fields - hangs indefinitely after confirm with spinning gear
+ #1882 Can't see any entry on any folder, using any account
  #1881 Doesn't auto-delete install/ folder after installation completed
  #1880 Custom Fields, Not encrypted/decrypted when toggled in Custom-Field Settings Screen
  #1872 New Admin User login not working -JSON Parse file failure

diff --git a/items.php b/items.php
@@ -168,7 +168,7 @@
                         <li onclick="$(\'#div_copy_folder\').dialog(\'open\');"><i class="fa fa-copy fa-fw"></i>&nbsp; '.$LANG['copy_folder'].'</li>
                         ', isset($SETTINGS['allow_import']) && $SETTINGS['allow_import'] == 1 && $session_user_admin !== '1' ? '<li onclick="loadImportDialog()"><i class="fa fa-cloud-upload fa-fw"></i>&nbsp; '.$LANG['import_csv_menu_title'].'</li>' : '',
                         (isset($SETTINGS['allow_print']) && $SETTINGS['allow_print'] == 1 && $session_user_admin !== '1' && $_SESSION['temporary']['user_can_printout'] === true) ? '<li onclick="loadExportDialog()"><i class="fa fa-cloud-download fa-fw"></i>&nbsp; '.$LANG['print_out_menu_title'].'</li>' : '',
-                        (isset($SETTINGS['settings_offline_mode']) && $SETTINGS['settings_offline_mode'] == 1 && session_user_admin !== '1') ? '<li onclick="loadOfflineDialog()"><i class="fa fa-laptop fa-fw"></i>&nbsp; '.$LANG['offline_menu_title'].'</li>' : '', '
+                        (isset($SETTINGS['settings_offline_mode']) && $SETTINGS['settings_offline_mode'] == 1 && $session_user_admin !== '1') ? '<li onclick="loadOfflineDialog()"><i class="fa fa-laptop fa-fw"></i>&nbsp; '.$LANG['offline_menu_title'].'</li>' : '', '
                     </ul>
                 </li>
             </ul>

diff --git a/sources/core.php b/sources/core.php
@@ -135,7 +135,7 @@ function delTree($dir)
 if (isset($_SESSION['user_settings']['usertimezone']) === true && $_SESSION['user_settings']['usertimezone'] !== "not_defined") {
     // use user timezone
     date_default_timezone_set($_SESSION['user_settings']['usertimezone']);
-} elseif ($SETTINGS['timezone'] === null) {
+} elseif (isset($SETTINGS['timezone']) === false || $SETTINGS['timezone'] === null) {
     // use server timezone
     date_default_timezone_set('UTC');
 } else {

diff --git a/sources/export.queries.php b/sources/export.queries.php
@@ -562,7 +562,7 @@
         //CASE export in HTML format - Iteration loop
         case "export_to_html_format_loop":
             // do checks ... if fails, return an error
-            if (null !== $post_idTree || null !== $post_idsList) {
+            if (null === $post_idTree || null === $post_idsList) {
                 echo '[{"error":"true"}]';
                 break;
             }