fixed problem with login check

[contagged] / entry.php

diff --git a/entry.php b/entry.php
index a19888ec24375478b608470981bd258629cc6d91..9edd1717023604763444909f21697fa163b46aa2 100644 (file)
--- a/entry.php
+++ b/entry.php
@@ -2,7 +2,7 @@
 require_once('inc/init.php');
 ldap_login();
 
-if ($conf['userlogreq'] && $user == ''){
+if ($conf['userlogreq'] && !isset($_SESSION['ldapab']['username'])){
   header('Location: login.php');
   exit();
 }
@@ -133,7 +133,7 @@ function _saveData(){
   $now    = time();
   $newdn  = 'uid='.$now;
   if (empty($_REQUEST['type'])) { $_REQUEST['type']='public'; }
-  if($_REQUEST['type'] == 'private'){
+  if($_REQUEST['type'] == 'private' && $conf['privatebook']){
     $newdn .= ', '.$conf['privatebook'].', '.$_SESSION['ldapab']['binddn'];
   }else{
     $newdn .= ', '.$conf['publicbook'];
@@ -231,7 +231,7 @@ function _getUploadData(){
       unlink($file['tmp_name']);
       return $data;
     } else {
-      $smarty->assign('jpegError',$lang['err_wrongFileType']); 
+      $smarty->assign('jpegError',$lang['err_wrongFileType']);
     }
   } else {
     $smarty->assign('jpegError',$lang['err_fileNotUploaded']);