mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-24 11:08:45 +02:00
N°2866 Change "cron" case in labels as it is not an acronym
Thanks @Hipska for the feedback done in Combodo/iTop#124 !
This commit is contained in:
@@ -23,7 +23,7 @@
|
|||||||
// Developer's notes:
|
// Developer's notes:
|
||||||
// Duplicated code: sys_get_temp_dir, the computation of the target filename, etc.
|
// Duplicated code: sys_get_temp_dir, the computation of the target filename, etc.
|
||||||
|
|
||||||
// Recommended usage in CRON
|
// Recommended usage in cron
|
||||||
// /usr/bin/php -q /var/www/combodo/modules/itop-backup/check-backup.php --backup_file=/home/backups/combodo-crm-%Y-%m-%d
|
// /usr/bin/php -q /var/www/combodo/modules/itop-backup/check-backup.php --backup_file=/home/backups/combodo-crm-%Y-%m-%d
|
||||||
// Do not forget to set the 'itop_backup_incident' configuration file parameter !
|
// Do not forget to set the 'itop_backup_incident' configuration file parameter !
|
||||||
|
|
||||||
|
|||||||
@@ -210,7 +210,7 @@ Operátory:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro~~',
|
'Core:Context=Synchro' => 'Synchro~~',
|
||||||
'Core:Context=Setup' => 'Setup~~',
|
'Core:Context=Setup' => 'Setup~~',
|
||||||
'Core:Context=GUI:Console' => 'Console~~',
|
'Core:Context=GUI:Console' => 'Console~~',
|
||||||
'Core:Context=CRON' => 'CRON~~',
|
'Core:Context=CRON' => 'cron~~',
|
||||||
'Core:Context=GUI:Portal' => 'Portal~~',
|
'Core:Context=GUI:Portal' => 'Portal~~',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ Operators:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro~~',
|
'Core:Context=Synchro' => 'Synchro~~',
|
||||||
'Core:Context=Setup' => 'Setup~~',
|
'Core:Context=Setup' => 'Setup~~',
|
||||||
'Core:Context=GUI:Console' => 'Console~~',
|
'Core:Context=GUI:Console' => 'Console~~',
|
||||||
'Core:Context=CRON' => 'CRON~~',
|
'Core:Context=CRON' => 'cron~~',
|
||||||
'Core:Context=GUI:Portal' => 'Portal~~',
|
'Core:Context=GUI:Portal' => 'Portal~~',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ Operatoren:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro',
|
'Core:Context=Synchro' => 'Synchro',
|
||||||
'Core:Context=Setup' => 'Setup',
|
'Core:Context=Setup' => 'Setup',
|
||||||
'Core:Context=GUI:Console' => 'Konsole',
|
'Core:Context=GUI:Console' => 'Konsole',
|
||||||
'Core:Context=CRON' => 'CRON',
|
'Core:Context=CRON' => 'cron',
|
||||||
'Core:Context=GUI:Portal' => 'Portal',
|
'Core:Context=GUI:Portal' => 'Portal',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ Operators:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro',
|
'Core:Context=Synchro' => 'Synchro',
|
||||||
'Core:Context=Setup' => 'Setup',
|
'Core:Context=Setup' => 'Setup',
|
||||||
'Core:Context=GUI:Console' => 'Console',
|
'Core:Context=GUI:Console' => 'Console',
|
||||||
'Core:Context=CRON' => 'CRON',
|
'Core:Context=CRON' => 'cron',
|
||||||
'Core:Context=GUI:Portal' => 'Portal',
|
'Core:Context=GUI:Portal' => 'Portal',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ Operadores:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro~~',
|
'Core:Context=Synchro' => 'Synchro~~',
|
||||||
'Core:Context=Setup' => 'Setup~~',
|
'Core:Context=Setup' => 'Setup~~',
|
||||||
'Core:Context=GUI:Console' => 'Console~~',
|
'Core:Context=GUI:Console' => 'Console~~',
|
||||||
'Core:Context=CRON' => 'CRON~~',
|
'Core:Context=CRON' => 'cron~~',
|
||||||
'Core:Context=GUI:Portal' => 'Portal~~',
|
'Core:Context=GUI:Portal' => 'Portal~~',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ Opérateurs :<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro',
|
'Core:Context=Synchro' => 'Synchro',
|
||||||
'Core:Context=Setup' => 'Setup',
|
'Core:Context=Setup' => 'Setup',
|
||||||
'Core:Context=GUI:Console' => 'Console',
|
'Core:Context=GUI:Console' => 'Console',
|
||||||
'Core:Context=CRON' => 'CRON',
|
'Core:Context=CRON' => 'cron',
|
||||||
'Core:Context=GUI:Portal' => 'Portal',
|
'Core:Context=GUI:Portal' => 'Portal',
|
||||||
));
|
));
|
||||||
|
|
||||||
@@ -1051,6 +1051,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
|
|||||||
'Core:Context=Synchro+' => 'Synchro',
|
'Core:Context=Synchro+' => 'Synchro',
|
||||||
'Core:Context=Setup+' => 'Setup',
|
'Core:Context=Setup+' => 'Setup',
|
||||||
'Core:Context=GUI:Console+' => 'GUI:Console',
|
'Core:Context=GUI:Console+' => 'GUI:Console',
|
||||||
'Core:Context=CRON+' => 'CRON',
|
'Core:Context=CRON+' => 'cron',
|
||||||
'Core:Context=GUI:Portal+' => 'GUI:Portal',
|
'Core:Context=GUI:Portal+' => 'GUI:Portal',
|
||||||
));
|
));
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ Operators:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro~~',
|
'Core:Context=Synchro' => 'Synchro~~',
|
||||||
'Core:Context=Setup' => 'Setup~~',
|
'Core:Context=Setup' => 'Setup~~',
|
||||||
'Core:Context=GUI:Console' => 'Console~~',
|
'Core:Context=GUI:Console' => 'Console~~',
|
||||||
'Core:Context=CRON' => 'CRON~~',
|
'Core:Context=CRON' => 'cron~~',
|
||||||
'Core:Context=GUI:Portal' => 'Portal~~',
|
'Core:Context=GUI:Portal' => 'Portal~~',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ Operatori:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro~~',
|
'Core:Context=Synchro' => 'Synchro~~',
|
||||||
'Core:Context=Setup' => 'Setup~~',
|
'Core:Context=Setup' => 'Setup~~',
|
||||||
'Core:Context=GUI:Console' => 'Console~~',
|
'Core:Context=GUI:Console' => 'Console~~',
|
||||||
'Core:Context=CRON' => 'CRON~~',
|
'Core:Context=CRON' => 'cron~~',
|
||||||
'Core:Context=GUI:Portal' => 'Portal~~',
|
'Core:Context=GUI:Portal' => 'Portal~~',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ Operators:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro~~',
|
'Core:Context=Synchro' => 'Synchro~~',
|
||||||
'Core:Context=Setup' => 'Setup~~',
|
'Core:Context=Setup' => 'Setup~~',
|
||||||
'Core:Context=GUI:Console' => 'Console~~',
|
'Core:Context=GUI:Console' => 'Console~~',
|
||||||
'Core:Context=CRON' => 'CRON~~',
|
'Core:Context=CRON' => 'cron~~',
|
||||||
'Core:Context=GUI:Portal' => 'Portal~~',
|
'Core:Context=GUI:Portal' => 'Portal~~',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -214,7 +214,7 @@ Operators:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro',
|
'Core:Context=Synchro' => 'Synchro',
|
||||||
'Core:Context=Setup' => 'Setup',
|
'Core:Context=Setup' => 'Setup',
|
||||||
'Core:Context=GUI:Console' => 'Console',
|
'Core:Context=GUI:Console' => 'Console',
|
||||||
'Core:Context=CRON' => 'CRON',
|
'Core:Context=CRON' => 'cron',
|
||||||
'Core:Context=GUI:Portal' => 'Portaal',
|
'Core:Context=GUI:Portal' => 'Portaal',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ Operadores:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro~~',
|
'Core:Context=Synchro' => 'Synchro~~',
|
||||||
'Core:Context=Setup' => 'Setup~~',
|
'Core:Context=Setup' => 'Setup~~',
|
||||||
'Core:Context=GUI:Console' => 'Console~~',
|
'Core:Context=GUI:Console' => 'Console~~',
|
||||||
'Core:Context=CRON' => 'CRON~~',
|
'Core:Context=CRON' => 'cron~~',
|
||||||
'Core:Context=GUI:Portal' => 'Portal~~',
|
'Core:Context=GUI:Portal' => 'Portal~~',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -195,7 +195,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
|
|||||||
'Core:Context=Synchro' => 'Synchro~~',
|
'Core:Context=Synchro' => 'Synchro~~',
|
||||||
'Core:Context=Setup' => 'Setup~~',
|
'Core:Context=Setup' => 'Setup~~',
|
||||||
'Core:Context=GUI:Console' => 'Console~~',
|
'Core:Context=GUI:Console' => 'Console~~',
|
||||||
'Core:Context=CRON' => 'CRON~~',
|
'Core:Context=CRON' => 'cron~~',
|
||||||
'Core:Context=GUI:Portal' => 'Portal~~',
|
'Core:Context=GUI:Portal' => 'Portal~~',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -205,7 +205,7 @@ Operatori:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro~~',
|
'Core:Context=Synchro' => 'Synchro~~',
|
||||||
'Core:Context=Setup' => 'Setup~~',
|
'Core:Context=Setup' => 'Setup~~',
|
||||||
'Core:Context=GUI:Console' => 'Console~~',
|
'Core:Context=GUI:Console' => 'Console~~',
|
||||||
'Core:Context=CRON' => 'CRON~~',
|
'Core:Context=CRON' => 'cron~~',
|
||||||
'Core:Context=GUI:Portal' => 'Portal~~',
|
'Core:Context=GUI:Portal' => 'Portal~~',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ Operators:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro~~',
|
'Core:Context=Synchro' => 'Synchro~~',
|
||||||
'Core:Context=Setup' => 'Setup~~',
|
'Core:Context=Setup' => 'Setup~~',
|
||||||
'Core:Context=GUI:Console' => 'Console~~',
|
'Core:Context=GUI:Console' => 'Console~~',
|
||||||
'Core:Context=CRON' => 'CRON~~',
|
'Core:Context=CRON' => 'cron~~',
|
||||||
'Core:Context=GUI:Portal' => 'Portal~~',
|
'Core:Context=GUI:Portal' => 'Portal~~',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ Operators:<br/>
|
|||||||
'Core:Context=Synchro' => 'Synchro~~',
|
'Core:Context=Synchro' => 'Synchro~~',
|
||||||
'Core:Context=Setup' => 'Setup~~',
|
'Core:Context=Setup' => 'Setup~~',
|
||||||
'Core:Context=GUI:Console' => 'Console~~',
|
'Core:Context=GUI:Console' => 'Console~~',
|
||||||
'Core:Context=CRON' => 'CRON~~',
|
'Core:Context=CRON' => 'cron~~',
|
||||||
'Core:Context=GUI:Portal' => 'Portal~~',
|
'Core:Context=GUI:Portal' => 'Portal~~',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ In order to ease the installation, all the background tasks have been grouped to
|
|||||||
<li>Edit the file <b>cron.params</b> to set the credentials used for cronified tasks</li>
|
<li>Edit the file <b>cron.params</b> to set the credentials used for cronified tasks</li>
|
||||||
<li>Edit the file <em><itop root></em>/webservices/<b>cron.cmd</b>, and set the relevant path for your installation of PHP.</li>
|
<li>Edit the file <em><itop root></em>/webservices/<b>cron.cmd</b>, and set the relevant path for your installation of PHP.</li>
|
||||||
<li>Schedule the execution of cron.cmd:
|
<li>Schedule the execution of cron.cmd:
|
||||||
<pre>schtasks.exe /create /tn "iTop CRON" /sc minute /mo 1 /tr "\"<em><itop root></em>/webservices/cron.cmd\""</pre>
|
<pre>schtasks.exe /create /tn "iTop Cron" /sc minute /mo 1 /tr "\"<em><itop root></em>/webservices/cron.cmd\""</pre>
|
||||||
</li>
|
</li>
|
||||||
</ol>
|
</ol>
|
||||||
|
|
||||||
|
|||||||
@@ -658,7 +658,7 @@ EOF
|
|||||||
if ($oMutex->IsLocked())
|
if ($oMutex->IsLocked())
|
||||||
{
|
{
|
||||||
$oPage->add(<<<HTML
|
$oPage->add(<<<HTML
|
||||||
<div class="message">An iTop CRON process is being executed on the target database. iTop CRON process will be stopped during the setup execution.</div>
|
<div class="message">An iTop cron process is being executed on the target database. iTop cron process will be stopped during the setup execution.</div>
|
||||||
HTML
|
HTML
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# CRON parameters file used by cron.cmd
|
# cron parameters file used by cron.cmd
|
||||||
#
|
#
|
||||||
# Warning: make sure that this file is NOT readable by the web server
|
# Warning: make sure that this file is NOT readable by the web server
|
||||||
|
|
||||||
|
|||||||
@@ -479,11 +479,11 @@ set_time_limit(0); // Some background actions may really take long to finish (li
|
|||||||
|
|
||||||
if (utils::IsModeCLI())
|
if (utils::IsModeCLI())
|
||||||
{
|
{
|
||||||
$oP = new CLIPage("iTop - CRON");
|
$oP = new CLIPage("iTop - cron");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$oP = new WebPage("iTop - CRON");
|
$oP = new WebPage("iTop - cron");
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
|
|||||||
Reference in New Issue
Block a user