diff options
| -rw-r--r-- | mod/oexchange.php | 2 | ||||
| -rw-r--r-- | mod/rpost.php | 2 | ||||
| -rw-r--r-- | mod/urlinfo.php (renamed from mod/parse_url.php) | 10 | ||||
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/msg-header.tpl | 4 |
6 files changed, 13 insertions, 11 deletions
diff --git a/mod/oexchange.php b/mod/oexchange.php index a684bd5d8..867cea6f2 100644 --- a/mod/oexchange.php +++ b/mod/oexchange.php @@ -47,7 +47,7 @@ function oexchange_content(&$a) { $tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags'])) ? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : ''); - $ret = z_fetch_url($a->get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags); + $ret = z_fetch_url($a->get_baseurl() . '/urlinfo?f=&url=' . $url . $title . $description . $tags); if($ret['success']) $s = $ret['body']; diff --git a/mod/rpost.php b/mod/rpost.php index 0c0916646..4a6b87cc6 100644 --- a/mod/rpost.php +++ b/mod/rpost.php @@ -102,7 +102,7 @@ function rpost_content(&$a) { ); if($_REQUEST['url']) { - $x = z_fetch_url(z_root() . '/parse_url?f=&url=' . urlencode($_REQUEST['url'])); + $x = z_fetch_url(z_root() . '/urlinfo?f=&url=' . urlencode($_REQUEST['url'])); if($x['success']) $_REQUEST['body'] = $_REQUEST['body'] . $x['body']; } diff --git a/mod/parse_url.php b/mod/urlinfo.php index 2a6f7663e..6b9be3f6f 100644 --- a/mod/parse_url.php +++ b/mod/urlinfo.php @@ -220,7 +220,9 @@ function arr_add_hashes(&$item,$k) { $item = '#' . $item; } -function parse_url_content(&$a) { +function urlinfo_content(&$a) { + + logger('urlinfo: ' . print_r($_REQUEST,true)); $text = null; $str_tags = ''; @@ -251,7 +253,7 @@ function parse_url_content(&$a) { } } - logger('parse_url: ' . $url); + logger('urlinfo: ' . $url); $result = z_fetch_url($url,false,0,array('novalidate' => true, 'nobody' => true)); if($result['success']) { @@ -315,7 +317,7 @@ function parse_url_content(&$a) { $result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags; - logger('parse_url (unparsed): returns: ' . $result); + logger('urlinfo (unparsed): returns: ' . $result); echo $result; killme(); @@ -374,7 +376,7 @@ function parse_url_content(&$a) { $result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags; - logger('parse_url: returns: ' . $result, LOGGER_DEBUG); + logger('urlinfo: returns: ' . $result, LOGGER_DEBUG); echo trim($result); killme(); diff --git a/view/js/main.js b/view/js/main.js index 5fe778488..20b23b7ed 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -135,7 +135,7 @@ function insertCommentURL(comment, id) { if(reply && reply.length) { reply = bin2hex(reply); $('body').css('cursor', 'wait'); - $.get('parse_url?binurl=' + reply, function(data) { + $.get('urlinfo?f=&binurl=' + reply, function(data) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == comment) { tmpStr = ""; diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 4121882b7..424d856e3 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -191,7 +191,7 @@ function enableOnUser(){ if(reply && reply.length) { reply = bin2hex(reply); $('#profile-rotator').spin('tiny'); - $.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) { + $.get('{{$baseurl}}/urlinfo?f=&binurl=' + reply, function(data) { addeditortext(data); $('#profile-rotator').spin(false); }); @@ -258,7 +258,7 @@ function enableOnUser(){ if(reply && reply.length) { reply = bin2hex(reply); $('#profile-rotator').spin('tiny'); - $.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) { + $.get('{{$baseurl}}/urlinfo?f=&binurl=' + reply, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index e1d1c6d23..20d0dd914 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -78,7 +78,7 @@ else reply = prompt("{{$linkurl}}"); if(reply && reply.length) { $('#prvmail-rotator').spin('tiny'); - $.get('parse_url?url=' + reply, function(data) { + $.get('urlinfo?f=&url=' + reply, function(data) { addmailtext(data); $('#prvmail-rotator').spin(false); }); @@ -104,7 +104,7 @@ else event.preventDefault(); if(reply && reply.length) { $('#prvmail-rotator').spin('tiny'); - $.get('parse_url?url=' + reply, function(data) { + $.get('urlinfo?f=&url=' + reply, function(data) { addmailtext(data); $('#prvmail-rotator').spin(false); }); |