[icinga-checkins] icinga.org: icinga-web/master: * Fixed last commit, commas were lost during regexp transformation

git at icinga.org git at icinga.org
Wed Jan 4 19:11:25 CET 2012


Module: icinga-web
Branch: master
Commit: 097bf9cf3ff1b361a7489d7e0388a7801d4c0652
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=097bf9cf3ff1b361a7489d7e0388a7801d4c0652

Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Wed Jan  4 19:09:44 2012 +0100

* Fixed last commit, commas were lost during regexp transformation

---

 .../LegacyLayer/TargetModifierModel.class.php      |   46 ++++++++++----------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
index 30e8456..8ebc622 100644
--- a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
+++ b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
@@ -76,29 +76,29 @@ class Api_Store_LegacyLayer_TargetModifierModel extends IcingaStoreTargetModifie
             'CONTACT_NAME'                 =>        'oc.name1',
             'CONTACT_CUSTOMVARIABLE_NAME'        =>  'cvsc.varname',
             'CONTACT_CUSTOMVARIABLE_VALUE'        => 'cvsc.varvalue',
-            'CONTACT_CONTACT_ID'     =>      'cgm.contact_id'
-            'CONTACT_INSTANCE_ID'    =>      'cgm.instance_id'
-            'CONTACT_CONFIG_TYPE'    =>      'cgm.config_type'
-            'CONTACT_CONTACT_OBJECT_ID'      =>      'cgm.contact_object_id'
-            'CONTACT_ALIAS'  =>      'cgm.alias'
-            'CONTACT_EMAIL_ADDRESS'  =>      'cgm.email_address'
-            'CONTACT_PAGER_ADDRESS'  =>      'cgm.pager_address'
-            'CONTACT_HOST_TIMEPERIOD_OBJECT_ID'      =>      'cgm.host_timeperiod_object_id'
-            'CONTACT_SERVICE_TIMEPERIOD_OBJECT_ID'   =>      'cgm.service_timeperiod_object_id'
-            'CONTACT_HOST_NOTIFICATIONS_ENABLED'     =>      'cgm.host_notifications_enabled'
-            'CONTACT_SERVICE_NOTIFICATIONS_ENABLED'  =>      'cgm.service_notifications_enabled'
-            'CONTACT_CAN_SUBMIT_COMMANDS'    =>      'cgm.can_submit_commands'
-            'CONTACT_NOTIFY_SERVICE_RECOVERY'        =>      'cgm.notify_service_recovery'
-            'CONTACT_NOTIFY_SERVICE_WARNING'         =>      'cgm.notify_service_warning'
-            'CONTACT_NOTIFY_SERVICE_UNKNOWN'         =>      'cgm.notify_service_unknown'
-            'CONTACT_NOTIFY_SERVICE_CRITICAL'        =>      'cgm.notify_service_critical'
-            'CONTACT_NOTIFY_SERVICE_FLAPPING'        =>      'cgm.notify_service_flapping'
-            'CONTACT_NOTIFY_SERVICE_DOWNTIME'        =>      'cgm.notify_service_downtime'
-            'CONTACT_NOTIFY_HOST_RECOVERY'   =>      'cgm.notify_host_recovery'
-            'CONTACT_NOTIFY_HOST_DOWN'       =>      'cgm.notify_host_down'
-            'CONTACT_NOTIFY_HOST_UNREACHABLE'        =>      'cgm.notify_host_unreachable'
-            'CONTACT_NOTIFY_HOST_FLAPPING'   =>      'cgm.notify_host_flapping'
-            'CONTACT_NOTIFY_HOST_DOWNTIME'   =>      'cgm.notify_host_downtime'
+            'CONTACT_CONTACT_ID'     =>      'cgm.contact_id',
+            'CONTACT_INSTANCE_ID'    =>      'cgm.instance_id',
+            'CONTACT_CONFIG_TYPE'    =>      'cgm.config_type',
+            'CONTACT_CONTACT_OBJECT_ID'      =>      'cgm.contact_object_id',
+            'CONTACT_ALIAS'  =>      'cgm.alias',
+            'CONTACT_EMAIL_ADDRESS'  =>      'cgm.email_address',
+            'CONTACT_PAGER_ADDRESS'  =>      'cgm.pager_address',
+            'CONTACT_HOST_TIMEPERIOD_OBJECT_ID'      =>      'cgm.host_timeperiod_object_id',
+            'CONTACT_SERVICE_TIMEPERIOD_OBJECT_ID'   =>      'cgm.service_timeperiod_object_id',
+            'CONTACT_HOST_NOTIFICATIONS_ENABLED'     =>      'cgm.host_notifications_enabled',
+            'CONTACT_SERVICE_NOTIFICATIONS_ENABLED'  =>      'cgm.service_notifications_enabled',
+            'CONTACT_CAN_SUBMIT_COMMANDS'    =>      'cgm.can_submit_commands',
+            'CONTACT_NOTIFY_SERVICE_RECOVERY'        =>      'cgm.notify_service_recovery',
+            'CONTACT_NOTIFY_SERVICE_WARNING'         =>      'cgm.notify_service_warning',
+            'CONTACT_NOTIFY_SERVICE_UNKNOWN'         =>      'cgm.notify_service_unknown',
+            'CONTACT_NOTIFY_SERVICE_CRITICAL'        =>      'cgm.notify_service_critical',
+            'CONTACT_NOTIFY_SERVICE_FLAPPING'        =>      'cgm.notify_service_flapping',
+            'CONTACT_NOTIFY_SERVICE_DOWNTIME'        =>      'cgm.notify_service_downtime',
+            'CONTACT_NOTIFY_HOST_RECOVERY'   =>      'cgm.notify_host_recovery',
+            'CONTACT_NOTIFY_HOST_DOWN'       =>      'cgm.notify_host_down',
+            'CONTACT_NOTIFY_HOST_UNREACHABLE'        =>      'cgm.notify_host_unreachable',
+            'CONTACT_NOTIFY_HOST_FLAPPING'   =>      'cgm.notify_host_flapping',
+            'CONTACT_NOTIFY_HOST_DOWNTIME'   =>      'cgm.notify_host_downtime',
             
             // Timeperiod data
             'TIMEPERIOD_ID'                =>        'tp.timeperiod_id',





More information about the icinga-checkins mailing list