[Phpgroupware-cvs] api/accounts/class.accounts_sql.php, 1.1.1.1.2.22

[nomail]

Update of /api/accounts
Modified Files:
        Branch: proposal-branch
          class.accounts_sql.php

date: 2004/07/03 02:33:42;  author: jengo;  state: Exp;  lines: +24 -11

Log Message:
Give a nicer warning if the account_id isn't passed
=====================================================================
Index: api/accounts/class.accounts_sql.php
diff -u api/accounts/class.accounts_sql.php:1.1.1.1.2.21 
api/accounts/class.accounts_sql.php:1.1.1.1.2.22
--- api/accounts/class.accounts_sql.php:1.1.1.1.2.21    Mon Jun 28 21:40:58 2004
+++ api/accounts/class.accounts_sql.php Sat Jul  3 02:33:42 2004
@@ -69,19 +69,32 @@
 
                function read_repository()
                {
+                       if (! $this->account_id)
+                       {
+                               trigger_error("Required account_id 
missing",E_USER_WARNING);
+                               return false;
+                       }
+
                        $dbresult = $GLOBALS['phpgw']->db->Execute('SELECT * 
FROM phpgw_accounts WHERE account_id=' . $this->account_id);
 
-                       $this->data['id']                = 
$dbresult->fields['account_id'];
-                       $this->data['lid']               = 
$dbresult->fields['account_lid'];
-                       $this->data['firstname']         = 
$dbresult->fields['account_firstname'];
-                       $this->data['lastname']          = 
$dbresult->fields['account_lastname'];
-                       $this->data['fullname']          = 
$dbresult->fields['account_firstname'] . ' ' . 
$dbresult->fields['account_lastname'];
-                       $this->data['lastpasswd_change'] = 
$dbresult->unixtimestamp($dbresult->fields['account_lastpwd_change']);
-                       $this->data['status']            = 
$dbresult->fields['account_status'];
-                       $this->data['expires']           = 
$dbresult->unixtimestamp($dbresult->fields['account_expires']);
-                       $this->data['account_type']      = 
$dbresult->fields['account_type'];
+                       if (is_object($dbresult))
+                       {
+                               $this->data['id']                = 
$dbresult->fields['account_id'];
+                               $this->data['lid']               = 
$dbresult->fields['account_lid'];
+                               $this->data['firstname']         = 
$dbresult->fields['account_firstname'];
+                               $this->data['lastname']          = 
$dbresult->fields['account_lastname'];
+                               $this->data['fullname']          = 
$dbresult->fields['account_firstname'] . ' ' . 
$dbresult->fields['account_lastname'];
+                               $this->data['lastpasswd_change'] = 
$dbresult->unixtimestamp($dbresult->fields['account_lastpwd_change']);
+                               $this->data['status']            = 
$dbresult->fields['account_status'];
+                               $this->data['expires']           = 
$dbresult->unixtimestamp($dbresult->fields['account_expires']);
+                               $this->data['account_type']      = 
$dbresult->fields['account_type'];
                        
-                       return $this->data;
+                               return $this->data;
+                       }
+                       else
+                       {
+                               return false;
+                       }
                }
 
                function save_repository()