[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9411] Merge 9403:9410 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9411] Merge 9403:9410 from trunk |
|
Date: |
Sun, 20 May 2012 07:46:56 +0000 |
Revision: 9411
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9411
Author: sigurdne
Date: 2012-05-20 07:46:55 +0000 (Sun, 20 May 2012)
Log Message:
-----------
Merge 9403:9410 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control_item.inc.php
branches/Version-1_0-branch/controller/setup/phpgw_no.lang
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
branches/Version-1_0-branch/registration/inc/class.bomanagefields.inc.php
branches/Version-1_0-branch/registration/inc/class.bopending.inc.php
branches/Version-1_0-branch/registration/inc/class.boreg.inc.php
branches/Version-1_0-branch/registration/inc/class.menu.inc.php
branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
branches/Version-1_0-branch/registration/js/portico/ajax.js
branches/Version-1_0-branch/registration/main.php
branches/Version-1_0-branch/registration/setup/default_records.inc.php
branches/Version-1_0-branch/registration/setup/phpgw_no.lang
branches/Version-1_0-branch/registration/setup/setup.inc.php
branches/Version-1_0-branch/registration/setup/tables_update.inc.php
branches/Version-1_0-branch/registration/templates/base/config.tpl
branches/Version-1_0-branch/registration/templates/base/loginid_select.tpl
branches/Version-1_0-branch/registration/templates/base/personal_info.tpl
Added Paths:
-----------
branches/Version-1_0-branch/activitycalendar/sonar-project.properties
branches/Version-1_0-branch/activitycalendarfrontend/sonar-project.properties
branches/Version-1_0-branch/controller/sonar-project.properties
branches/Version-1_0-branch/frontend/sonar-project.properties
branches/Version-1_0-branch/registration/inc/class.hook_helper.inc.php
branches/Version-1_0-branch/rental/sonar-project.properties
branches/Version-1_0-branch/tests/
branches/Version-1_0-branch/tests.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
+
/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
Copied: branches/Version-1_0-branch/activitycalendar/sonar-project.properties
(from rev 9410, trunk/activitycalendar/sonar-project.properties)
===================================================================
--- branches/Version-1_0-branch/activitycalendar/sonar-project.properties
(rev 0)
+++ branches/Version-1_0-branch/activitycalendar/sonar-project.properties
2012-05-20 07:46:55 UTC (rev 9411)
@@ -0,0 +1,24 @@
+#Project-file used by Sonar. Added by Erik Holm-Larsen, Bouvet AS
+# required metadata
+sonar.projectKey=no.bouvet.portico:activitycalendar
+sonar.projectName=PorticoEstate Aktivitetsoversikt
+sonar.projectVersion=1.0-SNAPSHOT
+
+# path to source directories (required)
+#sources=jenkins_checkout/pe/controller,jenkins_checkout/pe/rental,jenkins_checkout/pe/activitycalendar
+sources=.
+tests=../tests
+
+sonar.language=php
+
+#sonar.scm.url=scm:svn:http://svn.codehaus.org/sonar-plugins/trunk/php/math-php-test
+sonar.scm.url=scm:svn:http://svn.savannah.nongnu.org/svn/fmsystem/trunk/
+
+#sonar.phpUnit.mainTestClass=source/tests/AllTests2.php
+sonar.phpUnit.mainTestClass=../tests.php
+sonar.phpcpd.excludes=../tests.php
+
+# Example of properties that can be uncommented to enable reuse of existing
PHP Code Sniffer reports
+#sonar.phpCodesniffer.analyzeOnly=true
+#sonar.phpCodesniffer.reportFileRelativePath=../../logs
+#sonar.phpCodesniffer.reportFileName=cs-report.xml
\ No newline at end of file
Copied:
branches/Version-1_0-branch/activitycalendarfrontend/sonar-project.properties
(from rev 9410, trunk/activitycalendarfrontend/sonar-project.properties)
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/sonar-project.properties
(rev 0)
+++
branches/Version-1_0-branch/activitycalendarfrontend/sonar-project.properties
2012-05-20 07:46:55 UTC (rev 9411)
@@ -0,0 +1,25 @@
+#Project-file used by Sonar. Added by Erik Holm-Larsen, Bouvet AS
+# required metadata
+sonar.projectKey=no.bouvet.portico:activitycalendarfrontend
+sonar.projectName=PorticoEstate Aktivitetsoversikt Frontend
+
+sonar.projectVersion=1.0-SNAPSHOT
+
+# path to source directories (required)
+#sources=jenkins_checkout/pe/controller,jenkins_checkout/pe/rental,jenkins_checkout/pe/activitycalendar
+sources=.
+tests=../tests
+
+sonar.language=php
+
+#sonar.scm.url=scm:svn:http://svn.codehaus.org/sonar-plugins/trunk/php/math-php-test
+sonar.scm.url=scm:svn:http://svn.savannah.nongnu.org/svn/fmsystem/trunk/
+
+#sonar.phpUnit.mainTestClass=source/tests/AllTests2.php
+sonar.phpUnit.mainTestClass=../tests.php
+sonar.phpcpd.excludes=../tests.php
+
+# Example of properties that can be uncommented to enable reuse of existing
PHP Code Sniffer reports
+#sonar.phpCodesniffer.analyzeOnly=true
+#sonar.phpCodesniffer.reportFileRelativePath=../../logs
+#sonar.phpCodesniffer.reportFileName=cs-report.xml
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -145,7 +145,7 @@
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
$control->set_component_type_id($this->unmarshal($this->db->f('component_type_id',
true), 'int'));
$control->set_component_id($this->unmarshal($this->db->f('component_id', true),
'int'));
-
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+ //
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type',
true), 'int'));
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
@@ -187,7 +187,7 @@
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
$control->set_component_type_id($this->unmarshal($this->db->f('component_type_id',
true), 'int'));
$control->set_component_id($this->unmarshal($this->db->f('component_id', true),
'int'));
-
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+ //
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
@@ -383,7 +383,7 @@
//
$control->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
$control->set_component_type_id($this->unmarshal($this->db->f('component_type_id',
true), 'int'));
$control->set_component_id($this->unmarshal($this->db->f('component_id', true),
'int'));
-
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+
//$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
}
@@ -427,7 +427,7 @@
$control->set_control_area_name($category[0]['name']);
$control->set_component_type_id($this->unmarshal($this->db->f('component_type_id',
true), 'int'));
$control->set_component_id($this->unmarshal($this->db->f('component_id', true),
'int'));
-
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+ //
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
$control->set_repeat_type_label($control->get_repeat_type());
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
Modified: branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -57,7 +57,7 @@
protected $responsibility_name;
protected $component_id;
protected $component_type_id;
- protected $location_code;
+ //protected $location_code;
protected $control_area_id;
protected $control_area_name;
@@ -212,14 +212,14 @@
}
public function get_component_type_id() { return
$this->component_type_id; }
-
+ /*
public function set_location_code($location_code)
{
$this->location_code = $location_code;
}
public function get_location_code() { return
$this->location_code; }
-
+ */
public function set_control_area_id($control_area_id)
{
$this->control_area_id = $control_area_id;
Modified:
branches/Version-1_0-branch/controller/inc/model/class.control_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.control_item.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/controller/inc/model/class.control_item.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -33,10 +33,17 @@
class controller_control_item extends controller_model
{
public static $so;
+
/*
+ const "CONTROL_ITEM_TYPE_MAALING" = "control_item_type_1";
const CONTROL_ITEM_TYPE_MAALING = "control_item_type_1";
- const CONTROL_ITEM_TYPE_MAALING = "control_item_type_1";
- */
+ */
+
+ public static $type_array = array("CONTROL_ITEM_TYPE_1" =>
"Vanlig",
+
"CONTROL_ITEM_TYPE_2" => "Måling",
+
"CONTROL_ITEM_TYPE_3" => "Nedtrekksliste",
+
"CONTROL_ITEM_TYPE_4" => "Radioknapper");
+
protected $id;
protected $title;
protected $required;
Modified: branches/Version-1_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2012-05-19
19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2012-05-20
07:46:55 UTC (rev 9411)
@@ -2,6 +2,10 @@
location_connections controller no Byggknytning
control controller no Kontroll
controller common no Kontroll
+control_item_type_1 no Ingen ekstra felt
+control_item_type_2 no Måling
+control_item_type_3 no Nedtrekksliste
+control_item_type_4 no Radioknapper
control_helptext controller no Her kommer hjelpetekst for å
opprette en kontroll
Check_list controller no Sjekkliste
Calendar_overview controller no Kontrollplan
Copied: branches/Version-1_0-branch/controller/sonar-project.properties (from
rev 9410, trunk/controller/sonar-project.properties)
===================================================================
--- branches/Version-1_0-branch/controller/sonar-project.properties
(rev 0)
+++ branches/Version-1_0-branch/controller/sonar-project.properties
2012-05-20 07:46:55 UTC (rev 9411)
@@ -0,0 +1,24 @@
+#Project-file used by Sonar. Added by Erik Holm-Larsen, Bouvet AS
+# required metadata
+sonar.projectKey=no.bouvet.portico:controller
+sonar.projectName=PorticoEstate Controller
+sonar.projectVersion=1.0-SNAPSHOT
+
+# path to source directories (required)
+#sources=jenkins_checkout/pe/controller,jenkins_checkout/pe/rental,jenkins_checkout/pe/activitycalendar
+sources=.
+tests=../tests
+
+sonar.language=php
+
+#sonar.scm.url=scm:svn:http://svn.codehaus.org/sonar-plugins/trunk/php/math-php-test
+sonar.scm.url=scm:svn:http://svn.savannah.nongnu.org/svn/fmsystem/trunk/
+
+#sonar.phpUnit.mainTestClass=source/tests/AllTests2.php
+sonar.phpUnit.mainTestClass=../tests.php
+sonar.phpcpd.excludes=../tests.php
+
+# Example of properties that can be uncommented to enable reuse of existing
PHP Code Sniffer reports
+#sonar.phpCodesniffer.analyzeOnly=true
+#sonar.phpCodesniffer.reportFileRelativePath=../../logs
+#sonar.phpCodesniffer.reportFileName=cs-report.xml
\ No newline at end of file
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-19 19:38:43 UTC (rev 9410)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-20 07:46:55 UTC (rev 9411)
@@ -1,12 +1,39 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="check_list_status_checker" xmlns:php="http://php.net/xsl";>
-
<xsl:param name="location_code" />
- <xsl:choose>
- <xsl:when test="status = 'CONTROL_REGISTERED'">
- <td>
+ <xsl:choose>
+ <xsl:when test="status = 'CONTROL_REGISTERED'">
+ <td>
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
+ <xsl:text>&date=</xsl:text>
+ <xsl:value-of select="info/date"/>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="info/control_id"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of select="$location_code"/>
+ </xsl:attribute>
+ <img height="15"
src="controller/images/status_icon_yellow_ring.png" />
+ </a>
+ </td>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_PLANNED'">
+ <td>
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of
select="info/check_list_id"/>
+ </xsl:attribute>
+ <img height="15"
src="controller/images/status_icon_yellow.png" />
+ </a>
+ </td>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_NOT_DONE'">
+ <td>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
@@ -17,52 +44,39 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="$location_code"/>
</xsl:attribute>
- <img height="15"
src="controller/images/status_icon_yellow_ring.png" />
+ <img height="15"
src="controller/images/status_icon_red_cross.png" />
</a>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_PLANNED'">
- <td>
+ </td>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
+ <td>
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of
select="info/check_list_id"/>
+ </xsl:attribute>
+ <img height="15"
src="controller/images/status_icon_red_cross.png" />
+ </a>
+ </td>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
+ <td>
<a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of
select="info/check_list_id"/>
- </xsl:attribute>
- <img height="15"
src="controller/images/status_icon_yellow.png" />
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of
select="info/check_list_id"/>
+ </xsl:attribute>
+ <span
style="display:none"><xsl:value-of select="info/id"/></span>
+ <img height="15"
src="controller/images/status_icon_dark_green.png" />
</a>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_NOT_DONE'">
- <td>
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
-
<xsl:text>&date=</xsl:text>
- <xsl:value-of
select="info/date"/>
-
<xsl:text>&control_id=</xsl:text>
- <xsl:value-of
select="info/control_id"/>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="$location_code"/>
- </xsl:attribute>
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
- </a>
- </td>
- </xsl:when>
- <xsl:when test="status =
'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
- <td>
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of
select="info/check_list_id"/>
- </xsl:attribute>
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
- </a>
- </td>
+ </td>
</xsl:when>
- <xsl:when test="status =
'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
- <td>
+ <xsl:when test="status =
'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
+ <td>
+ <div style="position:relative;">
+ <div id="info_box"></div>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -70,79 +84,62 @@
<xsl:value-of
select="info/check_list_id"/>
</xsl:attribute>
<span
style="display:none"><xsl:value-of select="info/id"/></span>
- <img height="15"
src="controller/images/status_icon_dark_green.png" />
+ <img height="15"
src="controller/images/status_icon_light_green.png" />
</a>
- </td>
- </xsl:when>
- <xsl:when test="status =
'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
- <td>
- <div style="position:relative;">
-
- <div id="info_box"></div>
- <a>
- <xsl:attribute name="href">
+ </div>
+ </td>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_DONE_WITH_ERRORS'">
+ <td>
+ <div class="info_box_wrp">
+ <div id="info_box"></div>
+ <a class="view_info_box">
+ <xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of
select="info/check_list_id"/>
</xsl:attribute>
- <span
style="display:none"><xsl:value-of select="info/id"/></span>
- <img height="15"
src="controller/images/status_icon_light_green.png" />
- </a>
- </div>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_DONE_WITH_ERRORS'">
- <td>
- <div class="info_box_wrp">
- <div id="info_box"></div>
- <a class="view_info_box">
- <xsl:attribute
name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of
select="info/check_list_id"/>
- </xsl:attribute>
- <span
style="display:none">
-
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
- </span>
- <xsl:value-of
select="info/num_open_cases"/>
- </a>
- </div>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROLS_DONE_WITH_ERRORS'">
- <td>
- <div class="info_box_wrp">
- <div id="info_box"></div>
- <a class="view_info_box">
- <xsl:attribute
name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
- <xsl:value-of
select="//control/id"/>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="//current_location/location_code"/>
-
<xsl:text>&year=</xsl:text>
- <xsl:value-of
select="//current_year"/>
-
<xsl:text>&month=</xsl:text>
- <xsl:number />
- </xsl:attribute>
- <span
style="display:none">
-
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
- </span>
- <xsl:value-of
select="info/agg_open_errors"/>
- </a>
- </div>
- </td>
- </xsl:when>
- <xsl:when test="status = 'CONTROL_CANCELED'">
- <td>
- <img height="15"
src="controller/images/status_icon_red_cross.png" />
- </td>
- </xsl:when>
- <xsl:otherwise>
- <td></td>
- </xsl:otherwise>
- </xsl:choose>
-
+ <span style="display:none">
+
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+ </span>
+ <xsl:value-of
select="info/num_open_cases"/>
+ </a>
+ </div>
+ </td>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROLS_DONE_WITH_ERRORS'">
+ <td>
+ <div class="info_box_wrp">
+ <div id="info_box"></div>
+ <a class="view_info_box">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+ <xsl:value-of
select="//control/id"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="//current_location/location_code"/>
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="//current_year"/>
+
<xsl:text>&month=</xsl:text>
+ <xsl:number />
+ </xsl:attribute>
+ <span style="display:none">
+
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+ </span>
+ <xsl:value-of
select="info/agg_open_errors"/>
+ </a>
+ </div>
+ </td>
+ </xsl:when>
+ <xsl:when test="status = 'CONTROL_CANCELED'">
+ <td>
+ <img height="15"
src="controller/images/status_icon_red_cross.png" />
+ </td>
+ </xsl:when>
+ <xsl:otherwise>
+ <td></td>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-19 19:38:43 UTC (rev 9410)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-20 07:46:55 UTC (rev 9411)
@@ -174,7 +174,7 @@
<xsl:for-each select="calendar_array">
<xsl:call-template
name="check_list_status_checker" >
- <xsl:with-param
name="location_code"><xsl:value-of
select="current_location/location_code"/></xsl:with-param>
+ <xsl:with-param
name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
</xsl:call-template>
</xsl:for-each>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-19 19:38:43 UTC (rev 9410)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-20 07:46:55 UTC (rev 9411)
@@ -114,7 +114,7 @@
</td>
<xsl:for-each
select="calendar_array">
<xsl:call-template name="check_list_status_checker" >
-
<xsl:with-param name="location_code"><xsl:value-of
select="current_location/location_code"/></xsl:with-param>
+
<xsl:with-param name="location_code"><xsl:value-of
select="//current_location/location_code"/></xsl:with-param>
</xsl:call-template>
</xsl:for-each>
</tr>
Copied: branches/Version-1_0-branch/frontend/sonar-project.properties (from rev
9410, trunk/frontend/sonar-project.properties)
===================================================================
--- branches/Version-1_0-branch/frontend/sonar-project.properties
(rev 0)
+++ branches/Version-1_0-branch/frontend/sonar-project.properties
2012-05-20 07:46:55 UTC (rev 9411)
@@ -0,0 +1,24 @@
+#Project-file used by Sonar. Added by Erik Holm-Larsen, Bouvet AS
+# required metadata
+sonar.projectKey=no.bouvet.portico:frontend
+sonar.projectName=PorticoEstate Frontend
+sonar.projectVersion=1.0-SNAPSHOT
+
+# path to source directories (required)
+#sources=jenkins_checkout/pe/controller,jenkins_checkout/pe/rental,jenkins_checkout/pe/activitycalendar
+sources=.
+tests=../tests
+
+sonar.language=php
+
+#sonar.scm.url=scm:svn:http://svn.codehaus.org/sonar-plugins/trunk/php/math-php-test
+sonar.scm.url=scm:svn:http://svn.savannah.nongnu.org/svn/fmsystem/trunk/
+
+#sonar.phpUnit.mainTestClass=source/tests/AllTests2.php
+sonar.phpUnit.mainTestClass=../tests.php
+sonar.phpcpd.excludes=../tests.php
+
+# Example of properties that can be uncommented to enable reuse of existing
PHP Code Sniffer reports
+#sonar.phpCodesniffer.analyzeOnly=true
+#sonar.phpCodesniffer.reportFileRelativePath=../../logs
+#sonar.phpCodesniffer.reportFileName=cs-report.xml
\ No newline at end of file
Modified:
branches/Version-1_0-branch/registration/inc/class.bomanagefields.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.bomanagefields.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/inc/class.bomanagefields.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -82,6 +82,8 @@
if($suffix &&
$field_info['field_type'] == 'location' && !is_array
($current_fields[$field_info['field_name']]))
{
$field_info['field_name'] = rtrim($transform_name,'1') . $suffix;
+ $_child_level = $suffix
+1;
+
$field_info['field_values'] =
"{$_child_level}::loc{$_child_level}_name::loc{$suffix}_name";
}
else if($suffix &&
$field_info['field_type'] == 'location' && is_array
($current_fields[$field_info['field_name']]))
{
Modified: branches/Version-1_0-branch/registration/inc/class.bopending.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.bopending.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/inc/class.bopending.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -218,7 +218,7 @@
continue;
}
- $file = PHPGW_SERVER_ROOT .
"/property/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
+ $file = PHPGW_SERVER_ROOT .
"/registration/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
if ( $entry['active'] && is_file($file) )
{
require_once $file;
@@ -349,7 +349,7 @@
continue;
}
- $file = PHPGW_SERVER_ROOT .
"/property/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
+ $file = PHPGW_SERVER_ROOT .
"/registration/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
if ( $entry['active'] && is_file($file) )
{
require_once $file;
Modified: branches/Version-1_0-branch/registration/inc/class.boreg.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.boreg.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/inc/class.boreg.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -50,12 +50,12 @@
$so = createobject('registration.soreg');
- if (! $r_reg['loginid'])
+ if (! $r_reg['loginid'] &&
!$this->config['username_is'] == 'email')
{
$errors[] = lang('You must enter a username');
}
- if (! is_array($errors) &&
$so->account_exists($r_reg['loginid']))
+ if (! is_array($errors) && $r_reg['loginid'] &&
$so->account_exists($r_reg['loginid']))
{
$errors[] = lang('Sorry, that username is
already taken.');
}
@@ -67,13 +67,17 @@
}
else
{
-
$GLOBALS['phpgw']->session->appsession('loginid','registration',$r_reg['loginid']);
+ if(!$this->config['username_is'] == 'email')
+ {
+
$GLOBALS['phpgw']->session->appsession('loginid','registration',$r_reg['loginid']);
+ }
$ui->step2();
}
}
function step2()
{
+ $ui = createobject('registration.uireg');
if(!$r_reg = phpgw::get_var('r_reg'))
{
$r_reg = array();
@@ -83,9 +87,49 @@
$o_reg = array();
}
$fields = array();
+ $errors = array();
+// _debug_array($r_reg);
+
+//-------
+ if($this->config['username_is'] == 'email')
+ {
+ $this->fields['loginid'] = array
+ (
+ 'field_name' => 'loginid',
+ 'field_text' => lang('username'),
+ 'field_type' => 'email',
+ 'field_values' =>'',
+ 'field_required' => 'Y',
+ 'field_order' => 1
+ );
- //echo '<pre>'; print_r($r_reg); echo '</pre>';
+ if (! $r_reg['loginid'])
+ {
+ $missing_fields[] = 'loginid';
+ $errors[] = lang('you must enter a
username');
+ }
+ else
+ {
+ $loginid =
$GLOBALS['phpgw']->session->appsession('loginid','registration');
+
+ if($r_reg['loginid'] != $loginid)
+ {
+
$GLOBALS['phpgw']->session->appsession('loginid','registration',$r_reg['loginid']);
+ $loginid = false;
+ }
+ if( !$loginid )
+ {
+ if(
execMethod('registration.soreg.account_exists', $r_reg['loginid']))
+ {
+ $errors[] =
lang('Sorry, that username is already taken.');
+ }
+ }
+ }
+ }
+
+//--------
+
if ($this->config['password_is'] == 'http')
{
$r_reg['passwd'] = $r_reg['passwd_confirm'] =
$_SERVER['PHP_AUTH_PW'];
@@ -202,14 +246,13 @@
}
}
- while (is_array($o_reg) && list($name,$value) =
each($o_reg))
- {
- $fields[$name] = $value;
- }
-
if (is_array ($o_reg))
{
reset($o_reg);
+ foreach ($o_reg as $name => $value)
+ {
+ $fields[$name] = $value;
+ }
}
if (is_array($missing_fields))
@@ -217,19 +260,19 @@
$errors[] = lang('You must fill in all of the
required fields');
}
- if (! is_array($errors))
+ if (! $errors)
{
$so = createobject('registration.soreg');
$reg_id = $so->step2($fields);
}
- $ui = createobject('registration.uireg');
- if (is_array($errors))
+ if ($errors)
{
$ui->step2($errors,$r_reg,$o_reg,$missing_fields);
}
else
{
+
$GLOBALS['phpgw']->session->appsession('loginid','registration','');
// Redirect them so they don't hit refresh and
make a mess
$GLOBALS['phpgw']->redirect_link('/registration/main.php',array('menuaction' =>
'registration.uireg.ready_to_activate', 'reg_id' => $reg_id, 'logindomain' =>
$_REQUEST['logindomain']));
}
@@ -414,6 +457,10 @@
{
return True;
}
+ else if ($this->config['password_is'] == 'email')
+ {
+ return True;
+ }
elseif ($this->config['password_is'] == 'http')
{
if (!$_SERVER['PHP_AUTH_PW'])
@@ -432,14 +479,26 @@
function get_locations()
{
$location_code = phpgw::get_var('location_code');
-
- $locations =
execMethod('property.solocation.get_children', $location_code);
-
- if(!$location_code)
+ $field = phpgw::get_var('field');
+ if($field)
{
- array_push($locations, array('id' => '', 'name'
=> lang('select')));
+ $field_info_arr = explode('::',
$this->fields[$field]['field_values']);
}
- return $locations;
+ $criteria = array
+ (
+ 'location_code' => $location_code,
+ 'child_level' => $field_info_arr[0],
+ 'field_name' => $field_info_arr[1]
+ );
+
+ $locations =
execMethod('property.solocation.get_children',$criteria);
+ $values = array
+ (
+ 'child_level' => $field_info_arr[0],
+ 'locations' => $locations
+ );
+
+ return $values;
}
}
Copied: branches/Version-1_0-branch/registration/inc/class.hook_helper.inc.php
(from rev 9410, trunk/registration/inc/class.hook_helper.inc.php)
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.hook_helper.inc.php
(rev 0)
+++ branches/Version-1_0-branch/registration/inc/class.hook_helper.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -0,0 +1,56 @@
+<?php
+ /**
+ * registration - Hook helper
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2012 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @package registration
+ * @version $Id: class.hook_helper.inc.php 9104 2012-04-04 09:47:47Z
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 registration
+ */
+ class registration_hook_helper
+ {
+ /**
+ * Clear reg_accounts either as part of a cron-job or logout
hook
+ *
+ * @return void
+ */
+ public function clear_reg_accounts()
+ {
+ $c = createobject('phpgwapi.config','registration');
+ $c->read();
+
+ if($c->config_data['activate_account'] ==
'pending_approval')
+ {
+ $GLOBALS['phpgw']->db->query("DELETE FROM
phpgw_reg_accounts WHERE reg_dla <= '"
+ . (time() - 7200) . "' AND reg_info IS
NULL",__LINE__,__FILE__);
+ }
+ else
+ {
+ $GLOBALS['phpgw']->db->query("DELETE FROM
phpgw_reg_accounts WHERE reg_dla <= '"
+ . (time() - 7200) . "'",__LINE__,__FILE__);
+ }
+ }
+ }
Modified: branches/Version-1_0-branch/registration/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.menu.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/inc/class.menu.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -40,7 +40,7 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'registration.uipending.index')),
'text' => lang('registration'),
'image' => array('admin',
'navbar'),
- 'order' => -6,
+ 'order' => -4,
'group' => 'systools'
),
);
Modified: branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -60,19 +60,17 @@
$this->reg_id = md5(time() . $account_lid .
$GLOBALS['phpgw']->common->randomstring(32));
$account_lid =
$GLOBALS['phpgw']->session->appsession('loginid','registration');
- $location = array();
-
- for ($i=1; $i<=6; $i++)
+ for ($i=1; $i < 10; $i++)
{
if (isset($fields["loc{$i}"]) &&
$fields["loc{$i}"])
{
- $location[] = $fields["loc{$i}"];
+ $fields['location_code'] =
$fields["loc{$i}"];
}
}
- if($location)
+ if($this->config['username_is'] == 'email')
{
- $fields['location_code'] = implode('-',
$location);
+ $fields['email'] = $fields['loginid'];
}
$this->db->query("UPDATE phpgw_reg_accounts SET
reg_id='" . $this->reg_id . "', reg_dla='"
@@ -445,7 +443,9 @@
'location' => 'registration',
'location_code' =>
$fields['location_code'],
'contact_id' =>
$GLOBALS['phpgw']->accounts->get($account_id)->person_id,
- 'account_lid' => $account_lid
+ 'account_lid' => $account_lid,
+ 'account_id' => $account_id,
+ 'email' =>
$fields['email']
);
$GLOBALS['phpgw']->hooks->single($args,
'property');
Modified: branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -25,6 +25,7 @@
{
var $template;
var $bomanagefields;
+ var $first_location = false;
var $fields;
var $bo;
var $config;
@@ -99,19 +100,37 @@
$this->template->set_var('lang_username',lang('Username'));
$this->template->set_var('lang_submit',lang('Submit'));
+ $var = $this->get_username_fields();
+ $this->template->set_var($var);
+ $this->template->pfp('out','form');
+
+ $this->footer();
+ }
+
+
+ function get_username_fields()
+ {
+ $values = array();
if(
$GLOBALS['phpgw_info']['server']['domain_from_host']
&&
!$GLOBALS['phpgw_info']['server']['show_domain_selectbox'] )
{
- $this->template->set_var(
- array(
- 'domain_selects'
=> '',
- 'logindomain'
=> $_SERVER['SERVER_NAME']
- )
- );
- $this->template->parse('domain_from_hosts',
'domain_from_host');
+ $values = array
+ (
+ 'domain_select' => '',
+ 'domain_from_host' => "<input type
= 'hidden' name='logindomain' id='logindomain' value
='{$_SERVER['SERVER_NAME']}' />"
+ );
}
elseif(
$GLOBALS['phpgw_info']['server']['show_domain_selectbox'] )
{
+
+ $lang_domain = lang('domain');
+ $domain_select = <<<HTML
+ <td>{$lang_domain}</td>
+ <td>
+ <select name="logindomain" id="logindomain"
class="inputbox">
+HTML;
+
+
$options = '';
foreach($GLOBALS['_phpgw_domain'] as
$domain_name => $domain_vars)
{
@@ -127,32 +146,30 @@
HTML;
}
- $this->template->set_var('domain_options',
$options);
+ $domain_select .= <<<HTML
+ {$options}
+ </select>
+ </td>
+HTML;
- $this->template->set_var(
- array(
- 'domain_from_hosts'
=> '',
- 'lang_domain'
=> lang('domain')
- )
- );
+ $values = array
+ (
+ 'domain_select' => $domain_select,
+ 'domain_from_host' => ''
+ );
}
else
{
- $this->template->set_var(
- array(
- 'domain_selects'
=> '',
- 'domain_from_hosts'
=> ''
- )
- );
-
+ $values = array
+ (
+ 'domain_select' => '',
+ 'domain_from_host' => ''
+ );
}
-
- $this->template->pfp('out','form');
-
- $this->footer();
+ return $values;
}
- function step2($errors = '',$r_reg = '',$o_reg =
'',$missing_fields='')
+ function step2($errors = array(),$r_reg = '',$o_reg =
'',$missing_fields='')
{
phpgwapi_jquery::load_widget('core');
$GLOBALS['phpgw']->js->validate_file('portico', 'ajax',
'registration');
@@ -174,11 +191,6 @@
));
$this->template->set_block('_personal_info','form');
- if ($errors)
- {
-
$this->template->set_var('errors',$GLOBALS['phpgw']->common->error_list($errors));
- }
-
$tpl_vars = array
(
'css' =>
$GLOBALS['phpgw']->common->get_css(),
@@ -215,6 +227,26 @@
}
}
+//----
+ if($this->config['username_is'] == 'email')
+ {
+
$this->template->set_var('message',lang('username as email'));
+ $username_fields = $this->get_username_fields();
+ $username_fields['lang_username'] = '<b>' .
lang('username') . '</b>';
+ $username_fields['value_username'] =
$GLOBALS['phpgw']->session->appsession('loginid','registration');
+ $this->template->set_var($username_fields);
+ }
+ else
+ {
+ $this->template->set_block ('form', 'username',
'empty');
+ }
+//-------
+
+ if ($errors)
+ {
+
$this->template->set_var('errors',$GLOBALS['phpgw']->common->error_list($errors));
+ }
+
$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>'registration.boreg.step2','logindomain'
=> $_REQUEST['logindomain'])));
$this->template->set_var('lang_password',lang('Password'));
$this->template->set_var('lang_reenter_password',lang('Re-enter password'));
@@ -447,9 +479,17 @@
$rstring = <<<HTML
<select id="{$name}" name="{$a}[{$name}]">
HTML;
- if($name == 'loc1')
+ if(!$this->first_location)
{
- $locations =
execMethod('property.solocation.get_children');
+ $field_info_arr = explode('::',
$this->fields[$name]['field_values']);
+ $criteria = array
+ (
+ 'location_code' =>
'',//$location_code,
+ 'child_level' => (int)
ltrim($name, 'loc'),
+ 'field_name' =>
isset($field_info_arr[2]) && $field_info_arr[2] ? $field_info_arr[2] :
"{$name}_name"
+ );
+
+ $locations =
execMethod('property.solocation.get_children',$criteria);
array_unshift($locations, array('id' =>
'', 'name' => lang('select')));
foreach ($locations as $location)
@@ -465,6 +505,7 @@
</select>
HTML;
}
+ $this->first_location = true;
}
return $rstring;
Modified: branches/Version-1_0-branch/registration/js/portico/ajax.js
===================================================================
--- branches/Version-1_0-branch/registration/js/portico/ajax.js 2012-05-19
19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/js/portico/ajax.js 2012-05-20
07:46:55 UTC (rev 9411)
@@ -1,19 +1,15 @@
$(document).ready(function(){
-
+
$("#loc1").change(function () {
- var loc1 = $(this).val();
- $("#loc2").html( "<option></option>" );
- $("#loc3").html( "<option></option>" );
- $("#loc4").html( "<option></option>" );
- $("#loc5").html( "<option></option>" );
- if(!loc1)
+ if(!$(this).val())
{
return false;
}
- var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:loc1};
+
+ var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:$(this).val(), field: 'loc1'};
var requestUrl = phpGWLink('registration/main.php', oArgs,
true);
-
+
var htmlString = "";
$.ajax({
@@ -23,39 +19,33 @@
success: function(data) {
if( data != null)
{
- htmlString = "<option value = ''>" +
data.length + " lokasjone(r) funnet</option>"
- var obj = data;
-
+ var obj = data.locations;
+ htmlString = "<option value = ''>" +
obj.length + " lokasjone(r) funnet</option>"
$.each(obj, function(i) {
- htmlString += "<option
value='" + obj[i].id + "'>" + obj[i].name + "</option>";
+ htmlString += "<option
value='" + obj[i].id + "'>"+ obj[i].name + "</option>";
});
- $("#loc2").html( htmlString );
+ $("#loc" + data.child_level).html(
htmlString );
}
else
{
htmlString += "<option>Ingen
lokasjoner</option>"
- $("#loc2").html( htmlString );
+ $("#loc" + data.child_level).html(
htmlString );
}
- }
- });
+ }
+ });
});
-
+
$("#loc2").change(function () {
- var loc1 = $("#loc1").val();
- var loc2 = $(this).val();
- $("#loc3").html( "<option></option>" );
- $("#loc4").html( "<option></option>" );
- $("#loc5").html( "<option></option>" );
- if(!loc2)
+ if(!$(this).val())
{
return false;
}
- var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:loc1 + "-" + loc2};
+ var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:$(this).val(), field: 'loc2'};
var requestUrl = phpGWLink('registration/main.php', oArgs,
true);
-
+
var htmlString = "";
$.ajax({
@@ -65,37 +55,33 @@
success: function(data) {
if( data != null)
{
- htmlString = "<option value = ''>" +
data.length + " lokasjone(r) funnet</option>"
- var obj = data;
+ var obj = data.locations;
+ htmlString = "<option value = ''>" +
obj.length + " lokasjone(r) funnet</option>"
$.each(obj, function(i) {
htmlString += "<option
value='" + obj[i].id + "'>"+ obj[i].name + "</option>";
});
- $("#loc3").html( htmlString );
+ $("#loc" + data.child_level).html(
htmlString );
}
else
{
htmlString += "<option>Ingen
lokasjoner</option>"
- $("#loc3").html( htmlString );
+ $("#loc" + data.child_level).html(
htmlString );
}
- }
- });
+ }
+ });
});
$("#loc3").change(function () {
- var loc1 = $("#loc1").val();
- var loc2 = $("#loc2").val();
- var loc3 = $(this).val();
- $("#loc4").html( "<option></option>" );
- $("#loc5").html( "<option></option>" );
- if(!loc3)
+ if(!$(this).val())
{
return false;
}
- var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:loc1 + "-" + loc2 + "-" + loc3};
+
+ var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:$(this).val(), field: 'loc3'};
var requestUrl = phpGWLink('registration/main.php', oArgs,
true);
-
+
var htmlString = "";
$.ajax({
@@ -105,37 +91,33 @@
success: function(data) {
if( data != null)
{
- htmlString = "<option value = ''>" +
data.length + " lokasjone(r) funnet</option>"
- var obj = data;
+ var obj = data.locations;
+ htmlString = "<option value = ''>" +
obj.length + " lokasjone(r) funnet</option>"
$.each(obj, function(i) {
htmlString += "<option
value='" + obj[i].id + "'>"+ obj[i].name + "</option>";
});
- $("#loc4").html( htmlString );
+ $("#loc" + data.child_level).html(
htmlString );
}
else
{
htmlString += "<option>Ingen
lokasjoner</option>"
- $("#loc4").html( htmlString );
+ $("#loc" + data.child_level).html(
htmlString );
}
- }
- });
+ }
+ });
});
$("#loc4").change(function () {
- var loc1 = $("#loc1").val();
- var loc2 = $("#loc2").val();
- var loc3 = $("#loc3").val();
- var loc4 = $(this).val();
- $("#loc5").html( "<option></option>" );
- if(!loc4)
+
+ if(!$(this).val())
{
return false;
}
- var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:loc1 + "-" + loc2 + "-" + loc3 + "-" + loc4};
+ var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:$(this).val(), field: 'loc4'};
var requestUrl = phpGWLink('registration/main.php', oArgs,
true);
-
+
var htmlString = "";
$.ajax({
@@ -145,38 +127,33 @@
success: function(data) {
if( data != null)
{
- htmlString = "<option value = ''>" +
data.length + " lokasjone(r) funnet</option>"
- var obj = data;
+ var obj = data.locations;
+ htmlString = "<option value = ''>" +
obj.length + " lokasjone(r) funnet</option>"
$.each(obj, function(i) {
htmlString += "<option
value='" + obj[i].id + "'>"+ obj[i].name + "</option>";
});
- $("#loc5").html( htmlString );
+ $("#loc" + data.child_level).html(
htmlString );
}
else
{
htmlString += "<option>Ingen
lokasjoner</option>"
- $("#loc5").html( htmlString );
+ $("#loc" + data.child_level).html(
htmlString );
}
- }
- });
+ }
+ });
});
$("#loc5").change(function () {
- var loc1 = $("#loc1").val();
- var loc2 = $("#loc2").val();
- var loc3 = $("#loc3").val();
- var loc4 = $("#loc4").val();
- var loc5 = $(this).val();
- $("#loc6").html( "<option></option>" );
- if(!loc5)
+
+ if(!$(this).val())
{
return false;
}
- var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:loc1 + "-" + loc2 + "-" + loc3 + "-" + loc4 + "-" + loc5};
+ var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:$(this).val(), field: 'loc5'};
var requestUrl = phpGWLink('registration/main.php', oArgs,
true);
-
+
var htmlString = "";
$.ajax({
@@ -186,21 +163,21 @@
success: function(data) {
if( data != null)
{
- htmlString = "<option value = ''>" +
data.length + " lokasjone(r) funnet</option>"
- var obj = data;
+ var obj = data.locations;
+ htmlString = "<option value = ''>" +
obj.length + " lokasjone(r) funnet</option>"
$.each(obj, function(i) {
htmlString += "<option
value='" + obj[i].id + "'>"+ obj[i].name + "</option>";
});
- $("#loc6").html( htmlString );
+ $("#loc" + data.child_level).html(
htmlString );
}
else
{
htmlString += "<option>Ingen
lokasjoner</option>"
- $("#loc6").html( htmlString );
+ $("#loc" + data.child_level).html(
htmlString );
}
- }
- });
+ }
+ });
});
/*
@@ -211,7 +188,7 @@
var loc_arr = loc_id.split('_');
var loc_level = parseInt(loc_arr[1]);
var new_loc_id = "loc_" + (parseInt(loc_level)+1);
-
+
var id = "";
var new_loc_code = "";
var level;
@@ -222,14 +199,14 @@
else
new_loc_code += $("#" + id).val();
}
-
+
if(!loc_code)
{
return false;
}
var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:new_loc_code};
var requestUrl = phpGWLink('registration/main.php', oArgs,
true);
-
+
var htmlString = "";
$.ajax({
@@ -241,8 +218,8 @@
{
htmlString = "<select
class='choose_loc' name='" + new_loc_id + "' id='" + new_loc_id + "' >" +
"<option
value = ''>" + data.length + " lokasjone(r) funnet</option>";
-
-
+
+
var obj = data;
$.each(obj, function(i) {
@@ -250,7 +227,7 @@
});
htmlString += "</select>";
-
+
$(thisSelectBox).after( htmlString );
}
else
@@ -258,8 +235,8 @@
htmlString += "<option>Ingen
lokasjoner</option>"
$(new_loc_id).html( htmlString );
}
- }
- });
+ }
+ });
});
*/
Modified: branches/Version-1_0-branch/registration/main.php
===================================================================
--- branches/Version-1_0-branch/registration/main.php 2012-05-19 19:38:43 UTC
(rev 9410)
+++ branches/Version-1_0-branch/registration/main.php 2012-05-20 07:46:55 UTC
(rev 9411)
@@ -84,13 +84,14 @@
include(PHPGW_API_INC.'/functions.inc.php');
+ $c = createobject('phpgwapi.config','registration');
+ $c->read();
+ $config = $c->config_data;
+
// Make sure we're always logged in
if (!phpgw::get_var(session_name()) ||
!$GLOBALS['phpgw']->session->verify())
{
- $c = createobject('phpgwapi.config','registration');
- $c->read();
- $config = $c->config_data;
//_debug_array($config);die();
$login = $c->config_data['anonymous_user'];
@@ -229,8 +230,16 @@
else
{
$app = 'registration';
- $class = 'uireg';
- $method = 'step1';
+ if($config['username_is'] != 'email')
+ {
+ $class = 'uireg';
+ $method = 'step1';
+ }
+ else
+ {
+ $class = 'boreg';
+ $method = 'step1';
+ }
}
$GLOBALS[$class] = CreateObject("{$app}.{$class}");
Modified: branches/Version-1_0-branch/registration/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/setup/default_records.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/setup/default_records.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -26,3 +26,11 @@
$GLOBALS['phpgw_setup']->oProc->query ("INSERT INTO phpgw_config
(config_app, config_name, config_value) VALUES
('registration','activate_account','email')");
$GLOBALS['phpgw_setup']->oProc->query ("INSERT INTO phpgw_config
(config_app, config_name, config_value) VALUES
('registration','username_is','choice')");
$GLOBALS['phpgw_setup']->oProc->query ("INSERT INTO phpgw_config
(config_app, config_name, config_value) VALUES
('registration','password_is','choice')");
+
+ $asyncservice = CreateObject('phpgwapi.asyncservice');
+ $asyncservice->set_timer(
+ array('hour' => "*/2"),
+ 'registration_clear_reg_accounts',
+ 'registration.hook_helper.clear_reg_accounts',
+ null
+ );
Modified: branches/Version-1_0-branch/registration/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/registration/setup/phpgw_no.lang
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/setup/phpgw_no.lang
2012-05-20 07:46:55 UTC (rev 9411)
@@ -32,6 +32,7 @@
type registration no Type
update/add registration no Oppdater/Legg til
Username registration no Brukernavn
+username as email registration no Angi epost som brukernavn
values (for dropdown only; comma separated) registration no Verdi
(bare for Dropdown; comma separert)
wrong session registration no Feil session
you have entered an invalid birthday registration no Du har angitt
en ugyldig fødselsdag
Modified: branches/Version-1_0-branch/registration/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/setup/setup.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/setup/setup.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -16,7 +16,7 @@
/* Basic information about this app */
$setup_info['registration']['name'] =
'registration';
- $setup_info['registration']['version'] = '0.8.4';
+ $setup_info['registration']['version'] = '0.8.5';
$setup_info['registration']['app_order'] = '90';
$setup_info['registration']['enable'] = 2;
$setup_info['registration']['app_group'] = 'other';
@@ -32,7 +32,7 @@
(
'menu' => 'registration.menu.get_menu',
'config',
- 'logout'
+ 'logout' => 'registration.hook_helper.clear_reg_accounts'
);
Modified: branches/Version-1_0-branch/registration/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/setup/tables_update.inc.php
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/setup/tables_update.inc.php
2012-05-20 07:46:55 UTC (rev 9411)
@@ -59,4 +59,25 @@
$GLOBALS['setup_info']['registration']['currentver'] =
'0.8.4';
return
$GLOBALS['setup_info']['registration']['currentver'];
}
- }
+ }
+
+ $test[] = '0.8.4';
+ function registration_upgrade0_8_4()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $asyncservice = CreateObject('phpgwapi.asyncservice');
+ $asyncservice->set_timer(
+ array('hour' => "*/2"),
+ 'registration_clear_reg_accounts',
+ 'registration.hook_helper.clear_reg_accounts',
+ null
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['registration']['currentver'] =
'0.8.5';
+ return
$GLOBALS['setup_info']['registration']['currentver'];
+ }
+ }
+
Modified: branches/Version-1_0-branch/registration/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/registration/templates/base/config.tpl
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/templates/base/config.tpl
2012-05-20 07:46:55 UTC (rev 9411)
@@ -60,6 +60,7 @@
<td>
<select name="newsettings[username_is]">
<option
value="choice"{selected_username_is_choice}>{lang_Users_Choice}</option>
+ <option
value="email"{selected_username_is_email}>{lang_email_address}</option>
<option
value="http"{selected_username_is_http}>{lang_HTTP_Username}</option>
</select>
</td>
Modified:
branches/Version-1_0-branch/registration/templates/base/loginid_select.tpl
===================================================================
--- branches/Version-1_0-branch/registration/templates/base/loginid_select.tpl
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/templates/base/loginid_select.tpl
2012-05-20 07:46:55 UTC (rev 9411)
@@ -4,17 +4,13 @@
<!-- BEGIN input -->
<form action="{form_action}" method="POST">
<table border="0" width="40%" align="center">
- <tr >
- <td>{lang_domain}</td>
- <td>
- <select name="logindomain" id="logindomain"
class="inputbox">
- {domain_options}
- </select>
- </td>
- </tr>
+
<tr>
+ {domain_select}
+ </tr>
+ <tr>
<td>{lang_username}</td>
- <td><input name="r_reg[loginid]" value="{value_username}"></td>
+ <td>{domain_from_host}<input name="r_reg[loginid]"
value="{value_username}"></td>
</tr>
<tr>
Modified:
branches/Version-1_0-branch/registration/templates/base/personal_info.tpl
===================================================================
--- branches/Version-1_0-branch/registration/templates/base/personal_info.tpl
2012-05-19 19:38:43 UTC (rev 9410)
+++ branches/Version-1_0-branch/registration/templates/base/personal_info.tpl
2012-05-20 07:46:55 UTC (rev 9411)
@@ -42,9 +42,24 @@
{javascript}
+<center>{message}</center>
<center>{errors}</center>
<form action="{form_action}" method="POST">
<table border="0" width="75%" align="center">
+
+<!-- BEGIN username -->
+ <tr>
+ <td width="1%"></td>
+ {domain_select}
+ </tr>
+ <tr>
+ <td width="1%">{missing_loginid}</td>
+ <td>{lang_username}</td>
+ <td>{domain_from_host}<input name="r_reg[loginid]"
value="{value_username}"></td>
+ </tr>
+<!-- END username -->
+
+
<!-- BEGIN password -->
<tr>
<td width="1%">{missing_passwd}</td>
Copied: branches/Version-1_0-branch/rental/sonar-project.properties (from rev
9410, trunk/rental/sonar-project.properties)
===================================================================
--- branches/Version-1_0-branch/rental/sonar-project.properties
(rev 0)
+++ branches/Version-1_0-branch/rental/sonar-project.properties 2012-05-20
07:46:55 UTC (rev 9411)
@@ -0,0 +1,24 @@
+#Project-file used by Sonar. Added by Erik Holm-Larsen, Bouvet AS
+# required metadata
+sonar.projectKey=no.bouvet.portico:rental
+sonar.projectName=PorticoEstate Leiemodul
+sonar.projectVersion=1.0-SNAPSHOT
+
+# path to source directories (required)
+#sources=jenkins_checkout/pe/controller,jenkins_checkout/pe/rental,jenkins_checkout/pe/activitycalendar
+sources=.
+tests=../tests
+
+sonar.language=php
+
+#sonar.scm.url=scm:svn:http://svn.codehaus.org/sonar-plugins/trunk/php/math-php-test
+sonar.scm.url=scm:svn:http://svn.savannah.nongnu.org/svn/fmsystem/trunk/
+
+#sonar.phpUnit.mainTestClass=source/tests/AllTests2.php
+sonar.phpUnit.mainTestClass=../tests.php
+sonar.phpcpd.excludes=../tests.php
+
+# Example of properties that can be uncommented to enable reuse of existing
PHP Code Sniffer reports
+#sonar.phpCodesniffer.analyzeOnly=true
+#sonar.phpCodesniffer.reportFileRelativePath=../../logs
+#sonar.phpCodesniffer.reportFileName=cs-report.xml
\ No newline at end of file
Copied: branches/Version-1_0-branch/tests.php (from rev 9410, trunk/tests.php)
===================================================================
--- branches/Version-1_0-branch/tests.php (rev 0)
+++ branches/Version-1_0-branch/tests.php 2012-05-20 07:46:55 UTC (rev
9411)
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Dummy PHPUnit test-file used by Sonar during automatic build via Jenkins.
+ *
+ *
+ * This file is part of phpUnderControl.
+ *
+ * Copyright (c) 2007-2009, Manuel Pichler <address@hidden>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * * Neither the name of Manuel Pichler nor the names of his
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+require_once 'PHPUnit/Framework/TestCase.php';
+
+
+/**
+ * Simple math test class.
+ *
+ * @package Example
+ * @author Manuel Pichler <address@hidden>
+ * @copyright 2007-2009 Manuel Pichler. All rights reserved.
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version Release: 0.5.0
+ * @link http://www.phpundercontrol.org/
+ */
+class tests extends PHPUnit_Framework_TestCase
+{
+ /**
+ * The used math object.
+ *
+ * @var PhpUnderControl_Example_Math $math
+ */
+ protected $math = null;
+
+ /**
+ * Creates a new address@hidden PhpUnderControl_Example_Math} object.
+ */
+ public function setUp()
+ {
+ parent::setUp();
+
+ $this->math = new tests();
+ }
+
+ /**
+ * Successful test.
+ */
+ public function testAddSuccess()
+ {
+ $this->assertEquals(4, 4);
+ }
+
+}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9411] Merge 9403:9410 from trunk,
Sigurd Nes <=