Skip to content

Commit bf08ef6

Browse files
author
momo_102
committed
Lot of bugfixes
1 parent f615814 commit bf08ef6

File tree

10 files changed

+156
-31
lines changed

10 files changed

+156
-31
lines changed

‎com_clubmanagement/admin/models/fields/cmcustom.php‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?php
2+
// Check to ensure this file is included in Joomla!
3+
defined('_JEXEC') or die('Restricted access');
4+
5+
jimport('joomla.form.formfield');
6+
jimport('joomla.application.component.helper');
7+
8+
class JFormFieldCmCustom extends JFormField
9+
{
10+
11+
protected $type = 'cmcustom';
12+
13+
public function getLabel()
14+
{
15+
// Get the label text from the XML element, defaulting to the element name.
16+
$text = $this->element['label'] ? (string) $this->element['label'] : (string) $this->element['name'];
17+
18+
// Build the class for the label.
19+
$class = !empty($this->description) ? 'hasTip' : '';
20+
$class = $this->required == true ? $class.' required' : $class;
21+
22+
$label = '<label id="'.$this->id.'-lbl" for="'.$this->id.'" class="'.$class.'"';
23+
24+
// If a description is specified, use it to build a tooltip.
25+
if (!empty($this->description)) {
26+
$label .= ' title="'.htmlspecialchars(trim(JText::_($text), ':').'::' .
27+
JText::_($this->description), ENT_COMPAT, 'UTF-8').'"';
28+
}
29+
30+
// Retrive label
31+
$customLabel = JComponentHelper::getParams('com_clubmanagement')->get($this->element['name']);
32+
if (strlen($customLabel) == 0)
33+
{
34+
$customLabel = JText::_($this->element['label']);
35+
}
36+
37+
// Add the label text and closing tag.
38+
$label .= '>'.$customLabel.'</label>';
39+
40+
return $label;
41+
}
42+
43+
public function getInput()
44+
{
45+
// Initialize field attributes.
46+
$attr = ' type="text"';
47+
$attr .= ' name="'.$this->name.'"';
48+
$attr .= ' id="'.$this->id.'"';
49+
$attr .= ' value="'.htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8').'"';
50+
$attr .= $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
51+
$attr .= $this->element['size'] ? ' size="' . (int) $this->element['size'] . '"' : '';
52+
$attr .= $this->element['required'] ? ' required' : '';
53+
$attr .= $this->element['disabled'] ? ' disabled' : '';
54+
return ' <input'.$attr.' />';
55+
}
56+
57+
}
58+
?>

‎com_clubmanagement/admin/models/fields/cmimagelist.php‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?php
2+
/**
3+
* @version $Id$
4+
* @package Joomla
5+
* @subpackage ClubManagement-Main
6+
* @copyright Copyright (c) 2015 Norbert Kümin. All rights reserved.
7+
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE
8+
* @author Norbert Kuemin
9+
* @authorEmail momo_102@bluemail.ch
10+
*/
11+
12+
// Check to ensure this file is included in Joomla!
13+
defined('_JEXEC') or die('Restricted access');
14+
15+
jimport('joomla.form.formfield');
16+
17+
// The class name must always be the same as the filename (in camel case)
18+
class JFormFieldCmImageList extends JFormField {
19+
20+
//The field class must know its own type through the variable $type.
21+
protected $type = 'cmimagelist';
22+
23+
public function getInput() {
24+
$param = JComponentHelper::getParams('com_clubmanagement');
25+
$dir = JPATH_ROOT.$param->get('image_dir');
26+
$option = '';
27+
$multiple = '';
28+
if ($this->element['multiple'] == 'true') {
29+
$multiple = 'multiple ';
30+
}
31+
if (is_array($this->value)) {
32+
$values = $this->value;
33+
} else {
34+
$values = array($this->value);
35+
}
36+
$files = array("");
37+
if ($handle = opendir($dir)) {
38+
while (false !== ($file = readdir($handle))) {
39+
if (!is_dir($directory. "/" . $file)) {
40+
$files[] = $file;
41+
}
42+
}
43+
closedir($handle);
44+
}
45+
asort($files);
46+
foreach($files as $file) {
47+
$option .= '<option value="'.$file.'"';
48+
if (array_search($file,$values) !== false) {
49+
$option .= ' selected';
50+
}
51+
$option .= '>'.$file.'</option>';
52+
}
53+
return '<select '.$multiple.'id="'.$this->id.'" name="'.$this->name.'">'.$option.'</select>';
54+
}
55+
}

