[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13382] Merge 13366:13381 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13382] Merge 13366:13381 from trunk |
|
Date: |
Mon, 08 Jun 2015 10:23:13 +0000 |
Revision: 13382
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13382
Author: sigurdne
Date: 2015-06-08 10:23:13 +0000 (Mon, 08 Jun 2015)
Log Message:
-----------
Merge 13366:13381 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
branches/Version-1_0-branch/phpgwapi/cron/stalesessions.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_ads.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.Mail_mimeDecode.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.Services_JSON.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.Template.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.arrayfunctions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.calendar_holidays.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.contact_types.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.country.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.csstooltip.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.custom_functions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.data_cleaner.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.excel.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.gdgraph.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.gdimage.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.html2text.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.http_svn_client.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.interserver.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ipc_manager.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.locations.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.mail2array.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.mail_handlers.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.matrixview.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.net_http_client.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.network.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.nextmatchs_xslt.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.rssparser.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_array.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mssql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_oracle.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_sapdb.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.service.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.service_contacts.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.service_notes.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.service_schedule.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup_detection.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ui_tools.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.uijsaddressbook.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.utilities.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.validator.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_dav.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.xml.inc.php
branches/Version-1_0-branch/phpgwapi/inc/excel/BIFFwriter.php
branches/Version-1_0-branch/phpgwapi/inc/excel/Format.php
branches/Version-1_0-branch/phpgwapi/inc/excel/Workbook.php
branches/Version-1_0-branch/phpgwapi/inc/excel/Worksheet.php
branches/Version-1_0-branch/phpgwapi/inc/excel/test.php
branches/Version-1_0-branch/phpgwapi/inc/exchange/class_http.php
branches/Version-1_0-branch/phpgwapi/inc/exchange/class_xml.php
branches/Version-1_0-branch/phpgwapi/inc/exchange/example_xml.php
branches/Version-1_0-branch/phpgwapi/inc/exchange/image_cache.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/actionscript.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ada.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/apache.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/applescript.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/asm.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/bash.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/blitzbasic.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c_mac.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/caddcl.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cadlisp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfdg.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfm.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cpp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/csharp.php
branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/css.php
branches/Version-1_0-branch/phpgwapi/inc/log_functions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_.inc.php
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_ldap.inc.php
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_sql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/pclzip/pclzip.lib.php
branches/Version-1_0-branch/phpgwapi/inc/soaplib.soapinterop.php
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/combo.php
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/settings.php
branches/Version-1_0-branch/phpgwapi/setup/tables_baseline.inc.php
branches/Version-1_0-branch/phpgwapi/setup/test_data.inc.php
branches/Version-1_0-branch/phpgwapi/templates/desktop/head.inc.php
branches/Version-1_0-branch/phpgwapi/templates/idsociety/head.inc.php
branches/Version-1_0-branch/phpgwapi/templates/linux-at-work.de/head.inc.php
branches/Version-1_0-branch/phpgwapi/templates/probusiness/head.inc.php
branches/Version-1_0-branch/phpgwapi/templates/simple/head.inc.php
branches/Version-1_0-branch/phpsysinfo/setup/setup.inc.php
branches/Version-1_0-branch/preferences/inc/class.boadmin_acl.inc.php
branches/Version-1_0-branch/rental/inc/class.menu.inc.php
branches/Version-1_0-branch/rental/inc/class.socontract_price_item.inc.php
branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
branches/Version-1_0-branch/rental/inc/hook_config.inc.php
branches/Version-1_0-branch/rental/inc/model/class.contract.inc.php
branches/Version-1_0-branch/rental/setup/default_records.inc.php
branches/Version-1_0-branch/rental/setup/setup.inc.php
branches/Version-1_0-branch/rental/setup/tables_update.inc.php
branches/Version-1_0-branch/rental/templates/base/config.tpl
branches/Version-1_0-branch/rental/templates/base/contract.php
branches/Version-1_0-branch/setup/applications.php
branches/Version-1_0-branch/setup/applist.php
branches/Version-1_0-branch/setup/bulk.php
branches/Version-1_0-branch/setup/config.php
branches/Version-1_0-branch/setup/index.php
branches/Version-1_0-branch/setup/ldap.php
branches/Version-1_0-branch/setup/ldapexport.php
branches/Version-1_0-branch/setup/ldapimport.php
branches/Version-1_0-branch/setup/ldapmodify.php
branches/Version-1_0-branch/setup/schematoy.php
branches/Version-1_0-branch/setup/sqltoarray.php
Added Paths:
-----------
branches/Version-1_0-branch/rental/inc/class.hook_helper.inc.php
branches/Version-1_0-branch/rental/inc/custom/
Property Changed:
----------------
branches/Version-1_0-branch/
branches/Version-1_0-branch/bookingfrontend/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /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
+ /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
Modified: branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -30,7 +30,7 @@
$setup_info['activitycalendar']['depends'][] = array(
'appname' => 'booking',
- 'versions' =>
array('0.2.05','0.2.06','0.2.07','0.2.08','0.2.09','0.2.10', '0.2.11','0.2.12')
+ 'versions' => array('0.2.20')
);
$setup_info['activitycalendar']['depends'][] = array(
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -22,7 +22,7 @@
$setup_info['activitycalendarfrontend']['depends'][] = array(
'appname' => 'booking',
- 'versions' => Array('0.2.00', '0.2.01', '0.2.02', '0.2.03', '0.2.04',
'0.2.05', '0.2.06', '0.2.07', '0.2.08', '0.2.09', '0.2.10', '0.2.11','0.2.12')
+ 'versions' => Array('0.2.20')
);
$setup_info['activitycalendarfrontend']['depends'][] = array(
@@ -32,7 +32,7 @@
$setup_info['activitycalendarfrontend']['depends'][] = array(
'appname' => 'activitycalendar',
- 'versions' => Array('0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8',
'0.1.9', '0.1.10', '0.1.11')
+ 'versions' => Array('0.1.11')
);
/* The hooks this app includes, needed for hooks registration */
Modified: branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -620,7 +620,7 @@
'lang_no_location'
=> lang('No location'),
'lang_location_statustext'
=> lang('Select submodule'),
'select_name_location'
=> 'location',
- 'location_list'
=>
$this->bolocation->select_location('filter',$location,False,True),
+ 'location_list'
=> $this->bolocation->select_location('filter',
$location, false, false, true),
);
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
+ /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
Modified: branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -21,7 +21,7 @@
$setup_info['bookingfrontend']['depends'][] = array(
'appname' => 'booking',
- 'versions' => Array('0.2.10',
'0.2.11','0.2.12','0.2.13','0.2.14','0.2.15','0.2.16','0.2.17','0.2.18','0.2.19','0.2.20')
+ 'versions' => Array('0.2.20')
);
$setup_info['bookingfrontend']['depends'][] = array(
Modified: branches/Version-1_0-branch/phpgwapi/cron/stalesessions.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/cron/stalesessions.php 2015-06-08
10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/cron/stalesessions.php 2015-06-08
10:23:13 UTC (rev 13382)
@@ -26,4 +26,4 @@
// delete old (timed out) sessions
$query = sprintf("delete from phpgw_sessions where session_dla <=
'$purgetime'");
$res = mysql_query($query, $link);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_ads.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_ads.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_ads.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -66,4 +66,3 @@
return 'CN=Users,'.$this->base_dn;
}
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.Mail_mimeDecode.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.Mail_mimeDecode.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.Mail_mimeDecode.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -803,4 +803,4 @@
}
} // End of class
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.Services_JSON.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.Services_JSON.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.Services_JSON.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -797,5 +797,4 @@
}
}
-
-?>
+
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.Template.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.Template.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.Template.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -1028,4 +1028,3 @@
}
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.arrayfunctions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.arrayfunctions.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.arrayfunctions.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -75,4 +75,3 @@
}
}
-?>
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.calendar_holidays.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.calendar_holidays.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.calendar_holidays.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -566,5 +566,4 @@
$cal_workdays = new calendar_holidays();
$cal_workdays->add_number_of_workdays(31,5,2004,3,'Germany','Lower
Saxony','Evangelic',$day,$month,$year);
echo $year . '-' . $month . '-' . $day . "\n";
- */
-?>
\ No newline at end of file
+ */
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.contact_types.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.contact_types.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.contact_types.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -79,4 +79,3 @@
}
}
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.country.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.country.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.country.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -384,4 +384,3 @@
);
}
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.csstooltip.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.csstooltip.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.csstooltip.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -131,5 +131,4 @@
{
return '<a href="#"
class="tooltip">'.$link_content.'<span class="tooltip"><span
class="tooltip_headline">'.$tooltip_headline.'</span><span
class="tooltip_line"> </span><span
class="tooltip_content">'.$tooltip_content.'</span></span></a>';
}
- }
-?>
\ No newline at end of file
+ }
\ No newline at end of file
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.custom_functions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.custom_functions.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.custom_functions.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -289,10 +289,15 @@
$querymethod = '';
if($query)
{
- $querymethod = " AND file_name {$this->_like}
'%{$query}%'"
- . " OR descr
{$this->_like} '%{$query}%'";
+ $querymethod = " AND (file_name {$this->_like}
'%{$query}%'"
+ . " OR descr
{$this->_like} '%{$query}%')";
}
+ if ( isset($data['pre_commit']) )
+ {
+ $querymethod = " AND pre_commit = 1";
+ }
+
$sql = 'FROM phpgw_cust_function'
. " WHERE location_id = {$location_id}
{$querymethod}";
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.data_cleaner.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.data_cleaner.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.data_cleaner.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -261,4 +261,3 @@
return $data;
}
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.excel.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.excel.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.excel.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -42,4 +42,3 @@
* @see workbook
*/
require_once(PHPGW_API_INC . '/excel/Workbook.php');
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.gdgraph.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.gdgraph.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.gdgraph.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -853,4 +853,3 @@
return $url;
}
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.gdimage.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.gdimage.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.gdimage.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -385,4 +385,3 @@
}
}
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.html2text.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.html2text.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.html2text.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -430,4 +430,3 @@
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.http_svn_client.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.http_svn_client.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.http_svn_client.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -272,4 +272,3 @@
return $rarray;
}
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.interserver.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.interserver.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.interserver.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -547,4 +547,3 @@
return False;
}
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.ipc_manager.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.ipc_manager.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.ipc_manager.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -196,4 +196,3 @@
}
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.locations.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.locations.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.locations.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -447,7 +447,7 @@
if($c_function)
{
- $filter .= ' AND c_function = 1';
+ $filter .= ' AND allow_c_function = 1';
}
$sql = "SELECT phpgw_locations.location_id,
phpgw_locations.name, phpgw_locations.descr FROM phpgw_locations"
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.mail2array.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.mail2array.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.mail2array.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -506,4 +506,3 @@
}
return trim($val);
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.mail_handlers.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.mail_handlers.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.mail_handlers.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -99,4 +99,3 @@
$this->db->query($sql, __LINE__, __FILE__);
}
}
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.matrixview.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.matrixview.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.matrixview.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -336,4 +336,3 @@
echo '</form>' . "\n";
}
}
-?>
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-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.net_http_client.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -856,5 +856,3 @@
} // end class net_http_client
-
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.network.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.network.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.network.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -232,4 +232,4 @@
}
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.nextmatchs_xslt.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.nextmatchs_xslt.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.nextmatchs_xslt.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -138,4 +138,4 @@
return $nm_data;
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.rssparser.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.rssparser.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.rssparser.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -225,4 +225,4 @@
return $GLOBALS['_rss'];
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -716,4 +716,4 @@
return $this->m_odb->validate_insert($values);
}
}
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_array.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_array.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_array.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -184,4 +184,4 @@
return True;
}
}
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mssql.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mssql.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mssql.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -435,4 +435,4 @@
}
}
}
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -448,4 +448,4 @@
return false;
}
}
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_oracle.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_oracle.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_oracle.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -466,4 +466,4 @@
return false;
}
}
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -772,4 +772,4 @@
return false;
}
}
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_sapdb.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_sapdb.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_sapdb.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -536,4 +536,4 @@
return false;
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.service.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.service.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.service.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -53,4 +53,4 @@
return $this->function_map;
}
}
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.service_contacts.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.service_contacts.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.service_contacts.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -51,4 +51,4 @@
return ExecMethod($this->svc . '.' .
$this->function_map['delete']['function'],$data);
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.service_notes.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.service_notes.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.service_notes.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -52,4 +52,4 @@
return ExecMethod($this->svc . '.' .
$this->function_map['delete']['function'],$data);
}
}
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.service_schedule.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.service_schedule.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.service_schedule.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -57,4 +57,4 @@
return ExecMethod($this->svc . '.' .
$this->function_map['export_event']['function'],$data);
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -838,4 +838,4 @@
return 'phpgw_hooks';
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.setup_detection.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.setup_detection.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.setup_detection.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -493,5 +493,4 @@
return True;
}
}
- }
-?>
+ }
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.sql.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.sql.inc.php 2015-06-08
10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.sql.inc.php 2015-06-08
10:23:13 UTC (rev 13382)
@@ -507,4 +507,4 @@
return $return_value;
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.ui_tools.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.ui_tools.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.ui_tools.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -190,4 +190,4 @@
return $elm;
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.uijsaddressbook.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.uijsaddressbook.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.uijsaddressbook.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -1079,4 +1079,4 @@
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.utilities.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.utilities.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.utilities.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -43,4 +43,4 @@
$GLOBALS['phpgw']->sbox =
createObject('phpgwapi.portalbox');
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.validator.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.validator.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.validator.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -305,4 +305,4 @@
exit;
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -875,4 +875,4 @@
}
} //end class
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.vfs_dav.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.vfs_dav.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vfs_dav.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -2127,4 +2127,4 @@
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -1829,4 +1829,4 @@
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.xml.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.xml.inc.php 2015-06-08
10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.xml.inc.php 2015-06-08
10:23:13 UTC (rev 13382)
@@ -3360,4 +3360,3 @@
}
}
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/excel/BIFFwriter.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/excel/BIFFwriter.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/excel/BIFFwriter.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -206,4 +206,3 @@
return($tmp);
}
}
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/excel/Format.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/excel/Format.php 2015-06-08
10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/excel/Format.php 2015-06-08
10:23:13 UTC (rev 13382)
@@ -634,4 +634,3 @@
$this->_text_wrap = $text_wrap;
}
}
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/excel/Workbook.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/excel/Workbook.php 2015-06-08
10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/excel/Workbook.php 2015-06-08
10:23:13 UTC (rev 13382)
@@ -951,4 +951,3 @@
$this->_append($header.$data);
}
}
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/excel/Worksheet.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/excel/Worksheet.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/excel/Worksheet.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -2832,4 +2832,3 @@
$this->_append($header.$data);
}
}
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/excel/test.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/excel/test.php 2015-06-08
10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/excel/test.php 2015-06-08
10:23:13 UTC (rev 13382)
@@ -85,4 +85,3 @@
//$worksheet2->insert_bitmap(0, 0, "some.bmp",10,10);
$workbook->close();
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/exchange/class_http.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/exchange/class_http.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/exchange/class_http.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -405,4 +405,4 @@
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/exchange/class_xml.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/exchange/class_xml.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/exchange/class_xml.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -75,4 +75,4 @@
return utf8_decode(trim($string));
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/exchange/example_xml.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/exchange/example_xml.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/exchange/example_xml.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -53,4 +53,4 @@
echo "<h1>Log</h1>";
echo $x->log;
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/exchange/image_cache.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/exchange/image_cache.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/exchange/image_cache.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -21,4 +21,4 @@
$h->fetch($_GET['url'], $_GET['ttl']);
header("Content-Type: image/jpeg");
echo $h->body;
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/actionscript.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/actionscript.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/actionscript.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -196,4 +196,4 @@
'HIGHLIGHT_STRICT_BLOCK' => array()
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ada.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ada.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/ada.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -132,4 +132,4 @@
)
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/apache.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/apache.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/apache.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -170,4 +170,4 @@
)
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/applescript.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/applescript.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/applescript.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -133,4 +133,4 @@
)
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/asm.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/asm.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/asm.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -197,4 +197,4 @@
)
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/bash.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/bash.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/bash.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -127,4 +127,4 @@
)
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/blitzbasic.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/blitzbasic.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/blitzbasic.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -184,4 +184,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c.php 2015-06-08
10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c.php 2015-06-08
10:23:13 UTC (rev 13382)
@@ -141,4 +141,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c_mac.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c_mac.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/c_mac.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -173,4 +173,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/caddcl.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/caddcl.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/caddcl.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -124,4 +124,4 @@
)
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cadlisp.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cadlisp.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cadlisp.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -184,4 +184,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfdg.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfdg.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfdg.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -124,5 +124,5 @@
)
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfm.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfm.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cfm.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -324,4 +324,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cpp.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cpp.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/cpp.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -169,4 +169,4 @@
)
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/csharp.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/csharp.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/csharp.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -230,4 +230,4 @@
)
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/css.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/css.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/geshi/geshi/css.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -175,4 +175,3 @@
)
);
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/log_functions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/log_functions.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/log_functions.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -79,4 +79,3 @@
}
}
-?>
Modified:
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -256,4 +256,3 @@
}
}
-?>
Modified:
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_ldap.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_ldap.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_ldap.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -68,4 +68,4 @@
return $auth->authenticate($uid,$password);
}
}
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_sql.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_sql.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/mapping/class.mapping_sql.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -72,4 +72,4 @@
return $auth->authenticate($uid,$password,'text');
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/pclzip/pclzip.lib.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/pclzip/pclzip.lib.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/pclzip/pclzip.lib.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -5691,4 +5691,3 @@
//
--------------------------------------------------------------------------------
-?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/soaplib.soapinterop.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/soaplib.soapinterop.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/soaplib.soapinterop.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -148,4 +148,4 @@
array('string','string','string'),
array('array')
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/combo.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/combo.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/combo.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -13,4 +13,4 @@
$combo = new YUICombo($_GET, $config);
$combo->loadModules();
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -211,4 +211,4 @@
$this->modules = $newModules;
}
}
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
2015-06-08 10:14:42 UTC (rev 13381)
+++
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -50,4 +50,4 @@
return false;
}
}
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php
2015-06-08 10:14:42 UTC (rev 13381)
+++
branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -28,4 +28,4 @@
header("Content-Encoding: gzip");
}
}
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/settings.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/settings.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/settings.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -14,4 +14,4 @@
}
define(DS, DIRECTORY_SEPARATOR);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/setup/tables_baseline.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/tables_baseline.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/setup/tables_baseline.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -182,4 +182,4 @@
'uc' => array()
)
);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/setup/test_data.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/test_data.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/setup/test_data.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -37,4 +37,4 @@
'address@hidden','212-555-5555','212-555-4444','212-555-4445','212-555-5556',
'212-555-5557','212-555-5558','321 Contact','Oiforgot','North
Dakota','15421',
'10/05/1955','This is a test note\nfor verification','Baubles and
Beads')");
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/templates/desktop/head.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/desktop/head.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/templates/desktop/head.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -45,4 +45,4 @@
$tpl->set_var($var);
$tpl->pfp('out','head');
unset($tpl);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/templates/idsociety/head.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/idsociety/head.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/templates/idsociety/head.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -54,4 +54,4 @@
$GLOBALS['phpgw']->template->set_var($var);
$GLOBALS['phpgw']->template->pfp('out','head');
unset($tpl);
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/templates/linux-at-work.de/head.inc.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/templates/linux-at-work.de/head.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++
branches/Version-1_0-branch/phpgwapi/templates/linux-at-work.de/head.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -43,6 +43,6 @@
$tpl->set_var($var);
$tpl->pfp('out', 'head');
unset ($tpl);
-?>
+
Modified:
branches/Version-1_0-branch/phpgwapi/templates/probusiness/head.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/probusiness/head.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/templates/probusiness/head.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -80,4 +80,4 @@
$tpl->set_var($var);
$tpl->pfp('out','head');
unset($tpl);
-?>
+
Modified: branches/Version-1_0-branch/phpgwapi/templates/simple/head.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/simple/head.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpgwapi/templates/simple/head.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -98,4 +98,4 @@
$tpl->pfp('out','head');
unset($tpl);
-?>
+
Modified: branches/Version-1_0-branch/phpsysinfo/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/phpsysinfo/setup/setup.inc.php 2015-06-08
10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/phpsysinfo/setup/setup.inc.php 2015-06-08
10:23:13 UTC (rev 13382)
@@ -32,5 +32,4 @@
$setup_info['phpsysinfo']['depends'][] = array(
'appname' => 'phpgwapi',
'versions' => Array('0.9.16', '0.9.17', '0.9.18')
- );
-?>
+ );
\ No newline at end of file
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-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/preferences/inc/class.boadmin_acl.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -128,7 +128,7 @@
}
}
- function select_location($format = 'filter', $selected='',
$grant = false, $allow_c_attrib = false)
+ function select_location($format = 'filter', $selected='',
$grant = false, $allow_c_attrib = false, $allow_c_functions = false)
{
switch($format)
@@ -143,7 +143,7 @@
$location_list = array();
- $locations =
$GLOBALS['phpgw']->locations->get_locations($grant, $this->acl_app,
$allow_c_attrib);
+ $locations =
$GLOBALS['phpgw']->locations->get_locations($grant, $this->acl_app,
$allow_c_attrib, $allow_c_functions);
$i = 0;
foreach ( $locations as $loc_id => $loc_descr )
Copied: branches/Version-1_0-branch/rental/inc/class.hook_helper.inc.php (from
rev 13381, trunk/rental/inc/class.hook_helper.inc.php)
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.hook_helper.inc.php
(rev 0)
+++ branches/Version-1_0-branch/rental/inc/class.hook_helper.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -0,0 +1,74 @@
+<?php
+ /**
+ * property - Hook helper
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2015 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @package rental
+ * @version $Id: class.hook_helper.inc.php 11076 2013-04-25 07:19:14Z
sigurdne $
+ */
+
+ /*
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+ /**
+ * Hook helper
+ *
+ * @package rental
+ */
+ class rental_hook_helper
+ {
+
+ /**
+ * Add a contact to a location
+ *
+ * @return void
+ */
+ public function add_contract_from_composite(&$data)
+ {
+ if(!isset($data['location_code']) ||
!$data['location_code'])
+ {
+ phpgwapi_cache::message_set("location_code not
set", 'error');
+ return false;
+ }
+
+ $criteria = array
+ (
+ 'appname' => 'rental',
+ 'location' =>
$data['acl_location'],
+ 'pre_commit' => true,
+ 'allrows' => true
+ );
+
+ $custom_functions =
$GLOBALS['phpgw']->custom_functions->find($criteria);
+
+ foreach ( $custom_functions as $entry )
+ {
+ // prevent path traversal
+ if ( preg_match('/\.\./', $entry['file_name']) )
+ {
+ continue;
+ }
+
+ $file = PHPGW_SERVER_ROOT .
"/rental/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
+ if ( $entry['active'] && is_file($file) &&
!$entry['client_side'])
+ {
+ require $file;
+ }
+ }
+ }
+ }
Modified: branches/Version-1_0-branch/rental/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.menu.inc.php 2015-06-08
10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/rental/inc/class.menu.inc.php 2015-06-08
10:23:13 UTC (rev 13382)
@@ -166,7 +166,12 @@
'text' => lang('import_adjustments'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'rental.uiimport.import_regulations', 'appname' => 'rental') ),
'image' => array('rental',
'document-save')
- )
+ ),
+ 'custom_functions' => array
+ (
+ 'text' => lang('custom functions'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.ui_custom.list_custom_function','appname' => 'rental', 'location' =>
'.contract', 'menu_selection' => 'admin::rental::custom_functions') )
+ ),
);
$menus['folders'] =
phpgwapi_menu::get_categories('bergen');
Modified:
branches/Version-1_0-branch/rental/inc/class.socontract_price_item.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.socontract_price_item.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/rental/inc/class.socontract_price_item.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -298,7 +298,8 @@
public function get_total_price($contract_id){
$ts_query = strtotime(date('Y-m-d')); // timestamp for query
(today)
//$this->db->query("SELECT sum(rcpi.total_price::numeric) AS
sum_total FROM rental_contract_price_item rcpi, rental_price_item rpi WHERE
rpi.id = rcpi.price_item_id AND NOT rpi.is_one_time AND
rcpi.contract_id={$contract_id} AND ((rcpi.date_start <= {$ts_query} AND
rcpi.date_end >= {$ts_query}) OR (rcpi.date_start <= {$ts_query} AND
(rcpi.date_end is null OR rcpi.date_end = 0)) OR (rcpi.date_start is null AND
(rcpi.date_end >= {$ts_query} OR rcpi.date_end is null)))");
- $this->db->query("SELECT sum(total_price::numeric) AS sum_total
FROM rental_contract_price_item WHERE NOT is_one_time AND
contract_id={$contract_id}");
+// $this->db->query("SELECT sum(total_price::numeric) AS sum_total
FROM rental_contract_price_item WHERE NOT is_one_time AND
contract_id={$contract_id}");
+ $this->db->query("SELECT sum(total_price::numeric) AS sum_total
FROM rental_contract_price_item WHERE contract_id={$contract_id} AND (NOT
is_one_time OR NOT is_billed)");
if($this->db->next_record()){
$total_price = $this->db->f('sum_total');
return $total_price;
Modified: branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -677,6 +677,31 @@
{
$contract = new rental_contract();
$contract->set_location_id(phpgw::get_var('responsibility_id'));
+
$contract->set_account_in(rental_socontract::get_instance()->get_default_account($contract->get_location_id(),
true));
+
$contract->set_account_out(rental_socontract::get_instance()->get_default_account($contract->get_location_id(),
false));
+
$contract->set_executive_officer_id($GLOBALS['phpgw_info']['user']['account_id']);
+
+ $config = CreateObject('phpgwapi.config','rental');
+ $config->read();
+ $default_billing_term =
$config->config_data['default_billing_term'];
+
+ $contract->set_term_id($default_billing_term);
+
+ $units =
rental_socomposite::get_instance()->get_single(phpgw::get_var('id'))->get_units();
+ $location_code =
$units[0]->get_location()->get_location_code();
+
+ $args = array
+ (
+ 'acl_location' => '.contract',
+ 'location_code' => $location_code,
+ 'contract' => &$contract
+ );
+
+ $hook_helper = CreateObject('rental.hook_helper');
+ $hook_helper->add_contract_from_composite($args);
+
+ // _debug_array($contract); die();
+
if($contract->has_permission(PHPGW_ACL_EDIT))
{
$so_contract =
rental_socontract::get_instance();
Modified: branches/Version-1_0-branch/rental/inc/hook_config.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/hook_config.inc.php 2015-06-08
10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/rental/inc/hook_config.inc.php 2015-06-08
10:23:13 UTC (rev 13382)
@@ -212,3 +212,34 @@
}
return $out;
}
+
+ /**
+ * Get HTML radiobox with default billing term for new contracts
+ *
+ * @param $config
+ * @return string HTML checkboxes to be placed in a table
+ */
+ function default_billing_term($config)
+ {
+ phpgw::import_class('rental.sobilling');
+ $billing_terms =
rental_sobilling::get_instance()->get_billing_terms();
+ $term_assigned = isset($config['default_billing_term']) ?
$config['default_billing_term'] : array();
+ $lang_none = lang('none');
+ $out = "<tr><td><input type=\"radio\"
name=\"newsettings[default_billing_term]\"
value=\"\"><label>{$lang_none}</label></td></tr>";
+
+ foreach ( $billing_terms as $term_id => $_label)
+ {
+ $label =
$GLOBALS['phpgw']->translation->translate($_label, array(), false, 'rental');
+ $checked = '';
+ if ($term_id == $term_assigned)
+ {
+ $checked = ' checked';
+ }
+
+ $out .= <<<HTML
+ <tr><td><input type="radio"
name="newsettings[default_billing_term]" value="{$term_id}"
{$checked}><label>{$label}</label></td></tr>
+HTML;
+ }
+ return $out;
+ }
+
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-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/rental/inc/model/class.contract.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -256,7 +256,11 @@
$this->service_id = $service_id;
}
- public function get_service_id() { return $this->service_id; }
+ public function get_service_id()
+ {
+ //Add magic
+ return $this->service_id;
+ }
public function set_responsibility_id($responsibility_id)
{
Modified: branches/Version-1_0-branch/rental/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/default_records.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/rental/setup/default_records.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -34,7 +34,8 @@
//Create groups, users, add users to groups and set preferences
-$GLOBALS['phpgw']->locations->add('.', 'Root',
'rental',false);
+$GLOBALS['phpgw']->locations->add('.', 'Root',
'rental',false);
+$GLOBALS['phpgw']->locations->add('.contract', 'Contract','rental',
$allow_grant = false, $custom_tbl = false, $c_function = true);
$GLOBALS['phpgw']->locations->add('.ORG', 'Locations for
organisational units', 'rental',false);
$GLOBALS['phpgw']->locations->add('.ORG.BK', 'Organisational units
in Bergen Kommune', 'rental',false);
Modified: branches/Version-1_0-branch/rental/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/setup.inc.php 2015-06-08
10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/rental/setup/setup.inc.php 2015-06-08
10:23:13 UTC (rev 13382)
@@ -1,6 +1,6 @@
<?php
$setup_info['rental']['name'] = 'rental'; // Module
identifier
- $setup_info['rental']['version'] = '0.1.0.20'; // Current module
version
+ $setup_info['rental']['version'] = '0.1.0.21'; // Current module
version
$setup_info['rental']['app_order'] = 51; // (?)
$setup_info['rental']['tables'] = array(
'rental_party', // All
contract participants, tenants etc.
@@ -55,5 +55,4 @@
'config',
'menu' => 'rental.menu.get_menu',
'settings'
- );
-?>
+ );
\ No newline at end of file
Modified: branches/Version-1_0-branch/rental/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/tables_update.inc.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/rental/setup/tables_update.inc.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -8,52 +8,52 @@
function rental_upgrade0_0_27()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_party','org_enhet_id', array
('type' => 'int','precision' => 8, 'nullable' => true));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0';
function rental_upgrade0_1_0()
{
$GLOBALS['phpgw_setup']->oProc->AlterColumn('rental_contract','adjustment_share',array(
- 'type' => 'int',
+ 'type' => 'int',
'precision' => '4',
'nullable' => true,
'default' => 100
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.1';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.1';
function rental_upgrade0_1_0_1()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_adjustment','adjustment_type',
array('type' => 'varchar','precision' => '255','nullable' => true));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.2';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.2';
function rental_upgrade0_1_0_2()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_adjustment','is_executed',
array('type' => 'bool','nullable' => false,'default' => 'false'));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.3';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.3';
function rental_upgrade0_1_0_3()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_contract','publish_comment',
array('type' => 'bool','nullable' => true,'default' => 'false'));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.4';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.4';
function rental_upgrade0_1_0_4()
{
@@ -64,52 +64,52 @@
'rental.soadjustment.run_adjustments',
null
);
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.5';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.5';
function rental_upgrade0_1_0_5()
{
$GLOBALS['phpgw_setup']->oProc->AlterColumn('rental_notification_workbench','notification_id',array(
- 'type' => 'int',
+ 'type' => 'int',
'precision' => '4',
'nullable' => true
));
-
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_notification_workbench','workbench_message',
array('type' => 'text'));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.6';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.6';
function rental_upgrade0_1_0_6()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_invoice','serial_number',array(
- 'type' => 'int',
+ 'type' => 'int',
'precision' => '8',
'nullable' => true
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.7';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.7';
function rental_upgrade0_1_0_7()
{
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_price_item','standard',array(
- 'type' => 'bool',
+ 'type' => 'bool',
'nullable' => true,
'default' => 'false'
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.8';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.8';
function rental_upgrade0_1_0_8()
{
@@ -118,16 +118,16 @@
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.9';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.9';
function rental_upgrade0_1_0_9()
{
-
-
+
+
$sql = 'SELECT config_name,config_value FROM phpgw_config'
. " WHERE config_name = 'files_dir'"
. " OR config_name = 'file_repository'";
-
+
$GLOBALS['phpgw_setup']->oProc->query($sql, __LINE__, __FILE__);
while ( $GLOBALS['phpgw_setup']->oProc->next_record() )
{
@@ -135,22 +135,22 @@
}
$GLOBALS['phpgw']->db = & $GLOBALS['phpgw_setup']->oProc->m_odb;
$acl = CreateObject('phpgwapi.acl');
-
+
$admins = $acl->get_ids_for_location('run', 1, 'admin');
$GLOBALS['phpgw_info']['user']['account_id'] = $admins[0];
-
+
//used in vfs
define('PHPGW_ACL_READ',1);
define('PHPGW_ACL_ADD',2);
define('PHPGW_ACL_EDIT',4);
define('PHPGW_ACL_DELETE',8);
-
+
$GLOBALS['phpgw']->session =
createObject('phpgwapi.sessions');
-
+
//Prepare paths
$vfs = CreateObject('phpgwapi.vfs');
$vfs->override_acl = 1;
-
+
$path = "/rental";
$dir = array('string' => $path, RELATIVE_NONE);
if(!$vfs->file_exists($dir)){
@@ -159,7 +159,7 @@
return;
}
}
-
+
$path .= "/billings";
$dir = array('string' => $path, RELATIVE_NONE);
if(!$vfs->file_exists($dir)){
@@ -168,17 +168,17 @@
return;
}
}
-
+
$sql = "SELECT id, export_data FROM rental_billing";
$db = clone $GLOBALS['phpgw']->db;
$result = $db->query($sql, __LINE__, __FILE__);
-
+
while($db->next_record())
{
$id = $db->f('id',true);
$export_data = $db->f('export_data','string');
$file_path = $path."/{$id}";
- if($export_data != ""){
+ if($export_data != ""){
$result = $vfs->write
(
array
@@ -190,7 +190,7 @@
);
}
}
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.10';
return $GLOBALS['setup_info']['rental']['currentver'];
}
@@ -203,17 +203,17 @@
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.11';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.11';
function rental_upgrade0_1_0_11()
{
// Add adjustment year column
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_adjustment',
'year', array(
- 'type' => 'int',
+ 'type' => 'int',
'nullable' => true,
'precision' => '4'
));
-
+
// Update year column to match the adjustment_date of all
existing adjustments
$so = CreateObject('rental.soadjustment');
foreach ($so->get(0, NULL, NULL, true, NULL, NULL, NULL) as
$adjustment) {
@@ -221,11 +221,11 @@
$adjustment->set_year($year);
$so->store($adjustment);
}
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.12';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.12';
function rental_upgrade0_1_0_12()
{
@@ -236,11 +236,11 @@
'rental.uiparty.syncronize_party_name',
null
);
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.13';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.13';
function rental_upgrade0_1_0_13()
{
@@ -249,21 +249,21 @@
'precision' => 4,
'nullable' => 'True'
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.14';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
+
$test[] = '0.1.0.14';
function rental_upgrade0_1_0_14()
{
// Add unit_leader column
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_party',
'unit_leader', array(
- 'type' => 'varchar',
+ 'type' => 'varchar',
'nullable' => true,
'precision' => '255'
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.15';
return $GLOBALS['setup_info']['rental']['currentver'];
}
@@ -282,18 +282,18 @@
'rental.soparty.syncronize_party_name',
null
);
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.16';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
- $test[] = '0.1.0.16';
+
+ $test[] = '0.1.0.16';
function rental_upgrade0_1_0_16()
- {
+ {
$sql = "INSERT INTO rental_billing_term (title, months) VALUES
('free_of_charge','0')";
$db = clone $GLOBALS['phpgw']->db;
$result = $db->query($sql, __LINE__, __FILE__);
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.17';
return $GLOBALS['setup_info']['rental']['currentver'];
}
@@ -315,7 +315,7 @@
'fd' => array(
'id' => array('type' =>
'int','precision' => '4','nullable' => false),
'name' => array('type' =>
'varchar','precision' => '255','nullable' => false),
- 'factor' => array('type' => 'decimal', 'precision' =>
'20','scale' => '2', 'nullable' => true),
+ 'factor' => array('type' => 'decimal',
'precision' => '20','scale' => '2', 'nullable' => true),
),
'pk' => array('id'),
'fk' => array(),
@@ -354,17 +354,25 @@
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.19';
return $GLOBALS['setup_info']['rental']['currentver'];
}
-
- $test[] = '0.1.0.19';
+
+ $test[] = '0.1.0.19';
function rental_upgrade0_1_0_19()
{
// Add unit_leader column
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_adjustment',
'extra_adjustment', array(
- 'type' => 'bool',
+ 'type' => 'bool',
'nullable' => true,
'default' => 'false'
));
-
+
$GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.20';
return $GLOBALS['setup_info']['rental']['currentver'];
}
+
+ $test[] = '0.1.0.20';
+ function rental_upgrade0_1_0_20()
+ {
+
$GLOBALS['phpgw']->locations->add('.contract','Contract','rental', $allow_grant
= false, $custom_tbl = false, $c_function = true);
+ $GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.21';
+ return $GLOBALS['setup_info']['rental']['currentver'];
+ }
Modified: branches/Version-1_0-branch/rental/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/config.tpl
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/rental/templates/base/config.tpl
2015-06-08 10:23:13 UTC (rev 13382)
@@ -169,6 +169,16 @@
</table>
</td>
</tr>
+ <tr class="row_on">
+ <td valign = 'top'>{lang_default_billing_term}:</td>
+ <td>
+ <!--to be able to blank the setting - need an
empty value-->
+ <!--input type = 'hidden'
name="newsettings[default_billing_term]" value=""-->
+ <table>
+ {hook_default_billing_term}
+ </table>
+ </td>
+ </tr>
<!-- END body -->
<!-- BEGIN footer -->
Modified: branches/Version-1_0-branch/rental/templates/base/contract.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/contract.php
2015-06-08 10:14:42 UTC (rev 13381)
+++ branches/Version-1_0-branch/rental/templates/base/contract.php
2015-06-08 10:23:13 UTC (rev 13382)
@@ -319,7 +319,11 @@
</dt>
<dd>
<?php
- $executive_officer =
$contract->get_executive_officer_id();
+ if(!$executive_officer =
$contract->get_executive_officer_id())
+ {
+ $executive_officer =
$GLOBALS['phpgw_info']['user']['account_id'];
+ }
+
if($editable)
{
$location_name =
$contract->get_field_of_responsibility_name();
@@ -440,7 +444,11 @@
</dt>
<dd>
<?php
- $current_term_id =
$contract->get_term_id();
+ if(!$current_term_id =
$contract->get_term_id())
+ {
+ $current_term_id =
$config->config_data['default_billing_term'];
+ }
+
if ($editable)
{
?>
Modified: branches/Version-1_0-branch/setup/applications.php
===================================================================
--- branches/Version-1_0-branch/setup/applications.php 2015-06-08 10:14:42 UTC
(rev 13381)
+++ branches/Version-1_0-branch/setup/applications.php 2015-06-08 10:23:13 UTC
(rev 13382)
@@ -2,7 +2,7 @@
/**
* Setup
*
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @copyright Copyright (C) 2000-2015 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package setup
* @version $Id$
@@ -523,7 +523,7 @@
{
$setup_tpl->set_var('bg_class', "row_install_{$row}");
$status =
"[{$value['status']}] " . lang('Please install');
- if (
isset($value['tables']) && is_array($value['tables']) &&
$GLOBALS['phpgw_setup']->detection->check_app_tables($value['name'],True))
+ if (
isset($value['tables']) && is_array($value['tables']) && $value['tables'] &&
$GLOBALS['phpgw_setup']->detection->check_app_tables($value['name'],True))
{
// Some tables
missing
$setup_tpl->set_var('bg_class', "row_err_gen_{$row}");
@@ -608,4 +608,4 @@
$setup_tpl->pparse('out','app_footer');
$setup_tpl->pparse('out','footer');
$GLOBALS['phpgw_setup']->html->show_footer();
- }
+ }
\ No newline at end of file
Modified: branches/Version-1_0-branch/setup/applist.php
===================================================================
--- branches/Version-1_0-branch/setup/applist.php 2015-06-08 10:14:42 UTC
(rev 13381)
+++ branches/Version-1_0-branch/setup/applist.php 2015-06-08 10:23:13 UTC
(rev 13382)
@@ -103,5 +103,4 @@
$r = $c->send($logout);
$v = $r->value();
- $GLOBALS['phpgw_setup']->html->show_footer();
-?>
+ $GLOBALS['phpgw_setup']->html->show_footer();
\ No newline at end of file
Modified: branches/Version-1_0-branch/setup/bulk.php
===================================================================
--- branches/Version-1_0-branch/setup/bulk.php 2015-06-08 10:14:42 UTC (rev
13381)
+++ branches/Version-1_0-branch/setup/bulk.php 2015-06-08 10:23:13 UTC (rev
13382)
@@ -164,5 +164,4 @@
$setup_tpl->set_var('submit',lang('Upgrade'));
$setup_tpl->set_var('cancel',lang('Cancel'));
$setup_tpl->pparse('out','T_footer');
- $GLOBALS['phpgw_setup']->html->show_footer();
-?>
+ $GLOBALS['phpgw_setup']->html->show_footer();
\ No newline at end of file
Modified: branches/Version-1_0-branch/setup/config.php
===================================================================
--- branches/Version-1_0-branch/setup/config.php 2015-06-08 10:14:42 UTC
(rev 13381)
+++ branches/Version-1_0-branch/setup/config.php 2015-06-08 10:23:13 UTC
(rev 13382)
@@ -298,5 +298,4 @@
$setup_tpl->set_var('lang_cancel',lang('Cancel'));
$setup_tpl->pparse('out','T_config_post_script');
- $GLOBALS['phpgw_setup']->html->show_footer();
-?>
+ $GLOBALS['phpgw_setup']->html->show_footer();
\ No newline at end of file
Modified: branches/Version-1_0-branch/setup/index.php
===================================================================
--- branches/Version-1_0-branch/setup/index.php 2015-06-08 10:14:42 UTC (rev
13381)
+++ branches/Version-1_0-branch/setup/index.php 2015-06-08 10:23:13 UTC (rev
13382)
@@ -2,7 +2,7 @@
/**
* phpGroupWare Setup - http://phpGroupWare.org
*
- * @copyright Portions Copyright (C) 2000-2005 Free Software Foundation,
Inc. http://www.fsf.org/
+ * @copyright Portions Copyright (C) 2000-2015 Free Software Foundation,
Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package setup
* @version $Id$
Modified: branches/Version-1_0-branch/setup/ldap.php
===================================================================
--- branches/Version-1_0-branch/setup/ldap.php 2015-06-08 10:14:42 UTC (rev
13381)
+++ branches/Version-1_0-branch/setup/ldap.php 2015-06-08 10:23:13 UTC (rev
13382)
@@ -74,5 +74,4 @@
$setup_tpl->pfp('out','cancel_only');
$setup_tpl->pfp('out','footer');
- $GLOBALS['phpgw_setup']->html->show_footer();
-?>
+ $GLOBALS['phpgw_setup']->html->show_footer();
\ No newline at end of file
Modified: branches/Version-1_0-branch/setup/ldapexport.php
===================================================================
--- branches/Version-1_0-branch/setup/ldapexport.php 2015-06-08 10:14:42 UTC
(rev 13381)
+++ branches/Version-1_0-branch/setup/ldapexport.php 2015-06-08 10:23:13 UTC
(rev 13382)
@@ -349,4 +349,3 @@
$setup_tpl->pfp('out','footer');
$GLOBALS['phpgw_setup']->html->show_footer();
-?>
Modified: branches/Version-1_0-branch/setup/ldapimport.php
===================================================================
--- branches/Version-1_0-branch/setup/ldapimport.php 2015-06-08 10:14:42 UTC
(rev 13381)
+++ branches/Version-1_0-branch/setup/ldapimport.php 2015-06-08 10:23:13 UTC
(rev 13382)
@@ -537,5 +537,4 @@
$setup_tpl->pfp('out','submit');
$setup_tpl->pfp('out','footer');
- $GLOBALS['phpgw_setup']->html->show_footer();
-?>
+ $GLOBALS['phpgw_setup']->html->show_footer();
\ No newline at end of file
Modified: branches/Version-1_0-branch/setup/ldapmodify.php
===================================================================
--- branches/Version-1_0-branch/setup/ldapmodify.php 2015-06-08 10:14:42 UTC
(rev 13381)
+++ branches/Version-1_0-branch/setup/ldapmodify.php 2015-06-08 10:23:13 UTC
(rev 13382)
@@ -430,4 +430,3 @@
$setup_tpl->pfp('out','footer');
$GLOBALS['phpgw_setup']->html->show_footer();
-?>
Modified: branches/Version-1_0-branch/setup/schematoy.php
===================================================================
--- branches/Version-1_0-branch/setup/schematoy.php 2015-06-08 10:14:42 UTC
(rev 13381)
+++ branches/Version-1_0-branch/setup/schematoy.php 2015-06-08 10:23:13 UTC
(rev 13382)
@@ -281,4 +281,3 @@
$GLOBALS['setup_tpl']->pparse('out','app_footer');
$GLOBALS['setup_tpl']->pparse('out','footer');
$GLOBALS['phpgw_setup']->html->show_footer();
-?>
Modified: branches/Version-1_0-branch/setup/sqltoarray.php
===================================================================
--- branches/Version-1_0-branch/setup/sqltoarray.php 2015-06-08 10:14:42 UTC
(rev 13381)
+++ branches/Version-1_0-branch/setup/sqltoarray.php 2015-06-08 10:23:13 UTC
(rev 13382)
@@ -301,4 +301,3 @@
}
$setup_tpl->pfp('out','appfooter');
}
-?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13382] Merge 13366:13381 from trunk,
Sigurd Nes <=