Update of /cvsroot/phpwebsite-comm/modules/rolodex/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30376/class
Modified Files:
RDX_Forms.php RDX_Member.php RDX_Runtime.php Rolodex.php
Log Message:
1.0 updates beginning
Index: RDX_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** RDX_Forms.php 25 Jun 2008 02:48:43 -0000 1.14
--- RDX_Forms.php 3 Jul 2008 14:10:04 -0000 1.15
***************
*** 1037,1040 ****
--- 1037,1041 ----
$tpl['BUSINESS_LABEL'] = dgettext('rolodex', 'Business address');
$tpl['SETTINGS_GROUP_LABEL'] = dgettext('rolodex', 'Settings');
+ $tpl['SELECT_LIST_TIP'] = dgettext('rolodex', 'To use the category, location, or feature lists, select an item from the list and click on the "+" symbool to add the selection to this profile. To remove a selection, click on the name of the item in the box below the select menu.');
if (PHPWS_Settings::get('rolodex', 'custom1_name') || PHPWS_Settings::get('rolodex', 'custom2_name') || PHPWS_Settings::get('rolodex', 'custom3_name') || PHPWS_Settings::get('rolodex', 'custom4_name') || PHPWS_Settings::get('rolodex', 'custom5_name') || PHPWS_Settings::get('rolodex', 'custom6_name') || PHPWS_Settings::get('rolodex', 'custom7_name') || PHPWS_Settings::get('rolodex', 'custom8_name')) {
$tpl['META_GROUP_LABEL'] = dgettext('rolodex', 'Extra');
Index: RDX_Runtime.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Runtime.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** RDX_Runtime.php 4 Feb 2008 03:09:16 -0000 1.1.1.1
--- RDX_Runtime.php 3 Jul 2008 14:10:04 -0000 1.2
***************
*** 67,70 ****
--- 67,75 ----
$member = new Rolodex_Member($result[0]['user_id']);
$tpl['MEMBER_TITLE'] = $member->viewLink();
+ if ($member->getThumbnail()) {
+ $tpl['MEMBER_THUMBNAIL'] = $member->getThumbnail(true, true);
+ } else {
+ $tpl['MEMBER_THUMBNAIL'] = null;
+ }
$tpl['BROWSE_LINK'] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Browse all members'), 'rolodex', array('uop'=>'list'));
PHPWS_Core::initModClass('layout', 'Layout.php');
Index: Rolodex.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Rolodex.php 24 Jun 2008 11:23:27 -0000 1.12
--- Rolodex.php 3 Jul 2008 14:10:04 -0000 1.13
***************
*** 438,442 ****
case 'send_message':
if ($this->checkMessage()) {
! if (PHPWS_Error::logIfError($this->sendMail())) {
$this->forwardMessage(dgettext('rolodex', 'Message sent succesfully.'));
PHPWS_Core::reroute('index.php?module=rolodex&id=' . $this->member->user_id);
--- 438,442 ----
case 'send_message':
if ($this->checkMessage()) {
! if (!PHPWS_Error::logIfError($this->sendMail())) {
$this->forwardMessage(dgettext('rolodex', 'Message sent succesfully.'));
PHPWS_Core::reroute('index.php?module=rolodex&id=' . $this->member->user_id);
Index: RDX_Member.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RDX_Member.php 24 Jun 2008 11:23:27 -0000 1.11
--- RDX_Member.php 3 Jul 2008 14:10:04 -0000 1.12
***************
*** 126,130 ****
$result = $db->select('col');
}
! return $result;
}
--- 126,133 ----
$result = $db->select('col');
}
! if (!isset($result[0])) {
! $result = null;
! }
! return $result;
}
***************
*** 152,155 ****
--- 155,161 ----
$result = $link;
}
+ if (!isset($result[0])) {
+ $result = null;
+ }
return $result;
}
***************
*** 177,181 ****
}
$result = $link;
! }
return $result;
}
--- 183,190 ----
}
$result = $link;
! }
! if (!isset($result[0])) {
! $result = null;
! }
return $result;
}
|