modified: statusnet.tgz Set up tabs in code correctly.

modified:   statusnet/statusnet.php Set up tabs in code correctly.
	modified:   twitter.tgz Set up tabs in code correctly.
	modified:   twitter/twitter.php Set up tabs in code correctly.
	modified:   yourls.tgz Set up tabs in code correctly.
	modified:   yourls/yourls.css Set up tabs in code correctly.
	modified:   yourls/yourls.php Set up tabs in code correctly.
This commit is contained in:
Keith Fernie 2012-02-09 22:08:15 +00:00
parent e8d86324db
commit 772c58ce9a
7 changed files with 56 additions and 56 deletions

Binary file not shown.

View file

@ -407,19 +407,19 @@ function statusnet_post_hook(&$a,&$b) {
$shortlink = ""; $shortlink = "";
require_once('library/slinky.php'); require_once('library/slinky.php');
$slinky = new Slinky( $b['plink'] ); $slinky = new Slinky( $b['plink'] );
$yourls_url = get_config('yourls','url1'); $yourls_url = get_config('yourls','url1');
if ($yourls_url) { if ($yourls_url) {
$yourls_username = get_config('yourls','username1'); $yourls_username = get_config('yourls','username1');
$yourls_password = get_config('yourls', 'password1'); $yourls_password = get_config('yourls', 'password1');
$yourls_ssl = get_config('yourls', 'ssl1'); $yourls_ssl = get_config('yourls', 'ssl1');
$yourls = new Slinky_YourLS(); $yourls = new Slinky_YourLS();
$yourls->set( 'username', $yourls_username ); $yourls->set( 'username', $yourls_username );
$yourls->set( 'password', $yourls_password ); $yourls->set( 'password', $yourls_password );
$yourls->set( 'ssl', $yourls_ssl ); $yourls->set( 'ssl', $yourls_ssl );
$yourls->set( 'yourls-url', $yourls_url ); $yourls->set( 'yourls-url', $yourls_url );
$slinky->set_cascade( array( $yourls, new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL() ) ); $slinky->set_cascade( array( $yourls, new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL() ) );
} }
else { else {
// setup a cascade of shortening services // setup a cascade of shortening services
// try to get a short link from these services // try to get a short link from these services
// in the order ur1.ca, trim, id.gd, tinyurl // in the order ur1.ca, trim, id.gd, tinyurl
@ -429,9 +429,9 @@ function statusnet_post_hook(&$a,&$b) {
// the new message will be shortened such that "... $shortlink" // the new message will be shortened such that "... $shortlink"
// will fit into the character limit // will fit into the character limit
$msg = substr($msg, 0, $max_char-strlen($shortlink)-4); $msg = substr($msg, 0, $max_char-strlen($shortlink)-4);
$msg .= '... ' . $shortlink; $msg .= '... ' . $shortlink;
} }
// and now tweet it :-) // and now tweet it :-)
if(strlen($msg)) if(strlen($msg))
$dent->post('statuses/update', array('status' => $msg)); $dent->post('statuses/update', array('status' => $msg));
} }

Binary file not shown.

View file

