do_query( $form, $dbh, $query, @values );
$query = undef;
+ my @columns = qw(cp_title cp_givenname cp_name cp_email cp_phone1 cp_phone2 cp_abteilung cp_fax
+ cp_mobile1 cp_mobile2 cp_satphone cp_satfax cp_project cp_privatphone cp_privatemail cp_birthday cp_gender
+ cp_street cp_zipcode cp_city);
+ @values = map { $_ eq 'cp_gender' ? ($form->{$_} eq 'f' ? 'f' : 'm') : $form->{$_} } @columns;
+
if ( $form->{cp_id} ) {
- $query = qq|UPDATE contacts SET | .
- qq|cp_title = ?, | .
- qq|cp_givenname = ?, | .
- qq|cp_name = ?, | .
- qq|cp_email = ?, | .
- qq|cp_phone1 = ?, | .
- qq|cp_phone2 = ?, | .
- qq|cp_abteilung = ?, | .
- qq|cp_fax = ?, | .
- qq|cp_mobile1 = ?, | .
- qq|cp_mobile2 = ?, | .
- qq|cp_satphone = ?, | .
- qq|cp_satfax = ?, | .
- qq|cp_project = ?, | .
- qq|cp_privatphone = ?, | .
- qq|cp_privatemail = ?, | .
- qq|cp_birthday = ?, | .
- qq|cp_gender = ? | .
- qq|WHERE cp_id = ?|;
- @values = (
- $form->{cp_title},
- $form->{cp_givenname},
- $form->{cp_name},
- $form->{cp_email},
- $form->{cp_phone1},
- $form->{cp_phone2},
- $form->{cp_abteilung},
- $form->{cp_fax},
- $form->{cp_mobile1},
- $form->{cp_mobile2},
- $form->{cp_satphone},
- $form->{cp_satfax},
- $form->{cp_project},
- $form->{cp_privatphone},
- $form->{cp_privatemail},
- $form->{cp_birthday},
- $form->{cp_gender} eq 'f' ? 'f' : 'm',
- $form->{cp_id}
- );
+ $query = qq|UPDATE contacts SET | . join(', ', map { "${_} = ?" } @columns) . qq| WHERE cp_id = ?|;
+ push @values, $form->{cp_id};
+
} elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
- $query =
- qq|INSERT INTO contacts ( cp_cv_id, cp_title, cp_givenname, | .
- qq| cp_name, cp_email, cp_phone1, cp_phone2, cp_abteilung, cp_fax, cp_mobile1, | .
- qq| cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, | .
- qq| cp_birthday, cp_gender) | .
- qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
- @values = (
- $form->{id},
- $form->{cp_title},
- $form->{cp_givenname},
- $form->{cp_name},
- $form->{cp_email},
- $form->{cp_phone1},
- $form->{cp_phone2},
- $form->{cp_abteilung},
- $form->{cp_fax},
- $form->{cp_mobile1},
- $form->{cp_mobile2},
- $form->{cp_satphone},
- $form->{cp_satfax},
- $form->{cp_project},
- $form->{cp_privatphone},
- $form->{cp_privatemail},
- $form->{cp_birthday},
- $form->{cp_gender} eq 'f' ? 'f' : 'm',
- );
+ $query = qq|INSERT INTO contacts (| . join(', ', 'cp_cv_id', @columns) . qq|) VALUES (?, | . join(', ', ('?') x scalar(@columns)) . qq|)|;
+ unshift @values, $form->{id};
}
do_query( $form, $dbh, $query, @values ) if ($query);
'trans_id' => $form->{id},
'variables' => $form,
'always_valid' => 1);
- CVar->save_custom_variables('dbh' => $dbh,
- 'module' => 'Contacts',
- 'trans_id' => $form->{cp_id},
- 'variables' => $form,
- 'name_prefix' => 'cp',
- 'always_valid' => 1);
+ if ($form->{cp_id}) {
+ CVar->save_custom_variables('dbh' => $dbh,
+ 'module' => 'Contacts',
+ 'trans_id' => $form->{cp_id},
+ 'variables' => $form,
+ 'name_prefix' => 'cp',
+ 'always_valid' => 1);
+ }
my $rc = $dbh->commit();
'trans_id' => $form->{id},
'variables' => $form,
'always_valid' => 1);
- CVar->save_custom_variables('dbh' => $dbh,
- 'module' => 'Contacts',
- 'trans_id' => $form->{cp_id},
- 'variables' => $form,
- 'name_prefix' => 'cp',
- 'always_valid' => 1);
+ if ($form->{cp_id}) {
+ CVar->save_custom_variables('dbh' => $dbh,
+ 'module' => 'Contacts',
+ 'trans_id' => $form->{cp_id},
+ 'variables' => $form,
+ 'name_prefix' => 'cp',
+ 'always_valid' => 1);
+ }
my $rc = $dbh->commit();
'vcnumber' => 'vcnumber, cp_name, cp_givenname',
);
- my %sortcols = map { $_ => 1 } qw(cp_name cp_givenname cp_phone1 cp_phone2 cp_mobile1 cp_email vcname vcnumber);
+ my %sortcols = map { $_ => 1 } qw(cp_name cp_givenname cp_phone1 cp_phone2 cp_mobile1 cp_email cp_street cp_zipcode cp_city vcname vcnumber);
my $order_by = $sortcols{$::form->{sort}} ? $::form->{sort} : 'cp_name';
$::form->{sort} = $order_by;
push @where_tokens, map { "($_)" } join ' OR ', @tokens;
}
+ my ($cvar_where, @cvar_values) = CVar->build_filter_query('module' => 'Contacts',
+ 'trans_id_field' => 'cp.cp_id',
+ 'filter' => $params{filter});
+
+ if ($cvar_where) {
+ push @where_tokens, $cvar_where;
+ push @values, @cvar_values;
+ }
+
if (my $filter = $params{filter}) {
for (qw(name title givenname email project abteilung)) {
next unless $filter->{"cp_$_"};