‎com_clubmanagement/admin/models/forms/person.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,8 @@
9090
cols="40" rows="7"
9191
required="false" />
9292

93-
<field name="image" type="imagelist" label="COM_CLUBMANAGEMENT_PERSONS_FIELD_IMAGE_LABEL"
93+
<field name="image" type="cmimagelist" label="COM_CLUBMANAGEMENT_PERSONS_FIELD_IMAGE_LABEL"
9494
description="COM_CLUBMANAGEMENT_PERSONS_FIELD_IMAGE_DESC"
95-
directory=""
9695
required="false" />
9796

9897
<field name="birthday" type="calendar" label="COM_CLUBMANAGEMENT_PERSONS_FIELD_BIRTHDAY_LABEL"

‎com_clubmanagement/com_clubmanagement.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<name>Club Management</name>
44
<author>Norbert Kuemin</author>
55
<authorEmail>momo_102@bluemail.ch</authorEmail>
6-
<creationDate>August 2014</creationDate>
7-
<copyright>(C) 2014 Norbert Kuemin</copyright>
6+
<creationDate>January 2015</creationDate>
7+
<copyright>(C) 2015 Norbert Kuemin</copyright>
88
<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
9-
<version>3.0.1</version>
9+
<version>3.0.4</version>
1010
<description>COM_CLUBMANAGEMENT_XML_DESC</description>
1111

1212
<install>

‎com_clubmanagement/language/de-DE.com_clubmanagement.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_COLUMN_5_LABEL="Mitglieder-Feld
8080
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_COLUMN_5_DESC="Mitglieder-Feld das angezeigt werden soll in der Spalte 5."
8181
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_SORT_COLUMN_1_LABEL="Sortierung Mitglieder-Feld 1"
8282
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_SORT_COLUMN_1_DESC="Mitglieder-Feld nach dem sortiert werden soll 1."
83-
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_SORT_DIRECTION_1_LABEL="Mitgliedschaft sortierrichtung 1"
83+
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_SORT_DIRECTION_1_LABEL="Mitgliedschaft Sortierrichtung 1"
8484
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_SORT_DIRECTION_1_DESC="Sortierrichtung für die Mitgliedschaft 1."
8585
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_SORT_COLUMN_2_LABEL="Sortierung Mitglieder-Feld 2"
8686
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_SORT_COLUMN_2_DESC="Mitglieder-Feld nach dem sortiert werden soll 2."
87-
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_SORT_DIRECTION_2_LABEL="Mitgliedschaft sortierrichtung 2"
87+
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_SORT_DIRECTION_2_LABEL="Mitgliedschaft Sortierrichtung 2"
8888
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_MEMBERSHIP_SORT_DIRECTION_2_DESC="Sortierrichtung für die Mitgliedschaft 2."
8989
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_TITLE_LABEL="Titel Vorstand"
9090
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_TITLE_DESC="Titel f&uuml;r die Vorstandsliste."
@@ -100,11 +100,11 @@ COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_COLUMN_5_LABEL="Vorstand-Feld 5"
100100
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_COLUMN_5_DESC="Vorstand-Feld das angezeigt werden soll in der Spalte 5."
101101
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_SORT_COLUMN_1_LABEL="Sortierung Vorstand-Feld 1"
102102
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_SORT_COLUMN_1_DESC="Vorstand-Feld nach dem sortiert werden soll 1."
103-
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_SORT_DIRECTION_1_LABEL="Vorstand sortierrichtung 1"
103+
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_SORT_DIRECTION_1_LABEL="Vorstand Sortierrichtung 1"
104104
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_SORT_DIRECTION_1_DESC="Sortierrichtung für den Vorstand 1."
105105
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_SORT_COLUMN_2_LABEL="Sortierung Vorstand-Feld 2"
106106
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_SORT_COLUMN_2_DESC="Vorstand-Feld nach dem sortiert werden soll 2."
107-
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_SORT_DIRECTION_2_LABEL="Vorstand sortierrichtung 2"
107+
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_SORT_DIRECTION_2_LABEL="Vorstand Sortierrichtung 2"
108108
COM_CLUBMANAGEMENT_CONFIGFIELD_DETAIL_BOARD_SORT_DIRECTION_2_DESC="Sortierrichtung für den Vorstand 2."
109109
;Config/Board
110110
COM_CLUBMANAGEMENT_CONFIGFIELD_BOARD_JOBS_DESC="M&ouml;gliche Jobs im Vorstand (WERT1=Anzeige1;WERT2=Anzeige2;...)"

