[Fmsystem-commits] [15975] tweak notify info

[sigurdne]

Revision: 15975
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15975
Author:   sigurdne
Date:     2016-11-09 13:54:55 +0000 (Wed, 09 Nov 2016)
Log Message:
-----------
tweak notify info

Modified Paths:
--------------
    trunk/property/inc/class.botts.inc.php
    trunk/property/inc/class.notify.inc.php

Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php      2016-11-09 13:54:09 UTC (rev 
15974)
+++ trunk/property/inc/class.botts.inc.php      2016-11-09 13:54:55 UTC (rev 
15975)
@@ -1436,24 +1436,6 @@
                        {
                                $this->historylog->add('M', $id, implode(';', 
array_unique($log_recipients)));
                        }
-                       /*
-                         if (!$rc && 
($this->config->config_data['groupnotification'] || 
$this->config->config_data['ownernotification'] || 
$this->config->config_data['groupnotification']))
-                         {
-                         $receipt['error'][] = array('msg'=> lang('Your 
message could not be sent by mail!'));
-                         $receipt['error'][] = array('msg'=> lang('The mail 
server returned'));
-                         $receipt['error'][] = array('msg'=> "From : 
{$current_user_address}");
-                         $receipt['error'][] = array('msg'=> 'to: '.$to);
-                         $receipt['error'][] = array('msg'=> 'subject: 
'.$subject);
-                         $receipt['error'][] = array('msg'=> $body );
-                         //                    $receipt['error'][] = 
array('msg'=> 'cc: ' . $cc);
-                         //                    $receipt['error'][] = 
array('msg'=> 'bcc: '.$bcc);
-                         $receipt['error'][] = array('msg'=> 'group: 
'.$group_name);
-                         $receipt['error'][] = array('msg'=> 'err_code: 
'.$this->send->err['code']);
-                         $receipt['error'][] = array('msg'=> 'err_msg: '. 
htmlspecialchars($this->send->err['msg']));
-                         $receipt['error'][] = array('msg'=> 'err_desc: '. 
$this->send->err['desc']);
-                         }
-                        */
-                       //_debug_array($receipt);
                        return $receipt;
                }
 

Modified: trunk/property/inc/class.notify.inc.php
===================================================================
--- trunk/property/inc/class.notify.inc.php     2016-11-09 13:54:09 UTC (rev 
15974)
+++ trunk/property/inc/class.notify.inc.php     2016-11-09 13:54:55 UTC (rev 
15975)
@@ -53,6 +53,7 @@
                function __construct()
                {
                        $this->_db = & $GLOBALS['phpgw']->db;
+                       $this->_db2 = clone($this->_db);
                        $this->_join = & $this->_db->join;
                        $this->account = 
$GLOBALS['phpgw_info']['user']['account_id'];
                }
@@ -116,19 +117,19 @@
                                $entry['sms'] = 
$comms[$entry['contact_id']]['mobile (cell) phone'];
                                $entry['is_active_text'] = $entry['is_active'] 
? $lang_yes : $lang_no;
 
-                               $sql = "SELECT account_id FROM phpgw_accounts 
WHERE person_id = " . (int)$entry['contact_id'];
-                               $this->_db->query($sql, __LINE__, __FILE__);
-                               if ($this->_db->next_record())
+                               $sql = "SELECT account_id, account_lid FROM 
phpgw_accounts WHERE person_id = " . (int)$entry['contact_id'];
+                               $this->_db2->query($sql, __LINE__, __FILE__);
+                               if ($this->_db2->next_record())
                                {
-                                       $account_id = 
$this->_db->f('account_id');
+                                       $account_id = 
$this->_db2->f('account_id');
+                                       $entry['account_id'] = $account_id;
+                                       $entry['account_lid'] = 
$this->_db2->f('account_lid');
                                        $prefs = 
$socommon->create_preferences('property', $account_id);
 
                                        $entry['email'] = 
isset($entry['email']) && $entry['email'] ? $entry['email'] : $prefs['email'];
                                        $entry['sms'] = isset($entry['sms']) && 
$entry['sms'] ? $entry['sms'] : $prefs['cellphone'];
-                                       $entry['account_id'] = $account_id;
                                }
                        }
-
                        return $values;
                }
 
@@ -176,6 +177,8 @@
                                'values' => array(array('key' => 'id', 'hidden' 
=> true),
                                        array('key' => 'contact_id', 'label' => 
lang('id'), 'sortable' => false, 'resizeable' => true,
                                                'formatter' => 
'formatLink_notify'),
+                                       array('key' => 'account_lid', 'label' 
=> lang('username'), 'sortable' => true,
+                                               'resizeable' => true),
                                        array('key' => 'first_name', 'label' => 
lang('first name'), 'sortable' => true,
                                                'resizeable' => true),
                                        array('key' => 'last_name', 'label' => 
lang('last name'), 'sortable' => true,