Merge branch 'master' of github.com:stv0g/snippets
This commit is contained in:
commit
e0011ce33a
1 changed files with 8 additions and 1 deletions
|
@ -206,7 +206,7 @@ if (isset($matrnr) && isset($passwd)) {
|
||||||
|
|
||||||
case 'LOCATION':
|
case 'LOCATION':
|
||||||
$matches = array();
|
$matches = array();
|
||||||
if (preg_match('/^([0-9]+\|[0-9]+) /', $value, $matches)) {
|
if (preg_match('/^([0-9]+\|[0-9]+)/', $value, $matches)) {
|
||||||
$room = $matches[1];
|
$room = $matches[1];
|
||||||
$address = get_address($db, $room);
|
$address = get_address($db, $room);
|
||||||
|
|
||||||
|
@ -284,6 +284,13 @@ else {
|
||||||
var cipher = $('#matrnr').val() + ':' + $('#passwd').val();
|
var cipher = $('#matrnr').val() + ':' + $('#passwd').val();
|
||||||
var link = '<?php echo $scriptUrl ?>?hash=' + Base64.encode(cipher);
|
var link = '<?php echo $scriptUrl ?>?hash=' + Base64.encode(cipher);
|
||||||
|
|
||||||
|
$('#result a').attr('href', link);
|
||||||
|
$('#result a').text(link);
|
||||||
|
$('#result').show(300);
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* we dont want to store your credentials ;-) sorry for these ugly links */
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url : 'http://d.0l.de/add.json',
|
url : 'http://d.0l.de/add.json',
|
||||||
data : {
|
data : {
|
||||||
|
|
Loading…
Add table
Reference in a new issue