Merge branch 'master' into configmgr_improvements

Conflicts:
	inc/auth.php
	inc/template.php
	lib/plugins/authad/lang/zh/settings.php
	lib/plugins/authldap/lang/en/settings.php
	lib/plugins/authldap/lang/zh/settings.php
	lib/plugins/authmysql/lang/zh/settings.php
	lib/plugins/config/settings/config.class.php
	lib/plugins/usermanager/admin.php

1 files changed, 5 insertions, 2 deletions

diff --git a/inc/Tar.class.php b/inc/Tar.class.php
index 20f397395..d1a38ea0e 100644
--- a/inc/Tar.class.php
+++ b/inc/Tar.class.php
@@ -262,7 +262,7 @@ class Tar {
 
             if(!$this->fh) throw new TarIOException('Could not open file for writing: '.$this->file);
         }
-        $this->writeaccess = false;
+        $this->writeaccess = true;
         $this->closed      = false;
     }
 
@@ -296,7 +296,10 @@ class Tar {
         );
 
         while(!feof($fp)) {
-            $packed = pack("a512", fread($fp, 512));
+            $data = fread($fp, 512);
+            if($data === false) break;
+            if($data === '') break;
+            $packed = pack("a512", $data);
             $this->writebytes($packed);
         }
         fclose($fp);