Merge pull request #15 from cweiske/master

[contagged] / img.php

diff --git a/img.php b/img.php
index eeb44713e46bf1b984a66d686a8fcb8ef4c95e5c..087ff2da69462cbda39e858f43f4b96d8e8c28bf 100644 (file)
--- a/img.php
+++ b/img.php
@@ -1,16 +1,24 @@
-<?
-  require_once('init.php');
-  ldap_login();
+<?php
+require_once('inc/init.php');
+ldap_login();
 
-  $dn = $_REQUEST['dn'];
+if ($conf['userlogreq'] && !isset($_SESSION['ldapab']['username'])){
+  header("HTTP/1.0 401 Access Denied");
+  echo '<h1>Access Denied</h1>';
+  exit();
+}
 
-  $sr = ldap_search($LDAP_CON,$dn,'(objectClass=inetOrgPerson)',array('jpegPhoto'));
-  if(!ldap_count_entries($LDAP_CON,$sr)){
-    exit;
-  }
-  $result = ldap_get_binentries($LDAP_CON, $sr);
-  $entry  = $result[0];
+$dn = $_REQUEST['dn'];
 
-  header("Content-type: image/jpeg");
-  print $entry['jpegPhoto'][0];
+$sr = ldap_search($LDAP_CON,$dn,'(objectClass=inetOrgPerson)',array($FIELDS['photo']));
+if(!ldap_count_entries($LDAP_CON,$sr)){
+  header("HTTP/1.0 404 Not Found");
+  echo '<h1>Not Found</h1>';
+  exit;
+}
+$result = ldap_get_binentries($LDAP_CON, $sr);
+$entry  = $result[0];
+
+header("Content-type: image/jpeg");
+print $entry[$FIELDS['photo']][0];
 ?>