[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9852] controller: remove stripslashes for integers
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9852] controller: remove stripslashes for integers |
|
Date: |
Tue, 14 Aug 2012 12:31:16 +0000 |
Revision: 9852
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9852
Author: sigurdne
Date: 2012-08-14 12:31:16 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
controller: remove stripslashes for integers
Modified Paths:
--------------
trunk/controller/inc/class.socase.inc.php
trunk/controller/inc/class.socheck_item.inc.php
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/class.socontrol.inc.php
trunk/controller/inc/class.socontrol_group.inc.php
trunk/controller/inc/class.socontrol_group_list.inc.php
trunk/controller/inc/class.socontrol_item.inc.php
trunk/controller/inc/class.socontrol_item_list.inc.php
trunk/controller/inc/class.socontrol_item_option.inc.php
trunk/controller/inc/class.sodocument.inc.php
trunk/controller/inc/class.soprocedure.inc.php
Modified: trunk/controller/inc/class.socase.inc.php
===================================================================
--- trunk/controller/inc/class.socase.inc.php 2012-08-14 11:30:12 UTC (rev
9851)
+++ trunk/controller/inc/class.socase.inc.php 2012-08-14 12:31:16 UTC (rev
9852)
@@ -68,17 +68,17 @@
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
if($this->db->next_record()) {
- $case = new
controller_check_item_case($this->unmarshal($this->db->f('id', true), 'int'));
-
$case->set_check_item_id($this->unmarshal($this->db->f('check_item_id', true),
'int'));
-
$case->set_status($this->unmarshal($this->db->f('status', true), 'int'));
-
$case->set_location_id($this->unmarshal($this->db->f('location_id', true),
'int'));
-
$case->set_location_item_id($this->unmarshal($this->db->f('location_item_id',
true), 'int'));
+ $case = new
controller_check_item_case($this->unmarshal($this->db->f('id'), 'int'));
+
$case->set_check_item_id($this->unmarshal($this->db->f('check_item_id'),
'int'));
+
$case->set_status($this->unmarshal($this->db->f('status'), 'int'));
+
$case->set_location_id($this->unmarshal($this->db->f('location_id'), 'int'));
+
$case->set_location_item_id($this->unmarshal($this->db->f('location_item_id'),
'int'));
$case->set_descr($this->unmarshal($this->db->f('descr', true), 'string'));
-
$case->set_user_id($this->unmarshal($this->db->f('user_id', true), 'int'));
-
$case->set_entry_date($this->unmarshal($this->db->f('entry_date', true),
'int'));
-
$case->set_modified_date($this->unmarshal($this->db->f('modified_date', true),
'int'));
-
$case->set_modified_by($this->unmarshal($this->db->f('modified_by', true),
'int'));
-
$case->set_measurement($this->unmarshal($this->db->f('measurement', true),
'string'));
+
$case->set_user_id($this->unmarshal($this->db->f('user_id'), 'int'));
+
$case->set_entry_date($this->unmarshal($this->db->f('entry_date'), 'int'));
+
$case->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
+
$case->set_modified_by($this->unmarshal($this->db->f('modified_by'), 'int'));
+
$case->set_measurement($this->unmarshal($this->db->f('measurement'), 'string'));
return $case;
}
@@ -104,17 +104,17 @@
$this->db->query($sql);
while ($this->db->next_record()) {
- $case = new
controller_check_item_case($this->unmarshal($this->db->f('id', true), 'int'));
-
$case->set_check_item_id($this->unmarshal($this->db->f('check_item_id', true),
'int'));
-
$case->set_status($this->unmarshal($this->db->f('status', true), 'int'));
-
$case->set_location_id($this->unmarshal($this->db->f('location_id', true),
'int'));
-
$case->set_location_item_id($this->unmarshal($this->db->f('location_item_id',
true), 'int'));
+ $case = new
controller_check_item_case($this->unmarshal($this->db->f('id'), 'int'));
+
$case->set_check_item_id($this->unmarshal($this->db->f('check_item_id'),
'int'));
+
$case->set_status($this->unmarshal($this->db->f('status'), 'int'));
+
$case->set_location_id($this->unmarshal($this->db->f('location_id'), 'int'));
+
$case->set_location_item_id($this->unmarshal($this->db->f('location_item_id'),
'int'));
$case->set_descr($this->unmarshal($this->db->f('descr', true), 'string'));
-
$case->set_user_id($this->unmarshal($this->db->f('user_id', true), 'int'));
-
$case->set_entry_date($this->unmarshal($this->db->f('entry_date', true),
'int'));
-
$case->set_modified_date($this->unmarshal($this->db->f('modified_date', true),
'int'));
-
$case->set_modified_by($this->unmarshal($this->db->f('modified_by', true),
'int'));
-
$case->set_measurement($this->unmarshal($this->db->f('measurement', true),
'string'));
+
$case->set_user_id($this->unmarshal($this->db->f('user_id'), 'int'));
+
$case->set_entry_date($this->unmarshal($this->db->f('entry_date'), 'int'));
+
$case->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
+
$case->set_modified_by($this->unmarshal($this->db->f('modified_by'), 'int'));
+
$case->set_measurement($this->unmarshal($this->db->f('measurement'), 'string'));
if($return_type == "return_object")
$cases_array[] = $case;
Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php 2012-08-14 11:30:12 UTC
(rev 9851)
+++ trunk/controller/inc/class.socheck_item.inc.php 2012-08-14 12:31:16 UTC
(rev 9852)
@@ -116,16 +116,16 @@
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
if($this->db->next_record()) {
- $check_item = new
controller_check_item($this->unmarshal($this->db->f('c_id', true), 'int'));
-
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
-
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('c_id'), 'int'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id'),
'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id'),
'int'));
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id'), 'int'));
$control_item->set_title($this->db->f('title',
true), 'string');
$control_item->set_required($this->db->f('required', true), 'string');
$control_item->set_what_to_do($this->db->f('what_to_do', true), 'string');
$control_item->set_how_to_do($this->db->f('how_to_do', true), 'string');
-
$control_item->set_control_group_id($this->db->f('control_group_id', true),
'string');
+
$control_item->set_control_group_id($this->db->f('control_group_id'), 'int');
$check_item->set_control_item($control_item->toArray());
@@ -160,16 +160,16 @@
if( $counter == 0 ){
- $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
-
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
-
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id'), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id'),
'int'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id'),
'int'));
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id'), 'int'));
$control_item->set_title($this->db->f('title', true), 'string');
$control_item->set_required($this->db->f('required', true), 'string');
$control_item->set_what_to_do($this->db->f('what_to_do', true), 'string');
$control_item->set_how_to_do($this->db->f('how_to_do', true), 'string');
-
$control_item->set_control_group_id($this->db->f('control_group_id', true),
'string');
+
$control_item->set_control_group_id($this->db->f('control_group_id'), 'int');
$control_item->set_type($this->db->f('type', true), 'string');
if($return_type == "return_array")
@@ -181,16 +181,16 @@
}
if($this->db->f('cic_id', true) != ''){
- $case = new
controller_check_item_case($this->unmarshal($this->db->f('cic_id', true),
'int'));
-
$case->set_check_item_id($this->unmarshal($this->db->f('check_item_id', true),
'int'));
-
$case->set_status($this->unmarshal($this->db->f('cic_status', true), 'int'));
-
$case->set_location_id($this->unmarshal($this->db->f('location_id', true),
'int'));
-
$case->set_location_item_id($this->unmarshal($this->db->f('location_item_id',
true), 'int'));
+ $case = new
controller_check_item_case($this->unmarshal($this->db->f('cic_id'), 'int'));
+
$case->set_check_item_id($this->unmarshal($this->db->f('check_item_id'),
'int'));
+
$case->set_status($this->unmarshal($this->db->f('cic_status'), 'int'));
+
$case->set_location_id($this->unmarshal($this->db->f('location_id'), 'int'));
+
$case->set_location_item_id($this->unmarshal($this->db->f('location_item_id'),
'int'));
$case->set_descr($this->unmarshal($this->db->f('descr', true), 'string'));
-
$case->set_user_id($this->unmarshal($this->db->f('user_id', true), 'int'));
-
$case->set_entry_date($this->unmarshal($this->db->f('entry_date', true),
'int'));
-
$case->set_modified_date($this->unmarshal($this->db->f('modified_date', true),
'int'));
-
$case->set_modified_by($this->unmarshal($this->db->f('modified_by', true),
'int'));
+
$case->set_user_id($this->unmarshal($this->db->f('user_id'), 'int'));
+
$case->set_entry_date($this->unmarshal($this->db->f('entry_date'), 'int'));
+
$case->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
+
$case->set_modified_by($this->unmarshal($this->db->f('modified_by'), 'int'));
if($return_type == "return_array")
@@ -233,16 +233,16 @@
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
if($this->db->next_record()) {
- $check_item = new
controller_check_item($this->unmarshal($this->db->f('c_id', true), 'int'));
-
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
-
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('c_id'), 'int'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id'),
'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id'),
'int'));
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id'), 'int'));
$control_item->set_title($this->db->f('title',
true), 'string');
$control_item->set_required($this->db->f('required', true), 'string');
$control_item->set_what_to_do($this->db->f('what_to_do', true), 'string');
$control_item->set_how_to_do($this->db->f('how_to_do', true), 'string');
-
$control_item->set_control_group_id($this->db->f('control_group_id', true),
'string');
+
$control_item->set_control_group_id($this->db->f('control_group_id'), 'int');
$check_item->set_control_item($control_item->toArray());
@@ -355,16 +355,16 @@
$check_items_array[] =
$check_item;
}
- $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
-
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
-
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id'), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id'),
'int'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id'),
'int'));
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id'), 'int'));
$control_item->set_title($this->db->f('title', true), 'string');
$control_item->set_required($this->db->f('required', true), 'string');
$control_item->set_what_to_do($this->db->f('what_to_do', true), 'string');
$control_item->set_how_to_do($this->db->f('how_to_do', true), 'string');
-
$control_item->set_control_group_id($this->db->f('control_group_id', true),
'string');
+
$control_item->set_control_group_id($this->db->f('control_group_id'), 'int');
$control_item->set_type($this->db->f('type', true), 'string');
if($return_type == "return_array")
@@ -376,16 +376,16 @@
}
if($this->db->f('cic_id', true) != ''){
- $case = new
controller_check_item_case($this->unmarshal($this->db->f('cic_id', true),
'int'));
-
$case->set_check_item_id($this->unmarshal($this->db->f('check_item_id', true),
'int'));
-
$case->set_status($this->unmarshal($this->db->f('cic_status', true), 'int'));
-
$case->set_location_id($this->unmarshal($this->db->f('location_id', true),
'int'));
-
$case->set_location_item_id($this->unmarshal($this->db->f('location_item_id',
true), 'int'));
+ $case = new
controller_check_item_case($this->unmarshal($this->db->f('cic_id'), 'int'));
+
$case->set_check_item_id($this->unmarshal($this->db->f('check_item_id'),
'int'));
+
$case->set_status($this->unmarshal($this->db->f('cic_status'), 'int'));
+
$case->set_location_id($this->unmarshal($this->db->f('location_id'), 'int'));
+
$case->set_location_item_id($this->unmarshal($this->db->f('location_item_id'),
'int'));
$case->set_descr($this->unmarshal($this->db->f('descr', true), 'string'));
-
$case->set_user_id($this->unmarshal($this->db->f('user_id', true), 'int'));
-
$case->set_entry_date($this->unmarshal($this->db->f('entry_date', true),
'int'));
-
$case->set_modified_date($this->unmarshal($this->db->f('modified_date', true),
'int'));
-
$case->set_modified_by($this->unmarshal($this->db->f('modified_by', true),
'int'));
+
$case->set_user_id($this->unmarshal($this->db->f('user_id'), 'int'));
+
$case->set_entry_date($this->unmarshal($this->db->f('entry_date'), 'int'));
+
$case->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
+
$case->set_modified_by($this->unmarshal($this->db->f('modified_by'), 'int'));
$case->set_measurement($this->unmarshal($this->db->f('measurement', true),
'string'));
if($return_type == "return_array")
@@ -444,16 +444,16 @@
$check_items_array[] =
$check_item;
}
- $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
-
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
-
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id'), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id'),
'int'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id'),
'int'));
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id'), 'int'));
$control_item->set_title($this->db->f('title', true), 'string');
$control_item->set_required($this->db->f('required', true), 'string');
$control_item->set_what_to_do($this->db->f('what_to_do', true), 'string');
$control_item->set_how_to_do($this->db->f('how_to_do', true), 'string');
-
$control_item->set_control_group_id($this->db->f('control_group_id', true),
'string');
+
$control_item->set_control_group_id($this->db->f('control_group_id'), 'int');
$control_item->set_type($this->db->f('type', true), 'string');
if($return_type == "return_array")
@@ -465,16 +465,16 @@
}
if($this->db->f('cic_id', true) != ''){
- $case = new
controller_check_item_case($this->unmarshal($this->db->f('cic_id', true),
'int'));
-
$case->set_status($this->unmarshal($this->db->f('cic_status', true), 'int'));
-
$case->set_check_item_id($this->unmarshal($this->db->f('check_item_id', true),
'int'));
-
$case->set_location_id($this->unmarshal($this->db->f('location_id', true),
'int'));
-
$case->set_location_item_id($this->unmarshal($this->db->f('location_item_id',
true), 'int'));
+ $case = new
controller_check_item_case($this->unmarshal($this->db->f('cic_id'), 'int'));
+
$case->set_status($this->unmarshal($this->db->f('cic_status'), 'int'));
+
$case->set_check_item_id($this->unmarshal($this->db->f('check_item_id'),
'int'));
+
$case->set_location_id($this->unmarshal($this->db->f('location_id'), 'int'));
+
$case->set_location_item_id($this->unmarshal($this->db->f('location_item_id'),
'int'));
$case->set_descr($this->unmarshal($this->db->f('descr', true), 'string'));
-
$case->set_user_id($this->unmarshal($this->db->f('user_id', true), 'int'));
-
$case->set_entry_date($this->unmarshal($this->db->f('entry_date', true),
'int'));
-
$case->set_modified_date($this->unmarshal($this->db->f('modified_date', true),
'int'));
-
$case->set_modified_by($this->unmarshal($this->db->f('modified_by', true),
'int'));
+
$case->set_user_id($this->unmarshal($this->db->f('user_id'), 'int'));
+
$case->set_entry_date($this->unmarshal($this->db->f('entry_date'), 'int'));
+
$case->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
+
$case->set_modified_by($this->unmarshal($this->db->f('modified_by'), 'int'));
if($return_type == "return_array")
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2012-08-14 11:30:12 UTC
(rev 9851)
+++ trunk/controller/inc/class.socheck_list.inc.php 2012-08-14 12:31:16 UTC
(rev 9852)
@@ -67,18 +67,18 @@
$this->db->query($sql);
$this->db->next_record();
- $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
-
$check_list->set_control_id($this->unmarshal($this->db->f('control_id', true),
'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id'), 'int'));
+
$check_list->set_control_id($this->unmarshal($this->db->f('control_id'),
'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
-
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
-
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
-
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
-
$check_list->set_component_id($this->unmarshal($this->db->f('component_id',
true), 'int'));
-
$check_list->set_location_id($this->unmarshal($this->db->f('location_id',
true), 'int'));
-
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
-
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
+
$check_list->set_location_id($this->unmarshal($this->db->f('location_id'),
'int'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases'),
'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases'),
'int'));
if($check_list != null){
return $check_list;
@@ -119,24 +119,24 @@
$check_list = null;
while ($this->db->next_record()) {
if($counter == 0){
- $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'bool'));
-
$check_list->set_control_id($this->unmarshal($this->db->f('control_id', true),
'int'));
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id'), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'bool'));
+
$check_list->set_control_id($this->unmarshal($this->db->f('control_id'),
'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
-
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
-
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
-
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
-
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
-
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases'),
'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases'),
'int'));
}
- if($this->db->f('ci_id', true) != ''){
- $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
-
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
-
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+ if($this->db->f('ci_id') != ''){
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id'), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id'),
'int'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id'),
'int'));
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id'), 'int'));
$control_item->set_title($this->db->f('coi_title', true), 'string');
$control_item->set_required($this->db->f('coi_required', true), 'string');
$control_item->set_what_to_do($this->db->f('coi_what_to_do', true), 'string');
@@ -179,29 +179,29 @@
$check_list_id = 0;
$check_list = null;
while ($this->db->next_record()) {
- if( $this->db->f('cl_id', true) != $check_list_id ){
+ if( $this->db->f('cl_id') != $check_list_id ){
if($check_list_id != 0){
$check_list->set_check_item_array($check_items_array);
$check_list_array[] =
$check_list->toArray();
}
- $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id'), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
-
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
-
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
-
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
-
$check_list->set_component_id($this->unmarshal($this->db->f('component_id',
true), 'int'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
-
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
-
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases'),
'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases'),
'int'));
$check_items_array = array();
}
- $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
-
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
-
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id'), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id'),
'int'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id'),
'int'));
$check_items_array[] = $check_item->toArray();
$check_list_id = $check_list->get_id();
@@ -252,22 +252,22 @@
$check_list = null;
while ($this->db->next_record()) {
- if( $this->db->f('cl_id', true) != $check_list_id ){
+ if( $this->db->f('cl_id') != $check_list_id ){
if($check_list_id != 0){
$check_list_array[] = $check_list;
}
- $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
-
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
-
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
-
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
-
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
-
$check_list->set_component_id($this->unmarshal($this->db->f('component_id',
true), 'int'));
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id'), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
+
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment'),
'string'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
-
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
-
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases'),
'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases'),
'int'));
}
$check_list_id = $check_list->get_id();
}
@@ -303,21 +303,21 @@
$check_list_id = 0;
$check_list = null;
while ($this->db->next_record()) {
- if( $this->db->f('cl_id', true) != $check_list_id ){
+ if( $this->db->f('cl_id') != $check_list_id ){
if($check_list_id != 0){
$check_list_array[] = $check_list;
}
- $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id'), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
-
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
-
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
-
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
-
$check_list->set_component_id($this->unmarshal($this->db->f('component_id',
true), 'int'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
-
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
-
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases'),
'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases'),
'int'));
}
$check_list_id = $check_list->get_id();
}
@@ -354,21 +354,21 @@
$check_list = null;
while ($this->db->next_record()) {
- if( $this->db->f('cl_id', true) != $check_list_id ){
+ if( $this->db->f('cl_id') != $check_list_id ){
if($check_list_id != 0){
$check_list_array[] = $check_list;
}
- $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id'), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
-
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
-
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
-
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
-
$check_list->set_component_id($this->unmarshal($this->db->f('component_id',
true), 'int'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
-
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
-
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases'),
'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases'),
'int'));
}
$check_list_id = $check_list->get_id();
}
@@ -408,10 +408,10 @@
$this->db->query($sql);
- if ($this->db->next_record() & $this->db->f('count', true) > 0)
{
+ if ($this->db->next_record() & $this->db->f('count') > 0) {
$control_array = array(
- "id" =>
$this->unmarshal($this->db->f('c_id', true), 'int'),
-
"count" => $this->db->f('count', true)
+ "id" =>
$this->unmarshal($this->db->f('c_id'), 'int'),
+
"count" => $this->db->f('count')
);
}
@@ -448,28 +448,28 @@
$controls_array = array();
while ($this->db->next_record()) {
- if( $this->db->f('c_id', true) != $control_id ){
+ if( $this->db->f('c_id') != $control_id ){
if($control_id != 0){
$control->set_check_lists_array($check_lists_array);
$controls_array[] = $control;
}
- $control = new
controller_control($this->unmarshal($this->db->f('c_id', true), 'int'));
+ $control = new
controller_control($this->unmarshal($this->db->f('c_id'), 'int'));
$check_lists_array = array();
}
- $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id'), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
-
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
-
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
-
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
-
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id',
true), 'int'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
true), 'string'));
-
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
-
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases'),
'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases'),
'int'));
$check_lists_array[] = $check_list;
@@ -515,29 +515,29 @@
$controls_array = array();
while ($this->db->next_record()) {
- if( $this->db->f('c_id', true) != $control_id ){
+ if( $this->db->f('c_id') != $control_id ){
if($control_id != 0){
$control->set_check_lists_array($check_lists_array);
$controls_array[] = $control;
}
- $control = new
controller_control($this->unmarshal($this->db->f('c_id', true), 'int'));
+ $control = new
controller_control($this->unmarshal($this->db->f('c_id'), 'int'));
$check_lists_array = array();
}
- $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id'), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
-
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
-
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
-
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
-
$check_list->set_component_id($this->unmarshal($this->db->f('component_id',
true), 'int'));
-
$check_list->set_location_id($this->unmarshal($this->db->f('location_id',
true), 'int'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
+
$check_list->set_location_id($this->unmarshal($this->db->f('location_id'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
true), 'string'));
-
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
-
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases'),
'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases'),
'int'));
$check_lists_array[] = $check_list;
@@ -578,16 +578,16 @@
$this->db->query($sql);
while ($this->db->next_record()) {
- $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id'), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
-
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
-
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
-
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
-
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id',
true), 'int'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
true), 'string'));
-
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
-
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases'),
'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases'),
'int'));
$check_lists_array[] = $check_list;
}
@@ -622,17 +622,17 @@
$this->db->query($sql);
while ($this->db->next_record()) {
- $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id'), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
-
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
-
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
-
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
-
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id',
true), 'int'));
-
$check_list->set_location_id($this->unmarshal($this->db->f('cl_location_id',
true), 'int'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id'),
'int'));
+
$check_list->set_location_id($this->unmarshal($this->db->f('cl_location_id'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
true), 'string'));
-
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
-
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases'),
'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases'),
'int'));
$check_lists_array[] = $check_list;
}
@@ -746,19 +746,19 @@
$control->set_description($this->unmarshal($this->db->f('description', true),
'boolean'));
$control->set_start_date($start_date);
$control->set_end_date($end_date);
-
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id', true),
'int'));
+
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$control->set_procedure_name($this->unmarshal($this->db->f('procedure_name',
true), 'string'));
-
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
-
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
-
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
-
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
+
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id'),
'int'));
+
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id'),
'int'));
+
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id'),
'int'));
+
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
-
$control->set_equipment_type_id($this->unmarshal($this->db->f('equipment_type_id',
true), 'int'));
-
$control->set_equipment_id($this->unmarshal($this->db->f('equipment_id', true),
'int'));
+
$control->set_equipment_type_id($this->unmarshal($this->db->f('equipment_type_id'),
'int'));
+
$control->set_equipment_id($this->unmarshal($this->db->f('equipment_id'),
'int'));
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
-
$control->set_location_id($this->unmarshal($this->db->f('location_id', true),
'string'));
-
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
-
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
+
$control->set_location_id($this->unmarshal($this->db->f('location_id'),
'string'));
+
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type'), 'int'));
+
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval'),
'int'));
}
return $control;
Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php 2012-08-14 11:30:12 UTC
(rev 9851)
+++ trunk/controller/inc/class.socontrol.inc.php 2012-08-14 12:31:16 UTC
(rev 9852)
@@ -141,20 +141,20 @@
$this->db->query($sql);
while($this->db->next_record()) {
- $control = new
controller_control($this->unmarshal($this->db->f('id', true), 'int'));
+ $control = new
controller_control($this->unmarshal($this->db->f('id'), 'int'));
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
$control->set_description($this->unmarshal($this->db->f('description', true),
'boolean'));
-
$control->set_start_date($this->unmarshal($this->db->f('start_date', true),
'int'));
-
$control->set_end_date($this->unmarshal($this->db->f('end_date', true), 'int'));
-
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id', true),
'int'));
-
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
-
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
-
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
+
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
+
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
+
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id'),
'int'));
+
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id'),
'int'));
+
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id'),
'int'));
$control->set_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
true), 'string'));
-
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
-
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
-
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type',
true), 'int'));
-
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
+
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type'), 'int'));
+
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type'),
'int'));
+
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval'),
'int'));
if($return_type == "return_object")
$controls_array[] = $control;
@@ -203,20 +203,20 @@
$this->db->query($sql);
while($this->db->next_record()) {
- $control = new
controller_control($this->unmarshal($this->db->f('id', true), 'int'));
+ $control = new
controller_control($this->unmarshal($this->db->f('id'), 'int'));
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
$control->set_description($this->unmarshal($this->db->f('description', true),
'boolean'));
-
$control->set_start_date($this->unmarshal($this->db->f('start_date', true),
'int'));
-
$control->set_end_date($this->unmarshal($this->db->f('end_date', true), 'int'));
-
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id', true),
'int'));
-
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
-
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
-
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
+
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
+
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
+
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id'),
'int'));
+
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id'),
'int'));
+
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id'),
'int'));
$control->set_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
true), 'string'));
-
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
-
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
-
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type',
true), 'int'));
-
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
+
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type'), 'int'));
+
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type'),
'int'));
+
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval'),
'int'));
//Sigurd 3.august 2010:
$control->set_location_id($this->unmarshal($this->db->f('location_id'), 'int'));
$control->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
@@ -285,7 +285,7 @@
$component = null;
while($this->db->next_record())
{
- if( $this->db->f('component_id', true) !=
$component_id )
+ if( $this->db->f('component_id') !=
$component_id )
{
if($component_id != 0)
{
@@ -303,9 +303,9 @@
}
$component = new controller_component();
-
$component->set_type($this->unmarshal($this->db->f('component_type', true),
'int'));
-
$component->set_id($this->unmarshal($this->db->f('component_id', true), 'int'));
-
$component->set_location_id($this->unmarshal($this->db->f('location_id', true),
'int'));
+
$component->set_type($this->unmarshal($this->db->f('component_type'), 'int'));
+
$component->set_id($this->unmarshal($this->db->f('component_id'), 'int'));
+
$component->set_location_id($this->unmarshal($this->db->f('location_id'),
'int'));
$component->set_guid($this->unmarshal($this->db->f('guid', true), 'string'));
$component->set_xml($this->unmarshal($this->db->f('xml', true), 'string'));
$component->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
@@ -313,22 +313,22 @@
$component->set_address($this->unmarshal($this->db->f('address', true),
'string'));
}
- $control = new
controller_control($this->unmarshal($this->db->f('control_id', true), 'int'));
+ $control = new
controller_control($this->unmarshal($this->db->f('control_id'), 'int'));
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
$control->set_description($this->unmarshal($this->db->f('description', true),
'boolean'));
-
$control->set_start_date($this->unmarshal($this->db->f('start_date', true),
'int'));
-
$control->set_end_date($this->unmarshal($this->db->f('end_date', true), 'int'));
-
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id', true),
'int'));
+
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
+
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$control->set_procedure_name($this->unmarshal($this->db->f('procedure_name',
true), 'string'));
-
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
-
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
-
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
+
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id'),
'int'));
+
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id'),
'int'));
+
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id'),
'int'));
$control->set_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
true), 'string'));
-
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
+
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
-
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
-
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type',
true), 'int'));
-
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
+
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type'), 'int'));
+
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type'),
'int'));
+
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval'),
'int'));
if($return_type == "return_object")
{
@@ -379,19 +379,19 @@
while($this->db->next_record())
{
- $control = new
controller_control($this->unmarshal($this->db->f('id', true), 'int'));
+ $control = new
controller_control($this->unmarshal($this->db->f('id'), 'int'));
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
$control->set_description($this->unmarshal($this->db->f('description', true),
'boolean'));
-
$control->set_start_date($this->unmarshal($this->db->f('start_date', true),
'int'));
-
$control->set_end_date($this->unmarshal($this->db->f('end_date', true), 'int'));
-
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id', true),
'int'));
+
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
+
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$control->set_procedure_name($this->unmarshal($this->db->f('procedure_name',
true), 'string'));
-
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
-
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
-
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
-
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
-
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
-
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
+
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id'),
'int'));
+
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id'),
'int'));
+
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id'),
'int'));
+
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type'), 'int'));
+
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval'),
'int'));
$controls_array[] = $control->toArray();
}
@@ -424,7 +424,7 @@
$this->db->query($sql);
while($this->db->next_record()) {
- $control_id =
$this->unmarshal($this->db->f('id', true), 'int');
+ $control_id =
$this->unmarshal($this->db->f('id'), 'int');
$title = $this->unmarshal($this->db->f('title',
true), 'string');
$location_code =
$this->unmarshal($this->db->f('location_code', true), 'string');
@@ -466,9 +466,9 @@
while($this->db->next_record()) {
$component = new controller_component();
-
$component->set_type($this->unmarshal($this->db->f('type', true), 'int'));
-
$component->set_id($this->unmarshal($this->db->f('component_id', true), 'int'));
-
$component->set_location_id($this->unmarshal($this->db->f('location_id', true),
'int'));
+
$component->set_type($this->unmarshal($this->db->f('type'), 'int'));
+
$component->set_id($this->unmarshal($this->db->f('component_id'), 'int'));
+
$component->set_location_id($this->unmarshal($this->db->f('location_id'),
'int'));
$component->set_guid($this->unmarshal($this->db->f('guid', true), 'string'));
$component->set_xml($this->unmarshal($this->db->f('xml', true), 'string'));
$component->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
@@ -774,19 +774,20 @@
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
$control->set_description($this->unmarshal($this->db->f('description', true),
'boolean'));
-
$control->set_start_date($this->unmarshal($this->db->f('start_date', true),
'int'));
-
$control->set_end_date($this->unmarshal($this->db->f('end_date', true), 'int'));
-
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id', true),
'int'));
+
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
+
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$control->set_procedure_name($this->unmarshal($this->db->f('procedure_name',
true), 'string'));
-
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
-
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
-
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
+
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id'),
'int'));
+
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id'),
'int'));
+
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id'),
'int'));
$control->set_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
true), 'string'));
-
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
- $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
+
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type'), 'int'));
+
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval'),
'int'));
+
+ $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$control->set_control_area_name($category[0]['name']);
-
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
-
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
}
return $control;
@@ -815,21 +816,22 @@
$control = new controller_control((int) $id);
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
$control->set_description($this->unmarshal($this->db->f('description', true),
'boolean'));
-
$control->set_start_date($this->unmarshal($this->db->f('start_date', true),
'int'));
-
$control->set_end_date($this->unmarshal($this->db->f('end_date', true), 'int'));
-
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id', true),
'int'));
+
$control->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
+
$control->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$control->set_procedure_name($this->unmarshal($this->db->f('procedure_name',
true), 'string'));
-
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
-
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
-
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
+
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id'),
'int'));
+
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id'),
'int'));
+
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id'),
'int'));
$control->set_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
true), 'string'));
-
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
- $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
- $control->set_control_area_name($category[0]['name']);
-
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
+
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type'), 'int'));
$control->set_repeat_type_label($control->get_repeat_type());
-
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
+
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval'),
'int'));
+ $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
+ $control->set_control_area_name($category[0]['name']);
+
return $control;
}
@@ -865,7 +867,7 @@
while($this->db->next_record())
{
$ret_array[$i]['id'] = $this->db->f('id');
- $ret_array[$i]['name'] = $this->db->f('name');
+ $ret_array[$i]['name'] = $this->db->f('name',
true);
$i++;
}
return $ret_array;
@@ -929,8 +931,8 @@
$controlArray[$i]['id'] =
$this->db->f('control_id');
$controlArray[$i]['title'] =
$this->db->f('control_title');
$controlArray[$i]['bim_id'] =
$this->db->f('bim_id');
- $controlArray[$i]['bim_item_guid'] =
$this->db->f('bim_item_guid');
- $controlArray[$i]['bim_type'] =
$this->db->f('type_name');
+ $controlArray[$i]['bim_item_guid'] =
$this->db->f('bim_item_guid', true);
+ $controlArray[$i]['bim_type'] =
$this->db->f('type_name', true);
$i++;
}
@@ -958,7 +960,7 @@
if($this->db->num_rows() > 0)
{
$this->db->next_record();
- $result = $this->db->f(location_code);
+ $result = $this->db->f('location_code');
return $result;
}
}
Modified: trunk/controller/inc/class.socontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group.inc.php 2012-08-14 11:30:12 UTC
(rev 9851)
+++ trunk/controller/inc/class.socontrol_group.inc.php 2012-08-14 12:31:16 UTC
(rev 9852)
@@ -124,15 +124,16 @@
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
$this->db->next_record();
- $control_group = new
controller_control_group($this->unmarshal($this->db->f('id', true), 'int'));
+ $control_group = new
controller_control_group($this->unmarshal($this->db->f('id'), 'int'));
$control_group->set_group_name($this->unmarshal($this->db->f('group_name',
true), 'string'));
$control_group->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
-
$control_group->set_procedure_name($this->unmarshal($this->db->f('procedure_title'),
'string'));
+
$control_group->set_procedure_name($this->unmarshal($this->db->f('procedure_title',
true), 'string'));
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'string'));
+
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr',
true), 'string'));
+
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
$control_group->set_control_area_name($category[0]['name']);
-
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'string'));
-
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr'),
'string'));
return $control_group;
}
@@ -158,7 +159,7 @@
while ($this->db->next_record())
{
- $control_group = new
controller_control_group($this->unmarshal($this->db->f('id', true), 'int'));
+ $control_group = new
controller_control_group($this->unmarshal($this->db->f('id'), 'int'));
$control_group->set_group_name($this->unmarshal($this->db->f('group_name',
true), 'string'));
$results[] = $control_group->toArray();
@@ -190,14 +191,14 @@
$curr_id = $this->db->f('id', false);
if($selected_building_part_id &&
$selected_building_part_id > 0 && $selected_building_part_id == $curr_id)
{
- $results[] = array('id' =>
$this->db->f('id', false),
-
'name' => $this->db->f('name', false),
+ $results[] = array('id' =>
$this->db->f('id'),
+
'name' => $this->db->f('name', true),
'selected' => 'yes');
}
else
{
- $results[] = array('id' =>
$this->db->f('id', false),
-
'name' => $this->db->f('name', false));
+ $results[] = array('id' =>
$this->db->f('id'),
+
'name' => $this->db->f('name', true));
}
}
return $results;
@@ -217,10 +218,10 @@
$this->db->query($sql);
while ($this->db->next_record()) {
- $control_group = new
controller_control_group($this->unmarshal($this->db->f('id', true), 'int'));
+ $control_group = new
controller_control_group($this->unmarshal($this->db->f('id'), 'int'));
$control_group->set_group_name($this->unmarshal($this->db->f('group_name',
true), 'string'));
-
$control_group->set_procedure_id($this->unmarshal($this->db->f('procedure_id',
true), 'string'));
-
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'string'));
+
$control_group->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
+
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$results[] = $control_group->toArray();
}
@@ -308,14 +309,15 @@
if($control_group == null) {
$control_group = new
controller_control_group((int) $control_group_id);
-
$control_group->set_group_name($this->unmarshal($this->db->f('group_name'),
'string'));
+
$control_group->set_group_name($this->unmarshal($this->db->f('group_name',
true), 'string'));
$control_group->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
-
$control_group->set_procedure_name($this->unmarshal($this->db->f('procedure_title'),
'string'));
+
$control_group->set_procedure_name($this->unmarshal($this->db->f('procedure_title',
true), 'string'));
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'string'));
+
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr',
true), 'string'));
+
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
$control_group->set_control_area_name($category[0]['name']);
-
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'string'));
-
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr'),
'string'));
}
return $control_group;
@@ -337,14 +339,14 @@
while($this->db->next_record()) {
$control_group = new
controller_control_group((int) $this->db->f('id'));
-
$control_group->set_group_name($this->unmarshal($this->db->f('group_name'),
'string'));
+
$control_group->set_group_name($this->unmarshal($this->db->f('group_name',
true), 'string'));
$control_group->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
-
$control_group->set_procedure_name($this->unmarshal($this->db->f('procedure_title'),
'string'));
+
$control_group->set_procedure_name($this->unmarshal($this->db->f('procedure_title',
true), 'string'));
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
$control_group->set_control_area_name($category[0]['name']);
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'string'));
-
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr'),
'string'));
+
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr',
true), 'string'));
$control_groups_array[] =
$control_group->toArray();
}
@@ -410,10 +412,10 @@
while($this->db->next_record())
{
$controlGroupArray[$i]['id'] =
$this->db->f('control_group_id');
- $controlGroupArray[$i]['title'] =
$this->db->f('control_group_name');
+ $controlGroupArray[$i]['title'] =
$this->db->f('control_group_name', true);
$controlGroupArray[$i]['bim_id'] =
$this->db->f('bim_id');
$controlGroupArray[$i]['bim_item_guid'] =
$this->db->f('bim_item_guid');
- $controlGroupArray[$i]['bim_type'] =
$this->db->f('type_name');
+ $controlGroupArray[$i]['bim_type'] =
$this->db->f('type_name', true);
$i++;
}
@@ -475,8 +477,8 @@
$this->db->query("SELECT id, group_name FROM
controller_control_group ORDER BY group_name ASC", __LINE__, __FILE__);
while ($this->db->next_record())
{
- $results[] = array('id' =>
$this->db->f('id', false),
-
'group_name' => $this->db->f('group_name', false));
+ $results[] = array('id' =>
$this->db->f('id'),
+
'group_name' => $this->db->f('group_name', true));
}
return $results;
}
Modified: trunk/controller/inc/class.socontrol_group_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group_list.inc.php 2012-08-14
11:30:12 UTC (rev 9851)
+++ trunk/controller/inc/class.socontrol_group_list.inc.php 2012-08-14
12:31:16 UTC (rev 9852)
@@ -120,8 +120,8 @@
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
if($this->db->next_record()){
- $control_group_list = new
controller_control_group_list($this->unmarshal($this->db->f('id', true),
'int'));
-
$control_group_list->set_control_id($this->unmarshal($this->db->f('control_id',
true), 'int'));
+ $control_group_list = new
controller_control_group_list($this->unmarshal($this->db->f('id'), 'int'));
+
$control_group_list->set_control_id($this->unmarshal($this->db->f('control_id'),
'int'));
$control_group_list->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
$control_group_list->set_order_nr($this->unmarshal($this->db->f('order_nr'),
'int'));
@@ -146,8 +146,8 @@
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
if($this->db->next_record()){
- $control_group_list = new
controller_control_group_list($this->unmarshal($this->db->f('id', true),
'int'));
-
$control_group_list->set_control_id($this->unmarshal($this->db->f('control_id',
true), 'int'));
+ $control_group_list = new
controller_control_group_list($this->unmarshal($this->db->f('id'), 'int'));
+
$control_group_list->set_control_id($this->unmarshal($this->db->f('control_id'),
'int'));
$control_group_list->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
$control_group_list->set_order_nr($this->unmarshal($this->db->f('order_nr'),
'int'));
@@ -207,7 +207,7 @@
while($this->db->next_record())
{
- $control_group = new
controller_control_group($this->unmarshal($this->db->f('id', true), 'int'));
+ $control_group = new
controller_control_group($this->unmarshal($this->db->f('id'), 'int'));
$control_group->set_group_name($this->unmarshal($this->db->f('group_name',
true), 'string'));
$control_group->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php 2012-08-14 11:30:12 UTC
(rev 9851)
+++ trunk/controller/inc/class.socontrol_item.inc.php 2012-08-14 12:31:16 UTC
(rev 9852)
@@ -137,17 +137,17 @@
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
$this->db->next_record();
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('id'), 'int'));
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'bool'));
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
+
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id')));
- $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', true), 'int'));
+
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
+ $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$control_item->set_control_area_name($category[0]['name']);
-
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
return $control_item;
}
@@ -174,25 +174,25 @@
{
if( $counter == 0 )
{
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('ci_id'), 'int'));
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'bool'));
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
+
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
$control_item->set_control_group_name($this->unmarshal($this->db->f('group_name',
true), 'string'));
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id')));
- $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', true), 'int'));
+
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
+ $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$control_item->set_control_area_name($category[0]['name']);
-
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
}
- if($this->db->f('cio_id', true) != '')
+ if($this->db->f('cio_id') != '')
{
$control_item_option = new
controller_control_item_option();
-
$control_item_option->set_id($this->unmarshal($this->db->f('cio_id', true),
'int'));
+
$control_item_option->set_id($this->unmarshal($this->db->f('cio_id'), 'int'));
$control_item_option->set_option_value($this->unmarshal($this->db->f('option_value',
true), 'string'));
-
$control_item_option->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+
$control_item_option->set_control_item_id($this->unmarshal($this->db->f('control_item_id'),
'int'));
if($return_type == "return_object")
{
@@ -244,14 +244,14 @@
$this->db->limit_query($sql, $start, __LINE__,
__FILE__, $limit);
while ($this->db->next_record()) {
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('id'), 'int'));
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
+
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
+
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$results[] = $control_item;
}
@@ -367,12 +367,13 @@
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
- $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', true), 'int'));
-
$control_item->set_control_area_name($category[0]['name']);
+
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
+
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
+
+ $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
+
$control_item->set_control_area_name($category[0]['name']);
}
return $control_item;
@@ -416,14 +417,14 @@
while($this->db->next_record())
{
//create check_item and add to return array
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('id'), 'int'));
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
+
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
+
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$results[] = $control_item;
}
Modified: trunk/controller/inc/class.socontrol_item_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item_list.inc.php 2012-08-14
11:30:12 UTC (rev 9851)
+++ trunk/controller/inc/class.socontrol_item_list.inc.php 2012-08-14
12:31:16 UTC (rev 9852)
@@ -115,10 +115,10 @@
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
$this->db->next_record();
- $control_item_list = new
controller_control_item_list($this->unmarshal($this->db->f('id', true), 'int'));
-
$control_item_list->set_control_id($this->unmarshal($this->db->f('control_id',
true), 'int'));
-
$control_item_list->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
-
$control_item_list->set_order_nr($this->unmarshal($this->db->f('order_nr',
true), 'int'));
+ $control_item_list = new
controller_control_item_list($this->unmarshal($this->db->f('id'), 'int'));
+
$control_item_list->set_control_id($this->unmarshal($this->db->f('control_id'),
'int'));
+
$control_item_list->set_control_item_id($this->unmarshal($this->db->f('control_item_id'),
'int'));
+
$control_item_list->set_order_nr($this->unmarshal($this->db->f('order_nr'),
'int'));
return $control_item_list;
}
@@ -136,10 +136,10 @@
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
$this->db->next_record();
- $control_item_list = new
controller_control_item_list($this->unmarshal($this->db->f('id', true), 'int'));
-
$control_item_list->set_control_id($this->unmarshal($this->db->f('control_id',
true), 'int'));
-
$control_item_list->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
-
$control_item_list->set_order_nr($this->unmarshal($this->db->f('order_nr',
true), 'int'));
+ $control_item_list = new
controller_control_item_list($this->unmarshal($this->db->f('id'), 'int'));
+
$control_item_list->set_control_id($this->unmarshal($this->db->f('control_id'),
'int'));
+
$control_item_list->set_control_item_id($this->unmarshal($this->db->f('control_item_id'),
'int'));
+
$control_item_list->set_order_nr($this->unmarshal($this->db->f('order_nr'),
'int'));
return $control_item_list;
}
@@ -162,12 +162,12 @@
$this->db->query($sql);
while ($this->db->next_record()) {
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('id'), 'int'));
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
-
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
+
$control_item->set_required($this->unmarshal($this->db->f('required'),
'boolean'));
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
+
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
if($return_type == "return_object")
$results[] = $control_item;
@@ -197,12 +197,12 @@
$this->db->query($sql);
while ($this->db->next_record()) {
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('id'), 'int'));
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
-
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
+
$control_item->set_required($this->unmarshal($this->db->f('required'),
'boolean'));
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
+
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
if($returnType == "return_array")
@@ -237,12 +237,12 @@
$this->db->limit_query($sql, $start, __LINE__,
__FILE__, $limit);
while ($this->db->next_record()) {
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('id'), 'int'));
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
-
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
+
$control_item->set_required($this->unmarshal($this->db->f('required'),
'boolean'));
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
+
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
if($returnType == "return_array")
@@ -281,7 +281,7 @@
$control_item = null;
$control_item_array = array();
while ($this->db->next_record()) {
- if( $this->db->f('ci_id', true) !=
$control_item_id ){
+ if( $this->db->f('ci_id') != $control_item_id ){
if($control_item_id != 0){
$control_item->set_options_array($options_array);
@@ -291,19 +291,19 @@
$control_item_array[] =
$control_item;
}
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('ci_id'), 'int'));
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
-
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
+
$control_item->set_required($this->unmarshal($this->db->f('required'),
'boolean'));
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
-
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
+
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
$options_array = array();
}
- $control_item_option = new
controller_control_item_option($this->db->f('option_value', true),
$this->db->f('control_item_id', true));
-
$control_item_option->set_id($this->db->f('cio_id', true));
+ $control_item_option = new
controller_control_item_option($this->db->f('option_value', true),
$this->db->f('control_item_id'));
+
$control_item_option->set_id($this->db->f('cio_id'));
if($return_type == "return_array")
$options_array[] =
$control_item_option->toArray();
Modified: trunk/controller/inc/class.socontrol_item_option.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item_option.inc.php 2012-08-14
11:30:12 UTC (rev 9851)
+++ trunk/controller/inc/class.socontrol_item_option.inc.php 2012-08-14
12:31:16 UTC (rev 9852)
@@ -107,9 +107,9 @@
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
$this->db->next_record();
- $control_item_option = new
controller_control_item_option($this->unmarshal($this->db->f('id', true),
'int'));
+ $control_item_option = new
controller_control_item_option($this->unmarshal($this->db->f('id'), 'int'));
$control_item_option->set_option_value($this->unmarshal($this->db->f('option_value',
true), 'string'));
-
$control_item_option->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+
$control_item_option->set_control_item_id($this->unmarshal($this->db->f('control_item_id'),
'int'));
return $control_item_option;
}
Modified: trunk/controller/inc/class.sodocument.inc.php
===================================================================
--- trunk/controller/inc/class.sodocument.inc.php 2012-08-14 11:30:12 UTC
(rev 9851)
+++ trunk/controller/inc/class.sodocument.inc.php 2012-08-14 12:31:16 UTC
(rev 9852)
@@ -160,7 +160,7 @@
$document->set_description($this->unmarshal($this->db->f('description',true),'string'));
$document->set_name($this->unmarshal($this->db->f('name',true),'string'));
$document->set_type($this->unmarshal($this->db->f('type_title',true),'string'));
-
$document->set_procedure_id($this->unmarshal($this->db->f('procedure_id',true),'int'));
+
$document->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),'int'));
}
return $document;
}
@@ -220,7 +220,7 @@
$this->db->query($sql, __LINE__, __FILE__);
$results = array();
while($this->db->next_record()){
- $location_id = $this->db->f('id', true);
+ $location_id = $this->db->f('id');
$results[$location_id] = $this->db->f('title',
true);
}
$this->document_types = $results;
@@ -235,7 +235,7 @@
$this->db->query($sql, __LINE__, __FILE__);
$results = array();
while($this->db->next_record()){
- $result[] = $this->db->f('id', true);
+ $result[] = $this->db->f('id');
$result[] = $this->db->f('title', true);
$results[] = $result;
}
Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php 2012-08-14 11:30:12 UTC
(rev 9851)
+++ trunk/controller/inc/class.soprocedure.inc.php 2012-08-14 12:31:16 UTC
(rev 9852)
@@ -153,7 +153,7 @@
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record()) {
if($counter == 0){
- $procedure = new
controller_procedure($this->unmarshal($this->db->f('id', true), 'int'));
+ $procedure = new
controller_procedure($this->unmarshal($this->db->f('id'), 'int'));
$procedure->set_title($this->unmarshal($this->db->f('title', true), 'string'));
$procedure->set_purpose($this->unmarshal($this->db->f('purpose', true),
'string'));
$procedure->set_responsibility($this->unmarshal($this->db->f('responsibility',
true), 'string'));
@@ -173,8 +173,8 @@
//$procedure->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
'string')));
}
- if($this->db->f('document_id', true) != ''){
- $document = new
controller_document($this->unmarshal($this->db->f('document_id', true), 'int'));
+ if($this->db->f('document_id') != ''){
+ $document = new
controller_document($this->unmarshal($this->db->f('document_id'), 'int'));
$document->set_procedure_id($procedure->get_id());
$document->set_title($this->unmarshal($this->db->f('document_title', true),
'string'));
$document->set_description($this->unmarshal($this->db->f('document_description',
true), 'string'));
@@ -201,7 +201,7 @@
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record()) {
if($counter == 0){
- $procedure = new
controller_procedure($this->unmarshal($this->db->f('id', true), 'int'));
+ $procedure = new
controller_procedure($this->unmarshal($this->db->f('id'), 'int'));
$procedure->set_title($this->unmarshal($this->db->f('title', true), 'string'));
$procedure->set_purpose($this->unmarshal($this->db->f('purpose', true),
'string'));
$procedure->set_responsibility($this->unmarshal($this->db->f('responsibility',
true), 'string'));
@@ -218,8 +218,8 @@
$procedure->set_control_area_name($category[0]['name']);
}
- if($this->db->f('document_id', true) != ''){
- $document = new
controller_document($this->unmarshal($this->db->f('document_id', true), 'int'));
+ if($this->db->f('document_id') != ''){
+ $document = new
controller_document($this->unmarshal($this->db->f('document_id'), 'int'));
$document->set_procedure_id($procedure->get_id());
$document->set_title($this->unmarshal($this->db->f('document_title', true),
'string'));
$document->set_description($this->unmarshal($this->db->f('document_description',
true), 'string'));
@@ -258,7 +258,7 @@
$this->db->query($sql);
while($this->db->next_record()) {
- $procedure = new
controller_procedure($this->unmarshal($this->db->f('id', true), 'int'));
+ $procedure = new
controller_procedure($this->unmarshal($this->db->f('id'), 'int'));
$procedure->set_title($this->unmarshal($this->db->f('title', true), 'string'));
$procedure->set_purpose($this->unmarshal($this->db->f('purpose', true),
'string'));
$procedure->set_responsibility($this->unmarshal($this->db->f('responsibility',
true), 'string'));
@@ -297,7 +297,7 @@
$this->db->limit_query($sql, $start, __LINE__,
__FILE__, $limit);
while ($this->db->next_record()) {
- $procedure = new
controller_procedure($this->unmarshal($this->db->f('id', true), 'int'));
+ $procedure = new
controller_procedure($this->unmarshal($this->db->f('id'), 'int'));
$procedure->set_title($this->unmarshal($this->db->f('title', true), 'string'));
$procedure->set_purpose($this->unmarshal($this->db->f('purpose', true),
'string'));
$procedure->set_responsibility($this->unmarshal($this->db->f('responsibility',
true), 'string'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9852] controller: remove stripslashes for integers,
Sigurd Nes <=