[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11970] Merge 11963:11969 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11970] Merge 11963:11969 from trunk |
|
Date: |
Tue, 13 May 2014 13:48:04 +0000 |
Revision: 11970
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11970
Author: sigurdne
Date: 2014-05-13 13:48:03 +0000 (Tue, 13 May 2014)
Log Message:
-----------
Merge 11963:11969 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/inc/class.mailer_smtp.inc.php
branches/Version-1_0-branch/phpgwapi/templates/base/categories.xsl
branches/Version-1_0-branch/property/inc/class.boevent.inc.php
branches/Version-1_0-branch/property/inc/class.soevent.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php
branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.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/migrate.xsl
branches/Version-1_0-branch/property/templates/base/request.xsl
branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
branches/Version-1_0-branch/property/templates/base/wo_hour.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,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,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962
+
/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,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.mailer_smtp.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.mailer_smtp.inc.php
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.mailer_smtp.inc.php
2014-05-13 13:48:03 UTC (rev 11970)
@@ -34,7 +34,7 @@
$this->Host =
$GLOBALS['phpgw_info']['server']['smtp_server'];
$this->Port =
isset($GLOBALS['phpgw_info']['server']['smtp_port']) ?
$GLOBALS['phpgw_info']['server']['smtp_port'] : 25;
$this->SMTPSecure =
isset($GLOBALS['phpgw_info']['server']['smtpSecure']) ?
$GLOBALS['phpgw_info']['server']['smtpSecure'] : '';
- $this->Version = 'custom - phpGroupWare 1.73';
+ $this->Version = 'custom - phpGroupWare 5.2.7';
$this->CharSet = 'utf-8';
if (
isset($GLOBALS['phpgw_info']['server']['smtpAuth']) &&
$GLOBALS['phpgw_info']['server']['smtpAuth'] == 'yes' )
Modified: branches/Version-1_0-branch/phpgwapi/templates/base/categories.xsl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/categories.xsl
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/categories.xsl
2014-05-13 13:48:03 UTC (rev 11970)
@@ -16,7 +16,7 @@
<xsl:variable name="select_name"><xsl:value-of
select="select_name"/></xsl:variable>
<xsl:variable name="lang_submit"><xsl:value-of
select="lang_submit"/></xsl:variable>
<form method="post" action="{$select_url}">
- <select name="{$select_name}"
onChange="this.form.submit();" onMouseout="window.status='';return true;">
+ <select name="{$select_name}"
onChange="this.form.submit();">
<xsl:attribute name="title">
<xsl:value-of
select="lang_cat_statustext"/>
</xsl:attribute>
@@ -33,10 +33,19 @@
<xsl:template match="cat_select">
<xsl:variable name="lang_cat_statustext"><xsl:value-of
select="lang_cat_statustext"/></xsl:variable>
<xsl:variable name="select_name"><xsl:value-of
select="select_name"/></xsl:variable>
- <select id = "global_category_id" name="{$select_name}"
class="forms" onMouseover="window.status='{$lang_cat_statustext}'; return
true;" onMouseout="window.status='';return true;">
+ <select id = "global_category_id" name="{$select_name}"
class="forms" title="{$lang_cat_statustext}">
+ <xsl:if test="disabled = 1">
+ <xsl:attribute name="disabled">
+ <xsl:text>disabled</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
<option value="0"><xsl:value-of
select="lang_no_cat"/></option>
<xsl:apply-templates select="cat_list"/>
</select>
+ <xsl:if test="disabled = 1">
+ <input type="hidden" name="{$select_name}"
value="{hidden_value}"/>
+ </xsl:if>
+
</xsl:template>
<xsl:template match="cat_list">
Modified: branches/Version-1_0-branch/property/inc/class.boevent.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boevent.inc.php
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/inc/class.boevent.inc.php
2014-05-13 13:48:03 UTC (rev 11970)
@@ -305,73 +305,73 @@
$dow = $rpt_day[$data['repeat_day'][0]];
switch($data['repeat_type'])
{
- case '0':
- $times = $data['start_date'];
- break;
- case '1': //'Daily'
- if($data['repeat_interval'])
- {
- $times = array('day' =>
"*/{$data['repeat_interval']}");
- }
- else
- {
- $times = array('day' => "*/1");
- }
- break;
- case '2': //'Weekly'
- if($data['repeat_interval'])
- {
- $day = $data['repeat_interval']
* 7;
- $times = array('day' =>
"*/{$day}");
- }
- else
- {
- $times = array('day' => "*/7");
- }
- if ($data['repeat_day'])
- {
- $times['dow'] = $repeat_day;
- }
- break;
- case '3': //'Monthly (by day)'
- if( !isset($data['repeat_day']) ||
!is_array($data['repeat_day']) )
- {
- $dow = 1;
- }
+ case '0':
+ $times = $data['start_date'];
+ break;
+ case '1': //'Daily'
+ if($data['repeat_interval'])
+ {
+ $times = array('day' =>
"*/{$data['repeat_interval']}");
+ }
+ else
+ {
+ $times = array('day' =>
"*/1");
+ }
+ break;
+ case '2': //'Weekly'
+ if($data['repeat_interval'])
+ {
+ $day =
$data['repeat_interval'] * 7;
+ $times = array('day' =>
"*/{$day}");
+ }
+ else
+ {
+ $times = array('day' =>
"*/7");
+ }
+ if ($data['repeat_day'])
+ {
+ $times['dow'] =
$repeat_day;
+ }
+ break;
+ case '3': //'Monthly (by day)'
+ if( !isset($data['repeat_day'])
|| !is_array($data['repeat_day']) )
+ {
+ $dow = 1;
+ }
- if($data['repeat_interval'])
- {
- $times = array('month' =>
"*/{$data['repeat_interval']}", 'dow' => $dow);
- }
- else
- {
- $times = array('month' =>
"*/1", 'dow' => $dow);
- }
- break;
- case '4': //'Monthly (by date)'
- if($data['repeat_interval'])
- {
- $times = array('month' =>
"*/{$data['repeat_interval']}", 'day' => 1);
- }
- else
- {
- $times = array('day' => 1);
- }
- break;
- case '5': //'Yearly'
- $month = date(n, $data['start_date']);
- if($data['repeat_interval'])
- {
- $times = array('year' =>
"*/{$data['repeat_interval']}", 'month' => $month);
- }
- else
- {
- $times = array('month' =>
$month);
- }
- break;
- default:
- $times = $data['start_date'];
- break;
+ if($data['repeat_interval'])
+ {
+ $times = array('month'
=> "*/{$data['repeat_interval']}", 'dow' => $dow);
+ }
+ else
+ {
+ $times = array('month'
=> "*/1", 'dow' => $dow);
+ }
+ break;
+ case '4': //'Monthly (by date)'
+ if($data['repeat_interval'])
+ {
+ $times = array('month'
=> "*/{$data['repeat_interval']}", 'day' => 1);
+ }
+ else
+ {
+ $times = array('day' =>
1);
+ }
+ break;
+ case '5': //'Yearly'
+ $month = date(n,
$data['start_date']);
+ if($data['repeat_interval'])
+ {
+ $times = array('year'
=> "*/{$data['repeat_interval']}", 'month' => $month);
+ }
+ else
+ {
+ $times = array('month'
=> $month);
+ }
+ break;
+ default:
+ $times = $data['start_date'];
+ break;
}
}
@@ -431,9 +431,26 @@
{
$parts = explode('::',$data['id']);
$id = end($parts);
+ $now = time();
- if($data['enabled'] &&
!$this->so->check_event_exception($id,$data['time']))
+ $event = $this->so->read_single($id);
+ $_perform_action = false;
+
+ foreach($event['event_schedule'] as $_schedule)
{
+ if (in_array($_schedule,
$event['event_receipt']) || in_array($_schedule, $event['repeat_exception']))
+ {
+ continue;
+ }
+ if($_schedule < $now && $data['enabled'])
+ {
+ $_perform_action = true;
+ break;
+ }
+ }
+
+ if($_perform_action)
+ {
list($module, $classname) = explode('.',
$data['action'], 3);
$file = PHPGW_INCLUDE_ROOT .
"/{$module}/inc/class.{$classname}.inc.php";
if ( is_file($file) )
Modified: branches/Version-1_0-branch/property/inc/class.soevent.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soevent.inc.php
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/inc/class.soevent.inc.php
2014-05-13 13:48:03 UTC (rev 11970)
@@ -338,11 +338,32 @@
$values['end']['min'] = $end_date ?
date('i',$end_date) : 0;
$values['end']['sec'] = $end_date ?
date('s',$end_date) : 0;
- $sql = "SELECT * FROM fm_event_exception WHERE
event_id ='{$id}'";
+ $values['event_schedule'] = array();
+ $values['event_receipt'] = array();
+ $values['repeat_exception'] = array();
+
+ $sql = "SELECT * FROM fm_event_schedule WHERE
event_id ='{$id}' ORDER BY schedule_time";
+
$this->_db->query($sql,__LINE__,__FILE__);
while ($this->_db->next_record())
{
+ $values['event_schedule'][] =
$this->_db->f('schedule_time');
+ }
+
+ $sql = "SELECT * FROM fm_event_receipt WHERE
event_id ='{$id}' ORDER BY receipt_time";
+
+ $this->_db->query($sql,__LINE__,__FILE__);
+ while ($this->_db->next_record())
+ {
+ $values['event_receipt'][] =
$this->_db->f('receipt_time');
+ }
+
+ $sql = "SELECT * FROM fm_event_exception WHERE
event_id ='{$id}' ORDER BY exception_time";
+
+ $this->_db->query($sql,__LINE__,__FILE__);
+ while ($this->_db->next_record())
+ {
$values['repeat_exception'][] =
$this->_db->f('exception_time');
}
}
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2014-05-13 13:48:03 UTC (rev 11970)
@@ -1208,7 +1208,7 @@
}
}
- if (($oldassigned != $ticket['assignedto']) &&
$ticket['assignedto'] != 'ignore')
+ if ($ticket['assignedto'] && ( ($oldassigned !=
$ticket['assignedto']) && $ticket['assignedto'] != 'ignore') )
{
$this->fields_updated[] = 'assignedto';
@@ -1219,7 +1219,7 @@
$this->historylog->add('A',$id,$ticket['assignedto'],$oldassigned);
}
- if (($oldgroup_id != $ticket['group_id']) &&
$ticket['group_id'] != 'ignore')
+ if ($ticket['group_id'] && ( ($oldgroup_id !=
$ticket['group_id']) && $ticket['group_id'] != 'ignore') )
{
$this->fields_updated[] = 'group_id';
@@ -1245,7 +1245,7 @@
$this->db->query("update fm_tts_tickets set
contact_id={$contact_id} WHERE id=$id",__LINE__,__FILE__);
}
- if (($oldcat_id != $ticket['cat_id']) &&
$ticket['cat_id'] != 'ignore')
+ if ($ticket['cat_id'] && ( ($oldcat_id !=
$ticket['cat_id']) && $ticket['cat_id'] != 'ignore') )
{
$this->fields_updated[] = 'cat_id';
$this->db->query("update fm_tts_tickets set
cat_id='" . $ticket['cat_id']
Modified: branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php
2014-05-13 13:48:03 UTC (rev 11970)
@@ -1364,8 +1364,8 @@
for($z=0; $z<count($agreement['files']); $z++)
{
- $content_files[$z]['file_name'] = '<a
href="'.$link_view_file.'&file_name='.$agreement['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view file').'"
style="cursor:help">'.$agreement['files'][$z]['name'].'</a>';
- $content_files[$z]['delete_file'] = '<input
type="checkbox" name="values[file_action][]"
value="'.$agreement['files'][$z]['name'].'" title="'.lang('Check to delete
file').'" style="cursor:help">';
+ $content_files[$z]['file_name'] = '<a
href="'.$link_view_file.'&file_name='.$agreement['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$agreement['files'][$z]['name'].'</a>';
+ $content_files[$z]['delete_file'] = '<input
type="checkbox" name="values[file_action][]"
value="'.$agreement['files'][$z]['name'].'" title="'.lang('Check to delete
file').'">';
}
$datavalues[2] = array
@@ -2170,11 +2170,11 @@
{
if ($link_to_files != '')
{
- $content_files[$z]['file_name'] = '<a
href="'.$link_to_files.'/'.$agreement['files'][$z]['directory'].'/'.$agreement['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view file').'"
style="cursor:help">'.$agreement['files'][$z]['name'].'</a>';
+ $content_files[$z]['file_name'] = '<a
href="'.$link_to_files.'/'.$agreement['files'][$z]['directory'].'/'.$agreement['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$agreement['files'][$z]['name'].'</a>';
}
else
{
- $content_files[$z]['file_name'] = '<a
href="'.$link_view_file.'&file_name='.$agreement['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view file').'"
style="cursor:help">'.$agreement['files'][$z]['name'].'</a>';
+ $content_files[$z]['file_name'] = '<a
href="'.$link_view_file.'&file_name='.$agreement['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$agreement['files'][$z]['name'].'</a>';
}
}
Modified: branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
2014-05-13 13:48:03 UTC (rev 11970)
@@ -1527,13 +1527,13 @@
{
if ($link_to_files != '')
{
- $content_files[$z]['file_name'] = '<a
href="'.$link_to_files.'/'.$values['files'][$z]['directory'].'/'.$values['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view file').'"
style="cursor:help">'.$values['files'][$z]['name'].'</a>';
+ $content_files[$z]['file_name'] = '<a
href="'.$link_to_files.'/'.$values['files'][$z]['directory'].'/'.$values['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$values['files'][$z]['name'].'</a>';
}
else
{
- $content_files[$z]['file_name'] = '<a
href="'.$link_view_file.'&file_name='.$values['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view file').'"
style="cursor:help">'.$values['files'][$z]['name'].'</a>';
+ $content_files[$z]['file_name'] = '<a
href="'.$link_view_file.'&file_name='.$values['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$values['files'][$z]['name'].'</a>';
}
- $content_files[$z]['delete_file'] = '<input
type="checkbox" name="values[file_action][]"
value="'.$values['files'][$z]['name'].'" title="'.lang('Check to delete
file').'" style="cursor:help">';
+ $content_files[$z]['delete_file'] = '<input
type="checkbox" name="values[file_action][]"
value="'.$values['files'][$z]['name'].'" title="'.lang('Check to delete
file').'" >';
}
$datavalues[1] = array
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2014-05-13 13:48:03 UTC (rev 11970)
@@ -422,16 +422,16 @@
$dry_run = false;
$second_display = phpgw::get_var('second_display',
'bool');
- $default_category =
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_district'])?$GLOBALS['phpgw_info']['user']['preferences']['property']['default_district']:'');
+ $default_district =
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_district'])?$GLOBALS['phpgw_info']['user']['preferences']['property']['default_district']:'');
//FIXME: differentiate mainsreen and helpdesk if this
should be used.
$default_status =
'';//isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status'])?$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status']:'';
$start_date = urldecode($this->start_date);
$end_date =
urldecode($this->end_date);
- if ($default_category && !$second_display &&
!$this->district_id)
+ if ($default_district && !$second_display &&
!$this->district_id)
{
- $this->bo->district_id = $default_category;
- $this->district_id =
$default_category;
+ $this->bo->district_id = $default_district;
+ $this->district_id =
$default_district;
}
if ($default_status && !$second_display)
@@ -1393,15 +1393,15 @@
$second_display = phpgw::get_var('second_display',
'bool');
- $default_category =
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_district'])?$GLOBALS['phpgw_info']['user']['preferences']['property']['default_district']:'');
+ $default_district =
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_district'])?$GLOBALS['phpgw_info']['user']['preferences']['property']['default_district']:'');
$default_status =
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status'])?$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status']:'');
$start_date = urldecode($this->start_date);
$end_date = urldecode($this->end_date);
- if ($default_category && !$second_display &&
!$this->district_id)
+ if ($default_district && !$second_display &&
!$this->district_id)
{
- $this->bo->district_id = $default_category;
- $this->district_id =
$default_category;
+ $this->bo->district_id = $default_district;
+ $this->district_id =
$default_district;
}
if ($default_status && !$second_display)
@@ -3155,7 +3155,7 @@
{
if ($link_to_files != '')
{
- $content_files[$z]['file_name'] = '<a
href="'.$link_to_files.'/'.$ticket['files'][$z]['directory'].'/'.$ticket['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view file').'"
style="cursor:help">'.$ticket['files'][$z]['name'].'</a>';
+ $content_files[$z]['file_name'] = '<a
href="'.$link_to_files.'/'.$ticket['files'][$z]['directory'].'/'.$ticket['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$ticket['files'][$z]['name'].'</a>';
}
else
{
@@ -3242,6 +3242,39 @@
//_debug_array($supervisor_email);die();
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$cat_select =
$this->cats->formatted_xslt_list(array('select_name' =>
'values[cat_id]','selected' => $this->cat_id,'use_acl' =>
$this->_category_acl));
+
+ $_ticket_cat_found = false;
+ if(isset($cat_select['cat_list']) &&
is_array($cat_select['cat_list']))
+ {
+ foreach($cat_select['cat_list'] as
$cat_list_entry)
+ {
+ if($cat_list_entry['cat_id'] ==
$ticket['cat_id'])
+ {
+ $_ticket_cat_found = true;
+ break;
+ }
+ }
+ }
+
+ if(!$_ticket_cat_found)
+ {
+ $category =
$this->cats->return_single($ticket['cat_id']);
+//_debug_array($category);
+
+ array_unshift ($cat_select['cat_list'],array
+ (
+ 'cat_id' =>
$category[0]['id'],
+ 'name' =>
$category[0]['name'],
+ 'description' =>
$category[0]['description'],
+ 'selected' => true,
+ )
+ );
+ $cat_select['disabled'] = true;
+ $cat_select['hidden_value'] =
$ticket['cat_id'];
+//_debug_array($cat_select);die();
+ }
+
+
$this->cats->set_appname('property','.project');
$order_catetory =
$this->cats->formatted_xslt_list(array('select_name' =>
'values[cat_id]','selected' => $ticket['order_cat_id']));
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2014-05-13
13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2014-05-13
13:48:03 UTC (rev 11970)
@@ -1559,7 +1559,7 @@
select the category the building belongs to. to do not use a category select
no category property no velg kategori bygningene tilhører.
For ikke å bruke kategori velg KATEGORI IKKE VALGT
select the category the claim belongs to. to do not use a category select no
category property no Velg kategorien dette kravet tilhører
select the category the custom belongs to. to do not use a category select no
category property no Velg kategorien denne egentilpassede tilhører
-select the category the data belong to. to do not use a category select no
category property no Velg kategorien dataen hører til
+select the category the data belong to. to do not use a category select no
category property no Velg kategorien posten tilhører
select the category the document belongs to. to do not use a category select
no category property no velg kategori dokumentene tilhører.
For ikke å bruke kategori velg KATEGORI IKKE VALGT
select the category the entrance belongs to. to do not use a category select
no category property no velg kategori inngang tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
select the category the equipment belongs to. to do not use a category select
no category property no velg kategori utstyr tilhører. For
ikke å bruke kategori velg KATEGORI IKKE VALGT
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2014-05-13
13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2014-05-13
13:48:03 UTC (rev 11970)
@@ -168,6 +168,7 @@
'fm_event_receipt',
'fm_idgenerator',
'fm_document',
+ 'fm_document_relation',
'fm_document_history',
'fm_document_status',
'fm_standard_unit',
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2014-05-13 13:48:03 UTC (rev 11970)
@@ -1725,6 +1725,19 @@
'ix' => array('location_code'),
'uc' => array()
),
+ 'fm_document_relation' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto','precision' =>
'4','nullable' => False),
+ 'document_id' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'location_id' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'location_item_id' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array('fm_document' => array('document_id' =>
'id')),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
'fm_document_status' => array(
'fd' => array(
'id' => array('type' => 'varchar','precision'
=> '20','nullable' => False),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2014-05-13 13:48:03 UTC (rev 11970)
@@ -8032,3 +8032,35 @@
}
}
+
+ /**
+ * Update property version from 0.9.17.681 to 0.9.17.682
+ * Add one-to-many relation on documents
+ */
+ $test[] = '0.9.17.681';
+ function property_upgrade0_9_17_681()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_document_relation', array(
+ 'fd' => array(
+ 'id' => array('type' =>
'auto','precision' => '4','nullable' => False),
+ 'document_id' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'location_id' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'location_item_id' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array('fm_document' =>
array('document_id' => 'id')),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.682';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
Modified: branches/Version-1_0-branch/property/templates/base/migrate.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/migrate.xsl
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/templates/base/migrate.xsl
2014-05-13 13:48:03 UTC (rev 11970)
@@ -93,7 +93,7 @@
</td>
<xsl:choose>
<xsl:when test="lang_select_migrate_text != ''">
- <td align="center"
title="{lang_select_migrate_text}" style="cursor:help">
+ <td align="center"
title="{lang_select_migrate_text}">
<input type="checkbox"
name="values[]" value="{domain}">
</input>
</td>
Modified: branches/Version-1_0-branch/property/templates/base/request.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/request.xsl
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/templates/base/request.xsl
2014-05-13 13:48:03 UTC (rev 11970)
@@ -628,18 +628,6 @@
<xsl:call-template name="file_upload"/>
</xsl:when>
</xsl:choose>
- <tr height="50">
- <td>
-
<xsl:variable name="lang_save">
-
<xsl:value-of select="lang_save"/>
-
</xsl:variable>
- <input
type="submit" name="values[save]" value="{$lang_save}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_save_statustext"/>
-
</xsl:attribute>
- </input>
- </td>
- </tr>
</table>
</div>
<div id="history">
Modified: branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
2014-05-13 13:48:03 UTC (rev 11970)
@@ -62,7 +62,7 @@
</td>
<td
class="th_text" align="left">
<xsl:for-each select="data">
-
<a href="{link}" title="{//lang_origin_statustext}" style="cursor:help">
+
<a href="{link}" title="{//lang_origin_statustext}">
<xsl:value-of select="id"/>
</a>
<xsl:text> </xsl:text>
Modified: branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2014-05-13 13:45:21 UTC (rev 11969)
+++ branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2014-05-13 13:48:03 UTC (rev 11970)
@@ -1419,7 +1419,7 @@
</input>
</td>
<td>
- <select name="values[wo_hour_cat][{counter}]"
class="forms" title="{lang_wo_hour_cat_statustext}" style="cursor:help">
+ <select name="values[wo_hour_cat][{counter}]"
class="forms" title="{lang_wo_hour_cat_statustext}">
<option value="">
<xsl:value-of
select="//lang_no_wo_hour_cat"/>
</option>
@@ -1814,7 +1814,7 @@
<input type="text" size="6"
name="values[quantity][{counter}]"/>
</td>
<td>
- <select name="values[wo_hour_cat][{counter}]"
class="forms" title="{lang_wo_hour_cat_statustext}" style="cursor:help">
+ <select name="values[wo_hour_cat][{counter}]"
class="forms" title="{lang_wo_hour_cat_statustext}">
<option value="">
<xsl:value-of
select="//lang_no_wo_hour_cat"/>
</option>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11970] Merge 11963:11969 from trunk,
Sigurd Nes <=