Merge branch 'master' of ssh://0l.de/var/git/snippets

Conflicts:
	osm_changeset_rss/osm_changeset_rss.php
	osm_changeset_rss/osmrss.php
	php_scripts/osm_changeset_rss.php
This commit is contained in:
Steffen Vogel 2011-07-30 17:36:38 +02:00
commit a19adc1423
4 changed files with 19 additions and 13 deletions

View file

@ -28,7 +28,7 @@
<option value="5">5</option> <option value="5">5</option>
<option value="6">6</option> <option value="6">6</option>
</select></div> </select></div>
<div style="margin-top: 25px;" >Code &amp; Erläuterungen auf <a href="http://www.steffenvogel.de/">http://www.steffenvogel.de</a></div> <div style="margin-top: 25px;" >Code &amp; Erl&auml;uterungen auf <a href="http://www.steffenvogel.de/">http://www.steffenvogel.de</a></div>
<div style="float: right; font-size: 90%;" >&copy; Steffen Vogel<br /><a href="mailto:info@steffenvogel.de">info@steffenvogel.de</a><br /><a href="http://www.steffenvogel.de">http://www.steffenvogel.de</a><br /><br />Slider by Erik Arvidsson @ <a href="http://webfx.eae.net/dhtml/slider/slider.html" >WebFx</a></div> <div style="float: right; font-size: 90%;" >&copy; Steffen Vogel<br /><a href="mailto:info@steffenvogel.de">info@steffenvogel.de</a><br /><a href="http://www.steffenvogel.de">http://www.steffenvogel.de</a><br /><br />Slider by Erik Arvidsson @ <a href="http://webfx.eae.net/dhtml/slider/slider.html" >WebFx</a></div>
<script type="text/javascript"> <script type="text/javascript">

View file

