[Rebranding] Open operation/*

This commit is contained in:
fermin831 2018-05-14 15:52:51 +02:00
parent 80aeded931
commit ed18d58676
5 changed files with 12 additions and 13 deletions

View File

@ -106,7 +106,7 @@ foreach ($result as $row) {
echo "<html>";
echo "<head>";
echo "<title>Pandora FMS - Latest events </title>";
echo "<title>" . __("%s - Latest events", get_product_name()) . "</title>";
$query = ui_get_full_url();
echo '<meta http-equiv="refresh" content="' . $MARQUEE_INTERVAL . '; URL=' . $query . '">';

View File

@ -60,9 +60,9 @@ function rss_error_handler ($errno, $errstr, $errfile, $errline, $error_human_de
$rss_feed .= "\n";
$rss_feed .= '<channel>';
$rss_feed .= "\n";
$rss_feed .= '<title>Pandora RSS Feed</title>';
$rss_feed .= '<title>' . get_product_name() . ' RSS Feed</title>';
$rss_feed .= "\n";
$rss_feed .= '<description>Latest events on Pandora</description>';
$rss_feed .= '<description>Latest events on ' . get_product_name() . '</description>';
$rss_feed .= "\n";
$rss_feed .= '<lastBuildDate>'.date (DATE_RFC822, 0).'</lastBuildDate>';
$rss_feed .= "\n";
@ -138,7 +138,7 @@ require('events.build_query.php');
////////////////////////////////////////////////////////////////////////
$sql = "SELECT *
FROM tevento
FROM tevento LEFT JOIN tagent_secondary_group on id_grupo = id_group
WHERE 1=1 " . $sql_post . "
ORDER BY utimestamp DESC";
@ -157,8 +157,8 @@ else {
$rss_feed = '<?xml version="1.0" encoding="utf-8" ?>' . "\n"; // ' <?php ' -- Fixes highlighters thinking that the closing tag is PHP
$rss_feed .= '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">' . "\n";
$rss_feed .= '<channel>'. "\n";
$rss_feed .= '<title>Pandora RSS Feed</title>'. "\n";
$rss_feed .= '<description>Latest events on Pandora</description>' . "\n";
$rss_feed .= '<title>' . get_product_name() . ' RSS Feed</title>'. "\n";
$rss_feed .= '<description>Latest events on ' . get_product_name() . '</description>' . "\n";
$rss_feed .= '<lastBuildDate>'.date (DATE_RFC822, $lastbuild).'</lastBuildDate>'. "\n"; //Last build date is the last event - that way readers won't mark it as having new posts
$rss_feed .= '<link>'.$url.'</link>'. "\n"; //Link back to the main Pandora page
$rss_feed .= '<atom:link href="' . xml_entities(io_safe_input ($selfurl)) . '" rel="self" type="application/rss+xml" />'. "\n";; //Alternative for Atom feeds. It's the same.

View File

@ -237,9 +237,9 @@ echo '<form method="post" action="' . $config['homeurl'] .
html_print_input_text ('date', $date, false, 13, 10, true) .
html_print_image ("images/calendar_view_day.png", true,
array("alt" => "calendar")) .
ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
ui_print_help_tip(__('Date format is YY/MM/DD'), true) .
html_print_input_text ('time', $time, false, 10, 8, true) .
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true) .
"</td>";
echo "<td>" . '<b>'.__('Interval').'</b>' . "</td>";

View File

@ -20,7 +20,7 @@ $totalHelps = check_acl($config["id_user"], 0, "IR");
if ($helps === false || !$searchHelps) {
echo "<br><div class='nf'>" . __("Zero results found.") .
sprintf(__('You can find more help in the <a style="text-decoration: underline;" href="%s">Pandora\'s wiki</a>'),
sprintf(__('You can find more help in the <a style="text-decoration: underline;" href="%s">wiki</a>'),
"http://wiki.pandorafms.com/index.php?search=" . $config['search_keywords']) .
"</div>\n";
}

View File

@ -228,7 +228,7 @@ if ($view_mode === false) {
}
else {
$data = array();
$data[0] = '<i>'.__('You can not change your password from Pandora FMS under the current authentication scheme').'</i>';
$data[0] = '<i>'.__('You cannot change your password under the current authentication scheme').'</i>';
$table->rowclass[] = '';
$table->rowstyle[] = '';
$table->colspan[count($table-data)][0] = 2;
@ -352,7 +352,7 @@ if (check_acl ($config['id_user'], 0, "ER")){
else if (license_free()) {
$data[1] = __('Newsletter Subscribed') . ':';
if ($user_info["middlename"]) {
$data[1] .= $jump . '<span style="font-weight:initial;">' . __('Already subscribed to Pandora FMS newsletter') . "</span>";
$data[1] .= $jump . '<span style="font-weight:initial;">' . __('Already subscribed to %s newsletter', get_product_name()) . "</span>";
}
else {
$data[1] .= $jump . '<span style="font-weight:initial;"><a style="text-decoration:underline;" href="javascript: force_run_newsletter();">' . __('Subscribe to our newsletter') . "</a></span>";
@ -474,10 +474,9 @@ echo '<form name="user_mod" method="post" action="'.$url.'&amp;modified=1&amp;id
html_print_table($table);
echo '<div style="width:' . $table->width . '; text-align:right;">';
if (!$config["user_can_update_info"]) {
echo '<i>'.__('You can not change your user info from Pandora FMS under the current authentication scheme').'</i>';
echo '<i>'.__('You can not change your user info under the current authentication scheme').'</i>';
}
else {
html_print_submit_button (__('Update'), 'uptbutton', $view_mode, 'class="sub upd"');