‎com_clubmanagement/language/de-DE.com_clubmanagement.sys.ini‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
;@authorEmail momo_102@bluemail.ch
88
COM_CLUBMANAGEMENT="Vereins-Verwaltung"
99
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_ADDRESS_LIST_LAYOUT_DESC="Liste im Adressen-Layout (5 Felder)."
10-
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_ADDRESS_LIST_LAYOUT_TITLE="Adressliste"
10+
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_ADDRESS_LIST_LAYOUT_TITLE="Vorstand Adressliste"
1111
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_CARD_LAYOUT_DESC="Liste im Visitenkarten-Layout (5 Felder 1 ein Bild)."
12-
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_CARD_LAYOUT_TITLE="Visitenkarten"
12+
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_CARD_LAYOUT_TITLE="Vorstand Visitenkarten"
1313
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_DESC="Vorstand informationen"
1414
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_LIST_LAYOUT_DESC="Allgemeines Listen-Layout."
15-
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_LIST_LAYOUT_TITLE="Liste"
15+
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_LIST_LAYOUT_TITLE="Vorstand Liste"
1616
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_TITLE="Vorstand"
1717
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_ADDRESS_LIST_LAYOUT_DESC="Liste im Adressen-Layout (5 Felder)."
18-
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_ADDRESS_LIST_LAYOUT_TITLE="Adressliste"
18+
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_ADDRESS_LIST_LAYOUT_TITLE="Mitglieder Adressliste"
1919
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_CARD_LAYOUT_DESC="Liste im Visitenkarten-Layout (5 Felder 1 ein Bild)."
20-
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_CARD_LAYOUT_TITLE="Visitenkarten"
20+
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_CARD_LAYOUT_TITLE="Mitglieder Visitenkarten"
2121
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_DESC="Mitglieder Informationen"
2222
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_LIST_LAYOUT_DESC="Allgemeines Listen-Layout."
23-
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_LIST_LAYOUT_TITLE="Liste"
23+
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_LIST_LAYOUT_TITLE="Mitglieder Liste"
2424
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_TITLE="Mitglieder"
2525
COM_CLUBMANAGEMENT_PERSON_VIEW_DESC="Personen Informationen"
26-
COM_CLUBMANAGEMENT_PERSON_VIEW_DETAIL_LAYOUT_DESC="Personen Details"
27-
COM_CLUBMANAGEMENT_PERSON_VIEW_DETAIL_LAYOUT_TITLE="Details"
28-
COM_CLUBMANAGEMENT_PERSON_VIEW_EDIT_LAYOUT_DESC="Bearbeitungsformular für personendaten."
29-
COM_CLUBMANAGEMENT_PERSON_VIEW_EDIT_LAYOUT_TITLE="Bearbeitungsformular"
26+
COM_CLUBMANAGEMENT_PERSON_VIEW_DETAIL_LAYOUT_DESC="Personen Detail Informationen"
27+
COM_CLUBMANAGEMENT_PERSON_VIEW_DETAIL_LAYOUT_TITLE="Person Detail"
28+
COM_CLUBMANAGEMENT_PERSON_VIEW_EDIT_LAYOUT_DESC="Bearbeitungsformular für Personendaten."
29+
COM_CLUBMANAGEMENT_PERSON_VIEW_EDIT_LAYOUT_TITLE="Person Bearbeitungsformular"
3030
COM_CLUBMANAGEMENT_PERSON_VIEW_TITLE="Personen"
3131
COM_CLUBMANAGEMENT_UPDATE_NAME="Vereins-Verwaltung Neuerungen"
3232
COM_CLUBMANAGEMENT_XML_DESC="Komponente f&uuml;r die Vereinsverwaltung (Personen, Mitglieder, Vorstand)"

