← Back to branch summary

~kampka/ubuntu/quantal/zabbix/upstart-support

« back to all changes in this revision

Viewing changes to frontends/php/include/setup.inc.php

  • Committer: Bazaar Package Importer
  • Author(s): Michael Ablassmeier
  • Date: 2009-06-28 19:11:29 UTC
  • mfrom: (19.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090628191129-5esmmf2h3tbff1fv
http://bugs.debian.org/528426
http://bugs.debian.org/534096
http://bugs.debian.org/520197
http://bugs.debian.org/527559
http://bugs.debian.org/527600
http://bugs.debian.org/528571
http://bugs.debian.org/529157
http://bugs.debian.org/529502
http://bugs.debian.org/532344
* New upstream release
* Merge upstream config file to template (Closes: #528426)
* Move logrotate from Depends to Suggests (Closes: #534096)
* Server should not crash anymore if postgresql transaction fails
  (Closes: #520197)
* Update fr.po (Closes: #527559)
* Update es.po (Closes: #527600)
* Update sv.po (Closes: #528571)
* Update it.po (Closes: #529157)
* Update cs.po (Closes: #529502)
* Update de.po (Closes: #532344)

Show diffs side-by-side

added added

removed removed

Lines of Context:
frontends/php/include/setup.inc.php
88
88
                        $table = new CTable(null, 'setup_wizard');
89
89
                        $table->SetAlign('center');
90
90
                        $table->SetHeader(array(
91
 
                                new CCol(S_ZABBIX_VER, 'left'), 
 
91
                                new CCol(S_ZABBIX.SPACE.ZABBIX_VERSION, 'left'), 
92
92
                                SPACE
93
93
                                ),'header');
94
94
                        $table->AddRow(array(SPACE, new CCol($this->stage[$this->GetStep()]['title'], 'right')),'title');
162
162
                        $result &= $condition;
163
163
                        
164
164
                        $row = new CRow(array(
165
 
                                        $test_name,
 
165
                                        new CCol($test_name,'header'),
166
166
                                        $test_value,
167
167
                                        $condition ? new CSpan(S_OK,'ok') : new CSpan(S_FAIL,'fail')
168
168
                                ),
240
240
                        $table->AddRow(
241
241
                                $this->get_test_result(
242
242
                                        $final_result,
243
 
                                        'PHP BC math support',
 
243
                                        'PHP BC math support:',
244
244
                                        $bcmath_fnc_exist ? 'yes' : 'no',
245
245
                                        $bcmath_fnc_exist,
246
246
                                        'Required bcmath module [configured PHP with --enable-bcmath]'));
247
247
                                        
 
248
                                        
 
249
//* Check sockets lib
 
250
                        $sockets_fnc_exist = function_exists('socket_create');
 
251
                        $table->AddRow(
 
252
                                $this->get_test_result(
 
253
                                        $final_result,
 
254
                                        'PHP Sockets support',
 
255
                                        $sockets_fnc_exist?'yes':'no',
 
256
                                        $sockets_fnc_exist,
 
257
                                        'Required Sockets module [configured PHP with --enable-sockets]'));
 
258
//*/
 
259
 
 
260
                                        
248
261
/* Check mb-strings 
249
262
                        $mbstrings_fnc_exist = mbstrings_available();
250
263
                        $table->AddRow(
326
339
                function Stage3(){
327
340
                        global $ZBX_CONFIG;
328
341
 
329
 
                        $table = new CTable();
 
342
                        $table = new CTable(null, 'requirements');
330
343
                        $table->SetAlign('center');
331
344
                        
332
345
                        $DB['TYPE'] = $this->GetConfig('DB_TYPE');
359
372
                function Stage4(){
360
373
                        global $ZBX_CONFIG;
361
374
 
362
 
                        $table = new CTable();
 
375
                        $table = new CTable(null, 'requirements');
363
376
                        $table->SetAlign('center');
364
377
                        
365
378
                        $table->AddRow(array(S_HOST, new CTextBox('zbx_server',         $this->GetConfig('ZBX_SERVER',          'localhost'))));
415
428
                        
416
429
                        $table = new CTable(null, 'requirements');
417
430
                        $table->SetAlign('center');
418
 
                        $table->AddRow(array('Database type:',          $allowed_db[$this->GetConfig('DB_TYPE', 'unknown')]));
419
 
                        $table->AddRow(array('Database server:',        $this->GetConfig('DB_SERVER',   'unknown')));
420
 
                        $table->AddRow(array('Database port:',          $this->GetConfig('DB_PORT',     '0')));
421
 
                        $table->AddRow(array('Database name:',          $this->GetConfig('DB_DATABASE', 'unknown')));
422
 
                        $table->AddRow(array('Database user:',          $this->GetConfig('DB_USER',     'unknown')));
423
 
                        $table->AddRow(array('Database password:',      ereg_replace('.','*',$this->GetConfig('DB_PASSWORD',    'unknown'))));
424
 
                        /* $table->AddRow(array('Distributed monitoring',       $this->GetConfig('distributed', null) ? 'Enabled' : 'Disabled')); */
 
431
                        $table->AddRow(array(new CCol('Database type:','header'),               $allowed_db[$this->GetConfig('DB_TYPE', 'unknown')]));
 
432
                        $table->AddRow(array(new CCol('Database server:','header'),     $this->GetConfig('DB_SERVER',   'unknown')));
 
433
                        $table->AddRow(array(new CCol('Database port:','header'),               $this->GetConfig('DB_PORT',     '0')));
 
434
                        $table->AddRow(array(new CCol('Database name:','header'),               $this->GetConfig('DB_DATABASE', 'unknown')));
 
435
                        $table->AddRow(array(new CCol('Database user:','header'),               $this->GetConfig('DB_USER',     'unknown')));
 
436
                        $table->AddRow(array(new CCol('Database password:','header'),   ereg_replace('.','*',$this->GetConfig('DB_PASSWORD',    'unknown'))));
 
437
                        /* $table->AddRow(array(new CCol('Distributed monitoring','header'),    $this->GetConfig('distributed', null) ? 'Enabled' : 'Disabled')); */
425
438
                        
426
439
                        if($this->GetConfig('distributed', null)){
427
 
                                $table->AddRow(array('Node name',       $this->GetConfig('nodename',    'unknown')));
428
 
                                $table->AddRow(array('Node GUID',       $this->GetConfig('nodeid',      'unknown')));
 
440
                                $table->AddRow(array(new CCol('Node name','header'),    $this->GetConfig('nodename',    'unknown')));
 
441
                                $table->AddRow(array(new CCol('Node GUID','header'),    $this->GetConfig('nodeid',      'unknown')));
429
442
                        }
 
443
                        
 
444
                        $table->AddRow(BR());
430
445
 
431
 
                        $table1 = new CTable(null, 'requirements');
432
 
                        $table1->SetAlign('center');
433
 
                        $table1->AddRow(array('ZABBIX server:',         $this->GetConfig('ZBX_SERVER',          'unknown')));
434
 
                        $table1->AddRow(array('ZABBIX server port:',    $this->GetConfig('ZBX_SERVER_PORT',     'unknown')));
 
446
                        $table->AddRow(array(new CCol('ZABBIX server:','header'),               $this->GetConfig('ZBX_SERVER',          'unknown')));
 
447
                        $table->AddRow(array(new CCol('ZABBIX server port:','header'),  $this->GetConfig('ZBX_SERVER_PORT',     'unknown')));
435
448
                        return array(
436
449
                                'Please check configuration parameters.', BR(),
437
450
                                'If all correct press "Next" button, or "Previous" button to change configuration parameters.', BR(), BR(),
438
 
                                $table, BR(),
439
 
                                $table1
 
451
                                $table
440
452
                                );
441
453
                }
442
454