New upstream version 3.5.0

This commit is contained in:
geos_one
2025-08-08 11:12:01 +02:00
parent 8948a800bb
commit 8e3d35fd6e
153 changed files with 33544 additions and 22227 deletions

View File

@@ -1,88 +1,98 @@
<!-- (c) 2005-2018 by Martin Willisegger -->
<!-- (c) 2005-2022 by Martin Willisegger -->
<!-- -->
<!-- Project : NagiosQL -->
<!-- Component : Installer main template -->
<!-- Website : https://sourceforge.net/projects/nagiosql/ -->
<!-- Version : 3.4.0 -->
<!-- Version : 3.5.0 -->
<!-- GIT Repo : https://gitlab.com/wizonet/NagiosQL -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>{PAGETITLE}</title>
<link href="css/install.css" rel="stylesheet" type="text/css">
</head>
<body>
<div id="page_margins">
<div id="page">
<div id="header">
<div id="header-logo">
<a href="index.php"><img src="images/nagiosql.png" border="0" alt="NagiosQL"></a>
</div>
<div id="documentation">
<a href='https://sourceforge.net/projects/nagiosql/files/nagiosql/Documentation/' target='_blank'>{NAGIOS_FAQ}</a>
</div>
<div id="langselector">
<form action="" name="frmLanguage" id="frmLanguage" method="post">
{LANGUAGE} :
<select title="{LANGUAGE}" name="selLanguage" onchange="document.frmLanguage.submit();">
{LANG_OPTION}
</select>
</form>
</div>
</div>
<div id="main">
<div id="indexmain">
<div id="indexmain_content">
<h1>{MAIN_TITLE}</h1>
<div style="text-align: center;">{TEXT_PART_1}<br>{TEXT_PART_2}<a href="https://sourceforge.net/projects/nagiosql/" target="_blank">NagiosQL @ Sourceforge</a></div>
<p><div style="text-align: center;"><strong>{TEXT_PART_9}</strong></div>
<br>
<p>{TEXT_PART_3}</p>
<p>{TEXT_PART_4}</p>
<ul>
<li>{TEXT_PART_5}</li>
<ul>
<li>{TEXT_PHP_REQ_1}</li>
<li>{TEXT_PHP_REQ_2}</li>
<li>{TEXT_PHP_REQ_3}</li>
<li>{TEXT_PHP_REQ_6}</li>
<li>{TEXT_PHP_REQ_8}</li>
<li>{TEXT_PHP_REQ_10}</li>
</ul>
</ul>
<ul>
<li>{TEXT_PART_6}</li>
<ul>
<li>{TEXT_INI_REQ_1}</li>
<li>{TEXT_INI_REQ_2}</li>
</ul>
</ul>
<ul>
<li>{TEXT_PART_7}</li>
<li>{TEXT_PART_8}</li>
</ul>
{UPDATE_ERROR}
<form name="frmInstall" id="frmInstall" action="install.php" method="post">
<input type="hidden" name="hidLocale" value="{LOCALE}">
<input type="hidden" name="hidStep" value="1">
<input type="hidden" name="hidJScript" value="">
<p><input type="submit" name="butNewInstall" id="butNewInstall" value="{NEW_INSTALLATION}" {DISABLE_NEW}>
<input type="submit" name="butUpgrade" id="butUpgrade" value="{UPDATE}" {DISABLE_UPDATE}></p>
<p><a href='https://sourceforge.net/projects/nagiosql/files/nagiosql/Documentation/' target='_blank'>{ONLINE_DOC}</a></p>
</form>
</div>
</div>
<div id="footer">
<a href='https://sourceforge.net/projects/nagiosql/' target='_blank'>NagiosQL</a> <?php echo BASE_VERSION; ?>
</div>
</div>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>{PAGETITLE}</title>
<link href="css/install.css" rel="stylesheet" type="text/css">
</head>
<body>
<div id="page_margins">
<div id="page">
<div id="header">
<div id="header-logo">
<a href="index.php"><img src="images/nagiosql.png" border="0" alt="NagiosQL"></a>
</div>
<div id="documentation">
<a href='https://sourceforge.net/projects/nagiosql/files/nagiosql/Documentation/'
target='_blank'>{NAGIOS_FAQ}</a>
</div>
<div id="langselector">
<form action="" name="frmLanguage" id="frmLanguage" method="post">
{LANGUAGE} :
<select title="{LANGUAGE}" name="selLanguage" onchange="document.frmLanguage.submit();">
{LANG_OPTION}
</select>
</form>
</div>
</div>
<script type="">
<div id="main">
<div id="indexmain">
<div id="indexmain_content">
<h1>{MAIN_TITLE}</h1>
<div style="text-align: center;">{TEXT_PART_1}<br>{TEXT_PART_2}<a
href="https://sourceforge.net/projects/nagiosql/" target="_blank">NagiosQL @
Sourceforge</a></div>
<p>
<div style="text-align: center;"><strong>{TEXT_PART_9}</strong></div>
<br>
<p>{TEXT_PART_3}</p>
<p>{TEXT_PART_4}</p>
<ul>
<li>{TEXT_PART_5}</li>
<ul>
<li>{TEXT_PHP_REQ_1}</li>
<li>{TEXT_PHP_REQ_2}</li>
<li>{TEXT_PHP_REQ_3}</li>
<li>{TEXT_PHP_REQ_6}</li>
<li>{TEXT_PHP_REQ_8}</li>
<li>{TEXT_PHP_REQ_10}</li>
</ul>
</ul>
<ul>
<li>{TEXT_PART_6}</li>
<ul>
<li>{TEXT_INI_REQ_1}</li>
<li>{TEXT_INI_REQ_2}</li>
<li>{TEXT_INI_REQ_3}</li>
</ul>
</ul>
<ul>
<li>{TEXT_PART_7}</li>
<li>{TEXT_PART_8}</li>
</ul>
{UPDATE_ERROR}
<form name="frmInstall" id="frmInstall" action="install.php" method="post">
<input type="hidden" name="hidLocale" value="{LOCALE}">
<input type="hidden" name="hidStep" value="1">
<input type="hidden" name="hidJScript" value="">
<p><input type="submit" name="butNewInstall" id="butNewInstall"
value="{NEW_INSTALLATION}" {DISABLE_NEW}>
<input type="submit" name="butUpgrade" id="butUpgrade" value="{UPDATE}" {DISABLE_UPDATE}>
</p>
<p><a href='https://sourceforge.net/projects/nagiosql/files/nagiosql/Documentation/'
target='_blank'>{ONLINE_DOC}</a></p>
</form>
</div>
</div>
<div id="footer">
<a href='https://sourceforge.net/projects/nagiosql/'
target='_blank'>NagiosQL</a> <?php echo BASE_VERSION; ?>
</div>
</div>
</div>
</div>
<script type="">
<!--
document.frmInstall.hidJScript.value = 'yes';
//-->
</script>
</body>
</script>
</body>
</html>

