@@ -21,19 +21,19 @@ discard block |
||
| 21 | 21 | /************ Trapdb ***********/ |
| 22 | 22 | try |
| 23 | 23 | { |
| 24 | - $dbConn = $this->getUIDatabase()->getDbConn(); |
|
| 24 | + $dbConn=$this->getUIDatabase()->getDbConn(); |
|
| 25 | 25 | if ($dbConn === null) throw new \ErrorException('uncatched db error'); |
| 26 | - $query = $dbConn->select()->from( |
|
| 26 | + $query=$dbConn->select()->from( |
|
| 27 | 27 | $this->getModuleConfig()->getTrapTableName(), |
| 28 | 28 | array('COUNT(*)') |
| 29 | 29 | ); |
| 30 | 30 | $this->view->trap_count=$dbConn->fetchOne($query); |
| 31 | - $query = $dbConn->select()->from( |
|
| 31 | + $query=$dbConn->select()->from( |
|
| 32 | 32 | $this->getModuleConfig()->getTrapDataTableName(), |
| 33 | 33 | array('COUNT(*)') |
| 34 | 34 | ); |
| 35 | 35 | $this->view->trap_object_count=$dbConn->fetchOne($query); |
| 36 | - $query = $dbConn->select()->from( |
|
| 36 | + $query=$dbConn->select()->from( |
|
| 37 | 37 | $this->getModuleConfig()->getTrapRuleName(), |
| 38 | 38 | array('COUNT(*)') |
| 39 | 39 | ); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | } |
| 45 | 45 | catch (Exception $e) |
| 46 | 46 | { |
| 47 | - $this->displayExitError('status',$e->getMessage()); |
|
| 47 | + $this->displayExitError('status', $e->getMessage()); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /*************** Log destination *******************/ |
@@ -59,20 +59,20 @@ discard block |
||
| 59 | 59 | } |
| 60 | 60 | catch (Exception $e) |
| 61 | 61 | { |
| 62 | - $this->displayExitError('status',$e->getMessage()); |
|
| 62 | + $this->displayExitError('status', $e->getMessage()); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /*************** SNMP configuration ****************/ |
| 66 | 66 | try |
| 67 | 67 | { |
| 68 | - $this->view->useSnmpTrapAddess= ( $this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1 ) ? TRUE : FALSE; |
|
| 68 | + $this->view->useSnmpTrapAddess=($this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1) ? TRUE : FALSE; |
|
| 69 | 69 | $this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid'); |
| 70 | - $this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE; |
|
| 70 | + $this->view->SnmpTrapAddressOIDDefault=($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid']) ? TRUE : FALSE; |
|
| 71 | 71 | |
| 72 | 72 | } |
| 73 | 73 | catch (Exception $e) |
| 74 | 74 | { |
| 75 | - $this->displayExitError('status',$e->getMessage()); |
|
| 75 | + $this->displayExitError('status', $e->getMessage()); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | if ($action == 'update_mib_db') |
| 99 | 99 | { // Do the update in background |
| 100 | 100 | $return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid'); |
| 101 | - if (preg_match('/OK/',$return)) |
|
| 101 | + if (preg_match('/OK/', $return)) |
|
| 102 | 102 | { |
| 103 | 103 | $this->_helper->json(array('status'=>'OK')); |
| 104 | 104 | } |
@@ -107,32 +107,32 @@ discard block |
||
| 107 | 107 | } |
| 108 | 108 | if ($action == 'check_update') |
| 109 | 109 | { |
| 110 | - $file=@fopen('/tmp/trapdirector_update.pid','r'); |
|
| 110 | + $file=@fopen('/tmp/trapdirector_update.pid', 'r'); |
|
| 111 | 111 | if ($file == false) |
| 112 | 112 | { // process is dead |
| 113 | - $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file')); |
|
| 113 | + $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'Cannot open file')); |
|
| 114 | 114 | return; |
| 115 | 115 | } |
| 116 | 116 | $pid=fgets($file); |
| 117 | 117 | $output=array(); |
| 118 | 118 | $retVal=0; |
| 119 | - exec('ps '.$pid,$output,$retVal); |
|
| 119 | + exec('ps '.$pid, $output, $retVal); |
|
| 120 | 120 | if ($retVal == 0) |
| 121 | 121 | { // process is alive |
| 122 | 122 | $this->_helper->json(array('status'=>'Alive and kicking')); |
| 123 | 123 | } |
| 124 | 124 | else |
| 125 | 125 | { // process is dead |
| 126 | - $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid)); |
|
| 126 | + $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'no proc'.$pid)); |
|
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | - $this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' )); |
|
| 129 | + $this->_helper->json(array('status'=>'ERR : no '.$action.' action possible')); |
|
| 130 | 130 | } |
| 131 | 131 | /** Check for mib file UPLOAD */ |
| 132 | 132 | if (isset($_FILES['mibfile'])) |
| 133 | 133 | { |
| 134 | - $name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING); |
|
| 135 | - $DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs')); |
|
| 134 | + $name=filter_var($_FILES['mibfile']['name'], FILTER_SANITIZE_STRING); |
|
| 135 | + $DirConf=explode(':', $this->Config()->get('config', 'snmptranslate_dirs')); |
|
| 136 | 136 | $destDir=array_shift($DirConf); |
| 137 | 137 | if (!is_dir($destDir)) |
| 138 | 138 | { |
@@ -146,9 +146,9 @@ discard block |
||
| 146 | 146 | } |
| 147 | 147 | else |
| 148 | 148 | { |
| 149 | - $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name"; |
|
| 150 | - $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING); |
|
| 151 | - if (move_uploaded_file($sourceTmpNam,$destination)===false) |
|
| 149 | + $destination=$destDir.'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name"; |
|
| 150 | + $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'], FILTER_SANITIZE_STRING); |
|
| 151 | + if (move_uploaded_file($sourceTmpNam, $destination) === false) |
|
| 152 | 152 | { |
| 153 | 153 | $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations"; |
| 154 | 154 | } |
@@ -164,16 +164,16 @@ discard block |
||
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | // snmptranslate tests |
| 167 | - $snmptranslate = $this->Config()->get('config', 'snmptranslate'); |
|
| 167 | + $snmptranslate=$this->Config()->get('config', 'snmptranslate'); |
|
| 168 | 168 | $this->view->snmptranslate_bin=$snmptranslate; |
| 169 | 169 | $this->view->snmptranslate_state='warn'; |
| 170 | - if (is_executable ( $snmptranslate )) |
|
| 170 | + if (is_executable($snmptranslate)) |
|
| 171 | 171 | { |
| 172 | - $translate=exec($snmptranslate . ' 1'); |
|
| 173 | - if (preg_match('/iso/',$translate)) |
|
| 172 | + $translate=exec($snmptranslate.' 1'); |
|
| 173 | + if (preg_match('/iso/', $translate)) |
|
| 174 | 174 | { |
| 175 | - $translate=exec($snmptranslate . ' 1.3.6.1.4'); |
|
| 176 | - if (preg_match('/private/',$translate)) |
|
| 175 | + $translate=exec($snmptranslate.' 1.3.6.1.4'); |
|
| 176 | + if (preg_match('/private/', $translate)) |
|
| 177 | 177 | { |
| 178 | 178 | $this->view->snmptranslate='works fine'; |
| 179 | 179 | $this->view->snmptranslate_state='ok'; |
@@ -196,46 +196,46 @@ discard block |
||
| 196 | 196 | // mib database |
| 197 | 197 | |
| 198 | 198 | $this->view->mibDbCount=$this->getMIB()->countObjects(); |
| 199 | - $this->view->mibDbCountTrap=$this->getMIB()->countObjects(null,21); |
|
| 199 | + $this->view->mibDbCountTrap=$this->getMIB()->countObjects(null, 21); |
|
| 200 | 200 | |
| 201 | 201 | // mib dirs |
| 202 | 202 | $DirConf=$this->Config()->get('config', 'snmptranslate_dirs'); |
| 203 | - $dirArray=explode(':',$DirConf); |
|
| 203 | + $dirArray=explode(':', $DirConf); |
|
| 204 | 204 | |
| 205 | 205 | // Get base directories from net-snmp-config |
| 206 | 206 | $output=$matches=array(); |
| 207 | 207 | $retVal=0; |
| 208 | - $sysDirs=exec('net-snmp-config --default-mibdirs',$output,$retVal); |
|
| 209 | - if ($retVal==0) |
|
| 208 | + $sysDirs=exec('net-snmp-config --default-mibdirs', $output, $retVal); |
|
| 209 | + if ($retVal == 0) |
|
| 210 | 210 | { |
| 211 | - $dirArray=array_merge($dirArray,explode(':',$sysDirs)); |
|
| 211 | + $dirArray=array_merge($dirArray, explode(':', $sysDirs)); |
|
| 212 | 212 | } |
| 213 | 213 | else |
| 214 | 214 | { |
| 215 | - $translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS'); |
|
| 216 | - if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches)) |
|
| 215 | + $translateOut=exec($this->Config()->get('config', 'snmptranslate').' -Dinit_mib .1.3 2>&1 | grep MIBDIRS'); |
|
| 216 | + if (preg_match('/MIBDIRS.*\'([^\']+)\'/', $translateOut, $matches)) |
|
| 217 | 217 | { |
| 218 | - $dirArray=array_merge($dirArray,explode(':',$matches[1])); |
|
| 218 | + $dirArray=array_merge($dirArray, explode(':', $matches[1])); |
|
| 219 | 219 | } |
| 220 | 220 | else |
| 221 | 221 | { |
| 222 | - array_push($dirArray,'Install net-snmp-config to see system directories'); |
|
| 222 | + array_push($dirArray, 'Install net-snmp-config to see system directories'); |
|
| 223 | 223 | } |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | $this->view->dirArray=$dirArray; |
| 227 | 227 | |
| 228 | 228 | $output=null; |
| 229 | - foreach (explode(':',$DirConf) as $mibdir) |
|
| 229 | + foreach (explode(':', $DirConf) as $mibdir) |
|
| 230 | 230 | { |
| 231 | - exec('ls '.$mibdir.' | grep -v traplist.txt',$output); |
|
| 231 | + exec('ls '.$mibdir.' | grep -v traplist.txt', $output); |
|
| 232 | 232 | } |
| 233 | 233 | //$i=0;$listFiles='';while (isset($output[$i])) $listFiles.=$output[$i++]; |
| 234 | 234 | //$this->view->fileList=explode(' ',$listFiles); |
| 235 | 235 | $this->view->fileList=$output; |
| 236 | 236 | |
| 237 | 237 | // Zend form |
| 238 | - $this->view->form= new UploadForm(); |
|
| 238 | + $this->view->form=new UploadForm(); |
|
| 239 | 239 | //$this->view->form= new Form('upload-form'); |
| 240 | 240 | |
| 241 | 241 | |
@@ -250,9 +250,9 @@ discard block |
||
| 250 | 250 | $this->view->setOKMsg=''; |
| 251 | 251 | |
| 252 | 252 | //max_rows=25&row_update=update |
| 253 | - if ( $this->getRequest()->getParam('max_rows',NULL) !== NULL ) |
|
| 253 | + if ($this->getRequest()->getParam('max_rows', NULL) !== NULL) |
|
| 254 | 254 | { |
| 255 | - $maxRows = $this->getRequest()->getParam('max_rows'); |
|
| 255 | + $maxRows=$this->getRequest()->getParam('max_rows'); |
|
| 256 | 256 | if (!preg_match('/^[0-9]+$/', $maxRows) || $maxRows < 1) |
| 257 | 257 | { |
| 258 | 258 | $this->view->setError='Max rows must be a number'; |
@@ -260,21 +260,21 @@ discard block |
||
| 260 | 260 | else |
| 261 | 261 | { |
| 262 | 262 | $this->setitemListDisplay($maxRows); |
| 263 | - $this->view->setOKMsg='Set max rows to ' . $maxRows; |
|
| 263 | + $this->view->setOKMsg='Set max rows to '.$maxRows; |
|
| 264 | 264 | } |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | - if ( $this->getRequest()->getParam('add_category',NULL) !== NULL ) |
|
| 267 | + if ($this->getRequest()->getParam('add_category', NULL) !== NULL) |
|
| 268 | 268 | { |
| 269 | - $addCat = $this->getRequest()->getParam('add_category'); |
|
| 269 | + $addCat=$this->getRequest()->getParam('add_category'); |
|
| 270 | 270 | $this->addHandlersCategory($addCat); |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | - if ( $this->getRequest()->getPost('type',NULL) !== NULL ) |
|
| 273 | + if ($this->getRequest()->getPost('type', NULL) !== NULL) |
|
| 274 | 274 | { |
| 275 | - $type = $this->getRequest()->getPost('type',NULL); |
|
| 276 | - $index = $this->getRequest()->getPost('index',NULL); |
|
| 277 | - $newname = $this->getRequest()->getPost('newname',NULL); |
|
| 275 | + $type=$this->getRequest()->getPost('type', NULL); |
|
| 276 | + $index=$this->getRequest()->getPost('index', NULL); |
|
| 277 | + $newname=$this->getRequest()->getPost('newname', NULL); |
|
| 278 | 278 | |
| 279 | 279 | if (!preg_match('/^[0-9]+$/', $index) || $index < 1) |
| 280 | 280 | $this->_helper->json(array('status'=>'Bad index')); |
@@ -298,9 +298,9 @@ discard block |
||
| 298 | 298 | } |
| 299 | 299 | } |
| 300 | 300 | |
| 301 | - $this->view->maxRows = $this->itemListDisplay(); |
|
| 301 | + $this->view->maxRows=$this->itemListDisplay(); |
|
| 302 | 302 | |
| 303 | - $this->view->categories = $this->getHandlersCategory(); |
|
| 303 | + $this->view->categories=$this->getHandlersCategory(); |
|
| 304 | 304 | |
| 305 | 305 | |
| 306 | 306 | |
@@ -324,18 +324,18 @@ discard block |
||
| 324 | 324 | $this->view->templateForm_output=''; |
| 325 | 325 | if (isset($postData['template_name']) && isset($postData['template_revert_time'])) |
| 326 | 326 | { |
| 327 | - $template_create = 'icingacli director service create --json \'{ "check_command": "dummy", '; |
|
| 328 | - $template_create .= '"check_interval": "' .$postData['template_revert_time']. '", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", '; |
|
| 329 | - $template_create .= '"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\''; |
|
| 327 | + $template_create='icingacli director service create --json \'{ "check_command": "dummy", '; |
|
| 328 | + $template_create.='"check_interval": "'.$postData['template_revert_time'].'", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", '; |
|
| 329 | + $template_create.='"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\''; |
|
| 330 | 330 | $output=array(); |
| 331 | 331 | $ret_code=0; |
| 332 | - exec($template_create,$output,$ret_code); |
|
| 332 | + exec($template_create, $output, $ret_code); |
|
| 333 | 333 | if ($ret_code != 0) |
| 334 | 334 | { |
| 335 | - $this->displayExitError("Status -> Services","Error creating template : ".$output[0].'<br>Command was : '.$template_create); |
|
| 335 | + $this->displayExitError("Status -> Services", "Error creating template : ".$output[0].'<br>Command was : '.$template_create); |
|
| 336 | 336 | } |
| 337 | - exec('icingacli director config deploy',$output,$ret_code); |
|
| 338 | - $this->view->templateForm_output='Template '.$postData['template_name']. ' created'; |
|
| 337 | + exec('icingacli director config deploy', $output, $ret_code); |
|
| 338 | + $this->view->templateForm_output='Template '.$postData['template_name'].' created'; |
|
| 339 | 339 | } |
| 340 | 340 | |
| 341 | 341 | // template creation form |
@@ -351,15 +351,15 @@ discard block |
||
| 351 | 351 | { |
| 352 | 352 | $this->prepareTabs()->activate('plugins'); |
| 353 | 353 | |
| 354 | - require_once($this->Module()->getBaseDir() .'/bin/trap_class.php'); |
|
| 354 | + require_once($this->Module()->getBaseDir().'/bin/trap_class.php'); |
|
| 355 | 355 | $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc'); |
| 356 | - $Trap = new Trap($icingaweb2_etc,4); |
|
| 356 | + $Trap=new Trap($icingaweb2_etc, 4); |
|
| 357 | 357 | |
| 358 | - $this->view->pluginLoaded = htmlentities($Trap->pluginClass->registerAllPlugins(false)); |
|
| 358 | + $this->view->pluginLoaded=htmlentities($Trap->pluginClass->registerAllPlugins(false)); |
|
| 359 | 359 | |
| 360 | - $enabledPlugins = $Trap->pluginClass->getEnabledPlugins(); |
|
| 360 | + $enabledPlugins=$Trap->pluginClass->getEnabledPlugins(); |
|
| 361 | 361 | |
| 362 | - $pluginList = $Trap->pluginClass->pluginList(); |
|
| 362 | + $pluginList=$Trap->pluginClass->pluginList(); |
|
| 363 | 363 | |
| 364 | 364 | // Plugin list and fill function name list |
| 365 | 365 | $functionList=array(); |
@@ -367,16 +367,16 @@ discard block |
||
| 367 | 367 | foreach ($pluginList as $plugin) |
| 368 | 368 | { |
| 369 | 369 | $pluginDetails=$Trap->pluginClass->pluginDetails($plugin); |
| 370 | - $pluginDetails->enabled = (in_array($plugin, $enabledPlugins)) ? true : false; |
|
| 371 | - $pluginDetails->catchAllTraps = ($pluginDetails->catchAllTraps === true )? 'Yes' : 'No'; |
|
| 372 | - $pluginDetails->processTraps = ($pluginDetails->processTraps === true )? 'Yes' : 'No'; |
|
| 373 | - $pluginDetails->description = htmlentities($pluginDetails->description); |
|
| 374 | - $pluginDetails->description = preg_replace('/\n/','<br>',$pluginDetails->description); |
|
| 370 | + $pluginDetails->enabled=(in_array($plugin, $enabledPlugins)) ? true : false; |
|
| 371 | + $pluginDetails->catchAllTraps=($pluginDetails->catchAllTraps === true) ? 'Yes' : 'No'; |
|
| 372 | + $pluginDetails->processTraps=($pluginDetails->processTraps === true) ? 'Yes' : 'No'; |
|
| 373 | + $pluginDetails->description=htmlentities($pluginDetails->description); |
|
| 374 | + $pluginDetails->description=preg_replace('/\n/', '<br>', $pluginDetails->description); |
|
| 375 | 375 | array_push($this->view->pluginArray, $pluginDetails); |
| 376 | 376 | // Get functions for function details |
| 377 | 377 | foreach ($pluginDetails->funcArray as $function) |
| 378 | 378 | { |
| 379 | - array_push($functionList,$function); |
|
| 379 | + array_push($functionList, $function); |
|
| 380 | 380 | } |
| 381 | 381 | } |
| 382 | 382 | |
@@ -384,10 +384,10 @@ discard block |
||
| 384 | 384 | $this->view->functionList=array(); |
| 385 | 385 | foreach ($functionList as $function) |
| 386 | 386 | { |
| 387 | - $functionDetail = $Trap->pluginClass->getFunctionDetails($function); |
|
| 388 | - $functionDetail->params = htmlentities($functionDetail->params); |
|
| 389 | - $functionDetail->description = htmlentities($functionDetail->description); |
|
| 390 | - $functionDetail->description = preg_replace('/\n/','<br>',$functionDetail->description); |
|
| 387 | + $functionDetail=$Trap->pluginClass->getFunctionDetails($function); |
|
| 388 | + $functionDetail->params=htmlentities($functionDetail->params); |
|
| 389 | + $functionDetail->description=htmlentities($functionDetail->description); |
|
| 390 | + $functionDetail->description=preg_replace('/\n/', '<br>', $functionDetail->description); |
|
| 391 | 391 | array_push($this->view->functionList, $functionDetail); |
| 392 | 392 | } |
| 393 | 393 | |
@@ -403,20 +403,20 @@ discard block |
||
| 403 | 403 | $postData=$this->getRequest()->getPost(); |
| 404 | 404 | if (isset($postData['input1'])) |
| 405 | 405 | { |
| 406 | - $input1 = $postData['input1']; |
|
| 407 | - $input2 = $postData['input2']; |
|
| 408 | - $input3 = $postData['input3']; |
|
| 406 | + $input1=$postData['input1']; |
|
| 407 | + $input2=$postData['input2']; |
|
| 408 | + $input3=$postData['input3']; |
|
| 409 | 409 | |
| 410 | 410 | //$this->view->answer=$input1 . '/' . $input2 . '/' . $input3; |
| 411 | 411 | try { |
| 412 | - $API = $this->getIdoConn(); |
|
| 412 | + $API=$this->getIdoConn(); |
|
| 413 | 413 | //$hosts = $API->getHostByIP($input1); |
| 414 | - $hosts = $API->getHostsIPByHostGroup($input1); |
|
| 415 | - $this->view->answer = print_r($hosts,true); |
|
| 414 | + $hosts=$API->getHostsIPByHostGroup($input1); |
|
| 415 | + $this->view->answer=print_r($hosts, true); |
|
| 416 | 416 | |
| 417 | 417 | } catch (Exception $e) |
| 418 | 418 | { |
| 419 | - $this->view->answer = "Exception : " . print_r($e->getMessage()); |
|
| 419 | + $this->view->answer="Exception : ".print_r($e->getMessage()); |
|
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | } |
@@ -427,19 +427,19 @@ discard block |
||
| 427 | 427 | { |
| 428 | 428 | return $this->getTabs()->add('status', array( |
| 429 | 429 | 'label' => $this->translate('Status'), |
| 430 | - 'url' => $this->getModuleConfig()->urlPath() . '/status') |
|
| 430 | + 'url' => $this->getModuleConfig()->urlPath().'/status') |
|
| 431 | 431 | )->add('mib', array( |
| 432 | 432 | 'label' => $this->translate('MIB Management'), |
| 433 | - 'url' => $this->getModuleConfig()->urlPath() . '/status/mib') |
|
| 433 | + 'url' => $this->getModuleConfig()->urlPath().'/status/mib') |
|
| 434 | 434 | )->add('uimgt', array( |
| 435 | 435 | 'label' => $this->translate('UI Configuration'), |
| 436 | - 'url' => $this->getModuleConfig()->urlPath() . '/status/uimgt') |
|
| 436 | + 'url' => $this->getModuleConfig()->urlPath().'/status/uimgt') |
|
| 437 | 437 | )->add('services', array( |
| 438 | 438 | 'label' => $this->translate('Services management'), |
| 439 | - 'url' => $this->getModuleConfig()->urlPath() . '/status/services') |
|
| 439 | + 'url' => $this->getModuleConfig()->urlPath().'/status/services') |
|
| 440 | 440 | )->add('plugins', array( |
| 441 | 441 | 'label' => $this->translate('Plugins management'), |
| 442 | - 'url' => $this->getModuleConfig()->urlPath() . '/status/plugins') |
|
| 442 | + 'url' => $this->getModuleConfig()->urlPath().'/status/plugins') |
|
| 443 | 443 | ); |
| 444 | 444 | } |
| 445 | 445 | } |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | // TODO : see if useless |
| 448 | 448 | class UploadForm extends Form |
| 449 | 449 | { |
| 450 | - public function __construct($options = null) |
|
| 450 | + public function __construct($options=null) |
|
| 451 | 451 | { |
| 452 | 452 | parent::__construct($options); |
| 453 | 453 | $this->addElements2(); |
@@ -456,11 +456,11 @@ discard block |
||
| 456 | 456 | public function addElements2() |
| 457 | 457 | { |
| 458 | 458 | // File Input |
| 459 | - $file = new File('mib-file'); |
|
| 459 | + $file=new File('mib-file'); |
|
| 460 | 460 | $file->setLabel('Mib upload'); |
| 461 | 461 | //->setAttrib('multiple', null); |
| 462 | 462 | $this->addElement($file); |
| 463 | - $button = new Submit("upload",array('ignore'=>false)); |
|
| 464 | - $this->addElement($button);//->setIgnore(false); |
|
| 463 | + $button=new Submit("upload", array('ignore'=>false)); |
|
| 464 | + $this->addElement($button); //->setIgnore(false); |
|
| 465 | 465 | } |
| 466 | 466 | } |