OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

added rss feed outage message; updated forum address

Browse Source
This commit is contained in:
following
2013-03-24 20:22:40 +01:00
parent 9644465b5c
commit a37f20a5e8
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/doc/sql/static-data/data.sql
View File

@@ -2431,6 +2431,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1967', 'all log
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1968', 'more', '2013-02-23 19:00:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1969', 'Only the <span class=\"public-setting\">green entries</span> are visible to other users.', '2013-02-23 19:00:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1975', 'Do not use easy-to-guess number and letter sequences like \'123456\' or \'qwerty\'', '2013-02-23 19:00:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1976', 'currently not available', '2013-02-23 19:00:04');
-- Table sys_trans_ref
SET NAMES 'utf8';
@@ -6139,6 +6140,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1968', 'DE', 'mehr', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1969', 'DE', 'Nur die <span class=\"public-setting\">grüne Einträge</span> sind für andere Benutzer sichtbar.', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1975', 'DE', 'Verwende keine einfach erratbaren Ziffern- oder Buchstabenkombinationen wie &bdquo;123456&ldquo; oder &bdquo;qwertz&ldquo;.', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1976', 'DE', 'zurzeit nicht verfügbar', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'EN', 'Reorder IDs \r', '2010-09-02 00:15:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'EN', 'The database could not be reconnected.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'EN', 'Testing – please do not login', '2010-08-28 11:48:07');
@@ -7634,6 +7636,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1968', 'EN', 'more', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1969', 'EN', 'Only the <span class=\"public-setting\">green entries</span> are visible to other users.', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1975', 'EN', 'Do not use easy-to-guess number and letter sequences like \'123456\' or \'qwerty\'.', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1976', 'EN', 'currently not available', '2013-02-19 05:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'ES', 'Reordenar ID', '2010-12-09 00:17:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'ES', 'La base de datos no se pudo conectar.', '2010-12-09 00:17:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'ES', 'En pruebas - por favor, no entre.', '2010-12-09 00:17:55');

5
htdocs/lib2/RSSParser.class.php
View File

@@ -11,6 +11,7 @@ class RSSParser {
* @return string $item feeditems as HTML-string
*/
public static function parse($items,$url) {
global $translate;
if ($items <= 0)
return '';
@@ -28,7 +29,7 @@ class RSSParser {
$html .= '<div class="newsblock">';
// get xml-data
$data = file_get_contents($url);
$data = @file_get_contents($url);
// check data
if($data === false || strpos($data, 'rss version=') === false) {
@@ -75,7 +76,7 @@ class RSSParser {
if(!$error) {
return $html;
} else {
return '';
return '<p><em>' . $translate->t('currently not available','','',0) . '</em></p>';
}
}
}

4
htdocs/templates2/ocstyle/articles/DE/contact.tpl
View File

@@ -20,7 +20,7 @@
<br />
<br />
Wenn du ein spezielles Problem hast und darauf keine Antwort findest,
kannst du dir unter <a href="http://forum.geocaching-network.com/">forum.geocaching-network.com</a>
kannst du dir unter <a href="http://forum.opencaching-network.org/">forum.opencaching-network.org</a>
ein passendes Forum raussuchen und dich dort erkundigen.<br />
&nbsp;
</td>
@@ -34,7 +34,7 @@
<tr>
<td>
Hierfür gibt es ein eigenes Unterforum auf
<a href="http://forum.geocaching-network.com/index.php?board=33.0">forum.geocaching-network.com</a>.
<a href="http://forum.opencaching-network.org/index.php?board=33.0">forum.opencaching-network.org</a>.
Dort findest du auch weitere Informationen, falls du in unserem Team mitmachen möchtest.
<br />
&nbsp;

4
htdocs/templates2/ocstyle/articles/EN/contact.tpl
View File

@@ -19,7 +19,7 @@
For general questions, you will find lots of information at the German websites <a href="http://wiki.opencaching.de">wiki.opencaching.de</a> and <a href="http://www.geocaching.de">www.geocaching.de</a>.
<br />
<br />
If you encounter a special problem, you may ask your questions in one of the German or international discussion boards at <a href="http://forum.geocaching-network.com/">forum.geocaching-network.com</a>.<br />
If you encounter a special problem, you may ask your questions in one of the German or international discussion boards at <a href="http://forum.opencaching-network.org/">forum.opencaching-network.org</a>.<br />
&nbsp;
</td>
</tr>
@@ -32,7 +32,7 @@
<tr>
<td>
There is a board for this purpose at
<a href="http://forum.geocaching-network.com/index.php?board=33.0">forum.geocaching-network.com</a> (<em>Opencaching 3.0 &ndash; Ideen und Gedanken</em>). It also conatains (German) information on joining our team.
<a href="http://forum.opencaching-network.org/index.php?board=33.0">forum.opencaching-network.org</a> (<em>Opencaching 3.0 &ndash; Ideen und Gedanken</em>). It also conatains (German) information on joining our team.
<br />
&nbsp;
</td>