diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
| commit | 9d87313eaebe8240393ac300a435f3b1332c8849 (patch) | |
| tree | 6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /lib/ping.php | |
| parent | 5efe588174c71979fc1970353c9a556ea441f138 (diff) | |
| parent | beae3db41375879e725af053edf8041bbd76ac8c (diff) | |
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'lib/ping.php')
| -rw-r--r-- | lib/ping.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ping.php b/lib/ping.php index d26c73417..175bf8440 100644 --- a/lib/ping.php +++ b/lib/ping.php @@ -1,7 +1,7 @@ <?php /* - * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2009, Control Yourself, Inc. + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2009, StatusNet, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -if (!defined('LACONICA')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } function ping_broadcast_notice($notice) { @@ -47,7 +47,7 @@ function ping_broadcast_notice($notice) { $context = stream_context_create(array('http' => array('method' => "POST", 'header' => "Content-Type: text/xml\r\n". - "User-Agent: Laconica/".LACONICA_VERSION."\r\n", + "User-Agent: StatusNet/".STATUSNET_VERSION."\r\n", 'content' => $req))); $file = file_get_contents($notify_url, false, $context); @@ -81,11 +81,11 @@ function ping_broadcast_notice($notice) { if ($type === 'get') { $result = $fetcher->get($notify_url . '?' . http_build_query($args), - array('User-Agent: Laconica/'.LACONICA_VERSION)); + array('User-Agent: StatusNet/'.STATUSNET_VERSION)); } else { $result = $fetcher->post($notify_url, http_build_query($args), - array('User-Agent: Laconica/'.LACONICA_VERSION)); + array('User-Agent: StatusNet/'.STATUSNET_VERSION)); } if ($result->status != '200') { common_log(LOG_WARNING, |