Make it possible to disable private contacts

[contagged] / tags.php

diff --git a/tags.php b/tags.php
index 443ed67cd8271ff8539ef4263aadfe91fb9a8a0a..9310f29f77e164bbeb5f283b17f5b96bcf27ce40 100644 (file)
--- a/tags.php
+++ b/tags.php
@@ -1,7 +1,11 @@
-<?
-  require_once('init.php');
+<?php
+  require_once('inc/init.php');
   ldap_login();
 
+  if ($conf['userlogreq'] && $user == ''){
+    header('Location: login.php');
+    exit();
+  }
   //prepare templates
   tpl_std();
   $smarty->assign('tagcloud',tag_cloud());
@@ -12,16 +16,16 @@
   function tag_cloud(){
     global $conf;
     global $LDAP_CON;
-    if(!$conf['extended']) return;
-
-    $result = ldap_queryabooks('(objectClass=contactPerson)','marker');
+    global $FIELDS;
+    if(!$FIELDS['_marker']) return;
 
+    $result = ldap_queryabooks('(objectClass=inetOrgPerson)',$FIELDS['_marker']);
     $max = 0;
     $min = 999999999;
     $tags = array();
     foreach ($result as $entry){
-      if(!empty($entry['marker']) && count($entry['marker'])){
-        foreach($entry['marker'] as $marker){
+      if(!empty($entry[$FIELDS['_marker']]) && count($entry[$FIELDS['_marker']])){
+        foreach($entry[$FIELDS['_marker']] as $marker){
           $marker = strtolower($marker);
           if (empty($tags[$marker])) { $tags[$marker]=0; }
           $tags[$marker] += 1;