[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] hrm/inc class.uiplace.inc.php, 1.2 class.souser.inc.p
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] hrm/inc class.uiplace.inc.php, 1.2 class.souser.inc.php, 1.2 class.soplace.inc.php, 1.2 class.boplace.inc.php, 1.2 |
|
Date: |
Tue, 22 Nov 2005 19:20:00 +0100 |
Update of hrm/inc
Modified Files:
Branch: MAIN
class.uiplace.inc.php lines: +18 -24
class.souser.inc.php lines: +2 -3
class.soplace.inc.php lines: +27 -87
class.boplace.inc.php lines: +6 -14
Log Message:
no message
====================================================
Index: hrm/inc/class.uiplace.inc.php
diff -u hrm/inc/class.uiplace.inc.php:1.1 hrm/inc/class.uiplace.inc.php:1.2
--- hrm/inc/class.uiplace.inc.php:1.1 Tue Nov 22 15:25:21 2005
+++ hrm/inc/class.uiplace.inc.php Tue Nov 22 18:20:09 2005
@@ -174,32 +174,28 @@
function edit()
{
$place_id =
get_var('place_id',array('POST','GET'));
- $place_id =
get_var('place_id',array('POST','GET'));
$values = get_var('values',array('POST'));
$GLOBALS['phpgw']->xslttpl->add_file(array('place'));
if (is_array($values))
{
- $values['place_id']=
get_var('place_id',array('POST'));
- $values['place_id']= $place_id;
-
if ($values['save'] || $values['apply'])
{
- if(!$values['place_name'])
+ if(!$values['name'])
{
$receipt['error'][]=array('msg'=>lang('Please enter a name !'));
}
- if(!$values['place_address'])
+ if(!$values['address'])
{
$receipt['error'][]=array('msg'=>lang('Please enter an address !'));
}
- if(!$values['place_zip'])
+ if(!$values['zip'])
{
$receipt['error'][]=array('msg'=>lang('Please enter a zip code !'));
}
- if(!$values['place_town'])
+ if(!$values['town'])
{
$receipt['error'][]=array('msg'=>lang('Please enter a town !'));
}
@@ -248,8 +244,7 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uiplace.edit',
- 'place_id' => $place_id,
- 'place_id' => $place_id
+ 'place_id' => $place_id
);
//_debug_array($link_data);
@@ -261,12 +256,11 @@
(
'value_title' =>
$values['title'],
'value_entry_date' =>
$values['entry_date'],
- 'value_reference' =>
$values['reference'],
- 'value_place_name' =>
$values['name'],
- 'value_place_address' =>
$values['address'],
- 'value_place_zip' =>
$values['zip'],
- 'value_place_town' =>
$values['town'],
- 'value_place_remark' =>
$values['remark'],
+ 'value_name' =>
$values['name'],
+ 'value_address' => $values['address'],
+ 'value_zip' =>
$values['zip'],
+ 'value_town' =>
$values['town'],
+ 'value_remark' => $values['remark'],
'lang_entry_date' =>
lang('Entry date'),
@@ -282,11 +276,11 @@
'lang_place_status_text' =>
lang('Enter a new place'),
'lang_no_place'
=> lang('select a place'),
- 'lang_place_name' =>
lang('name'),
- 'lang_place_address' =>
lang('address'),
- 'lang_place_zip' =>
lang('zip'),
- 'lang_place_town' =>
lang('town'),
- 'lang_place_remark' =>
lang('remark'),
+ 'lang_name' => lang('name'),
+ 'lang_address' => lang('address'),
+ 'lang_zip' => lang('zip'),
+ 'lang_town' => lang('town'),
+ 'lang_remark' =>
lang('remark'),
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
@@ -396,13 +390,13 @@
$link_data = array
(
- 'menuaction' =>
$this->currentapp.'.uiplace.training',
+ 'menuaction' =>
$this->currentapp.'.uiplace.index',
'place_id' => $place_id
);
if (get_var('confirm',array('POST')))
{
- $this->bo->delete_training($place_id,$place_id);
+ $this->bo->delete($place_id);
Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
====================================================
Index: hrm/inc/class.souser.inc.php
diff -u hrm/inc/class.souser.inc.php:1.1 hrm/inc/class.souser.inc.php:1.2
--- hrm/inc/class.souser.inc.php:1.1 Mon Nov 21 12:01:20 2005
+++ hrm/inc/class.souser.inc.php Tue Nov 22 18:20:09 2005
@@ -281,5 +281,4 @@
return $place;
}
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.soplace.inc.php
diff -u hrm/inc/class.soplace.inc.php:1.1 hrm/inc/class.soplace.inc.php:1.2
--- hrm/inc/class.soplace.inc.php:1.1 Tue Nov 22 15:25:21 2005
+++ hrm/inc/class.soplace.inc.php Tue Nov 22 18:20:09 2005
@@ -144,122 +144,64 @@
return $training;
}
- function add_place($values)
+ function add($values)
{
- $values['new_place_name'] =
$this->db->db_addslashes($values['new_place_name']);
- $values['new_place_address'] =
$this->db->db_addslashes($values['new_place_address']);
- $values['new_place_town'] =
$this->db->db_addslashes($values['new_place_town']);
- $values['new_place_descr'] =
$this->db->db_addslashes($values['new_place_descr']);
- $values['place_id'] =
$this->bocommon->next_id('hrm_training_place');
-
- $insert_values=array(
- $values['place_id'],
- $values['new_place_name'],
- $values['new_place_address'],
- $values['new_place_zip'],
- $values['new_place_town'],
- $values['new_place_remark'],
- );
-
- $insert_values =
$this->bocommon->validate_db_insert($insert_values);
- $this->db->query("INSERT INTO hrm_training_place
(id,name,address,zip,town, remark) "
- . "VALUES ($insert_values)",__LINE__,__FILE__);
-
- return $values['place_id'];
- }
-
- function add_training($values)
- {
- $values['descr'] =
$this->db->db_addslashes($values['descr']);
- $values['title'] =
$this->db->db_addslashes($values['title']);
-
$this->db->transaction_begin();
- if($values['new_place_name'] &&
$values['place_id']=='new_place')
- {
- $values['place_id'] = $this->add_place($values);
- }
-
- $training_id = $this->bocommon->next_id('hrm_training');
+ $values['name'] =
$this->db->db_addslashes($values['name']);
+ $values['address'] =
$this->db->db_addslashes($values['address']);
+ $values['town'] =
$this->db->db_addslashes($values['town']);
+ $values['descr'] =
$this->db->db_addslashes($values['descr']);
+ $values['place_id'] =
$this->bocommon->next_id('hrm_training_place');
$insert_values=array(
- $training_id,
- $values['user_id'],
- $values['cat_id'],
- $values['title'],
- $values['start_date'],
- $values['end_date'],
- $values['reference'],
- $values['skill'],
$values['place_id'],
- $values['descr'],
- time(),
- $this->account
+ $values['name'],
+ $values['address'],
+ $values['zip'],
+ $values['town'],
+ $values['remark'],
);
$insert_values =
$this->bocommon->validate_db_insert($insert_values);
-
- $this->db->query("INSERT INTO hrm_training
(id,user_id,category,title,start_date,end_date,reference,skill,place_id,descr,entry_date,owner)
"
+ $this->db->query("INSERT INTO hrm_training_place
(id,name,address,zip,town, remark) "
. "VALUES ($insert_values)",__LINE__,__FILE__);
$receipt['message'][]=array('msg'=>lang('training item
has been saved'));
-
- $receipt['training_id']= $training_id;
+ $receipt['place_id']= $values['place_id'];
$this->db->transaction_commit();
+
return $receipt;
}
- function edit_training($values)
+ function edit($values)
{
$this->db->transaction_begin();
- if($values['new_place_name'] &&
$values['place_id']=='new_place')
- {
- $values['place_id'] = $this->add_place($values);
- }
-
- $value_set['descr'] =
$this->db->db_addslashes($values['descr']);
- $value_set['category'] = $values['cat_id'];
- $value_set['title'] =
$this->db->db_addslashes($values['title']);
- $value_set['start_date'] = $values['start_date'];
- $value_set['end_date'] = $values['end_date'];
- $value_set['reference'] =
$this->db->db_addslashes($values['reference']);
- $value_set['skill'] =
$values['skill'];
- $value_set['place_id'] = $values['place_id'];
+ $value_set['name'] =
$this->db->db_addslashes($values['name']);
+ $value_set['address'] =
$this->db->db_addslashes($values['address']);
+ $value_set['zip'] = $values['zip'];
+ $value_set['remark'] =
$this->db->db_addslashes($values['remark']);
+ $value_set['town'] =
$this->db->db_addslashes($values['town']);
$value_set =
$this->bocommon->validate_db_update($value_set);
- $table='hrm_training';
- $this->db->query("UPDATE $table set $value_set WHERE
id=" . $values['training_id'],__LINE__,__FILE__);
+ $this->db->query("UPDATE hrm_training_place set
$value_set WHERE id=" . $values['place_id'],__LINE__,__FILE__);
$this->db->transaction_commit();
- $receipt['message'][]=array('msg'=>lang('Training item
has been edited'));
+ $receipt['message'][]=array('msg'=>lang('Place item has
been edited'));
- $receipt['training_id']= $values['training_id'];
+ $receipt['place_id']= $values['place_id'];
return $receipt;
}
- function delete_training($user_id,$id)
- {
-
- $this->db->query('DELETE FROM hrm_training WHERE id='
. intval($id) . ' AND user_id=' . intval($user_id),__LINE__,__FILE__);
- }
-
- function select_category_list()
+ function delete($id)
{
- $this->db->query("SELECT id, descr FROM
hrm_training_category ORDER BY descr ");
- $i = 0;
- while ($this->db->next_record())
- {
- $categories[$i]['id']
= $this->db->f('id');
- $categories[$i]['name']
= stripslashes($this->db->f('descr'));
- $i++;
- }
- return $categories;
+ $this->db->query('DELETE FROM hrm_training_place WHERE
id=' . intval($id),__LINE__,__FILE__);
}
function select_place_list()
@@ -275,6 +217,4 @@
}
return $place;
}
-
- }
-?>
+ }
\ No newline at end of file
====================================================
Index: hrm/inc/class.boplace.inc.php
diff -u hrm/inc/class.boplace.inc.php:1.1 hrm/inc/class.boplace.inc.php:1.2
--- hrm/inc/class.boplace.inc.php:1.1 Tue Nov 22 15:25:21 2005
+++ hrm/inc/class.boplace.inc.php Tue Nov 22 18:20:09 2005
@@ -150,24 +150,16 @@
return $values;
}
- function read_training($user_id)
- {
- $values = $this->so->read_training($user_id);
- return $values;
- }
-
function save($values,$action='')
{
- $values['start_date'] =
$this->bocommon->date_to_timestamp($values['start_date']);
- $values['end_date'] =
$this->bocommon->date_to_timestamp($values['end_date']);
if ($action=='edit')
{
- if ($values['training_id'] != '')
+ if ($values['place_id'] != '')
{
- $receipt =
$this->so->edit_training($values);
+ $receipt = $this->so->edit($values);
}
else
{
@@ -176,15 +168,15 @@
}
else
{
- $receipt = $this->so->add_training($values);
+ $receipt = $this->so->add($values);
}
return $receipt;
}
- function delete_training($user_id,$id)
+ function delete($id)
{
- $this->so->delete_training($user_id,$id);
+ $this->so->delete($id);
}
function select_category_list($format='',$selected='')
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] hrm/inc class.uiplace.inc.php, 1.2 class.souser.inc.php, 1.2 class.soplace.inc.php, 1.2 class.boplace.inc.php, 1.2,
sigurdne <=