Serendipity Forums

Code: Select all

$ diff serendipity_event_linktrimmer.php ~/Desktop/serendipity_event_linktrimmer.php 
133c133,135
<             $hash = $this->create($url, $custom_hash);
---
>             $hash = serendipity_event_linktrimmer::create($url, $custom_hash);
> 
153c155,157
<             $hash = $this->base62($id);
---
>             $hash = serendipity_event_linktrimmer::base62($id);

Code: Select all

$ diff serendipity_event_twitter.php ~/Desktop/serendipity_event_twitter.php 
39a40
>             'linktrimmer'     => "linktrimmer plugin",

Code: Select all

$ diff classes/UrlShortener.php ~/Desktop/UrlShortener.php 
9a10,18
> $linktrimmer_plugin = dirname(__FILE__) . '/../../serendipity_event_linktrimmer/serendipity_event_linktrimmer.php';
> $linktrimmer_found = true;
> if(file_exists($linktrimmer_plugin)) {
>     require_once $linktrimmer_plugin;
> } else {
>     $linktrimmer_found = false;
> }
> //echo $linktrimmer_plugin;
> //echo $linktrimmer_found;
50a60,66
>             case 'linktrimmer':
>                 //echo "Linktrimmer";
>                 if (linktrimmer_found) {
>                     //echo "OK";
>                     UrlShortener::shorten_via_linktrimmer( $url, $shorturls );
>                 }
>                 break;

78a97,102
>     
>     function shorten_via_linktrimmer( $url, &$shorturls ) {
>         $shorturl = trim(serendipity_event_linktrimmer::create($url));
>         $shorturls['linktrimmer'] = "http://test.scrmblog.com/s/" . $shorturl;
>     }

Code: Select all

9c9
< define('PLUGIN_LINKTRIMMER_LINKPREFIX_DESC', 'Enter a unique URL portion that will be used on your domain to identify the base of the linktrimmer. If you enter "l" for example, your URLs will look like http://yourblog/l/feda [with URL-Rewriting enabled] or http://yourblog/index.php?/l/feda [without URL-Rewriting]');
---
> define('PLUGIN_LINKTRIMMER_LINKPREFIX_DESC', 'Enter a unique URL portion that will be used on your domain to identify the base of the linktrimmer. If you enter "l" for example, your URLs will look like http://yourblog/l/feda [with URL-Rewriting enabled] or http://yourblog/index.php?/l/feda [without URL-Rewriting]. Never leave  empty, even if you have a separate domain for your short url.');
11c11
< define('PLUGIN_LINKTRIMMER_DOMAIN_DESC', 'The link that is used for the output. You could use .htaccess redirection of any other domain you own and enter that here. If you have Serendipity on http://mylongdomain.com/serendipity/ but also own http://short.com/ you could enter http://short.com/ here, and inside the .htaccess of short.com redirect everything to your longdomain: RewriteRule ^(.*)$ http://longdomain.com/serendipity/$1.');
---
> define('PLUGIN_LINKTRIMMER_DOMAIN_DESC', 'The link that is used for the output. You could use .htaccess redirection of any other domain you own and enter that here. If you have Serendipity on http://mylongdomain.com/serendipity/ but also own http://short.com/ you could enter http://short.com/ here, and inside the .htaccess of short.com redirect everything to your longdomain: RewriteRule ^(.*)$ http://longdomain.com/serendipity/yourprefix/$1 (alternativly: redirectMatch 301 ^(.*)$ http://longdomain.com/serendipity/yourprefix/$1). URLs are then redirected twice: from your short.com to mylongdomain.com to the original URL.');

Code: Select all

114,115c114,118
< 
<         $pref = $this->get_config('domain') . $this->get_config('prefix') . '/';
---
>         if ($this->get_config('domain') == $serendipity['baseURL'])  {
>             $pref = $this->get_config('domain') . $this->get_config('prefix') . '/';
>         } else {
>             $pref = $this->get_config('domain');
>         }

Code: Select all

22,24c22,34
<                     // TODO: Instead of hardcoding '/s/' here, we need to instanciate serendipity_event_linktrimmer and get the proper config variable
<                     // (or issue a SQL statement on serendipity_config directly)
<                     $shorturls['linktrimmer'] = $serendipity['baseURL'] . '/s/' . trim(serendipity_event_linktrimmer::create($url));
---
>                     $res = serendipity_db_query("SELECT value FROM `serendipity_config` WHERE name LIKE 'serendipity_event_linktrimmer:%/prefix';", true, 'assoc');
>                     if (is_array($res) && !empty($res['value'])) {
>                         $lt_prefix = "/" . trim($res['value']) . "/";
>                     }
>                     $res = serendipity_db_query("SELECT value FROM `serendipity_config` WHERE name LIKE 'serendipity_event_linktrimmer:%/domain';", true, 'assoc');
>                     if (is_array($res) && !empty($res['value'])) {
>                         $lt_domain = trim($res['value']);
>                     }
>                     if ($lt_domain == $serendipity['baseURL'])  {
>                         $shorturls['linktrimmer'] = $lt_domain. $lt_prefix .trim(serendipity_event_linktrimmer::create($url));
>                     } else {
>                         $shorturls['linktrimmer'] = $lt_domain . trim(serendipity_event_linktrimmer::create($url));
>                     }