[Gdtc-commits] r1666 - /trunk/gdtc/include/actor.php

[bdrieu]

Author: benj
Date: Tue May 10 11:39:21 2016
New Revision: 1666

URL: http://svn.gna.org/viewcvs/gdtc?rev=1666&view=rev
Log:
Add function to get a non empty actor name and add messages

Modified:
    trunk/gdtc/include/actor.php

Modified: trunk/gdtc/include/actor.php
URL: 
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/include/actor.php?rev=1666&r1=1665&r2=1666&view=diff
==============================================================================
--- trunk/gdtc/include/actor.php        (original)
+++ trunk/gdtc/include/actor.php        Tue May 10 11:39:21 2016
@@ -33,6 +33,18 @@
     $additional = array_merge ( $additional, list_benevalo ( $id ) );
 
     list ( $lists, $mailing_lists_status ) = get_all_mailing_lists_status ( 
$id );
+    if ( array_key_exists ( 'error', $additional ) )
+    {
+       $additional [ 'message' ] [ 'error' ] = $additional [ 'error' ];
+    }
+    if ( array_key_exists ( 'warning', $additional ) )
+    {
+       $additional [ 'message' ] [ 'warning' ] = $additional [ 'warning' ];
+    }
+    if ( array_key_exists ( 'notice', $additional ) )
+    {
+       $additional [ 'message' ] [ 'notice' ] = $additional [ 'notice' ];
+    }
     $additional [ 'sympa_lists' ] = $lists;
     $additional [ 'mailing_list_status' ] = $mailing_lists_status;
 
@@ -283,6 +295,25 @@
 }
 
 
+function actor_get_clickable_name ( $details )
+{
+    if ( $details [ 'actor_type' ] == 'person' )
+    {
+       $name = sprintf ( "%s %s", 
+                         $details [ 'firstname' ], $details [ 'person_name' ]);
+    }
+    else
+    {
+       $name = $details [ 'entity_name' ];
+    }
+
+    if ( ! $name || preg_match ( '/^ *$/', $name ) )
+    {
+       return 'Undef';
+    }
+    return $name;
+}
+
 
 /* Local Variables: */
 /* c-basic-offset: 4 */


_______________________________________________
Gdtc-commits mailing list
Gdtc-commits@gna.org
https://mail.gna.org/listinfo/gdtc-commits