@ -56,14 +56,14 @@ foreach ($changesets as $changeset) {
unset($tag); unset($tag);
foreach ($changeset->childNodes as $child) { foreach ($changeset->childNodes as $child) {
if (get_class($child) == 'DOMElement') { if (get_class($child) == 'DOMElement') {
$tag[$child->getAttribute('k')] = $child->getAttribute('v'); $tag[$child->getAttribute('k')] = htmlspecialchars($child->getAttribute('v'));
} }
} }
$ts = strtotime(($changeset->getAttribute('closed_at')) ? $changeset->getAttribute('closed_at') : $changeset->getAttribute('created_at')); $ts = strtotime(($changeset->getAttribute('closed_at')) ? $changeset->getAttribute('closed_at') : $changeset->getAttribute('created_at'));
$date = date('D, d M Y H:i:s', $ts); $date = date('D, d M Y H:i:s', $ts);
$item->appendChild($rss->createElement('title', (($changeset->getAttribute('open') == 'true') ? '[Editing] ' : '') . $changeset->getAttribute('user') . (($tag['comment']) ? ': ' . $tag['comment'] : '') . (($tag['created_by']) ? ': ' . $tag['created_by'] : ''))); $item->appendChild($rss->createElement('title', (($changeset->getAttribute('open') == 'true') ? '[Editing] ' : '') . $changeset->getAttribute('user') . ((@$tag['comment']) ? ': ' . @$tag['comment'] : '') . (($tag['created_by']) ? ': ' . $tag['created_by'] : '')));
$item->appendChild($rss->createElement('link', $browseUrl . $changeset->getAttribute('id'))); $item->appendChild($rss->createElement('link', $browseUrl . $changeset->getAttribute('id')));
$item->appendChild($rss->createElement('guid', $apiUrl . '/changeset/' . $changeset->getAttribute('id'))); $item->appendChild($rss->createElement('guid', $apiUrl . '/changeset/' . $changeset->getAttribute('id')));
$item->appendChild($rss->createElement('pubDate', $date)); $item->appendChild($rss->createElement('pubDate', $date));

View file

@ -9,7 +9,7 @@
<script src="sms.js" type="text/javascript"></script> <script src="sms.js" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" href="style.css"> <link rel="stylesheet" type="text/css" href="style.css">
</head> </head>
<body onload="document.forms.sms_frm.message.focus()"> <body onload="parent.document.getElementById('sms_frame').height=document.body.scrollHeight; document.forms.sms_frm.message.focus()">
<div id="sms_contact"> <div id="sms_contact">
<?php <?php
@ -56,11 +56,12 @@ if ($_POST) {
$balance = $sipgate->getBalance(); $balance = $sipgate->getBalance();
echo '<h3>SMS wurde gesendet!</h3><p>Vielen Dank :)</p>'; echo '<h3>SMS wurde gesendet!</h3><p>Vielen Dank :)</p>';
echo '<p>Du kannst deine n&auml;chste SMS in ' . format_duration($config['blocked']) . ' senden!</p>'; echo '<p>Du kannst deine n&auml;chste SMS in ' . format_duration($config['blocked']) . ' senden!</p>';
echo '<p>Verbleibendes Guthaben: ' . round($balance['CurrentBalance']['TotalIncludingVat']) . ' ' . $balance['CurrentBalance']['Currency'] . ' (das sind noch ' . floor(($balance['CurrentBalance']['TotalIncludingVat'] - $config['reserve']) / 0.079) . ' SMS)</p>'; echo '<p>Verbleibendes Guthaben: ' . round($balance['CurrentBalance']['TotalIncludingVat'], 2) . ' ' . $balance['CurrentBalance']['Currency'] . ' (das sind noch
' . floor(($balance['CurrentBalance']['TotalIncludingVat'] - $config['reserve']) / 0.079) . ' SMS)</p>';
if ($_SERVER['REMOTE_ADDR'] != '172.0.0.1') $blacklist[] = array($_SERVER['REMOTE_ADDR'], time()); if ($_SERVER['REMOTE_ADDR'] != '172.0.0.1') $blacklist[] = array($_SERVER['REMOTE_ADDR'], time());
echo '<p><a href="javascript:history.go(-1)" title="back">back</a></p>'; echo '<p><a href="javascript:history.go(-1)" title="back">zu&uuml;ck</a></p>';
write_blacklist($blacklist); write_blacklist($blacklist);
} }
else { else {
@ -71,9 +72,9 @@ function show_form() {
global $config; global $config;
$message = (isset($_REQUEST['message'])) ? $_REQUEST['message'] : $config['default']; $message = (isset($_REQUEST['message'])) ? $_REQUEST['message'] : $config['default'];
echo '<form name="sms_frm" onsubmit="send(this);" action="' . $_SERVER['PHP_SELF'] . '" method="post"> echo '<form name="sms_frm" onsubmit="return send(this);" action="' . $_SERVER['PHP_SELF'] . '" method="post">
<table> <table>
<tr><td><span class="head">An:</span> <span id="number">++' . $config['recipient'] . '</span></td></tr> <!-- <tr><td><span class="head">An:</span> <span id="number">++' . $config['recipient'] . '</span></td></tr> --!>
<tr><td><textarea onfocus="update_length(this);" onkeyup="update_length(this);" name="message" cols="40" rows="5">' . $message . '</textarea></td></tr> <tr><td><textarea onfocus="update_length(this);" onkeyup="update_length(this);" name="message" cols="40" rows="5">' . $message . '</textarea></td></tr>
<tr><td><span class="head">Zeichen:</span> <span id="length">' . strlen($message) . '</span> (&uuml;brig: <span id="left" style="color: green;">' . (160 - strlen($message)) . '</span>)</td></tr> <tr><td><span class="head">Zeichen:</span> <span id="length">' . strlen($message) . '</span> (&uuml;brig: <span id="left" style="color: green;">' . (160 - strlen($message)) . '</span>)</td></tr>
</table> </table>

View file

@ -1,7 +1,12 @@
* { html, body {
padding: 0; padding: 0;
margin: 0;
color: #666666;
}
* {
font-family: sans-serif; font-family: sans-serif;
font-size: small; font-size: x-small;
} }
.error { .error {
@ -19,5 +24,5 @@ span.number {
textarea { textarea {
width: 165px; width: 165px;
height: 170px; height: 165px;
} }