Merge pull request #15 from cweiske/master

[contagged] / tags.php

diff --git a/tags.php b/tags.php
index bd26632768980a60d296f070d20f45e91b52bbad..ddde120596086c446714a7a6d46968748c289b45 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'] && !isset($_SESSION['ldapab']['username'])){
+    header('Location: login.php');
+    exit();
+  }
   //prepare templates
   tpl_std();
   $smarty->assign('tagcloud',tag_cloud());
@@ -12,33 +16,56 @@
   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;
           if($tags[$marker] > $max) $max = $tags[$marker];
+          if($tags[$marker] < $min) $min = $tags[$marker];
         }
       }
     }
     ksort($tags);
+    tag_cloud_weight($tags,$min,$max,6);
 
     $out = '';
     foreach($tags as $tag => $cnt){
-      $pct = round($cnt * 20 / $max); // percents from 0 to 20
-
-      $out .= '<a href="index.php?marker='.rawurlencode($tag).'" class="tc'.$pct.'">';
+      $out .= '<a href="index.php?marker='.rawurlencode($tag).'" class="cloud_'.$cnt.'">';
       $out .= htmlspecialchars($tag).'</a> ';
     }
 
     return $out;
   }
 
-?>
+  /**
+   * Calculate weights for a nicer tagcloud distribution
+   */
+  function tag_cloud_weight(&$tags,$min,$max,$levels){
+    // calculate tresholds
+    $tresholds = array();
+    for($i=0; $i<=$levels; $i++){
+        $tresholds[$i] = pow($max - $min + 1, $i/$levels);
+    }
+
+    // assign weights
+    foreach($tags as $tag => $cnt){
+        foreach($tresholds as $tresh => $val){
+            if($cnt <= $val){
+                $tags[$tag] = $tresh;
+                break;
+            }
+            $tags[$tag] = $levels;
+        }
+    }
+  }
+
+