[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11707] Merge 11692:11706 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11707] Merge 11692:11706 from trunk |
|
Date: |
Sat, 15 Feb 2014 16:42:35 +0000 |
Revision: 11707
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11707
Author: sigurdne
Date: 2014-02-15 16:42:35 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
Merge 11692:11706 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/header.inc.php.template
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/cron/class.cron_parent.inc.php
branches/Version-1_0-branch/setup/manageheader.php
branches/Version-1_0-branch/setup/templates/base/manageheader.tpl
Added Paths:
-----------
branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email_18_1.php
branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email_3_1.php
branches/Version-1_0-branch/catch/inc/custom/default/pdf_3_1.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691
+
/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
Copied:
branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email_18_1.php
(from rev 11706, trunk/catch/inc/custom/default/notify_by_email_18_1.php)
===================================================================
---
branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email_18_1.php
(rev 0)
+++
branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email_18_1.php
2014-02-15 16:42:35 UTC (rev 11707)
@@ -0,0 +1,188 @@
+<?php
+ $validator = CreateObject('phpgwapi.EmailAddressValidator');
+
+ if(isset($config_data['notify_email']) && $config_data['notify_email'])
+ {
+ $to_array = array();
+ $_to_array = explode(',', $config_data['notify_email']);
+
+ if(isset($config_data['notify_rule']) &&
$config_data['notify_rule'])
+ {
+ $notify_rule = explode(',',
$config_data['notify_rule']);
+ foreach($notify_rule as $_rule)
+ {
+ $__rule = explode('=>', $_rule);
+ $___rule = explode(';', trim($__rule[1]));
+ if($__rule)
+ {
+ $_condition = explode('=', $__rule[0]);
+ if($_condition)
+ {
+ $this->db->query("SELECT * FROM
$target_table WHERE id = {$id} AND " . trim($_condition[0]) . "='" .
trim($_condition[1]) . "'", __LINE__, __FILE__);
+ if($this->db->next_record())
+ {
+ foreach($___rule as
$____rule)
+ {
+
if(isset($_to_array[($____rule - 1)]))
+ {
+
$to_array[] = $_to_array[($____rule - 1)];
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ $to_array = $_to_array;
+ }
+
+ $to_array = array_unique($to_array);
+
+ //_debug_array($to_array);
+
+ $socommon = CreateObject('property.socommon');
+ $prefs = $socommon->create_preferences('property',
$user_id);
+
+ if($validator->check_email_address($prefs['email']))
+ {
+ $account_name =
$GLOBALS['phpgw']->accounts->id2name($user_id);
+ // avoid problems with the delimiter in the send class
+ if(strpos($account_name, ','))
+ {
+ $_account_name = explode(',', $account_name);
+ $account_name = ltrim($_account_name[1]) . '
' . $_account_name[0];
+ }
+ $from_email = "{$account_name}<{$prefs['email']}>";
+
+ $to_array[] = $from_email;
+ }
+
+ if(!is_object($GLOBALS['phpgw']->send))
+ {
+ $GLOBALS['phpgw']->send = CreateObject('phpgwapi.send');
+ }
+
+ $_to = implode(';', $to_array);
+
+ $from_name = 'noreply';
+ $from_email = isset($from_email) && $from_email ?
$from_email : "{$from_name}<address@hidden>";
+ $cc = '';
+ $bcc = '';
+ $subject = "{$schema_text}::{$id}";
+
+ // Include something in subject
+ if(isset($config_data['email_include_in_subject']) &&
$config_data['email_include_in_subject'])
+ {
+ $params = explode('=>',
$config_data['email_include_in_subject']);
+ $_metadata = $this->db->metadata($target_table);
+ if(isset($_metadata[$params[1]]))
+ {
+ $this->db->query("SELECT {$params[1]} FROM
$target_table WHERE id = {$id}", __LINE__, __FILE__);
+ if($this->db->next_record())
+ {
+ $subject .= "::{$params[0]} " .
$this->db->f($params[1]);
+ }
+ }
+ unset($_metadata);
+ }
+
+ unset($_link_to_item);
+
+ if(isset($config_data['email_message']) &&
$config_data['email_message'])
+ {
+ $body = str_replace(array('[', ']'), array('<', '>'),
$config_data['email_message']);
+ }
+ else
+ {
+ $body = "<H2>Det er registrert ny post i
{$schema_text}</H2>";
+ }
+
+ $jasper_id = isset($config_data['jasper_id']) &&
$config_data['jasper_id'] ? $config_data['jasper_id'] : 0;
+
+ $attachments = array();
+
+ if(!$jasper_id)
+ {
+ $this->receipt['error'][] = array('msg' =>
lang('notify_by_email: missing "jasper_id" in config for catch %1 schema',
$schema_text));
+ }
+ else
+ {
+ $jasper_parameters = '';
+ $_parameters = array();
+
+ $_parameters[] = "ID|{$id}";
+ $jasper_parameters = '"' . implode(';',
$_parameters) . '"';
+
+ unset($_parameters);
+
+ $output_type = 'PDF';
+ $values_jasper =
execMethod('property.bojasper.read_single', $jasper_id);
+ $report_source =
"{$GLOBALS['phpgw_info']['server']['files_dir']}/property/jasper/{$jasper_id}/{$values_jasper['file_name']}";
+ $jasper_wrapper =
CreateObject('phpgwapi.jasper_wrapper');
+
+ try
+ {
+ $report =
$jasper_wrapper->execute($jasper_parameters, $output_type, $report_source,
true);
+ }
+ catch(Exception $e)
+ {
+ $error = $e->getMessage();
+ echo "<H1>{$error}</H1>";
+ }
+
+ $jasper_fname =
tempnam($GLOBALS['phpgw_info']['server']['temp_dir'], 'PDF_') . '.pdf';
+ file_put_contents($jasper_fname, $report['content'],
LOCK_EX);
+
+ $attachments[] = array
+ (
+ 'file' => $jasper_fname,
+ 'name' => $report['filename'],
+ 'type' => $report['mime']
+ );
+
+ if($attachments)
+ {
+ $body .= "</br>Rapport vedlagt";
+ }
+ }
+
+ $this->db->query("SELECT kontraktsnummer, leie_opphore_fra_dato
FROM $target_table WHERE id = {$id}", __LINE__, __FILE__);
+ $this->db->next_record();
+ $_kontraktsnummer = $this->db->f('kontraktsnummer');
+ $_utflyttingsdato =
$this->db->f('leie_opphore_fra_dato');
+ if($_utflyttingsdato)
+ {
+ $this->db->query("SELECT id, num, utflyttingsdato FROM
fm_catch_3_1 WHERE kontraktsnummer = '{$_kontraktsnummer}'", __LINE__,
__FILE__);
+ if($this->db->next_record())
+ {
+ $_num_3_1 = $this->db->f('num');
+ $_id_3_1 = $this->db->f('id');
+ $_old_utflyttingsdato =
$this->db->f('utflyttingsdato');
+
+ $this->db->query("UPDATE fm_catch_3_1 SET
utflyttingsdato = '{$_utflyttingsdato}' WHERE id = '{$_id_3_1}'", __LINE__,
__FILE__);
+
+ $body .= "</br></br>Utflyttingsdato oppdatert
fra {$_old_utflyttingsdato} til {$_utflyttingsdato} for inneflyttemelding
{$_num_3_1}";
+
+ }
+ else
+ {
+ $body .= "</br></br>Fant ikke inneflyttemelding
for kontraktsnummer {$_kontraktsnummer}";
+
+ }
+ }
+ else
+ {
+ $body .= "</br>Utflyttingsdato ikke angitt";
+ }
+
+ if($_to && $GLOBALS['phpgw']->send->msg('email', $_to,
$subject, stripslashes($body), '', $cc, $bcc, $from_email, $from_name, 'html',
'', $attachments, true))
+ {
+ $this->receipt['message'][] = array('msg' => "email
notification sent to: {$_to}");
+ }
+ if(isset($jasper_fname) && is_file($jasper_fname))
+ {
+ unlink($jasper_fname);
+ }
+ }
Copied:
branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email_3_1.php
(from rev 11706, trunk/catch/inc/custom/default/notify_by_email_3_1.php)
===================================================================
---
branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email_3_1.php
(rev 0)
+++
branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email_3_1.php
2014-02-15 16:42:35 UTC (rev 11707)
@@ -0,0 +1,158 @@
+<?php
+ $validator = CreateObject('phpgwapi.EmailAddressValidator');
+
+ if(isset($config_data['notify_email']) && $config_data['notify_email'])
+ {
+ $to_array = array();
+ $_to_array = explode(',', $config_data['notify_email']);
+
+ if(isset($config_data['notify_rule']) &&
$config_data['notify_rule'])
+ {
+ $notify_rule = explode(',',
$config_data['notify_rule']);
+ foreach($notify_rule as $_rule)
+ {
+ $__rule = explode('=>', $_rule);
+ $___rule = explode(';', trim($__rule[1]));
+ if($__rule)
+ {
+ $_condition = explode('=', $__rule[0]);
+ if($_condition)
+ {
+ $this->db->query("SELECT * FROM
$target_table WHERE id = {$id} AND " . trim($_condition[0]) . "='" .
trim($_condition[1]) . "'", __LINE__, __FILE__);
+ if($this->db->next_record())
+ {
+ foreach($___rule as
$____rule)
+ {
+
if(isset($_to_array[($____rule - 1)]))
+ {
+
$to_array[] = $_to_array[($____rule - 1)];
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ $to_array = $_to_array;
+ }
+
+ $to_array = array_unique($to_array);
+
+ //_debug_array($to_array);
+
+ $socommon = CreateObject('property.socommon');
+ $prefs = $socommon->create_preferences('property',
$user_id);
+
+ if($validator->check_email_address($prefs['email']))
+ {
+ $account_name =
$GLOBALS['phpgw']->accounts->id2name($user_id);
+ // avoid problems with the delimiter in the send class
+ if(strpos($account_name, ','))
+ {
+ $_account_name = explode(',', $account_name);
+ $account_name = ltrim($_account_name[1]) . '
' . $_account_name[0];
+ }
+ $from_email = "{$account_name}<{$prefs['email']}>";
+
+ $to_array[] = $from_email;
+ }
+
+ if(!is_object($GLOBALS['phpgw']->send))
+ {
+ $GLOBALS['phpgw']->send = CreateObject('phpgwapi.send');
+ }
+
+ $_to = implode(';', $to_array);
+
+ $from_name = 'noreply';
+ $from_email = isset($from_email) && $from_email ?
$from_email : "{$from_name}<address@hidden>";
+ $cc = '';
+ $bcc = '';
+ $subject = "{$schema_text}::{$id}";
+
+ // Include something in subject
+ if(isset($config_data['email_include_in_subject']) &&
$config_data['email_include_in_subject'])
+ {
+ $params = explode('=>',
$config_data['email_include_in_subject']);
+ $_metadata = $this->db->metadata($target_table);
+ if(isset($_metadata[$params[1]]))
+ {
+ $this->db->query("SELECT {$params[1]} FROM
$target_table WHERE id = {$id}", __LINE__, __FILE__);
+ if($this->db->next_record())
+ {
+ $subject .= "::{$params[0]} " .
$this->db->f($params[1]);
+ }
+ }
+ unset($_metadata);
+ }
+
+ unset($_link_to_item);
+
+ if(isset($config_data['email_message']) &&
$config_data['email_message'])
+ {
+ $body = str_replace(array('[', ']'), array('<', '>'),
$config_data['email_message']);
+ }
+ else
+ {
+ $body = "<H2>Det er registrert ny post i
{$schema_text}</H2>";
+ }
+
+ $_duplicate_num = '';
+
+ $this->db->query("SELECT kontraktsnummer FROM $target_table
WHERE id = {$id}", __LINE__, __FILE__);
+ if($this->db->next_record())
+ {
+ $_kontraktsnummer =
$this->db->f('kontraktsnummer');
+ $this->db->query("SELECT num FROM $target_table WHERE
id != {$id} AND kontraktsnummer = '{$_kontraktsnummer}'", __LINE__, __FILE__);
+ $this->db->next_record();
+ $_duplicate_num = $this->db->f('num');
+ }
+
+ $attachments = array();
+
+ require_once PHPGW_SERVER_ROOT .
"/catch/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/pdf_3_1.php";
+
+ $pdf = new pdf_3_1();
+
+ try
+ {
+ $report = $pdf->get_document($id, $_duplicate_num);
+ }
+ catch(Exception $e)
+ {
+ $error = $e->getMessage();
+ echo "<H1>{$error}</H1>";
+ }
+
+ if($_duplicate_num)
+ {
+ $this->db->query("DELETE FROM $target_table WHERE id =
{$id}", __LINE__, __FILE__);
+ }
+
+ $report_fname =
tempnam($GLOBALS['phpgw_info']['server']['temp_dir'], 'PDF_') . '.pdf';
+ file_put_contents($report_fname, $report, LOCK_EX);
+
+ $attachments[] = array
+ (
+ 'file' => $report_fname,
+ 'name' => "NLSH_melding_om_innflytting_{$id}.pdf",
+ 'type' => 'application/pdf'
+ );
+
+ if($attachments)
+ {
+ $body .= "</br>Se vedlegg";
+ }
+
+
+ if($_to && $GLOBALS['phpgw']->send->msg('email', $_to,
$subject, stripslashes($body), '', $cc, $bcc, $from_email, $from_name, 'html',
'', $attachments, true))
+ {
+ $this->receipt['message'][] = array('msg' => "email
notification sent to: {$_to}");
+ }
+ if(isset($report_fname) && is_file($report_fname))
+ {
+ unlink($report_fname);
+ }
+ }
\ No newline at end of file
Copied: branches/Version-1_0-branch/catch/inc/custom/default/pdf_3_1.php (from
rev 11706, trunk/catch/inc/custom/default/pdf_3_1.php)
===================================================================
--- branches/Version-1_0-branch/catch/inc/custom/default/pdf_3_1.php
(rev 0)
+++ branches/Version-1_0-branch/catch/inc/custom/default/pdf_3_1.php
2014-02-15 16:42:35 UTC (rev 11707)
@@ -0,0 +1,238 @@
+<?php
+ /**
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare 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.
+ *
+ * phpGroupWare 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 phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
+ * @package property
+ * @version $Id$
+ */
+
+ /**
+ * Custom class for catch_3_1
+ *
+ */
+
+ class pdf_3_1
+ {
+
+ var $preview = false;
+
+
+ public function __construct()
+ {
+
+
+ }
+
+
+ /**
+ * Produce the document for a specified record
+ * @param type $id
+ * @return string document
+ */
+ public function get_document($id = 0, $_duplicate='')
+ {
+ if(!$id)
+ {
+ return false;
+ }
+
+ $sql = "SELECT * FROM fm_catch_3_1 WHERE id ='{$id}'";
+ $GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
+ $GLOBALS['phpgw']->db->next_record();
+ $values = $GLOBALS['phpgw']->db->Record;
+
+//_debug_array($values);
+//die();
+
+ $config =
CreateObject('phpgwapi.config','property');
+
+ $config->read();
+
+ $pdf = CreateObject('phpgwapi.pdf');
+ $pdf -> ezSetMargins(50,70,50,50);
+ $pdf->selectFont(PHPGW_API_INC .
'/pdf/fonts/Helvetica.afm');
+
+ // put a line top and bottom on all the pages
+ $all = $pdf->openObject();
+ $pdf->saveState();
+
+
+ if(isset($config->config_data['order_logo']) &&
$config->config_data['order_logo'])
+ {
+
$pdf->addJpegFromFile($config->config_data['order_logo'],
+ 40,
+ 800,
+
isset($config->config_data['order_logo_width']) &&
$config->config_data['order_logo_width'] ?
$config->config_data['order_logo_width'] : 80
+ );
+ }
+
+ $pdf->setStrokeColor(0,0,0,1);
+ $pdf->line(20,40,578,40);
+ // $pdf->line(20,820,578,820);
+ // $pdf->addText(50,823,6,lang('order'));
+ $pdf->addText(50,28,6,$config->config_data['org_name']);
+ $pdf->addText(300,28,6,$date);
+
+ if($_duplicate)
+ {
+ $pdf->setColor(1,0,0);
+ $pdf->addText(50,400,30,"Dette er en duplikat
av {$_duplicate}",-10);
+ $pdf->addText(50,350,30," - og er
slettet!",-10);
+ }
+
+ $pdf->restoreState();
+ $pdf->closeObject();
+ // note that object can be told to appear on just odd
or even pages by changing 'all' to 'odd'
+ // or 'even'.
+ $pdf->addObject($all,'all');
+
+ // $pdf->ezSetDy(-100);
+
+ $pdf->ezStartPageNumbers(500,28,6,'right','{PAGENUM} '
. lang('of') . ' {TOTALPAGENUM}',1);
+
+ $data = array
+ (
+ array
+ (
+
'col1'=>"{$config->config_data['org_name']}\n\nOrg.nr:
{$config->config_data['org_unit_id']}",
+ 'col2'=>'MELDING OM INNFLYTTING',
+ 'col3'=> 'Melding Nr:' . "\n\n{$id}"
+ )
+ );
+
+
$pdf->ezTable($data,array('col1'=>'','col2'=>'','col3'=>''),''
+ ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0
+ ,'xOrientation'=>'right','width'=>500
+ ,'cols'=>array
+ (
+
'col1'=>array('justification'=>'right','width'=>200, 'justification'=>'left'),
+
'col2'=>array('justification'=>'right','width'=>100, 'justification'=>'center'),
+
'col3'=>array('justification'=>'right','width'=>200),
+ )
+
+ ));
+
+ $address = 'Tildelt Leilighet:';
+ $address_element =
execMethod('property.botts.get_address_element', $values['location_code']);
+ foreach($address_element as $entry)
+ {
+ $address .= "\n {$entry['text']}:
{$entry['value']}";
+ }
+
+ $text = "Kontrakt: {$values['kontraktsnummer']}";
+ $text .= "\n\nLeietaker:";
+ $text .= "{$values['navn_leietaker']}";
+ $text .= "\n\n{$address}";
+ $text .= "\n\nFødselsdato:";
+ $text .= " {$values['foedselsdato']}";
+ $text .= "\n\nAvd:";
+ $text .= " {$values['avdeling']}";
+ $text .= "\n\nTlf:";
+ $text .= " {$values['telefonnummer']}";
+ $text .= "\n\nInnbetaling av leie:";
+ $text .= " {$values['innbetaling_av_leie']}";
+ $text .= "\n\nFaktura sendes til:";
+ $text .= " {$values['faktura_sendes_til']}";
+ $text .= "\n\nFakturaadresse:";
+ $text .= " {$values['fakturaadresse']}";
+ $text .= "\n\nKostnadssted:";
+ $text .= " {$values['kostnadssted']}";
+ $text .= "\n\nFirmaadresse:";
+ $text .= " {$values['firmaadresse']}\n\n";
+
+ $text .= <<<TXT
+1. Innflyttingsdato: {$values['innflyttingsdato']}
+Boligtype: {$values['boligtype']}
+
+2. Utflyttingsdato: {$values['utflyttingsdato']}
+
+3. Utlevert antall nøkler: {$values['utlevert_ant_nokler']}
+Boligareal (m2): {$values['boligareal']}
+
+4. Langtidsleie:
+Husleien er ved kontraktsinngåelsen fastsatt til kr
{$values['husleie_pr_mnd']} pr mnd og kan endres iht konsumprisindeksen
tidligst et år etter at sist leiefastsetting ble satt i verk.
+
+Det innbetales forskuddsvis leie (kr): {$values['innbetaling_forskudd']}
+
+5. Kortidsleie:
+Antall leiedøgn: {$values['antall_leiedoegn']}
+Klargjøring boenheter (kr): {$values['klargjoering_av_boenhet']}
+Leie pr døgn (kr): {$values['leie_pr_doegn']}
+Sengetøy/håndduker kr/døgn: {$values['sengetoey_handduker']}
+Samlet leie ved korttidsleie er fastsatt til kr:
{$values['samlet_korttidsleie']}
+
+6. Strømab registreres på: {$values['strommaaler_registreres_paa']}
+
+7. Innbo: {$values['innbo']}
+Målerstand: {$values['maalerstand_kwh']}
+Målernr: {$values['maalernummer']}
+Annet innbo: {$values['annet_innbo']}
+Vedlagt inventarliste: {$values['inventarliste_vedlagt_kontrakt']}
+
+8. Boligstandard ved innflytting: {$values['bolig_standard_ved_innflytting']}
+
+9. Tilstand spesielt: {$values['tilstand_spesielt']}
+
+Merknader: {$values['merknader_tilstand']}
+
+10. Jeg er kjent med at skade på leiligheten, mangler, dårlig renhold o.l. ved
utflytting blir belastet meg som leietaker
+
+Dato:
+TXT;
+
+
+ $pdf->ezSetDy(-20);
+ $pdf->ezText($text,12);
+ $pdf->ezSetDy(-40);
+
+
+ $data = array
+ (
+ array('col1'=>"Sign
leietaker:\n\n\n{$values['navn_leietaker']}",'col2' =>
"Boligforvalter:\n\n\n{$values['boligforvalter']}"),
+ );
+
+ $pdf->ezTable($data,array('col1'=>'','col2'=>''),''
+ ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0
+
,'xOrientation'=>'right','width'=>500,'showLines'=> 0
+ ,'cols'=>array
+ (
+ 'col1' =>array('justification' =>
'right', 'width' => 250, 'justification' => 'left'),
+ 'col2' => array('justification' =>
'right', 'width' => 250, 'justification' => 'left'),
+ )
+
+ ));
+
+ $document= $pdf->ezOutput();
+
+ if($this->preview)
+ {
+
$pdf->print_pdf($document,"NLSH_melding_om_innflytting_{$id}");
+ }
+ else
+ {
+ return $document;
+ }
+
+ }
+
+ }
\ No newline at end of file
Modified: branches/Version-1_0-branch/header.inc.php.template
===================================================================
--- branches/Version-1_0-branch/header.inc.php.template 2014-02-15 16:36:09 UTC
(rev 11706)
+++ branches/Version-1_0-branch/header.inc.php.template 2014-02-15 16:42:35 UTC
(rev 11707)
@@ -115,6 +115,25 @@
$GLOBALS['phpgw_info']['login_template_set'] = 'simple';
/**
+ * @global string $phpgw_info['login_left_message']
+ * An optional text to be displayed to the left on the login form.
+ * FORMATTING HAS TO BE EDITED MANUALLY (links and linebreak)
+ */
+ $GLOBALS['phpgw_info']['login_left_message'] = <<<HTML
+{LOGIN_LEFT_MESSAGE}
+HTML;
+
+ /**
+ * @global string $phpgw_info['login_right_message']
+ * An optional text to be displayed to the right on the login form.
+ * FORMATTING HAS TO BE EDITED MANUALLY (links and linebreak)
+ */
+ $GLOBALS['phpgw_info']['login_right_message'] = <<<HTML
+{LOGIN_RIGHT_MESSAGE}
+HTML;
+
+
+ /**
* @global boolean $phpgw_info['server']['mcrypt_enabled']
* This is used to control mcrypt's use
*/
@@ -215,7 +234,7 @@
* @global string $phpgw_info['server']['versions']['header']
* Version of this header file
*/
- $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.31';
+ $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.32';
if ( !isset($GLOBALS['phpgw_info']['flags']['noapi'])
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2014-02-15 16:36:09 UTC (rev 11706)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2014-02-15 16:42:35 UTC (rev 11707)
@@ -956,7 +956,7 @@
{
case 'workorder':
$GLOBALS['phpgw']->db->query("SELECT id FROM fm_workorder WHERE
status='{$status_code[$entry]}' AND id = {$id}");
-
if(!$this->db->next_record())
+
if(!$GLOBALS['phpgw']->db->next_record())
{
$historylog_workorder->add($entry, $id, $status_code[$entry]);
$GLOBALS['phpgw']->db->query("UPDATE fm_workorder set
status='{$status_code[$entry]}' WHERE id = {$id}");
@@ -2581,4 +2581,4 @@
return $invoice_num;
}
- }
\ No newline at end of file
+ }
Modified:
branches/Version-1_0-branch/property/inc/cron/class.cron_parent.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/cron/class.cron_parent.inc.php
2014-02-15 16:36:09 UTC (rev 11706)
+++ branches/Version-1_0-branch/property/inc/cron/class.cron_parent.inc.php
2014-02-15 16:42:35 UTC (rev 11707)
@@ -154,7 +154,7 @@
$cron,
date($this->db->datetime_format()),
$this->function_name,
-
$this->db->db_addslashes(implode(',',(array_keys($msgbox_data))))
+
$this->db->db_addslashes(implode('::',(array_keys($msgbox_data))))
);
$insert_values =
$this->db->validate_insert($insert_values);
Modified: branches/Version-1_0-branch/setup/manageheader.php
===================================================================
--- branches/Version-1_0-branch/setup/manageheader.php 2014-02-15 16:36:09 UTC
(rev 11706)
+++ branches/Version-1_0-branch/setup/manageheader.php 2014-02-15 16:42:35 UTC
(rev 11707)
@@ -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-2014 Free Software Foundation,
Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package setup
* @version $Id$
@@ -647,7 +647,11 @@
// $setup_tpl->set_var('header_admin_password',
isset($GLOBALS['phpgw_info']['server']['header_admin_password']) ?
$GLOBALS['phpgw_info']['server']['header_admin_password'] : '');
$setup_tpl->set_var('system_name',
isset($GLOBALS['phpgw_info']['server']['system_name']) ?
$GLOBALS['phpgw_info']['server']['system_name'] : 'Portico Estate');
$setup_tpl->set_var('default_lang',
isset($GLOBALS['phpgw_info']['server']['default_lang']) ?
$GLOBALS['phpgw_info']['server']['default_lang'] : phpgw::get_var('ConfigLang',
'string', 'POST'));
+ $setup_tpl->set_var('login_left_message',
$GLOBALS['phpgw_info']['login_left_message']);
+ $setup_tpl->set_var('login_right_message',
$GLOBALS['phpgw_info']['login_right_message']);
+
+
if (
isset($GLOBALS['phpgw_info']['server']['db_persistent']) &&
$GLOBALS['phpgw_info']['server']['db_persistent'] )
{
$setup_tpl->set_var('db_persistent_yes','
selected');
@@ -745,6 +749,8 @@
$setup_tpl->set_var('lang_includeroot',lang('Include
Root (this should be the same as Server Root unless you know what you are
doing)'));
$setup_tpl->set_var('lang_adminpass',lang('Admin
password to header manager'));
$setup_tpl->set_var('lang_system_name',lang('System
name'));
+
$setup_tpl->set_var('lang_login_left_message',lang('login left message'));
+
$setup_tpl->set_var('lang_login_right_message',lang('login right message'));
$setup_tpl->set_var('lang_dbhost',lang('DB Host'));
$setup_tpl->set_var('lang_dbhostdescr',lang('Hostname/IP of database server'));
$setup_tpl->set_var('lang_dbname',lang('DB Name'));
@@ -781,4 +787,3 @@
$setup_tpl->pfp('out','manageheader');
// ending the switch default
}
-?>
Modified: branches/Version-1_0-branch/setup/templates/base/manageheader.tpl
===================================================================
--- branches/Version-1_0-branch/setup/templates/base/manageheader.tpl
2014-02-15 16:36:09 UTC (rev 11706)
+++ branches/Version-1_0-branch/setup/templates/base/manageheader.tpl
2014-02-15 16:42:35 UTC (rev 11707)
@@ -22,6 +22,18 @@
<b>{lang_system_name}</b><br><input type="text"
name="setting[system_name]" size="80" value="{system_name}">
</td>
</tr>
+ <tr>
+ <td colspan="2">
+ <b>{lang_login_left_message} - FORMATTING HAS TO BE EDITED MANUALLY in
the resulting header.inc.php</b><br>
+ <textarea cols="80" rows="4" name="setting[login_left_message]"
wrap="virtual">{login_left_message}</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <b>{lang_login_right_message} - FORMATTING HAS TO BE EDITED MANUALLY in
the resulting header.inc.php</b><br>
+ <textarea cols="80" rows="4" name="setting[login_right_message]"
wrap="virtual">{login_right_message}</textarea>
+ </td>
+ </tr>
<br><br>
<tr>
<td><b>{lang_persist}</b><br>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11707] Merge 11692:11706 from trunk,
Sigurd Nes <=