View File

@@ -1,35 +1,37 @@
<!-- (c) 2005-2018 by Martin Willisegger -->
<!-- (c) 2005-2022 by Martin Willisegger -->
<!-- -->
<!-- Project : NagiosQL -->
<!-- Component : Installer template -->
<!-- Website : https://sourceforge.net/projects/nagiosql/ -->
<!-- Version : 3.4.0 -->
<!-- Version : 3.5.0 -->
<!-- GIT Repo : https://gitlab.com/wizonet/NagiosQL -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>{PAGETITLE}</title>
<link href="css/install.css" rel="stylesheet" type="text/css">
</head>
<body>
<div id="page_margins">
<div id="page">
<div id="header">
<div id="header-logo">
<a href="index.php"><img src="images/nagiosql.png" border="0" alt="NagiosQL Logo" title="NagiosQL Logo"></a>
</div>
<div id="documentation">
<a href="https://sourceforge.net/projects/nagiosql/faq.html" target="_blank"><?php echo translate("Online Documentation"); ?></a>
</div>
</div>
<div id="main">
{CONTENT}
</div>
<div id="footer">
<a href='https://sourceforge.net/projects/nagiosql/' target='_blank'>NagiosQL</a> <?php echo BASE_VERSION; ?>
</div>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>{PAGETITLE}</title>
<link href="css/install.css" rel="stylesheet" type="text/css">
</head>
<body>
<div id="page_margins">
<div id="page">
<div id="header">
<div id="header-logo">
<a href="index.php"><img src="images/nagiosql.png" border="0" alt="NagiosQL Logo" title="NagiosQL Logo"></a>
</div>
<div id="documentation">
<a href="https://sourceforge.net/projects/nagiosql/faq.html"
target="_blank"><?php echo translate("Online Documentation"); ?></a>
</div>
</div>
</body>
<div id="main">
{CONTENT}
</div>
<div id="footer">
<a href='https://sourceforge.net/projects/nagiosql/'
target='_blank'>NagiosQL</a> <?php echo BASE_VERSION; ?>
</div>
</div>
</div>
</body>
</html>

