[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10595] Merge 10591:10594 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10595] Merge 10591:10594 from trunk |
|
Date: |
Fri, 14 Dec 2012 11:27:13 +0000 |
Revision: 10595
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10595
Author: sigurdne
Date: 2012-12-14 11:27:13 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Merge 10591:10594 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable.js
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.borequest.inc.php
branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
branches/Version-1_0-branch/property/inc/cron/default/forward_mail_as_sms.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/condition_survey_import.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,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
+
/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
Modified: branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable.js
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable.js 2012-12-14
11:22:49 UTC (rev 10594)
+++ branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable.js 2012-12-14
11:27:13 UTC (rev 10595)
@@ -24,7 +24,7 @@
YAHOO.portico.setupPaginator = function() {
var paginatorConfig = {
rowsPerPage: 10,
- alwaysVisible: false,
+ alwaysVisible: true,
template: "{PreviousPageLink} <strong>{CurrentPageReport}</strong>
{NextPageLink}",
pageReportTemplate: "Showing items {startRecord} - {endRecord} of
{totalRecords}",
containers: ['paginator']
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2012-12-14 11:22:49 UTC (rev 10594)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2012-12-14 11:27:13 UTC (rev 10595)
@@ -1419,10 +1419,8 @@
break;
}
- $sogeneric = CreateObject('property.sogeneric');
+ $categories =
execMethod('property.sogeneric.get_list',$data);
- $categories= $sogeneric->get_list($data);
-
return
$this->select_list($data['selected'],$categories);
}
Modified: branches/Version-1_0-branch/property/inc/class.borequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.borequest.inc.php
2012-12-14 11:22:49 UTC (rev 10594)
+++ branches/Version-1_0-branch/property/inc/class.borequest.inc.php
2012-12-14 11:27:13 UTC (rev 10595)
@@ -159,13 +159,13 @@
{
if ($this->use_session)
{
-
$GLOBALS['phpgw']->session->appsession('session_data','request',$data);
+
phpgwapi_cache::session_set('property.request','session_data', $data);
}
}
function read_sessiondata()
{
- $data =
$GLOBALS['phpgw']->session->appsession('session_data','request');
+ $data =
phpgwapi_cache::session_get('property.request','session_data', $data);
$this->start = $data['start'];
$this->query = $data['query'];
Modified:
branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
2012-12-14 11:22:49 UTC (rev 10594)
+++ branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
2012-12-14 11:27:13 UTC (rev 10595)
@@ -37,40 +37,12 @@
class property_socondition_survey extends property_socommon_core
{
- /**
- * @var int $_total_records total number of records found
- */
- protected $_total_records = 0;
-
- /**
- * @var int $_receipt feedback on actions
- */
- protected $_receipt = array();
-
-
- /**
- * @var object $_db reference to the global database object
- */
- protected $_db;
-
- /**
- * @var string $_join SQL JOIN statement
- */
- protected $_join;
-
- /**
- * @var string $_like SQL LIKE statement
- */
- protected $_like;
-
-
public function __construct()
{
parent::__construct();
}
-
function read($data = array())
{
$start = isset($data['start']) ? (int)
$data['start'] : 0;
@@ -104,8 +76,11 @@
$querymethod = " {$where} title
{$this->_like} '%{$query}%'";
}
- $sql = "SELECT * FROM {$table} $filtermethod
$querymethod";
+ $groupmethod = "GROUP BY
$table.id,$table.title,$table.descr,$table.address,$table.entry_date,$table.user_id";
+ $sql = "SELECT DISTINCT
$table.id,$table.title,$table.descr,$table.address,$table.entry_date,$table.user_id
, count(condition_survey_id) AS cnt"
+ . " FROM {$table} {$this->_left_join} fm_request ON
{$table}.id =fm_request.condition_survey_id {$filtermethod} {$querymethod}
{$groupmethod}";
+
$this->_db->query($sql,__LINE__,__FILE__);
$this->_total_records = $this->_db->num_rows();
@@ -128,7 +103,8 @@
'descr' =>
$this->_db->f('descr',true),
'address' =>
$this->_db->f('address',true),
'entry_date' =>
$this->_db->f('entry_date'),
- 'user' =>
$this->_db->f('user_id')
+ 'user' =>
$this->_db->f('user_id'),
+ 'cnt' =>
$this->_db->f('cnt'),
);
}
@@ -335,6 +311,15 @@
);
*/
+ $_update_buildingpart = array();
+ $filter_buildingpart =
isset($config->config_data['filter_buildingpart']) ?
$config->config_data['filter_buildingpart'] : array();
+
+ if($filter_key = array_search('.project.request',
$filter_buildingpart))
+ {
+ $_update_buildingpart =
array("filter_{$filter_key}" => 1);
+ }
+
+
foreach ($import_data as $entry)
{
@@ -369,7 +354,7 @@
$request['cat_id'] =
(int)$categories[0]['id'];
}
-
$this->_check_building_part($entry['building_part']);
+
$this->_check_building_part($entry['building_part'],$_update_buildingpart);
$request['condition_survey_id'] =
$survey['id'];
@@ -385,8 +370,8 @@
$request['coordinator']
= $survey['coordinator_id'];
$request['status']
= $config->config_data['condition_survey_initial_status'];
$request['budget']
= $entry['amount'];
- $request['planning_date']
= mktime(13,0,0,7,1, $entry['due_year']?$entry['due_year']:date('Y'));
$request['planning_value']
= $entry['amount'];
+ $request['planning_date']
= mktime(13,0,0,7,1, $entry['due_year']?$entry['due_year']:date('Y'));
$request['condition']
= array
(
array
@@ -398,7 +383,6 @@
)
);
-//_debug_array($request);
$sorequest->add($request,
$values_attribute = array());
if($entry['amount_extra'] > 0)
{
@@ -406,19 +390,17 @@
{
$request['cat_id'] =
(int)$config->config_data['condition_survey_import_cat'][4];
}
-
$request['planning_value']
=$entry['amount_extra'];
- $request['cat_id']
= 13; //???? FIXME
+ $request['budget']
=$entry['amount_extra'];
$sorequest->add($request,
$values_attribute = array());
}
}
}
-// die();
$this->_db->transaction_commit();
}
- private function _check_building_part($id)
+ private function _check_building_part($id,
$_update_buildingpart)
{
$sql = "SELECT id FROM fm_building_part WHERE id =
'{$id}'";
$this->_db->query($sql,__LINE__,__FILE__);
@@ -427,6 +409,12 @@
$sql = "INSERT INTO fm_building_part (id,
descr) VALUES ('{$id}', '{$id}::__')";
$this->_db->query($sql,__LINE__,__FILE__);
}
+
+ if($_update_buildingpart)
+ {
+ $value_set =
$this->_db->validate_update($_update_buildingpart);
+ $this->_db->query("UPDATE fm_building_part SET
{$value_set} WHERE id = '{$id}'",__LINE__,__FILE__);
+ }
}
public function get_summation($id)
Modified:
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2012-12-14 11:22:49 UTC (rev 10594)
+++ branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2012-12-14 11:27:13 UTC (rev 10595)
@@ -159,6 +159,11 @@
'sortable' => true
),
array(
+ 'key' => 'cnt',
+ 'label' =>
lang('count'),
+ 'sortable' => false,
+ ),
+ array(
'key' => 'link',
'hidden' => true
)
@@ -301,6 +306,8 @@
}
}
+
phpgwapi_cache::session_clear('property.request','session_data');
+
phpgwapi_yui::tabview_setup('survey_edit_tabview');
$tabs = array();
$tabs['generic'] = array('label' =>
lang('generic'), 'link' => '#generic');
@@ -796,6 +803,16 @@
$sheet_id = $sheet_id ? $sheet_id :
phpgw::get_var('selected_sheet_id', 'int', 'REQUEST');
+ if(!$step )
+ {
+ if($cached_file =
phpgwapi_cache::session_get('property', 'condition_survey_import_file'))
+ {
+
phpgwapi_cache::session_clear('property', 'condition_survey_import_file');
+ unlink($cached_file);
+ unset($cached_file);
+ }
+ }
+
if($start_line = phpgw::get_var('start_line', 'int',
'REQUEST'))
{
phpgwapi_cache::system_set('property',
'import_sheet_start_line', $start_line);
Modified:
branches/Version-1_0-branch/property/inc/cron/default/forward_mail_as_sms.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/forward_mail_as_sms.php
2012-12-14 11:22:49 UTC (rev 10594)
+++
branches/Version-1_0-branch/property/inc/cron/default/forward_mail_as_sms.php
2012-12-14 11:27:13 UTC (rev 10595)
@@ -134,24 +134,31 @@
$data =
$GLOBALS['phpgw']->session->appsession('session_data','mail2sms');
$GLOBALS['phpgw_info']['user']['account_id'] =
$data['account_id'];
- $GLOBALS['phpgw']->preferences->account_id =
$data['account_id'];
- $pref = $GLOBALS['phpgw']->preferences->read();
-
$GLOBALS['phpgw_info']['user']['preferences']['felamimail'] =
isset($pref['felamimail']) ? $pref['felamimail'] : '';
+
$GLOBALS['phpgw']->preferences->set_account_id($data['data_id'], true);
+ $GLOBALS['phpgw_info']['user']['preferences']=
$GLOBALS['phpgw']->preferences->read();
+
$boPreferences =
CreateObject('felamimail.bopreferences');
- $boPreferences->setProfileActive(false);
- $boPreferences->setProfileActive(true,2); //2 for
selected user
+
$bofelamimail =
CreateObject('felamimail.bofelamimail');
+// $bofelamimail->closeConnection();
+// $boPreferences->setProfileActive(false);
+// $boPreferences->setProfileActive(true,2); //2 for
selected user
+
$connectionStatus = $bofelamimail->openConnection();
$headers = $bofelamimail->getHeaders('INBOX', 1,
$maxMessages = 15, $sort = 0, $_reverse = 1, $_filter = array('string' => '',
'type' => 'quick', 'status' => 'unseen'));
+//_debug_array($headers);
+//die();
+
+ $sms = array();
$j = 0;
if (isset($headers['header']) &&
is_array($headers['header']))
{
foreach ($headers['header'] as $header)
{
- if($header['seen'] == 0)
+ if(!$header['seen'])
{
$sms[$j]['message'] =
utf8_encode($header['subject']);
$bodyParts =
$bofelamimail->getMessageBody($header['uid']);
@@ -164,32 +171,24 @@
$sms[$j]['message'] =
substr($sms[$j]['message'],0,160);
$j++;
}
+ $bofelamimail->flagMessages('read',
$header['uid']);
}
}
- if($connectionStatus == 'true')
+
+ if($connectionStatus)
{
$bofelamimail->closeConnection();
}
$bosms = CreateObject('sms.bosms',false);
- if(isset($sms) && is_array($sms))
+ foreach ($sms as $entry)
{
- foreach ($sms as $entry)
- {
-
$bosms->send_sms(array('p_num_text'=>$data['cellphone'], 'message'
=>$entry['message']));
- }
+
$bosms->send_sms(array('p_num_text'=>$data['cellphone'], 'message'
=>$entry['message']));
}
- $msg = $j . ' messages er sendt';
+ $msg = $j . ' meldinger er sendt';
$this->receipt['message'][]=array('msg'=> $msg);
- if($j>0)
- {
- return $msg;
- }
- else
- {
- return false;
- }
+ return $j ? $msg : false;
}
}
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2012-12-14
11:22:49 UTC (rev 10594)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2012-12-14
11:27:13 UTC (rev 10595)
@@ -1295,6 +1295,7 @@
probability property no Sannsynlighet
project property no prosjekt
.project property no Prosjekt
+project.condition_survey property no Tilstandsanalyse
project.workorder property no Prosjekt::Bestilling
project %1 has been edited property no Prosjekt %1 er oppdatert
project %1 has been saved property no Prosjekt %1 er lagret
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2012-12-14
11:22:49 UTC (rev 10594)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2012-12-14
11:27:13 UTC (rev 10595)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.656';
+ $setup_info['property']['version'] = '0.9.17.657';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2012-12-14 11:22:49 UTC (rev 10594)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2012-12-14 11:27:13 UTC (rev 10595)
@@ -493,8 +493,8 @@
'category' => array('type' => 'int','precision'
=> '4','nullable' => True),
'chapter_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'start_date' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'end_date' => array('type' => 'int','precision'
=> '4','nullable' => False),
+ 'start_date' => array('type' =>
'int','precision' => '8','nullable' => False),
+ 'end_date' => array('type' => 'int','precision'
=> '8','nullable' => False),
'coordinator' => array('type' =>
'int','precision' => '4','nullable' => True),
'vendor_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'status' => array('type' =>
'varchar','precision' => '20','nullable' => False,'default' => 'active'),
@@ -865,8 +865,8 @@
'coordinator' => array('type' =>
'int','precision' => '4','nullable' => True),
'authorities_demands' => array('type' =>
'int','precision' => '2','default' => '0','nullable' => True),
'score' => array('type' => 'int','precision' =>
'4','default' => '0','nullable' => True),
- 'start_date' => array('type' =>
'int','precision' => '4','default' => '0','nullable' => True),
- 'end_date' => array('type' => 'int','precision'
=> '4','default' => '0','nullable' => True),
+ 'start_date' => array('type' =>
'int','precision' => '8','default' => '0','nullable' => True),
+ 'end_date' => array('type' => 'int','precision'
=> '8','default' => '0','nullable' => True),
'building_part'=> array('type' =>
'varchar','precision' => 4,'nullable' => True),
'closed_date' => array('type' =>
'int','precision' => '4','nullable' => True),
'in_progress_date' => array('type' =>
'int','precision' => '4','nullable' => True),
@@ -913,7 +913,7 @@
'id' => array('type' => 'auto','nullable' =>
False),
'request_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'amount' => array('type' => 'int','precision'
=> '4','nullable' => False),
- 'date' => array('type' => 'int','precision' =>
'4','nullable' => False),
+ 'date' => array('type' => 'int','precision' =>
'8','nullable' => False),
'user_id' => array('type' => 'int','precision'
=> '4','nullable' => true),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => true),
'descr' => array('type' => 'text','nullable' =>
True)
@@ -928,7 +928,7 @@
'id' => array('type' => 'auto','nullable' =>
False),
'request_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'amount' => array('type' => 'int','precision'
=> '4','nullable' => False),
- 'date' => array('type' => 'int','precision' =>
'4','nullable' => False),
+ 'date' => array('type' => 'int','precision' =>
'8','nullable' => False),
'user_id' => array('type' => 'int','precision'
=> '4','nullable' => true),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => true),
'descr' => array('type' => 'text','nullable' =>
True)
@@ -1486,8 +1486,8 @@
'access' => array('type' =>
'varchar','precision' => '7','nullable' => True),
'category' => array('type' => 'int','precision'
=> '4','nullable' => true),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'start_date' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'end_date' => array('type' => 'int','precision'
=> '4','nullable' => False),
+ 'start_date' => array('type' =>
'int','precision' => '8','nullable' => False),
+ 'end_date' => array('type' => 'int','precision'
=> '8','nullable' => False),
'coordinator' => array('type' =>
'int','precision' => '4','nullable' => False),
'status' => array('type' =>
'varchar','precision' => '20','nullable' => False,'default' => 'active'),
'descr' => array('type' => 'text','nullable' =>
True),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-12-14 11:22:49 UTC (rev 10594)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-12-14 11:27:13 UTC (rev 10595)
@@ -6947,3 +6947,67 @@
}
}
+ /**
+ * Update property version from 0.9.17.656 to 0.9.17.657
+ * Alter planing dates to hold bigint
+ */
+ $test[] = '0.9.17.656';
+ function property_upgrade0_9_17_656()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_project','start_date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => false
+ )
+ );
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_project','end_date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => false
+ )
+ );
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_workorder','start_date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => false
+ )
+ );
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_workorder','end_date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => false
+ )
+ );
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_request','start_date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => true
+ )
+ );
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_request','end_date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => true
+ )
+ );
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_request_consume','date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => false
+ )
+ );
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_request_planning','date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => false
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.657';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
Modified:
branches/Version-1_0-branch/property/templates/base/condition_survey_import.xsl
===================================================================
---
branches/Version-1_0-branch/property/templates/base/condition_survey_import.xsl
2012-12-14 11:22:49 UTC (rev 10594)
+++
branches/Version-1_0-branch/property/templates/base/condition_survey_import.xsl
2012-12-14 11:27:13 UTC (rev 10595)
@@ -54,39 +54,46 @@
<xsl:when test="step=1">
<xsl:call-template
name="import_step_1"/>
</xsl:when>
- </xsl:choose>
-
- <xsl:choose>
<xsl:when test="step=2">
<xsl:call-template
name="import_step_2"/>
</xsl:when>
- </xsl:choose>
- <xsl:choose>
<xsl:when test="step=3">
<xsl:call-template
name="import_step_3"/>
</xsl:when>
- </xsl:choose>
- <xsl:choose>
<xsl:when test="step=4">
<xsl:call-template
name="import_step_4"/>
</xsl:when>
+ <xsl:otherwise>
+ <dl
class="proplist-col">
+ <dt>
+
<label><xsl:value-of select="php:function('lang', 'finished')" /></label>
+ </dt>
+ </dl>
+ </xsl:otherwise>
</xsl:choose>
-
</div>
<dl class="proplist-col">
<div class="form-buttons">
<xsl:variable
name="lang_submit"><xsl:value-of select="lang_submit"/></xsl:variable>
<xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
- <input type="submit"
name="submit_step" value="{$lang_submit}" title = "{$lang_submit}" />
+ <xsl:choose>
+ <xsl:when
test="$lang_submit != ''">
+ <input
type="submit" name="submit_step" value="{$lang_submit}" title =
"{$lang_submit}" />
+ </xsl:when>
+ </xsl:choose>
<input class="button"
type="button" name="cancelButton" id ='cancelButton' value="{$lang_cancel}"
title = "{$lang_cancel}" onClick="document.cancel_form.submit();"/>
</div>
</dl>
</form>
</div>
+ <xsl:variable name="cancel_params">
+ <xsl:text>menuaction:property.uicondition_survey.view,
id:</xsl:text>
+ <xsl:value-of select="survey/id" />
+ </xsl:variable>
<xsl:variable name="cancel_url">
- <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.index')" />
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $cancel_params )" />
</xsl:variable>
<form name="cancel_form" id="cancel_form"
action="{$cancel_url}" method="post">
@@ -110,20 +117,7 @@
</xsl:template>
-<xsl:template name="datasource-definition">
- <script>
- YAHOO.util.Event.onDOMReady(function(){
- <xsl:for-each select="datatable_def">
- YAHOO.portico.inlineTableHelper("<xsl:value-of
select="container"/>", <xsl:value-of select="requestUrl"/>, <xsl:value-of
select="ColumnDefs"/>);
- </xsl:for-each>
-
- });
- </script>
-
-</xsl:template>
-
-
<xsl:template name="import_step_1"
xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
<dl class="proplist-col">
<dt>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10595] Merge 10591:10594 from trunk,
Sigurd Nes <=