X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=profile_edit.php;h=a9e9a42ca228ae2b76f5b1950cfd2fb075c83231;hb=f027343f84ec692438d44daac39edd0d6aad37c0;hp=d4036ec5c44ef5ebfafe4cdbc34ae56a2efe1d1c;hpb=eb14c12d3be2cd31e20988b6abf7585f6af0b34d;p=timetracker.git

diff --git a/profile_edit.php b/profile_edit.php
index d4036ec5..a9e9a42c 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -50,28 +50,30 @@ if ($request->isPost()) {
 
   if ($user->canManageTeam()) {
     $cl_team = trim($request->getParameter('team_name'));
-    $cl_address = trim($request->getParameter('address'));
     $cl_currency = trim($request->getParameter('currency'));
     if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
     $cl_lang = $request->getParameter('lang');
     $cl_decimal_mark = $request->getParameter('decimal_mark');
-    $cl_custom_format_date = $request->getParameter('format_date');
-    $cl_custom_format_time = $request->getParameter('format_time');
+    $cl_date_format = $request->getParameter('date_format');
+    $cl_time_format = $request->getParameter('time_format');
     $cl_start_week = $request->getParameter('start_week');
     $cl_tracking_mode = $request->getParameter('tracking_mode');
     $cl_project_required = $request->getParameter('project_required');
     $cl_task_required = $request->getParameter('task_required');
     $cl_record_type = $request->getParameter('record_type');
     $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
+    $cl_bcc_email = trim($request->getParameter('bcc_email'));
+
+    // Plugin checkboxes.
     $cl_charts = $request->getParameter('charts');
     $cl_clients = $request->getParameter('clients');
     $cl_client_required = $request->getParameter('client_required');
     $cl_invoices = $request->getParameter('invoices');
+    $cl_paid_status = $request->getParameter('paid_status');
     $cl_custom_fields = $request->getParameter('custom_fields');
     $cl_expenses = $request->getParameter('expenses');
     $cl_tax_expenses = $request->getParameter('tax_expenses');
     $cl_notifications = $request->getParameter('notifications');
-    $cl_bcc_email = trim($request->getParameter('bcc_email'));
     $cl_locking = $request->getParameter('locking');
     $cl_quotas = $request->getParameter('quotas');
   }
@@ -81,12 +83,11 @@ if ($request->isPost()) {
   $cl_email = $user->email;
   if ($user->canManageTeam()) {
     $cl_team = $user->team;
-    $cl_address = $user->address;
     $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
     $cl_lang = $user->lang;
     $cl_decimal_mark = $user->decimal_mark;
-    $cl_custom_format_date = $user->date_format;
-    $cl_custom_format_time = $user->time_format;
+    $cl_date_format = $user->date_format;
+    $cl_time_format = $user->time_format;
     $cl_start_week = $user->week_start;
     $cl_tracking_mode = $user->tracking_mode;
     $cl_project_required = $user->project_required;
@@ -101,6 +102,7 @@ if ($request->isPost()) {
     $cl_clients = in_array('cl', $plugins);
     $cl_client_required = in_array('cm', $plugins);
     $cl_invoices = in_array('iv', $plugins);
+    $cl_paid_status = in_array('ps', $plugins);
     $cl_custom_fields = in_array('cf', $plugins);    
     $cl_expenses = in_array('ex', $plugins);
     $cl_tax_expenses = in_array('et', $plugins);
@@ -120,11 +122,8 @@ if (!$auth->isPasswordExternal()) {
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email,'enable'=>$can_change_login));
 if ($user->canManageTeam()) {
   $form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team));
-  $form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px;','cols'=>'55','rows'=>'4','value'=>$cl_address));
   $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
-  $DECIMAL_MARK_OPTIONS = array(array('id'=>'.','name'=>'.'),array('id'=>',','name'=>','));
-  $form->addInput(array('type'=>'combobox','name'=>'decimal_mark','style'=>'width: 150px','data'=>$DECIMAL_MARK_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_decimal_mark,
-    'onchange'=>'adjustDecimalPreview()'));
+
   // Prepare an array of available languages.
   $lang_files = I18n::getLangFileList();
   foreach ($lang_files as $lfile) {
@@ -142,17 +141,22 @@ if ($user->canManageTeam()) {
   }
   $longname_lang = mu_sort($longname_lang, 'name');
   $form->addInput(array('type'=>'combobox','name'=>'lang','style'=>'width: 150px','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
+
+  $DECIMAL_MARK_OPTIONS = array(array('id'=>'.','name'=>'.'),array('id'=>',','name'=>','));
+  $form->addInput(array('type'=>'combobox','name'=>'decimal_mark','style'=>'width: 150px','data'=>$DECIMAL_MARK_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_decimal_mark,
+    'onchange'=>'adjustDecimalPreview()'));
+
   $DATE_FORMAT_OPTIONS = array(
     array('id'=>'%Y-%m-%d','name'=>'Y-m-d'),
     array('id'=>'%m/%d/%Y','name'=>'m/d/Y'),
     array('id'=>'%d.%m.%Y','name'=>'d.m.Y'),
     array('id'=>'%d.%m.%Y %a','name'=>'d.m.Y a'));
-  $form->addInput(array('type'=>'combobox','name'=>'format_date','style'=>'width: 150px;','data'=>$DATE_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_custom_format_date,
+  $form->addInput(array('type'=>'combobox','name'=>'date_format','style'=>'width: 150px;','data'=>$DATE_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_date_format,
     'onchange'=>'MakeFormatPreview("date_format_preview", this);'));
   $TIME_FORMAT_OPTIONS = array(
     array('id'=>'%H:%M','name'=>$i18n->getKey('form.profile.24_hours')),
     array('id'=>'%I:%M %p','name'=>$i18n->getKey('form.profile.12_hours')));
-  $form->addInput(array('type'=>'combobox','name'=>'format_time','style'=>'width: 150px;','data'=>$TIME_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_custom_format_time,
+  $form->addInput(array('type'=>'combobox','name'=>'time_format','style'=>'width: 150px;','data'=>$TIME_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_time_format,
     'onchange'=>'MakeFormatPreview("time_format_preview", this);'));
 
   // Prepare week start choices.
@@ -189,11 +193,12 @@ if ($user->canManageTeam()) {
     $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'bcc_email','value'=>$cl_bcc_email));
   }
 
+  // Plugin checkboxes.
   $form->addInput(array('type'=>'checkbox','name'=>'charts','value'=>$cl_charts));
   $form->addInput(array('type'=>'checkbox','name'=>'clients','value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));
   $form->addInput(array('type'=>'checkbox','name'=>'client_required','value'=>$cl_client_required));
-
   $form->addInput(array('type'=>'checkbox','name'=>'invoices','value'=>$cl_invoices));
+  $form->addInput(array('type'=>'checkbox','name'=>'paid_status','value'=>$cl_paid_status));
   $form->addInput(array('type'=>'checkbox','name'=>'custom_fields','value'=>$cl_custom_fields,'onchange'=>'handlePluginCheckboxes()'));
   $form->addInput(array('type'=>'checkbox','name'=>'expenses','value'=>$cl_expenses,'onchange'=>'handlePluginCheckboxes()'));
   $form->addInput(array('type'=>'checkbox','name'=>'tax_expenses','value'=>$cl_tax_expenses));
@@ -222,7 +227,6 @@ if ($request->isPost()) {
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
   if ($user->canManageTeam()) {
     if (!ttValidString($cl_team, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
-    if (!ttValidString($cl_address, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.address'));
     if (!ttValidString($cl_currency, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.currency'));
     if ($user->isManager()) {
       if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.bcc'));
@@ -243,6 +247,8 @@ if ($request->isPost()) {
         $plugins .= ',cm';
       if ($cl_invoices)
         $plugins .= ',iv';
+      if ($cl_paid_status)
+        $plugins .= ',ps';
       if ($cl_custom_fields)
         $plugins .= ',cf';
       if ($cl_expenses)
@@ -259,12 +265,11 @@ if ($request->isPost()) {
 
       $update_result = ttTeamHelper::update($user->team_id, array(
         'name' => $cl_team,
-        'address' => $cl_address,
         'currency' => $cl_currency,
         'lang' => $cl_lang,
         'decimal_mark' => $cl_decimal_mark,
-        'date_format' => $cl_custom_format_date,
-        'time_format' => $cl_custom_format_time,
+        'date_format' => $cl_date_format,
+        'time_format' => $cl_time_format,
         'week_start' => $cl_start_week,
         'tracking_mode' => $cl_tracking_mode,
         'project_required' => $cl_project_required,