View File

@@ -1,9 +1,9 @@
<!-- (c) 2005-2018 by Martin Willisegger -->
<!-- (c) 2005-2022 by Martin Willisegger -->
<!-- -->
<!-- Project : NagiosQL -->
<!-- Component : Installer template - step 1 -->
<!-- Website : https://sourceforge.net/projects/nagiosql/ -->
<!-- Version : 3.4.0 -->
<!-- Version : 3.5.0 -->
<!-- GIT Repo : https://gitlab.com/wizonet/NagiosQL -->
<div id="installmenu">
<div id="installmenu_content">
@@ -16,9 +16,11 @@
<div id="installmain_content">
<h1>{STEP1_TITLE}</h1>
<h3>{STEP1_SUBTITLE1}</h3>
<img src='images/{CHECK_1_PIC}.png' alt='{CHECK_1_PIC}' title='{CHECK_1_PIC}' class='textmiddle'> Javascript: <span class='{CHECK_1_CLASS}'>{CHECK_1_VALUE}</span>{CHECK_1_INFO}
<img src='images/{CHECK_1_PIC}.png' alt='{CHECK_1_PIC}' title='{CHECK_1_PIC}' class='textmiddle'> Javascript:
<span class='{CHECK_1_CLASS}'>{CHECK_1_VALUE}</span>{CHECK_1_INFO}
<h3>{STEP1_SUBTITLE2}</h3>
<img src='images/{CHECK_2_PIC}.png' alt='{CHECK_2_PIC}' title='{CHECK_2_PIC}' class='textmiddle'> {CHECK_2_TEXT}: <span class='{CHECK_2_CLASS}'>{CHECK_2_VALUE}</span> {CHECK_2_INFO}
<img src='images/{CHECK_2_PIC}.png' alt='{CHECK_2_PIC}' title='{CHECK_2_PIC}' class='textmiddle'> {CHECK_2_TEXT}
: <span class='{CHECK_2_CLASS}'>{CHECK_2_VALUE}</span> {CHECK_2_INFO}
<h3>{STEP1_SUBTITLE3}</h3>
<p class='hint'>{STEP1_TEXT3_1}:</p>
{CHECK_3_CONTENT_1}
@@ -49,10 +51,10 @@
</form>
</div>
</div>
</div>
</div>
<script type="text/javascript">
<!--
document.frmStep1.hidJScript.value = 'yes';
//-->
</script>
<div id="ie_clearing"> </div>
<div id="ie_clearing"></div>

View File