@ -269,20 +269,20 @@ function twitter_post_hook(&$a,&$b) {
$shortlink = ""; $shortlink = "";
require_once('library/slinky.php'); require_once('library/slinky.php');
$slinky = new Slinky( $b['plink'] ); $slinky = new Slinky( $b['plink'] );
$yourls_url = get_config('yourls','url1'); $yourls_url = get_config('yourls','url1');
if ($yourls_url) { if ($yourls_url) {
$max_char = 135; $max_char = 135;
$yourls_username = get_config('yourls','username1'); $yourls_username = get_config('yourls','username1');
$yourls_password = get_config('yourls', 'password1'); $yourls_password = get_config('yourls', 'password1');
$yourls_ssl = get_config('yourls', 'ssl1'); $yourls_ssl = get_config('yourls', 'ssl1');
$yourls = new Slinky_YourLS(); $yourls = new Slinky_YourLS();
$yourls->set( 'username', $yourls_username ); $yourls->set( 'username', $yourls_username );
$yourls->set( 'password', $yourls_password ); $yourls->set( 'password', $yourls_password );
$yourls->set( 'ssl', $yourls_ssl ); $yourls->set( 'ssl', $yourls_ssl );
$yourls->set( 'yourls-url', $yourls_url ); $yourls->set( 'yourls-url', $yourls_url );
$slinky->set_cascade( array( $yourls, new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL() ) ); $slinky->set_cascade( array( $yourls, new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL() ) );
} }
else { else {
// setup a cascade of shortening services // setup a cascade of shortening services
// try to get a short link from these services // try to get a short link from these services
// in the order ur1.ca, trim, id.gd, tinyurl // in the order ur1.ca, trim, id.gd, tinyurl

Binary file not shown.

View file

@ -14,7 +14,7 @@ yourls-url {
} }
.yourls { .yourls {
text-align: left; text-align: left;
width 100%; width 100%;
margin-top: 25px; margin-top: 25px;
font-size: 20px; font-size: 20px;

View file

@ -19,10 +19,10 @@ function yourls_install() {
function yourls_uninstall() { function yourls_uninstall() {
unregister_hook('plugin_settings', 'addon/yourls/yourls.php', 'yourls_addon_settings'); unregister_hook('plugin_settings', 'addon/yourls/yourls.php', 'yourls_addon_settings');
unregister_hook('plugin_settings_post', 'addon/yourls/yourls.php', 'yourls_addon_settings_post'); unregister_hook('plugin_settings_post', 'addon/yourls/yourls.php', 'yourls_addon_settings_post');
set_config('yourls','url1',trim($_POST[''])); set_config('yourls','url1',trim($_POST['']));
set_config('yourls','username1',trim($_POST[''])); set_config('yourls','username1',trim($_POST['']));
set_config('yourls','password1',trim($_POST[''])); set_config('yourls','password1',trim($_POST['']));
set_config('yourls','ssl1',trim($_POST[''])); set_config('yourls','ssl1',trim($_POST['']));
} }
@ -38,42 +38,42 @@ function yourls_addon_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */ /* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/yourls/yourls.css' . '" media="all" />' . "\r\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/yourls/yourls.css' . '" media="all" />' . "\r\n";
$yourls_url = get_config('yourls','url1'); $yourls_url = get_config('yourls','url1');
$yourls_username = get_config('yourls','username1'); $yourls_username = get_config('yourls','username1');
$yourls_password = get_config('yourls', 'password1'); $yourls_password = get_config('yourls', 'password1');
$ssl_enabled = get_config('yourls','ssl1'); $ssl_enabled = get_config('yourls','ssl1');
$ssl_checked = (($ssl_enabled) ? ' checked="checked" ' : ''); $ssl_checked = (($ssl_enabled) ? ' checked="checked" ' : '');
$yourls_ssl = get_config('yourls', 'ssl1'); $yourls_ssl = get_config('yourls', 'ssl1');
$s .= '<div class="settings-block">'; $s .= '<div class="settings-block">';
$s .= '<h3>' . t('YourLS Settings') . '</h3>'; $s .= '<h3>' . t('YourLS Settings') . '</h3>';
$s .= '<div id="yourls-url-wrapper">'; $s .= '<div id="yourls-url-wrapper">';
$s .= '<label id="yourls-url-label" for="yourls-url">' . t('URL: http://') . '</label>'; $s .= '<label id="yourls-url-label" for="yourls-url">' . t('URL: http://') . '</label>';
$s .= '<input id="yourls-url" type="text" name="yourls_url" value="' . $yourls_url .'" />'; $s .= '<input id="yourls-url" type="text" name="yourls_url" value="' . $yourls_url .'" />';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
$s .= '<div id="yourls-username-wrapper">'; $s .= '<div id="yourls-username-wrapper">';
$s .= '<label id="yourls-username-label" for="yourls-username">' . t('Username:') . '</label>'; $s .= '<label id="yourls-username-label" for="yourls-username">' . t('Username:') . '</label>';
$s .= '<input id="yourls-username" type="text" name="yourls_username" value="' . $yourls_username .'" />'; $s .= '<input id="yourls-username" type="text" name="yourls_username" value="' . $yourls_username .'" />';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
$s .= '<div id="yourls-password-wrapper">'; $s .= '<div id="yourls-password-wrapper">';
$s .= '<label id="yourls-password-label" for="yourls-password">' . t('Password:') . '</label>'; $s .= '<label id="yourls-password-label" for="yourls-password">' . t('Password:') . '</label>';
$s .= '<input id="yourls-password" type="password" name="yourls_password" value="' . $yourls_password .'" />'; $s .= '<input id="yourls-password" type="password" name="yourls_password" value="' . $yourls_password .'" />';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
$s .= '<div id="yourls-ssl-wrapper">'; $s .= '<div id="yourls-ssl-wrapper">';
$s .= '<label id="yourls-ssl-label" for="yourls-ssl">' . t('Use SSL ') . '</label>'; $s .= '<label id="yourls-ssl-label" for="yourls-ssl">' . t('Use SSL ') . '</label>';
$s .= '<input id="yourls-ssl" type="checkbox" name="yourls_ssl" value="1" ' . $ssl_checked . '"/>'; $s .= '<input id="yourls-ssl" type="checkbox" name="yourls_ssl" value="1" ' . $ssl_checked . '"/>';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="yourls-submit" name="yourls-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>'; $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="yourls-submit" name="yourls-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
return; return;
@ -86,9 +86,9 @@ function yourls_addon_settings_post(&$a,&$b) {
if($_POST['yourls-submit']) { if($_POST['yourls-submit']) {
set_config('yourls','url1',trim($_POST['yourls_url'])); set_config('yourls','url1',trim($_POST['yourls_url']));
set_config('yourls','username1',trim($_POST['yourls_username'])); set_config('yourls','username1',trim($_POST['yourls_username']));
set_config('yourls','password1',trim($_POST['yourls_password'])); set_config('yourls','password1',trim($_POST['yourls_password']));
set_config('yourls','ssl1',intval($_POST['yourls_ssl'])); set_config('yourls','ssl1',intval($_POST['yourls_ssl']));
info( t('yourls Settings saved.') . EOL); info( t('yourls Settings saved.') . EOL);
} }
} }