‎com_clubmanagement/language/en-GB.com_clubmanagement.sys.ini‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
;@authorEmail momo_102@bluemail.ch
88
COM_CLUBMANAGEMENT="Club Management"
99
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_ADDRESS_LIST_LAYOUT_DESC="Address list layout"
10-
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_ADDRESS_LIST_LAYOUT_TITLE="Address list"
10+
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_ADDRESS_LIST_LAYOUT_TITLE="Board addresses"
1111
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_CARD_LAYOUT_DESC="Business card layout"
12-
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_CARD_LAYOUT_TITLE="Business card"
12+
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_CARD_LAYOUT_TITLE="Board business card"
1313
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_DESC="Board informations"
1414
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_LIST_LAYOUT_DESC="Generic list layout"
15-
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_LIST_LAYOUT_TITLE="List"
15+
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_LIST_LAYOUT_TITLE="Board list"
1616
COM_CLUBMANAGEMENT_BOARDENTRIES_VIEW_TITLE="Board"
1717
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_ADDRESS_LIST_LAYOUT_DESC="Address list style (5 lines)"
18-
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_ADDRESS_LIST_LAYOUT_TITLE="Address list"
18+
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_ADDRESS_LIST_LAYOUT_TITLE="Member address list"
1919
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_CARD_LAYOUT_DESC="List in business card style (5 lines + picture)."
20-
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_CARD_LAYOUT_TITLE="Business card"
20+
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_CARD_LAYOUT_TITLE="Member business card"
2121
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_DESC="Membership informations"
2222
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_LIST_LAYOUT_DESC="Simple list style."
23-
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_LIST_LAYOUT_TITLE="Generic list"
23+
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_LIST_LAYOUT_TITLE="Member list"
2424
COM_CLUBMANAGEMENT_MEMBERSHIPS_VIEW_TITLE="Membership"
2525
COM_CLUBMANAGEMENT_PERSON_VIEW_DESC="Person informations"
26-
COM_CLUBMANAGEMENT_PERSON_VIEW_DETAIL_LAYOUT_DESC="Person details"
27-
COM_CLUBMANAGEMENT_PERSON_VIEW_DETAIL_LAYOUT_TITLE="Details"
28-
COM_CLUBMANAGEMENT_PERSON_VIEW_EDIT_LAYOUT_DESC="Person edit form"
29-
COM_CLUBMANAGEMENT_PERSON_VIEW_EDIT_LAYOUT_TITLE="Edit form"
26+
COM_CLUBMANAGEMENT_PERSON_VIEW_DETAIL_LAYOUT_DESC="Person detail information"
27+
COM_CLUBMANAGEMENT_PERSON_VIEW_DETAIL_LAYOUT_TITLE="Person detail"
28+
COM_CLUBMANAGEMENT_PERSON_VIEW_EDIT_LAYOUT_DESC="User can edit their own record(s)."
29+
COM_CLUBMANAGEMENT_PERSON_VIEW_EDIT_LAYOUT_TITLE="Person edit form"
3030
COM_CLUBMANAGEMENT_PERSON_VIEW_TITLE="Person"
3131
COM_CLUBMANAGEMENT_UPDATE_NAME="Club management updates"
3232
COM_CLUBMANAGEMENT_XML_DESC="Component for managing clubs (Persons, Memberships, Board)"

