Merge branch 'master' of github.com:VitexSoftware/Icinga-Editor

Vitexus · Vitexus · commit e2237a5c7baf · 2016-07-28T11:21:42.000+02:00
diff --git a/src/classes/NSCPConfigBatGenerator.php b/src/classes/NSCPConfigBatGenerator.php
@@ -137,6 +137,7 @@ function cfgInit()
             case 'windows':
                 $this->nscBatArray = ['
 @ECHO OFF
+powershell Set-ExecutionPolicy ByPass
 set NSCDIR=%ProgramFiles%\NSClient++\
 set NSCLIENT="%NSCDIR%\nscp.exe"
 set ICINGA_SERVER="'.$this->prefs['serverip'].'"
@@ -501,4 +502,5 @@ public function deployScripts()
             }
         }
     }
-}
+}
+

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,7 @@ function cfgInit()`
`137`	`137`	`case 'windows':`
`138`	`138`	`$this->nscBatArray = ['`
`139`	`139`	`@ECHO OFF`
	`140`	`+powershell Set-ExecutionPolicy ByPass`
`140`	`141`	`set NSCDIR=%ProgramFiles%\NSClient++\`
`141`	`142`	`set NSCLIENT="%NSCDIR%\nscp.exe"`
`142`	`143`	`set ICINGA_SERVER="'.$this->prefs['serverip'].'"`
`@@ -501,4 +502,5 @@ public function deployScripts()`
`501`	`502`	`}`
`502`	`503`	`}`
`503`	`504`	`}`
`504`		`-}`
	`505`	`+}`
	`506`	`+`