X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_edit.php;h=a3421a8d21074b24f771a39cfe607a484e1ee57d;hb=05b0f8e4762b8a2ca2002a8f7545b7ff68cc3925;hp=2dca2447c161f8ccab3df36528885964114348b1;hpb=eb55e2f8ca3859482a389795e03b45283e14ef36;p=timetracker.git

diff --git a/time_edit.php b/time_edit.php
index 2dca2447..a3421a8d 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -41,7 +41,7 @@ if (!ttAccessCheck(right_data_entry)) {
 }
 
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
   $custom_fields = new CustomFields($user->team_id);
   $smarty->assign('custom_fields', $custom_fields);
@@ -70,7 +70,7 @@ if ($request->isPost()) {
   $cl_project = $request->getParameter('project');
   $cl_task = $request->getParameter('task');
   $cl_billable = 1;
-  if (in_array('iv', explode(',', $user->plugins)))
+  if ($user->isPluginEnabled('iv'))
     $cl_billable = $request->getParameter('billable');
 } else {
   $cl_client = $time_rec['client_id'];
@@ -88,7 +88,7 @@ if ($request->isPost()) {
     $fields = $custom_fields->get($time_rec['id']);
     if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
       $cl_cf_1 = $fields[0]['value'];
-    else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+    elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
       $cl_cf_1 = $fields[0]['option_id'];
   }
 
@@ -98,7 +98,7 @@ if ($request->isPost()) {
   if (($cl_start == $cl_finish) && ($cl_duration == '0:00')) {
     $cl_finish = '';
     $cl_duration = '';
-    $messages->add($i18n->getKey('form.time_edit.uncompleted'));
+    $msg->add($i18n->getKey('form.time_edit.uncompleted'));
   }
 }
 
@@ -106,7 +106,7 @@ if ($request->isPost()) {
 $form = new Form('timeRecordForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && in_array('cl', explode(',', $user->plugins))) {
+if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
   $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
@@ -132,7 +132,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
     'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
-  if (in_array('cl', explode(',', $user->plugins))) {
+  if ($user->isPluginEnabled('cl')) {
     $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
@@ -190,7 +190,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
   // Only one custom field is supported at this time.
   if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) {
     $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1));
-  } else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
+  } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
     $form->addInput(array('type'=>'combobox',
       'name'=>'cf_1',
       'style'=>'width: 250px;',
@@ -201,7 +201,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
 }
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-if (in_array('iv', explode(',', $user->plugins)))
+if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','data'=>1,'value'=>$cl_billable));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.save')));
@@ -211,7 +211,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getK
 if ($request->isPost()) {
 
   // Validate user input.
-  if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
+  if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
     $err->add($i18n->getKey('error.client'));
   if ($custom_fields) {
     if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
@@ -225,7 +225,7 @@ if ($request->isPost()) {
   if (!$cl_duration) {
     if ('0' == $cl_duration)
       $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
-    else if ($cl_start || $cl_finish) {
+    elseif ($cl_start || $cl_finish) {
       if (!ttTimeHelper::isValidTime($cl_start))
         $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
       if ($cl_finish) {
@@ -319,7 +319,7 @@ if ($request->isPost()) {
       if ($res && $custom_fields) {
         if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
           $res = $custom_fields->update($cl_id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
-        else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
           $res = $custom_fields->update($cl_id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
       }
       if ($res)
@@ -378,7 +378,7 @@ if ($request->isPost()) {
       if ($id && $custom_fields && $cl_cf_1) {
         if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
           $res = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
-        else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
           $res = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
       }
       if ($id && $res) {