[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11054] Merge 11041:11053 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11054] Merge 11041:11053 from trunk |
Date: |
Thu, 11 Apr 2013 11:32:16 +0000 |
Revision: 11054
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11054
Author: sigurdne
Date: 2013-04-11 11:32:15 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
Merge 11041:11053 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/bookingfrontend/setup/setup.inc.php
branches/Version-1_0-branch/mobilefrontend/setup/setup.inc.php
branches/Version-1_0-branch/mobilefrontend/setup/tables_update.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.login.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ofphpgwapi.inc.php
branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-1_0-branch/property/inc/class.soagreement.inc.php
branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
branches/Version-1_0-branch/property/inc/class.solocation.inc.php
branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
branches/Version-1_0-branch/property/templates/base/agreement.xsl
branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
branches/Version-1_0-branch/mobilefrontend/inc/class.menu.inc.php
branches/Version-1_0-branch/mobilefrontend/templates/base/config.tpl
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.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
+
/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
Modified: branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -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')
+ 'versions' =>
array('0.2.05','0.2.06','0.2.07','0.2.08','0.2.09','0.2.10', '0.2.11')
);
$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
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -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')
+ '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')
);
$setup_info['activitycalendarfrontend']['depends'][] = array(
@@ -41,4 +41,3 @@
'menu' => 'activitycalendarfrontend.menu.get_menu',
'config'
);
-?>
Modified: branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -21,7 +21,7 @@
$setup_info['bookingfrontend']['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')
+ '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')
);
$setup_info['bookingfrontend']['depends'][] = array(
@@ -35,4 +35,3 @@
'menu' => 'bookingfrontend.menu.get_menu',
'config'
);
-?>
Copied:
branches/Version-1_0-branch/mobilefrontend/inc/class.hook_helper.inc.php (from
rev 11053, trunk/mobilefrontend/inc/class.hook_helper.inc.php)
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
(rev 0)
+++ branches/Version-1_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -0,0 +1,54 @@
+<?php
+ /**
+ * Mobilefrontend - Hook helper
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2013 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @package controller
+ * @version $Id: class.hook_helper.inc.php 10919 2013-02-18 14:47:02Z
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 controller
+ */
+ class mobilefrontend_hook_helper
+ {
+ /**
+ * set auth_type for custom login - called from login
+ *
+ * @return void
+ */
+ public function set_auth_type()
+ {
+ //get from local config
+
+ $config =
CreateObject('phpgwapi.config','mobilefrontend');
+ $config->read();
+
+ if(isset($config->config_data['auth_type']) &&
$config->config_data['auth_type'])
+ {
+ $GLOBALS['phpgw_info']['server']['auth_type'] =
$config->config_data['auth_type'];
+ }
+
+//_debug_array($GLOBALS['phpgw_info']['server']);die();
+ }
+ }
Copied: branches/Version-1_0-branch/mobilefrontend/inc/class.menu.inc.php (from
rev 11053, trunk/mobilefrontend/inc/class.menu.inc.php)
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/inc/class.menu.inc.php
(rev 0)
+++ branches/Version-1_0-branch/mobilefrontend/inc/class.menu.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -0,0 +1,27 @@
+<?php
+ class mobilefrontend_menu
+ {
+ function get_menu()
+ {
+ $incoming_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $GLOBALS['phpgw_info']['flags']['currentapp'] =
'mobilefrontend';
+
+ $menus = array();
+
+ if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin')
+ || $GLOBALS['phpgw']->acl->check('admin',
phpgwapi_acl::ADD, 'mobilefrontend'))
+ {
+ $menus['admin'] = array
+ (
+ 'index' => array
+ (
+ 'text' =>
lang('Configuration'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiconfig.index', 'appname' => 'mobilefrontend') )
+ ),
+ );
+ }
+
+ $GLOBALS['phpgw_info']['flags']['currentapp'] =
$incoming_app;
+ return $menus;
+ }
+ }
Modified: branches/Version-1_0-branch/mobilefrontend/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/setup/setup.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/mobilefrontend/setup/setup.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -12,7 +12,7 @@
*/
$setup_info['mobilefrontend']['name'] = 'mobilefrontend';
- $setup_info['mobilefrontend']['version'] = '0.1.1';
+ $setup_info['mobilefrontend']['version'] = '0.1.2';
$setup_info['mobilefrontend']['app_order'] = 80;
$setup_info['mobilefrontend']['enable'] = 1;
$setup_info['mobilefrontend']['app_group'] = 'office';
@@ -36,6 +36,7 @@
<b>Mobilefrontend</b> for:
<ol>
<li>Conntroller</li>
+ <li>Property::tickets</li>
</ol>
<b>Mobilefrontend</b> is organized as a set of submodules as extensions
to their backend-parents.
@@ -51,6 +52,8 @@
(
'config',
'home',
+ 'set_auth_type' => 'mobilefrontend.hook_helper.set_auth_type',
+ 'menu' => 'mobilefrontend.menu.get_menu'
);
/* Dependencies for this app to work */
Modified: branches/Version-1_0-branch/mobilefrontend/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/setup/tables_update.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/mobilefrontend/setup/tables_update.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -14,16 +14,11 @@
/**
* Update mobilefrontend version from '0.1.1' to '0.1.2';
*/
-/*
+
$test[] = '0.1.1';
function mobilefrontend_upgrade0_1_1()
{
- $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
-
- if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
- {
- $GLOBALS['setup_info']['mobilefrontend']['currentver']
= '0.1.2';
- return
$GLOBALS['setup_info']['mobilefrontend']['currentver'];
- }
+ $GLOBALS['setup_info']['mobilefrontend']['currentver'] =
'0.1.2';
+ return $GLOBALS['setup_info']['mobilefrontend']['currentver'];
}
-*/
+
Copied: branches/Version-1_0-branch/mobilefrontend/templates/base/config.tpl
(from rev 11053, trunk/mobilefrontend/templates/base/config.tpl)
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/templates/base/config.tpl
(rev 0)
+++ branches/Version-1_0-branch/mobilefrontend/templates/base/config.tpl
2013-04-11 11:32:15 UTC (rev 11054)
@@ -0,0 +1,40 @@
+<!-- BEGIN header -->
+<form method="POST" action="{action_url}">
+ <table border="0" align="center" width="85%">
+ <tr class="th">
+ <td colspan="2"><font
color="{th_text}"> <b>{title}</b></font></td>
+ </tr>
+ <!-- END header -->
+ <!-- BEGIN body -->
+ <tr class="row_on">
+ <td colspan="2"> </td>
+ </tr>
+ <tr class="row_off">
+ <td colspan="2"> <b>{lang_mobilefrontend}</b></td>
+ </tr>
+ <tr class="row_on">
+ <td>{lang_auth_type}:</td>
+ <td>
+ <select name="newsettings[auth_type]">
+ <option value="0"
{selected_auth_type_0}>Same as framework</option>
+ <option value="sql"
{selected_auth_type_sql}>SQL</option>
+ <option value="custom_sso"
{selected_auth_type_custom_sso}>Custom SSO</option>
+ </select>
+ </td>
+ </tr>
+ <!-- END body -->
+ <!-- BEGIN footer -->
+ <tr class="th">
+ <td colspan="2">
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <input type="submit" name="submit"
value="{lang_submit}">
+ <input type="submit" name="cancel"
value="{lang_cancel}">
+ </td>
+ </tr>
+ </table>
+</form>
+<!-- END footer -->
Copied:
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
(from rev 11053, trunk/phpgwapi/inc/auth/class.auth_custom_sso.inc.php)
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
(rev 0)
+++ branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -0,0 +1,174 @@
+<?php
+ /**
+ * Authentication based on SQL table
+ * @author Dan Kuykendall <address@hidden>
+ * @author Joseph Engo <address@hidden>
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2013 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
+ * @package phpgwapi
+ * @subpackage accounts
+ * @version $Id: class.auth_custom_sso.inc.php 10127 2012-10-07
17:06:01Z sigurdne $
+ */
+
+ /*
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser 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 Lesser General Public
License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ /**
+ * Authentication based on SQL table
+ *
+ * @package phpgwapi
+ * @subpackage accounts
+ */
+ class phpgwapi_auth_custom_sso extends phpgwapi_auth_
+ {
+
+ /**
+ * Constructor
+ */
+ public function __construct()
+ {
+ parent::__construct();
+ }
+
+ /**
+ * Authenticate a user based on SSO
+ *
+ * @param string $username the login to authenticate
+ * @param string $passwd the password supplied by the user
+ * @return bool did the user sucessfully authenticate
+ */
+ public function authenticate($username, $passwd='')
+ {
+ $username =
$GLOBALS['phpgw']->db->db_addslashes($username);
+
+ $sql = 'SELECT account_pwd FROM phpgw_accounts'
+ . " WHERE account_lid = '{$username}'"
+ . " AND account_status = 'A'";
+
+ $GLOBALS['phpgw']->db->query($sql, __LINE__, __FILE__);
+ return !!$GLOBALS['phpgw']->db->next_record();
+ }
+
+ /* php ping function
+ */
+ private function ping($host)
+ {
+ exec(sprintf('ping -c 1 -W 5 %s', escapeshellarg($host)), $res,
$rval);
+ return $rval === 0;
+ }
+
+ public function get_username()
+ {
+ $config = CreateObject('phpgwapi.config','rental');
+ $config->read();
+
+ if(! $config->config_data['external_db_host'] ||
!$this->ping($config->config_data['external_db_host']))
+ {
+ $message ="Database server
{$config->config_data['external_db_host']} is not accessible";
+ phpgwapi_cache::message_set($message, 'error');
+ return false;
+ }
+
+ $db = createObject('phpgwapi.db', null, null, true);
+
+ $db->debug =
!!$config->config_data['external_db_debug'];
+ $db->Host = $config->config_data['external_db_host'];
+ $db->Port = $config->config_data['external_db_port'];
+ $db->Type = $config->config_data['external_db_type'];
+ $db->Database =
$config->config_data['external_db_name'];
+ $db->User = $config->config_data['external_db_user'];
+ $db->Password =
$config->config_data['external_db_password'];
+
+ try
+ {
+ $db->connect();
+ }
+ catch(Exception $e)
+ {
+ $message =
lang('unable_to_connect_to_database');
+ phpgwapi_cache::message_set($message, 'error');
+ return false;
+ }
+
+ $headers = getallheaders();
+ $fodsels_nr = substr($headers['Osso-User-Dn'],2, 11);
+
+ $sql = "SELECT V_ORG_PERSON.BRUKERNAVN FROM
V_ORG_PERSON WHERE FODSELSNR ='{$fodsels_nr}'";
+ $db->query($sql,__LINE__,__FILE__);
+ $db->next_record();
+ return $db->f('BRUKERNAVN',true);
+ }
+
+ /**
+ * Set the user's password to a new value
+ *
+ * @param string $old_passwd the user's old password
+ * @param string $new_passwd the user's new password
+ * @param int $account_id the account to change the password for
- defaults to current user
+ * @return string the new encrypted hash, or an empty string on
failure
+ */
+ public function change_password($old_passwd, $new_passwd,
$account_id = 0)
+ {
+ $account_id = (int) $account_id;
+ // Don't allow passwords changes for other accounts
when using XML-RPC
+ if ( !$account_id )
+ {
+ $account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
+ }
+
+ if ( $GLOBALS['phpgw_info']['flags']['currentapp'] ==
'login')
+ {
+ if (
!$this->authenticate($GLOBALS['phpgw']->accounts->id2lid($account_id),
$old_passwd) )
+ {
+ return '';
+ }
+ }
+
+ $hash = $this->create_hash($new_passwd);
+ $hash_safe =
$GLOBALS['phpgw']->db->db_addslashes($hash); // just to be safe :)
+ $now = time();
+
+ $sql = 'UPDATE phpgw_accounts'
+ . " SET account_pwd = '{$hash_safe}',
account_lastpwd_change = {$now}"
+ . " WHERE account_id = {$account_id}";
+
+ if ( !!$GLOBALS['phpgw']->db->query($sql, __LINE__,
__FILE__) )
+ {
+ return $hash;
+ }
+ return '';
+ }
+
+ /**
+ * Update when the user last logged in
+ *
+ * @param int $account_id the user's account id
+ * @param string $ip the source IP adddress for the request
+ */
+ public function update_lastlogin($account_id, $ip)
+ {
+ $ip = $GLOBALS['phpgw']->db->db_addslashes($ip);
+ $account_id = (int) $account_id;
+ $now = time();
+
+ $sql = 'UPDATE phpgw_accounts'
+ . " SET account_lastloginfrom = '{$ip}',"
+ . " account_lastlogin = {$now}"
+ . " WHERE account_id = {$account_id}";
+
+ $GLOBALS['phpgw']->db->query($sql, __LINE__, __FILE__);
+ }
+ }
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -568,7 +568,7 @@
{
if ($strip_slashes ||
($this->auto_stripslashes && ! $strip_slashes))
{
- return
stripslashes($this->resultSet->fields[$name]);
+ return
htmlspecialchars_decode(stripslashes($this->resultSet->fields[$name]));
}
else
{
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -810,7 +810,7 @@
{
if ($strip_slashes ||
($this->auto_stripslashes && ! $strip_slashes))
{
- return
stripslashes($this->Record[$name]);
+ return
htmlspecialchars_decode(stripslashes($this->Record[$name]));
}
else
{
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.login.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.login.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.login.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -64,6 +64,11 @@
$partial_url =
'phpgwapi/inc/sso/login_server.php';
}
+ if($frontend)
+ {
+
$GLOBALS['phpgw']->hooks->process('set_auth_type', array($frontend));
+ }
+
/* Program starts here */
$uilogin = new phpgw_uilogin($tmpl,
$GLOBALS['phpgw_info']['server']['auth_type'] == 'remoteuser' &&
!isset($GLOBALS['phpgw_remote_user']));
@@ -156,7 +161,7 @@
$extra_vars['cd'] = 'yes';
$GLOBALS['phpgw']->hooks->process('login');
- $GLOBALS['phpgw']->redirect_link('/home.php',
$extra_vars);
+
$GLOBALS['phpgw']->redirect_link("{$frontend}/home.php", $extra_vars);
//----------------- End login ntlm
}
@@ -194,6 +199,47 @@
unset($sslattributes);
}
+ if ($GLOBALS['phpgw_info']['server']['auth_type'] ==
'custom_sso' && !isset($_GET['cd']))
+ {
+ //Reset auth object
+ $GLOBALS['phpgw']->auth =
createObject('phpgwapi.auth');
+ $login =
$GLOBALS['phpgw']->auth->get_username();
+
+ $GLOBALS['sessionid'] =
$GLOBALS['phpgw']->session->create($login, '');
+
+ if (!isset($GLOBALS['sessionid']) ||
!$GLOBALS['sessionid'])
+ {
+ $cd_array = array();
+ if
($GLOBALS['phpgw']->session->cd_reason)
+ {
+ $cd_array['cd']
= $GLOBALS['phpgw']->session->cd_reason;
+ }
+ $cd_array['skip_remote'] = true;
+
+
$GLOBALS['phpgw']->redirect_link("/{$partial_url}", $cd_array);
+ exit;
+ }
+
+ $forward = phpgw::get_var('phpgw_forward');
+ if ($forward)
+ {
+ $extra_vars['phpgw_forward'] = $forward;
+ foreach ($_GET as $name => $value)
+ {
+ if (ereg('phpgw_', $name))
+ {
+ $name
= urlencode($name);
+ $extra_vars[$name]
= urlencode($value);
+ }
+ }
+ }
+
+ $extra_vars['cd'] = 'yes';
+
+ $GLOBALS['phpgw']->hooks->process('login');
+
$GLOBALS['phpgw']->redirect_link("{$frontend}/home.php", $extra_vars);
+ }
+
if ((isset($_POST['submitit']) ||
isset($_POST['submit_x']) || isset($_POST['submit_y'])))
{
if ($_SERVER['REQUEST_METHOD'] != 'POST' &&
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.ofphpgwapi.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.ofphpgwapi.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.ofphpgwapi.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -109,6 +109,7 @@
case 'ldap':
case 'mail':
// case 'nis': - doesn't currently work AFAIK -
skwashd may08
+ case 'custom_sso':
case 'ntlm':
case 'remoteuser':
case 'sql':
Modified: branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2013-04-11
11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2013-04-11
11:32:15 UTC (rev 11054)
@@ -626,7 +626,6 @@
unset($server_info_cache);
*/
-
// In case we use virtual hosts - some of them but not all with ntlm
auth.
if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'ntlm' &&
!isset($_SERVER['REMOTE_USER']))
{
Modified: branches/Version-1_0-branch/property/inc/class.soagreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soagreement.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/property/inc/class.soagreement.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -386,14 +386,14 @@
function read_details($data)
{
- $start = isset($data['start'])
&& $data['start'] ? $data['start']:0;
- $filter =
isset($data['filter']) && $data['filter'] ? $data['filter']:'none';
- $query = isset($data['query'])
? $data['query'] : '';
- $sort = isset($data['sort'])
&& $data['sort'] ? $data['sort']:'DESC';
- $order = isset($data['order'])
? $data['order'] : '';
- $cat_id =
isset($data['cat_id']) ? $data['cat_id'] : '';
- $allrows =
isset($data['allrows']) ? $data['allrows'] : '';
- $agreement_id = isset($data['agreement_id'])
? $data['agreement_id'] : '';
+ $start = isset($data['start']) &&
$data['start'] ? $data['start']:0;
+ $filter = isset($data['filter']) &&
$data['filter'] ? $data['filter']:'none';
+ $query = isset($data['query']) ?
$data['query'] : '';
+ $sort = isset($data['sort']) &&
$data['sort'] ? $data['sort']:'DESC';
+ $order = isset($data['order']) ?
$data['order'] : '';
+ $cat_id = isset($data['cat_id']) ?
$data['cat_id'] : '';
+ $allrows = isset($data['allrows']) ?
$data['allrows'] : '';
+ $agreement_id = isset($data['agreement_id']) ?
$data['agreement_id'] : '';
$allrows = true; // return all..
Modified: branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -153,6 +153,7 @@
'uicol_address'=> true
));
+
$this->bocommon->fm_cache('sql_document_' .
$entity_id,$sql);
$this->uicols =
$this->bocommon->uicols;
@@ -182,6 +183,9 @@
$groupmethod.= "
,fm_document.p_entity_id,fm_entity_category.name,fm_document.p_num,fm_document.p_cat_id";
}
+ //FIXME
+ $groupmethod = '';
+
if ($order)
{
$ordermethod = " order by fm_document.$order
$sort";
Modified: branches/Version-1_0-branch/property/inc/class.solocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -1327,7 +1327,7 @@
{
$input_name='category';
}
- $value_set[$input_name] = $value;
+ $value_set[$input_name] =
$this->db->db_addslashes($value);
}
}
Modified: branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -1516,7 +1516,13 @@
function download()
{
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uilocation.stop', 'perm'=>1, 'acl_location'=> $this->acl_location));
+ }
+
$id = phpgw::get_var('id', 'int');
+ $this->bo->allrows = true;
if($id)
{
$list = $this->bo->read_details($id);
@@ -2188,6 +2194,13 @@
'values' =>
json_encode(array(array(key =>
file_name,label=>lang('Filename'),sortable=>false,resizeable=>true)))
);
+
+ $link_download = array
+ (
+ 'menuaction' =>
'property.uiagreement.download',
+ 'id' =>$agreement_id
+ );
+
$data = array
(
'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
@@ -2256,7 +2269,13 @@
'lang_status'
=> lang('Status'),
'status_list'
=> $this->bo->select_status_list('select',$agreement['status']),
'textareacols'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] : 40,
- 'textarearows'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] : 6
+ 'textarearows'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] : 6,
+
+ 'lang_download'
=> 'download',
+ 'link_download'
=> $GLOBALS['phpgw']->link('/index.php',$link_download),
+ 'lang_download_help' =>
lang('Download table to your browser'),
+
+
);
//---datatable settings--------------------
Modified:
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -432,12 +432,16 @@
'ColumnDefs' => $summation_def
);
+ $this->config =
CreateObject('phpgwapi.config','property');
+ $this->config->read();
+
$data = array
(
'datatable_def'
=> $datatable_def,
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'survey'
=> $values,
- 'location_data2'
=> $location_data,
+ 'location_data2'
=> $location_data,
+ 'lang_coordinator'
=> isset($this->config->config_data['lang_request_coordinator']) &&
$this->config->config_data['lang_request_coordinator'] ?
$this->config->config_data['lang_request_coordinator'] : lang('coordinator'),
'categories'
=> array('options' => $categories),
'status_list'
=> array('options' => execMethod('property.bogeneric.get_list',array('type' =>
'condition_survey_status', 'selected' => $values['status_id'], 'add_empty' =>
true))),
'editable'
=> $mode == 'edit',
Modified: branches/Version-1_0-branch/property/templates/base/agreement.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/agreement.xsl
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/property/templates/base/agreement.xsl
2013-04-11 11:32:15 UTC (rev 11054)
@@ -1358,9 +1358,22 @@
<br/>
<xsl:choose>
<xsl:when test="values!=''">
- <table align="center">
+ <table>
<tr>
<td align="center">
+ <xsl:variable
name="link_download">
+
<xsl:value-of select="link_download"/>
+ </xsl:variable>
+ <xsl:variable
name="lang_download_help">
+
<xsl:value-of select="lang_download_help"/>
+ </xsl:variable>
+ <xsl:variable
name="lang_download">
+
<xsl:value-of select="lang_download"/>
+ </xsl:variable>
+ <a
href="javascript:var w=window.open('{$link_download}','','left=50,top=100')">
+
<xsl:value-of select="lang_download"/>
+ </a>
+ <xsl:text>
</xsl:text>
<xsl:value-of
select="lang_total_records"/>
<xsl:text>
</xsl:text>
<xsl:value-of
select="num_records"/>
Modified:
branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
2013-04-11 11:32:15 UTC (rev 11054)
@@ -169,7 +169,7 @@
</dd>
<dt>
- <label
for="coordinator"><xsl:value-of select="php:function('lang', 'coordinator')"
/></label>
+ <label
for="coordinator"><xsl:value-of select="lang_coordinator" /></label>
</dt>
<dd>
Modified: branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
2013-04-11 11:30:18 UTC (rev 11053)
+++ branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
2013-04-11 11:32:15 UTC (rev 11054)
@@ -63,7 +63,7 @@
try
{
$db->connect();
- $connected = true;
+ $this->connected = true;
}
catch(Exception $e)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11054] Merge 11041:11053 from trunk,
Sigurd Nes <=