[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13981] Merge 13939:13980 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13981] Merge 13939:13980 from trunk |
|
Date: |
Mon, 21 Sep 2015 19:41:15 +0000 |
Revision: 13981
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13981
Author: sigurdne
Date: 2015-09-21 19:41:15 +0000 (Mon, 21 Sep 2015)
Log Message:
-----------
Merge 13939:13980 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/about.php
branches/Version-1_0-branch/activitycalendar/inc/class.uicommon.inc.php
branches/Version-1_0-branch/addressbook/inc/class.boXport.inc.php
branches/Version-1_0-branch/admin/inc/class.bolog.inc.php
branches/Version-1_0-branch/admin/inc/class.uiconfig.inc.php
branches/Version-1_0-branch/booking/inc/class.uibuilding.inc.php
branches/Version-1_0-branch/booking/inc/class.uievent.inc.php
branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
branches/Version-1_0-branch/calendar/inc/class.bocalendar.inc.php
branches/Version-1_0-branch/calendar/inc/class.socalendar.inc.php
branches/Version-1_0-branch/calendar/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/catch/inc/class.boconfig.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/email/inc/class.mail_msg_display.inc.php
branches/Version-1_0-branch/email/inc/class.svc_nextmatches.inc.php
branches/Version-1_0-branch/emailadmin/inc/class.pleskimap.inc.php
branches/Version-1_0-branch/felamimail/inc/class.Script.inc.php
branches/Version-1_0-branch/felamimail/inc/class.uisieve.inc.php
branches/Version-1_0-branch/hrm/inc/class.bocommon.inc.php
branches/Version-1_0-branch/hrm/inc/class.uicategory.inc.php
branches/Version-1_0-branch/ipc_test_suite/sources/api/class.vcard.inc.php
branches/Version-1_0-branch/ipc_test_suite/sources/app/class.ipc_addressbook.inc.php
branches/Version-1_0-branch/phpgwapi/cron/asyncservices.php
branches/Version-1_0-branch/phpgwapi/inc/class.asyncservice.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.jscal.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.net_http_client.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sql_builder.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
branches/Version-1_0-branch/phpgwapi/inc/wiki2html/textile/Textile.php
branches/Version-1_0-branch/phpgwapi/js/uploadify/uploadify.php
branches/Version-1_0-branch/preferences/inc/class.boadmin_acl.inc.php
branches/Version-1_0-branch/property/inc/class.bodocument.inc.php
branches/Version-1_0-branch/property/inc/class.interlink.inc.php
branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
branches/Version-1_0-branch/rental/inc/class.soprice_item.inc.php
branches/Version-1_0-branch/rental/inc/class.uiprice_item.inc.php
branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
branches/Version-1_0-branch/rental/inc/model/class.contract.inc.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/clickatell/fn.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/uplink/fn.php
branches/Version-1_0-branch/soap.php
branches/Version-1_0-branch/todo/inc/class.uitodo.inc.php
branches/Version-1_0-branch/xmlrpc.php
Property Changed:
----------------
branches/Version-1_0-branch/
branches/Version-1_0-branch/booking/
branches/Version-1_0-branch/bookingfrontend/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/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,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761,12763-12819,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13062-13142,13144,13146-13331,13333-13338,13340-13347,13349-13365,13367-13381,13383,13385,13387-13391,13393-13401,13403,13405-13416,13418-13431,13433-13434,13436,13438-13440,13442-13480,13482-13506,13509-13540,13545-13551,13553,13555-13564,13566-13570,13572,13574-13590,13601,13603-13701,13703-13709,13711-13713,13715,13717,13719-13723,13725,13727-13728,13730-13732,13734-13735,13737-13744,13746,13748-13772,13774-13775,13777-13781,13783-13797,13799,13801-13806,13808-13810,13812,13814-13835,13837-13840,13842,13844-13855,13857-13879,13881-13930,13932-13934,13936-13938
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/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,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761,12763-12819,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13062-13142,13144,13146-13331,13333-13338,13340-13347,13349-13365,13367-13381,13383,13385,13387-13391,13393-13401,13403,13405-13416,13418-13431,13433-13434,13436,13438-13440,13442-13480,13482-13506,13509-13540,13545-13551,13553,13555-13564,13566-13570,13572,13574-13590,13601,13603-13701,13703-13709,13711-13713,13715,13717,13719-13723,13725,13727-13728,13730-13732,13734-13735,13737-13744,13746,13748-13772,13774-13775,13777-13781,13783-13797,13799,13801-13806,13808-13810,13812,13814-13835,13837-13840,13842,13844-13855,13857-13879,13881-13930,13932-13934,13936-13938,13940-13980
Modified: branches/Version-1_0-branch/about.php
===================================================================
--- branches/Version-1_0-branch/about.php 2015-09-21 19:33:17 UTC (rev
13980)
+++ branches/Version-1_0-branch/about.php 2015-09-21 19:41:15 UTC (rev
13981)
@@ -93,7 +93,7 @@
if (is_array($infos))
{
$names =
explode('<br />',$infos['name']);
- $emails =
split('@|<br />',$infos['email']);
+ $emails =
preg_split('/@|<br \/>/',$infos['email']);
if
(count($names) < count($emails)/2)
{
$names
= '';
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uicommon.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uicommon.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uicommon.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -22,7 +22,7 @@
{
if(in_array($key, array_keys($array)))
{
- $result[$key] = $array[$key];
+ $result[$key] =
phpgw::clean_value($array[$key]);
}
}
return $result;
Modified: branches/Version-1_0-branch/addressbook/inc/class.boXport.inc.php
===================================================================
--- branches/Version-1_0-branch/addressbook/inc/class.boXport.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/addressbook/inc/class.boXport.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -133,7 +133,7 @@
while ($data = fgets($fp,8000))
{
$url = "";
- list($name,$value,$extra) = split(':',
$data);
+ list($name,$value,$extra) =
preg_split('/:/', $data);
if (substr($name,0,2) == 'dn')
{
$buffer =
$contacts->import_start_record($buffer);
@@ -156,7 +156,7 @@
if ($name && $value)
{
- $test = split(',mail=',$value);
+ $test =
preg_split('/,mail=/',$value);
if ($test[1])
{
$name = "mail";
Modified: branches/Version-1_0-branch/admin/inc/class.bolog.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.bolog.inc.php 2015-09-21
19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/admin/inc/class.bolog.inc.php 2015-09-21
19:41:15 UTC (rev 13981)
@@ -42,7 +42,7 @@
if (
preg_match('/@/',$record['log_account_lid']))
{
- $t =
split('@',$record['log_account_lid']);
+ $t =
preg_split('/@/',$record['log_account_lid']);
$record['log_account_lid'] = $t[0];
}
Modified: branches/Version-1_0-branch/admin/inc/class.uiconfig.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.uiconfig.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/admin/inc/class.uiconfig.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -211,7 +211,7 @@
break;
case 'checked':
/* '+' is used as a
delimiter for the check value */
- list($newvalue,$check)
= split('\+',$newval);
+ list($newvalue,$check)
= preg_split('/\+/',$newval);
$newval =
preg_replace('/ /','_',$newvalue);
if($current_config[$newval] == $check)
{
Property changes on: branches/Version-1_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking: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,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761,12763-12819,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13333-13338,13442-13480,13783-13797,13814-13835,13932-13934
+ /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking: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,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761,12763-12819,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13333-13338,13442-13480,13783-13797,13814-13835,13932-13934,13940-13980
Modified: branches/Version-1_0-branch/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uibuilding.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/booking/inc/class.uibuilding.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -33,7 +33,7 @@
public function properties()
{
$q = phpgw::get_var('query', 'str', 'REQUEST', null);
- $type_id = count(split('-', $q));
+ $type_id = count(explode('-', $q));
$so = CreateObject('property.solocation');
$ret = $so->read(array('type_id' => $type_id,
'location_code'=>$q));
foreach($ret as &$r)
Modified: branches/Version-1_0-branch/booking/inc/class.uievent.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uievent.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/booking/inc/class.uievent.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -378,8 +378,8 @@
$event['to_'] = $checkdate['to_'];
$_POST['to_'] = $checkdate['to_'];
list($event, $errors) =
$this->extract_and_validate($event);
- $time_from = split(" ",$_POST['from_']);
- $time_to = split(" ",$_POST['to_']);
+ $time_from = explode("
",$_POST['from_']);
+ $time_to = explode(" ",$_POST['to_']);
if ($time_from[0] == $time_to[0])
{
if ($time_from[1] >=
$time_to[1])
@@ -396,8 +396,8 @@
else
{
list($event, $errors) =
$this->extract_and_validate($event);
- $time_from = split(" ",$_POST['from_']);
- $time_to = split(" ",$_POST['to_']);
+ $time_from = explode(" ",$_POST['from_']);
+ $time_to = explode(" ",$_POST['to_']);
if ($time_from[0] == $time_to[0]) {
if ($time_from[1] >= $time_to[1])
{
Property changes on: branches/Version-1_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/bookingfrontend:9468-12740,12743-12875,12986
/trunk/bookingfrontend: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,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761,12763-12819,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13367-13381,13385,13433-13434
+ /branches/stavangerkommune/bookingfrontend:9468-12740,12743-12875,12986
/trunk/bookingfrontend: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,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761,12763-12819,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13367-13381,13385,13433-13434,13940-13980
Modified:
branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -101,8 +101,8 @@
#The string replace is a workaround for a problem at Bergen
Kommune
$booking['from_'] = str_replace('%3A',':',phpgw::get_var('from_',
'str', 'GET'));
$booking['to_'] = str_replace('%3A',':',phpgw::get_var('to_',
'str', 'GET'));
- $time_from = split(" ",phpgw::get_var('from_', 'str',
'GET'));
- $time_to = split(" ",phpgw::get_var('to_', 'str',
'GET'));
+ $time_from = explode(" ",phpgw::get_var('from_', 'str',
'GET'));
+ $time_to = explode(" ",phpgw::get_var('to_', 'str',
'GET'));
$step = phpgw::get_var('step', 'str', 'POST');
if (! isset($step)) $step = 1;
Modified: branches/Version-1_0-branch/calendar/inc/class.bocalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/calendar/inc/class.bocalendar.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/calendar/inc/class.bocalendar.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -2564,7 +2564,7 @@
$details['startdate'] =
$GLOBALS['phpgw']->common->show_date($starttime);
$details['enddate'] =
$GLOBALS['phpgw']->common->show_date($endtime);
- list($subject,$body) =
split("\n",$GLOBALS['phpgw']->preferences->parse_notify($notify_msg,$details),2);
+ list($subject,$body) =
explode("\n",$GLOBALS['phpgw']->preferences->parse_notify($notify_msg,$details),2);
$subject =
trim($send->encode_subject($subject));
switch($part_prefs['calendar']['update_format'])
{
Modified: branches/Version-1_0-branch/calendar/inc/class.socalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/calendar/inc/class.socalendar.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/calendar/inc/class.socalendar.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -147,7 +147,7 @@
$sql = 'AND (phpgw_cal_user.cal_login IN
('.implode(',',$members).')) AND '.
'(phpgw_cal_user.cal_login='.intval($this->owner).' OR phpgw_cal.is_public=1)
AND (';
- $words = split(' ',$keywords);
+ $words = explode(' ',$keywords);
foreach($words as $i => $word)
{
$sql .= $i > 0 ? ' OR ' : '';
Modified: branches/Version-1_0-branch/calendar/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/calendar/inc/class.uicalendar.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/calendar/inc/class.uicalendar.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -2298,7 +2298,7 @@
$params = explode('&', $params);
foreach( $params as $v )
{
- $b = split('=', $v);
+ $b = explode('=', $v);
if(isset($b[0]) && $b[0])
{
$new_params[$b[0]] = $b[1];
Modified: branches/Version-1_0-branch/catch/inc/class.boconfig.inc.php
===================================================================
--- branches/Version-1_0-branch/catch/inc/class.boconfig.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/catch/inc/class.boconfig.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -88,7 +88,7 @@
foreach ($config_info as & $entry)
{
- list($entity_id, $cat_id) = split('[_]',
$entry['schema']);
+ list($entity_id, $cat_id) = preg_split('/[_]/',
$entry['schema']);
$category =
$entity->read_single_category($entity_id, $cat_id);
$entry['schema'] = "{$entry['schema']}
{$category['name']}";
}
@@ -101,7 +101,7 @@
$values =
$this->so->read_single_type($id);
$entity =
CreateObject('property.soadmin_entity');
$entity->type = 'catch';
- list($entity_id, $cat_id) = split('[_]',
$values['schema']);
+ list($entity_id, $cat_id) = preg_split('/[_]/',
$values['schema']);
$category =
$entity->read_single_category($entity_id, $cat_id);
$values['schema_text'] = "{$values['schema']}
{$category['name']}";
return $values;
Modified: branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -1532,7 +1532,7 @@
$from =
str_replace(array('[',']'),array('<','>'),$from_address);
- $from_array = split('<', $from);
+ $from_array = explode('<', $from);
unset($from);
if ( count($from_array) == 2 )
{
Modified: branches/Version-1_0-branch/email/inc/class.mail_msg_display.inc.php
===================================================================
--- branches/Version-1_0-branch/email/inc/class.mail_msg_display.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/email/inc/class.mail_msg_display.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -2352,7 +2352,7 @@
}
$newText = '';
- $lines = split("\n",$data);
+ $lines = explode("\n",$data);
while ( list ($key,$line) = each ($lines))
{
Modified: branches/Version-1_0-branch/email/inc/class.svc_nextmatches.inc.php
===================================================================
--- branches/Version-1_0-branch/email/inc/class.svc_nextmatches.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/email/inc/class.svc_nextmatches.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -83,7 +83,7 @@
$extra = explode('&', $extra);
foreach( $extra as $v )
{
- $b = split('=', $v);
+ $b = explode('=', $v);
if(isset($b[0]) && $b[0])
{
$new_extra[$b[0]] = $b[1];
@@ -197,7 +197,7 @@
$extravar = explode('&', $extravar);
foreach( $extravar as $v )
{
- $b = split('=', $v);
+ $b = explode('=', $v);
if(isset($b[0]) && $b[0])
{
$new_extravar[$b[0]] = $b[1];
Modified: branches/Version-1_0-branch/emailadmin/inc/class.pleskimap.inc.php
===================================================================
--- branches/Version-1_0-branch/emailadmin/inc/class.pleskimap.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/emailadmin/inc/class.pleskimap.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -423,7 +423,7 @@
while(!feof($fp))
{
$line = trim(fgets($fp));
- list($name,$value) = split(': *',$line,2);
+ list($name,$value) = preg_split('/: */',$line,2);
if (!is_null($value) && strpos($name,'An error
occured') === false && $name)
{
$values[$name] = $value;
Modified: branches/Version-1_0-branch/felamimail/inc/class.Script.inc.php
===================================================================
--- branches/Version-1_0-branch/felamimail/inc/class.Script.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/felamimail/inc/class.Script.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -380,7 +380,7 @@
$if[] = 'address :contains
["To","TO","Cc","CC"] "'.$addr.'"';
}
$newscriptbody .= 'if anyof
('.implode(', ',$if).") {\n";
- foreach(split(',
?',$vacation['forwards']) as $addr) {
+ foreach(preg_split('/,
?/',$vacation['forwards']) as $addr) {
$newscriptbody .= "\tredirect
\"".$addr."\";\n";
}
$newscriptbody .= "\tkeep;\n}\n";
Modified: branches/Version-1_0-branch/felamimail/inc/class.uisieve.inc.php
===================================================================
--- branches/Version-1_0-branch/felamimail/inc/class.uisieve.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/felamimail/inc/class.uisieve.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -260,7 +260,7 @@
if ($_vacation['forwards'])
{
- foreach(split(', ?',$_vacation['forwards']) as
$addr)
+ foreach(preg_split('/,
?/',$_vacation['forwards']) as $addr)
{
if (!preg_match($regexp,$addr))
{
Modified: branches/Version-1_0-branch/hrm/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/hrm/inc/class.bocommon.inc.php 2015-09-21
19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/hrm/inc/class.bocommon.inc.php 2015-09-21
19:41:15 UTC (rev 13981)
@@ -120,8 +120,8 @@
{
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- $fields = split('[./-]',$datestr);
- foreach(split('[./-]',$dateformat) as $n => $field)
+ $fields = preg_split('/[.\/-]/',$datestr);
+ foreach(preg_split('/[.\/-]/',$dateformat) as $n =>
$field)
{
$date[$field] = intval($fields[$n]);
Modified: branches/Version-1_0-branch/hrm/inc/class.uicategory.inc.php
===================================================================
--- branches/Version-1_0-branch/hrm/inc/class.uicategory.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/hrm/inc/class.uicategory.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -77,7 +77,7 @@
while (is_array($category_list) && list(,$category) =
each($category_list))
{
- $words = split(' ',$category['descr']);
+ $words = explode(' ',$category['descr']);
$first = "$words[0] $words[1] $words[2]
$words[3]";
$content[] = array
Modified:
branches/Version-1_0-branch/ipc_test_suite/sources/api/class.vcard.inc.php
===================================================================
--- branches/Version-1_0-branch/ipc_test_suite/sources/api/class.vcard.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/ipc_test_suite/sources/api/class.vcard.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -174,7 +174,7 @@
/* Following is a lot of pain and little magic */
while ( list($name,$value) = @each($buffer) )
{
- $field = split(';',$name);
+ $field = explode(';',$name);
while (list($key,$val) = each($field))
{
@@ -185,7 +185,7 @@
$field[0] = preg_replace("/B\./",'',$field[0]);
$field[0] = preg_replace("/C\./",'',$field[0]);
$field[0] = preg_replace("/D\./",'',$field[0]);
- $values = split(';',$value);
+ $values = explode(';',$value);
switch ($field[0])
{
case 'N':
@@ -207,7 +207,7 @@
}
break;
case 'FN':
- $fn = split(" ", $values[0], 3);
+ $fn = explode(" ", $values[0], 3);
switch (count($fn))
{
case 1:
@@ -479,7 +479,7 @@
}
}
- if (count($street =
split("\r*\n",$buffer['adr_one_street'],3)) > 1)
+ if (count($street =
preg_split("/\r*\n/",$buffer['adr_one_street'],3)) > 1)
{
$entry['adr_one_street'] = $street[0];
// RB 2001/05/08 added for Lotus Organizer to split multiline adresses
$entry['address2'] = $street[1];
Modified:
branches/Version-1_0-branch/ipc_test_suite/sources/app/class.ipc_addressbook.inc.php
===================================================================
---
branches/Version-1_0-branch/ipc_test_suite/sources/app/class.ipc_addressbook.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++
branches/Version-1_0-branch/ipc_test_suite/sources/app/class.ipc_addressbook.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -627,7 +627,7 @@
$add_parts =
explode(',', utf8_decode($data[$attribute][0]));
for($k=0;$k<count($add_parts);++$k)
{
- list($name,
$value) = split('=', $add_parts[$k], 2);
+ list($name,
$value) = explode('=', $add_parts[$k], 2);
$value =
utf8_decode($value);
switch(strtolower($name))
{
@@ -690,7 +690,7 @@
$add_parts =
explode(';', utf8_decode($data[$attribute][0]));
for($k=0;$k<count($add_parts);++$k)
{
- list($name,
$value) = split('=', $add_parts[$k], 2);
+ list($name,
$value) = explode('=', $add_parts[$k], 2);
switch(strtolower($name))
{
case
'c':
Modified: branches/Version-1_0-branch/phpgwapi/cron/asyncservices.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/cron/asyncservices.php 2015-09-21
19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/phpgwapi/cron/asyncservices.php 2015-09-21
19:41:15 UTC (rev 13981)
@@ -60,7 +60,8 @@
echo "Domain: {$GLOBALS['phpgw_info']['user']['domain']}\n";
echo 'Start cron: ' . date('Y/m/d H:i:s ') . "\n";
- $num = ExecMethod('phpgwapi.asyncservice.check_run','crontab');
+ $num = (int) ExecMethod('phpgwapi.asyncservice.check_run','crontab');
+ echo "Number of jobs: {$num}\n";
echo 'End cron: ' . date('Y/m/d H:i:s ') . "\n";
// if the following comment got removed, you will get an email from
cron for every check performed
//echo date('Y/m/d H:i:s ').$_GET['domain'].': '.($num ? "$num job(s)
executed" : 'Nothing to execute')."\n";
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.asyncservice.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.asyncservice.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.asyncservice.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -428,8 +428,19 @@
{
try
{
- echo
"{$job['method']}\n";
+ echo 'Start job: ' .
date('Y/m/d H:i:s ') . "\n";
+ echo "--id:
{$job['id']}\n";
+ echo "--method:
{$job['method']}\n";
+ if(isset($job['data'])
&& $job['data'])
+ {
+ echo "--data: ";
+
print_r($job['data']);
+ echo "\n";
+ }
ExecMethod($job['method'],$job['data']);
+
+ echo 'End job: ' .
date('Y/m/d H:i:s ') . "\n\n";
+
}
catch (Exception $e)
{
@@ -453,24 +464,24 @@
$GLOBALS['phpgw']->db->Exception_On_Error = $this->Exception_On_Error;
- if ($job['next'] =
$this->next_run($job['times']))
- {
- $updated_jobs =
$this->read($id);
- if
(isset($updated_jobs[$id]) && isset($updated_jobs[$id]['data']))
- { // update async data
field, it could be changed during ExecMethod()
- $job['data'] =
$updated_jobs[$id]['data'];
- }
- // TK 20.11.06 write
job to get 'next' and alarm updated
- $job['data']['time'] =
$job['next'];
- $this->write($job);
+ if ($job['next'] =
$this->next_run($job['times']))
+ {
+ $updated_jobs =
$this->read($id);
+ if (isset($updated_jobs[$id])
&& isset($updated_jobs[$id]['data']))
+ { // update async data field,
it could be changed during ExecMethod()
+ $job['data'] =
$updated_jobs[$id]['data'];
}
- else // no further runs
+ // TK 20.11.06 write job to get
'next' and alarm updated
+ $job['data']['time'] =
$job['next'];
+ $this->write($job);
+ }
+ else // no further runs
+ {
+ if($job['next'] <= time())
{
- if($job['next'] <=
time())
- {
-
$this->delete($job['id']);
- }
+
$this->delete($job['id']);
}
+ }
}
}
@@ -655,7 +666,7 @@
while ($line = fgets($crontab,256))
{
if ($this->debug) echo 'line '.++$n.":
$line<br>\n";
- $parts = split(' ',$line,6);
+ $parts = explode(' ',$line,6);
if ($line[0] == '#' || count($parts) <
6 || ($parts[5][0] != '/' && substr($parts[5],0,3) != 'php'))
{
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.jscal.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.jscal.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.jscal.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -177,8 +177,8 @@
{
return False;
}
- $fields = split('[./-]',$datestr);
- foreach(split('[./-]',$this->dateformat) as $n =>
$field)
+ $fields = preg_split('/[.\/-]/',$datestr);
+ foreach(preg_split('/[.\/-]/',$this->dateformat) as $n
=> $field)
{
$date[$field] = intval($fields[$n]);
if($field == 'M')
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.net_http_client.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.net_http_client.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.net_http_client.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -722,7 +722,7 @@
if( $this->debug & DBGINDATA ) echo "HEADER :
$str;";
$finished = ( $str == $lastLine );
if ( !$finished ) {
- list( $hdr, $value ) = split( ": ",
$str, 2 );
+ list( $hdr, $value ) = preg_split( "/:
/", $str, 2 );
// nasty workaround broken multiple
same headers (eg. Set-Cookie headers) @FIXME
if( isset( $headers[$hdr]) )
$headers[$hdr] .= "; " .
trim($value);
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php 2015-09-21
19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php 2015-09-21
19:41:15 UTC (rev 13981)
@@ -71,7 +71,7 @@
{
$mail = createObject('phpgwapi.mailer_smtp');
$from =
str_replace(array('[',']'),array('<','>'),$from);
- $from_array = split('<', $from);
+ $from_array = explode('<', $from);
unset($from);
if ( count($from_array) == 2 )
{
@@ -89,7 +89,7 @@
foreach ($to as $entry)
{
$entry =
str_replace(array('[',']'),array('<','>'),$entry);
- $to_array = split('<', $entry);
+ $to_array = explode('<', $entry);
if ( count($to_array) == 2 )
{
$mail->AddAddress(trim($to_array[1],'>'), $to_array[0]);
@@ -108,7 +108,7 @@
foreach ($cc as $entry)
{
$entry =
str_replace(array('[',']'),array('<','>'),$entry);
- $cc_array = split('<', $entry);
+ $cc_array = explode('<', $entry);
if ( count($cc_array) == 2 )
{
$mail->AddCC(trim($cc_array[1],'>'), $cc_array[0]);
@@ -127,7 +127,7 @@
foreach ($bcc as $entry)
{
$entry =
str_replace(array('[',']'),array('<','>'),$entry);
- $bcc_array = split('<', $entry);
+ $bcc_array = explode('<', $entry);
if ( count($bcc_array) == 2 )
{
$mail->AddBCC(trim($bcc_array[1],'>'), $bcc_array[0]);
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -229,17 +229,17 @@
function checkip($remoteip='')
{
- $allowed_ips =
split(',',$GLOBALS['phpgw_info']['server']['setup_acl']);
+ $allowed_ips =
explode(',',$GLOBALS['phpgw_info']['server']['setup_acl']);
if(is_array($allowed_ips))
{
$foundip = False;
while(list(,$value) = @each($allowed_ips))
{
- $test = split("\.",$value);
+ $test = preg_split("/\./",$value);
if(count($test) < 3)
{
$value .= ".0.0";
- $tmp = split("\.",$remoteip);
+ $tmp =
preg_split("/\./",$remoteip);
$tmp[2] = 0;
$tmp[3] = 0;
$testremoteip = join('.',$tmp);
@@ -247,14 +247,14 @@
elseif(count($test) < 4)
{
$value .= ".0";
- $tmp = split("\.",$remoteip);
+ $tmp =
preg_split("/\./",$remoteip);
$tmp[3] = 0;
$testremoteip = join('.',$tmp);
}
elseif(count($test) == 4 &&
intval($test[3]) == 0)
{
- $tmp = split("\.",$remoteip);
+ $tmp =
preg_split("/\./",$remoteip);
$tmp[3] = 0;
$testremoteip = join('.',$tmp);
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.sql_builder.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.sql_builder.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.sql_builder.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -789,7 +789,7 @@
elseif(is_string($data))
{
$this->ldebug('criteria', 'Query a string is',
'msg');
- list($field, $filter) = split ('=',
str_replace(' ', '', $data));
+ list($field, $filter) = explode('=',
str_replace(' ', '', $data));
$ent = $this->get_entity($field);
$this->entities[$ent]->add_criteria($field,
$filter);
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -174,7 +174,7 @@
/* Following is a lot of pain and little magic */
while ( list($name,$value) = @each($buffer) )
{
- $field = split(';',$name);
+ $field = explode(';',$name);
while (list($key,$val) = each($field))
{
@@ -185,7 +185,7 @@
$field[0] = str_replace("B\.",'',$field[0]);
$field[0] = str_replace("C\.",'',$field[0]);
$field[0] = str_replace("D\.",'',$field[0]);
- $values = split(';',$value);
+ $values = explode(';',$value);
switch ($field[0])
{
case 'N':
@@ -207,7 +207,7 @@
}
break;
case 'FN':
- $fn = split(" ", $values[0], 3);
+ $fn = explode(" ", $values[0], 3);
switch (count($fn))
{
case 1:
@@ -479,7 +479,7 @@
}
}
- if (count($street =
split("\r*\n",$buffer['adr_one_street'],3)) > 1)
+ if (count($street =
preg_split("/\r*\n/",$buffer['adr_one_street'],3)) > 1)
{
$entry['adr_one_street'] = $street[0];
// RB 2001/05/08 added for Lotus Organizer to split multiline adresses
$entry['address2'] = $street[1];
Modified: branches/Version-1_0-branch/phpgwapi/inc/wiki2html/textile/Textile.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/wiki2html/textile/Textile.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/phpgwapi/inc/wiki2html/textile/Textile.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -609,7 +609,7 @@
$o = '';
if( $style ) {
foreach($style as $s) {
- $parts = split(';', $s);
+ $parts = explode(';', $s);
foreach( $parts as $p ) {
$p = trim($p, '; ');
if( !empty( $p ) )
Modified: branches/Version-1_0-branch/phpgwapi/js/uploadify/uploadify.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/uploadify/uploadify.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/phpgwapi/js/uploadify/uploadify.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -32,7 +32,7 @@
// $fileTypes = str_replace('*.','',$_REQUEST['fileext']);
// $fileTypes = str_replace(';','|',$fileTypes);
- // $typesArray = split('\|',$fileTypes);
+ // $typesArray = preg_split('/\|/',$fileTypes);
// $fileParts = pathinfo($_FILES['Filedata']['name']);
// if (in_array($fileParts['extension'],$typesArray)) {
@@ -45,4 +45,3 @@
// echo 'Invalid file type.';
// }
}
-?>
Modified: branches/Version-1_0-branch/preferences/inc/class.boadmin_acl.inc.php
===================================================================
--- branches/Version-1_0-branch/preferences/inc/class.boadmin_acl.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/preferences/inc/class.boadmin_acl.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -247,7 +247,7 @@
$totalacl = array();
foreach ( $values as $rowinfo => $perm )
{
- list($user_id,$rights) = split('_', $rowinfo);
+ list($user_id,$rights) = explode('_', $rowinfo);
if ( !isset($totalacl[$user_id]) )
{
Modified: branches/Version-1_0-branch/property/inc/class.bodocument.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bodocument.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/property/inc/class.bodocument.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -40,6 +40,7 @@
var $filter;
var $sort;
var $order;
+ var $p_num;
var $cat_id;
var $entity_id;
var $status_id;
@@ -77,6 +78,7 @@
$sort =
phpgw::get_var('sort');
$order =
phpgw::get_var('order');
$filter =
phpgw::get_var('filter', 'int');
+ $p_num =
phpgw::get_var('p_num', 'int');
$cat_id =
phpgw::get_var('cat_id', 'int');
$status_id =
phpgw::get_var('status_id');
$entity_id =
phpgw::get_var('entity_id', 'int');
@@ -89,6 +91,7 @@
$this->sort = isset($sort)
&& $sort ? $sort : '';
$this->order = isset($order) &&
$order ? $order : '';
$this->filter = isset($filter) &&
$filter ? $filter : '';
+ $this->p_num = isset($p_num) &&
$p_num ? $p_num : '';
$this->cat_id = isset($cat_id) &&
$cat_id ? $cat_id : '';
$this->status_id = isset($status_id) &&
$status_id ? $status_id : '';
$this->entity_id = isset($entity_id) &&
$entity_id ? $entity_id : '';
@@ -231,7 +234,7 @@
$document = $this->so->read_at_location(array('start'
=> $this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
- 'filter' => $this->filter,'cat_id' =>
$this->cat_id,'entity_id' => $this->entity_id,
+ 'filter' => $this->filter,'p_num'
=>$this->p_num, 'cat_id' => $this->cat_id,'entity_id' => $this->entity_id,
'location_code' =>
$location_code,'doc_type'=>$this->doc_type, 'allrows' => $this->allrows));
$this->total_records = $this->so->total_records;
Modified: branches/Version-1_0-branch/property/inc/class.interlink.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.interlink.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/property/inc/class.interlink.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -174,7 +174,6 @@
$location = ltrim($location, '.');
$parts = explode('.', $location);
- // list($type, $entity_id,
$cat_id) = split('[.]', $location);
$this->boadmin_entity->type = $parts[0];
switch( $parts[0] )
{
Modified: branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -326,13 +326,14 @@
$filter =
isset($data['filter']) && $data['filter'] ? (int) $data['filter']: 0;
$entity_id =
isset($data['entity_id']) && $data['entity_id'] ? (int)$data['entity_id']:0;
$cat_id =
isset($data['cat_id']) && $data['cat_id'] ? (int)$data['cat_id']: 0;
+ $p_num = isset($data['p_num'])
&& $data['p_num'] ? (int)$data['p_num']: 0;
$id =
isset($data['id']) && $data['id'] ? (int)$data['id']: 0;
$doc_type =
isset($data['doc_type']) && $data['doc_type'] ? $data['doc_type']: 0;
$allrows =
isset($data['allrows'])?$data['allrows']:'';
$location_code =
isset($data['location_code'])?$data['location_code']:'';
}
- if( !$location_code && !($entity_id && $cat_id ))
+ if( !$location_code && !($entity_id && $cat_id &&
$p_num))
{
return array();
}
@@ -363,7 +364,7 @@
}
if ($cat_id > 0)
{
- $filtermethod .= " $where
fm_document.p_cat_id={$cat_id} AND fm_document.p_entity_id={$entity_id}";
+ $filtermethod .= " $where
fm_document.p_cat_id={$cat_id} AND fm_document.p_entity_id={$entity_id} AND
p_num = '{$p_num}'";
$where = 'AND';
}
Modified: branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/property/inc/cron/default/catch_ppc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -79,7 +79,7 @@
$this->pickup_path =
$config_data['pickup_path'];
$target = $config_data['target'];
$target_table = "fm_catch_{$target}";
- list($entity_id, $cat_id) = split('[_]',
$target);
+ list($entity_id, $cat_id) = preg_split('/[_]/',
$target);
$this->category_dir =
"catch_{$entity_id}_{$cat_id}";
$category =
$admin_entity->read_single_category($entity_id, $cat_id);
$schema_text = "{$target}
{$category['name']}";
Modified: branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
2015-09-21 19:41:15 UTC (rev 13981)
@@ -1449,6 +1449,10 @@
<!-- add attribute / edit attribute -->
<xsl:template xmlns:php="http://php.net/xsl"; match="edit_attrib">
<div align="left">
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+ <form method="post" action="{$form_action}">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -1459,10 +1463,6 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
- <form method="post" action="{$form_action}">
<tr>
<td class="th_text"
align="left">
<xsl:value-of
select="php:function('lang', 'entity')"/>
@@ -1808,7 +1808,9 @@
</input>
</td>
</tr>
+ </table>
</form>
+ <table>
<tr>
<td>
<xsl:variable
name="done_action">
@@ -2242,21 +2244,37 @@
<!-- New template-->
<xsl:template xmlns:php="http://php.net/xsl"; name="choice">
+ <xsl:variable name="lang_id">
+ <xsl:value-of select="php:function('lang', 'id')"/>
+ </xsl:variable>
+ <xsl:variable name="lang_value">
+ <xsl:value-of select="php:function('lang', 'value')"/>
+ </xsl:variable>
+ <xsl:variable name="lang_sorting">
+ <xsl:value-of select="php:function('lang', 'sorting')"/>
+ </xsl:variable>
+ <xsl:variable name="lang_delete_value">
+ <xsl:value-of select="php:function('lang', 'delete
value')"/>
+ </xsl:variable>
+ <xsl:variable name="lang_delete_title">
+ <xsl:value-of select="php:function('lang',
'delete this value from the list of multiple choice')"/>
+ </xsl:variable>
+
<table cellpadding="2" cellspacing="2" width="80%" align="left">
<xsl:choose>
<xsl:when test="value_choice!=''">
<tr class="th">
<td class="th_text" width="5%"
align="left">
- <xsl:value-of
select="php:function('lang', 'id')"/>
+ <xsl:value-of
select="$lang_id"/>
</td>
<td class="th_text" width="85%"
align="left">
- <xsl:value-of
select="php:function('lang', 'value')"/>
+ <xsl:value-of
select="$lang_value"/>
</td>
<td class="th_text" width="85%"
align="left">
- <xsl:value-of
select="php:function('lang', 'order')"/>
+ <xsl:value-of
select="$lang_sorting"/>
</td>
<td class="th_text" width="15%"
align="center">
- <xsl:value-of
select="php:function('lang', 'delete value')"/>
+ <xsl:value-of
select="$lang_delete_value"/>
</td>
</tr>
<xsl:for-each select="value_choice">
@@ -2280,21 +2298,21 @@
<td align="left">
<input
type="textbox" name="values[edit_choice][{id}]" value="{value}" size="15">
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'value')"/>
+
<xsl:value-of select="$lang_value"/>
</xsl:attribute>
</input>
</td>
<td align="center">
<input
type="textbox" name="values[order_choice][{id}]" value="{order}" size="4">
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'order')"/>
+
<xsl:value-of select="$lang_sorting"/>
</xsl:attribute>
</input>
</td>
<td align="center">
<input
type="checkbox" name="values[delete_choice][]" value="{id}">
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'delete this value from the list of
multiple choice')"/>
+
<xsl:value-of select="$lang_delete_title"/>
</xsl:attribute>
</input>
</td>
Modified:
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
===================================================================
---
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
2015-09-21 19:33:17 UTC (rev 13980)
+++
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
2015-09-21 19:41:15 UTC (rev 13981)
@@ -1,12 +1,12 @@
#!/bin/bash
-# $Id$
+# $Id$
#/**
-# * installscript for APACHE with PHP, IMAP, POSTGRESQL, MYSQL, LIBXML, XSLT,
FREEDTS(MSSQL) and EACCELERATOR
-# *
-# *
+# * installscript for APACHE with PHP, IMAP, POSTGRESQL, MYSQL, LIBXML, XSLT,
FREEDTS(MSSQL), PCRE, APR, APR-UTIL
+# *
+# *
# * Download all tarballs to one directory(here: '/opt/web') and place this
script in the same place
-# *
+# *
# * NOTE: Do not add spaces after bash variables.
# *
# * @author Sigurd Nes <Sigurdne (inside) online (dot) no>
@@ -17,14 +17,24 @@
# should be edited
##############################
+#PCRE from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+PCRETAR="pcre-8.36.tar.gz"
+PCRE="pcre-8.36"
+
+#APR from http://apr.apache.org/
+APRTAR="apr-1.5.2.tar.gz"
+APR="apr-1.5.2"
+APR_UTIL_TAR="apr-util-1.5.4.tar.gz"
+APR_UTIL="apr-util-1.5.4"
+
#/**
# * Name of the freetds package e.g freetds-stable.tgz
-# *
+# *
# * @var string FREETDS, FREETDSTAR
# * Download: http://www.freetds.org/software.html
# */
-FREETDSTAR="freetds-stable.tgz"
-FREETDS="freetds-0.91"
+FREETDSTAR="freetds-patched.tar.gz"
+FREETDS="freetds-0.95.19"
# Download: http://xmlsoft.org/downloads.html
LIBXMLTAR="libxml2-2.9.2.tar.gz"
@@ -41,36 +51,24 @@
#/**
# * Name of the APACHE tarball e.g httpd-2.2.6.tar.gz
-# *
+# *
# * @var string APACHE, APACHETAR
# * Download: http://php.net/
# */
-APACHETAR="httpd-2.2.21.tar.gz"
-APACHE="httpd-2.2.21"
+APACHETAR="httpd-2.4.16.tar.gz"
+APACHE="httpd-2.4.16"
#/**
# * Name of the PHP tarball e.g php-5.2.tar.gz
-# *
+# *
# * @var string PHP, PHPTAR
# * Download: http://httpd.apache.org/
# */
-PHPTAR="php-5.3.8.tar.bz2"
-PHP="php-5.3.8"
+PHPTAR="php-7.0.0RC2.tar.bz2"
+PHP="php-7.0.0RC2"
-#/**
-# * Name of the EACCELERATOR tarball e.g eaccelerator-0.9.5.tar.bz2
-# *
-# * @var string EACCELERATOR, EACCELERATORTAR
-# * Download: http://eaccelerator.net/
-# */
-EACCELERATORTAR="eaccelerator-0.9.6.1.tar.bz2"
-EACCELERATOR="eaccelerator-0.9.6.1"
PHP_PREFIX="/usr/local"
-# APC as Alternative:
-# Download: http://pecl.php.net/package/APC
-# APCTAR="APC-3.1.2.tgz"
-# APC="APC-3.1.2"
#/**
# * Oracle PDO-Support
@@ -81,9 +79,9 @@
#ORACLE="instantclient_11_2"
#ORACLEDEVELTAR="instantclient-sdk-linux32-11.2.0.1.zip"
-ORACLETAR="instantclient-basic-linux-x86-64-11.2.0.2.0.zip"
-ORACLE="instantclient_11_2"
-ORACLEDEVELTAR="instantclient-sdk-linux-x86-64-11.2.0.2.0.zip"
+ORACLETAR="instantclient-basic-linux.x64-12.1.0.2.0.zip"
+ORACLE="instantclient_12_1"
+ORACLEDEVELTAR="instantclient-sdk-linux.x64-12.1.0.2.0.zip"
ORACLE_PDO=""
@@ -103,17 +101,17 @@
unzip $1
mv $2 /opt/
- unzip $ORACLEDEVELTAR
+ unzip $ORACLEDEVELTAR
mv $2/sdk /opt/$2/
export ORACLE_HOME=/opt/$2/
- ln -s /opt/$2/libclntsh.so.11.1 /opt/$2/libclntsh.so
- ln -s /opt/$2/libocci.so.11.1 /opt/$2/libocci.so
+ ln -s /opt/$2/libclntsh.so.12.1 /opt/$2/libclntsh.so
+ ln -s /opt/$2/libocci.so.12.1 /opt/$2/libocci.so
ln -s /opt/$2/ /opt/$2/lib
}
# clean up from previous
-
+rm $PCRE -rf &&\
rm $FREETDS -rf &&\
rm $LIBXML -rf &&\
rm $LIBXSL -rf &&\
@@ -196,16 +194,23 @@
echo "Skipping MSSQL"
fi
-
+tar -xzf $APRTAR &&\
+tar -xzf $APR_UTIL_TAR &&\
+tar -xzf $PCRETAR &&\
tar -xzf $LIBXMLTAR &&\
tar -xzf $LIBXSLTAR &&\
tar -xzf $APACHETAR &&\
bunzip2 -c $PHPTAR | tar xvf -&&\
-bunzip2 -c $EACCELERATORTAR | tar xvf -&&\
-cd $LIBXML &&\
+mv $APR $APACHE/srclib/apr &&\
+mv $APR_UTIL $APACHE/srclib/apr-util &&\
+cd $PCRE &&\
./configure &&\
make &&\
make install &&\
+cd ../$LIBXML &&\
+./configure &&\
+make &&\
+make install &&\
cd ../$LIBXSL &&\
./configure &&\
make &&\
@@ -261,20 +266,43 @@
--enable-zip \
$ORACLE_PDO &&\
make &&\
-make install &&\
-cd ../$EACCELERATOR &&\
-$PHP_PREFIX/bin/phpize &&\
-./configure --enable-eaccelerator=shared
--with-php-config=$PHP_PREFIX/bin/php-config &&\
-make &&\
-make install &&\
-mkdir /tmp/eaccelerator &&\
-chmod 0777 /tmp/eaccelerator
+make install
-#cd ../$APC &&\
-#$PHP_PREFIX/bin/phpize &&\
-#./configure --enable-apc-mmap --with-apxs
--with-php-config=$PHP_PREFIX/bin/php-config &&\
-#make &&\
-#make install
+#export ORACLE_HOME=/opt/instantclient_12_1/ &&\
+#export LDFLAGS=-lstdc++ &&\
+#./configure \
+# --with-sybase-ct=/usr/local/freetds\
+# --with-apxs2=/usr/local/apache2/bin/apxs\
+# --with-xsl\
+# --with-zlib\
+# --with-pspell\
+# --with-jpeg-dir=/usr/lib\
+# --with-png-dir=/usr/lib\
+# --with-freetype-dir=/usr/lib\
+# --with-gd\
+# --enable-ftp\
+# --with-pgsql\
+# --with-mysql\
+# --with-mysqli\
+# --enable-shmop\
+# --enable-sysvsem\
+# --enable-sysvshm\
+# --enable-calendar\
+# --enable-pdo\
+# --with-pdo-sqlite\
+# --with-sqlite\
+# --with-pdo-pgsql\
+# --with-pdo-mysql\
+# --with-openssl\
+# --enable-mbstring\
+# --with-mcrypt\
+# --enable-soap\
+# --with-xmlrpc \
+# --with-gettext \
+# --with-snmp \
+# --with-curl \
+# --enable-zip \
+# --with-oci8=instantclient,/opt/instantclient_12_1/ --with-pdo-oci
-# vim: set expandtab :
+# vim: set expandtab :
\ No newline at end of file
Modified: branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -579,7 +579,7 @@
$selector = "";
switch($search_type){
case 'unit_leader':
- $search_words = split('
', $search_for);
+ $search_words =
explode(' ', $search_for);
$count = 0;
$selector = "(";
foreach($search_words
as $search_word){
@@ -719,7 +719,7 @@
$selector = "";
switch($search_type){
case 'unit_leader':
- $search_words = split('
', $search_for);
+ $search_words =
explode(' ', $search_for);
$count = 0;
$selector = "(";
foreach($search_words
as $search_word)
Modified: branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -38,14 +38,16 @@
$id =
$this->marshal($filters[$this->get_id_field_name()],'int');
$filter_clauses[] = "{$this->get_id_field_name()} =
{$id}";
}
-
- if(isset($filters['manual_adjustment']))
- {
- $clauses[] = "is_manual";
- }
else
{
- $clauses[] = "NOT is_manual";
+ if(isset($filters['manual_adjustment']))
+ {
+ $clauses[] = "is_manual";
+ }
+ else
+ {
+ $clauses[] = "NOT is_manual";
+ }
}
if(count($filter_clauses))
@@ -143,14 +145,15 @@
$adjustment->get_percent(),
$adjustment->get_interval(),
$adjustment->get_adjustment_date(),
- '\''.$adjustment->get_adjustment_type().'\'',
+ $adjustment->get_adjustment_type(),
($adjustment->is_manual() ? "true" : "false"),
($adjustment->is_executed() ? "true" : "false"),
($adjustment->is_extra_adjustment() ? "true" :
"false"),
$adjustment->get_year()
);
- $query ="INSERT INTO rental_adjustment (" . join(',', $cols) .
") VALUES (" . join(',', $values) . ")";
+ $values_insert = $this->db->validate_insert($values);
+ $query ="INSERT INTO rental_adjustment (" . join(',', $cols) .
") VALUES ({$values_insert})";
$result = $this->db->query($query);
$adjustment_id =
$this->db->get_last_insert_id('rental_adjustment', 'id');
Modified: branches/Version-1_0-branch/rental/inc/class.soprice_item.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.soprice_item.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/rental/inc/class.soprice_item.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -519,31 +519,39 @@
function adjust_contract_price_items(int $price_item_id, $new_price)
{
- $q_contract_price_items = "SELECT * from
rental_contract_price_item where price_item_id=$price_item_id";
+ $this->db->transaction_begin();
+ $number_affected = 0;
+ $db2 = clone($this->db);
+ $q_contract_price_items = "SELECT * FROM
rental_contract_price_item WHERE price_item_id={$price_item_id}";
$this->db->query($q_contract_price_items);
- while($this->db->next_record()){
+ while($this->db->next_record())
+ {
$total_price = 0.00;
- $curr_id = $this->db->f('id');
- $is_area =
$this->unmarshal($this->db->f('is_area'),'bool');
- if($is_area){
- $area =
$this->unmarshal($this->db->f('area'),'float');
+ $curr_id = $this->db->f('id');
+ $is_area =
$this->unmarshal($this->db->f('is_area'), 'bool');
+ if($is_area)
+ {
+ $area =
$this->unmarshal($this->db->f('area'), 'float');
$total_price = $area * $new_price;
}
- else{
- $count =
$this->unmarshal($this->db->f('count'),'int');
+ else
+ {
+ $count =
$this->unmarshal($this->db->f('count'), 'int');
$total_price = $count * $new_price;
}
- $query="UPDATE rental_contract_price_item SET
price=$new_price, total_price=$total_price WHERE id=$curr_id";
- $this->db->query($query);
+ $query = "UPDATE rental_contract_price_item SET
price=$new_price, total_price=$total_price WHERE id=$curr_id";
+ $db2->query($query);
+
+ $number_affected ++;
}
-
- $query2 = "SELECT count(*) as count FROM
rental_contract_price_item WHERE price_item_id=$price_item_id";
- $this->db->query($query2);
- if($this->db->next_record()){
- return $this->db->f('count');
+
+ if($this->db->transaction_commit())
+ {
+ return $number_affected;
}
- else{
+ else
+ {
return 0;
}
}
-}
\ No newline at end of file
+}
Modified: branches/Version-1_0-branch/rental/inc/class.uiprice_item.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uiprice_item.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/rental/inc/class.uiprice_item.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -357,7 +357,9 @@
$adjustment = new rental_adjustment();
$adjustment->set_price_item_id($price_item->get_id());
$adjustment->set_new_price($new_price);
+ $adjustment->set_year(date('Y'));
$adjustment->set_percent(0);
+ $adjustment->set_interval(0);
$adjustment->set_responsibility_id($price_item->get_responsibility_id());
$adjustment->set_is_manual(true);
$adjustment->set_adjustment_date(time());
Modified: branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -163,6 +163,7 @@
'id' => $this->get_id(),
'price_item_id' => $this->get_price_item_id(),
'responsibility_title' =>
lang(rental_socontract::get_instance()->get_responsibility_title($this->get_responsibility_id())),
+ 'responsibility_id' => $this->get_responsibility_id(),
'new_price' => $this->get_new_price(),
'percent' => $this->get_percent(),
'interval' => $this->get_interval(),
@@ -174,4 +175,4 @@
);
}
}
-?>
\ No newline at end of file
+?>
Modified: branches/Version-1_0-branch/rental/inc/model/class.contract.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/model/class.contract.inc.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/rental/inc/model/class.contract.inc.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -689,13 +689,13 @@
$date_end = phpgw::get_var('date_end');
if(isset($date_start)){
- $aDate = split ("/", $date_start);
+ $aDate = explode("/", $date_start);
$date_start =
$aDate[1]."/".$aDate[0]."/".$aDate[2];
$timestamp_invoice_start =
strtotime($date_start);
}
if(isset($date_end)){
- $aDate = split ("/", $date_end);
+ $aDate = explode("/", $date_end);
$date_end =
$aDate[1]."/".$aDate[0]."/".$aDate[2];
$timestamp_invoice_end = strtotime($date_end);
}
Modified: branches/Version-1_0-branch/sms/inc/plugin/gateway/clickatell/fn.php
===================================================================
--- branches/Version-1_0-branch/sms/inc/plugin/gateway/clickatell/fn.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/sms/inc/plugin/gateway/clickatell/fn.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -19,7 +19,7 @@
$fd = @implode ('', file ($url));
if ($fd)
{
- $response = split (" ", $fd);
+ $response = explode(" ", $fd);
$err_code = trim ($response[1]);
$credit = 0;
if ((strtoupper(trim($response[2])) == "CHARGE:"))
@@ -149,7 +149,7 @@
setsmsdeliverystatus($smslog_id,$uid,$p_status);
if ($fd)
{
- $response = split (":", $fd);
+ $response = explode(":", $fd);
$err_code = trim ($response[1]);
if ((strtoupper($response[0]) == "ID"))
{
Modified: branches/Version-1_0-branch/sms/inc/plugin/gateway/uplink/fn.php
===================================================================
--- branches/Version-1_0-branch/sms/inc/plugin/gateway/uplink/fn.php
2015-09-21 19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/sms/inc/plugin/gateway/uplink/fn.php
2015-09-21 19:41:15 UTC (rev 13981)
@@ -53,7 +53,7 @@
$fd = @implode ('', file ($url));
if ($fd)
{
- $response = split (" ", $fd);
+ $response = explode(" ", $fd);
if ($response[0] == "OK")
{
$remote_slid = $response[1];
Modified: branches/Version-1_0-branch/soap.php
===================================================================
--- branches/Version-1_0-branch/soap.php 2015-09-21 19:33:17 UTC (rev
13980)
+++ branches/Version-1_0-branch/soap.php 2015-09-21 19:41:15 UTC (rev
13981)
@@ -77,7 +77,7 @@
$tmp = str_replace(' ','',$tmp);
$tmp = str_replace('Basic','',$tmp);
$auth = base64_decode(trim($tmp));
- list($login,$password) = split(':',$auth);
+ list($login,$password) = explode(':',$auth);
if($GLOBALS['phpgw']->session->create($login, $password))
{
Modified: branches/Version-1_0-branch/todo/inc/class.uitodo.inc.php
===================================================================
--- branches/Version-1_0-branch/todo/inc/class.uitodo.inc.php 2015-09-21
19:33:17 UTC (rev 13980)
+++ branches/Version-1_0-branch/todo/inc/class.uitodo.inc.php 2015-09-21
19:41:15 UTC (rev 13981)
@@ -191,7 +191,7 @@
if (!$title)
{
- $words = split('
',$GLOBALS['phpgw']->strip_html($todo_list[$i]['descr']));
+ $words = explode('
',$GLOBALS['phpgw']->strip_html($todo_list[$i]['descr']));
$title = "$words[0] $words[1] $words[2]
$words[3] ...";
}
@@ -385,7 +385,7 @@
}
if (! $todo['title'])
{
- $words = split('
',$GLOBALS['phpgw']->strip_html($todo['descr']));
+ $words = explode('
',$GLOBALS['phpgw']->strip_html($todo['descr']));
$title = "$words[0] $words[1] $words[2]
$words[3] ...";
$todo_select .= ">$title";
}
Modified: branches/Version-1_0-branch/xmlrpc.php
===================================================================
--- branches/Version-1_0-branch/xmlrpc.php 2015-09-21 19:33:17 UTC (rev
13980)
+++ branches/Version-1_0-branch/xmlrpc.php 2015-09-21 19:41:15 UTC (rev
13981)
@@ -139,7 +139,7 @@
$tmp = str_replace(' ','',$tmp);
$tmp = str_replace('Basic','',$tmp);
$auth = base64_decode(trim($tmp));
- list($login,$password) = split(':',$auth);
+ list($login,$password) = explode(':',$auth);
if($GLOBALS['phpgw']->session->create($login, $password))
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13981] Merge 13939:13980 from trunk,
Sigurd Nes <=