[geeklog-cvs] geeklog: An attempt to fix sorting of events by author when $_CO...

[geeklog-cvs at lists.geeklog.net]

changeset 7501:4623d59f78b3
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/4623d59f78b3
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 29 20:53:58 2009 +0100
description:
An attempt to fix sorting of events by author when $_CONF['show_fullname'] is enabled. Really only works when all users entered their full name.

diffstat:

 plugins/calendar/functions.inc |  111 +++++++++++++++++++++----------------
 1 files changed, 63 insertions(+), 48 deletions(-)

diffs (138 lines):

diff -r a1af6656a356 -r 4623d59f78b3 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sun Nov 29 20:13:22 2009 +0100
+++ b/plugins/calendar/functions.inc	Sun Nov 29 20:53:58 2009 +0100
@@ -884,12 +884,16 @@
     $retval = '';
 
     $header_arr = array(      # display 'text' and use table field 'field'
-        array('text' => $LANG_ADMIN['title'], 'field' => 'title', 'sort' => true),
-        array('text' => $LANG_CAL_ADMIN[13], 'field' => 'username', 'sort' => true),
-        array('text' => $LANG_ACCESS['access'], 'field' => 'access', 'sort' => false),
-        array('text' => $LANG_CAL_ADMIN[14], 'field' => 'datestart', 'sort' => true),
-        array('text' => $LANG_CAL_ADMIN[15], 'field' => 'dateend', 'sort' => true)
+        array('text' => $LANG_ADMIN['title'], 'field' => 'title', 'sort' => true)
     );
+    if ($_CONF['show_fullname'] == 1) {
+        $header_arr[] = array('text' => $LANG_CAL_ADMIN[13], 'field' => 'fullname', 'sort' => true);
+    } else {
+        $header_arr[] = array('text' => $LANG_CAL_ADMIN[13], 'field' => 'username', 'sort' => true);
+    }
+    $header_arr[] = array('text' => $LANG_ACCESS['access'], 'field' => 'access', 'sort' => false);
+    $header_arr[] = array('text' => $LANG_CAL_ADMIN[14], 'field' => 'datestart', 'sort' => true);
+    $header_arr[] = array('text' => $LANG_CAL_ADMIN[15], 'field' => 'dateend', 'sort' => true);
 
     $defsort_arr = array('field' => 'datestart', 'direction' => 'desc');
 
@@ -1005,12 +1009,16 @@
     $header_arr = array(      # display 'text' and use table field 'field'
         array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
         array('text' => $LANG_ADMIN['copy'], 'field' => 'copy', 'sort' => false),
-        array('text' => $LANG_ADMIN['title'], 'field' => 'title', 'sort' => true),
-        array('text' => $LANG_CAL_ADMIN[13], 'field' => 'username', 'sort' => true),
-        array('text' => $LANG_ACCESS['access'], 'field' => 'access', 'sort' => false),
-        array('text' => $LANG_CAL_ADMIN[14], 'field' => 'datestart', 'sort' => true),
-        array('text' => $LANG_CAL_ADMIN[15], 'field' => 'dateend', 'sort' => true)
+        array('text' => $LANG_ADMIN['title'], 'field' => 'title', 'sort' => true)
     );
+    if ($_CONF['show_fullname'] == 1) {
+        $header_arr[] = array('text' => $LANG_CAL_ADMIN[13], 'field' => 'fullname', 'sort' => true);
+    } else {
+        $header_arr[] = array('text' => $LANG_CAL_ADMIN[13], 'field' => 'username', 'sort' => true);
+    }
+    $header_arr[] = array('text' => $LANG_ACCESS['access'], 'field' => 'access', 'sort' => false);
+    $header_arr[] = array('text' => $LANG_CAL_ADMIN[14], 'field' => 'datestart', 'sort' => true);
+    $header_arr[] = array('text' => $LANG_CAL_ADMIN[15], 'field' => 'dateend', 'sort' => true);
 
     $defsort_arr = array('field' => 'datestart', 'direction' => 'desc');
 
@@ -1740,45 +1748,52 @@
                             $A['perm_group'],$A['perm_members'],$A['perm_anon']);
 
     switch($fieldname) {
-        case "delete":
-            $retval = "<input type=\"checkbox\" name=\"delitem[{$A['eid']}]\" checked=\"checked\"" . XHTML . ">";
-            break;
-        case "edit":
-            if ($access == 3) {
-                $retval = COM_createLink(
-                    $icon_arr['edit'],
-                    "{$_CONF['site_admin_url']}/plugins/calendar/index.php"
-                    . "?mode=edit&eid={$A['eid']}");
-            }
-            break;
-        case "copy":
-            if ($access == 3) {
-                $retval = COM_createLink(
-                    $icon_arr['copy'],
-                    "{$_CONF['site_admin_url']}/plugins/calendar/index.php"
-                    . "?mode=clone&eid={$A['eid']}");
-            }
-            break;
-        case 'access':
-            if ($access == 3) {
-                $retval = $LANG_ACCESS['edit'];
-            } else {
-                $retval = $LANG_ACCESS['readonly'];
-            }
-            break;
-        case 'title':
-            $retval = stripslashes ($A['title']);
-            $retval = COM_createLink( $retval,
-                "{$_CONF['site_url']}/calendar/event.php?eid={$A['eid']}"
-            );
-            break;
-        case 'username':
-            $retval = COM_getDisplayName ($A['owner_id'], $A['username'], $A['fullname']);
-            break;
-        default:
-            $retval = $fieldvalue;
-            break;
+    case 'delete':
+        $retval = "<input type=\"checkbox\" name=\"delitem[{$A['eid']}]\" checked=\"checked\"" . XHTML . ">";
+        break;
+
+    case 'edit':
+        if ($access == 3) {
+            $retval = COM_createLink(
+                $icon_arr['edit'],
+                "{$_CONF['site_admin_url']}/plugins/calendar/index.php"
+                . "?mode=edit&eid={$A['eid']}");
+        }
+        break;
+
+    case 'copy':
+        if ($access == 3) {
+            $retval = COM_createLink(
+                $icon_arr['copy'],
+                "{$_CONF['site_admin_url']}/plugins/calendar/index.php"
+                . "?mode=clone&eid={$A['eid']}");
+        }
+        break;
+
+    case 'access':
+        if ($access == 3) {
+            $retval = $LANG_ACCESS['edit'];
+        } else {
+            $retval = $LANG_ACCESS['readonly'];
+        }
+        break;
+
+    case 'title':
+        $retval = COM_createLink(stripslashes($A['title']),
+                    "{$_CONF['site_url']}/calendar/event.php?eid={$A['eid']}");
+        break;
+
+    case 'username':
+    case 'fullname':
+        $retval = COM_getDisplayName($A['owner_id'], $A['username'],
+                                     $A['fullname']);
+        break;
+
+    default:
+        $retval = $fieldvalue;
+        break;
     }
+
     return $retval;
 }