‎com_clubmanagement/site/views/boardentries/tmpl/card.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@
7474
foreach($this->items as $item) {
7575
$row = (array) $item;
7676
$lines = array();
77+
$imageCol = $this->paramsMenuEntry->get( "column_image" );
78+
if ($imageCol != "") {
79+
$image = $row[$imageCol];
80+
}
7781
for($i=0;$i<$Line;$i++) {
7882
for($j=0;$j<$FieldPerLine;$j++) {
7983
$colnr = $i*$FieldPerLine+$j;
@@ -97,6 +101,7 @@
97101
$lines[$i] = "<a href=\"".$uri->toString()."\" class=\"modal\" rel=\"{handler: 'iframe', size: {x: ".$this->paramsComponent->get( 'detail_width' ).", y: ".$this->paramsComponent->get( 'detail_height' )."}}\">".$lines[$i]."</a>";
98102
}
99103
}
104+
echo "<table".$borderStyle.">\n";
100105
switch ($this->paramsMenuEntry->get( "picpos" )) {
101106
case "right": //picture on the left side
102107
echo "<tr valign=\"top\">\n";

‎com_clubmanagement/site/views/memberships/tmpl/card.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@
7676
foreach($this->items as $item) {
7777
$row = (array) $item;
7878
$lines = array();
79+
$imageCol = $this->paramsMenuEntry->get( "column_image" );
80+
if ($imageCol != "") {
81+
$image = $row[$imageCol];
82+
}
7983
for($i=0;$i<$Line;$i++) {
8084
for($j=0;$j<$FieldPerLine;$j++) {
8185
$colnr = $i*$FieldPerLine+$j;
@@ -99,6 +103,7 @@
99103
$lines[$i] = "<a href=\"".$uri->toString()."\" class=\"modal\" rel=\"{handler: 'iframe', size: {x: ".$this->paramsComponent->get( 'detail_width' ).", y: ".$this->paramsComponent->get( 'detail_height' )."}}\">".$lines[$i]."</a>";
100104
}
101105
}
106+
echo "<table".$borderStyle.">\n";
102107
switch ($this->paramsMenuEntry->get( "picpos" )) {
103108
case "right": //picture on the left side
104109
echo "<tr valign=\"top\">\n";

‎com_clubmanagement/site/views/person/tmpl/detail.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,13 @@ function getParamList($obj, $prefix, $amount) {
6565
echo "<style type=\"text/css\" media=\"screen\">\n".$this->paramsComponent->get("detail_css")."\n</style>\n";
6666
}
6767
echo "<div class=\"cmdetail\"><table class=\"cmdetail_table\">\n";
68+
$imageCol = $this->paramsComponent->get( "detail_column_image" );
69+
$label = $this->paramsComponent->get( "detail_show_label" );
6870
for ($i=0;$i<$personColumnCount;$i++) {
6971
$field = $personColumns[$i];
7072
echo "\t<tr class=\"cmdetail_row\">\n";
71-
if (($i == 0) && ($this->paramsComponent->get("detail_column_image") != "")) {
73+
if (($i == 0) && ($imageCol != "")) {
74+
$image = $row[$imageCol];
7275
echo "\t\t<td class=\"cmdetail_imagefield\" rowspan=\"".$personColumnCount."\"><img class=\"cmdetail_image\" src=\"".$imageDir.$image."\"></td>\n";
7376
}
7477
if ($label != "0") {
@@ -103,7 +106,7 @@ function getParamList($obj, $prefix, $amount) {
103106
$data = $model->getMembershipItems($id,$sort);
104107
echo "<div class=\"cmdetail_member\">\n";
105108
if ($this->paramsComponent->get("detail_member_title") != "") {
106-
echo "<span class=\"cmdetail_member_title\">".$this->paramsComponent->get($this,"detail_member_title")."</span>\n";
109+
echo "<span class=\"cmdetail_member_title\">".$this->paramsComponent->get("detail_member_title")."</span>\n";
107110
}
108111
echo "<table class=\"cmdetail_member_table\">\n";
109112
if ($label != "0") {

0 commit comments

Comments
 (0)