[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11152] Merge 11139:11151 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11152] Merge 11139:11151 from trunk |
|
Date: |
Thu, 06 Jun 2013 09:28:38 +0000 |
Revision: 11152
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11152
Author: sigurdne
Date: 2013-06-06 09:28:37 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
Merge 11139:11151 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.bobooking.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_component.js
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_location.js
branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
branches/Version-1_0-branch/property/inc/class.uientity.inc.php
branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
branches/Version-1_0-branch/property/inc/hook_config.inc.php
branches/Version-1_0-branch/property/templates/base/config.tpl
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,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138
+
/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,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151
Modified: branches/Version-1_0-branch/booking/inc/class.bobooking.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.bobooking.inc.php
2013-06-05 16:44:30 UTC (rev 11151)
+++ branches/Version-1_0-branch/booking/inc/class.bobooking.inc.php
2013-06-06 09:28:37 UTC (rev 11152)
@@ -176,12 +176,6 @@
*
* @return array containing values from $array for the keys in
$keys.
*/
-
- function getTimestamp($last){
- $now = floor(microtime(true)*1000);
- return $now-$last;
- }
-
function building_schedule($building_id, $date)
{
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
2013-06-05 16:44:30 UTC (rev 11151)
+++
branches/Version-1_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
2013-06-06 09:28:37 UTC (rev 11152)
@@ -294,6 +294,8 @@
$results =
phpgw::get_var('results', 'int');
$control_registered =
phpgw::get_var('control_registered', 'bool');
+ $results =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int)
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : $results;
+
if(!$entity_id && !$cat_id)
{
$values = array();
@@ -325,8 +327,6 @@
}
}
- $num_rows =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int)
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : 15;
-
$data = array(
'ResultSet' => array(
'totalResultsAvailable' =>
$boentity->total_records,
@@ -334,15 +334,13 @@
'sortKey' => 'location_code',
'sortDir' => "ASC",
'Result' => $values,
- 'pageSize' => $num_rows,
- 'activePage' => floor($boentity->start
/ $num_rows) + 1
+ 'pageSize' => $results,
+ 'activePage' => floor($boentity->start
/ $results) + 1
)
);
return $data;
-
-
$return_data['recordsReturned'] = count($values);
$return_data['totalRecords'] = $boentity->total_records;
$return_data['startIndex'] = $this->start;
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
2013-06-05 16:44:30 UTC (rev 11151)
+++
branches/Version-1_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
2013-06-06 09:28:37 UTC (rev 11152)
@@ -299,11 +299,19 @@
'className' => ''
);
-
$count_fields = count($uicols['name']);
for ($i=0;$i<$count_fields;$i++)
{
+ switch($uicols['datatype'][$i])
+ {
+ case 'link':
+ $formatter = 'link';
+ break;
+ default:
+ $formatter =
$uicols['formatter'][$i];
+ }
+
if( $uicols['name'][$i])
{
$columndef[] = array
@@ -311,7 +319,7 @@
'key' =>
$uicols['name'][$i],
'label' =>
$uicols['descr'][$i],
'sortable' =>
!!$uicols['sortable'][$i],
- 'formatter' =>
$uicols['formatter'][$i],
+ 'formatter' => $formatter,
'hidden' =>
$uicols['input_type'][$i] == 'hidden' ? true : false ,
'className' =>
$uicols['classname'][$i],
);
@@ -352,9 +360,11 @@
$results =
phpgw::get_var('results', 'int');
$control_registered =
phpgw::get_var('control_registered', 'bool');
+ $results =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int)
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : $results;
+
$this->bo->results = $results;
- $this->bo->sort = phpgw::get_var('dir');
- $this->bo->order = phpgw::get_var('sort');
+ $this->bo->sort = 'ASC';
+ $this->bo->order = 'location_code';
$this->bo->start = phpgw::get_var('startIndex', 'int', 'REQUEST',
0);
$values = $this->bo->read(array('control_registered' =>
$control_registered,
@@ -380,8 +390,6 @@
}
}
- $num_rows =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int)
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : 15;
-
$data = array(
'ResultSet' => array(
'totalResultsAvailable' =>
$this->bo->total_records,
@@ -389,8 +397,8 @@
'sortKey' => 'location_code',
'sortDir' => "ASC",
'Result' => $values,
- 'pageSize' => $num_rows,
- 'activePage' => floor($this->bo->start
/ $num_rows) + 1
+ 'pageSize' => $results,
+ 'activePage' => floor($this->bo->start
/ $results) + 1
)
);
Modified:
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_component.js
===================================================================
---
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_component.js
2013-06-05 16:44:30 UTC (rev 11151)
+++
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_component.js
2013-06-06 09:28:37 UTC (rev 11152)
@@ -129,6 +129,7 @@
var oArgs = {menuaction:'property.bolocation.get_locations_by_name'};
var baseUrl = phpGWLink('index.php', oArgs, true);
+ var location_type = 1;
$("#search-location-name").autocomplete({
source: function( request, response ) {
Modified:
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_location.js
===================================================================
---
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_location.js
2013-06-05 16:44:30 UTC (rev 11151)
+++
branches/Version-1_0-branch/controller/js/controller/ajax_control_to_location.js
2013-06-06 09:28:37 UTC (rev 11152)
@@ -91,7 +91,7 @@
var oArgs = {menuaction:'property.bolocation.get_locations_by_name'};
var baseUrl = phpGWLink('index.php', oArgs, true);
-
+ var location_type = 1;
$("#search-location-name").autocomplete({
source: function( request, response ) {
location_type = $("#location_type").val();
Modified: branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2013-06-05 16:44:30 UTC (rev 11151)
+++ branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2013-06-06 09:28:37 UTC (rev 11152)
@@ -955,7 +955,7 @@
function delete_entity($id)
{
$id = (int) $id;
-
$category_list=$this->read_category(array('entity_id'=>$id));
+
$category_list=$this->read_category(array('allrows'=>true, 'entity_id'=>$id));
$locations = array();
$locations[] = $GLOBALS['phpgw']->locations->get_id(
$this->type_app[$this->type], ".{$this->type}.{$id}");
$subs = $GLOBALS['phpgw']->locations->get_subs(
$this->type_app[$this->type], ".{$this->type}.{$id}");
@@ -969,7 +969,7 @@
$this->db->query('DELETE FROM phpgw_cust_attribute
WHERE location_id IN (' . implode(',', $locations) . ')',__LINE__,__FILE__);
$this->db->query('DELETE FROM phpgw_locations WHERE
location_id IN (' . implode(',', $locations) . ')',__LINE__,__FILE__);
$this->db->query('DELETE FROM phpgw_acl WHERE
location_id IN (' . implode(',', $locations) . ')',__LINE__,__FILE__);
- if (isset($category_list) AND is_array($category_list))
+ if (isset($category_list) && is_array($category_list))
{
$this->init_process();
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2013-06-05 16:44:30 UTC (rev 11151)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2013-06-06 09:28:37 UTC (rev 11152)
@@ -483,11 +483,19 @@
$where= 'AND';
}
+ $bypass_acl_at_entity = false;
+ if(isset($_config->config_data['bypass_acl_at_entity'])
+ &&
is_array($_config->config_data['bypass_acl_at_entity'])
+ && in_array($entity_id,
$_config->config_data['bypass_acl_at_entity']))
+ {
+ $bypass_acl_at_entity = true;
+ }
+
unset($_config);
if ($filter=='all')
{
- if (is_array($grants))
+ if (is_array($grants) && !$bypass_acl_at_entity)
{
foreach($grants as $user => $right)
{
@@ -1208,11 +1216,19 @@
$where= 'AND';
}
+ $bypass_acl_at_entity = false;
+ if(isset($_config->config_data['bypass_acl_at_entity'])
+ &&
is_array($_config->config_data['bypass_acl_at_entity'])
+ && in_array($entity_id,
$_config->config_data['bypass_acl_at_entity']))
+ {
+ $bypass_acl_at_entity = true;
+ }
+
unset($_config);
if ($filter=='all')
{
- if (is_array($grants))
+ if (is_array($grants) && !$bypass_acl_at_entity)
{
foreach($grants as $user => $right)
{
Modified: branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
2013-06-05 16:44:30 UTC (rev 11151)
+++ branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
2013-06-06 09:28:37 UTC (rev 11152)
@@ -1244,7 +1244,14 @@
{
if(!$this->acl_delete)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uilocation.stop', 'perm'=> 8, 'acl_location'=> $this->acl_location));
+ if( phpgw::get_var('phpgw_return_as') == 'json'
)
+ {
+ return "Go away!";
+ }
+ else
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uilocation.stop', 'perm'=> 8, 'acl_location'=> $this->acl_location));
+ }
}
$entity_id = phpgw::get_var('entity_id',
'int');
Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2013-06-05 16:44:30 UTC (rev 11151)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2013-06-06 09:28:37 UTC (rev 11152)
@@ -795,7 +795,7 @@
$entity_list = array();
$entity_list =
$this->bo->read(array('start_date'=>$start_date,'end_date'=>$end_date,
'dry_run' => $dry_run));
-
+//_debug_array($entity_list);
$uicols = $this->bo->uicols;
$uicols['name'][] = 'img_id';
@@ -849,16 +849,25 @@
{
$_loc1 = isset($entity_entry['loc1'])
&& $entity_entry['loc1'] ? $entity_entry['loc1'] : 'dummy';
- $_files = $vfs->ls(array(
- 'string' =>
"/property/{$this->category_dir}/{$_loc1}/{$entity_entry['id']}",
- 'relatives' =>
array(RELATIVE_NONE)));
-
- if(isset($_files[0]) && $_files[0] &&
in_array($_files[0]['mime_type'], $img_types))
+ if(false)
{
- $entity_entry['file_name']
= urlencode($_files[0]['name']);
- $entity_entry['directory']
= urlencode($_files[0]['directory']);
- $entity_entry['img_id']
= $_files[0]['file_id'];
+ $entity_entry['file_name']
= $entity_entry['museumsnr'];
+ $entity_entry['directory']
= urlencode('external_source');
+ $entity_entry['img_id']
= $entity_entry['museumsnr'];
}
+ else
+ {
+ $_files = $vfs->ls(array(
+ 'string' =>
"/property/{$this->category_dir}/{$_loc1}/{$entity_entry['id']}",
+ 'relatives' =>
array(RELATIVE_NONE)));
+
+ if(isset($_files[0]) &&
$_files[0] && in_array($_files[0]['mime_type'], $img_types))
+ {
+
$entity_entry['file_name'] = urlencode($_files[0]['name']);
+
$entity_entry['directory'] = urlencode($_files[0]['directory']);
+ $entity_entry['img_id']
= $_files[0]['file_id'];
+ }
+ }
for
($i=0;$i<count($uicols['name']);$i++)
{
Modified: branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
2013-06-05 16:44:30 UTC (rev 11151)
+++ branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
2013-06-06 09:28:37 UTC (rev 11152)
@@ -91,6 +91,37 @@
$this->bo->save_sessiondata($data);
}
+ private function get_external_source($file, $thumb)
+ {
+ $file = ltrim($file,'external_source/');
+
+ $url =
"bkbilde.bergen.kommune.no/fotoweb/cmdrequest/rest/PreviewAgent.fwx?ar=5008&rs=0&pg=0&username=FDV&password=FDV123&sr={$file}*";
+
+ if($thumb)
+ {
+ $url .= '&sz=50';
+ }
+ else
+ {
+ header('Content-Type: image/jpeg');
+ }
+
+/*
+ $file = 'http://somehosted.com/file.pdf'; // URL to the
file
+
+ $contents = file_get_contents($file); // read the
remote file
+*/
+
+ $ch = curl_init ($url);
+ curl_setopt($ch, CURLOPT_HEADER, 0);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_BINARYTRANSFER,1);
+ $raw=curl_exec($ch);
+ curl_close ($ch);
+ echo $raw;
+
+ }
+
function view_file()
{
$GLOBALS['phpgw_info']['flags']['noheader'] = true;
@@ -107,6 +138,11 @@
$directory = explode('/', $file);
+
+ if($directory[0] == 'external_source')
+ {
+ return $this->get_external_source($file,
$thumb);
+ }
$location_info = $this->bo->get_location($directory);
Modified: branches/Version-1_0-branch/property/inc/hook_config.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/hook_config.inc.php
2013-06-05 16:44:30 UTC (rev 11151)
+++ branches/Version-1_0-branch/property/inc/hook_config.inc.php
2013-06-06 09:28:37 UTC (rev 11152)
@@ -502,3 +502,31 @@
return $out;
}
+
+ /**
+ * Get HTML checkbox with entities to bypass ACL
+ *
+ * @param $config
+ * @return string HTML checkboxes to be placed in a table
+ */
+ function bypass_acl_at_entity($config)
+ {
+ $entity_list =
execMethod('property.soadmin_entity.read',array('allrows' => true));
+
+ $acl_bypass = isset($config['bypass_acl_at_entity']) ?
$config['bypass_acl_at_entity'] : array();
+ $out = '';
+ foreach ( $entity_list as $dummy => $entity)
+ {
+ $checked = '';
+ if ( in_array($entity['id'], $acl_bypass))
+ {
+ $checked = ' checked';
+ }
+
+ $out .= <<<HTML
+ <tr><td><input type="checkbox"
name="newsettings[bypass_acl_at_entity][]" value="{$entity['id']}"
{$checked}><label>{$entity['name']}</label></td></tr>
+HTML;
+ }
+ return $out;
+ }
+
Modified: branches/Version-1_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/config.tpl
2013-06-05 16:44:30 UTC (rev 11151)
+++ branches/Version-1_0-branch/property/templates/base/config.tpl
2013-06-06 09:28:37 UTC (rev 11152)
@@ -461,7 +461,7 @@
</select>
</td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_Bypass_ACL_for_accessing_tickets}.</td>
<td>
<select
name="newsettings[bypass_acl_at_tickets]">
@@ -471,6 +471,17 @@
</td>
</tr>
<tr class="row_off">
+ <td>{lang_Bypass_ACL_for_accessing_entities}.</td>
+ <td>
+ <!--to be able to blank the setting - need an
empty value-->
+ <input type = 'hidden'
name="newsettings[bypass_acl_at_entity][]" value="">
+ <table>
+ {hook_bypass_acl_at_entity}
+ </table>
+ </td>
+ </tr>
+
+ <tr class="row_on">
<td>{lang_Use_ACL_for_helpdesk_categories}.</td>
<td>
<select name="newsettings[acl_at_tts_category]">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11152] Merge 11139:11151 from trunk,
Sigurd Nes <=