show: restructuring, adding new fields, ...

[contagged] / entry.php

diff --git a/entry.php b/entry.php
index c081da428596df7191effc51549e4a48efda1264..ec73909242f0d362b93c6fd239f78dbace847c25 100644 (file)
--- a/entry.php
+++ b/entry.php
@@ -5,6 +5,7 @@
   $users = get_users();
 
   //select template to use
+  if (empty($_REQUEST['mode'])) { $_REQUEST['mode']='show'; }
   if( $_SESSION['ldapab']['username'] &&
      ($_REQUEST['mode']=='edit' || $_REQUEST['mode']=='copy')){
     $template='entry_edit.tpl';
@@ -14,25 +15,29 @@
     $template='entry_show.tpl';
   }
 
-  $dn = $_REQUEST['dn'];
-  #$dn = 'cn=bar foo, ou=contacts, o=cosmocode, c=de';
+  if (empty($_REQUEST['dn'])) {
+    $dn = "";
+  }else{
+    $dn = $_REQUEST['dn'];
+    #$dn = 'cn=bar foo, ou=contacts, o=cosmocode, c=de';
+  }
 
   //save data if asked for
-  if($_SESSION['ldapab']['username'] && $_REQUEST['save']){
+  if($_SESSION['ldapab']['username'] && !empty($_REQUEST['save']) && $_REQUEST['save']){
     // prepare special data
-    $_REQUEST['entry']['jpegPhoto'][]=_getUploadData();
+    $_REQUEST['entry']['photo']  = _getUploadData();
     $_REQUEST['entry']['marker'] = explode(',',$_REQUEST['entry']['markers']);
-    $_REQUEST['entry']['marker'] = array_map('trim',$_REQUEST['entry']['marker']);
-    $_REQUEST['entry']['marker'] = array_unique($_REQUEST['entry']['marker']);
-    $_REQUEST['entry']['marker'] = array_filter($_REQUEST['entry']['marker']);
-    sort($_REQUEST['entry']['marker']);
     unset($_REQUEST['entry']['markers']);
-    
-    $_REQUEST['entry']['mail'] = array_map('trim',$_REQUEST['entry']['mail']);
-    $_REQUEST['entry']['mail'] = array_unique($_REQUEST['entry']['mail']);
-    $_REQUEST['entry']['mail'] = array_filter($_REQUEST['entry']['mail']);
-    sort($_REQUEST['entry']['mail']);
-    
+
+    foreach(array_keys($_REQUEST['entry']) as $field){
+        if($FIELDS['_'.$field]){
+            // entry has to be handled as array -> clean it up (trim, unique, sort)
+            $_REQUEST['entry'][$field] = array_map('trim',$_REQUEST['entry'][$field]);
+            $_REQUEST['entry'][$field] = array_unique($_REQUEST['entry'][$field]);
+            $_REQUEST['entry'][$field] = array_filter($_REQUEST['entry'][$field]);
+            natcasesort($_REQUEST['entry'][$field]);
+        }
+    }
     $dn = _saveData();
   }
 
@@ -41,7 +46,7 @@
       $smarty->assign('error','No dn was given');
       $template = 'error.tpl';
     }
-  }elseif($_REQUEST['del']){
+  }elseif(!empty($_REQUEST['del']) && $_REQUEST['del']){
     _delEntry($dn);
   }elseif(!_fetchData($dn)){
     $smarty->assign('error',"The requested entry '$dn' was not found");
@@ -89,7 +94,7 @@
     $entry  = $result[0];
 
     //remove dn from entry when copy
-    if($_REQUEST['mode'] == 'copy'){
+    if(!empty($_REQUEST['mode']) && $_REQUEST['mode'] == 'copy'){
       $entry['dn']='';
     }
 
@@ -101,6 +106,8 @@ print_r($entry);
 print '</pre>';*/
 
     // make username from dn for manager:
+    if (empty($entry['manager'])) { $entry['manager']=array(""); }
+    if (empty($users[$entry['manager'][0]])) { $users[$entry['manager'][0]]=''; }
     $smarty->assign('managername',$users[$entry['manager'][0]]);
     return true;
   }
@@ -113,23 +120,21 @@ print '</pre>';*/
   function _saveData(){
     global $LDAP_CON;
     global $conf;
-    $entries = namedentries();
-    $entries['mail']='mail';  //special field mail isn't in entries so we add it here
-    if($conf['extended']){
-      $entries['marker']='marker'; //same for marker inextended schema
-    }
+    global $FIELDS;
+    global $OCLASSES;
 
     $entry = $_REQUEST['entry'];
     $dn    = $_REQUEST['dn'];
     //construct new dn
     $now    = time();
     $newdn  = 'uid='.$now;
+    if (empty($_REQUEST['type'])) { $_REQUEST['type']='public'; }
     if($_REQUEST['type'] == 'private'){
       $newdn .= ', '.$conf['privatebook'].', '.$_SESSION['ldapab']['binddn'];
     }else{
       $newdn .= ', '.$conf['publicbook'];
     }
-    $entry['cn']          = $entry['givenname'].' '.$entry['name'];;
+    $entry['displayname'] = $entry['givenname'].' '.$entry['name'];;
     $entry = prepare_ldap_entry($entry);
 
 /*
@@ -145,19 +150,17 @@ print '</pre>';
       tpl_ldaperror();
       return $newdn;
     }else{
-      // in extended mode we have to make sure the right classes are set
-      if($conf['extended']){
-        ldap_store_objectclasses($dn,array('inetOrgPerson','contactPerson'));
-      }
-      // in openxchange mode we have to make sure the right classes are set
-      if ($conf['openxchange']){
-        ldap_store_objectclasses($dn,array('inetOrgPerson','OXUserObject'));
-      }
-      //modify entry (touches only our attributes)
-      foreach (array_keys($entries) as $key){
+      // update the objectClasses
+      ldap_store_objectclasses($dn,$OCLASSES);
+      unset($entry['objectclass']);
+
+      //modify entry attribute by attribute - this ensure we don't delete unknown stuff
+      foreach (array_values($FIELDS) as $key){
         if($key == 'dn'){
           continue;
         }elseif(empty($entry[$key])){
+          // field is empty -> handle deletion (except for photo unless deletion triggered)
+          if (empty($_REQUEST['delphoto'])) { $_REQUEST['delphoto']=0; }
           if($key == 'jpegPhoto' && !$_REQUEST['delphoto']){
             continue;
           }
@@ -204,4 +207,4 @@ print '</pre>';
     }
     return '';
   }
-?>
+