[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [19003] remove call to accounts::get_account_name()
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] [19003] remove call to accounts::get_account_name() |
|
Date: |
Thu, 27 Nov 2008 20:44:58 +0000 |
Revision: 19003
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19003
Author: skwashd
Date: 2008-11-27 20:44:57 +0000 (Thu, 27 Nov 2008)
Log Message:
-----------
remove call to accounts::get_account_name()
Modified Paths:
--------------
core/trunk/phpgwapi/inc/class.common.inc.php
Modified: core/trunk/phpgwapi/inc/class.common.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.common.inc.php 2008-11-19 18:06:31 UTC
(rev 19002)
+++ core/trunk/phpgwapi/inc/class.common.inc.php 2008-11-27 20:44:57 UTC
(rev 19003)
@@ -155,7 +155,7 @@
public function getInstalledLanguages()
{
$GLOBALS['phpgw']->db->query('select distinct lang from
phpgw_lang');
- while ($GLOBALS['phpgw']->db->next_record())
+ while ($GLOBALS['phpgw']->db->next_record())
{
$installedLanguages[$GLOBALS['phpgw']->db->f('lang')] =
$GLOBALS['phpgw']->db->f('lang');
}
@@ -472,7 +472,7 @@
);
}
}
-
+
$this->output['app_row_icon'][] = array
(
'layout' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'],
@@ -494,8 +494,7 @@
*/
public function grab_owner_name($accountid = '')
{
-
$GLOBALS['phpgw']->accounts->get_account_name($accountid,$lid,$fname,$lname);
- return $this->display_fullname($lid,$fname,$lname);
+ return (string)
$GLOBALS['phpgw']->accounts->get($accountid);
}
/**
@@ -525,7 +524,7 @@
$output .= <<<HTML
</ul>
</div>
-
+
HTML;
return $output;
@@ -581,10 +580,10 @@
{
$appname = 'phpgwapi';
}
-
+
$incdir = PHPGW_INCLUDE_ROOT . '/' . $appname .
'/inc';
$incdir_default = PHPGW_SERVER_ROOT . '/' . $appname .
'/inc';
-
+
if (@is_dir ($incdir))
{
return $incdir;
@@ -909,10 +908,10 @@
}
$image = $lang_images;
}
-
+
foreach ( $image as $img )
{
- $image_found = self::find_image($module,
$img.$ext);
+ $image_found = self::find_image($module,
$img.$ext);
if ( $image_found )
{
return $image_found;
@@ -1007,7 +1006,7 @@
$GLOBALS['phpgw']->xslttpl->pparse();
}
- if (
!isset($GLOBALS['phpgw_info']['flags']['nofooter'])
+ if (
!isset($GLOBALS['phpgw_info']['flags']['nofooter'])
||
!$GLOBALS['phpgw_info']['flags']['nofooter'] )
{
include(PHPGW_API_INC .
'/footer.inc.php');
@@ -1044,7 +1043,7 @@
{
list($app,$class,$method) =
explode('.',$GLOBALS['phpgw_info']['menuaction']);
if ( isset($GLOBALS[$class]->public_functions)
- &&
is_array($GLOBALS[$class]->public_functions)
+ &&
is_array($GLOBALS[$class]->public_functions)
&&
isset($GLOBALS[$class]->public_functions['css']) )
{
$app_css .= $GLOBALS[$class]->css();
@@ -1055,7 +1054,7 @@
{
$app_css .=
$GLOBALS['phpgw_info']['flags']['css'] . "\n";
}
-
+
$all_css .= "\n<!-- NOTE: This will not be supported in
the future -->\n\t\t<style type=\"text/css\">\n\t\t{$app_css}\n\t\t</style>\n";
return $all_css;
}
@@ -1068,12 +1067,12 @@
{
return $this->get_javascript();
}
-
+
/**
* Include JavaScript in template header
*
* The method is included here to make it easier to change the
js support
- * in phpgw. One change then all templates will support it (as
long as they
+ * in phpgw. One change then all templates will support it (as
long as they
* include a call to this method).
*
* @author Dave Hall skwashd at phpgroupware.org
@@ -1086,26 +1085,26 @@
{
$js .=
$GLOBALS['phpgw']->js->get_script_links();
}
-
+
if ( isset($GLOBALS['phpgw_info']['menuaction']) )
{
list($app, $class, $method) =
explode('.',$GLOBALS['phpgw_info']['menuaction']);
- if ( isset($GLOBALS[$class]->public_functions)
- &&
is_array($GLOBALS[$class]->public_functions)
+ if ( isset($GLOBALS[$class]->public_functions)
+ &&
is_array($GLOBALS[$class]->public_functions)
&&
isset($GLOBALS[$class]->public_functions['java_script'])
&&
$GLOBALS[$class]->public_functions['java_script'] )
{
$js .= $GLOBALS[$class]->java_script();
}
}
-
+
if
(isset($GLOBALS['phpgw_info']['flags']['java_script']))
{
$js .=
$GLOBALS['phpgw_info']['flags']['java_script'] . "\n";
}
return $js;
}
-
+
/**
* Get window.on* events from javascript class
*
@@ -1128,7 +1127,7 @@
* Convert hexadecimal data into binary
*
* @param string $data hexidecimal data as a string
- *
+ *
* @return string binary value of $data;
*/
public static function hex2bin($data)
@@ -1181,7 +1180,7 @@
* @param string $userpass User password
* @param string $random Random seed
* @return string MD5 encrypted password
- */
+ */
public function md5_cryptpasswd($userpass)
{
return '{md5}' . base64_encode(pack('H*',
md5($userpass)));
@@ -1199,14 +1198,14 @@
{
$salt = $this->randomstring(2);
$e_password = $this->des_cryptpasswd($password,
$salt);
-
+
return $e_password;
}
elseif
(strtolower($GLOBALS['phpgw_info']['server']['ldap_encryption_type']) == 'md5')
{
return $this->md5_cryptpasswd($password);
}
-
+
return false;
}
@@ -1266,7 +1265,7 @@
// + (date('I') == 1?3600:0)
$t += phpgwapi_datetime::user_timezone();
-
+
if (! $format)
{
$format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] . ' - ';
@@ -1309,7 +1308,7 @@
{
return (implode(' ',$dlarr));
}
- }
+ }
/**
* Format the time takes settings from user preferences
@@ -1382,32 +1381,32 @@
case 32: $s .= lang('Group has been
deleted'); break;
case 33: $s .= lang('Group has been
updated'); break;
case 34: $s .= lang('Account has been
deleted') . '<p>'
- . lang('Error deleting %1 %2
directory',lang('users'),' '.lang('private').' ')
+ . lang('Error deleting %1 %2
directory',lang('users'),' '.lang('private').' ')
. ',<br />' . lang('Please %1
by hand',lang('delete')) . '<br /><br />'
. lang('To correct this error
for the future you will need to properly set the')
. '<br />' . lang('permissions
to the files/users directory')
. '<br />' . lang('On *nix
systems please type: %1','chmod 770 '
- .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/users/');
+ .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/users/');
break;
case 35: $s .= lang('Account has been
updated') . '<p>'
. lang('Error renaming %1 %2
directory',lang('users'),
- ' '.lang('private').' ')
+ ' '.lang('private').' ')
. ',<br />' . lang('Please %1
by hand',
lang('rename')) . '<br /><br />'
. lang('To correct this error
for the future you will need to properly set the')
. '<br>' . lang('permissions to
the files/users directory')
. '<br>' . lang('On *nix
systems please type: %1','chmod 770 '
- .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/users/');
+ .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/users/');
break;
case 36: $s .= lang('Account has been
created') . '<p>'
. lang('Error creating %1 %2
directory',lang('users'),
- ' '.lang('private').' ')
+ ' '.lang('private').' ')
. ',<br />' . lang('Please %1
by hand',
lang('create')) . '<br /><br />'
. lang('To correct this error
for the future you will need to properly set the')
. '<br />' . lang('permissions
to the files/users directory')
. '<br />' . lang('On *nix
systems please type: %1','chmod 770 '
- .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/users/');
+ .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/users/');
break;
case 37: $s .= lang('Group has been
added') . '<p>'
. lang('Error creating %1 %2
directory',lang('groups'),' ')
@@ -1416,7 +1415,7 @@
. lang('To correct this error
for the future you will need to properly set the')
. '<br />' . lang('permissions
to the files/users directory')
. '<br />' . lang('On *nix
systems please type: %1','chmod 770 '
- .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/groups/');
+ .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/groups/');
break;
case 38: $s .= lang('Group has been
deleted') . '<p>'
. lang('Error deleting %1 %2
directory',lang('groups'),' ')
@@ -1425,7 +1424,7 @@
. lang('To correct this error
for the future you will need to properly set the')
. '<br />' . lang('permissions
to the files/users directory')
. '<br />' . lang('On *nix
systems please type: %1','chmod 770 '
- .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/groups/');
+ .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/groups/');
break;
case 39: $s .= lang('Group has been
updated') . '<p>'
. lang('Error renaming %1 %2
directory',lang('groups'),' ')
@@ -1434,7 +1433,7 @@
. lang('To correct this error
for the future you will need to properly set the')
. '<br />' . lang('permissions
to the files/users directory')
. '<br />' . lang('On *nix
systems please type: %1','chmod 770 '
- .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/groups/');
+ .
$GLOBALS['phpgw_info']['server']['files_dir'] . '/groups/');
break;
case 40: $s .= lang('You have not entered a
title').'.';
break;
@@ -1452,11 +1451,11 @@
/**
* Process error message
*
- * @param string $error Error message
+ * @param string $error Error message
* @param integer $line Line number of error
* @param string $file Filename in which the error occured
*/
- public function phpgw_error($error,$line = '', $file = '')
+ public function phpgw_error($error,$line = '', $file = '')
{
echo '<p><strong>phpGroupWare internal
error:</strong><p>'.$error;
if ($line)
@@ -1583,7 +1582,7 @@
}
/**
- * Stops capturing all output and uses it in the XSLT temaplte
engine by stuffing it
+ * Stops capturing all output and uses it in the XSLT temaplte
engine by stuffing it
* into an xml node called "body_data"
*
* @internal Note: need to be run BEFORE exit is called, as
buffers get flushed automatically before
@@ -1694,7 +1693,7 @@
* @param array $data
* @returns array for use with msgbox
*/
-
+
public function msgbox_data($receipt)
{
$msgbox_data_error=array();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [19003] remove call to accounts::get_account_name(),
Dave Hall <=