[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11121] Merge 11117:11120 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11121] Merge 11117:11120 from trunk |
|
Date: |
Wed, 22 May 2013 08:30:12 +0000 |
Revision: 11121
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11121
Author: sigurdne
Date: 2013-05-22 08:30:12 +0000 (Wed, 22 May 2013)
Log Message:
-----------
Merge 11117:11120 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.hook_helper.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_customsso.inc.php
Removed Paths:
-------------
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
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,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116
+
/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,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120
Modified: branches/Version-1_0-branch/controller/inc/class.hook_helper.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.hook_helper.inc.php
2013-05-22 08:04:19 UTC (rev 11120)
+++ branches/Version-1_0-branch/controller/inc/class.hook_helper.inc.php
2013-05-22 08:30:12 UTC (rev 11121)
@@ -172,6 +172,8 @@
$my_controls = array();
$my_controls = $this->get_my_controls($my_locations,
$from_date_ts, $to_date_ts, $repeat_type);
+ $my_check_lists =
$this->get_my_assigned_check_list($from_date_ts, $to_date_ts, $repeat_type);
+
$my_planned_controls = array();
// Generates an array with planned controls
@@ -279,6 +281,8 @@
// Fetches controls current user is responsible for 3 months
back in time
$my_controls = $this->get_my_controls($my_locations,
$from_date_ts, $to_date_ts, $repeat_type);
+ $my_check_lists =
$this->get_my_assigned_check_list($from_date_ts, $to_date_ts, $repeat_type);
+
$my_undone_controls = array();
// Generates an array containing undone controls
@@ -671,15 +675,37 @@
/* ================================ FUNCTIONS
======================================== */
+ function get_my_assigned_check_list($from_date_ts, $to_date_ts,
$repeat_type)
+ {
+ $check_list_array = array();
+
+ $so_control = CreateObject('controller.socontrol');
+
+ $user_id = $GLOBALS['phpgw_info']['user']['account_id'];
+ $assigned_check_list_at_location =
$so_control->get_assigned_check_list_at_location( $from_date_ts, $to_date_ts,
$repeat_type, $user_id,"return_array");
+
+ foreach ($assigned_check_list_at_location as
$assigned_check_list)
+ {
+ $check_list_array[$assigned_check_list['id']] =
$assigned_check_list;
+ }
+
+ $assigned_check_list_at_component =
$so_control->get_assigned_check_list_by_component( $from_date_ts, $to_date_ts,
$repeat_type, $user_id,"return_array");
+
+//_debug_array($check_list_array);
+//_debug_array($assigned_check_list_at_component);
+
+
+ }
+
+
function get_my_controls($my_locations, $from_date_ts,
$to_date_ts, $repeat_type)
{
$so_control = CreateObject('controller.socontrol');
foreach($my_locations as $location)
{
-
- $controls = array();
- $components_with_controls_array = array();
+ $my_controls = array();
+ // $components_with_controls_array = array();
$location_code = $location["location_code"];
$controls_at_location =
$so_control->get_controls_by_location( $location_code, $from_date_ts,
$to_date_ts, $repeat_type, "return_array", $location["role_id"] );
@@ -715,11 +741,8 @@
}
}
- $user_id = $GLOBALS['phpgw_info']['user']['account_id'];
- $assigned_controls_at_location =
$so_control->get_assigned_controls_at_location( $from_date_ts, $to_date_ts,
$repeat_type, $user_id,"return_array");
- $assigned_controls_at_component =
$so_control->get_assigned_controls_by_component( $from_date_ts, $to_date_ts,
$repeat_type, $user_id,"return_array");
-//_debug_array($assigned_controls);
-//_debug_array($assigned_controls);
+
+
return $my_controls;
}
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2013-05-22 08:04:19 UTC (rev 11120)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2013-05-22 08:30:12 UTC (rev 11121)
@@ -31,6 +31,7 @@
phpgw::import_class('controller.socommon');
include_class('controller', 'control', 'inc/model/');
+ include_class('controller', 'check_list', 'inc/model/');
include_class('controller', 'component', 'inc/model/');
include_class('controller', 'control_location', 'inc/model/');
@@ -123,24 +124,25 @@
* @param $role_id responsible role for carrying out the
control
* @return array with controls as objects or arrays
*/
- public function get_assigned_controls_at_location($from_date,
$to_date, $repeat_type, $user_id, $return_type = "return_object")
+ public function get_assigned_check_list_at_location($from_date,
$to_date, $repeat_type, $user_id, $return_type = "return_object")
{
$user_id = (int) $user_id;
$repeat_type = (int) $repeat_type;
- $controls_array = array();
+ $check_list_array = array();
$sql = "SELECT controller_check_list.location_code,
controller_check_list.control_id, controller_check_list.id AS check_list_id,"
- . "
procedure_id,requirement_id,costresponsibility_id,control_area_id,description,
start_date, end_date,"
+ . "
procedure_id,requirement_id,costresponsibility_id,control_area_id,description,
start_date, end_date,deadline,"
. " control_area_id,
repeat_type,repeat_interval, title"
. " FROM controller_check_list"
. " {$this->join} controller_control ON
controller_check_list.control_id = controller_control.id"
. " {$this->join}
controller_control_location_list ON controller_control_location_list.control_id
= controller_control.id"
. " WHERE assigned_to = {$user_id}";
-
+
+//_debug_array($sql);
if( $repeat_type )
{
- $sql .= "AND controller_control.repeat_type =
$repeat_type ";
+// $sql .= "AND controller_control.repeat_type =
$repeat_type ";
}
@@ -152,42 +154,35 @@
while($this->db->next_record())
{
- $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),
'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'),
'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'));
-
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('check_list_id'), 'int'));
+
$check_list->set_control_id($this->unmarshal($this->db->f('control_id'),
'int'));
+
$check_list->set_title($this->unmarshal($this->db->f('title', true), 'string'));
+
$check_list->set_description($this->unmarshal($this->db->f('description',
true), 'string'));
+
$check_list->set_start_date($this->unmarshal($this->db->f('start_date'),
'int'));
+
$check_list->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+ //
$check_list->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
+ //
$check_list->set_requirement_id($this->unmarshal($this->db->f('requirement_id'),
'int'));
+ //
$check_list->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id'),
'int'));
+
$check_list->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+ //
$check_list->set_repeat_type($this->unmarshal($this->db->f('repeat_type'),
'int'));
+ //
$check_list->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type'),
'int'));
+ //
$check_list->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval'),
'int'));
+
$check_list->set_assigned_to($this->unmarshal($user_id, 'int'));
+
if($return_type == "return_object")
{
- $controls_array[] = $control;
+ $check_list_array[] = $check_list;
}
else
{
- $controls_array[] = $control->toArray();
+ $check_list_array[] =
$check_list->toArray();
}
}
- if( count( $controls_array ) > 0 )
- {
- return $controls_array;
- }
- else
- {
- return null;
- }
+ return $check_list_array;
}
-
//---------
@@ -202,15 +197,14 @@
* @param $role_id responsible role for carrying out the
control
* @return array of components as objects or arrays
*/
- public function get_assigned_controls_by_component($from_date,
$to_date, $repeat_type, $user_id, $return_type = "return_object")
+ public function
get_assigned_check_list_by_component($from_date, $to_date, $repeat_type,
$user_id, $return_type = "return_object")
{
$repeat_type = $repeat_type;
$user_id = (int)$user_id;
- $controls_array = array();
-
+
$sql = "SELECT controller_check_list.location_code,
controller_check_list.control_id, controller_check_list.id AS check_list_id,"
- . "
procedure_id,requirement_id,costresponsibility_id,control_area_id,
controller_control.description, start_date, end_date,"
+ . "
procedure_id,requirement_id,costresponsibility_id,control_area_id,
controller_control.description, start_date, end_date, deadline,"
. " control_area_id,
repeat_type,repeat_interval, title,"
. " bim_item.guid,bim_item.type as
component_type, bim_item.id as component_id, bim_item.address,"
. " bim_item.loc1"
@@ -223,7 +217,7 @@
if( $repeat_type )
{
- $sql .= "AND controller_control.repeat_type =
$repeat_type ";
+// $sql .= "AND controller_control.repeat_type =
$repeat_type ";
}
$sql .= "AND ((controller_control.start_date <=
$to_date AND controller_control.end_date IS NULL) ";
@@ -232,6 +226,8 @@
$this->db->query($sql);
+ $check_list_array = array();
+ $components_array = array();
$component_id = 0;
$component = null;
while($this->db->next_record())
@@ -263,28 +259,32 @@
$component->set_address($this->unmarshal($this->db->f('address', true),
'string'));
}
- $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),
'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'),
'int'));
-
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_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_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'));
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('check_list_id'), 'int'));
+
$check_list->set_control_id($this->unmarshal($this->db->f('control_id'),
'int'));
+
$check_list->set_title($this->unmarshal($this->db->f('title', true), 'string'));
+
$check_list->set_description($this->unmarshal($this->db->f('description',
true), 'string'));
+
$check_list->set_start_date($this->unmarshal($this->db->f('start_date'),
'int'));
+
$check_list->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+ //
$check_list->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
+ //
$check_list->set_requirement_id($this->unmarshal($this->db->f('requirement_id'),
'int'));
+ //
$check_list->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id'),
'int'));
+
$check_list->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+ //
$check_list->set_repeat_type($this->unmarshal($this->db->f('repeat_type'),
'int'));
+ //
$check_list->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type'),
'int'));
+ //
$check_list->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval'),
'int'));
+
$check_list->set_assigned_to($this->unmarshal($user_id, 'int'));
+
+
+
if($return_type == "return_object")
{
- $controls_array[] = $control;
+ $check_list_array[] = $check_list;
}
else
{
- $controls_array[] = $control->toArray();
+ $check_list_array[] =
$check_list->toArray();
}
$component_id = $component->get_id();
@@ -292,7 +292,7 @@
if($component != null)
{
- $component->set_controls_array($controls_array);
+
$component->set_controls_array($check_list_array);
if($return_type == "return_array")
{
@@ -302,13 +302,9 @@
{
$components_array[] = $component;
}
-
- return $components_array;
}
- else
- {
- return null;
- }
+
+ return $components_array;
}
Modified:
branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
2013-05-22 08:04:19 UTC (rev 11120)
+++ branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
2013-05-22 08:30:12 UTC (rev 11121)
@@ -39,10 +39,14 @@
const STATUS_CANCELED = 3;
protected $id;
+ protected $title;//
+ protected $description;//
protected $control_id;
protected $status;
protected $comment;
protected $deadline;
+ protected $start_date;
+ protected $end_date;
protected $planned_date;
protected $completed_date;
protected $location_code;
@@ -50,7 +54,8 @@
protected $location_id;
protected $assigned_to;
protected $billable_hours;
-
+ protected $control_area_id;
+
// Aggregate fields. Fields not in a table
protected $num_open_cases;
protected $num_pending_cases;
@@ -80,6 +85,46 @@
public function get_id() { return $this->id; }
+ public function set_title($title)
+ {
+ $this->title = $title;
+ }
+
+ public function get_title()
+ {
+ return $this->title;
+ }
+
+ public function set_description($description)
+ {
+ $this->description = $description;
+ }
+
+ public function get_description()
+ {
+ return $this->description;
+ }
+
+ public function set_end_date($end_date)
+ {
+ $this->end_date = $end_date;
+ }
+
+ public function get_end_date()
+ {
+ return $this->end_date;
+ }
+
+ public function set_start_date($start_date)
+ {
+ $this->start_date = $start_date;
+ }
+
+ public function get_start_date()
+ {
+ return $this->start_date;
+ }
+
public function set_control_id($control_id)
{
$this->control_id = $control_id;
@@ -178,6 +223,16 @@
$this->error_msg_array = $error_msg_array;
}
+ public function set_control_area_id($control_area_id)
+ {
+ $this->control_area_id = $control_area_id;
+ }
+
+ public function get_control_area_id()
+ {
+ return $this->control_area_id;
+ }
+
public function set_assigned_to($assigned_to)
{
$this->assigned_to = $assigned_to;
@@ -202,12 +257,17 @@
{
return array(
'id' =>
$this->get_id(),
+ 'title' =>
$this->get_title(),
+ 'description' =>
$this->get_description(),
'control_id' =>
$this->get_control_id(),
'status' =>
$this->get_status(),
'comment' =>
$this->get_comment(),
'deadline' =>
$this->get_deadline(),
'planned_date' =>
$this->get_planned_date(),
'completed_date' =>
$this->get_completed_date(),
+ 'start_date' =>
$this->get_start_date(),
+ 'end_date' =>
$this->get_end_date(),
+ 'control_area_id' =>
$this->get_control_area_id(),
'location_code' =>
$this->get_location_code(),
'component_id' =>
$this->get_component_id(),
'location_id' =>
$this->get_location_id(),
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
2013-05-22 08:04:19 UTC (rev 11120)
+++ branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
2013-05-22 08:30:12 UTC (rev 11121)
@@ -1,183 +0,0 @@
-<?php
- /**
- * Authentication based on SQL table
- * @author Dan Kuykendall <address@hidden>
- * @author Joseph Engo <address@hidden>
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2013 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
- * @package phpgwapi
- * @subpackage accounts
- * @version $Id: class.auth_sql.inc.php 10166 2012-10-09 07:54:03Z
sigurdne $
- */
-
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
- /**
- * Authentication based on SQL table
- *
- * @package phpgwapi
- * @subpackage accounts
- */
- class phpgwapi_auth_custom_sso extends phpgwapi_auth_
- {
-
- /**
- * Constructor
- */
- public function __construct()
- {
- parent::__construct();
- }
-
- /**
- * Authenticate a user
- *
- * @param string $username the login to authenticate
- * @param string $passwd the password supplied by the user
- * @return bool did the user sucessfully authenticate
- */
- public function authenticate($username, $passwd)
- {
- $username =
$GLOBALS['phpgw']->db->db_addslashes($username);
-
- $sql = 'SELECT account_pwd FROM phpgw_accounts'
- . " WHERE account_lid = '{$username}'"
- . " AND account_status = 'A'";
-
- $GLOBALS['phpgw']->db->query($sql, __LINE__, __FILE__);
- return !!$GLOBALS['phpgw']->db->next_record();
-
- }
-
- /* php ping function
- */
- private function ping($host)
- {
- exec(sprintf('ping -c 1 -W 5 %s', escapeshellarg($host)), $res,
$rval);
- return $rval === 0;
- }
-
-
- public function get_username()
- {
- $config = CreateObject('phpgwapi.config','rental');
- $config->read();
-
- if(! $config->config_data['external_db_host'] ||
!$this->ping($config->config_data['external_db_host']))
- {
- $message ="Database server
{$config->config_data['external_db_host']} is not accessible";
- phpgwapi_cache::message_set($message, 'error');
- return false;
- }
-
- $db = createObject('phpgwapi.db', null, null, true);
-
- $db->debug =
!!$config->config_data['external_db_debug'];
- $db->Host = $config->config_data['external_db_host'];
- $db->Port = $config->config_data['external_db_port'];
- $db->Type = $config->config_data['external_db_type'];
- $db->Database =
$config->config_data['external_db_name'];
- $db->User = $config->config_data['external_db_user'];
- $db->Password =
$config->config_data['external_db_password'];
-
- try
- {
- $db->connect();
- }
- catch(Exception $e)
- {
- $message =
lang('unable_to_connect_to_database');
- phpgwapi_cache::message_set($message, 'error');
- return false;
- }
-
- $headers = getallheaders();
-
-// $headers['Osso-User-Dn'] =
'cn=02035701829,cn=users,dc=usrv,dc=ubergenkom,dc=no';// test
-
- $header_regular_expression = '/^cn=(.*),cn=users.*$/';
- $header_key = 'Osso-User-Dn';
- $matches = array();
-
preg_match_all($header_regular_expression,$headers[$header_key], $matches);
- $fodsels_nr = $matches[1][0];
-
- $sql = "SELECT BRUKERNAVN FROM V_IDM_KOBLINGER WHERE
FODSELSNR ='{$fodsels_nr}'";
- $db->query($sql,__LINE__,__FILE__);
- $db->next_record();
- return $db->f('BRUKERNAVN',true);
- }
-
- /**
- * Set the user's password to a new value
- *
- * @param string $old_passwd the user's old password
- * @param string $new_passwd the user's new password
- * @param int $account_id the account to change the password for
- defaults to current user
- * @return string the new encrypted hash, or an empty string on
failure
- */
- public function change_password($old_passwd, $new_passwd,
$account_id = 0)
- {
- $account_id = (int) $account_id;
- // Don't allow passwords changes for other accounts
when using XML-RPC
- if ( !$account_id )
- {
- $account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
- }
-
- if ( $GLOBALS['phpgw_info']['flags']['currentapp'] ==
'login')
- {
- if (
!$this->authenticate($GLOBALS['phpgw']->accounts->id2lid($account_id),
$old_passwd) )
- {
- return '';
- }
- }
-
- $hash = $this->create_hash($new_passwd);
- $hash_safe =
$GLOBALS['phpgw']->db->db_addslashes($hash); // just to be safe :)
- $now = time();
-
- $sql = 'UPDATE phpgw_accounts'
- . " SET account_pwd = '{$hash_safe}',
account_lastpwd_change = {$now}"
- . " WHERE account_id = {$account_id}";
-
- if ( !!$GLOBALS['phpgw']->db->query($sql, __LINE__,
__FILE__) )
- {
- return $hash;
- }
- return '';
- }
-
- /**
- * Update when the user last logged in
- *
- * @param int $account_id the user's account id
- * @param string $ip the source IP adddress for the request
- */
- public function update_lastlogin($account_id, $ip)
- {
- $ip = $GLOBALS['phpgw']->db->db_addslashes($ip);
- $account_id = (int) $account_id;
- $now = time();
-
- $sql = 'UPDATE phpgw_accounts'
- . " SET account_lastloginfrom = '{$ip}',"
- . " account_lastlogin = {$now}"
- . " WHERE account_id = {$account_id}";
-
- $GLOBALS['phpgw']->db->query($sql, __LINE__, __FILE__);
- }
- }
Modified:
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_customsso.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_customsso.inc.php
2013-05-22 08:04:19 UTC (rev 11120)
+++ branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_customsso.inc.php
2013-05-22 08:30:12 UTC (rev 11121)
@@ -115,7 +115,7 @@
preg_match_all($header_regular_expression,$headers[$header_key], $matches);
$fodsels_nr = $matches[1][0];
- $sql = "SELECT BRUKERNAVN FROM V_IDM_KOBLINGER WHERE
FODSELSNR ='{$fodsels_nr}'";
+ $sql = "SELECT BRUKERNAVN FROM V_AD_PERSON WHERE
FODSELSNR ='{$fodsels_nr}'";
$db->query($sql,__LINE__,__FILE__);
$db->next_record();
return $db->f('BRUKERNAVN',true);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11121] Merge 11117:11120 from trunk,
Sigurd Nes <=