@@ -1,9 +1,9 @@
<!-- (c) 2005-2018 by Martin Willisegger -->
<!-- (c) 2005-2022 by Martin Willisegger -->
<!-- -->
<!-- Project : NagiosQL -->
<!-- Component : Installer template - step 2 -->
<!-- Website : https://sourceforge.net/projects/nagiosql/ -->
<!-- Version : 3.4.0 -->
<!-- Version : 3.5.0 -->
<!-- GIT Repo : https://gitlab.com/wizonet/NagiosQL -->
<script type="text/javascript">
<!--
@@ -19,13 +19,14 @@
document.frmSetup.submit();
}
}
// Check form entries
function checkForm() {
// Are all required fields filled in?
const fields = "tfDBserver,tfLocalSrv,tfDBport,tfDBname,tfDBuser,tfDBpass{INSTALL_FIELDS}";
const form = document.frmSetup;
const ar_field = fields.split(",");
for (let i=0;i<ar_field.length;i++){
for (let i = 0; i < ar_field.length; i++) {
if (form[ar_field[i]].value === "") {
alert("{FIELDS_MESSAGE}");
form[ar_field[i]].focus();
@@ -38,6 +39,7 @@
}
return true;
}
// Modify port value
function modifyPort(db) {
if ((db === 'mysql') || (db === 'mysqli')) {
@@ -51,8 +53,9 @@
document.frmSetup.tfDBport.className = '';
}
}
//-->
</script>
</script>
<div id="installmenu">
<div id="installmenu_content">
<p class="step1_active"><a href='install.php?step=1'><br><br>{STEP1_BOX}</a></p>
@@ -72,46 +75,56 @@
<tr>
<td style="width:250px;">{STEP2_TEXT2_2} <em>*</em></td>
<td>
<select title="{STEP2_TEXT2_2}" name="selDBtype" id="selDBtype" class="required" onchange="modifyPort(this.value);">
<select title="{STEP2_TEXT2_2}" name="selDBtype" id="selDBtype" class="required"
onchange="modifyPort(this.value);">
{STEP2_VALUE2_2}
</select>
</td>
</tr>
<tr>
<td>{STEP2_TEXT2_3} <em>*</em></td>
<td><input title="{STEP2_TEXT2_3}" type="text" name="tfDBserver" id="tfDBserver" class="required" value="{STEP2_VALUE2_3}"></td>
<td><input title="{STEP2_TEXT2_3}" type="text" name="tfDBserver" id="tfDBserver"
class="required" value="{STEP2_VALUE2_3}"></td>
</tr>
<tr>
<td>{STEP2_TEXT2_4} <em>*</em></td>
<td><input title="{STEP2_TEXT2_4}" type="text" name="tfLocalSrv" id="tfLocalSrv" class="required" value="{STEP2_VALUE2_4}"></td>
<td><input title="{STEP2_TEXT2_4}" type="text" name="tfLocalSrv" id="tfLocalSrv"
class="required" value="{STEP2_VALUE2_4}"></td>
</tr>
<tr>
<td>{STEP2_TEXT2_5} <em>*</em></td>
<td><input title="{STEP2_TEXT2_5}" type="text" name="tfDBport" id="tfDBport" class="required" value="{STEP2_VALUE2_5}"></td>
<td><input title="{STEP2_TEXT2_5}" type="text" name="tfDBport" id="tfDBport" class="required"
value="{STEP2_VALUE2_5}"></td>
</tr>
<tr>
<td>{STEP2_TEXT2_6} <em>*</em></td>
<td><input title="{STEP2_TEXT2_6}" type="text" name="tfDBname" id="tfDBname" class="required" value="{STEP2_VALUE2_6}"></td>
<td><input title="{STEP2_TEXT2_6}" type="text" name="tfDBname" id="tfDBname" class="required"
value="{STEP2_VALUE2_6}"></td>
</tr>
<tr class="{INST_VISIBLE}">
<td>{STEP2_TEXT2_7} <em>*</em></td>
<td><input title="{STEP2_TEXT2_7}" type="text" name="tfDBuser" id="tfDBuser" class="required" value="{STEP2_VALUE2_7}"></td>
<td><input title="{STEP2_TEXT2_7}" type="text" name="tfDBuser" id="tfDBuser" class="required"
value="{STEP2_VALUE2_7}"></td>
</tr>
<tr class="{INST_VISIBLE}">
<td>{STEP2_TEXT2_8} <em>*</em></td>
<td><input title="{STEP2_TEXT2_8}" type="password" name="tfDBpass" id="tfDBpass" class="required" value="{STEP2_VALUE2_8}"></td>
<td><input title="{STEP2_TEXT2_8}" type="password" name="tfDBpass" id="tfDBpass"
class="required" value="{STEP2_VALUE2_8}"></td>
</tr>
<tr>
<td>{STEP2_TEXT2_9} <em>*</em></td>
<td><input title="{STEP2_TEXT2_9}" type="text" name="tfDBprivUser" id="tfDBprivUser" class="required" value="{STEP2_VALUE2_9}" size="19"></td>
<td><input title="{STEP2_TEXT2_9}" type="text" name="tfDBprivUser" id="tfDBprivUser"
class="required" value="{STEP2_VALUE2_9}" size="19"></td>
</tr>
<tr>
<td>{STEP2_TEXT2_10} <em>*</em></td>
<td><input title="{STEP2_TEXT2_10}" name="tfDBprivPass" id="tfDBprivPass" class="required" type="password"></td>
<td><input title="{STEP2_TEXT2_10}" name="tfDBprivPass" id="tfDBprivPass" class="required"
type="password"></td>
</tr>
<tr class="{INST_VISIBLE}">
<td>{STEP2_TEXT2_11}</td>
<td><input title="{STEP2_TEXT2_11}" type="checkbox" name="chbDrop" id="chbDrop" value="1" {STEP2_VALUE2_11}></td>
<td><input title="{STEP2_TEXT2_11}" type="checkbox" name="chbDrop" id="chbDrop"
value="1" {STEP2_VALUE2_11}></td>
</tr>
</table>
</fieldset>
@@ -120,15 +133,18 @@
<table cellpadding="0" cellspacing="1" border="0">
<tr>
<td style="width:250px;">{STEP2_TEXT3_2} <em>*</em></td>
<td><input title="{STEP2_TEXT3_2}" type="text" name="tfQLuser" id="tfQLuser" class="required" value="{STEP2_VALUE3_2}" size="15"></td>
<td><input title="{STEP2_TEXT3_2}" type="text" name="tfQLuser" id="tfQLuser" class="required"
value="{STEP2_VALUE3_2}" size="15"></td>
</tr>
<tr>
<td>{STEP2_TEXT3_3} <em>*</em></td>
<td><input title="{STEP2_TEXT3_3}" type="password" class="required" name="tfQLpass" id="tfQLpass" value="{STEP2_VALUE3_3}" size="15"></td>
<td><input title="{STEP2_TEXT3_3}" type="password" class="required" name="tfQLpass"
id="tfQLpass" value="{STEP2_VALUE3_3}" size="15"></td>
</tr>
<tr>
<td>{STEP2_TEXT3_4} <em>*</em></td>
<td><input title="{STEP2_TEXT3_4}" type="password" class="required" name="tfQLpassrepeat" id="tfQLpassrepeat" size="15"></td>
<td><input title="{STEP2_TEXT3_4}" type="password" class="required" name="tfQLpassrepeat"
id="tfQLpassrepeat" size="15"></td>
</tr>
</table>
</fieldset>
@@ -137,7 +153,8 @@
<table cellpadding="0" cellspacing="1" border="0">
<tr>
<td style="width:250px;">{STEP2_TEXT4_2} </td>
<td><input title="{STEP2_TEXT4_2}" type="checkbox" name="chbSample" id="chbSample" value="1" {STEP2_VALUE4_2}></td>
<td><input title="{STEP2_TEXT4_2}" type="checkbox" name="chbSample" id="chbSample"
value="1" {STEP2_VALUE4_2}></td>
</tr>
</table>
</fieldset>
@@ -146,15 +163,18 @@
<table cellpadding="0" cellspacing="1" border="0">
<tr>
<td style="width:250px;">{STEP2_TEXT5_2}</td>
<td><input title="{STEP2_TEXT5_2}" type="checkbox" name="chbPath" id="chbPath" value="1" {STEP2_VALUE5_2}></td>
<td><input title="{STEP2_TEXT5_2}" type="checkbox" name="chbPath" id="chbPath"
value="1" {STEP2_VALUE5_2}></td>
</tr>
<tr>
<td>{STEP2_TEXT5_3}</td>
<td><input title="{STEP2_TEXT5_3}" type="text" name="tfQLpath" id="tfQLpath" value="{STEP2_VALUE5_3}" size="15"></td>
<td><input title="{STEP2_TEXT5_3}" type="text" name="tfQLpath" id="tfQLpath"
value="{STEP2_VALUE5_3}" size="15"></td>
</tr>
<tr>
<td>{STEP2_TEXT5_4}</td>
<td><input title="{STEP2_TEXT5_4}" type="text" name="tfNagiosPath" id="tfNagiosPath" value="{STEP2_VALUE5_4}" size="15"></td>
<td><input title="{STEP2_TEXT5_4}" type="text" name="tfNagiosPath" id="tfNagiosPath"
value="{STEP2_VALUE5_4}" size="15"></td>
</tr>
<tr>
<td colspan="2" style="padding-top:5px;">{STEP2_TEXT5_5}<br>{STEP2_TEXT5_6}</td>
@@ -164,9 +184,10 @@
<br>
<div id="install-next">
<input type="hidden" name="hidStep" value="3">
<img src="images/next.png" onClick="LockButton();" alt="{STEP2_FORM_1}" title="{STEP2_FORM_1}" style="cursor:pointer"><br>{STEP2_FORM_1}
<img src="images/next.png" onClick="LockButton();" alt="{STEP2_FORM_1}" title="{STEP2_FORM_1}"
style="cursor:pointer"><br>{STEP2_FORM_1}
</div>
</form>
</div>
</div>
<div id="ie_clearing"> </div>
</div>
<div id="ie_clearing"></div>

View File

@@ -1,9 +1,9 @@
<!-- (c) 2005-2018 by Martin Willisegger -->
<!-- (c) 2005-2022 by Martin Willisegger -->
<!-- -->
<!-- Project : NagiosQL -->
<!-- Component : Installer template - step 3 -->
<!-- Website : https://sourceforge.net/projects/nagiosql/ -->
<!-- Version : 3.4.0 -->
<!-- Version : 3.5.0 -->
<!-- GIT Repo : https://gitlab.com/wizonet/NagiosQL -->
<div id="installmenu">
<div id="installmenu_content">
@@ -14,7 +14,7 @@
</div>
<div id="installmain">
<div id="installmain_content">
<h1>{STEP3_TITLE}</h1>
<h1>{STEP3_TITLE}</h1>
<form name="frmSetup" id="frmSetup" action="install.php" method="post" class="cmxform">
<fieldset>
<legend><b>{STEP3_SUB_TITLE}</b></legend>
@@ -62,27 +62,27 @@
<fieldset class="{STEP4_VISIBLE}">
<legend><b>{STEP4_SUB_TITLE}</b></legend>
<table cellpadding="0" cellspacing="1" border="0" class="{STEP4_VISIBLE}">
<tr>
<td valign="top" style="width:350px;"><label>{STEP4_TEXT_01}</label></td>
<td>{STEP4_TEXT_02}</td>
</tr>
<tr class="{STEP4_TEXT_03_SHOW}">
<td valign="top"><label>{STEP4_TEXT_03}</label></td>
<td>{STEP4_TEXT_04}</td>
</tr>
<tr class="{STEP4_TEXT_05_SHOW}">
<td valign="top"><label>{STEP4_TEXT_05}</label></td>
<td>{STEP4_TEXT_06}</td>
</tr>
<tr class="{STEP4_TEXT_07_SHOW}">
<td valign="top"><label>{STEP4_TEXT_07}</label></td>
<td>{STEP4_TEXT_08}</td>
</tr>
<tr>
<td valign="top" style="width:350px;"><label>{STEP4_TEXT_01}</label></td>
<td>{STEP4_TEXT_02}</td>
</tr>
<tr class="{STEP4_TEXT_03_SHOW}">
<td valign="top"><label>{STEP4_TEXT_03}</label></td>
<td>{STEP4_TEXT_04}</td>
</tr>
<tr class="{STEP4_TEXT_05_SHOW}">
<td valign="top"><label>{STEP4_TEXT_05}</label></td>
<td>{STEP4_TEXT_06}</td>
</tr>
<tr class="{STEP4_TEXT_07_SHOW}">
<td valign="top"><label>{STEP4_TEXT_07}</label></td>
<td>{STEP4_TEXT_08}</td>
</tr>
</table>
</fieldset>
</fieldset>
<p style="color:red; font-weight:bold;">{INFO_TEXT}</p>
{BUTTON}
</form>
</div>
</div>
<div id="ie_clearing"> </div>
</div>
<div id="ie_clearing"></div>