[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9859] Merge 9851:9858 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9859] Merge 9851:9858 from trunk |
|
Date: |
Wed, 15 Aug 2012 10:32:33 +0000 |
Revision: 9859
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9859
Author: sigurdne
Date: 2012-08-15 10:32:33 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
Merge 9851:9858 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.socase.inc.php
branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.socommon.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_group_list.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_item_option.inc.php
branches/Version-1_0-branch/controller/inc/class.sodocument.inc.php
branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
branches/Version-1_0-branch/property/inc/class.uientity.inc.php
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858
Modified: branches/Version-1_0-branch/controller/inc/class.socase.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socase.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/controller/inc/class.socase.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -61,24 +61,26 @@
*/
public function get_single($case_id)
{
+ $case_id = (int) $case_id;
+
$sql = "SELECT * FROM controller_check_item_case ";
- $sql .= "WHERE id = $case_id";
+ $sql .= "WHERE id = {$case_id}";
$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;
}
@@ -98,23 +100,26 @@
*/
public function get_cases_by_message($location_id,
$location_item_id, $return_type = "return_object")
{
+ $location_id = (int) $location_id;
+ $location_item_id = (int) $location_item_id;
+
$sql = "SELECT * FROM controller_check_item_case ";
$sql .= "WHERE location_id = {$location_id} AND
location_item_id = {$location_item_id}";
$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;
@@ -207,6 +212,7 @@
*/
function delete($case_id)
{
+ $case_id = (int) $case_id;
$status = $this->db->query("DELETE FROM
controller_check_item_case WHERE id = $case_id");
if( isset($status) )
Modified: branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -108,24 +108,26 @@
*/
public function get_single($check_item_id)
{
+ $check_item_id = (int) $check_item_id;
+
$sql = "SELECT ci.*, ci.id as c_id, coi.id as coi_id,
coi.* ";
$sql .= "FROM controller_check_item ci,
controller_control_item coi ";
- $sql .= "WHERE ci.id = $check_item_id ";
+ $sql .= "WHERE ci.id = {$check_item_id} ";
$sql .= "AND ci.control_item_id=coi.id";
$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());
@@ -143,14 +145,17 @@
* @param $check_item_id id to check item to be fetched
from database
* @return check item object
*/
- public function get_single_with_cases($check_item_id,
$return_type = "return_object"){
+ public function get_single_with_cases($check_item_id,
$return_type = "return_object")
+ {
+ $check_item_id = (int) $check_item_id;
+
$sql = "SELECT ci.id as ci_id, control_item_id,
check_list_id, ";
$sql .= "cic.id as cic_id, cic.status as cic_status,
cic.*, ";
$sql .= "coi.id as coi_id, coi.* ";
$sql .= "FROM controller_check_item ci ";
$sql .= "LEFT JOIN controller_control_item as coi ON
ci.control_item_id = coi.id ";
$sql .= "LEFT JOIN controller_check_item_case as cic ON
ci.id = cic.check_item_id ";
- $sql .= "WHERE ci.id = $check_item_id ";
+ $sql .= "WHERE ci.id = {$check_item_id} ";
$this->db->query($sql);
@@ -160,16 +165,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")
@@ -180,17 +185,17 @@
$cases_array = array();
}
- 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'));
+ if($this->db->f('cic_id') != ''){
+ $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")
@@ -224,25 +229,28 @@
*/
public function
get_check_item_by_check_list_and_control_item($check_list_id, $control_item_id)
{
+ $check_list_id = (int) $check_list_id;
+ $control_item_id = (int) $control_item_id;
+
$sql = "SELECT ci.*, ci.id as c_id, coi.id as coi_id,
coi.* ";
$sql .= "FROM controller_check_item ci,
controller_control_item coi ";
- $sql .= "WHERE ci.check_list_id = $check_list_id ";
+ $sql .= "WHERE ci.check_list_id = {$check_list_id} ";
$sql .= "AND ci.control_item_id = coi.id ";
- $sql .= "AND ci.control_item_id = $control_item_id";
+ $sql .= "AND ci.control_item_id = {$control_item_id}";
$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());
@@ -309,14 +317,16 @@
* @param $returnType data returned as objects or arrays
* @return check item objects
*/
- public function get_check_items_with_cases($check_list_id,
$type = "control_item_type_1", $status = "open", $messageStatus = null,
$return_type = "return_object"){
+ public function get_check_items_with_cases($check_list_id,
$type = "control_item_type_1", $status = "open", $messageStatus = null,
$return_type = "return_object")
+ {
+ $check_list_id = (int) $check_list_id;
$sql = "SELECT ci.id as ci_id, control_item_id,
check_list_id, ";
$sql .= "cic.id as cic_id, cic.status as cic_status,
cic.*, ";
$sql .= "coi.id as coi_id, coi.* ";
$sql .= "FROM controller_check_item ci ";
$sql .= "LEFT JOIN controller_control_item as coi ON
ci.control_item_id = coi.id ";
$sql .= "LEFT JOIN controller_check_item_case as cic ON
ci.id = cic.check_item_id ";
- $sql .= "WHERE ci.check_list_id = $check_list_id ";
+ $sql .= "WHERE ci.check_list_id = {$check_list_id} ";
if($status == 'open')
$sql .= "AND cic.status = 0 ";
@@ -355,16 +365,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 +386,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")
@@ -418,14 +428,17 @@
* @param $returnType data returned as objects or arrays
* @return check item objects
*/
- public function
get_check_items_with_cases_by_message($message_ticket_id, $return_type =
"return_object"){
+ public function
get_check_items_with_cases_by_message($message_ticket_id, $return_type =
"return_object")
+ {
+ $message_ticket_id = (int) $message_ticket_id;
+
$sql = "SELECT ci.id as ci_id, control_item_id, ";
$sql .= "check_list_id, cic.id as cic_id, cic.status as
cic_status, cic.*, ";
$sql .= "coi.id as coi_id, coi.* ";
$sql .= "FROM controller_check_item ci ";
$sql .= "LEFT JOIN controller_control_item as coi ON
ci.control_item_id = coi.id ";
$sql .= "LEFT JOIN controller_check_item_case as cic ON
ci.id = cic.check_item_id ";
- $sql .= "WHERE cic.location_item_id =
$message_ticket_id";
+ $sql .= "WHERE cic.location_item_id =
{$message_ticket_id}";
$this->db->query($sql);
@@ -444,16 +457,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")
@@ -464,17 +477,17 @@
$cases_array = array();
}
- 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'));
+ if($this->db->f('cic_id') != ''){
+ $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: branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -57,28 +57,30 @@
* @param $check_list_id
* @return check list object
*/
- public function get_single($check_list_id){
+ public function get_single($check_list_id)
+ {
+ $check_list_id = (int) $check_list_id;
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.control_id, cl.comment as cl_comment, deadline, planned_date, ";
$sql .= "completed_date, location_code, component_id,
num_open_cases, num_pending_cases, location_id, ci.id as ci_id, control_item_id
";
$sql .= "FROM controller_check_list cl ";
$sql .= "LEFT JOIN controller_check_item as ci ON cl.id =
ci.check_list_id ";
- $sql .= "WHERE cl.id = $check_list_id";
+ $sql .= "WHERE cl.id = {$check_list_id}";
$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;
@@ -95,7 +97,9 @@
* @param $type control items registration type (Radiobuttons,
Checklist, textfield, just commentfield)
* @return returns a check list object
*/
- public function get_single_with_check_items($check_list_id, $status,
$type){
+ public function get_single_with_check_items($check_list_id, $status,
$type)
+ {
+ $check_list_id = (int) $check_list_id;
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.control_id, cl.comment as cl_comment, deadline, planned_date,
completed_date, num_open_cases, location_code, num_pending_cases, ";
$sql .= "ci.id as ci_id, control_item_id, check_list_id, ";
$sql .= "coi.title as coi_title, coi.required as coi_required,
";
@@ -103,7 +107,7 @@
$sql .= "FROM controller_check_list cl ";
$sql .= "LEFT JOIN controller_check_item as ci ON cl.id =
ci.check_list_id ";
$sql .= "LEFT JOIN controller_control_item as coi ON
ci.control_item_id = coi.id ";
- $sql .= "WHERE cl.id = $check_list_id ";
+ $sql .= "WHERE cl.id = {$check_list_id} ";
if($status == 'open')
$sql .= "AND ci.status = 0 ";
@@ -119,24 +123,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');
@@ -165,12 +169,15 @@
* @param $control_id
* @return array with check list objects
*/
- function get_check_lists_for_control($control_id){
+ function get_check_lists_for_control($control_id)
+ {
+ $control_id = (int) $control_id;
+
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, ";
$sql .= "completed_date, component_id, location_code,
num_open_cases, num_pending_cases ";
$sql .= "ci.id as ci_id, control_item_id, check_list_id ";
$sql .= "FROM controller_check_list cl, controller_check_item
ci ";
- $sql .= "WHERE cl.control_id = $control_id ";
+ $sql .= "WHERE cl.control_id = {$control_id} ";
$sql .= "AND cl.id = ci.check_list_id ";
$sql .= "ORDER BY cl.id;";
@@ -179,29 +186,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();
@@ -228,6 +235,8 @@
*/
function get_planned_check_lists_for_control($control_id,
$location_code,$location_id, $component_id)
{
+ $control_id = (int) $control_id;
+
$component_filter = ' AND component_id IS NULL ';
if($component_id)
{
@@ -239,7 +248,7 @@
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, ";
$sql .= "completed_date, component_id, location_code,
num_open_cases, num_pending_cases ";
$sql .= "FROM controller_check_list cl ";
- $sql .= "WHERE cl.control_id = $control_id ";
+ $sql .= "WHERE cl.control_id = {$control_id} ";
$sql .= "AND cl.location_code = '{$location_code}' ";
$sql .= "AND NOT cl.planned_date IS NULL ";
$sql .= "AND cl.completed_date IS NULL ";
@@ -252,22 +261,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();
}
@@ -288,11 +297,14 @@
* @param $location_code
* @return array with check list objects
*/
- function get_unplanned_check_lists_for_control($control_id,
$location_code){
+ function get_unplanned_check_lists_for_control($control_id,
$location_code)
+ {
+ $control_id = (int) $control_id;
+
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, ";
$sql .= "completed_date, component_id, location_code,
num_open_cases, num_pending_cases ";
$sql .= "FROM controller_check_list cl ";
- $sql .= "WHERE cl.control_id = $control_id ";
+ $sql .= "WHERE cl.control_id = {$control_id} ";
$sql .= "AND cl.location_code = '{$location_code}' ";
$sql .= "AND cl.planned_date IS NULL ";
$sql .= "AND cl.completed_date IS NULL ";
@@ -303,21 +315,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();
}
@@ -337,11 +349,14 @@
* @param $location_code location code
* @return array with check list objects
*/
- function get_open_check_lists_for_control($control_id, $location_code,
$from_date){
+ function get_open_check_lists_for_control($control_id, $location_code,
$from_date)
+ {
+ $control_id = (int) $control_id;
+
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, ";
$sql .= "completed_date, component_id, location_code,
num_open_cases, num_pending_cases ";
$sql .= "FROM controller_check_list cl ";
- $sql .= "WHERE cl.control_id = $control_id ";
+ $sql .= "WHERE cl.control_id = {$control_id} ";
$sql .= "AND cl.location_code = '{$location_code}' ";
$sql .= "AND (cl.planned_date IS NULL OR cl.planned_date <
$from_date) ";
$sql .= "AND cl.deadline < $from_date ";
@@ -354,21 +369,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 +423,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 +463,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;
@@ -493,14 +508,18 @@
* @param $repeat_type_expr repeat type expression
* @return array with check list objects
*/
- function get_check_lists_for_component( $location_id, $component_id,
$from_date_ts, $to_date_ts, $repeat_type_expr = null ){
+ function get_check_lists_for_component( $location_id, $component_id,
$from_date_ts, $to_date_ts, $repeat_type_expr = null )
+ {
+ $location_id = (int) $location_id;
+ $component_id = (int) $component_id;
+
$sql = "SELECT c.id as c_id, ";
$sql .= "cl.id as cl_id, cl.status as cl_status, cl.comment as
cl_comment, deadline, planned_date, completed_date, ";
$sql .= "cl.component_id, cl.location_id, cl.location_code as
cl_location_code, num_open_cases, num_pending_cases ";
$sql .= "FROM controller_control c ";
$sql .= "LEFT JOIN controller_check_list cl on cl.control_id =
c.id ";
- $sql .= "WHERE cl.location_id = $location_id ";
- $sql .= "AND cl.component_id = $component_id ";
+ $sql .= "WHERE cl.location_id = {$location_id} ";
+ $sql .= "AND cl.component_id = {$component_id} ";
if( $repeat_type != null )
$sql .= "AND c.repeat_type $repeat_type_expr ";
@@ -515,29 +534,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;
@@ -562,7 +581,10 @@
* @param $repeat_type_expr repeat type expression
* @return array with check list objects
*/
- function get_check_lists_for_control_and_location( $control_id,
$location_code, $from_date_ts, $to_date_ts, $repeat_type = null ){
+ function get_check_lists_for_control_and_location( $control_id,
$location_code, $from_date_ts, $to_date_ts, $repeat_type = null )
+ {
+ $control_id = (int) $control_id;
+
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, completed_date, ";
$sql .= "cl.component_id as cl_component_id, cl.location_code
as cl_location_code, num_open_cases, num_pending_cases ";
$sql .= "FROM controller_check_list cl ";
@@ -578,16 +600,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;
}
@@ -605,7 +627,12 @@
* @param $repeat_type_expr repeat type expression
* @return array with check list objects
*/
- function get_check_lists_for_control_and_component( $control_id,
$location_id, $component_id, $from_date_ts, $to_date_ts, $repeat_type = null ){
+ function get_check_lists_for_control_and_component( $control_id,
$location_id, $component_id, $from_date_ts, $to_date_ts, $repeat_type = null )
+ {
+ $control_id = (int) $control_id;
+ $location_id = (int) $location_id;
+ $component_id = (int) $component_id;
+
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, completed_date, ";
$sql .= "cl.component_id as cl_component_id, cl.location_id as
cl_location_id, cl.location_code as cl_location_code, num_open_cases,
num_pending_cases ";
$sql .= "FROM controller_check_list cl ";
@@ -622,17 +649,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;
}
@@ -743,22 +770,22 @@
$control = new controller_control((int) $control_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_description($this->unmarshal($this->db->f('description', true),
'string'));
$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: branches/Version-1_0-branch/controller/inc/class.socommon.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socommon.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/controller/inc/class.socommon.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -93,18 +93,26 @@
{
return (boolean)$value;
}
- elseif($value === null || $value == 'NULL')
+ else if($type == 'boolean')
{
- return null;
+ return (boolean) $value;
}
- elseif($type == 'int')
+ else if($type == 'int')
{
- return intval($value);
+ return (int) $value;
}
- elseif($type == 'float')
+ else if($type == 'float')
{
- return floatval($value);
+ return (float) $value;
}
+ else if($type == 'string')
+ {
+ return (string) $value;
+ }
+ else if($value === null || $value == 'NULL')
+ {
+ return null;
+ }
return $value;
}
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -120,8 +120,10 @@
* @param $role_id responsible role for carrying out the
control
* @return array with controls as objects or arrays
*/
- public function get_controls_by_location($location_code,
$from_date, $to_date, $repeat_type, $return_type = "return_object", $role_id =
'')
+ public function get_controls_by_location($location_code,
$from_date, $to_date, $repeat_type, $return_type = "return_object", $role_id =
0)
{
+ $role_id = (int) $role_id;
+
$controls_array = array();
$sql = "SELECT distinct c.*,
fm_responsibility_role.name AS responsibility_name ";
@@ -141,20 +143,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_description($this->unmarshal($this->db->f('description', true),
'string'));
+
$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;
@@ -181,8 +183,10 @@
* @param $role_id responsible role for carrying out the
control
* @return array with controls as objects or arrays
*/
- public function
get_controls_for_components_by_location($location_code, $from_date, $to_date,
$repeat_type, $return_type = "return_object", $role_id = '')
+
+ public function
get_controls_for_components_by_location($location_code, $from_date, $to_date,
$repeat_type, $return_type = "return_object", $role_id = 0)
{
+ $role_id = (int) $role_id;
$controls_array = array();
$sql = "SELECT distinct c.*,
fm_responsibility_role.name AS responsibility_name, ccl.location_id,
ccl.component_id ";
@@ -203,20 +207,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_description($this->unmarshal($this->db->f('description', true),
'string'));
+
$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'));
@@ -245,8 +249,10 @@
* @param $role_id responsible role for carrying out the
control
* @return array of components as objects or arrays
*/
- public function get_controls_by_component($location_code,
$from_date, $to_date, $repeat_type = '', $return_type = "return_object",
$role_id = '', $filter = null)
+ public function get_controls_by_component($location_code,
$from_date, $to_date, $repeat_type = '', $return_type = "return_object",
$role_id = 0, $filter = null)
{
+ $role_id = (int) $role_id;
+
$controls_array = array();
$sql = "SELECT c.id as control_id, c.*, ";
@@ -285,7 +291,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 +309,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 +319,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_description($this->unmarshal($this->db->f('description', true),
'string'));
+
$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 +385,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_description($this->unmarshal($this->db->f('description', true),
'string'));
+
$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();
}
@@ -414,17 +420,19 @@
*/
function get_locations_for_control($control_id)
{
+ $control_id = (int) $control_id;
+
$controls_array = array();
$sql = "SELECT c.id, c.title, cll.location_code ";
$sql .= "FROM controller_control c,
controller_control_location_list cll ";
- $sql .= "WHERE cll.control_id = $control_id ";
+ $sql .= "WHERE cll.control_id = {$control_id} ";
$sql .= "AND cll.control_id = c.id";
$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');
@@ -451,12 +459,14 @@
* @param $control_id control id
* @return array with arrays of component info
*/
- function get_components_for_control($control_id)
+ function get_components_for_control($control_id)
{
+ $control_id = (int) $control_id;
+
$controls_array = array();
$sql = "SELECT ccl.control_id, ccl.component_id as
component_id, ccl.location_id as location_id, bim_type.description,
bim_item.location_code ";
- $sql .= "FROM controller_control_component_list ccl, fm_bim_item
bim_item, fm_bim_type bim_type ";
+ $sql .= "FROM controller_control_component_list ccl,
fm_bim_item bim_item, fm_bim_type bim_type ";
$sql .= "WHERE ccl.control_id = $control_id ";
$sql .= "AND ccl.component_id = bim_item.id ";
$sql .= "AND ccl.location_id = bim_type.location_id ";
@@ -466,9 +476,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'));
@@ -773,20 +783,21 @@
$control = new controller_control((int)
$control_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_description($this->unmarshal($this->db->f('description', true),
'string'));
+
$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;
@@ -814,22 +825,23 @@
$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_description($this->unmarshal($this->db->f('description', true),
'string'));
+
$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 +877,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 +941,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 +970,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:
branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -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;
@@ -211,16 +212,17 @@
*/
function get_control_groups_as_array($control_area_id)
{
+ $control_area_id = (int) $control_area_id;
$results = array();
$sql = "SELECT * FROM controller_control_group WHERE
control_area_id=$control_area_id";
$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 +310,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;
@@ -329,6 +332,7 @@
*/
function get_control_groups_by_control_area($control_area_id)
{
+ $control_area_id = (int) $control_area_id;
$controls_array = array();
$sql = "SELECT * FROM controller_control_group WHERE
control_area_id=$control_area_id";
@@ -337,14 +341,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();
}
@@ -366,7 +370,8 @@
*/
function get_control_areas_by_control_group($control_group_id)
{
- $sql = "SELECT control_area_id FROM
controller_control_group WHERE control_group_id=$control_group_id";
+ $control_group_id = (int) $control_group_id;
+ $sql = "SELECT control_area_id FROM
controller_control_group WHERE control_group_id={$control_group_id}";
$this->db->query($sql);
while($this->db->next_record()) {
@@ -410,10 +415,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++;
}
@@ -456,6 +461,7 @@
*/
function get_components_for_control_group($control_group_id)
{
+ $control_group_id = (int) $control_group_id;
$results = array();
$sql = "select * from
controller_control_group_component_list where
control_group_id={$control_group_id}";
@@ -475,8 +481,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:
branches/Version-1_0-branch/controller/inc/class.socontrol_group_list.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.socontrol_group_list.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++
branches/Version-1_0-branch/controller/inc/class.socontrol_group_list.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -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'));
@@ -142,12 +142,15 @@
*/
function get_group_list_by_control_and_group($control_id,
$control_group_id)
{
- $sql = "SELECT p.* FROM controller_control_group_list p
WHERE p.control_id=" . $control_id . " AND p.control_group_id=" .
$control_group_id;
+ $control_id = (int) $control_id;
+ $control_group_id = (int) $control_group_id;
+
+ $sql = "SELECT p.* FROM controller_control_group_list p
WHERE p.control_id={$control_id} AND p.control_group_id={$control_group_id}";
$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'));
@@ -168,6 +171,9 @@
*/
function delete($control_id, $control_group_id)
{
+ $control_id = (int) $control_id;
+ $control_group_id = (int) $control_group_id;
+
$result = $this->db->query("DELETE FROM
controller_control_group_list WHERE control_id = $control_id AND
control_group_id = $control_group_id");
return isset($result);
@@ -181,6 +187,7 @@
*/
function delete_control_groups($control_id)
{
+ $control_id = (int) $control_id;
$result = $this->db->query("DELETE FROM
controller_control_group_list WHERE control_id = $control_id");
return isset($result);
@@ -195,9 +202,10 @@
*/
function get_control_groups_by_control($control_id, $returnType
= "object")
{
+ $control_id = (int) $control_id;
$sql = "SELECT cg.*, cgl.order_nr ";
$sql .= "FROM controller_control_group_list cgl,
controller_control_group cg ";
- $sql .= "WHERE cgl.control_id=$control_id ";
+ $sql .= "WHERE cgl.control_id={$control_id} ";
$sql .= "AND cgl.control_group_id=cg.id ";
$sql .= "ORDER BY cgl.order_nr";
@@ -207,7 +215,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:
branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -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;
}
@@ -159,7 +159,9 @@
* @param $return_type return data as objects or as arrays
* @return control item object
*/
- public function get_single_with_options($id, $return_type =
"return_object"){
+ public function get_single_with_options($id, $return_type =
"return_object")
+ {
+ $id = (int)$id;
$sql = "SELECT ci.id as ci_id, ci.*, cio.id as cio_id,
cio.*, cg.group_name ";
$sql .= "FROM controller_control_item ci ";
$sql .= "LEFT JOIN controller_control_item_option as
cio ON cio.control_item_id = ci.id ";
@@ -174,25 +176,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")
{
@@ -227,7 +229,8 @@
*/
function delete_option_values($control_item_id)
{
- $sql = "delete from controller_control_item_option
where control_item_id=$control_item_id";
+ $control_item_id = (int)$control_item_id;
+ $sql = "delete from controller_control_item_option
where control_item_id={$control_item_id}";
$this->db->query($sql);
}
@@ -244,14 +247,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 +370,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;
@@ -407,6 +411,9 @@
*/
function get_items_for_control_group($control_id,
$control_group_id)
{
+ $control_id = (int) $control_id;
+ $control_group_id = (int) $control_group_id;
+
$results = array();
$sql = "select ci.* from controller_control_item ci,
controller_control_item_list cil where ci.control_group_id =
{$control_group_id} and cil.control_id = {$control_id} and ci.id =
cil.control_item_id";
@@ -416,14 +423,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:
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -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;
}
@@ -132,14 +132,17 @@
*/
function get_single_2($control_id, $control_item_id)
{
+ $control_id = (int) $control_id;
+ $control_item_id = (int) $control_item_id;
+
$sql = "SELECT cil.* FROM controller_control_item_list
cil WHERE cil.control_id = " . $control_id . " AND cil.control_item_id = " .
$control_item_id;
$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;
}
@@ -153,6 +156,8 @@
*/
function get_control_items($control_group_id, $return_type =
"return_object")
{
+ $control_group_id = (int) $control_group_id;
+
$results = array();
$sql = "SELECT * ";
@@ -162,12 +167,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;
@@ -187,6 +192,8 @@
*/
function get_control_items_by_control($control_id, $returnType
= "return_object")
{
+ $control_id = (int) $control_id;
+
$results = array();
$sql = "SELECT ci.* ";
@@ -197,12 +204,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")
@@ -224,6 +231,9 @@
*/
function get_control_items_by_control_and_group($control_id,
$control_group_id, $returnType = "return_array")
{
+ $control_id = (int) $control_id;
+ $control_group_id = (int) $control_group_id;
+
$results = array();
$sql = "SELECT ci.* ";
@@ -237,12 +247,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")
@@ -264,6 +274,9 @@
*/
function
get_control_items_and_options_by_control_and_group($control_id,
$control_group_id, $return_type = "return_array")
{
+ $control_id = (int) $control_id;
+ $control_group_id = (int) $control_group_id;
+
$results = array();
$sql = "SELECT ci.id as ci_id, ci.*, cio.id as cio_id,
cio.* ";
@@ -281,7 +294,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 +304,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();
@@ -338,6 +351,9 @@
*/
function delete($control_id, $control_item_id)
{
+ $control_id = (int) $control_id;
+ $control_item_id = (int) $control_item_id;
+
$result = $this->db->query("DELETE FROM
controller_control_item_list WHERE control_id = $control_id AND control_item_id
= $control_item_id", __LINE__,__FILE__);
return isset($result);
@@ -351,6 +367,7 @@
*/
function delete_control_items($control_id)
{
+ $control_id = (int) $control_id;
$result = $this->db->query("DELETE FROM
controller_control_item_list WHERE control_id = $control_id");
return isset($result);
@@ -365,6 +382,9 @@
*/
function delete_control_items_for_group_list($control_id,
$control_group_id)
{
+ $control_id = (int) $control_id;
+ $control_group_id = (int) $control_group_id;
+
$sql = "DELETE FROM controller_control_item_list ";
$sql .= "USING controller_control_item ";
$sql .= "WHERE control_id = $control_id ";
Modified:
branches/Version-1_0-branch/controller/inc/class.socontrol_item_option.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.socontrol_item_option.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++
branches/Version-1_0-branch/controller/inc/class.socontrol_item_option.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -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: branches/Version-1_0-branch/controller/inc/class.sodocument.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.sodocument.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/controller/inc/class.sodocument.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -153,6 +153,8 @@
function populate(int $document_id, &$document)
{
+ $document_id = (int) $document_id;
+
if($document == null)
{
$document = new controller_document($document_id);
@@ -160,7 +162,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 +222,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 +237,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: branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -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'));
@@ -252,13 +252,14 @@
function get_procedures_by_control_area($control_area_id)
{
+ $control_area_id = (int) $control_area_id;
$results = array();
$sql = "SELECT * FROM controller_procedure WHERE
control_area_id={$control_area_id} AND end_date IS NULL ORDER BY title ASC";
$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 +298,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'));
@@ -351,6 +352,7 @@
function get_old_revisions($id)
{
+ $id = (int) $id;
$results = array();
$sql = "SELECT p.* FROM controller_procedure p WHERE
procedure_id = {$id} ORDER BY end_date DESC";
Modified: branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -249,6 +249,9 @@
$data = array
(
+ 'action_url' =>
self::link(array('menuaction' => 'controller.uicheck_list.save_check_list')),
+ 'calendar_for_year_url' =>
self::link(array('menuaction' =>
'controller.uicalendar.view_calendar_for_year')),
+ 'calendar_for_month_url' =>
self::link(array('menuaction' =>
'controller.uicalendar.view_calendar_for_month')),
'location_array' =>
$location_array,
'component_array' =>
$component_array,
'control'
=> $control->toArray(),
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
2012-08-15 10:30:58 UTC (rev 9858)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
2012-08-15 10:32:33 UTC (rev 9859)
@@ -47,7 +47,7 @@
<div class="box-2 select-box">
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:value-of
select="calendar_for_year_url"/>
<xsl:text>&year=</xsl:text>
<xsl:value-of select="current_year"/>
<xsl:text>&location_code=</xsl:text>
@@ -64,7 +64,7 @@
</a>
<a class="last">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ <xsl:value-of
select="calendar_for_month_url"/>
<xsl:text>&year=</xsl:text>
<xsl:value-of select="current_year"/>
<xsl:text>&month=</xsl:text>
@@ -99,7 +99,7 @@
<!-- ================== CHECKLIST DETAILS ===================== -->
<div id="check_list_details">
<h3 class="box_header">Sjekklistedetaljer</h3>
- <form id="frm_add_check_list"
action="index.php?menuaction=controller.uicheck_list.save_check_list"
method="post">
+ <form id="frm_add_check_list" action="{action_url}"
method="post">
<xsl:variable name="control_id"><xsl:value-of
select="control/id"/></xsl:variable>
<input type="hidden" name="control_id"
value="{$control_id}" />
<xsl:variable name="type"><xsl:value-of
select="type"/></xsl:variable>
Modified: branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -87,6 +87,12 @@
{
$attributes['datatype_text'] =
$this->translate_datatype($attributes['datatype']);
$attributes['help_url'] =
$attributes['helpmsg'] ? $GLOBALS['phpgw']->link('/index.php',
array('menuaction'=> 'manual.uimanual.attrib_help', 'appname'=> $appname,
'location'=> $location, 'id' => $attributes['id'])): '';
+
+ if(!$view_only && $attributes['history'])
+ {
+
$GLOBALS['phpgw']->jqcal->add_listener("values_attribute_{$i}_date");
+ }
+
if($attributes['datatype'] == 'D' ||
$attributes['datatype'] == 'DT' || $attributes['datatype'] == 'date' ||
$attributes['datatype'] == 'timestamp')
{
if(!$view_only)
Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2012-08-15 10:32:33 UTC (rev 9859)
@@ -1964,43 +1964,8 @@
}
- $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
- $sep = '/';
- $dlarr[strpos($dateformat,'y')] = 'yyyy';
- $dlarr[strpos($dateformat,'m')] = 'MM';
- $dlarr[strpos($dateformat,'d')] = 'DD';
- ksort($dlarr);
-
- $dateformat= (implode($sep,$dlarr));
-
- switch(substr($dateformat,0,1))
- {
- case 'M':
- $dateformat_validate=
"javascript:vDateType='1'";
- $onKeyUp =
"DateFormat(this,this.value,event,false,'1')";
- $onBlur =
"DateFormat(this,this.value,event,true,'1')";
- break;
- case 'y':
- $dateformat_validate="javascript:vDateType='2'";
- $onKeyUp =
"DateFormat(this,this.value,event,false,'2')";
- $onBlur =
"DateFormat(this,this.value,event,true,'2')";
- break;
- case 'D':
- $dateformat_validate="javascript:vDateType='3'";
- $onKeyUp =
"DateFormat(this,this.value,event,false,'3')";
- $onBlur =
"DateFormat(this,this.value,event,true,'3')";
- break;
- }
-
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat','property');
-
-
$data = array
(
- 'lang_dateformat'
=> strtolower($dateformat),
- 'dateformat_validate'
=> $dateformat_validate,
- 'onKeyUp'
=> $onKeyUp,
- 'onBlur'
=> $onBlur,
-
'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
'datatable'
=> $datavalues,
'myColumnDefs'
=> $myColumnDefs,
Modified:
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2012-08-15 10:30:58 UTC (rev 9858)
+++ branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2012-08-15 10:32:33 UTC (rev 9859)
@@ -556,7 +556,7 @@
</xsl:choose>
<xsl:choose>
<xsl:when
test="history=1">
- <input
type="text" name="values_attribute[{counter}][date]" value=""
onFocus="{//dateformat_validate}" onKeyUp="{//onKeyUp}" onBlur="{//onBlur}"
size="12" maxlength="10">
+ <input
type="text" id="values_attribute_{counter}_date"
name="values_attribute[{counter}][date]" value="" size="12" maxlength="10">
</input>
<xsl:variable
name="link_history">
<xsl:value-of select="link_history"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9859] Merge 9851:9858 from trunk,
Sigurd Nes <=